diff --git a/flake.nix b/flake.nix index 8a40a9e..78e86c7 100644 --- a/flake.nix +++ b/flake.nix @@ -16,10 +16,7 @@ hyprland.url = "github:hyprwm/Hyprland"; hyprland-plugins.url = "github:hyprwm/hyprland-plugins"; - split-monitor-workspaces = { - url = "github:jacekpoz/split-monitor-workspaces"; - inputs.nixpkgs.follows = "hyprland"; - }; + split-monitor-workspaces.url = "github:jacekpoz/split-monitor-workspaces"; home-manager = { url = "github:nix-community/home-manager"; diff --git a/homes/jacek/gui/hypr/default.nix b/homes/jacek/gui/hypr/default.nix index 3a8f667..686b71c 100644 --- a/homes/jacek/gui/hypr/default.nix +++ b/homes/jacek/gui/hypr/default.nix @@ -43,6 +43,7 @@ workspace = special:btop, allpseudo workspace = special:amdgpu_top, allpseudo workspace = special:helvum, allpseudo + workspace = special:nixos, allpseudo input { kb_layout=pl @@ -211,6 +212,7 @@ bind = SUPER, B, togglespecialworkspace, btop bind = SUPER, A, togglespecialworkspace, amdgpu_top bind = SUPER, V, togglespecialworkspace, helvum + bind = SUPER, N, togglespecialworkspace, nixos bindm = SUPER, mouse:272, movewindow @@ -230,6 +232,7 @@ exec=[workspace special:amdgpu_top silent] amdgpu_top --gui -i 0 exec=[workspace special:amdgpu_top silent] amdgpu_top --gui -i 1 exec=[workspace special:helvum silent] helvum + exec-once=[workspace special:nixos silent;tile] cd niksos; foot nvim exec-once=foot --server exec-once=hyprctl setcursor Bibata-Modern-Classic 24 diff --git a/hosts/niks/configuration.nix b/hosts/niks/configuration.nix index 74e3307..8283084 100644 --- a/hosts/niks/configuration.nix +++ b/hosts/niks/configuration.nix @@ -128,7 +128,6 @@ in }; }; blueman.enable = true; - mullvad-vpn.enable = true; }; hardware = { diff --git a/hosts/niks/default.nix b/hosts/niks/default.nix index 7ab916b..e445b57 100644 --- a/hosts/niks/default.nix +++ b/hosts/niks/default.nix @@ -2,5 +2,6 @@ _: { imports = [ ./configuration.nix ./hardware-configuration.nix + ./mullvad.nix ]; } diff --git a/hosts/niks/mullvad.nix b/hosts/niks/mullvad.nix new file mode 100644 index 0000000..8be7176 --- /dev/null +++ b/hosts/niks/mullvad.nix @@ -0,0 +1,16 @@ +{ + config, + pkgs, + ... +}: { + services.mullvad-vpn.enable = true; + + systemd.services."mullvad-daemon".postStart = let + mullvad = config.services.mullvad-vpn.package; + in '' + while ! ${mullvad}/bin/mullvad status > /dev/null; do sleep 1; done + ${mullvad}/bin/mullvad auto-connect set on + ${mullvad}/bin/mullvad tunnel ipv6 set on + ${mullvad}/bin/mullvad set default --block-ads --block-trackers --block-malware + ''; +}