From 5718c8ca6dd84fb313b012d063a72da2e3cd919e Mon Sep 17 00:00:00 2001 From: TheWanderingCrow Date: Mon, 1 Dec 2025 08:24:10 -0500 Subject: [PATCH] NixOS 25.11 migration --- flake.lock | 200 +++------------ flake.nix | 9 +- home/crow/common/core/default.nix | 15 +- home/crow/common/optional/comms/default.nix | 2 +- home/crow/common/optional/desktops/niri.nix | 229 ------------------ hosts/common/core/editor.nix | 18 +- hosts/common/core/fonts.nix | 3 +- hosts/common/core/ssh.nix | 3 +- hosts/nixos/HandlerOne/default.nix | 2 +- .../nixos/Natsirt/hardware-configuration.nix | 30 ++- hosts/nixos/Parzival/default.nix | 2 - .../nixos/Parzival/hardware-configuration.nix | 1 - modules/services/matrix/default.nix | 4 - modules/services/trilium/default.nix | 12 - nixos-bootstrap/installer-config.nix | 26 +- overlays/default.nix | 14 +- 16 files changed, 107 insertions(+), 463 deletions(-) delete mode 100644 home/crow/common/optional/desktops/niri.nix diff --git a/flake.lock b/flake.lock index 09a003e..14c0586 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1764017209, - "narHash": "sha256-RoJGCtKExXXkNCZUmmxezG3eOczEOTBw38DaZGSYJC0=", + "lastModified": 1764350888, + "narHash": "sha256-6Rp18zavTlnlZzcoLoBTJMBahL2FycVkw2rAEs3cQvo=", "owner": "nix-community", "repo": "disko", - "rev": "ec8eabe00c4ee9a2ddc50162c125f0ec2a7099e1", + "rev": "2055a08fd0e2fd41318279a5355eb8a161accf26", "type": "github" }, "original": { @@ -78,11 +78,11 @@ }, "hardware": { "locked": { - "lastModified": 1764080039, - "narHash": "sha256-b1MtLQsQc4Ji1u08f+C6g5XrmLPkJQ1fhNkCt+0AERQ=", + "lastModified": 1764440730, + "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "da17006633ca9cda369be82893ae36824a2ddf1a", + "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3", "type": "github" }, "original": { @@ -98,16 +98,16 @@ ] }, "locked": { - "lastModified": 1763992789, - "narHash": "sha256-WHkdBlw6oyxXIra/vQPYLtqY+3G8dUVZM8bEXk0t8x4=", + "lastModified": 1764536451, + "narHash": "sha256-BgtcUkBfItu9/yU14IgUaj4rYOanTOUZjUfBP20/ZB4=", "owner": "nix-community", "repo": "home-manager", - "rev": "44831a7eaba4360fb81f2acc5ea6de5fde90aaa3", + "rev": "3fdd076e08049a9c7a83149b270440d9787d2df5", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.05", + "ref": "release-25.11", "repo": "home-manager", "type": "github" } @@ -163,62 +163,6 @@ "type": "github" } }, - "niri-flake": { - "inputs": { - "niri-stable": "niri-stable", - "niri-unstable": "niri-unstable", - "nixpkgs": "nixpkgs_3", - "nixpkgs-stable": "nixpkgs-stable", - "xwayland-satellite-stable": "xwayland-satellite-stable", - "xwayland-satellite-unstable": "xwayland-satellite-unstable" - }, - "locked": { - "lastModified": 1764081740, - "narHash": "sha256-eeQzyHJjSQTxcjSCy1OgOgNAUjdBnIjSYntfJK0Z4+I=", - "owner": "sodiboo", - "repo": "niri-flake", - "rev": "e579b1a51f26341eeeb41e32d5b5c6e2a032e339", - "type": "github" - }, - "original": { - "owner": "sodiboo", - "repo": "niri-flake", - "type": "github" - } - }, - "niri-stable": { - "flake": false, - "locked": { - "lastModified": 1756556321, - "narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=", - "owner": "YaLTeR", - "repo": "niri", - "rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294", - "type": "github" - }, - "original": { - "owner": "YaLTeR", - "ref": "v25.08", - "repo": "niri", - "type": "github" - } - }, - "niri-unstable": { - "flake": false, - "locked": { - "lastModified": 1764046829, - "narHash": "sha256-XFSR43nAKXDMhtNa+V2sd6Url/bCPGwawkmCqUKKRfI=", - "owner": "YaLTeR", - "repo": "niri", - "rev": "54c7fdcd1adcfade596aca1070062f3f0fb5d4d0", - "type": "github" - }, - "original": { - "owner": "YaLTeR", - "repo": "niri", - "type": "github" - } - }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -226,11 +170,11 @@ ] }, "locked": { - "lastModified": 1763505477, - "narHash": "sha256-nJRd4LY2kT3OELfHqdgWjvToNZ4w+zKCMzS2R6z4sXE=", + "lastModified": 1764161084, + "narHash": "sha256-HN84sByg9FhJnojkGGDSrcjcbeioFWoNXfuyYfJ1kBE=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "3bda9f6b14161becbd07b3c56411f1670e19b9b5", + "rev": "e95de00a471d07435e0527ff4db092c84998698e", "type": "github" }, "original": { @@ -241,7 +185,7 @@ }, "nix-secrets": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1763998918, @@ -275,59 +219,43 @@ }, "nixpkgs-darwin": { "locked": { - "lastModified": 1764018730, - "narHash": "sha256-ytszH039PHJ9HhUiH2i17ewZ+s8io9IdEBh9mtnTNQ0=", + "lastModified": 1764572236, + "narHash": "sha256-hLp6T/vKdrBQolpbN3EhJOKTXZYxJZPzpnoZz+fEGlE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "48ac51dd5d116984766707fd5c5661477a053b00", + "rev": "b0924ea1889b366de6bb0018a9db70b2c43a15f8", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixpkgs-25.05-darwin", + "ref": "nixpkgs-25.11-darwin", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1763948260, - "narHash": "sha256-dY9qLD0H0zOUgU3vWacPY6Qc421BeQAfm8kBuBtPVE0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1c8ba8d3f7634acac4a2094eef7c32ad9106532c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1763948260, - "narHash": "sha256-dY9qLD0H0zOUgU3vWacPY6Qc421BeQAfm8kBuBtPVE0=", + "lastModified": 1764522689, + "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1c8ba8d3f7634acac4a2094eef7c32ad9106532c", + "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1763966396, - "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=", + "lastModified": 1764517877, + "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a", + "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", "type": "github" }, "original": { @@ -354,22 +282,6 @@ } }, "nixpkgs_3": { - "locked": { - "lastModified": 1763966396, - "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1750605355, "narHash": "sha256-xT8cPLTxlktxI9vSdoBlAVK7dXgd8IK59j7ZwzkkhnI=", @@ -383,23 +295,23 @@ "type": "indirect" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { - "lastModified": 1763948260, - "narHash": "sha256-dY9qLD0H0zOUgU3vWacPY6Qc421BeQAfm8kBuBtPVE0=", + "lastModified": 1764522689, + "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1c8ba8d3f7634acac4a2094eef7c32ad9106532c", + "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1757745802, "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", @@ -415,7 +327,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1756696532, "narHash": "sha256-6FWagzm0b7I/IGigOv9pr6LL7NQ86mextfE8g8Q6HBg=", @@ -436,7 +348,7 @@ "flake-compat": "flake-compat", "flake-parts": "flake-parts", "mnw": "mnw", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_6", "systems": "systems_2" }, "locked": { @@ -455,7 +367,7 @@ }, "nvix": { "inputs": { - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "nvf": "nvf" }, "locked": { @@ -479,12 +391,11 @@ "home-manager": "home-manager", "iamb-flake": "iamb-flake", "impermanence": "impermanence", - "niri-flake": "niri-flake", "nix-darwin": "nix-darwin", "nix-secrets": "nix-secrets", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nixpkgs-darwin": "nixpkgs-darwin", - "nixpkgs-stable": "nixpkgs-stable_2", + "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": "nixpkgs-unstable", "nvix": "nvix", "sops-nix": "sops-nix" @@ -515,11 +426,11 @@ ] }, "locked": { - "lastModified": 1764021963, - "narHash": "sha256-1m84V2ROwNEbqeS9t37/mkry23GBhfMt8qb6aHHmjuc=", + "lastModified": 1764483358, + "narHash": "sha256-EyyvCzXoHrbL467YSsQBTWWg4sR96MH1sPpKoSOelB4=", "owner": "mic92", "repo": "sops-nix", - "rev": "c482a1c1bbe030be6688ed7dc84f7213f304f1ec", + "rev": "5aca6ff67264321d47856a2ed183729271107c9c", "type": "github" }, "original": { @@ -557,39 +468,6 @@ "repo": "default", "type": "github" } - }, - "xwayland-satellite-stable": { - "flake": false, - "locked": { - "lastModified": 1755491097, - "narHash": "sha256-m+9tUfsmBeF2Gn4HWa6vSITZ4Gz1eA1F5Kh62B0N4oE=", - "owner": "Supreeeme", - "repo": "xwayland-satellite", - "rev": "388d291e82ffbc73be18169d39470f340707edaa", - "type": "github" - }, - "original": { - "owner": "Supreeeme", - "ref": "v0.7", - "repo": "xwayland-satellite", - "type": "github" - } - }, - "xwayland-satellite-unstable": { - "flake": false, - "locked": { - "lastModified": 1763704521, - "narHash": "sha256-ceYEV6PnvUN8Zixao4gpPuN+VT3B0SlAXKuPNHZhqUY=", - "owner": "Supreeeme", - "repo": "xwayland-satellite", - "rev": "f379ff5722a821212eb59ada9cf8e51cb3654aad", - "type": "github" - }, - "original": { - "owner": "Supreeeme", - "repo": "xwayland-satellite", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index e9404c9..6136468 100644 --- a/flake.nix +++ b/flake.nix @@ -84,20 +84,20 @@ inputs = { # Official inputs - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; - nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; + nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.11"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; hardware.url = "github:nixos/nixos-hardware"; - nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-25.05-darwin"; + nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-25.11-darwin"; nix-darwin = { url = "github:lnl7/nix-darwin"; inputs.nixpkgs.follows = "nixpkgs-darwin"; }; home-manager = { - url = "github:nix-community/home-manager/release-25.05"; + url = "github:nix-community/home-manager/release-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; impermanence.url = "github:nix-community/impermanence"; @@ -114,7 +114,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - niri-flake.url = "github:sodiboo/niri-flake"; iamb-flake.url = "github:ulyssa/iamb/v0.0.11-alpha.1"; # CrOS inputs diff --git a/home/crow/common/core/default.nix b/home/crow/common/core/default.nix index d87f96e..cedf856 100644 --- a/home/crow/common/core/default.nix +++ b/home/crow/common/core/default.nix @@ -4,12 +4,11 @@ pkgs, hostSpec, ... -}: let - platform = - if hostSpec.isDarwin - then "darwin" - else "nixos"; -in { +}: +let + platform = if hostSpec.isDarwin then "darwin" else "nixos"; +in +{ imports = lib.flatten [ (map lib.custom.relativeToRoot [ "modules/common/host-spec.nix" @@ -25,15 +24,13 @@ in { ]; home.packages = builtins.attrValues { - inherit - (pkgs) + inherit (pkgs) screen ouch bitwarden-cli yaak vimgolf httpie - protonvpn-cli protonvpn-gui ; }; diff --git a/home/crow/common/optional/comms/default.nix b/home/crow/common/optional/comms/default.nix index 7685fc3..e99dd2c 100644 --- a/home/crow/common/optional/comms/default.nix +++ b/home/crow/common/optional/comms/default.nix @@ -16,7 +16,7 @@ slack zoom ; - inherit (inputs.iamb-flake.packages.${pkgs.system}) + inherit (inputs.iamb-flake.packages.${pkgs.stdenv.hostPlatform.system}) default ; }; diff --git a/home/crow/common/optional/desktops/niri.nix b/home/crow/common/optional/desktops/niri.nix deleted file mode 100644 index 38b812e..0000000 --- a/home/crow/common/optional/desktops/niri.nix +++ /dev/null @@ -1,229 +0,0 @@ -{ - pkgs, - inputs, - config, - ... -}: { - imports = [ - inputs.niri-flake.homeModules.niri - ./sway/waybar.nix - ./swww - ]; - nixpkgs.overlays = [ - inputs.niri-flake.overlays.niri - ]; - - home.packages = with pkgs; [ - foot - wofi - swaynotificationcenter - polkit_gnome - swayidle - sway-audio-idle-inhibit - sway-contrib.grimshot - waybar - wl-clipboard - hyprlock - grim - slurp - swappy - wljoywake - pulseaudio - playerctl - brightnessctl - ]; - - programs.niri = { - enable = true; - settings = { - binds = with config.lib.niri.actions; { - # Shortcuts - "Mod+Shift+Slash".action = show-hotkey-overlay; - "Mod+Return" = { - hotkey-overlay.title = "Open terminal"; - action = spawn "foot"; - }; - "Mod+D" = { - hotkey-overlay.title = "Open Application Picker"; - action = spawn "wofi" "--show" "run"; - }; - "Mod+Shift+Z" = { - hotkey-overlay.title = "Lock computer"; - action = spawn ""; - }; - "Mod+Shift+E" = { - action = quit; - }; - "Mod+O" = { - action = toggle-overview; - }; - # Audio Control - XF86AudioRaiseVolume = { - action = spawn "pactl" "set-sink-volume" "@DEFAULT_SINK@" "+5%"; - allow-when-locked = true; - }; - XF86AudioLowerVolume = { - action = spawn "pactl" "set-sink-volume" "@DEFAULT_SINK@" "-5%"; - allow-when-locked = true; - }; - XF86AudioMute = { - action = spawn "pactl" "set-sink-mute" "@DEFAULT_SINK@" "toggle"; - allow-when-locked = true; - }; - XF86AudioMicMute = { - action = spawn "pulseaudio-ctl" "mute-input"; - allow-when-locked = true; - }; - XF86AudioPlay = { - action = spawn "playerctl" "play-pause"; - allow-when-locked = true; - }; - XF86AudioNext = { - action = spawn "playerctl" "next"; - allow-when-locked = true; - }; - XF86AudioPrev = { - action = spawn "playerctl" "previous"; - allow-when-locked = true; - }; - # Brightness Control - XF86MonBrightnessUp = { - action = spawn "brightnessctl" "s" "+5%"; - allow-when-locked = true; - }; - XF86MonBrightnessDown = { - action = spawn "brightnessctl" "s" "-5%"; - allow-when-locked = true; - }; - # Application Controls - "Mod+Shift+Q" = { - action = close-window; - }; - - # Window switching (vim style) - "Mod+H" = {action = focus-column-left;}; - "Mod+J" = {action = focus-window-down;}; - "Mod+K" = {action = focus-window-up;}; - "Mod+L" = {action = focus-column-right;}; - - # Window moving - "Mod+Ctrl+H" = {action = move-column-left;}; - "Mod+Ctrl+J" = {action = move-window-down;}; - "Mod+Ctrl+K" = {action = move-window-up;}; - "Mod+Ctrl+L" = {action = move-column-right;}; - "Mod+Home" = {action = focus-column-first;}; - "Mod+End" = {action = focus-column-last;}; - "Mod+Ctrl+Home" = {action = move-column-to-first;}; - "Mod+Ctrl+End" = {action = move-column-to-last;}; - - # Monitor switching - "Mod+Shift+H" = {action = focus-monitor-left;}; - "Mod+Shift+J" = {action = focus-monitor-down;}; - "Mod+Shift+K" = {action = focus-monitor-up;}; - "Mod+Shift+L" = {action = focus-monitor-right;}; - - "Mod+Shift+Ctrl+H" = {action = move-column-to-monitor-left;}; - "Mod+Shift+Ctrl+J" = {action = move-column-to-monitor-down;}; - "Mod+Shift+Ctrl+K" = {action = move-column-to-monitor-up;}; - "Mod+Shift+Ctrl+L" = {action = move-column-to-monitor-right;}; - - # Workspace switching - "Mod+U" = {action = focus-workspace-up;}; - "Mod+I" = {action = focus-workspace-down;}; - "Mod+Ctrl+U" = {action = move-column-to-workspace-up;}; - "Mod+Ctrl+I" = {action = move-column-to-workspace-down;}; - - "Mod+Shift+U" = {action = move-workspace-up;}; - "Mod+Shift+I" = {action = move-workspace-down;}; - - "Mod+WheelScrollDown" = { - action = focus-workspace-down; - cooldown-ms = 150; - }; - "Mod+WheelScrollUp" = { - action = focus-workspace-up; - cooldown-ms = 150; - }; - "Mod+Ctrl+WheelScrollDown" = { - action = move-column-to-workspace-down; - cooldown-ms = 150; - }; - "Mod+Ctrl+WheelScrollUp" = { - action = move-column-to-workspace-up; - cooldown-ms = 150; - }; - - "Mod+WheelScrollRight" = {action = focus-column-right;}; - "Mod+WheelScrollLeft" = {action = focus-column-left;}; - "Mod+Ctrl+WheelScrollRight" = {action = move-column-right;}; - "Mod+Ctrl+WheelScrollLeft" = {action = move-column-left;}; - - "Mod+Shift+WheelScrollDown" = {action = focus-column-right;}; - "Mod+Shift+WheelScrollUp" = {action = focus-column-left;}; - "Mod+Ctrl+Shift+WheelScrollDown" = {action = move-column-right;}; - "Mod+Ctrl+Shift+WheelScrollUp" = {action = move-column-left;}; - - "Mod+1" = {action = focus-workspace 1;}; - "Mod+2" = {action = focus-workspace 2;}; - "Mod+3" = {action = focus-workspace 3;}; - "Mod+4" = {action = focus-workspace 4;}; - "Mod+5" = {action = focus-workspace 5;}; - "Mod+6" = {action = focus-workspace 6;}; - "Mod+7" = {action = focus-workspace 7;}; - "Mod+8" = {action = focus-workspace 8;}; - "Mod+9" = {action = focus-workspace 9;}; - - "Mod+BracketLeft" = {action = consume-or-expel-window-left;}; - "Mod+BracketRight" = {action = consume-or-expel-window-right;}; - - "Mod+Comma" = {action = consume-window-into-column;}; - - "Mod+Period" = {action = expel-window-from-column;}; - - "Mod+R" = {action = switch-preset-column-width;}; - "Mod+Shift+R" = {action = switch-preset-window-height;}; - "Mod+Ctrl+R" = {action = reset-window-height;}; - "Mod+F" = {action = maximize-column;}; - "Mod+Shift+F" = {action = fullscreen-window;}; - - "Mod+Ctrl+F" = {action = expand-column-to-available-width;}; - - "Mod+C" = {action = center-column;}; - - "Mod+Ctrl+C" = {action = center-visible-columns;}; - - "Mod+Minus" = {action = set-column-width "-10%";}; - "Mod+Equal" = {action = set-column-width "+10%";}; - - "Mod+Shift+Minus" = {action = set-window-height "-10%";}; - "Mod+Shift+Equal" = {action = set-window-height "+10%";}; - - "Mod+V" = {action = toggle-window-floating;}; - "Mod+Shift+V" = {action = switch-focus-between-floating-and-tiling;}; - - "Mod+W" = {action = toggle-column-tabbed-display;}; - - "Mod+Escape" = { - action = toggle-keyboard-shortcuts-inhibit; - allow-inhibiting = false; - }; - }; - input = { - keyboard = { - numlock = true; - }; - touchpad = { - tap = false; - natural-scroll = true; - click-method = "button-areas"; - }; - }; - layout = { - gaps = 16; - }; - spawn-at-startup = [ - {command = ["waybar"];} - ]; - }; - }; -} diff --git a/hosts/common/core/editor.nix b/hosts/common/core/editor.nix index 8a65000..6bfd4ba 100644 --- a/hosts/common/core/editor.nix +++ b/hosts/common/core/editor.nix @@ -3,13 +3,15 @@ pkgs, inputs, ... -}: { +}: +{ environment.systemPackages = - if config.hostSpec.isMinimal - then [ - inputs.nvix.packages.${pkgs.system}.mini - ] - else [ - inputs.nvix.packages.${pkgs.system}.default - ]; + if config.hostSpec.isMinimal then + [ + inputs.nvix.packages.${pkgs.stdenv.hostPlatform.system}.mini + ] + else + [ + inputs.nvix.packages.${pkgs.stdenv.hostPlatform.system}.default + ]; } diff --git a/hosts/common/core/fonts.nix b/hosts/common/core/fonts.nix index e145814..4917302 100644 --- a/hosts/common/core/fonts.nix +++ b/hosts/common/core/fonts.nix @@ -10,8 +10,7 @@ lib.mkIf (!config.hostSpec.isMinimal) { # Emoji and general symbols noto-fonts noto-fonts-cjk-sans - noto-fonts-emoji - noto-fonts-extra + noto-fonts-color-emoji unifont # Nerd fonts diff --git a/hosts/common/core/ssh.nix b/hosts/common/core/ssh.nix index 717dc86..6193f07 100644 --- a/hosts/common/core/ssh.nix +++ b/hosts/common/core/ssh.nix @@ -4,7 +4,8 @@ lib, pkgs, ... -}: { +}: +{ # Setup access to protected repos via our host ssh key environment.etc."ssh/root_config".text = '' Host github.com diff --git a/hosts/nixos/HandlerOne/default.nix b/hosts/nixos/HandlerOne/default.nix index 0c03cd2..c3f5ea6 100644 --- a/hosts/nixos/HandlerOne/default.nix +++ b/hosts/nixos/HandlerOne/default.nix @@ -92,7 +92,7 @@ acmeCA = "https://acme-v02.api.letsencrypt.org/directory"; package = pkgs.caddy.withPlugins { plugins = [ "github.com/greenpau/caddy-security@v1.1.31" ]; - hash = "sha256-6WJ403U6XbaNfncIvEJEwUc489yyRhv4jP7H/RVJWlM="; + hash = "sha256-65Z20N16/jHOtVb85HLx0z4nHEuG9POEV7D5QXOGYQM="; }; }; } diff --git a/hosts/nixos/Natsirt/hardware-configuration.nix b/hosts/nixos/Natsirt/hardware-configuration.nix index c08bd4b..353ee7d 100644 --- a/hosts/nixos/Natsirt/hardware-configuration.nix +++ b/hosts/nixos/Natsirt/hardware-configuration.nix @@ -7,15 +7,23 @@ pkgs, modulesPath, ... -}: { +}: +{ imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"]; - boot.initrd.kernelModules = ["amdgpu"]; - boot.kernelModules = ["kvm-amd"]; - boot.extraModulePackages = []; + boot.initrd.availableKernelModules = [ + "nvme" + "xhci_pci" + "ahci" + "usb_storage" + "usbhid" + "sd_mod" + ]; + boot.initrd.kernelModules = [ "amdgpu" ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; fileSystems."/" = { device = "/dev/disk/by-uuid/b1a6e175-8510-47d1-94b1-db74d050fe05"; @@ -25,10 +33,13 @@ fileSystems."/boot" = { device = "/dev/disk/by-uuid/8082-C66D"; fsType = "vfat"; - options = ["fmask=0077" "dmask=0077"]; + options = [ + "fmask=0077" + "dmask=0077" + ]; }; - swapDevices = []; + swapDevices = [ ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's @@ -43,11 +54,6 @@ initrd.enable = true; legacySupport.enable = true; opencl.enable = true; - amdvlk = { - enable = true; - supportExperimental.enable = true; - support32Bit.enable = true; - }; }; hardware.graphics.enable32Bit = true; } diff --git a/hosts/nixos/Parzival/default.nix b/hosts/nixos/Parzival/default.nix index a886bb8..d16a6f0 100644 --- a/hosts/nixos/Parzival/default.nix +++ b/hosts/nixos/Parzival/default.nix @@ -39,8 +39,6 @@ "hosts/common/optional/vbox.nix" "hosts/common/optional/printing.nix" "hosts/common/optional/docker.nix" - "hosts/common/optional/services/monero/node.nix" - "hosts/common/optional/services/monero/miner.nix" "modules/services/ollama" "modules/services/mesh/client.nix" ]) diff --git a/hosts/nixos/Parzival/hardware-configuration.nix b/hosts/nixos/Parzival/hardware-configuration.nix index 4eb5d9c..171fb80 100644 --- a/hosts/nixos/Parzival/hardware-configuration.nix +++ b/hosts/nixos/Parzival/hardware-configuration.nix @@ -28,7 +28,6 @@ hardware.amdgpu = { initrd.enable = true; - amdvlk.enable = true; opencl.enable = true; }; diff --git a/modules/services/matrix/default.nix b/modules/services/matrix/default.nix index 5590389..79cd068 100644 --- a/modules/services/matrix/default.nix +++ b/modules/services/matrix/default.nix @@ -21,10 +21,6 @@ let ); in { - imports = [ - "${inputs.nixpkgs-unstable}/nixos/modules/services/matrix/tuwunel.nix" - ]; - environment.systemPackages = [ customFluffy pkgs.unstable.element-web diff --git a/modules/services/trilium/default.nix b/modules/services/trilium/default.nix index 2eb1ec4..f17ba99 100644 --- a/modules/services/trilium/default.nix +++ b/modules/services/trilium/default.nix @@ -7,20 +7,8 @@ }: let sopsFolder = builtins.toString inputs.nix-secrets + "/sops"; - - customTriliumModule = builtins.fetchurl { - url = "https://raw.githubusercontent.com/NixOS/nixpkgs/refs/heads/master/nixos/modules/services/web-apps/trilium.nix"; - sha256 = "sha256:1y4xqwf011lkjzpn5ygmdn7chbwshha16h53hwydlx76avzsmd8j"; - }; in { - disabledModules = [ - "${inputs.nixpkgs}/nixos/modules/services/web-apps/trilium.nix" - ]; - imports = [ - customTriliumModule - ]; - sops.secrets = { "trilium/oidc/id" = { sopsFile = "${sopsFolder}/services.yaml"; diff --git a/nixos-bootstrap/installer-config.nix b/nixos-bootstrap/installer-config.nix index 3f4a6ea..20f2d1d 100644 --- a/nixos-bootstrap/installer-config.nix +++ b/nixos-bootstrap/installer-config.nix @@ -3,13 +3,14 @@ pkgs, lib, ... -}: let +}: +let loginKey = builtins.readFile ./installer.pub; -in { +in +{ environment.systemPackages = builtins.attrValues { - inherit (inputs.nvix.packages.${pkgs.system}) default; - inherit - (pkgs) + inherit (inputs.nvix.packages.${pkgs.stdenv.hostPlatform.system}) default; + inherit (pkgs) vim git just @@ -19,7 +20,16 @@ in { ; }; - boot.supportedFilesystems = lib.mkForce ["zfs" "btrfs" "reiserfs" "vfat" "f2fs" "xfs" "ntfs" "cifs"]; + boot.supportedFilesystems = lib.mkForce [ + "zfs" + "btrfs" + "reiserfs" + "vfat" + "f2fs" + "xfs" + "ntfs" + "cifs" + ]; networking = { wireless.enable = lib.mkForce false; @@ -27,8 +37,8 @@ in { enableIPv6 = false; }; - users.users.nixos.openssh.authorizedKeys.keys = [loginKey]; - users.users.root.openssh.authorizedKeys.keys = [loginKey]; + users.users.nixos.openssh.authorizedKeys.keys = [ loginKey ]; + users.users.root.openssh.authorizedKeys.keys = [ loginKey ]; services.openssh = { enable = true; diff --git a/overlays/default.nix b/overlays/default.nix index edf8a84..1b0c338 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,7 +1,8 @@ -{inputs, ...}: let +{ inputs, ... }: +let stable-packages = final: _prev: { stable = import inputs.nixpkgs-stable { - inherit (final) system; + inherit (final.stdenv.hostPlatform) system; config.allowUnfree = true; # overlays = [ # ]; @@ -10,14 +11,13 @@ unstable-packages = final: _prev: { unstable = import inputs.nixpkgs-unstable { - inherit (final) system; + inherit (final.stdenv.hostPlatform) system; config.allowUnfree = true; # overlays = [ # ]; }; }; -in { - default = final: prev: - (stable-packages final prev) - // (unstable-packages final prev); +in +{ + default = final: prev: (stable-packages final prev) // (unstable-packages final prev); }