flake.lock

@@ -458,16 +458,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1733050161,
+        "lastModified": 1726989464,
-        "narHash": "sha256-lYnT+EYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20=",
+        "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "62d536255879be574ebfe9b87c4ac194febf47c5",
+        "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-24.11",
+        "ref": "release-24.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -938,16 +938,16 @@
     },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1732981179,
+        "lastModified": 1732749044,
-        "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=",
+        "narHash": "sha256-T38FQOg0BV5M8FN1712fovzNakSOENEYs+CSkg31C9Y=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65",
+        "rev": "0c5b4ecbed5b155b705336aa96d878e55acd8685",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-24.11",
+        "ref": "nixos-24.05",
         "repo": "nixpkgs",
         "type": "github"
       }

flake.nix

@@ -3,14 +3,14 @@
 
   inputs = {
     # Nixpkgs
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
     # You can access packages and modules from different nixpkgs revs
     # at the same time. Here's an working example:
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
     # Also see the 'unstable-packages' overlay at 'overlays/default.nix'.
 
     # Home manager
-    home-manager.url = "github:nix-community/home-manager/release-24.11";
+    home-manager.url = "github:nix-community/home-manager/release-24.05";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
     hardware.url = "github:nixos/nixos-hardware";

home/features/cli/gpg.nix

@@ -19,7 +19,7 @@
 
   # Disable gnome-keyring ssh-agent
   xdg.configFile."autostart/gnome-keyring-ssh.desktop".text = ''
-    ${lib.fileContents "${pkgs.gnome-keyring}/etc/xdg/autostart/gnome-keyring-ssh.desktop"}
+    ${lib.fileContents "${pkgs.gnome3.gnome-keyring}/etc/xdg/autostart/gnome-keyring-ssh.desktop"}
     Hidden=true
   '';
 }

home/features/desktop/common/flatpak.nix

@@ -1,5 +1,5 @@
 {inputs, ...}: {
-  imports = [inputs.flatpaks.homeManagerModules.declarative-flatpak];
+  imports = [inputs.flatpaks.homeManagerModules.default];
   services.flatpak = {
     remotes.flathub = "https://flathub.org/repo/flathub.flatpakrepo";
     packages = [

home/global/default.nix

@@ -59,7 +59,7 @@
   nix = {
     package = lib.mkDefault pkgs.nix;
     settings = {
-      experimental-features = ["nix-command" "flakes"];
+      experimental-features = ["nix-command" "flakes" "repl-flake"];
       warn-dirty = false;
     };
   };

hosts/adalbert/default.nix

@@ -61,7 +61,7 @@
       allowUnfree = true;
       firefox.enablePlasmaBrowserIntegration = true;
       segger-jlink.acceptLicense = true;
-      permittedInsecurePackages = ["segger-jlink-qt4-796s"];
+      permittedInsecurePackages = ["segger-jlink-qt4-794l"];
     };
   };
 

hosts/common/global/locale.nix

@@ -16,5 +16,5 @@
     };
   };
   console.keyMap = "de";
-  services.xserver.xkb.layout = "de";
+  services.xserver.layout = "de";
 }

hosts/common/global/nix.nix

@@ -6,7 +6,7 @@
   nix = {
     settings = {
       auto-optimise-store = lib.mkDefault true;
-      experimental-features = ["nix-command" "flakes"];
+      experimental-features = ["nix-command" "flakes" "repl-flake"];
       warn-dirty = false;
       system-features = ["kvm" "big-parallel" "nixos-test"];
     };

hosts/common/optional/desktop/gnome.nix

@@ -7,41 +7,45 @@
   imports = [./global.nix ./x11.nix ./wayland.nix];
 
   services = {
-    libinput.enable = true;
     xserver = {
       desktopManager.gnome = {
         enable = true;
       };
+      libinput.enable = true;
       modules = [pkgs.xf86_input_wacom];
       wacom.enable = true;
     };
     udev.packages = with pkgs; [
-      gnome-settings-daemon
+      gnome.gnome-settings-daemon
     ];
   };
 
   environment = {
     systemPackages = with pkgs; [
       # System-Wide Packages
-      adwaita-icon-theme
+      gnome.adwaita-icon-theme
-      dconf-editor
+      gnome.dconf-editor
-      gnome-tweaks
+      gnome.gnome-tweaks
       gnomeExtensions.kimpanel
       gnomeExtensions.vitals
       gnomeExtensions.tray-icons-reloaded
     ];
-    gnome.excludePackages = with pkgs; [
+    gnome.excludePackages =
-      gnome-tour
+      (with pkgs; [
-      gedit
+        # Ignored Packages
-      atomix
+        gnome-tour
-      epiphany
+        gedit
-      geary
+      ])
-      gnome-characters
+      ++ (with pkgs.gnome; [
-      gnome-contacts
+        atomix
-      gnome-initial-setup
+        epiphany
-      hitori
+        geary
-      iagno
+        gnome-characters
-      tali
+        gnome-contacts
-    ];
+        gnome-initial-setup
+        hitori
+        iagno
+        tali
+      ]);
   };
 }

hosts/common/optional/desktop/japanese.nix

@@ -1,7 +1,6 @@
 {pkgs, ...}: {
   i18n.inputMethod = {
-    enable = true;
+    enabled = "fcitx5";
-    type = "fcitx5";
     fcitx5.addons = with pkgs; [
       fcitx5-mozc
       fcitx5-gtk

hosts/common/optional/desktop/x11.nix

@@ -5,12 +5,11 @@
   ...
 }: {
   services = {
-    libinput.enable = true; # Enable touchpad support
-    libinput.touchpad.naturalScrolling = true;
-
     # Enable the X11 windowing system.
     xserver = {
       enable = true;
+      # Enable touchpad support
+      libinput.enable = true;
       # Remove xterm terminal
       excludePackages = with pkgs; [xterm];
       modules = [pkgs.xf86_input_wacom];

hosts/common/optional/fhs-compat.nix

@@ -1,69 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}: {
-  services.envfs.enable = lib.mkDefault true;
-
-  programs.nix-ld.enable = lib.mkDefault true;
-  programs.nix-ld.libraries = with pkgs;
-    [
-      acl
-      attr
-      bzip2
-      dbus
-      expat
-      fontconfig
-      freetype
-      fuse3
-      icu
-      libnotify
-      libsodium
-      libssh
-      libunwind
-      libusb1
-      libuuid
-      nspr
-      nss
-      stdenv.cc.cc
-      util-linux
-      zlib
-      zstd
-    ]
-    ++ lib.optionals (config.hardware.graphics.enable) [
-      pipewire
-      cups
-      libxkbcommon
-      pango
-      mesa
-      libdrm
-      libglvnd
-      libpulseaudio
-      atk
-      cairo
-      alsa-lib
-      at-spi2-atk
-      at-spi2-core
-      gdk-pixbuf
-      glib
-      gtk3
-      libGL
-      libappindicator-gtk3
-      vulkan-loader
-      xorg.libX11
-      xorg.libXScrnSaver
-      xorg.libXcomposite
-      xorg.libXcursor
-      xorg.libXdamage
-      xorg.libXext
-      xorg.libXfixes
-      xorg.libXi
-      xorg.libXrandr
-      xorg.libXrender
-      xorg.libXtst
-      xorg.libxcb
-      xorg.libxkbfile
-      xorg.libxshmfence
-    ];
-}

hosts/common/optional/printing.nix

@@ -9,8 +9,7 @@
     printing.enable = true;
     avahi = {
       enable = true;
-      nssmdns4 = true;
+      nssmdns = true;
-      nssmdns6 = true;
       # for a WiFi printer
       openFirewall = true;
     };

hosts/ludwig/default.nix

@@ -34,7 +34,6 @@
     ../common/optional/desktop/japanese.nix
     ../common/optional/udisks.nix
     ../common/optional/tailscale.nix
-    ../common/optional/fhs-compat.nix
   ];
 
   nixpkgs = {
@@ -60,12 +59,11 @@
       # Disable if you don't want unfree packages
       allowUnfree = true;
       segger-jlink.acceptLicense = true;
-      permittedInsecurePackages = ["segger-jlink-qt4-796s"];
+      permittedInsecurePackages = ["segger-jlink-qt4-794l"];
     };
   };
 
   networking.hostName = "ludwig";
-  systemd.services.NetworkManager-wait-online.enable = false;
 
   services.udev.packages = [pkgs.segger-jlink];
 
@@ -78,7 +76,7 @@
   };
 
   hardware = {
-    graphics = {
+    opengl = {
       enable = true;
       extraPackages = with pkgs; [
         intel-media-driver # LIBVA_DRIVER_NAME=iHD