updates from makefile

This commit is contained in:
Don Harper 2024-04-27 22:27:12 -05:00
parent 210c7b020b
commit 02a3a76827
5 changed files with 23 additions and 24 deletions

24
flake.lock generated
View file

@ -77,11 +77,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713906585, "lastModified": 1714203603,
"narHash": "sha256-fv84DCOkBtjF6wMATt0rfovu7e95L8rdEkSfNbwKR3U=", "narHash": "sha256-eT7DENhYy7EPLOqHI9zkIMD9RvMCXcqh6gGqOK5BWYQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "bfa7c06436771e3a0c666ccc6ee01e815d4c33aa", "rev": "c1609d584a6b5e9e6a02010f51bd368cb4782f8e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -117,11 +117,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1713875850, "lastModified": 1714168167,
"narHash": "sha256-vNpkn7IobqC6wasH+NuxmxECSQ7OFO0few4N1fzYduA=", "narHash": "sha256-4AwaLB/gTRgvZG4FmFY6OY52yeLAnj0a6rtJCz7TRXA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nix", "repo": "nix",
"rev": "e3a4e40a354e1c2d177541d24d6a86a001fa87c7", "rev": "2f678331d59451dd6f1d9512cb6d92e4ecb9750f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -131,11 +131,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1713864415, "lastModified": 1714201532,
"narHash": "sha256-/BPDMJEkrsFAFOsQWhwm31wezlgshPFlLBn34KEUdVA=", "narHash": "sha256-nk0W4rH7xYdDeS7k1SqqNtBaNrcgIBYNmOVc8P2puEY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "797f8d8082c7cc3259cba7275c699d4991b09ecc", "rev": "53db5e1070d07e750030bf65f1b9963df8f0c678",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -197,11 +197,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1713714899, "lastModified": 1714076141,
"narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=", "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6143fc5eeb9c4f00163267708e26191d1e918932", "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -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 /home/don/bin/lock.sh
#set $lock 'swaylock -f -c 000000' #set $lock 'swaylock -f -c 000000'
exec swayidle -w \ #exec swayidle -w \
timeout 300 $lock \ # timeout 300 $lock \
timeout 360 'swaymsg "output * dpms off"' \ # timeout 360 'swaymsg "output * dpms off"' \
resume 'swaymsg "output * dpms on"' \ # resume 'swaymsg "output * dpms on"' \
before-sleep $lock # before-sleep $lock
floating_modifier $mod floating_modifier $mod

View file

@ -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 /home/don/bin/lock.sh
#set $lock 'swaylock -f -c 000000' #set $lock 'swaylock -f -c 000000'
exec swayidle -w \ #exec swayidle -w \
timeout 300 $lock \ # timeout 300 $lock \
timeout 360 'swaymsg "output * dpms off"' \ # timeout 360 'swaymsg "output * dpms off"' \
resume 'swaymsg "output * dpms on"' \ # resume 'swaymsg "output * dpms on"' \
before-sleep $lock # before-sleep $lock
floating_modifier $mod floating_modifier $mod

View file

@ -6,7 +6,6 @@
./hardware-configuration.nix ./hardware-configuration.nix
../workstation ../workstation
../wm ../wm
../wm/sddm
]; ];
networking.hostName = "smaug"; networking.hostName = "smaug";
} }

View file

@ -1,4 +1,4 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
imports = [ ./sway ]; imports = [ ./sway ./sddm ];
} }