From 465eed314b692f0dfaf1a7bf9ace5aa7e966497d Mon Sep 17 00:00:00 2001 From: Erwin Boskma Date: Mon, 31 Oct 2022 17:27:18 +0100 Subject: [PATCH] Update flake.lock, Hyprland fixes --- flake.lock | 60 +++++++++++------------ home-manager/modules/hyprland/default.nix | 1 + home-manager/modules/sway/powermenu.sh | 6 ++- 3 files changed, 36 insertions(+), 31 deletions(-) diff --git a/flake.lock b/flake.lock index 52a3a17..a82816d 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ ] }, "locked": { - "lastModified": 1666957671, - "narHash": "sha256-QmFXa7AToYu1/xyo4jxo7wKpy0Ec6IYWVsQjKz4WqlM=", + "lastModified": 1667211759, + "narHash": "sha256-Vn5BKKjzY43VLQJOLXhfljVsIAlSrA9DW4vlMxIIm8w=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "c5a67519099ded10354a96c268a9bdef8087161d", + "rev": "84217c538479607814bfeac188ab090d66a47083", "type": "github" }, "original": { @@ -25,11 +25,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1667077288, + "narHash": "sha256-bdC8sFNDpT0HK74u9fUkpbf1MEzVYJ+ka7NXCdgBoaA=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "6ee9ebb6b1ee695d2cacc4faa053a7b9baa76817", "type": "github" }, "original": { @@ -76,11 +76,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1666903647, - "narHash": "sha256-sFI1Gh9DTGzHnBINondupUGYbe+T0wZcpcZjkW0qffM=", + "lastModified": 1667218146, + "narHash": "sha256-MoyNz+TfyML+BYkJ8TtiLDmQcvbrSdoFWcT4Gf31EcM=", "owner": "nix-community", "repo": "home-manager", - "rev": "213a06295dff96668a1d673b9fd1c03ce1de6745", + "rev": "2464c21ab2b3607bed3c206a436855c487f35f55", "type": "github" }, "original": { @@ -97,11 +97,11 @@ "wlroots": "wlroots" }, "locked": { - "lastModified": 1667132917, - "narHash": "sha256-0b1kVcyDOrkluCSIkKmz3FO/cN4/Amz1uIU3EyvojPA=", + "lastModified": 1667219167, + "narHash": "sha256-8vZFiueGvZWAgrhwNuGmi/GigH/6p75yFPB96AIAcVk=", "owner": "Hyprwm", "repo": "Hyprland", - "rev": "9f1d7f7fc709ae3360f7ec229e9fd1e32b894ace", + "rev": "a69fd21a1ac90c24cee659595d62329f8638d632", "type": "github" }, "original": { @@ -168,11 +168,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1666873549, - "narHash": "sha256-a6Eu1Qv/EndjepSMja5SvcG+4vM5Rl2gzJD7xscRHss=", + "lastModified": 1667221253, + "narHash": "sha256-PGGT7D/qmi1E8D1Z32SLrzq7PJO5CajD64GfCCdslk0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "419dcc0ec767803182ed01a326f134230578bf60", + "rev": "d5bacd34f54328f31bef9237098fdeaad83074be", "type": "github" }, "original": { @@ -183,11 +183,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1666869603, - "narHash": "sha256-3V53or4Vpu4+LrGfGSh3T2V8+qf5RP6nRuex9GywkwE=", + "lastModified": 1667050928, + "narHash": "sha256-xOn0ZgjImIyeecEsrjxuvlW7IW5genTwvvnDQRFncB8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2001e2b31c565bcdf7bc13062b8d7cfccaca05b8", + "rev": "fdebb81f45a1ba2c4afca5fd9f526e1653ad0949", "type": "github" }, "original": { @@ -199,11 +199,11 @@ }, "nixpkgs-22_05": { "locked": { - "lastModified": 1666488099, - "narHash": "sha256-DANs2epN5QgvxWzH7xF3dzb4WE0lEuMLrMEu/vPmQxw=", + "lastModified": 1667091951, + "narHash": "sha256-62sz0fn06Nq8OaeBYrYSR3Y6hUcp8/PC4dJ7HeGaOhU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f9115594149ebcb409a42e303bec4956814a8419", + "rev": "6440d13df2327d2db13d3b17e419784020b71d22", "type": "github" }, "original": { @@ -267,11 +267,11 @@ ] }, "locked": { - "lastModified": 1666925689, - "narHash": "sha256-X2n+i2efiXcniDPDbvMsJVrPd7epu3+6pS/Pwu3OkHg=", + "lastModified": 1667184938, + "narHash": "sha256-/kuCiXuAxiD0c0zrfDvJ1Yba3FuVdRk/ROfb393AeX4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "4b1fcd5766db910c07c871d1454b1fe296e4547c", + "rev": "8f81faec35508647ced65c44fd3e8648a5518afb", "type": "github" }, "original": { @@ -288,11 +288,11 @@ "nixpkgs-22_05": "nixpkgs-22_05" }, "locked": { - "lastModified": 1666499473, - "narHash": "sha256-q1eFnBFL0kHgcnUPeKagw3BfbE/5sMJNGL2E2AR+a2M=", + "lastModified": 1667102919, + "narHash": "sha256-DP5j4TwXe96eZf0PLgYSj1Hdyt7SPUoQ003iNBQSKpQ=", "owner": "Mic92", "repo": "sops-nix", - "rev": "1b5f9512a265f0c9687dbff47893180f777f4809", + "rev": "448ec3e7eb7c7e4563cc2471db748a71baaf9698", "type": "github" }, "original": { @@ -327,11 +327,11 @@ }, "utils": { "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "lastModified": 1667077288, + "narHash": "sha256-bdC8sFNDpT0HK74u9fUkpbf1MEzVYJ+ka7NXCdgBoaA=", "owner": "numtide", "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "rev": "6ee9ebb6b1ee695d2cacc4faa053a7b9baa76817", "type": "github" }, "original": { diff --git a/home-manager/modules/hyprland/default.nix b/home-manager/modules/hyprland/default.nix index c3e0e29..406f518 100644 --- a/home-manager/modules/hyprland/default.nix +++ b/home-manager/modules/hyprland/default.nix @@ -137,6 +137,7 @@ in exec-once = ${pkgs.swaybg}/bin/swaybg -i ${wallpapers.qhd} -m fill exec-once = ${config.wayland.windowManager.hyprland.package}/bin/hyprctl setcursor Nordzy-cursors 24 exec-once = ${pkgs.systemd}/bin/systemctl --user start swaync + exec-once = ${pkgs.sysdemd}/bin/systemctl --user start fcitx5-daemon '' + (lib.optionalString config.eboskma.programs.emacs.enable "bind = $mod,C,exec,${config.eboskma.programs.emacs.package}/bin/emacsclient -c"); }; diff --git a/home-manager/modules/sway/powermenu.sh b/home-manager/modules/sway/powermenu.sh index e181372..4c858a1 100755 --- a/home-manager/modules/sway/powermenu.sh +++ b/home-manager/modules/sway/powermenu.sh @@ -49,7 +49,11 @@ if [[ "${answer}" == "y" ]]; then systemctl hibernate ;; "${exit_wm}") - swaymsg exit + if [[ ${XDG_CURRENT_DESKTOP} = "sway" ]]; then + swaymsg exit + elif [[ ${XDG_CURRENT_DESKTOP} = "Hyprland" ]]; then + hyprctl dispatch exit + fi ;; *) ;;