rename deprecated options

configs/thilo-laptop/hardware-configuration.nix

@@ -27,7 +27,8 @@
     fsType = "ext4";
   };
 
-  boot.initrd.luks.devices."luks-6f077715-c436-4254-acb2-66d8be0a0c55".device = "/dev/disk/by-uuid/6f077715-c436-4254-acb2-66d8be0a0c55";
+  boot.initrd.luks.devices."luks-6f077715-c436-4254-acb2-66d8be0a0c55".device =
+    "/dev/disk/by-uuid/6f077715-c436-4254-acb2-66d8be0a0c55";
 
   fileSystems."/boot" = {
     device = "/dev/disk/by-uuid/877C-C918";

configs/thilo-pc/hardware-configuration.nix

@@ -9,51 +9,55 @@
 }:
 
 {
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];
 
-  boot = {
-    initrd = {
-      availableKernelModules = [
-        "nvme"
-        "xhci_pci"
-        "ahci"
-        "usbhid"
-        "uas"
-        "usb_storage"
-        "sd_mod"
-      ];
-      kernelModules = [ ];
-    };
-    kernelModules = [ "kvm-amd" ];
-    extraModulePackages = [ ];
+  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/7b55546f-7bd5-4b46-b5b1-1c81fdd8509c";
+    fsType = "ext4";
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/5A04-0844";
+    fsType = "vfat";
+    options = [
+      "fmask=0077"
+      "dmask=0077"
+    ];
   };
 
   fileSystems = {
-    "/" = {
-      device = "/dev/disk/by-uuid/34eb30d5-5faa-409f-81ee-7b996d37534a";
-      fsType = "btrfs";
-      options = [ "subvol=@" ];
-    };
-
     "/data" = {
-      device = "/dev/disk/by-uuid/91f64815-1d3c-4032-960f-0a53eb3b01ab";
+      device = "/dev/disk/by-uuid/a13a2cfa-12af-463d-ae5c-d46c881fcdd6";
       fsType = "btrfs";
-    };
-
-    "/boot" = {
-      device = "/dev/disk/by-uuid/0EB3-BFB0";
-      fsType = "vfat";
+      options = [ "nofail" ];
     };
   };
 
-  swapDevices = [ ];
+  swapDevices = [
+    { device = "/dev/disk/by-uuid/da98aab4-f3a5-439b-aab5-b78624c219d3"; }
+  ];
 
   # 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
   # still possible to use this option, but it's recommended to use it in conjunction
   # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp8s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp6s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp5s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

configs/thilo-pc/home.nix

@@ -1,7 +1,9 @@
-{ inputs
-, pkgs
-, config
-, ...
+{
+  inputs,
+  pkgs,
+  config,
+  lib,
+  ...
 }:
 
 {
@@ -31,22 +33,12 @@
            };
       */
 
-      home.sessionVariables = {
-        LD_LIBRARY_PATH = "${pkgs.libGL}/lib";
-      };
-
       nix = {
-        package = pkgs.lix;
-      };
-
-      qt = {
-        enable = true;
-        platformTheme.name = "kde";
+        package = lib.mkDefault pkgs.lix;
       };
 
       home.packages = with pkgs; [
         lix
-        papirus-icon-theme
       ];
     };
   };

configs/thilo-pc/nixos.nix

@@ -1,7 +1,7 @@
 # Edit this configuration file to define what should be installed on
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
-{ pkgs, ... }:
+{ pkgs, options, ... }:
 
 {
   imports = [
@@ -16,13 +16,13 @@
     loader = {
       systemd-boot = {
         enable = true;
-        extraInstallCommands = ''
-          ${pkgs.gnused}/bin/sed -i "/default/c\default @saved" /boot/loader/loader.conf
-        '';
+        # extraInstallCommands = ''
+        #   ${pkgs.gnused}/bin/sed -i "/default/c\default @saved" /boot/loader/loader.conf
+        #   '';
       };
       efi.canTouchEfiVariables = true;
     };
-    kernelPackages = pkgs.linuxPackages_latest;
+    # kernelPackages = pkgs.linuxPackages_latest;
     binfmt.registrations.appimage = {
       wrapInterpreterInShell = false;
       interpreter = "${pkgs.appimage-run}/bin/appimage-run";
@@ -37,36 +37,135 @@
 
   # Enable the X11 windowing system.
   services = {
-    xserver = {
-      enable = true;
-      displayManager.sddm.enable = true;
-      displayManager.sddm.wayland.enable = true;
-      xkb = {
-        variant = "";
-        layout = "us";
-      };
+    xserver.enable = true;
+    displayManager.sddm.enable = true;
+    desktopManager.plasma6.enable = true;
+    xserver.xkb = {
+      layout = "us";
+      variant = "";
     };
     ollama = {
       enable = false;
       acceleration = "rocm";
     };
-    desktopManager.plasma6.enable = true;
     blueman.enable = true;
   };
 
   programs.kdeconnect.enable = true;
-  programs.nix-ld.enable = true;
+  programs.nix-ld = {
+    enable = true;
+    libraries =
+      (pkgs.steam-run.args.multiPkgs pkgs)
+      ++ (with pkgs; [
+        nss
+        sane-backends
+        nspr
+        zlib
+        libglvnd
+        qt5.qtbase
+        qt5.qtsvg
+        qt5.qtdeclarative
+        qt5.qtwayland
+        pkcs11helper
+        stdenv.cc.cc
+        freetype
 
-  hardware.opengl = {
+        stdenv.cc.cc
+        openssl
+        xorg.libXcomposite
+        xorg.libXtst
+        xorg.libXrandr
+        xorg.libXext
+        xorg.libX11
+        xorg.libXfixes
+        libGL
+        libva
+        xorg.libxcb
+        xorg.libXdamage
+        xorg.libxshmfence
+        xorg.libXxf86vm
+        libelf
+        glib
+        gtk3
+        bzip2
+        xorg.libXinerama
+        xorg.libXcursor
+        xorg.libXrender
+        xorg.libXScrnSaver
+        xorg.libXi
+        xorg.libSM
+        xorg.libICE
+        gnome2.GConf
+        nspr
+        nss
+        cups
+        libcap
+        SDL2
+        libusb1
+        dbus-glib
+        ffmpeg
+        libudev0-shim
+        xorg.libXt
+        xorg.libXmu
+        libogg
+        libvorbis
+        SDL
+        SDL2_image
+        glew110
+        libidn
+        tbb
+        flac
+        freeglut
+        libjpeg
+        libpng
+        libpng12
+        libsamplerate
+        libmikmod
+        libtheora
+        libtiff
+        pixman
+        speex
+        SDL_image
+        SDL_ttf
+        SDL_mixer
+        SDL2_ttf
+        SDL2_mixer
+        libappindicator-gtk2
+        libdbusmenu-gtk2
+        libindicator-gtk2
+        libcaca
+        libcanberra
+        libgcrypt
+        libvpx
+        librsvg
+        xorg.libXft
+        libvdpau
+        pango
+        cairo
+        atk
+        gdk-pixbuf
+        fontconfig
+        freetype
+        dbus
+        alsa-lib
+        expat
+        libdrm
+        mesa
+        libxkbcommon
+      ]);
+  };
+
+  hardware.graphics = {
     extraPackages = with pkgs; [
       vaapiVdpau
       libvdpau-va-gl
     ];
   };
+
   hardware.bluetooth.enable = true;
 
   programs.steam.gamescopeSession = {
-    enable = true;
+    enable = false;
     env = {
       WLR_RENDERER = "vulkan";
       DXVK_HDR = "1";
@@ -89,7 +188,5 @@
     ];
   };
 
-  nixpkgs.config.permittedInsecurePackages = [ "nix-2.16.2" ];
-
-  system.stateVersion = "23.05";
+  system.stateVersion = "24.11";
 }

flake.nix

@@ -46,11 +46,12 @@
   };
 
   outputs =
-    { nixpkgs
-    , home-manager
-    , nixgl
-    , w17
-    , ...
+    {
+      nixpkgs,
+      home-manager,
+      nixgl,
+      w17,
+      ...
     }@inputs:
     let
       system = "x86_64-linux";

home-manager/modules/machine.nix

@@ -85,7 +85,7 @@ with lib;
     nixGL = {
       packages = inputs.nixgl.packages;
       defaultWrapper = "mesa";
-      installScripts = ["mesa"];
+      installScripts = [ "mesa" ];
       vulkan.enable = true;
     };
 

home-manager/modules/packages.nix

@@ -59,8 +59,8 @@ in
         (callPackage ./../pkgs/toggl-time-grouper/package.nix { inherit python3Packages; })
         (callPackage ./../pkgs/extract.nix { inherit pkgs; })
         (pkgs.writeShellScriptBin "kitty-term-fix" ''
-            infocmp -a xterm-kitty | ssh $1 tic -x -o \~/.terminfo /dev/stdin
-          '')
+          infocmp -a xterm-kitty | ssh $1 tic -x -o \~/.terminfo /dev/stdin
+        '')
         nixpkgs-fmt
         ddev
         act
@@ -96,6 +96,8 @@ in
 
         php
         (lib.hiPrio phpPackages.composer)
+
+        nixfmt-rfc-style
       ]
       ++ (
         if (!config.machine.isGeneric) then
@@ -120,22 +122,22 @@ in
       ++ (
         if (config.machine.isGraphical && !config.machine.isGeneric) then
           [
-            jetbrains.webstorm
-            jetbrains.phpstorm
-            jetbrains.rust-rover
-            jetbrains.goland
+            # jetbrains.webstorm
+            # jetbrains.phpstorm
+            # jetbrains.rust-rover
+            # jetbrains.goland
             element-desktop
             ludusavi
-            dbeaver
+            dbeaver-bin
             onlyoffice-bin
             spotify
-            vesktop
+            discord
             (lutris.override {
-              extraLibraries = _: [ gnome3.adwaita-icon-theme ];
+              extraLibraries = _: [ adwaita-icon-theme ];
               extraPkgs = _: [
                 wineWowPackages.full
                 winetricks
-                gnome3.adwaita-icon-theme
+                adwaita-icon-theme
               ];
             })
             bottles
@@ -151,7 +153,7 @@ in
             mumble
             prusa-slicer
             trayscale
-            gnome.gnome-disk-utility
+            gnome-disk-utility
             inkscape
             musescore
             obsidian
@@ -162,6 +164,7 @@ in
             inputs.nix-alien.packages.x86_64-linux.nix-alien
             kdePackages.kdenlive
             audacity
+            signal-desktop
           ]
         else
           [ ]

home-manager/programs/chromium.nix

@@ -35,12 +35,8 @@ let
   extensions = map (eid: { id = eid; }) chromium_extension;
 in
 {
-  programs.chromium = {
-    inherit dictionaries commandLineArgs extensions;
-    enable = isEnabled;
-  };
-  programs.google-chrome = {
-    inherit commandLineArgs;
+  programs.brave = {
+    # inherit commandLineArgs;
     enable = isEnabled;
   };
 }

home-manager/programs/ssh.nix

@@ -22,7 +22,9 @@ let
       user = "git";
       identitiesOnly = true;
     };
-    "mail" = { hostname = "mail.officerent.de"; };
+    "mail" = {
+      hostname = "mail.officerent.de";
+    };
     "*.tu-darmstadt.de" = {
       identityFile = "~/.ssh/id_tu-darmstadt-de";
     };
@@ -61,25 +63,21 @@ let
     };
   };
   catchAlls = builtins.listToAttrs (
-    builtins.map
-      (host: {
-        name = "*.${host}";
-        value = {
-          identityFile = "~/.ssh/id_thilo-billerbeck-com";
-          user = "root";
-        };
-      })
-      ownDomains
+    builtins.map (host: {
+      name = "*.${host}";
+      value = {
+        identityFile = "~/.ssh/id_thilo-billerbeck-com";
+        user = "root";
+      };
+    }) ownDomains
   );
   hostnameAliasses = builtins.listToAttrs (
-    builtins.map
-      (host: {
-        name = "${host}";
-        value = {
-          hostname = "${host}.thilo-billerbeck.com";
-        };
-      })
-      thiloBillerbeckHosts
+    builtins.map (host: {
+      name = "${host}";
+      value = {
+        hostname = "${host}.thilo-billerbeck.com";
+      };
+    }) thiloBillerbeckHosts
   );
   buildersCCCDA = builtins.listToAttrs (
     builtins.map
@@ -89,7 +87,13 @@ let
           user = "avocadoom";
           identityFile = "~/.ssh/id_darmstadt-ccc-de";
         };
-      }) [ "1" "2" "3" "4" ]
+      })
+      [
+        "1"
+        "2"
+        "3"
+        "4"
+      ]
   );
 in
 {

nixos/builders.nix

@@ -1,9 +1,13 @@
 {
   programs.ssh.knownHosts = {
-    "build1.darmstadt.ccc.de".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE/oyJPRwW3bJoWKtXSrVOiqMaKq+9yd03+N2PuCbMKv";
-    "build2.darmstadt.ccc.de".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOZ7/eZLTfUD7Ejjio+8ivNFb8iyK1CD5Pq8uCDojT+z";
-    "build3.darmstadt.ccc.de".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM2D/SwJf46XCoim06lOyO42JqJiTeM8UMkT4bYluJJr";
-    "build4.darmstadt.ccc.de".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDu9ZsbUYaCzzZv4vn22KrKi/R9pCfOEe4aYWyLd96C1";
+    "build1.darmstadt.ccc.de".publicKey =
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE/oyJPRwW3bJoWKtXSrVOiqMaKq+9yd03+N2PuCbMKv";
+    "build2.darmstadt.ccc.de".publicKey =
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOZ7/eZLTfUD7Ejjio+8ivNFb8iyK1CD5Pq8uCDojT+z";
+    "build3.darmstadt.ccc.de".publicKey =
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM2D/SwJf46XCoim06lOyO42JqJiTeM8UMkT4bYluJJr";
+    "build4.darmstadt.ccc.de".publicKey =
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDu9ZsbUYaCzzZv4vn22KrKi/R9pCfOEe4aYWyLd96C1";
   };
 
   nix = {

nixos/common.nix

@@ -71,7 +71,7 @@
 
   virtualisation = {
     docker.enable = true;
-    podman.enable = true;
+    podman.enable = false;
   };
 
   environment.sessionVariables.NIXOS_OZONE_WL = "1";
@@ -80,7 +80,7 @@
     steam.enable = true;
     zsh.enable = true;
     adb.enable = true;
-    noisetorch.enable = true;
+    noisetorch.enable = false;
     dconf = {
       enable = true;
     };
@@ -89,8 +89,6 @@
   environment.systemPackages = with pkgs; [
     git
     zsh
-    kitty
-    steamtinkerlaunch
   ];
 
   networking.networkmanager.enable = true;
@@ -124,15 +122,13 @@
   };
 
   hardware = {
-    pulseaudio.enable = false;
-    opengl = {
-      driSupport = true;
-      driSupport32Bit = true;
+    graphics = {
+      enable = true;
+      enable32Bit = true;
     };
   };
 
   security.polkit.enable = true;
-  sound.enable = true;
   security.rtkit.enable = true;
 
   time.hardwareClockInLocalTime = true;