From d197e054ddd4feffcdfcfcd9a2ed1f1de9ea014a Mon Sep 17 00:00:00 2001 From: mrfluffy-dev Date: Mon, 13 Oct 2025 16:59:11 +0100 Subject: [PATCH] gg --- configuration.nix | 4 +-- dots/zsh.nix | 2 +- flake.lock | 60 ++++++++++++++++++++++----------------------- system/network.nix | 2 +- system/services.nix | 8 +++--- 5 files changed, 38 insertions(+), 38 deletions(-) diff --git a/configuration.nix b/configuration.nix index cd75f31..f2edd2c 100755 --- a/configuration.nix +++ b/configuration.nix @@ -42,14 +42,14 @@ in ############################################################################## nix.settings = { experimental-features = [ "nix-command" "flakes" ]; - build-dir = "/var/tmp"; + build-dir = "/nix/var/nix/builds"; auto-optimise-store = true; }; ############################################################################## # Desktop / WM ############################################################################## - programs.river.enable = useRiver; + programs.river-classic.enable = useRiver; qt = { enable = true; diff --git a/dots/zsh.nix b/dots/zsh.nix index 9490d6e..7a2ce81 100755 --- a/dots/zsh.nix +++ b/dots/zsh.nix @@ -7,7 +7,7 @@ { programs.zsh = { enable = true; - dotDir = ".config/zsh"; + dotDir = "${config.xdg.configHome}/zsh"; plugins = [ # pkgs.zsh-autosuggestions diff --git a/flake.lock b/flake.lock index 3b9d1d5..90cfaa6 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1759995371, - "narHash": "sha256-t3s7zhuW/qQJcrD1w85uC0gNEqlBdVj/3jOheFN5wTQ=", + "lastModified": 1760083914, + "narHash": "sha256-I9IMO9d+z71oeqOz6gOre07tK2Du3vp2FcOW3x4FDXw=", "owner": "Kirottu", "repo": "anyrun", - "rev": "09b0365e08a3c116856f6ce3159357f19d30ea3a", + "rev": "3050aa30e25957bbb9e1ac91a44d3979eccadf59", "type": "github" }, "original": { @@ -210,11 +210,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1759974693, - "narHash": "sha256-nFSdfKKpKDNrY/eQ7VAq6oNIKlwOFnJRIuvGdGHRC5Q=", + "lastModified": 1760147156, + "narHash": "sha256-ad+1gnp7Lm7jVSzqvGjMiwnA0P61dFZmp6HcRMXicWY=", "owner": "caelestia-dots", "repo": "cli", - "rev": "3f7f3bab15a357cf5503e73a7e29dfeea6c6a7e8", + "rev": "e9668d58f51e935094e50090b99301df8344f590", "type": "github" }, "original": { @@ -431,11 +431,11 @@ ] }, "locked": { - "lastModified": 1760005512, - "narHash": "sha256-xJ/pn6d9aYa9Eco+zjX7OoxSmaFf82q22u1Rjii9Bp0=", + "lastModified": 1760130406, + "narHash": "sha256-GKMwBaFRw/C1p1VtjDz4DyhyzjKUWyi1K50bh8lgA2E=", "owner": "nix-community", "repo": "home-manager", - "rev": "685d8d85d051820164c809fbbc4c67474ee93d67", + "rev": "d305eece827a3fe317a2d70138f53feccaf890a1", "type": "github" }, "original": { @@ -518,11 +518,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1759988134, - "narHash": "sha256-uVaAXjJgo2/uGJz6lD+Bn5nBBmW5AAr2n8lW7v7h0PI=", + "lastModified": 1760143218, + "narHash": "sha256-OhJPROcRcwBkjOKkXr/f3/7wuSjhAIqr8WfmEUF9Uuo=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "b965fb2a40b132209b58f511e2604a2939461818", + "rev": "d599513d4a72d66ac62ffdedc41d6653fa81b39e", "type": "github" }, "original": { @@ -734,11 +734,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1759909257, - "narHash": "sha256-ZGEBkK8ZQ370ifJO+1TOQ87m9Gmj52uzqcqysd/lolI=", + "lastModified": 1760121522, + "narHash": "sha256-8SGgpcZsMZIqFU+J/1OwebC/px8sgx5YYHNw1XkBM98=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "0d12957ebc8e272e3fc3830549edbb1ad63c34d4", + "rev": "17dbedb88a21142c41d120f139e2870bc56bb5f4", "type": "github" }, "original": { @@ -884,11 +884,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1760002388, - "narHash": "sha256-YzjYJlKoND2D6JswDGvdsrn43XvfW5brhBOmeQSnZaU=", + "lastModified": 1760145372, + "narHash": "sha256-DoYFmqHa/enkUcqJZ4vJ56cE9OdA/VZVPBDByAi4iLw=", "owner": "kaylorben", "repo": "nixcord", - "rev": "76d0063336d3a5be392fdb2c6c83d408356fd316", + "rev": "a875b64598bf15ae54ad4de539221359de1a2448", "type": "github" }, "original": { @@ -945,11 +945,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1759735786, - "narHash": "sha256-a0+h02lyP2KwSNrZz4wLJTu9ikujNsTWIC874Bv7IJ0=", + "lastModified": 1759994382, + "narHash": "sha256-wSK+3UkalDZRVHGCRikZ//CyZUJWDJkBDTQX1+G77Ow=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "20c4598c84a671783f741e02bf05cbfaf4907cff", + "rev": "5da4a26309e796daa7ffca72df93dbe53b8164c7", "type": "github" }, "original": { @@ -961,11 +961,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1759831965, - "narHash": "sha256-vgPm2xjOmKdZ0xKA6yLXPJpjOtQPHfaZDRtH+47XEBo=", + "lastModified": 1760038930, + "narHash": "sha256-Oncbh0UmHjSlxO7ErQDM3KM0A5/Znfofj2BSzlHLeVw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c9b6fb798541223bbb396d287d16f43520250518", + "rev": "0b4defa2584313f3b781240b29d61f6f9f7e0df3", "type": "github" }, "original": { @@ -993,11 +993,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1759831965, - "narHash": "sha256-vgPm2xjOmKdZ0xKA6yLXPJpjOtQPHfaZDRtH+47XEBo=", + "lastModified": 1760038930, + "narHash": "sha256-Oncbh0UmHjSlxO7ErQDM3KM0A5/Znfofj2BSzlHLeVw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c9b6fb798541223bbb396d287d16f43520250518", + "rev": "0b4defa2584313f3b781240b29d61f6f9f7e0df3", "type": "github" }, "original": { @@ -1025,11 +1025,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1759831965, - "narHash": "sha256-vgPm2xjOmKdZ0xKA6yLXPJpjOtQPHfaZDRtH+47XEBo=", + "lastModified": 1760038930, + "narHash": "sha256-Oncbh0UmHjSlxO7ErQDM3KM0A5/Znfofj2BSzlHLeVw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c9b6fb798541223bbb396d287d16f43520250518", + "rev": "0b4defa2584313f3b781240b29d61f6f9f7e0df3", "type": "github" }, "original": { diff --git a/system/network.nix b/system/network.nix index bfe04bc..b6ef5b0 100755 --- a/system/network.nix +++ b/system/network.nix @@ -44,7 +44,7 @@ in ''; # nameservers = [ ... ]; # Commented out to use DHCP-provided ones search = [ - "home.arpa" + "localdomain" "local" ]; diff --git a/system/services.nix b/system/services.nix index 62f3fd3..a429781 100755 --- a/system/services.nix +++ b/system/services.nix @@ -84,10 +84,10 @@ }; # Laptop-specific lid and sleep behavior - services.logind = lib.mkIf (systemName == "laptop") { - lidSwitch = "suspend-then-hibernate"; - lidSwitchExternalPower = "suspend-then-hibernate"; - lidSwitchDocked = "suspend-then-hibernate"; + services.logind.settings.Login = lib.mkIf (systemName == "laptop") { + HandleLidSwitch = "suspend-then-hibernate"; + HandleLidSwitchExternalPower = "suspend-then-hibernate"; + HandleLidSwitchDocked = "suspend-then-hibernate"; }; systemd.sleep.extraConfig = lib.mkIf (systemName == "laptop") ''