From 1eb67ac0ded33cf2945b43f4998e12986ca9b69f Mon Sep 17 00:00:00 2001 From: Lilith Date: Mon, 17 Mar 2025 21:04:49 +0100 Subject: [PATCH] hyprgrass --- flake.lock | 18 +++++++++--------- home/lilith/hyprland/default.nix | 15 ++++++--------- home/lilith/hyprland/hyprgrass.nix | 4 ++++ system/core/nix.nix | 23 ++++++++++++++++++++--- system/core/persistence.nix | 24 ++++++++++++++---------- system/core/ssh.nix | 3 +++ system/optional/desktop.nix | 2 +- 7 files changed, 57 insertions(+), 32 deletions(-) create mode 100644 home/lilith/hyprland/hyprgrass.nix diff --git a/flake.lock b/flake.lock index 2a496250..24fbbe01 100644 --- a/flake.lock +++ b/flake.lock @@ -341,11 +341,11 @@ ] }, "locked": { - "lastModified": 1741955947, - "narHash": "sha256-2lbURKclgKqBNm7hVRtWh0A7NrdsibD0EaWhahUVhhY=", + "lastModified": 1742238842, + "narHash": "sha256-Z79yUJi+UGSpRC90NbHyuvBjGLkgEtlZaJ8DtzaGkzE=", "owner": "nix-community", "repo": "home-manager", - "rev": "4e12151c9e014e2449e0beca2c0e9534b96a26b4", + "rev": "5a6e5a59a4d332edaa7d5d1604eb58ead27af851", "type": "github" }, "original": { @@ -804,11 +804,11 @@ ] }, "locked": { - "lastModified": 1742209060, - "narHash": "sha256-47/1bOPBGhmAegF06nxLN15d/MClCAkk8s/+WOhJJAM=", + "lastModified": 1742239755, + "narHash": "sha256-ptn8dR4Uat3UUadGYNnB7CIH9SQm8mK69D2A/twBUXQ=", "owner": "Mic92", "repo": "sops-nix", - "rev": "b33837ae3cfa012b65810891bebbee71fa4c0658", + "rev": "787afce414bcce803b605c510b60bf43c11f4b55", "type": "github" }, "original": { @@ -845,11 +845,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1742040559, - "narHash": "sha256-Hb3aw00C1/5ORiTCASwMd8vcLAl/GNJfyjXZyl/EKpc=", + "lastModified": 1742234510, + "narHash": "sha256-dQoo4XivjZuJiSi8ePv9CuP0ncE64RLyz2vb46blRx0=", "owner": "danth", "repo": "stylix", - "rev": "bcc674f1994396137438bac9d905971453d33b12", + "rev": "fa288c0dc695b49c9af38614af8da981371fe92a", "type": "github" }, "original": { diff --git a/home/lilith/hyprland/default.nix b/home/lilith/hyprland/default.nix index bb95eb32..da7cb9c4 100644 --- a/home/lilith/hyprland/default.nix +++ b/home/lilith/hyprland/default.nix @@ -1,9 +1,10 @@ -{ lib, ...}: { +{ lib, ... }: +{ imports = [ ./hyprpaper.nix ./hyprlock.nix -# ./hyprgrass.nix -# ./utils.nix + ./hyprgrass.nix + # ./utils.nix ]; wayland.windowManager.hyprland = { @@ -16,15 +17,11 @@ settings = { "$terminal" = "alacritty"; - env = [ - "HYPRCURSOR_THEME,rose-pine-hyprcursor" - ]; + env = [ "HYPRCURSOR_THEME,rose-pine-hyprcursor" ]; xwayland.force_zero_scaling = true; - monitor = [ - ",preferred,1" - ]; + monitor = [ ",preferred,1" ]; exec-once = [ "hyprlock" diff --git a/home/lilith/hyprland/hyprgrass.nix b/home/lilith/hyprland/hyprgrass.nix new file mode 100644 index 00000000..e8fd84c3 --- /dev/null +++ b/home/lilith/hyprland/hyprgrass.nix @@ -0,0 +1,4 @@ +{ pkgs, hyprgrass, ... }: +{ + wayland.windowManager.hyprland.plugins = [ hyprgrass.packages.${pkgs.system}.default ]; +} diff --git a/system/core/nix.nix b/system/core/nix.nix index 870b737e..61724ee3 100644 --- a/system/core/nix.nix +++ b/system/core/nix.nix @@ -1,4 +1,5 @@ -{...}: { +{ ... }: +{ nix = { gc = { automatic = true; @@ -8,8 +9,24 @@ settings = { keep-outputs = true; auto-optimise-store = true; - experimental-features = ["nix-command" "flakes"]; - trusted-users = ["root" "@wheel"]; + experimental-features = [ + "nix-command" + "flakes" + ]; + trusted-users = [ + "root" + "@wheel" + ]; + + builders-use-substitutes = true; }; + + distributedBuilds = true; + buildMachines = [ + { + hostName = "lilith-server-builder"; + system = "x86_64-linux"; + } + ]; }; } diff --git a/system/core/persistence.nix b/system/core/persistence.nix index d4d55aa7..a695ec34 100644 --- a/system/core/persistence.nix +++ b/system/core/persistence.nix @@ -1,5 +1,12 @@ -{impermanence, conf, lib, config, ...}: { - imports = [impermanence.nixosModule]; +{ + impermanence, + conf, + lib, + config, + ... +}: +{ + imports = [ impermanence.nixosModule ]; environment.persistence."/persist/data" = { hideMounts = true; @@ -7,20 +14,20 @@ "/etc/NetworkManager/system-connections" "/var/lib/bluetooth" ]; - files = []; + files = [ ]; users.lilith = { directories = [ ".config/syncthing" ".config/sops" ".config/keepassxc" - ".config/obsidian" ".config/vesktop" ".gnupg" ".ssh" ".thunderbird" ".mozilla" + ".zen" "nixos" "sync" @@ -31,7 +38,7 @@ ".local/share/lutris" ".local/share/games" ]; - files = []; + files = [ ]; }; }; @@ -45,9 +52,7 @@ "/var/lib/systemd/timers" "/var/log" ]; - files = [ - "/etc/machine-id" - ]; + files = [ "/etc/machine-id" ]; users.lilith = { directories = [ @@ -55,9 +60,8 @@ ".cache/keepassxc" ".cargo" ".local/state/wireplumber" - "tmp" ]; - files = []; + files = [ ]; }; }; } diff --git a/system/core/ssh.nix b/system/core/ssh.nix index bf68f6eb..9d0d27f1 100644 --- a/system/core/ssh.nix +++ b/system/core/ssh.nix @@ -14,6 +14,9 @@ PermitRootLogin = "no"; PasswordAuthentication = false; }; + }; + + programs.ssh = { extraConfig = '' Host lilith-server-builder HostName 2a01:4f9:4a:1ecb::2 diff --git a/system/optional/desktop.nix b/system/optional/desktop.nix index ab6ed1e0..4bd14a46 100644 --- a/system/optional/desktop.nix +++ b/system/optional/desktop.nix @@ -17,7 +17,7 @@ services.dbus.enable = true; programs.hyprland.enable = true; - programs.hyprland.package = hyprland.packages.${pkgs.stdenv.system}.hyprland; + programs.hyprland.package = hyprland.packages.${pkgs.system}.hyprland; services.greetd = { enable = true;