diff --git a/flake.nix b/flake.nix index 42b01c9..f56a62e 100644 --- a/flake.nix +++ b/flake.nix @@ -58,20 +58,14 @@ }; # configure pkgs - # use nixpkgs if running a server (homelab or worklab profile) - # otherwise use patched nixos-unstable nixpkgs - pkgs = (if ((systemSettings.profile == "homelab") || (systemSettings.profile == "worklab")) - then - pkgs-stable - else - (import nixpkgs-patched { - system = systemSettings.system; - config = { - allowUnfree = true; - allowUnfreePredicate = (_: true); - }; - overlays = [ rust-overlay.overlays.default ]; - })); + pkgs = import nixpkgs-patched { + system = systemSettings.system; + config = { + allowUnfree = true; + allowUnfreePredicate = (_: true); + }; + overlays = [ rust-overlay.overlays.default ]; + }; pkgs-stable = import nixpkgs-stable { system = systemSettings.system; @@ -90,13 +84,7 @@ }; # configure lib - # use nixpkgs if running a server (homelab or worklab profile) - # otherwise use patched nixos-unstable nixpkgs - lib = (if ((systemSettings.profile == "homelab") || (systemSettings.profile == "worklab")) - then - nixpkgs-stable.lib - else - nixpkgs.lib); + lib = nixpkgs.lib; # Systems that can run tests: supportedSystems = [ "aarch64-linux" "i686-linux" "x86_64-linux" ]; diff --git a/user/wm/hyprland/hyprland.nix b/user/wm/hyprland/hyprland.nix index e6cf8a3..5cfa622 100644 --- a/user/wm/hyprland/hyprland.nix +++ b/user/wm/hyprland/hyprland.nix @@ -42,7 +42,6 @@ exec-once = emacs --daemon exec-once = hypridle - #exec-once = hyprdim # currently broken :( exec-once = obs-notification-mute-daemon exec = ~/.swaybg-stylix @@ -138,8 +137,7 @@ bind=SUPER,C,exec,wl-copy $(hyprpicker) bind=SUPERSHIFT,S,exec,systemctl suspend - bindl=,switch:on:Lid Switch,exec,loginctl lock-session - bind=SUPERCTRL,L,exec,loginctl lock-session + bind=SUPERCTRL,L,exec,hyprlock bind=SUPER,H,movefocus,l bind=SUPER,J,movefocus,d @@ -295,7 +293,6 @@ hypridle hyprlock hyprnome - hyprdim swaybg fnott fuzzel @@ -388,13 +385,9 @@ ignore_dbus_inhibit = false } - listener { - timeout = 300 # in seconds - on-timeout = loginctl lock-session - } listener { timeout = 600 # in seconds - on-timeout = systemctl suspend + on-timeout = loginctl lock-session } ''; home.file.".config/hypr/hyprlock.conf".text = ''