defiant: Update to NixOS 24.11

base.nix

@@ -89,10 +89,10 @@
     ];
     uid = lib.mkDefault 1000;
     openssh.authorizedKeys.keys = lib.mkDefault [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDKzPICGew7uN0cmvRmbwkwTCodTBUgEhkoftQnZuO4Q felixalbrigtsen@gmail.com"
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBTXSL0w7OUcz1LzEt1T3I3K5RgyNV+MYz0x/1RbpDHQ felixalb@worf"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFiPHhj0YbklJnJNcxD0IlzPxLTGfv095H5zyS/1Wb64 felixalb@edison.home.feal.no"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDKzPICGew7uN0cmvRmbwkwTCodTBUgEhkoftQnZuO4Q felixalbrigtsen@gmail.com"
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH5M7hYl3saBNMAo6sczgfUvASEJWFHuERB7xvf4gxst nix-builder-worf"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJky33ynjqyWP+hh24gFCMFIEqe3CjIIowGM9jiPbT79 felixalb@sisko.home.feal.no"
     ];
     shell = pkgs.zsh;
   };

flake.lock

@@ -56,16 +56,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1726989464,
+        "lastModified": 1732466619,
-        "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
+        "narHash": "sha256-T1e5oceypZu3Q8vzICjv1X/sGs9XfJRMW5OuXHgpB3c=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
+        "rev": "f3111f62a23451114433888902a55cf0692b408d",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-24.05",
+        "ref": "release-24.11",
         "repo": "home-manager",
         "type": "github"
       }
@@ -175,11 +175,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1728018373,
+        "lastModified": 1732837521,
-        "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=",
+        "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "bc947f541ae55e999ffdb4013441347d83b00feb",
+        "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370",
         "type": "github"
       },
       "original": {
@@ -207,16 +207,16 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1731386116,
+        "lastModified": 1732824227,
-        "narHash": "sha256-lKA770aUmjPHdTaJWnP3yQ9OI1TigenUqVC3wweqZuI=",
+        "narHash": "sha256-fYNXgpu1AEeLyd3fQt4Ym0tcVP7cdJ8wRoqJ+CtTRyY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "689fed12a013f56d4c4d3f612489634267d86529",
+        "rev": "c71ad5c34d51dcbda4c15f44ea4e4aa6bb6ac1e9",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-24.05",
+        "ref": "nixos-24.11",
         "repo": "nixpkgs",
         "type": "github"
       }

flake.nix

@@ -2,14 +2,14 @@
   description = "Felixalb System flake";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
     nixpkgs-2211.url = "https://github.com/NixOS/nixpkgs/archive/34bfa9403e42eece93d1a3740e9d8a02fceafbca.tar.gz"; # old nixpgks for e.g. remmina
 
     nix-darwin.url = "github:lnl7/nix-darwin/master";
     nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
 
-    home-manager.url = "github:nix-community/home-manager/release-24.05";
+    home-manager.url = "github:nix-community/home-manager/release-24.11";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
     matrix-synapse-next.url = "github:dali99/nixos-matrix-modules/v0.6.0";
@@ -97,6 +97,9 @@
 
         # Web host
         malcolm = normalSys "malcolm" { };
+
+        # Home desktop
+        sisko = normalSys "sisko" { };
       };
 
       # Daily driver macbook

home/base.nix

@@ -41,6 +41,9 @@
         name = "Felix Albrigtsen";
         email = lib.mkDefault "felix@albrigtsen.it";
       };
+      safe = {
+        directory = "/config";
+      };
     };
     ignores = [
       "*~"

hosts/defiant/filesystems.nix

@@ -5,7 +5,6 @@
   boot = {
     zfs.extraPools = [ "tank" ];
     supportedFilesystems = [ "zfs" ];
-    kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
   };
   services.prometheus.exporters.zfs.enable = true;
 

hosts/defiant/services/keycloak.nix

@@ -17,11 +17,11 @@ in {
     settings = {
       cache = "local";
       hostname = "iam.feal.no";
-      hostname-strict-backchannel = true;
+      hostname-backchannel-dynamic = false;
       http-enable = true;
       http-host = "127.0.1.2";
       http-port = 5060;
-      proxy = "edge";
+      proxy-headers = "xforwarded";
     };
   };
 

hosts/sisko/applications.nix

@@ -0,0 +1,10 @@
+{ config, pkgs, lib, ... }:
+{
+  programs.steam = {
+     enable = true;
+    remotePlay.openFirewall = true;
+  };
+
+  environment.systemPackages = with pkgs; [
+  ];
+}

hosts/sisko/configuration.nix

@@ -7,12 +7,13 @@
       ../../common/metrics-exporters.nix
       ./hardware-configuration.nix
       ./desktop.nix
+      ./applications.nix
   ];
 
   networking = {
     hostName = "sisko";
     defaultGateway = "192.168.10.1";
-    interfaces.ens18.ipv4 = {
+    interfaces.enp14s0.ipv4 = {
       addresses = [
         { address = "192.168.10.172"; prefixLength = 24; }
       ];
@@ -20,10 +21,20 @@
     hostId = "b716d781";
   };
 
+  hardware.bluetooth.enable = true;
+
   sops.defaultSopsFile = ../../secrets/sisko/sisko.yaml;
 
   environment.variables = { EDITOR = "vim"; };
 
+  nixpkgs.config = {
+    allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
+      "copilot.vim"
+      "steam"
+      "steam-unwrapped"
+    ];
+  };
+
   system.stateVersion = "24.11";
 }
 

hosts/sisko/desktop.nix

@@ -11,6 +11,10 @@
     withUWSM = true;
     xwayland.enable = true;
   };
+  services.xserver.enable = true;
+  services.xserver.displayManager.gdm.enable = true;
+  services.xserver.desktopManager.gnome.enable = true;
+
 
   # Audio
   services.pipewire = {
@@ -51,8 +55,4 @@
       dunst.enable = true;
     };
   };
-
-  environment.systemPackages = with pkgs; [
-    kitty
-  ];
 }

hosts/sisko/hardware-configuration.nix

@@ -0,0 +1,48 @@
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-amd" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/60a70caf-ca37-488d-8c2a-98a7e9b67d84";
+      fsType = "btrfs";
+      options = [ "subvol=root" ];
+    };
+
+  fileSystems."/nix" =
+    { device = "/dev/disk/by-uuid/60a70caf-ca37-488d-8c2a-98a7e9b67d84";
+      fsType = "btrfs";
+      options = [ "subvol=nix" ];
+    };
+
+  fileSystems."/home" =
+    { device = "/dev/disk/by-uuid/60a70caf-ca37-488d-8c2a-98a7e9b67d84";
+      fsType = "btrfs";
+      options = [ "subvol=home" ];
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/12CE-A600";
+      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
+    };
+
+  swapDevices = [ {
+    device = "/swapfile";
+    size = 64*1024;
+  } ];
+
+  networking.useDHCP = lib.mkDefault false;
+  # networking.interfaces.enp14s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp15s0.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

hosts/sisko/home.nix

@@ -1,12 +1,75 @@
 { pkgs, lib, ... }:
+
 {
   imports = [
     ./../../home/base.nix
     ./../../home/alacritty.nix
   ];
 
+  home.packages = with pkgs; [
+    bc
+    catimg
+    chromium
+    dante
+    dig
+    element-desktop
+    hunspellDicts.en_US
+    hunspellDicts.nb_NO
+    jq
+    libreoffice
+    mpv
+    nixpkgs-2211.remmina
+    openssl
+    pwgen
+    unstable.tlclient
+    traceroute
+    virt-manager
+    w3m
+
+    (unstable.python311.withPackages (ps: with ps; [
+      numpy
+      pycryptodome
+      requests
+    ]))
+  ];
+
   programs = {
-    zsh.shellAliases."rebuild" = "sudo nixos-rebuild switch --flake /config";
+    aerc = {
+      enable = true;
+      package = pkgs.unstable.aerc;
+    };
+    alacritty.enable = true;
+    firefox.enable = true;
+    rbw = {
+      enable = true;
+      settings = {
+        base_url = "https://pw.feal.no";
+        email = "felix@albrigtsen.it";
+        pinentry = pkgs.pinentry-gnome3;
+      };
+    };
+    rofi = {
+      enable = true;
+      theme = "iggy";
+    };
+    zsh = {
+      shellAliases."rebuild" = "sudo nixos-rebuild switch --flake /config";
+      prezto.pmodules = [ "ssh" ];
+    };
+
+    neovim.plugins = with pkgs.vimPlugins; [ copilot-vim ];
+  };
+
+  xdg.mimeApps = {
+    enable = true;
+
+    defaultApplications = {
+      "text/html" = "firefox.desktop";
+      "x-scheme-handler/http" = "firefox.desktop";
+      "x-scheme-handler/https" = "firefox.desktop";
+      "x-scheme-handler/about" = "firefox.desktop";
+      "x-scheme-handler/unknown" = "firefox.desktop";
+    };
   };
 
   home.stateVersion = "24.11";