cleanup and format

configs/thilo-laptop/hardware-configuration.nix

@@ -1,24 +1,27 @@
-{ config, lib, pkgs, modulesPath, ... }:
+{ config, lib, modulesPath, ... }:
 
 {
-  imports =
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
 
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usb_storage" "sd_mod" ];
+  boot = {
-  boot.initrd.kernelModules = [ ];
+    initrd = {
-  boot.kernelModules = [ "kvm-amd" ];
+      availableKernelModules = [ "nvme" "xhci_pci" "usb_storage" "sd_mod" ];
-  boot.extraModulePackages = [ ];
+      kernelModules = [ ];
+    };
+    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 = "/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" =
+  fileSystems."/boot" = {
-    { device = "/dev/disk/by-uuid/877C-C918";
+    device = "/dev/disk/by-uuid/877C-C918";
     fsType = "vfat";
   };
 
@@ -33,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

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

configs/thilo-laptop/nixos.nix

@@ -1,35 +1,26 @@
-{
+{ pkgs, ... }:
-  config,
-  pkgs,
-  lib,
-  ...
-}:
 
 {
-  imports =
+  imports = [ # Include the results of the hardware scan.
-    [ # Include the results of the hardware scan.
     ./hardware-configuration.nix
     ./../../nixos/common.nix
   ];
 
   # Bootloader.
-  boot.loader.systemd-boot.enable = true;
+  boot.loader = {
-  boot.loader.efi.canTouchEfiVariables = true;
+    systemd-boot.enable = true;
+    efi.canTouchEfiVariables = 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;
 
@@ -50,10 +41,7 @@
     fwupd.enable = true;
   };
 
-  environment.systemPackages = with pkgs; [
+  environment.systemPackages = with pkgs; [ brlaser brgenml1lpr ];
-    brlaser
-    brgenml1lpr
-  ];
 
   system.stateVersion = "23.05";
 }

configs/thilo-pc/hardware-configuration.nix

@@ -1,34 +1,38 @@
 # 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, pkgs, modulesPath, ... }:
+{ config, lib, modulesPath, ... }:
 
 {
-  imports =
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
 
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "uas" "usb_storage" "sd_mod" ];
+  boot = {
-  boot.initrd.kernelModules = [ ];
+    initrd = {
-  boot.kernelModules = [ "kvm-amd" ];
+      availableKernelModules =
-  boot.extraModulePackages = [ ];
+        [ "nvme" "xhci_pci" "ahci" "usbhid" "uas" "usb_storage" "sd_mod" ];
+      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=@" ];
     };
 
-  fileSystems."/data" =
+    "/data" = {
-    {
       device = "/dev/disk/by-uuid/91f64815-1d3c-4032-960f-0a53eb3b01ab";
       fsType = "btrfs";
     };
 
-  fileSystems."/boot" =
+    "/boot" = {
-    { device = "/dev/disk/by-uuid/0EB3-BFB0";
+      device = "/dev/disk/by-uuid/0EB3-BFB0";
       fsType = "vfat";
     };
+  };
 
   swapDevices = [ ];
 
@@ -40,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

@@ -1,13 +1,12 @@
 { inputs, pkgs, ... }:
 
 {
-  home-manager.useGlobalPkgs = true;
+  home-manager = {
-  home-manager.useUserPackages = true;
+    useGlobalPkgs = true;
-  home-manager.extraSpecialArgs = { inherit inputs; };
+    useUserPackages = true;
-  home-manager.users.thilo = {
+    extraSpecialArgs = { inherit inputs; };
-    imports = [
+    users.thilo = {
-      ./../../home-manager/modules/machine.nix
+      imports = [ ./../../home-manager/modules/machine.nix ];
-    ];
 
       machine = {
         username = "thilo";
@@ -26,12 +25,9 @@
       services.kdeconnect.enable = true;
       services.kdeconnect.indicator = true;
 
-    home.sessionVariables = {
+      home.sessionVariables = { LD_LIBRARY_PATH = "${pkgs.libGL}/lib"; };
-      LD_LIBRARY_PATH = "${pkgs.libGL}/lib";
-    };
 
-    home.packages = with pkgs; [
+      home.packages = with pkgs; [ libsForQt5.discover ];
-      libsForQt5.discover
+    };
-    ];
   };
 }

configs/thilo-pc/nixos.nix

@@ -1,11 +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’).
-{ config
+{ pkgs, ... }:
-, pkgs
-, lib
-, ...
-}:
 
 {
   imports = [
@@ -15,12 +11,18 @@
   ];
 
   # Bootloader.
-  boot.loader.systemd-boot.enable = true;
+  boot = {
-  boot.loader.efi.canTouchEfiVariables = true;
+    loader = {
-  boot.loader.systemd-boot.extraInstallCommands = ''
+      systemd-boot = {
+        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";
 
@@ -37,10 +39,7 @@
   };
 
   hardware.opengl = {
-    extraPackages = with pkgs; [
+    extraPackages = with pkgs; [ vaapiVdpau libvdpau-va-gl ];
-      vaapiVdpau
-      libvdpau-va-gl
-    ];
   };
 
   system.stateVersion = "23.05";

configs/wsl/home.nix

@@ -1,9 +1,7 @@
-{ inputs, ... }:
+{ ... }:
 
 {
-    imports = [
+  imports = [ ./../../home-manager/modules/machine.nix ];
-      ./../../home-manager/modules/machine.nix
-    ];
 
   machine = {
     username = "thilo";

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

home-manager/modules/machine.nix

@@ -1,6 +1,5 @@
 { lib, pkgs, config, ... }:
-with lib;
+with lib; {
-{
   imports = [
     ./../programs/alacritty.nix
     ./../programs/bat.nix
@@ -71,7 +70,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 = ''

home-manager/modules/packages.nix

@@ -2,20 +2,20 @@
 
 with lib;
 let
-    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 = {
     nixpkgs.overlays = [
-      (final: prev: {
+      (_: prev: {
         quickemu = prev.quickemu.overrideAttrs (old: {
-          patches = (old.patches or [ ]) ++ [
+          patches = (old.patches or [ ]) ++ [ ./../patches/quickemu.patch ];
-            ./../patches/quickemu.patch
-          ];
         });
       })
     ];
 
-    home.packages = with pkgs; [
+    home.packages = with pkgs;
+      [
         up
         htop
         rustc
@@ -50,9 +50,7 @@ in {
         (pkgs.writeShellScriptBin "nix-build-default" ''
           nix-build -E 'with import <nixpkgs> { }; callPackage ./default.nix { }'
         '')
-      (callPackage ./../pkgs/toggl-time-grouper/package.nix {
+        (callPackage ./../pkgs/toggl-time-grouper/package.nix { inherit lib; })
-        inherit lib;
-      })
         nixpkgs-fmt
         toolbox
         distrobox
@@ -89,10 +87,8 @@ in {
         spotify
         vesktop
         (lutris.override {
-        extraLibraries = pkgs: [
+          extraLibraries = _: [ gnome3.adwaita-icon-theme ];
-          gnome3.adwaita-icon-theme
+          extraPkgs = _: [
-        ];
-        extraPkgs = pkgs: [
             wineWowPackages.full
             winetricks
             gnome3.adwaita-icon-theme
@@ -118,12 +114,14 @@ in {
         syncthingtray
         reaper
         yabridge
-    ] else [ ]) ++ (if config.machine.isGnome then [
+      ] else
+        [ ]) ++ (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,7 +1,4 @@
-{ lib
+{ lib, stdenv, fetchFromGitHub }:
-, stdenv
-, fetchFromGitHub
-}:
 
 stdenv.mkDerivation rec {
   pname = "docker-craft-cms-dev-env";
@@ -20,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/spx-gc.nix

@@ -1,8 +1,4 @@
-{ lib
+{ lib, buildNpmPackage, fetchFromGitHub }:
-, stdenv
-, 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/pkgs/toggl-time-grouper/package.nix

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

home-manager/programs/alacritty.nix

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

home-manager/programs/bat.nix

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

home-manager/programs/beets.nix

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

home-manager/programs/chromium.nix

@@ -31,21 +31,14 @@ let
     "--ozone-platform-hint=auto"
     "--enable-hardware-overlays"
   ];
-  extensions = map
+  extensions = map (eid: { id = eid; }) chromium_extension;
-    (eid: {
+in {
-      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,5 +1 @@
-{ config, pkgs, lib, ... }:
+{ programs.command-not-found = { enable = true; }; }
-
-{
-  programs.command-not-found = { enable = true; };
-}

home-manager/programs/dircolors.nix

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

home-manager/programs/direnv.nix

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

home-manager/programs/fzf.nix

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

home-manager/programs/git.nix

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

home-manager/programs/go.nix

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

home-manager/programs/hstr.nix

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

home-manager/programs/htop.nix

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

home-manager/programs/neovim.nix

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

home-manager/programs/starship.nix

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

home-manager/programs/syncthing.nix

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

home-manager/programs/topgrade.nix

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

home-manager/programs/yt-dlp.nix

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

home-manager/programs/zsh.nix

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

home-manager/wrappers/fedora.nix

@@ -1,5 +1,4 @@
-
+{ pkgs, lib, ... }:
-{ config, pkgs, lib, ... }:
 
 let
   chromeArgs = lib.strings.concatStringsSep " " [
@@ -16,15 +15,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,10 +8,7 @@
       sandbox = relaxed
     '';
     settings = {
-      trusted-users = [
+      trusted-users = [ "root" "thilo" ];
-        "root"
-        "thilo"
-      ];
       trusted-substituters = [
         "https://cache.nixos.org"
         "https://nix-community.cachix.org"

nixos/common.nix

@@ -1,14 +1,7 @@
-{ config
+{ config, pkgs, lib, inputs, ... }:
-, pkgs
-, lib
-, inputs
-, ...
-}:
 
 {
-  imports = [
+  imports = [ ./../nix.nix ];
-    ./../nix.nix
-  ];
 
   nix = {
     # This will add each flake input as a registry
@@ -17,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;
     };
   };
@@ -85,12 +76,7 @@
     noisetorch.enable = true;
   };
 
-  environment.systemPackages = with pkgs; [
+  environment.systemPackages = with pkgs; [ git zsh kitty steamtinkerlaunch ];
-    git
-    zsh
-    kitty
-    steamtinkerlaunch
-  ];
 
   networking.networkmanager.enable = true;
 
@@ -103,9 +89,7 @@
       pulse.enable = true;
       jack.enable = true;
     };
-    tailscale = {
+    tailscale = { enable = true; };
-      enable = true;
-    };
     flatpak.enable = true;
     avahi = {
       enable = true;
@@ -117,12 +101,16 @@
     };
   };
 
-  hardware.opengl.driSupport = true;
+  hardware = {
-  hardware.opengl.driSupport32Bit = true;
+    pulseaudio.enable = false;
+    opengl = {
+      driSupport = true;
+      driSupport32Bit = true;
+    };
+  };
 
   security.polkit.enable = true;
   sound.enable = true;
-  hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;
 
   time.hardwareClockInLocalTime = true;