configs/thilo-laptop/hardware-configuration.nix

@@ -1,27 +1,24 @@
-{ config, lib, modulesPath, ... }:
+{ config, lib, pkgs, modulesPath, ... }:
 
 {
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
 
-  boot = {
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usb_storage" "sd_mod" ];
-    initrd = {
+  boot.initrd.kernelModules = [ ];
-      availableKernelModules = [ "nvme" "xhci_pci" "usb_storage" "sd_mod" ];
+  boot.kernelModules = [ "kvm-amd" ];
-      kernelModules = [ ];
+  boot.extraModulePackages = [ ];
-    };
-    kernelModules = [ "kvm-amd" ];
-    extraModulePackages = [ ];
-  };
 
-  fileSystems."/" = {
+  fileSystems."/" =
-    device = "/dev/disk/by-uuid/2e1227f6-8725-43a3-aeb6-961df4ed9b25";
+    { device = "/dev/disk/by-uuid/2e1227f6-8725-43a3-aeb6-961df4ed9b25";
       fsType = "ext4";
     };
 
-  boot.initrd.luks.devices."luks-6f077715-c436-4254-acb2-66d8be0a0c55".device =
+  boot.initrd.luks.devices."luks-6f077715-c436-4254-acb2-66d8be0a0c55".device = "/dev/disk/by-uuid/6f077715-c436-4254-acb2-66d8be0a0c55";
-    "/dev/disk/by-uuid/6f077715-c436-4254-acb2-66d8be0a0c55";
 
-  fileSystems."/boot" = {
+  fileSystems."/boot" =
-    device = "/dev/disk/by-uuid/877C-C918";
+    { device = "/dev/disk/by-uuid/877C-C918";
       fsType = "vfat";
     };
 
@@ -36,6 +33,5 @@
   # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode =
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-    lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

configs/thilo-laptop/home.nix

@@ -1,12 +1,13 @@
 { inputs, pkgs, ... }:
 
 {
-  home-manager = {
+  home-manager.useGlobalPkgs = true;
-    useGlobalPkgs = true;
+  home-manager.useUserPackages = true;
-    useUserPackages = true;
+  home-manager.extraSpecialArgs = { inherit inputs; };
-    extraSpecialArgs = { inherit inputs; };
+  home-manager.users.thilo = {
-    users.thilo = {
+    imports = [
-      imports = [ ./../../home-manager/modules/machine.nix ];
+      ./../../home-manager/modules/machine.nix
+    ];
 
     machine = {
       username = "thilo";
@@ -33,11 +34,11 @@
         obs-command-source
         obs-move-transition
         advanced-scene-switcher
-           ];
+      ]; */
-        */
     };
 
-      home.sessionVariables = { LD_LIBRARY_PATH = "${pkgs.libGL}/lib"; };
+    home.sessionVariables = {
+      LD_LIBRARY_PATH = "${pkgs.libGL}/lib";
     };
   };
 }

configs/thilo-laptop/nixos.nix

@@ -1,26 +1,35 @@
-{ pkgs, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 
 {
-  imports = [ # Include the results of the hardware scan.
+  imports =
+    [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
       ./../../nixos/common.nix
     ];
 
   # Bootloader.
-  boot.loader = {
+  boot.loader.systemd-boot.enable = true;
-    systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
-    efi.canTouchEfiVariables = true;
-  };
 
   # Setup keyfile
-  boot.initrd.secrets = { "/crypto_keyfile.bin" = null; };
+  boot.initrd.secrets = {
+    "/crypto_keyfile.bin" = null;
+  };
 
   networking.hostName = "thilo-laptop"; # Define your hostname.
 
   # Configure console keymap
   console.keyMap = "de";
 
-  environment.gnome.excludePackages = with pkgs; [ tracker tracker-miners ];
+  environment.gnome.excludePackages = with pkgs; [
+    tracker
+    tracker-miners
+  ];
 
   hardware.bluetooth.enable = true;
 
@@ -41,7 +50,10 @@
     fwupd.enable = true;
   };
 
-  environment.systemPackages = with pkgs; [ brlaser brgenml1lpr ];
+  environment.systemPackages = with pkgs; [
+    brlaser
+    brgenml1lpr
+  ];
 
   system.stateVersion = "23.05";
 }

configs/thilo-pc/hardware-configuration.nix

@@ -1,38 +1,34 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, modulesPath, ... }:
+{ config, lib, pkgs, modulesPath, ... }:
 
 {
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
 
-  boot = {
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "uas" "usb_storage" "sd_mod" ];
-    initrd = {
+  boot.initrd.kernelModules = [ ];
-      availableKernelModules =
+  boot.kernelModules = [ "kvm-amd" ];
-        [ "nvme" "xhci_pci" "ahci" "usbhid" "uas" "usb_storage" "sd_mod" ];
+  boot.extraModulePackages = [ ];
-      kernelModules = [ ];
-    };
-    kernelModules = [ "kvm-amd" ];
-    extraModulePackages = [ ];
-  };
 
-  fileSystems = {
+  fileSystems."/" =
-    "/" = {
+    { device = "/dev/disk/by-uuid/34eb30d5-5faa-409f-81ee-7b996d37534a";
-      device = "/dev/disk/by-uuid/34eb30d5-5faa-409f-81ee-7b996d37534a";
       fsType = "btrfs";
       options = [ "subvol=@" ];
     };
 
-    "/data" = {
+  fileSystems."/data" =
+    {
       device = "/dev/disk/by-uuid/91f64815-1d3c-4032-960f-0a53eb3b01ab";
       fsType = "btrfs";
     };
 
-    "/boot" = {
+  fileSystems."/boot" =
-      device = "/dev/disk/by-uuid/0EB3-BFB0";
+    { device = "/dev/disk/by-uuid/0EB3-BFB0";
       fsType = "vfat";
     };
-  };
 
   swapDevices = [ ];
 
@@ -44,6 +40,5 @@
   # networking.interfaces.enp8s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode =
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-    lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

configs/thilo-pc/home.nix

@@ -1,12 +1,13 @@
 { inputs, pkgs, ... }:
 
 {
-  home-manager = {
+  home-manager.useGlobalPkgs = true;
-    useGlobalPkgs = true;
+  home-manager.useUserPackages = true;
-    useUserPackages = true;
+  home-manager.extraSpecialArgs = { inherit inputs; };
-    extraSpecialArgs = { inherit inputs; };
+  home-manager.users.thilo = {
-    users.thilo = {
+    imports = [
-      imports = [ ./../../home-manager/modules/machine.nix ];
+      ./../../home-manager/modules/machine.nix
+    ];
 
     machine = {
       username = "thilo";
@@ -16,18 +17,21 @@
       isGraphical = true;
     };
 
-/*       xsession.pointerCursor = {
+    xsession.pointerCursor = {
       name = "Bibata-Modern-Classic";
       package = pkgs.bibata-cursors;
       size = 128;
-      }; */
+    };
 
     services.kdeconnect.enable = true;
     services.kdeconnect.indicator = true;
 
-      home.sessionVariables = { LD_LIBRARY_PATH = "${pkgs.libGL}/lib"; };
+    home.sessionVariables = {
-
+      LD_LIBRARY_PATH = "${pkgs.libGL}/lib";
-      home.packages = with pkgs; [ libsForQt5.discover ];
     };
+
+    home.packages = with pkgs; [
+      libsForQt5.discover
+    ];
   };
 }

configs/thilo-pc/nixos.nix

@@ -1,7 +1,11 @@
 # 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, ... }:
+{ config
+, pkgs
+, lib
+, ...
+}:
 
 {
   imports = [
@@ -11,18 +15,12 @@
   ];
 
   # Bootloader.
-  boot = {
+  boot.loader.systemd-boot.enable = true;
-    loader = {
+  boot.loader.efi.canTouchEfiVariables = true;
-      systemd-boot = {
+  boot.loader.systemd-boot.extraInstallCommands = ''
-        enable = true;
-        extraInstallCommands = ''
     ${pkgs.gnused}/bin/sed -i "/default/c\default @saved" /boot/loader/loader.conf
   '';
-      };
+  boot.kernelPackages = pkgs.linuxPackages_latest;
-      efi.canTouchEfiVariables = true;
-    };
-    kernelPackages = pkgs.linuxPackages_latest;
-  };
 
   networking.hostName = "thilo-pc";
 
@@ -31,15 +29,18 @@
     xserver = {
       enable = true;
       displayManager.sddm.enable = true;
-      displayManager.defaultSession = "plasma";
+      displayManager.defaultSession = "plasmawayland";
-      desktopManager.plasma6.enable = true;
+      desktopManager.plasma5.enable = true;
       layout = "us";
       xkbVariant = "";
     };
   };
 
   hardware.opengl = {
-    extraPackages = with pkgs; [ vaapiVdpau libvdpau-va-gl ];
+    extraPackages = with pkgs; [
+      vaapiVdpau
+      libvdpau-va-gl
+    ];
   };
 
   system.stateVersion = "23.05";

configs/wsl/home.nix

@@ -1,7 +1,9 @@
-{ ... }:
+{ inputs, ... }:
 
-{
+ {
-  imports = [ ./../../home-manager/modules/machine.nix ];
+    imports = [
+      ./../../home-manager/modules/machine.nix
+    ];
 
     machine = {
       username = "thilo";
@@ -10,4 +12,4 @@
       noiseSuppression.enable = false;
       isGraphical = false;
     };
-}
+  }

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1709049058,
+        "lastModified": 1708440115,
-        "narHash": "sha256-RLag2Uy3wezy+oW+bsEwloDRaxV9BV/QdzHmSz1Ciwo=",
+        "narHash": "sha256-j3n3LiEmsn2V5HqhzHf+nh7JrHGbFmzLMm9qnmzFPxw=",
         "owner": "dagger",
         "repo": "nix",
-        "rev": "c4d98a163455709a6d8bba53465854981e115c15",
+        "rev": "b489ac4da2e88296611e5841f4580ebc185d7b83",
         "type": "github"
       },
       "original": {
@@ -119,11 +119,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1709204054,
+        "lastModified": 1708806879,
-        "narHash": "sha256-U1idK0JHs1XOfSI1APYuXi4AEADf+B+ZU4Wifc0pBHk=",
+        "narHash": "sha256-MSbxtF3RThI8ANs/G4o1zIqF5/XlShHvwjl9Ws0QAbI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2f3367769a93b226c467551315e9e270c3f78b15",
+        "rev": "4ee704cb13a5a7645436f400b9acc89a67b9c08a",
         "type": "github"
       },
       "original": {
@@ -381,11 +381,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1709150264,
+        "lastModified": 1708807242,
-        "narHash": "sha256-HofykKuisObPUfj0E9CJVfaMhawXkYx3G8UIFR/XQ38=",
+        "narHash": "sha256-sRTRkhMD4delO/hPxxi+XwLqPn8BuUq6nnj4JqLwOu0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9099616b93301d5cf84274b184a3a5ec69e94e08",
+        "rev": "73de017ef2d18a04ac4bfd0c02650007ccb31c2a",
         "type": "github"
       },
       "original": {

flake.nix

@@ -2,8 +2,12 @@
   description = "Nixos config";
 
   inputs = {
-    nixpkgs = { url = "github:NixOS/nixpkgs/nixos-unstable"; };
+    nixpkgs = {
-    nixpkgs-update = { url = "github:ryantm/nixpkgs-update"; };
+      url = "github:NixOS/nixpkgs/nixos-unstable";
+    };
+    nixpkgs-update = {
+      url = "github:ryantm/nixpkgs-update";
+    };
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -16,16 +20,19 @@
     muse-sounds-manager.url = "github:thilobillerbeck/muse-sounds-manager-nix";
   };
 
-  outputs = { nixpkgs, home-manager, nixgl, ... }@inputs:
+  outputs = { self, nixpkgs, home-manager, nixgl, ... }@inputs:
     let
       system = "x86_64-linux";
       pkgs = import nixpkgs {
         system = "${system}";
         overlays = [ nixgl.overlay ];
       };
-    in {
+    in
+    {
       nixConfig = {
-        extra-substituters = [ "https://nix-community.cachix.org" ];
+        extra-substituters = [
+          "https://nix-community.cachix.org"
+        ];
         extra-trusted-public-keys = [
           "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
         ];
@@ -48,8 +55,7 @@
         ];
         specialArgs = { inherit inputs; };
       };
-      homeConfigurations."thilo@thilo-pc-win" =
+      homeConfigurations."thilo@thilo-pc-win" = home-manager.lib.homeManagerConfiguration {
-        home-manager.lib.homeManagerConfiguration {
         inherit pkgs;
         modules = [ ./configs/wsl/home.nix ];
         extraSpecialArgs = { inherit inputs; };

home-manager/modules/machine.nix

@@ -1,5 +1,6 @@
 { lib, pkgs, config, ... }:
-with lib; {
+with lib;
+{
   imports = [
     ./../programs/alacritty.nix
     ./../programs/bat.nix
@@ -70,8 +71,7 @@ with lib; {
         '';
         ".ssh/config_source" = {
             source = ./../dotfiles/ssh-config;
-          onChange =
+            onChange = ''cat ~/.ssh/config_source > ~/.ssh/config && chmod 600 ~/.ssh/config'';
-            "cat ~/.ssh/config_source > ~/.ssh/config && chmod 600 ~/.ssh/config";
         };
         ".gitignore".source = ./../dotfiles/.gitignore;
         ".config/pipewire/pipewire.conf.d/99-noise-suppression.conf".text = ''

home-manager/modules/packages.nix

@@ -2,20 +2,20 @@
 
 with lib;
 let
-  electronFlags =
+    electronFlags = "--enable-features=UseOzonePlatform --ozone-platform=wayland --enable-wayland-ime --disable-gpu-shader-disk-cache -n";
-    "--enable-features=UseOzonePlatform --ozone-platform=wayland --enable-wayland-ime --disable-gpu-shader-disk-cache -n";
 in {
   config = {
     nixpkgs.overlays = [
-      (_: prev: {
+      (final: prev: {
         quickemu = prev.quickemu.overrideAttrs (old: {
-          patches = (old.patches or [ ]) ++ [ ./../patches/quickemu.patch ];
+          patches = (old.patches or [ ]) ++ [
+            ./../patches/quickemu.patch
+          ];
         });
       })
     ];
 
-    home.packages = with pkgs;
+    home.packages = with pkgs; [
-      [
       up
       htop
       rustc
@@ -50,7 +50,9 @@ in {
       (pkgs.writeShellScriptBin "nix-build-default" ''
         nix-build -E 'with import <nixpkgs> { }; callPackage ./default.nix { }'
       '')
-        (callPackage ./../pkgs/toggl-time-grouper/package.nix { inherit python3Packages; })
+      (callPackage ./../pkgs/toggl-time-grouper/package.nix {
+        inherit lib;
+      })
       nixpkgs-fmt
       toolbox
       distrobox
@@ -87,8 +89,10 @@ in {
       spotify
       vesktop
       (lutris.override {
-          extraLibraries = _: [ gnome3.adwaita-icon-theme ];
+        extraLibraries = pkgs: [
-          extraPkgs = _: [
+          gnome3.adwaita-icon-theme
+        ];
+        extraPkgs = pkgs: [
           wineWowPackages.full
           winetricks
           gnome3.adwaita-icon-theme
@@ -109,19 +113,17 @@ in {
       trayscale
       gnome.gnome-disk-utility
       inkscape
-        # musescore
+      musescore
       obsidian
       syncthingtray
       reaper
       yabridge
-      ] else
+    ] else [ ]) ++ (if config.machine.isGnome then [
-        [ ]) ++ (if config.machine.isGnome then [
       gnomeExtensions.blur-my-shell
       gnomeExtensions.dash-to-panel
       gnomeExtensions.user-themes
       gnomeExtensions.vitals
       gnomeExtensions.custom-accent-colors
-        ] else
+    ] else [ ]);
-          [ ]);
   };
 }

home-manager/pkgs/docker-craft-cms-dev-env.nix

@@ -1,4 +1,7 @@
-{ lib, stdenv, fetchFromGitHub }:
+{ lib
+, stdenv
+, fetchFromGitHub
+}:
 
 stdenv.mkDerivation rec {
   pname = "docker-craft-cms-dev-env";
@@ -17,8 +20,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description =
+    description = "Docker image for local development of sites based on Craft CMS";
-      "Docker image for local development of sites based on Craft CMS";
     homepage = "https://github.com/codemonauts/docker-craft-cms-dev-env";
     license = licenses.mit;
     maintainers = with maintainers; [ ];

home-manager/pkgs/spx-gc.nix

@@ -1,4 +1,8 @@
-{ lib, buildNpmPackage, fetchFromGitHub }:
+{ lib
+, stdenv
+, buildNpmPackage
+, fetchFromGitHub
+}:
 
 buildNpmPackage rec {
   pname = "spx-gc";
@@ -21,8 +25,7 @@ buildNpmPackage rec {
   '';
 
   meta = with lib; {
-    description =
+    description = "SPX is a graphics control client for live video productions and live streams using CasparCG, OBS, vMix, or similar software";
-      "SPX is a graphics control client for live video productions and live streams using CasparCG, OBS, vMix, or similar software";
     homepage = "https://github.com/TuomoKu/SPX-GC#npminstall";
     license = licenses.mit;
     maintainers = with maintainers; [ ];

home-manager/pkgs/toggl-time-grouper/package.nix

@@ -1,4 +1,4 @@
-{ python3Packages }:
+{ lib, python3Packages }:
 with python3Packages;
 buildPythonApplication {
   name = "toggl-time-grouper";

home-manager/programs/alacritty.nix

@@ -1,4 +1,4 @@
-{ config, ... }:
+{ config, pkgs, lib, ... }:
 
 {
   programs.alacritty = {

home-manager/programs/bat.nix

@@ -1 +1,5 @@
-{ programs.bat = { enable = true; }; }
+{ config, pkgs, lib, ... }:
+
+{
+  programs.bat = { enable = true; };
+}

home-manager/programs/beets.nix

@@ -1,3 +1,5 @@
+{ config, pkgs, lib, ... }:
+
 {
   programs.beets = {
     enable = false;

home-manager/programs/chromium.nix

@@ -31,14 +31,21 @@ let
       "--ozone-platform-hint=auto"
       "--enable-hardware-overlays"
   ];
-  extensions = map (eid: { id = eid; }) chromium_extension;
+  extensions = map
-in {
+    (eid: {
+      id = eid;
+    })
+    chromium_extension;
+in
+{
   programs.chromium = {
-    inherit dictionaries commandLineArgs extensions;
     enable = isEnabled;
+    dictionaries = dictionaries;
+    commandLineArgs = commandLineArgs;
+    extensions = extensions;
   };
   programs.google-chrome = {
-    inherit commandLineArgs;
     enable = isEnabled;
+    commandLineArgs = commandLineArgs;
   };
 }

home-manager/programs/command-not-found.nix

@@ -1 +1,5 @@
-{ programs.command-not-found = { enable = true; }; }
+{ config, pkgs, lib, ... }:
+
+{
+  programs.command-not-found = { enable = true; };
+}

home-manager/programs/dircolors.nix

@@ -1,3 +1,5 @@
+{ config, pkgs, lib, ... }:
+
 {
   programs.dircolors = {
     enable = true;

home-manager/programs/direnv.nix

@@ -1,3 +1,5 @@
+{ config, pkgs, lib, ... }:
+
 {
   programs.direnv = {
     enable = true;

home-manager/programs/fzf.nix

@@ -1,3 +1,5 @@
+{ config, pkgs, lib, ... }:
+
 {
   programs.fzf = {
     enable = true;

home-manager/programs/git.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
 {
   programs.git = {
@@ -27,5 +27,7 @@
       branch = { autosetuprebase = "always"; };
     };
   };
-  programs.git-credential-oauth = { enable = true; };
+  programs.git-credential-oauth = {
+    enable = true;
+  };
 }

home-manager/programs/go.nix

@@ -1 +1,7 @@
-{ programs.go = { enable = true; }; }
+{ config, pkgs, lib, ... }:
+
+{
+  programs.go = {
+    enable = true;
+  };
+}

home-manager/programs/hstr.nix

@@ -1 +1,5 @@
-{ programs.hstr = { enable = true; }; }
+{ config, pkgs, lib, ... }:
+
+{
+  programs.hstr = { enable = true; };
+}

home-manager/programs/htop.nix

@@ -1,3 +1,5 @@
+{ config, pkgs, lib, ... }:
+
 {
   programs.htop = {
     enable = true;

home-manager/programs/neovim.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
 {
   programs.neovim = {

home-manager/programs/starship.nix

@@ -1,3 +1,5 @@
+{ config, pkgs, lib, ... }:
+
 {
   programs.starship = {
     enable = true;

home-manager/programs/syncthing.nix

@@ -1 +1,7 @@
-{ services.syncthing = { enable = true; }; }
+{ config, pkgs, lib, ... }:
+
+{
+  services.syncthing = {
+    enable = true;
+  };
+}

home-manager/programs/topgrade.nix

@@ -1,10 +1,7 @@
-{ config, ... }:
+{ config, pkgs, lib, ... }:
 
 let
-  configPath = if config.machine.isGeneric then
+  configPath = if config.machine.isGeneric then "${config.home.homeDirectory}/.config/home-manager" else "${config.home.homeDirectory}/.nixos-config";
-    "${config.home.homeDirectory}/.config/home-manager"
-  else
-    "${config.home.homeDirectory}/.nixos-config";
 in {
   programs.topgrade = {
     enable = true;
@@ -16,13 +13,18 @@ in {
         pre_sudo = false;
         cleanup = true;
         skip_notify = true;
-        disable = [ "bun" "tldr" "flutter" ];
+        disable = [
+          "bun"
+          "tldr"
+          "flutter"
+        ];
       };
-      git.repos = [ configPath ];
+      git.repos = [
+        configPath
+      ];
       firmware = { upgrade = true; };
       pre_commands = {
-        flakeUpgrade =
+        flakeUpgrade = "cd ${configPath} && nix flake update --commit-lock-file --verbose --repair";
-          "cd ${configPath} && nix flake update --commit-lock-file --verbose --repair";
       };
     };
   };

home-manager/programs/yt-dlp.nix

@@ -1,2 +1,6 @@
-{ programs.yt-dlp = { enable = true; }; }
+{ config, pkgs, lib, ... }:
+
+{
+  programs.yt-dlp = { enable = true; };
+}
 

home-manager/programs/zsh.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ config, pkgs, lib, ... }:
 let
   omz-plugins = [
     "git"

home-manager/wrappers/fedora.nix

@@ -1,4 +1,5 @@
-{ pkgs, lib, ... }:
+
+{ config, pkgs, lib, ... }:
 
 let
   chromeArgs = lib.strings.concatStringsSep " " [
@@ -15,15 +16,15 @@ let
     "--ozone-platform-hint=auto"
     "--enable-features=WaylandWindowDecorations"
   ];
-  code-wrapper = pkgs.writeShellScriptBin "code" ''
+  code-wrapper = (pkgs.writeShellScriptBin "code" ''
     exec /usr/bin/code ${codeArgs} "$@"
-  '';
+  '');
-  chrome-wrapper = pkgs.writeShellScriptBin "google-chrome" ''
+  chrome-wrapper = (pkgs.writeShellScriptBin "google-chrome" ''
     exec /usr/bin/google-chrome ${chromeArgs} "$@"
-  '';
+  '');
-  chrome-stable-wrapper = pkgs.writeShellScriptBin "google-chrome-stable" ''
+  chrome-stable-wrapper = (pkgs.writeShellScriptBin "google-chrome-stable" ''
     exec /usr/bin/google-chrome-stable ${chromeArgs} "$@"
-  '';
+  '');
 in {
   home.packages = with pkgs; [
     code-wrapper

nix.nix

@@ -8,7 +8,10 @@
       sandbox = relaxed
     '';
     settings = {
-      trusted-users = [ "root" "thilo" ];
+      trusted-users = [
+        "root"
+        "thilo"
+      ];
       trusted-substituters = [
 	"https://cache.nixos.org"
         "https://nix-community.cachix.org"

nixos/common.nix

@@ -1,22 +1,31 @@
-{ config, pkgs, lib, inputs, ... }:
+{ config
+, pkgs
+, lib
+, inputs
+, ...
+}:
 
 {
-  imports = [ ./../nix.nix ];
+  imports = [
+    ./../nix.nix
+  ];
 
   nix = {
     # This will add each flake input as a registry
     # To make nix3 commands consistent with your flake
-    registry = lib.mapAttrs (_: value: { flake = value; }) inputs;
+    registry = lib.mapAttrs (_: value: {flake = value;}) inputs;
 
     # This will additionally add your inputs to the system's legacy channels
     # Making legacy nix commands consistent as well, awesome!
-    nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}")
+    nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry;
-      config.nix.registry;
   };
 
   nixpkgs = {
     config = {
-      permittedInsecurePackages = [ "electron-24.8.6" "electron-25.9.0" ];
+      permittedInsecurePackages = [
+        "electron-24.8.6"
+        "electron-25.9.0"
+      ];
       allowUnfree = true;
     };
   };
@@ -76,7 +85,12 @@
     noisetorch.enable = true;
   };
 
-  environment.systemPackages = with pkgs; [ git zsh kitty steamtinkerlaunch ];
+  environment.systemPackages = with pkgs; [
+    git
+    zsh
+    kitty
+    steamtinkerlaunch
+  ];
 
   networking.networkmanager.enable = true;
 
@@ -89,7 +103,9 @@
       pulse.enable = true;
       jack.enable = true;
     };
-    tailscale = { enable = true; };
+    tailscale = {
+      enable = true;
+    };
     flatpak.enable = true;
     avahi = {
       enable = true;
@@ -101,16 +117,12 @@
     };
   };
 
-  hardware = {
+  hardware.opengl.driSupport = true;
-    pulseaudio.enable = false;
+  hardware.opengl.driSupport32Bit = true;
-    opengl = {
-      driSupport = true;
-      driSupport32Bit = true;
-    };
-  };
 
   security.polkit.enable = true;
   sound.enable = true;
+  hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;
 
   time.hardwareClockInLocalTime = true;