configs/fedora/home.nix

@@ -1,15 +1,8 @@
-{
+{ pkgs, config, lib, inputs, ... }:
-  pkgs,
-  config,
-  lib,
-  inputs,
-  ...
-}:
 
 let
   nixGL = import ./../../home-manager/utils/nixGLWrap.nix { inherit pkgs config; };
-in
+in {
-{
   imports = [ ./../../home-manager/modules/machine.nix ];
 
   machine = {

configs/thilo-laptop/hardware-configuration.nix

@@ -1,21 +1,11 @@
-{
+{ config, lib, modulesPath, ... }:
-  config,
-  lib,
-  modulesPath,
-  ...
-}:
 
 {
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
   boot = {
     initrd = {
-      availableKernelModules = [
+      availableKernelModules = [ "nvme" "xhci_pci" "usb_storage" "sd_mod" ];
-        "nvme"
-        "xhci_pci"
-        "usb_storage"
-        "sd_mod"
-      ];
       kernelModules = [ ];
     };
     kernelModules = [ "kvm-amd" ];
@@ -27,7 +17,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";
@@ -45,5 +36,6 @@
   # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware.cpu.amd.updateMicrocode =
+    lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

configs/thilo-laptop/home.nix

@@ -4,9 +4,7 @@
   home-manager = {
     useGlobalPkgs = true;
     useUserPackages = true;
-    extraSpecialArgs = {
+    extraSpecialArgs = { inherit inputs; };
-      inherit inputs;
-    };
     users.thilo = {
       imports = [ ./../../home-manager/modules/machine.nix ];
 
@@ -18,9 +16,7 @@
         isGraphical = true;
       };
 
-      home.sessionVariables = {
+      home.sessionVariables = { LD_LIBRARY_PATH = "${pkgs.libGL}/lib"; };
-        LD_LIBRARY_PATH = "${pkgs.libGL}/lib";
-      };
     };
   };
 }

configs/thilo-laptop/nixos.nix

@@ -1,8 +1,7 @@
 { pkgs, ... }:
 
 {
-  imports = [
+  imports = [ # Include the results of the hardware scan.
-    # Include the results of the hardware scan.
     ./hardware-configuration.nix
     ./../../nixos/common.nix
     ./../../nixos/builders.nix
@@ -16,19 +15,14 @@
   boot.plymouth.enable = true;
 
   # Setup keyfile
-  boot.initrd.secrets = {
+  boot.initrd.secrets = { "/crypto_keyfile.bin" = null; };
-    "/crypto_keyfile.bin" = null;
-  };
 
   networking.hostName = "thilo-laptop"; # Define your hostname.
 
   # Configure console keymap
   console.keyMap = "de";
 
-  environment.gnome.excludePackages = with pkgs; [
+  environment.gnome.excludePackages = with pkgs; [ tracker tracker-miners ];
-    tracker
-    tracker-miners
-  ];
 
   hardware.bluetooth.enable = true;
 
@@ -72,16 +66,18 @@
     ];
   };
 
-  environment.systemPackages = with pkgs; [
+  environment.systemPackages = with pkgs; [ brlaser brgenml1lpr ];
-    brlaser
+
-    brgenml1lpr
+  nixpkgs.config.permittedInsecurePackages = [
+    "nix-2.16.2"
   ];
 
-  nixpkgs.config.permittedInsecurePackages = [ "nix-2.16.2" ];
 
   xdg.portal = {
     enable = true;
-    extraPortals = [ pkgs.kdePackages.xdg-desktop-portal-kde ];
+    extraPortals = [
+      pkgs.kdePackages.xdg-desktop-portal-kde
+    ];
   };
 
   system.stateVersion = "23.05";

configs/thilo-pc/hardware-configuration.nix

@@ -1,27 +1,15 @@
 # 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,
-  modulesPath,
-  ...
-}:
 
 {
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
   boot = {
     initrd = {
-      availableKernelModules = [
+      availableKernelModules =
-        "nvme"
+        [ "nvme" "xhci_pci" "ahci" "usbhid" "uas" "usb_storage" "sd_mod" ];
-        "xhci_pci"
-        "ahci"
-        "usbhid"
-        "uas"
-        "usb_storage"
-        "sd_mod"
-      ];
       kernelModules = [ ];
     };
     kernelModules = [ "kvm-amd" ];
@@ -56,5 +44,6 @@
   # networking.interfaces.enp8s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware.cpu.amd.updateMicrocode =
+    lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

configs/thilo-pc/home.nix

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

configs/thilo-pc/nixos.nix

@@ -58,10 +58,7 @@
   programs.nix-ld.enable = true;
 
   hardware.opengl = {
-    extraPackages = with pkgs; [
+    extraPackages = with pkgs; [ vaapiVdpau libvdpau-va-gl ];
-      vaapiVdpau
-      libvdpau-va-gl
-    ];
   };
   hardware.bluetooth.enable = true;
 
@@ -89,7 +86,9 @@
     ];
   };
 
-  nixpkgs.config.permittedInsecurePackages = [ "nix-2.16.2" ];
+  nixpkgs.config.permittedInsecurePackages = [
+    "nix-2.16.2"
+  ];
 
   system.stateVersion = "23.05";
 }

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1716892732,
+        "lastModified": 1715270390,
-        "narHash": "sha256-n1UnQ7RbJwDAUX1fq4+hUNVVIWDlZKvAsUp/muSkV3g=",
+        "narHash": "sha256-j4k51vcfTCgEPElhB+/4fL8MA05HhC+vZvUh1eQYzc0=",
         "owner": "dagger",
         "repo": "nix",
-        "rev": "9e26b2f73eebf9e3b9fbc1a31c378ccb2daf84cd",
+        "rev": "561a09f4c8b0eadf291f072b2e35498d9e33cdb9",
         "type": "github"
       },
       "original": {
@@ -93,11 +93,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1716908526,
+        "lastModified": 1715930644,
-        "narHash": "sha256-Zl6e/sEVDh07K47XxDGPsXTYT4nI6llUDbQ4xMIwp7k=",
+        "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "373ead20606efa9181cd15ba19a5deac7ead1492",
+        "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d",
         "type": "github"
       },
       "original": {
@@ -214,11 +214,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1716772633,
+        "lastModified": 1716170277,
-        "narHash": "sha256-Idcye44UW+EgjbjCoklf2IDF+XrehV6CVYvxR1omst4=",
+        "narHash": "sha256-fCAiox/TuzWGVaAz16PxrR4Jtf9lN5dwWL2W74DS0yI=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "ff80cb4a11bb87f3ce8459be6f16a25ac86eb2ac",
+        "rev": "e0638db3db43b582512a7de8c0f8363a162842b9",
         "type": "github"
       },
       "original": {
@@ -288,11 +288,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1716350738,
+        "lastModified": 1715679428,
-        "narHash": "sha256-aTwS8rp0vaDOIgirVNfYNr8swW/yG8AtOxbBoFpdD9U=",
+        "narHash": "sha256-WapL4RmvX+FaRtJvhbtCDGGzefn8wam+yO0hnf4l9+s=",
         "owner": "ryantm",
         "repo": "nixpkgs-update",
-        "rev": "3e25ce4c5f54e790bf757ac2f17915fc8ec4fc1d",
+        "rev": "4e1df89d081c96429f257d125f4c7ab02adffd47",
         "type": "github"
       },
       "original": {
@@ -303,11 +303,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1716509168,
+        "lastModified": 1716137900,
-        "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=",
+        "narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "bfb7a882678e518398ce9a31a881538679f6f092",
+        "rev": "6c0b7a92c30122196a761b440ac0d46d3d9954f1",
         "type": "github"
       },
       "original": {

flake.nix

@@ -2,12 +2,8 @@
   description = "Nixos config";
 
   inputs = {
-    nixpkgs = {
+    nixpkgs = { url = "github:NixOS/nixpkgs/nixos-unstable"; };
-      url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs-update = { url = "github:ryantm/nixpkgs-update"; };
-    };
-    nixpkgs-update = {
-      url = "github:ryantm/nixpkgs-update";
-    };
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -49,14 +45,7 @@
       ];
   };
 
-  outputs =
+  outputs = { nixpkgs, home-manager, nixgl, w17, ... }@inputs:
-    {
-      nixpkgs,
-      home-manager,
-      nixgl,
-      w17,
-      ...
-    }@inputs:
     let
       system = "x86_64-linux";
       pkgs = import nixpkgs {
@@ -64,8 +53,7 @@
         overlays = [ nixgl.overlay ];
         allowUnfree = true;
       };
-    in
+    in {
-    {
       nixosConfigurations.thilo-pc = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         modules = [
@@ -73,9 +61,7 @@
           ./configs/thilo-pc/nixos.nix
           ./configs/thilo-pc/home.nix
         ];
-        specialArgs = {
+        specialArgs = { inherit inputs; };
-          inherit inputs;
-        };
       };
       nixosConfigurations.thilo-laptop = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
@@ -84,33 +70,28 @@
           ./configs/thilo-laptop/nixos.nix
           ./configs/thilo-laptop/home.nix
         ];
-        specialArgs = {
+        specialArgs = { inherit inputs; };
-          inherit inputs;
       };
-      };
+      homeConfigurations."thilo@thilo-pc" =
-      homeConfigurations."thilo@thilo-pc" = home-manager.lib.homeManagerConfiguration {
+        home-manager.lib.homeManagerConfiguration {
           inherit pkgs;
           modules = [
             inputs.nix-index-database.hmModules.nix-index
             ./configs/fedora/home.nix
           ];
-        extraSpecialArgs = {
+          extraSpecialArgs = { inherit inputs nixgl; };
-          inherit inputs nixgl;
         };
-      };
+      homeConfigurations."thilo@thilo-laptop" =
-      homeConfigurations."thilo@thilo-laptop" = home-manager.lib.homeManagerConfiguration {
+        home-manager.lib.homeManagerConfiguration {
           inherit pkgs;
           modules = [ ./configs/fedora/home.nix ];
-        extraSpecialArgs = {
+          extraSpecialArgs = { inherit inputs nixgl; };
-          inherit inputs nixgl;
         };
-      };
+      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 = {
+          extraSpecialArgs = { inherit inputs nixgl; };
-          inherit inputs nixgl;
-        };
         };
     };
 }

home-manager/modules/machine.nix

@@ -1,11 +1,5 @@
-{
+{ lib, pkgs, config, ... }:
-  lib,
+with lib; {
-  pkgs,
-  config,
-  ...
-}:
-with lib;
-{
   imports = [
     ./../programs/atuin.nix
     ./../programs/alacritty.nix
@@ -86,7 +80,8 @@ with lib;
         '';
         ".ssh/config_source" = {
           source = ./../dotfiles/ssh-config;
-          onChange = "cat ~/.ssh/config_source > ~/.ssh/config && chmod 600 ~/.ssh/config";
+          onChange =
+            "cat ~/.ssh/config_source > ~/.ssh/config && chmod 600 ~/.ssh/config";
         };
         ".gitignore".source = ./../dotfiles/.gitignore;
         ".config/pipewire/pipewire.conf.d/99-noise-suppression.conf".text = ''
@@ -136,3 +131,4 @@ with lib;
     };
   };
 }
+

home-manager/modules/packages.nix

@@ -1,15 +1,10 @@
-{
+{ config, pkgs, lib, inputs, ... }:
-  config,
-  pkgs,
-  lib,
-  inputs,
-  ...
-}:
 
 with lib;
 let
   nixGL = import ./../../home-manager/utils/nixGLWrap.nix { inherit pkgs config; };
-  electronFlags = "--enable-features=UseOzonePlatform --ozone-platform=wayland --enable-wayland-ime --disable-gpu-shader-disk-cache -n";
+  electronFlags =
+    "--enable-features=UseOzonePlatform --ozone-platform=wayland --enable-wayland-ime --disable-gpu-shader-disk-cache -n";
 in
 {
   config = {
@@ -21,15 +16,14 @@ in
       })
     ];
 
-    home.packages =
+    home.packages = with pkgs;
-      with pkgs;
       [
         pkgs.nixVersions.latest # because remotely invoked updates are fun ;)
         up
         htop
         rustc
         cargo
-        nixfmt-rfc-style
+        nixfmt
         nodejs
         bun
         deno
@@ -46,11 +40,12 @@ in
         hub
         httpie
         manix
-        (pkgs.writeShellScriptBin "ssh-fix-permissions" (
+        (pkgs.writeShellScriptBin "ssh-fix-permissions"
-          builtins.readFile ./../scripts/ssh-fix-permissions.sh
+          (builtins.readFile ./../scripts/ssh-fix-permissions.sh))
-        ))
+        (pkgs.writeShellScriptBin "yt-dlp-audio"
-        (pkgs.writeShellScriptBin "yt-dlp-audio" (builtins.readFile ./../scripts/yt-dlp-audio.sh))
+          (builtins.readFile ./../scripts/yt-dlp-audio.sh))
-        (pkgs.writeShellScriptBin "nix-shell-init" (builtins.readFile ./../scripts/nix-shell-init.sh))
+        (pkgs.writeShellScriptBin "nix-shell-init"
+          (builtins.readFile ./../scripts/nix-shell-init.sh))
         (pkgs.writeShellScriptBin "http-server" ''
           ${pkgs.caddy}/bin/caddy file-server --listen :2345
         '')
@@ -77,37 +72,33 @@ in
         inputs.w17.packages.x86_64-linux.default
         aichat
         (pkgs.nerdfonts.override {
-          fonts = [
+          fonts = [ "JetBrainsMono" "FiraCode" "FiraMono" ];
-            "JetBrainsMono"
-            "FiraCode"
-            "FiraMono"
-          ];
         })
         nix-output-monitor
         nodePackages.pnpm
         npm-check-updates
-      ]
+      ] ++ (
-      ++ (
+        if (
-        if (!config.machine.isGeneric) then
+          !config.machine.isGeneric
-          [
+        ) then [
           toolbox
           distrobox
-          ]
+        ] else
-        else
           [ ]
-      )
+      ) ++ (
-      ++ (
+        if (
-        if (config.machine.isGraphical) then
+          config.machine.isGraphical
-          [
+        ) then [
           (nixGL insomnia)
           (nixGL comma)
-          ]
+        ] else
-        else
           [ ]
-      )
+      ) ++ (
-      ++ (
+        if (
-        if (config.machine.isGraphical && !config.machine.isGeneric) then
+          config.machine.isGraphical && !config.machine.isGeneric
-          [
+        ) then [
+          corefonts
+          vistafonts
           jetbrains.webstorm
           jetbrains.phpstorm
           jetbrains.rust-rover
@@ -150,21 +141,15 @@ in
           inputs.nix-alien.packages.x86_64-linux.nix-alien
           kdePackages.kdenlive
           audacity
-          ]
+        ] 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,8 +1,4 @@
-{
+{ lib, stdenv, fetchFromGitHub }:
-  lib,
-  stdenv,
-  fetchFromGitHub,
-}:
 
 stdenv.mkDerivation rec {
   pname = "docker-craft-cms-dev-env";
@@ -21,7 +17,8 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "Docker image for local development of sites based on Craft CMS";
+    description =
+      "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/extract.nix

@@ -1,9 +1,9 @@
 { pkgs }:
 
-# SOURCE: https://ostechnix.com/a-bash-function-to-extract-file-archives-of-various-types/
+/* SOURCE: https://ostechnix.com/a-bash-function-to-extract-file-archives-of-various-types/ */
 
 pkgs.writeShellScriptBin "extract" ''
-  if [ -f $1 ] ; then
+if [ -f $1 ] ; then
   case $1 in
     *.tar.bz2)   ${pkgs.gnutar}/bin/tar xjf $1     ;;
     *.tar.gz)    ${pkgs.gnutar}/bin/tar $1     ;;
@@ -18,7 +18,7 @@ pkgs.writeShellScriptBin "extract" ''
     *.7z)        ${pkgs._7zz}/bin/7z x $1    ;;
     *)           echo "'$1' cannot be extracted via extract()" ;;
   esac
-  else
+else
   echo "'$1' is not a valid file"
-  fi
+fi
 ''

home-manager/pkgs/spx-gc.nix

@@ -1,8 +1,4 @@
-{
+{ lib, buildNpmPackage, fetchFromGitHub }:
-  lib,
-  buildNpmPackage,
-  fetchFromGitHub,
-}:
 
 buildNpmPackage rec {
   pname = "spx-gc";
@@ -25,7 +21,8 @@ buildNpmPackage rec {
   '';
 
   meta = with lib; {
-    description = "SPX is a graphics control client for live video productions and live streams using CasparCG, OBS, vMix, or similar software";
+    description =
+      "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/programs/alacritty.nix

@@ -1,14 +1,8 @@
-{
+{ config, pkgs, lib, ... }:
-  config,
-  pkgs,
-  lib,
-  ...
-}:
 
 let
   nixGL = import ./../../home-manager/utils/nixGLWrap.nix { inherit pkgs config; };
-in
+in {
-{
   programs.alacritty = {
     enable = if config.machine.isGraphical then true else false;
     package = (nixGL pkgs.alacritty);

home-manager/programs/atuin.nix

@@ -1,5 +1,3 @@
 {
-  programs.atuin = {
+  programs.atuin = { enable = true; };
-    enable = true;
-  };
 }

home-manager/programs/bat.nix

@@ -1,5 +1 @@
-{
+{ programs.bat = { enable = true; }; }
-  programs.bat = {
-    enable = true;
-  };
-}

home-manager/programs/beets.nix

@@ -12,9 +12,7 @@
         duplicate_action = "ask";
         default_action = "apply";
       };
-      badfiles = {
+      badfiles = { check_on_import = "yes"; };
-        check_on_import = "yes";
-      };
       match = {
         max_rec = {
           track_length = "strong";

home-manager/programs/chromium.nix

@@ -20,10 +20,7 @@ let
     "kbfnbcaeplbcioakkpcpgfkobkghlhen" # Grammarly
   ];
   isEnabled = if (config.machine.isGraphical && !config.machine.isGeneric) then true else false;
-  dictionaries = with pkgs.hunspellDictsChromium; [
+  dictionaries = with pkgs.hunspellDictsChromium; [ en_US de_DE ];
-    en_US
-    de_DE
-  ];
   commandLineArgs = [
     "--enable-wayland-ime"
     "--ignore-gpu-blocklist"
@@ -33,8 +30,7 @@ let
     "--enable-features=WaylandWindowDecorations,VaapiVideoDecoder,VaapiVideoEncoder,VaapiVideoDecodeLinuxGL,WebRTCPipeWireCapturer"
   ];
   extensions = map (eid: { id = eid; }) chromium_extension;
-in
+in {
-{
   programs.chromium = {
     inherit dictionaries commandLineArgs extensions;
     enable = isEnabled;

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

@@ -1,5 +1 @@
-{
+{ programs.command-not-found = { enable = false; }; }
-  programs.command-not-found = {
-    enable = false;
-  };
-}

home-manager/programs/git.nix

@@ -15,28 +15,18 @@
         ui = true;
         pager = true;
       };
-      log = {
+      log = { date = "short"; };
-        date = "short";
+      rerere = { enabled = "1"; };
-      };
-      rerere = {
-        enabled = "1";
-      };
       core = {
         whitespace = "fix,-indent-with-non-tab,trailing-space,cr-at-eol";
         excludesfile = "~/.gitignore";
         autocrlf = "input";
       };
-      apply = {
+      apply = { whitespace = "nowarn"; };
-        whitespace = "nowarn";
+      branch = { autosetuprebase = "always"; };
-      };
-      branch = {
-        autosetuprebase = "always";
     };
   };
-  };
+  programs.git-credential-oauth = { enable = true; };
-  programs.git-credential-oauth = {
-    enable = true;
-  };
   programs.gh.enable = true;
   programs.gh-dash.enable = true;
   programs.lazygit.enable = true;

home-manager/programs/go.nix

@@ -1,5 +1 @@
-{
+{ programs.go = { enable = true; }; }
-  programs.go = {
-    enable = true;
-  };
-}

home-manager/programs/hstr.nix

@@ -1,5 +1 @@
-{
+{ programs.hstr = { enable = true; }; }
-  programs.hstr = {
-    enable = true;
-  };
-}

home-manager/programs/mpv.nix

@@ -3,10 +3,6 @@
 {
   programs.mpv = {
     enable = if (config.machine.isGraphical && !config.machine.isGeneric) then true else false;
-    scripts = with pkgs.mpvScripts; [
+    scripts = with pkgs.mpvScripts; [ autoload mpris sponsorblock ];
-      autoload
-      mpris
-      sponsorblock
-    ];
   };
 }

home-manager/programs/neovim.nix

@@ -7,9 +7,7 @@
     viAlias = true;
     vimAlias = true;
     vimdiffAlias = true;
-    coc = {
+    coc = { enable = true; };
-      enable = true;
-    };
     extraConfig = ''
       set title
       set ignorecase

home-manager/programs/starship.nix

@@ -3,12 +3,8 @@
     enable = true;
     settings = {
       add_newline = false;
-      character = {
+      character = { success_symbol = "[❯](bold white)"; };
-        success_symbol = "[❯](bold white)";
+      package = { disabled = true; };
-      };
-      package = {
-        disabled = true;
-      };
     };
   };
 }

home-manager/programs/syncthing.nix

@@ -1,5 +1 @@
-{
+{ services.syncthing = { enable = true; }; }
-  services.syncthing = {
-    enable = true;
-  };
-}

home-manager/programs/thefuck.nix

@@ -1,5 +1,3 @@
 {
-  programs.thefuck = {
+  programs.thefuck = { enable = false; };
-    enable = false;
-  };
 }

home-manager/programs/topgrade.nix

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

home-manager/programs/yt-dlp.nix

@@ -1,5 +1,2 @@
-{
+{ programs.yt-dlp = { enable = true; }; }
-  programs.yt-dlp = {
+
-    enable = true;
-  };
-}

home-manager/utils/nixGLWrap.nix

@@ -1,9 +1,12 @@
 # Call once on import to load global context
-{ pkgs, config }:
+{
+  pkgs,
+  config,
+}:
 # Wrap a single package
 pkg:
-if config.nixGLPrefix == "" then
+if config.nixGLPrefix == ""
-  pkg
+then pkg
 else
   # Wrap the package's binaries with nixGL, while preserving the rest of
   # the outputs and derivation attributes.
@@ -14,14 +17,12 @@ else
 
       ${
         # Heavily inspired by https://stackoverflow.com/a/68523368/6259505
-        pkgs.lib.concatStringsSep "\n" (
+        pkgs.lib.concatStringsSep "\n" (map (outputName: ''
-          map (outputName: ''
           echo "Copying output ${outputName}"
           set -x
           cp -rs --no-preserve=mode "${pkg.${outputName}}" "''$${outputName}"
           set +x
-          '') (old.outputs or [ "out" ])
+        '') (old.outputs or ["out"]))
-        )
       }
 
       rm -rf $out/bin/*

home-manager/wrappers/fedora.nix

@@ -24,8 +24,7 @@ let
   chrome-stable-wrapper = pkgs.writeShellScriptBin "google-chrome-stable" ''
     exec /usr/bin/google-chrome-stable ${chromeArgs} "$@"
   '';
-in
+in {
-{
   home.packages = with pkgs; [
     code-wrapper
     chrome-wrapper

nix.nix

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

nixos/builders.nix

@@ -8,8 +8,7 @@
 
   nix = {
     distributedBuilds = true;
-    buildMachines = [
+    buildMachines = [ {
-      {
       hostName = "build1.darmstadt.ccc.de";
       protocol = "ssh";
       sshUser = "avocadoom";
@@ -25,8 +24,7 @@
         "kvm"
         "nixos-test"
       ];
-      }
+    } {
-      {
       hostName = "build2.darmstadt.ccc.de";
       protocol = "ssh";
       sshUser = "avocadoom";
@@ -42,8 +40,7 @@
         "kvm"
         "nixos-test"
       ];
-      }
+    } {
-      {
       hostName = "build3.darmstadt.ccc.de";
       protocol = "ssh";
       sshUser = "avocadoom";
@@ -59,8 +56,7 @@
         "kvm"
         "nixos-test"
       ];
-      }
+    } {
-      {
       hostName = "build4.darmstadt.ccc.de";
       protocol = "ssh";
       sshUser = "avocadoom";
@@ -77,7 +73,6 @@
         "kvm"
         "nixos-test"
       ];
-      }
+    } ];
-    ];
   };
 }

nixos/common.nix

@@ -1,10 +1,4 @@
-{
+{ config, pkgs, lib, inputs, ... }:
-  config,
-  pkgs,
-  lib,
-  inputs,
-  ...
-}:
 
 {
   imports = [ ./../nix.nix ];
@@ -16,15 +10,13 @@
 
     # 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}") config.nix.registry;
+    nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}")
+      config.nix.registry;
   };
 
   nixpkgs = {
     config = {
-      permittedInsecurePackages = [
+      permittedInsecurePackages = [ "electron-24.8.6" "electron-25.9.0" ];
-        "electron-24.8.6"
-        "electron-25.9.0"
-      ];
       allowUnfree = true;
     };
   };
@@ -86,12 +78,7 @@
     };
   };
 
-  environment.systemPackages = with pkgs; [
+  environment.systemPackages = with pkgs; [ git zsh kitty steamtinkerlaunch ];
-    git
-    zsh
-    kitty
-    steamtinkerlaunch
-  ];
 
   networking.networkmanager.enable = true;
 
@@ -104,9 +91,7 @@
       pulse.enable = true;
       jack.enable = true;
     };
-    tailscale = {
+    tailscale = { enable = true; };
-      enable = true;
-    };
     flatpak.enable = true;
     avahi = {
       enable = true;