diff options
| -rw-r--r-- | flake.lock | 18 | ||||
| -rw-r--r-- | hosts/c-pc/configuration.nix | 3 | ||||
| -rw-r--r-- | hosts/c-pc/network.nix | 12 | ||||
| -rw-r--r-- | roles/desktop/default.nix | 4 | ||||
| -rw-r--r-- | roles/home/desktop/flameshot.nix | 8 |
5 files changed, 26 insertions, 19 deletions
@@ -41,11 +41,11 @@ ] }, "locked": { - "lastModified": 1722630065, - "narHash": "sha256-QfM/9BMRkCmgWzrPDK+KbgJOUlSJnfX4OvsUupEUZvA=", + "lastModified": 1737221749, + "narHash": "sha256-igllW0yG+UbetvhT11jnt9RppSHXYgMykYhZJeqfHs0=", "owner": "nix-community", "repo": "home-manager", - "rev": "afc892db74d65042031a093adb6010c4c3378422", + "rev": "97d7946b5e107dd03cc82f21165251d4e0159655", "type": "github" }, "original": { @@ -56,11 +56,11 @@ }, "impermanence": { "locked": { - "lastModified": 1719091691, - "narHash": "sha256-AxaLX5cBEcGtE02PeGsfscSb/fWMnyS7zMWBXQWDKbE=", + "lastModified": 1736688610, + "narHash": "sha256-1Zl9xahw399UiZSJ9Vxs1W4WRFjO1SsNdVZQD4nghz0=", "owner": "nix-community", "repo": "impermanence", - "rev": "23c1f06316b67cb5dabdfe2973da3785cfe9c34a", + "rev": "c64bed13b562fc3bb454b48773d4155023ac31b7", "type": "github" }, "original": { @@ -107,11 +107,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1722630782, - "narHash": "sha256-hMyG9/WlUi0Ho9VkRrrez7SeNlDzLxalm9FwY7n/Noo=", + "lastModified": 1737062831, + "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d04953086551086b44b6f3c6b7eeb26294f207da", + "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", "type": "github" }, "original": { diff --git a/hosts/c-pc/configuration.nix b/hosts/c-pc/configuration.nix index 364ebf5..6101fe8 100644 --- a/hosts/c-pc/configuration.nix +++ b/hosts/c-pc/configuration.nix @@ -49,8 +49,7 @@ nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "steam" - "steam-original" - "steam-run" + "steam-unwrapped" ]; roles = { diff --git a/hosts/c-pc/network.nix b/hosts/c-pc/network.nix index c2b5365..969b49f 100644 --- a/hosts/c-pc/network.nix +++ b/hosts/c-pc/network.nix @@ -9,11 +9,9 @@ wireless = { enable = true; - - environmentFile = "/secrets/wireless.env"; - networks = { - "@SSID@".psk = "@PSK@"; - }; + + # Import /etc/wpa_supplicant.conf networks + allowAuxiliaryImperativeNetworks = true; }; firewall = { @@ -23,4 +21,8 @@ allowedUDPPorts = [ ]; }; }; + + environment.etc."wpa_supplicant.conf" = { + source = "/secrets/wireless.conf"; + }; } diff --git a/roles/desktop/default.nix b/roles/desktop/default.nix index cfa5294..7acd1d8 100644 --- a/roles/desktop/default.nix +++ b/roles/desktop/default.nix @@ -58,15 +58,13 @@ let cfg = config.roles.desktop; in { fonts = { packages = with pkgs; [ - nerdfonts noto-fonts - noto-fonts-cjk noto-fonts-cjk-sans noto-fonts-cjk-serif noto-fonts-emoji minecraftia - ]; + ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts); fontconfig = { defaultFonts = { diff --git a/roles/home/desktop/flameshot.nix b/roles/home/desktop/flameshot.nix index d7f6e1f..d079fc9 100644 --- a/roles/home/desktop/flameshot.nix +++ b/roles/home/desktop/flameshot.nix @@ -16,4 +16,12 @@ }; }; }; + + #TODO: relocate. target.tray required for flameshot + systemd.user.targets.tray = { + Unit = { + Description = "Home Manager System Tray"; + Requires = [ "graphical-session-pre.target" ]; + }; + }; } |