diff --git a/flake.lock b/flake.lock index 6bb76bf..ecb826f 100644 --- a/flake.lock +++ b/flake.lock @@ -77,11 +77,11 @@ ] }, "locked": { - "lastModified": 1713906585, - "narHash": "sha256-fv84DCOkBtjF6wMATt0rfovu7e95L8rdEkSfNbwKR3U=", + "lastModified": 1714203603, + "narHash": "sha256-eT7DENhYy7EPLOqHI9zkIMD9RvMCXcqh6gGqOK5BWYQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "bfa7c06436771e3a0c666ccc6ee01e815d4c33aa", + "rev": "c1609d584a6b5e9e6a02010f51bd368cb4782f8e", "type": "github" }, "original": { @@ -117,11 +117,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1713875850, - "narHash": "sha256-vNpkn7IobqC6wasH+NuxmxECSQ7OFO0few4N1fzYduA=", + "lastModified": 1714168167, + "narHash": "sha256-4AwaLB/gTRgvZG4FmFY6OY52yeLAnj0a6rtJCz7TRXA=", "owner": "NixOS", "repo": "nix", - "rev": "e3a4e40a354e1c2d177541d24d6a86a001fa87c7", + "rev": "2f678331d59451dd6f1d9512cb6d92e4ecb9750f", "type": "github" }, "original": { @@ -131,11 +131,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1713864415, - "narHash": "sha256-/BPDMJEkrsFAFOsQWhwm31wezlgshPFlLBn34KEUdVA=", + "lastModified": 1714201532, + "narHash": "sha256-nk0W4rH7xYdDeS7k1SqqNtBaNrcgIBYNmOVc8P2puEY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "797f8d8082c7cc3259cba7275c699d4991b09ecc", + "rev": "53db5e1070d07e750030bf65f1b9963df8f0c678", "type": "github" }, "original": { @@ -197,11 +197,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1713714899, - "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=", + "lastModified": 1714076141, + "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6143fc5eeb9c4f00163267708e26191d1e918932", + "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856", "type": "github" }, "original": { diff --git a/home/gui/files/sway/eve b/home/gui/files/sway/eve index fcce91f..215a567 100644 --- a/home/gui/files/sway/eve +++ b/home/gui/files/sway/eve @@ -4,11 +4,11 @@ set $snd_sink alsa_output.usb-Corsair_CORSAIR_VOID_ELITE_Wireless_Gaming_Dongle- set $lock /home/don/bin/lock.sh #set $lock 'swaylock -f -c 000000' -exec swayidle -w \ - timeout 300 $lock \ - timeout 360 'swaymsg "output * dpms off"' \ - resume 'swaymsg "output * dpms on"' \ - before-sleep $lock +#exec swayidle -w \ +# timeout 300 $lock \ +# timeout 360 'swaymsg "output * dpms off"' \ +# resume 'swaymsg "output * dpms on"' \ +# before-sleep $lock floating_modifier $mod diff --git a/home/gui/files/sway/pocket2 b/home/gui/files/sway/pocket2 index 3c08834..76f85a3 100644 --- a/home/gui/files/sway/pocket2 +++ b/home/gui/files/sway/pocket2 @@ -5,11 +5,11 @@ set $snd_sink alsa_output.usb-Corsair_CORSAIR_VOID_ELITE_Wireless_Gaming_Dongle- set $lock /home/don/bin/lock.sh #set $lock 'swaylock -f -c 000000' -exec swayidle -w \ - timeout 300 $lock \ - timeout 360 'swaymsg "output * dpms off"' \ - resume 'swaymsg "output * dpms on"' \ - before-sleep $lock +#exec swayidle -w \ +# timeout 300 $lock \ +# timeout 360 'swaymsg "output * dpms off"' \ +# resume 'swaymsg "output * dpms on"' \ +# before-sleep $lock floating_modifier $mod diff --git a/hosts/smaug/default.nix b/hosts/smaug/default.nix index 81cc77e..82146bf 100644 --- a/hosts/smaug/default.nix +++ b/hosts/smaug/default.nix @@ -6,7 +6,6 @@ ./hardware-configuration.nix ../workstation ../wm - ../wm/sddm ]; networking.hostName = "smaug"; } diff --git a/hosts/wm/default.nix b/hosts/wm/default.nix index 980bcac..3234cb8 100644 --- a/hosts/wm/default.nix +++ b/hosts/wm/default.nix @@ -1,4 +1,4 @@ { pkgs, ... }: { - imports = [ ./sway ]; + imports = [ ./sway ./sddm ]; }