From d3f0fe0539e694fa1649d8b24330edaf27a5469b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Mon, 8 May 2023 13:03:20 +0200 Subject: [PATCH 1/4] refactor(hyprland): use getExe --- modules/programs/hyprland/default.nix | 6 +++--- modules/programs/nvim/default.nix | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/programs/hyprland/default.nix b/modules/programs/hyprland/default.nix index 0be3db8..98b41d1 100644 --- a/modules/programs/hyprland/default.nix +++ b/modules/programs/hyprland/default.nix @@ -88,11 +88,11 @@ in events = [ { event = "before-sleep"; - command = "${pkgs.swaylock}/bin/swaylock -fF"; + command = "${getExe pkgs.swaylock} -fF"; } { event = "lock"; - command = "${pkgs.swaylock}/bin/swaylock -fF"; + command = "${getExe pkgs.swaylock} -fF"; } ]; timeouts = [ @@ -132,7 +132,7 @@ in wantedBy = [ "graphical-session.target" ]; after = [ "graphical-session.target" ]; serviceConfig = { - ExecStart = "${pkgs.hyprpaper}/bin/hyprpaper -c ${config}"; + ExecStart = "${getExe pkgs.hyprpaper} -c ${config}"; RestartSec = "1s"; Restart = "on-failure"; }; diff --git a/modules/programs/nvim/default.nix b/modules/programs/nvim/default.nix index 092636b..805e88b 100644 --- a/modules/programs/nvim/default.nix +++ b/modules/programs/nvim/default.nix @@ -94,3 +94,4 @@ in }; }; } + From 3a0d4845b0c71218019479108c0d9b48dfc0f137 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Sun, 14 May 2023 15:27:25 +0200 Subject: [PATCH 2/4] fix: use suspend and hibernate --- hosts/nixos-laptop/default.nix | 11 +---------- modules/programs/hyprland/default.nix | 10 ++++------ 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/hosts/nixos-laptop/default.nix b/hosts/nixos-laptop/default.nix index 42c242c..39725c7 100644 --- a/hosts/nixos-laptop/default.nix +++ b/hosts/nixos-laptop/default.nix @@ -29,6 +29,7 @@ xserver.libinput.enable = true; xserver.libinput.touchpad.disableWhileTyping = true; printing.enable = true; + logind.lidSwitch = "suspend-and-hibernate"; }; hardware.bluetooth.enable = true; @@ -101,16 +102,6 @@ wantedBy = [ "multi-user.target" ]; }; - programs.ssh.extraConfig = '' - Host builder - Hostname 192.168.0.14 - Port 22 - User moritz - - IdentitiesOnly yes - IdentityFile /etc/ssh/ssh_host_ed25519_key - ''; - # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It‘s perfectly fine and recommended to leave diff --git a/modules/programs/hyprland/default.nix b/modules/programs/hyprland/default.nix index 3a3ffeb..6f0b197 100644 --- a/modules/programs/hyprland/default.nix +++ b/modules/programs/hyprland/default.nix @@ -118,12 +118,10 @@ in } ] ++ optional (!cfg.nvidiaSupport) # TODO https://github.com/hyprwm/Hyprland/issues/1728 - [ - { - timeout = 30 * 60; - command = "${pkgs.systemd}/bin/systemctl suspend-then-hibernate"; - } - ]; + { + timeout = 30 * 60; + command = "${pkgs.systemd}/bin/systemctl suspend-and-hibernate"; + }; systemdTarget = "hyprland-session.target"; }; }; From e503567eda9fb13cc7e2782d300fa446773d5c1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Sun, 14 May 2023 15:28:27 +0200 Subject: [PATCH 3/4] feat(desktop): add illum for backlight control --- modules/profiles/desktop.nix | 1 + modules/programs/hyprland/config.nix | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/profiles/desktop.nix b/modules/profiles/desktop.nix index ac348a0..4010852 100644 --- a/modules/profiles/desktop.nix +++ b/modules/profiles/desktop.nix @@ -63,6 +63,7 @@ with lib; { }; }; services = { + illum.enable = true; gnome.gnome-keyring.enable = true; pipewire = { enable = true; diff --git a/modules/programs/hyprland/config.nix b/modules/programs/hyprland/config.nix index 5feef36..eaa5a2e 100644 --- a/modules/programs/hyprland/config.nix +++ b/modules/programs/hyprland/config.nix @@ -171,8 +171,6 @@ in bind = , XF86AudioNext , exec , playerctl -p "spotifyd,firefox" next bind = , XF86AudioPlay , exec , playerctl -p "spotifyd,firefox" play-pause bind = , XF86AudioPrev , exec , playerctl -p "spotifyd,firefox" previous - binde = , XF86MonBrightnessDown , exec , brightnessctl s 10%- - binde = , XF86MonBrightnessUp , exec , brightnessctl s 10%+ # Move focus with mainMod + hjkl binde = $mainMod, H, movefocus, l From 9df08be993a41b8820fc9602816015e81986d151 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Sun, 14 May 2023 15:29:09 +0200 Subject: [PATCH 4/4] feat(laptop): enable virtualisation --- hosts/nixos-laptop/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hosts/nixos-laptop/default.nix b/hosts/nixos-laptop/default.nix index 39725c7..543e7c7 100644 --- a/hosts/nixos-laptop/default.nix +++ b/hosts/nixos-laptop/default.nix @@ -10,6 +10,8 @@ ./hardware-configuration.nix ]; + my.virtualisation.libvirtd.enable = true; + # BOOT boot = { supportedFilesystems = [ "btrfs" ];