diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index 26e0af2..785bfb0 100644 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -1294,7 +1294,6 @@ }; } ./waybar.nix - ./mako.nix ./swaylock.nix ./sway.nix ]; diff --git a/modules/home-manager/fish/shellInit.fish b/modules/home-manager/fish/shellInit.fish index 66a3a84..02e15b9 100644 --- a/modules/home-manager/fish/shellInit.fish +++ b/modules/home-manager/fish/shellInit.fish @@ -33,7 +33,7 @@ set --export --universal EXA_COLORS '*=0' set --export --universal ERL_AFLAGS "-kernel shell_history enabled -kernel shell_history_file_bytes 1024000" -set --export --universal BROWSER firefox +set --export --universal BROWSER (which firefox) set --export --universal SOPS_AGE_KEY_FILE "$XDG_CONFIG_HOME/sops/age/keys.txt" diff --git a/modules/home-manager/mako.nix b/modules/home-manager/mako.nix deleted file mode 100644 index af11c61..0000000 --- a/modules/home-manager/mako.nix +++ /dev/null @@ -1,28 +0,0 @@ -{style, ...}: { - services.mako = with style.colors.withHashPrefix; { - enable = false; - - anchor = "top-right"; - - extraConfig = '' - border-size=1 - max-visible=5 - default-timeout=15000 - font=Symbols Nerd Font ${toString font.size},${font.name} ${toString font.size} - anchor=top-right - - background-color=${colors.bg} - text-color=${colors.text} - border-color=${colors.primary} - progress-color=${colors.primary} - - [urgency=high] - border-color=${urgent} - - [urgency=high] - background-color=${urgent} - border-color=${urgent} - text-color=${bg} - ''; - }; -} diff --git a/modules/home-manager/sway.nix b/modules/home-manager/sway.nix index d435de9..f6cb461 100644 --- a/modules/home-manager/sway.nix +++ b/modules/home-manager/sway.nix @@ -9,6 +9,17 @@ enable = true; }; + xdg = { + enable = true; + mimeApps = { + enable = true; + defaultApplications = { + "x-scheme-handler/http" = "firefox.desktop"; + "x-scheme-handler/https" = "firefox.desktop"; + }; + }; + }; + home.file."${config.xdg.configHome}/mako/config" = { enable = true; text = with style.colors.withHashPrefix; '' @@ -17,6 +28,7 @@ default-timeout=15000 font=Symbols Nerd Font ${toString style.font.size},${style.font.name} ${toString style.font.size} anchor=top-right + on-notify=exec ${pkgs.mpv}/bin/mpv --volume=50 ~/.notify.wav background-color=${bg} text-color=${text} diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index aedc2b5..f11c23a 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -41,6 +41,25 @@ pipewire ]; + systemd.user.services."wait-for-full-path" = { + description = "wait for systemd units to have full PATH"; + wantedBy = ["xdg-desktop-portal.service"]; + before = ["xdg-desktop-portal.service"]; + path = with pkgs; [systemd coreutils gnugrep]; + script = '' + ispresent () { + systemctl --user show-environment | grep -E '^PATH=.*/.nix-profile/bin' + } + while ! ispresent; do + sleep 0.1; + done + ''; + serviceConfig = { + Type = "oneshot"; + TimeoutStartSec = "60"; + }; + }; + home-manager.users.daniel = { imports = with homeManagerModules; [ sway @@ -619,6 +638,8 @@ systemPackages = with pkgs; [ libnotify slides + slack + discord ]; variables = { /* @@ -880,6 +901,15 @@ backend = "podman"; }; }; + + networking = { + extraHosts = '' + 127.0.0.1 host.docker.internal + ::1 host.docker.internal + 127.0.0.1 host.containers.internal + ::1 host.containers.internal + ''; + }; }; virtual-machines = {pkgs, ...}: {