Wallpapers

flake.lock: Update
Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/b4372c4924d9182034066c823df76d6eaf1f4ec4' (2023-12-07) → 'github:NixOS/nixpkgs/781e2a9797ecf0f146e81425c822dca69fe4a348' (2023-12-10)
2023-12-11 23:33:26 +00:00 · 2023-12-11 18:32:45 +00:00 · 2023-12-11 18:31:55 +00:00 · 2023-12-10 23:53:54 +00:00 · 2023-12-10 19:45:31 +00:00 · 2023-12-10 18:44:42 +00:00
52 changed files with 586 additions and 718 deletions
--- a/flake.lock
+++ b/flake.lock
@ -45,11 +45,11 @@
    "firefox-gnome-theme": {
      "flake": false,
      "locked": {
-        "lastModified": 1701370547,
-        "narHash": "sha256-pCtPIcRnMMJOwAlNh5qTO00uw/PBThIIzjMCRcCyHYw=",
+        "lastModified": 1702138393,
+        "narHash": "sha256-2jRm1yzX+gKpSCtdpYt1olIgWVEkJnS7FeK00o9X1ko=",
        "owner": "rafaelmardojai",
        "repo": "firefox-gnome-theme",
-        "rev": "ec9421f82d922b7293ffd45a47f7abdee80038c6",
+        "rev": "d2e6cfdd63651ae8168e5905d94138f406580dd6",
        "type": "github"
      },
      "original": {
@ -86,11 +86,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1700814205,
-        "narHash": "sha256-lWqDPKHRbQfi+zNIivf031BUeyciVOtwCwTjyrhDB5g=",
+        "lastModified": 1702195709,
+        "narHash": "sha256-+zRjWkm5rKqQ57PuLZ3JF3xi3vPMiOJzItb1m/43Cq4=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "aeb2232d7a32530d3448318790534d196bf9427a",
+        "rev": "6761b8188b860f374b457eddfdb05c82eef9752f",
        "type": "github"
      },
      "original": {
@ -100,21 +100,6 @@
        "type": "github"
      }
    },
-    "nixos-hardware": {
-      "locked": {
-        "lastModified": 1701598471,
-        "narHash": "sha256-kHdJ2qc4qKeMTzUIHEcP41ah/dBIhCgvWgrjllt2G78=",
-        "owner": "NixOS",
-        "repo": "nixos-hardware",
-        "rev": "a89745edd5f657e2e5be5ed1bea86725ca78d92e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixos-hardware",
-        "type": "github"
-      }
-    },
    "nixpkgs": {
      "locked": {
        "lastModified": 1677676435,
@ -133,11 +118,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1701389149,
-        "narHash": "sha256-rU1suTIEd5DGCaAXKW6yHoCfR1mnYjOXQFOaH7M23js=",
+        "lastModified": 1702233072,
+        "narHash": "sha256-H5G2wgbim2Ku6G6w+NSaQaauv6B6DlPhY9fMvArKqRo=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "5de0b32be6e85dc1a9404c75131316e4ffbc634c",
+        "rev": "781e2a9797ecf0f146e81425c822dca69fe4a348",
        "type": "github"
      },
      "original": {
@ -151,19 +136,19 @@
        "agenix": "agenix",
        "firefox-gnome-theme": "firefox-gnome-theme",
        "home-manager": "home-manager_2",
-        "nixos-hardware": "nixos-hardware",
        "nixpkgs": "nixpkgs_2",
-        "thunderbird-gnome-theme": "thunderbird-gnome-theme"
+        "thunderbird-gnome-theme": "thunderbird-gnome-theme",
+        "wallpapers": "wallpapers"
      }
    },
    "thunderbird-gnome-theme": {
      "flake": false,
      "locked": {
-        "lastModified": 1699285862,
-        "narHash": "sha256-3TQYBJAeQ2fPFxQnD5iKRKKWFlN3GJhz1EkdwE+4m0k=",
+        "lastModified": 1701889124,
+        "narHash": "sha256-K+6oh7+J6RDBFkxphY/pzf0B+q5+IY54ZMKZrFSKXlc=",
        "owner": "rafaelmardojai",
        "repo": "thunderbird-gnome-theme",
-        "rev": "a899ca12204d19f4834fbd092aa5bb05dc4bd127",
+        "rev": "966e9dd54bd2ce9d36d51cd6af8c3bac7a764a68",
        "type": "github"
      },
      "original": {
@ -171,6 +156,23 @@
        "repo": "thunderbird-gnome-theme",
        "type": "github"
      }
+    },
+    "wallpapers": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1702336410,
+        "narHash": "sha256-DyC9Ro5tj3X0P2M24gZdpTkFGuZEy9JXrFLUav/b5H0=",
+        "ref": "refs/heads/master",
+        "rev": "dd78ed7242af54c33e8304feee322a71da575abd",
+        "shallow": true,
+        "type": "git",
+        "url": "ssh://git@git.vimium.com/jordan/wallpapers.git"
+      },
+      "original": {
+        "shallow": true,
+        "type": "git",
+        "url": "ssh://git@git.vimium.com/jordan/wallpapers.git"
+      }
    }
  },
  "root": "root",
--- a/flake.nix
+++ b/flake.nix
@ -1,9 +1,8 @@
 {
-  description = "NixOS/Darwin system configuration";
+  description = "NixOS system configuration";

  inputs = {
    nixpkgs.url = "nixpkgs/nixos-23.11";
-    nixos-hardware.url = "github:NixOS/nixos-hardware";
    agenix.url = "github:ryantm/agenix";
    home-manager = {
      url = "github:nix-community/home-manager/release-23.11";
@ -17,70 +16,55 @@
      url = "github:rafaelmardojai/thunderbird-gnome-theme";
      flake = false;
    };
+    wallpapers = {
+      url = "git+ssh://git@git.vimium.com/jordan/wallpapers.git?shallow=1";
+      flake = false;
+    };
  };

  outputs = inputs @ { self, nixpkgs, agenix, home-manager, ... }:
    let
-      inherit (lib) attrValues;
-      inherit (lib.my) mapModules mapModulesRec;
-
-      system = "x86_64-linux";
-
-      mkPkgs = pkgs: extraOverlays:
-        import pkgs {
-          inherit system;
-          config.allowUnfree = true;
-          overlays = extraOverlays ++ (lib.attrValues self.overlays);
+      nixpkgsForSystem = system: inputs.nixpkgs;
+      overlays = [
+        agenix.overlays.default
+        (import ./overlays/gnome.nix)
+      ];
+      commonModules = [
+        agenix.nixosModules.age
+        home-manager.nixosModule
+        ./modules
+      ];
+      nixosSystem = system: name:
+        let
+          nixpkgs = nixpkgsForSystem system;
+          lib = (import nixpkgs { inherit overlays system; }).lib;
+        in
+        inputs.nixpkgs.lib.nixosSystem {
+          inherit lib system;
+          specialArgs = { modulesPath = toString (nixpkgs + "/nixos/modules"); inherit inputs; };
+          baseModules = import (nixpkgs + "/nixos/modules/module-list.nix");
+          modules = commonModules ++ [
+            ({ config, ... }:
+              {
+                nixpkgs.pkgs = import nixpkgs {
+                  inherit overlays system;
+                  config.allowUnfree = true;
+                };
+                networking.hostName = name;
+                nix = {
+                  extraOptions = "experimental-features = nix-command flakes";
+                };
+              })
+            ./hosts/${name}
+          ];
        };
-      pkgs = mkPkgs nixpkgs [];
-
-      lib = nixpkgs.lib.extend (self: super: {
-        my = import ./lib {
-          inherit pkgs inputs;
-          lib = self;
-        };
-      });
-    in {
-      lib = lib.my;
-
      nixosConfigurations = {
-        atlas = nixpkgs.lib.nixosSystem {
-          modules = [
-            home-manager.nixosModules.home-manager
-            { nixpkgs.overlays = [ (import ./overlays/gnome.nix) ]; }
-            (import ./modules)
-            ./hosts/atlas
-          ];
-          specialArgs = { inherit lib inputs; };
-        };
-        eos = nixpkgs.lib.nixosSystem {
-          modules = [
-            home-manager.nixosModules.home-manager
-            { nixpkgs.overlays = [ (import ./overlays/gnome.nix) ]; }
-            (import ./modules)
-            ./hosts/eos
-          ];
-          specialArgs = { inherit lib inputs; };
-        };
-        helios = nixpkgs.lib.nixosSystem {
-          modules = [
-            home-manager.nixosModules.home-manager
-            { nixpkgs.overlays = [ (import ./overlays/gnome.nix) ]; }
-            (import ./modules)
-            ./hosts/helios
-          ];
-          specialArgs = { inherit lib inputs; };
-        };
-        odyssey = nixpkgs.lib.nixosSystem {
-          modules = [
-            home-manager.nixosModules.home-manager
-            agenix.nixosModules.default
-            { nixpkgs.overlays = [ (import ./overlays/gnome.nix) ]; }
-            (import ./modules)
-            ./hosts/odyssey
-          ];
-          specialArgs = { inherit lib inputs; };
-        };
+        atlas = nixosSystem "x86_64-linux" "atlas";
+        eos = nixosSystem "x86_64-linux" "eos";
+        helios = nixosSystem "x86_64-linux" "helios";
+        odyssey = nixosSystem "x86_64-linux" "odyssey";
      };
-  };
+    in
+    { inherit nixosConfigurations; };
 }
+
--- a/hosts/atlas/default.nix
+++ b/hosts/atlas/default.nix
@ -1,6 +1,5 @@
 { config, lib, pkgs, ... }:

-with lib.my;
 {
  imports = [
    ./hardware-configuration.nix
--- a/hosts/atlas/hardware-configuration.nix
+++ b/hosts/atlas/hardware-configuration.nix
@ -1,70 +1,66 @@
-# 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, ... }:

 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];

-  boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.initrd.supportedFilesystems = [ "zfs" ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.kernelParams = [ "elevator=none" ];
-  boot.extraModulePackages = [ ];
-  boot.supportedFilesystems = [ "zfs" ];
+  boot = {
+    initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+    initrd.kernelModules = [ ];
+    initrd.supportedFilesystems = [ "zfs" ];
+    kernelModules = [ "kvm-intel" ];
+    kernelParams = [ "elevator=none" ];
+    extraModulePackages = [ ];
+    supportedFilesystems = [ "zfs" ];
+  };

-  fileSystems."/" =
-    { device = "rpool/system/root";
-      fsType = "zfs";
-    };
+  fileSystems."/" = {
+    device = "rpool/system/root";
+    fsType = "zfs";
+  };

-  fileSystems."/home" =
-    { device = "rpool/user/home";
-      fsType = "zfs";
-    };
+  fileSystems."/home" = {
+    device = "rpool/user/home";
+    fsType = "zfs";
+  };

-  fileSystems."/nix" =
-    { device = "rpool/local/nix";
-      fsType = "zfs";
-    };
+  fileSystems."/nix" = {
+    device = "rpool/local/nix";
+    fsType = "zfs";
+  };

-  fileSystems."/tmp" =
-    { device = "rpool/local/tmp";
-      fsType = "zfs";
-    };
+  fileSystems."/tmp" = {
+    device = "rpool/local/tmp";
+    fsType = "zfs";
+  };

-  fileSystems."/var" =
-    { device = "rpool/system/var";
-      fsType = "zfs";
-    };
+  fileSystems."/var" = {
+    device = "rpool/system/var";
+    fsType = "zfs";
+  };

-  fileSystems."/var/log" =
-    { device = "rpool/system/var/log";
-      fsType = "zfs";
-    };
+  fileSystems."/var/log" = {
+    device = "rpool/system/var/log";
+    fsType = "zfs";
+  };

-  fileSystems."/var/tmp" =
-    { device = "rpool/system/var/tmp";
-      fsType = "zfs";
-    };
+  fileSystems."/var/tmp" = {
+    device = "rpool/system/var/tmp";
+    fsType = "zfs";
+  };

-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/00B2-0384";
-      fsType = "vfat";
-    };
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/00B2-0384";
+    fsType = "vfat";
+  };

  swapDevices = [ ];

-  # 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.enp0s25.useDHCP = lib.mkDefault true;

  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+
  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
--- a/hosts/desktop.nix
+++ b/hosts/desktop.nix
@ -1,7 +1,5 @@
 { config, lib, pkgs, ... }:

-with lib;
-with lib.my;
 {
  time.timeZone = "Europe/London";

--- a/hosts/eos/default.nix
+++ b/hosts/eos/default.nix
@ -1,6 +1,5 @@
 { config, lib, pkgs, ... }:

-with lib.my;
 {
  imports = [
    ./hardware-configuration.nix
--- a/hosts/eos/hardware-configuration.nix
+++ b/hosts/eos/hardware-configuration.nix
@ -1,71 +1,65 @@
-# 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, ... }:

 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];

-  boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ];
-  boot.initrd.kernelModules = [ ];
-  boot.initrd.supportedFilesystems = [ "zfs" ];
-  boot.kernelModules = [ ];
-  boot.kernelParams = [ "elevator=none" ];
-  boot.extraModulePackages = [ ];
-  boot.supportedFilesystems = [ "zfs" ];
+  boot = {
+    initrd.availableKernelModules = [ "ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ];
+    initrd.kernelModules = [ ];
+    initrd.supportedFilesystems = [ "zfs" ];
+    kernelModules = [ ];
+    kernelParams = [ "elevator=none" ];
+    extraModulePackages = [ ];
+    supportedFilesystems = [ "zfs" ];
+  };

-  fileSystems."/" =
-    { device = "rpool/system/root";
-      fsType = "zfs";
-    };
+  fileSystems."/" = {
+    device = "rpool/system/root";
+    fsType = "zfs";
+  };

-  fileSystems."/home" =
-    { device = "rpool/user/home";
-      fsType = "zfs";
-    };
+  fileSystems."/home" = {
+    device = "rpool/user/home";
+    fsType = "zfs";
+  };

-  fileSystems."/nix" =
-    { device = "rpool/local/nix";
-      fsType = "zfs";
-    };
+  fileSystems."/nix" = {
+    device = "rpool/local/nix";
+    fsType = "zfs";
+  };

-  fileSystems."/tmp" =
-    { device = "rpool/local/tmp";
-      fsType = "zfs";
-    };
+  fileSystems."/tmp" = {
+    device = "rpool/local/tmp";
+    fsType = "zfs";
+  };

-  fileSystems."/var" =
-    { device = "rpool/system/var";
-      fsType = "zfs";
-    };
+  fileSystems."/var" = {
+    device = "rpool/system/var";
+    fsType = "zfs";
+  };

-  fileSystems."/var/log" =
-    { device = "rpool/system/var/log";
-      fsType = "zfs";
-    };
+  fileSystems."/var/log" = {
+    device = "rpool/system/var/log";
+    fsType = "zfs";
+  };

-  fileSystems."/var/tmp" =
-    { device = "rpool/system/var/tmp";
-      fsType = "zfs";
-    };
+  fileSystems."/var/tmp" = {
+    device = "rpool/system/var/tmp";
+    fsType = "zfs";
+  };

-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/28E6-5509";
-      fsType = "vfat";
-    };
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/28E6-5509";
+    fsType = "vfat";
+  };

  swapDevices = [ ];

-  # 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.enp0s25.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;

  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+
  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
--- a/hosts/helios/default.nix
+++ b/hosts/helios/default.nix
@ -1,6 +1,5 @@
 { config, lib, pkgs, ... }:

-with lib.my;
 {
  imports = [
    ./hardware-configuration.nix
--- a/hosts/helios/hardware-configuration.nix
+++ b/hosts/helios/hardware-configuration.nix
@ -1,65 +1,61 @@
-# 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, ... }:

 {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+  ];

-  boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sr_mod" "zfs" ];
-  boot.initrd.kernelModules = [ ];
-  boot.initrd.supportedFilesystems = [ "zfs" ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.kernelParams = [ "elevator=none" ];
-  boot.extraModulePackages = [ ];
-  boot.supportedFilesystems = [ "zfs" ];
+  boot = {
+    initrd.availableKernelModules = [ "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sr_mod" "zfs" ];
+    initrd.kernelModules = [ ];
+    initrd.supportedFilesystems = [ "zfs" ];
+    kernelModules = [ "kvm-intel" ];
+    kernelParams = [ "elevator=none" ];
+    extraModulePackages = [ ];
+    supportedFilesystems = [ "zfs" ];
+  };

-  fileSystems."/" =
-    { device = "rpool/system/root";
-      fsType = "zfs";
-    };
+  fileSystems."/" = {
+    device = "rpool/system/root";
+    fsType = "zfs";
+  };

-  fileSystems."/home" =
-    { device = "rpool/user/home";
-      fsType = "zfs";
-    };
+  fileSystems."/home" = {
+    device = "rpool/user/home";
+    fsType = "zfs";
+  };

-  fileSystems."/nix" =
-    { device = "rpool/local/nix";
-      fsType = "zfs";
-    };
+  fileSystems."/nix" = {
+    device = "rpool/local/nix";
+    fsType = "zfs";
+  };

-  fileSystems."/tmp" =
-    { device = "rpool/local/tmp";
-      fsType = "zfs";
-    };
+  fileSystems."/tmp" = {
+    device = "rpool/local/tmp";
+    fsType = "zfs";
+  };

-  fileSystems."/var/log" =
-    { device = "rpool/system/var/log";
-      fsType = "zfs";
-    };
+  fileSystems."/var/log" = {
+    device = "rpool/system/var/log";
+    fsType = "zfs";
+  };

-  fileSystems."/var/tmp" =
-    { device = "rpool/system/var/tmp";
-      fsType = "zfs";
-    };
+  fileSystems."/var/tmp" = {
+    device = "rpool/system/var/tmp";
+    fsType = "zfs";
+  };

-  fileSystems."/boot" =
-    { device = "/dev/sda1";
-      fsType = "ext2";
-    };
+  fileSystems."/boot" = {
+    device = "/dev/sda1";
+    fsType = "ext2";
+  };

  swapDevices = [ ];

-  # 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.eno1.useDHCP = lib.mkDefault true;

  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+
  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
--- a/hosts/odyssey/0001-Update-device-ID-for-PreSonus-1824c.patch
+++ b/hosts/odyssey/0001-Update-device-ID-for-PreSonus-1824c.patch
@ -1,4 +1,4 @@
-From c16be6b3b4da5a55e3ff4258ada123b5f03757e5 Mon Sep 17 00:00:00 2001
+From daebf42bd955f6f8d971af967c675e4e339cb0b2 Mon Sep 17 00:00:00 2001
 From: Jordan Holt <jordan@vimium.com>
 Date: Sun, 12 Nov 2023 12:13:39 +0000
 Subject: [PATCH] Update device ID for PreSonus 1824c
@ -6,8 +6,9 @@ Subject: [PATCH] Update device ID for PreSonus 1824c
 ---
 sound/usb/format.c       | 4 ++--
 sound/usb/mixer_quirks.c | 2 +-
+ sound/usb/mixer_s1810c.c | 2 +-
 sound/usb/quirks.c       | 4 ++--
- 3 files changed, 5 insertions(+), 5 deletions(-)
+ 4 files changed, 6 insertions(+), 6 deletions(-)

 diff --git a/sound/usb/format.c b/sound/usb/format.c
 index ab5fed9f55b6..da50a4782414 100644
@ -37,6 +38,19 @@ index 898bc3baca7b..c3135459c38c 100644
 		err = snd_sc1810_init_mixer(mixer);
 		break;
 	case USB_ID(0x2a39, 0x3fb0): /* RME Babyface Pro FS */
+diff --git a/sound/usb/mixer_s1810c.c b/sound/usb/mixer_s1810c.c
+index fac4bbc6b275..5bc2e66d452c 100644
+--- a/sound/usb/mixer_s1810c.c
+++ b/sound/usb/mixer_s1810c.c
+@@ -552,7 +552,7 @@ int snd_sc1810_init_mixer(struct usb_mixer_interface *mixer)
+ 		return 0;
+ 
+ 	dev_info(&dev->dev,
+-		 "Presonus Studio 1810c, device_setup: %u\n", chip->setup);
+		 "Presonus Studio 1824c, device_setup: %u\n", chip->setup);
+ 	if (chip->setup == 1)
+ 		dev_info(&dev->dev, "(8out/18in @ 48kHz)\n");
+ 	else if (chip->setup == 2)
 diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
 index ab2b938502eb..b86832edaaa0 100644
 --- a/sound/usb/quirks.c
@ -53,5 +67,5 @@ index ab2b938502eb..b86832edaaa0 100644
 
 
 -- 
-2.40.1
+2.42.0

--- a/hosts/odyssey/audio.nix
+++ b/hosts/odyssey/audio.nix
@ -0,0 +1,45 @@
+{ config, pkgs, ... }:
+let
+  snd-usb-audio-module = pkgs.callPackage ./snd-usb-audio.nix {
+    kernel = config.boot.kernelPackages.kernel;
+  };
+  upmixConfig = ''
+    stream.properties = {
+      channelmix.upmix = true
+      channelmix.upmix-method = psd
+    }
+  '';
+in {
+  boot.extraModulePackages = [
+    (snd-usb-audio-module.overrideAttrs (_: {
+      patches = [ ./0001-Update-device-ID-for-PreSonus-1824c.patch ];
+    }))
+  ];
+
+  environment.etc = {
+    "pipewire/pipewire.conf.d/surround.conf".text = ''
+      context.modules = [
+        {
+          name = libpipewire-module-loopback
+          args = {
+            node.description = "Genelec 4.1 Surround"
+            capture.props = {
+              node.name = "Genelec_Speakers"
+              media.class = "Audio/Sink"
+              audio.position = [ FL FR SL SR LFE ]
+            }
+            playback.props = {
+              node.name = "playback.Genelec_Speakers"
+              audio.position = [ AUX0 AUX1 AUX3 AUX4 AUX5 ]
+              target.object = "alsa_output.usb-PreSonus_Studio_1824c_SC4E21110775-00.multichannel-output"
+              stream.dont-remix = true
+              node.passive = true
+            }
+          }
+        }
+      ]
+    '';
+    "pipewire/pipewire-pulse.conf.d/40-upmix.conf".text = upmixConfig;
+    "pipewire/client-rt.conf.d/40-upmix.conf".text = upmixConfig;
+  };
+ } 
--- a/hosts/odyssey/default.nix
+++ b/hosts/odyssey/default.nix
@ -1,9 +1,9 @@
 { config, lib, pkgs, ... }:

-with lib.my;
 {
  imports = [
    ./hardware-configuration.nix
+    ./audio.nix
    ../desktop.nix
  ];

@ -16,32 +16,8 @@ with lib.my;

  networking.hostName = "odyssey";
  networking.hostId = "c5e68d78";
-
  networking.networkmanager.enable = true;

-  environment.etc."pipewire/pipewire.conf.d/surround.conf".text = ''
-    context.modules = [
-      {
-        name = libpipewire-module-loopback
-        args = {
-          node.description = "1824c Surround"
-          capture.props = {
-            node.name = "1824c_Speakers"
-            media.class = "Audio/Sink"
-            audio.position = [ FL FR FC SL SR LFE ]
-          }
-          playback.props = {
-            node.name = "playback.1824c_Speakers"
-            audio.position = [ AUX0 AUX1 AUX2 AUX3 AUX4 AUX5 ]
-            target.object = "alsa_output.usb-PreSonus_Studio_1824c_SC4E21110775-00.multichannel-output"
-            stream.dont-remix = true
-            node.passive = true
-          }
-        }
-      }
-    ]
-  '';
-
  nix.package = pkgs.nixFlakes;
  nix.extraOptions = ''
    experimental-features = nix-command flakes
@ -125,6 +101,7 @@ with lib.my;
    };
    editors = {
      neovim.enable = true;
+      vscode.enable = true;
    };
    security = {
      gpg.enable = true;
--- a/hosts/odyssey/hardware-configuration.nix
+++ b/hosts/odyssey/hardware-configuration.nix
@ -1,78 +1,68 @@
-# 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, ... }:

-let
-  snd-usb-audio-module = pkgs.callPackage ./snd-usb-audio.nix {
-    kernel = config.boot.kernelPackages.kernel;
-  };
-in {
-  imports =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
-    ];
-
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [
-    (snd-usb-audio-module.overrideAttrs (_: {
-      patches = [ ./0001-Update-device-ID-for-PreSonus-1824c.patch ];
-    }))
+{
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
  ];
-  boot.supportedFilesystems = [ "ntfs" ];
-  boot.binfmt.emulatedSystems = [ "aarch64-linux" ];

-  hardware.nvidia = {
-    modesetting.enable = true;
-    powerManagement.enable = true;
+  boot = {
+    initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
+    initrd.kernelModules = [ ];
+    initrd.supportedFilesystems = [ "zfs" ];
+    kernelModules = [ "kvm-intel" ];
+    kernelPackages = pkgs.linuxPackages;
+    supportedFilesystems = [ "ntfs" ];
+    binfmt.emulatedSystems = [ "aarch64-linux" ];
  };
+
+  hardware = {
+    cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+    nvidia = {
+      modesetting.enable = true;
+      powerManagement.enable = true;
+    };
+  };
+
  services.xserver.videoDrivers = [ "nvidia" ];

-  fileSystems."/" =
-    { device = "rpool/system/root";
-      fsType = "zfs";
-    };
+  fileSystems."/" = {
+    device = "rpool/system/root";
+    fsType = "zfs";
+  };

-  fileSystems."/home" =
-    { device = "rpool/user/home";
-      fsType = "zfs";
-    };
+  fileSystems."/home" = {
+    device = "rpool/user/home";
+    fsType = "zfs";
+  };

-  fileSystems."/var" =
-    { device = "rpool/system/var";
-      fsType = "zfs";
-    };
+  fileSystems."/var" = {
+    device = "rpool/system/var";
+    fsType = "zfs";
+  };

-  fileSystems."/tmp" =
-    { device = "rpool/local/tmp";
-      fsType = "zfs";
-    };
+  fileSystems."/tmp" = {
+    device = "rpool/local/tmp";
+    fsType = "zfs";
+  };

-  fileSystems."/var/log" =
-    { device = "rpool/system/var/log";
-      fsType = "zfs";
-    };
+  fileSystems."/var/log" = {
+    device = "rpool/system/var/log";
+    fsType = "zfs";
+  };

-  fileSystems."/var/tmp" =
-    { device = "rpool/system/var/tmp";
-      fsType = "zfs";
-    };
+  fileSystems."/var/tmp" = {
+    device = "rpool/system/var/tmp";
+    fsType = "zfs";
+  };

-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/E63E-8E75";
-      fsType = "vfat";
-    };
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/E63E-8E75";
+    fsType = "vfat";
+  };

  swapDevices = [ ];

-  # 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.eno1.useDHCP = lib.mkDefault true;

  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
--- a/hosts/pi/default.nix
+++ b/hosts/pi/default.nix
@ -1,44 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib.my;
-{
-  imports = [
-    <nixos-hardware/raspberry-pi/4>
-    ./hardware-configuration.nix
-    ../server.nix
-  ];
-
-  networking.hostName = "pi";
-  networking.hostId = "";
-
-  hardware = {
-    raspberry-pi."4" = {
-      apply-overlays-dtmerge.enable = true;
-      audio.enable = true;
-      fkms-3d.enable = true;
-    };
-    deviceTree = {
-      enable = true;
-      filter = "*rpi-4-*.dtb";
-    };
-  };
-
-  sound.enable = true;
-  console.enable = false;
-
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-  };
-
-  environment.systemPackages = with pkgs; [
-    libraspberrypi
-    raspberrypi-eeprom
-  ];
-
-  system.stateVersion = "22.11";
-}
-
--- a/hosts/pi/hardware-configuration.nix
+++ b/hosts/pi/hardware-configuration.nix
@ -1,16 +0,0 @@
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
-  imports = [
-    <nixos-hardware/raspberry-pi/4>
-  ];
-
-  fileSystems = {
-    "/" = {
-      device = "/dev/disk/by-label/NIXOS_SD";
-      fsType = "ext4";
-      options = [ "noatime" ];
-    };
-  };
-}
-
--- a/hosts/server.nix
+++ b/hosts/server.nix
@ -1,7 +1,5 @@
 { config, lib, pkgs, ... }:

-with lib;
-with lib.my;
 {
  time.timeZone = "Europe/London";

--- a/lib/attrs.nix
+++ b/lib/attrs.nix
@ -1,26 +0,0 @@
-{ lib, ... }:
-
-with builtins;
-with lib;
-rec {
-  # attrsToList
-  attrsToList = attrs:
-    mapAttrsToList (name: value: { inherit name value; }) attrs;
-
-  # mapFilterAttrs ::
-  #   (name -> value -> bool)
-  #   (name -> value -> { name = any; value = any; })
-  #   attrs
-  mapFilterAttrs = pred: f: attrs: filterAttrs pred (mapAttrs' f attrs);
-
-  # Generate an attribute set by mapping a function over a list of values.
-  genAttrs' = values: f: listToAttrs (map f values);
-
-  # anyAttrs :: (name -> value -> bool) attrs
-  anyAttrs = pred: attrs:
-    any (attr: pred attr.name attr.value) (attrsToList attrs);
-
-  # countAttrs :: (name -> value -> bool) attrs
-  countAttrs = pred: attrs:
-    count (attr: pred attr.name attr.value) (attrsToList attrs);
-}
--- a/lib/default.nix
+++ b/lib/default.nix
@ -1,19 +0,0 @@
-
-{ inputs, lib, pkgs, ... }:
-
-let
-  inherit (lib) makeExtensible attrValues foldr;
-  inherit (modules) mapModules;
-
-  modules = import ./modules.nix {
-    inherit lib;
-    self.attrs = import ./attrs.nix { inherit lib; self = {}; };
-  };
-
-  mylib = makeExtensible (self:
-    with self; mapModules ./.
-      (file: import file { inherit self lib pkgs inputs; }));
-in
-mylib.extend
-  (self: super:
-    foldr (a: b: a // b) {} (attrValues super))
--- a/lib/modules.nix
+++ b/lib/modules.nix
@ -1,53 +0,0 @@
-{ self, lib, ... }:
-
-let
-  inherit (builtins) attrValues readDir pathExists concatLists;
-  inherit (lib) id mapAttrsToList filterAttrs hasPrefix hasSuffix nameValuePair removeSuffix;
-  inherit (self.attrs) mapFilterAttrs;
-in
-rec {
-  mapModules = dir: fn:
-    mapFilterAttrs
-      (n: v:
-        v != null &&
-        !(hasPrefix "_" n))
-      (n: v:
-        let path = "${toString dir}/${n}"; in
-        if v == "directory" && pathExists "${path}/default.nix"
-        then nameValuePair n (fn path)
-        else if v == "regular" &&
-                n != "default.nix" &&
-                hasSuffix ".nix" n
-        then nameValuePair (removeSuffix ".nix" n) (fn path)
-        else nameValuePair "" null)
-      (readDir dir);
-
-  mapModules' = dir: fn:
-    attrValues (mapModules dir fn);
-
-  mapModulesRec = dir: fn:
-    mapFilterAttrs
-      (n: v:
-        v != null &&
-        !(hasPrefix "_" n))
-      (n: v:
-        let path = "${toString dir}/${n}"; in
-        if v == "directory"
-        then nameValuePair n (mapModulesRec path fn)
-        else if v == "regular" && n != "default.nix" && hasSuffix ".nix" n
-        then nameValuePair (removeSuffix ".nix" n) (fn path)
-        else nameValuePair "" null)
-      (readDir dir);
-
-  mapModulesRec' = dir: fn:
-    let
-      dirs =
-        mapAttrsToList
-          (k: _: "${dir}/${k}")
-          (filterAttrs
-            (n: v: v == "directory" && !(hasPrefix "_" n))
-            (readDir dir));
-      files = attrValues (mapModules dir id);
-      paths = files ++ concatLists (map (d: mapModulesRec' d id) dirs);
-    in map fn paths;
-}
--- a/lib/nixos.nix
+++ b/lib/nixos.nix
@ -1,25 +0,0 @@
-{ inputs, lib, pkgs, ... }:
-
-with lib;
-with lib.my;
-let sys = "x86_64-linux";
-in {
-  mkHost = path: attrs @ { system ? sys, ... }:
-    nixosSystem {
-      inherit system;
-      specialArgs = { inherit lib inputs system; };
-      modules = [
-        {
-          nixpkgs.pkgs = pkgs;
-          networking.hostName = mkDefault (removeSuffix ".nix" (baseNameOf path));
-        }
-        (filterAttrs (n: v: !elem n [ "system" ]) attrs)
-        ../.   # /default.nix
-        (import path)
-      ];
-    };
-
-  mapHosts = dir: attrs @ { system ? system, ... }:
-    mapModules dir
-      (hostPath: mkHost hostPath attrs);
-}
--- a/lib/options.nix
+++ b/lib/options.nix
@ -1,35 +0,0 @@
-{ lib, ... }:
-
-let
-  inherit (lib) mkOption types;
-in
-rec {
-  mkOpt = type: default:
-    mkOption { inherit type default; };
-
-  mkOpt' = type: default: description:
-    mkOption { inherit type default description; };
-
-  mkBoolOpt = default: mkOption {
-    inherit default;
-    type = types.bool;
-    example = true;
-  };
-
-  mkStringOpt = default: mkOption {
-    inherit default;
-    type = types.lines;
-    example = "";
-  };
-
-  mkListOfStringOpt = default: mkOption {
-    inherit default;
-    type = types.listOf types.lines;
-    example = [ "a" "b" "c" ];
-  };
-
-  mkPath = path:
-    if path != null
-    then toString path
-    else "";
-}
--- a/modules/desktop/apps/qbittorrent.nix
+++ b/modules/desktop/apps/qbittorrent.nix
@ -1,16 +1,17 @@
 { config, lib, pkgs, ... }:

-with lib;
-with lib.my;
 let cfg = config.modules.desktop.apps.qbittorrent;
 in {
  options.modules.desktop.apps.qbittorrent = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
  };

-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
    user.packages = with pkgs; [
      qbittorrent
    ];
  };
-}
+}
--- a/modules/desktop/apps/slack.nix
+++ b/modules/desktop/apps/slack.nix
@ -1,14 +1,15 @@
 { config, lib, pkgs, ... }:

-with lib;
-with lib.my;
 let cfg = config.modules.desktop.apps.slack;
 in {
  options.modules.desktop.apps.slack = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
  };

-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
    user.packages = with pkgs; [
      slack
    ];
--- a/modules/desktop/apps/thunderbird.nix
+++ b/modules/desktop/apps/thunderbird.nix
@ -1,14 +1,15 @@
 { config, lib, pkgs, inputs, ... }:

-with lib;
-with lib.my;
 let cfg = config.modules.desktop.apps.thunderbird;
 in {
  options.modules.desktop.apps.thunderbird = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
  };
  
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
    home.file.".thunderbird/Default/chrome/thunderbird-gnome-theme".source = inputs.thunderbird-gnome-theme;

    home.programs.thunderbird = {
--- a/modules/desktop/apps/zoom.nix
+++ b/modules/desktop/apps/zoom.nix
@ -1,14 +1,15 @@
 { config, lib, pkgs, ... }:

-with lib;
-with lib.my;
 let cfg = config.modules.desktop.apps.zoom;
 in {
  options.modules.desktop.apps.zoom = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
  };

-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
    user.packages = with pkgs; [
      zoom-us
    ];
--- a/modules/desktop/browsers/firefox.nix
+++ b/modules/desktop/browsers/firefox.nix
@ -1,14 +1,15 @@
 { config, lib, pkgs, inputs, ... }:

-with lib;
-with lib.my;
 let cfg = config.modules.desktop.browsers.firefox;
 in {
  options.modules.desktop.browsers.firefox = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
  };

-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
    home.file.".mozilla/firefox/Default/chrome/firefox-gnome-theme".source = inputs.firefox-gnome-theme;

    home.programs.firefox = {
--- a/modules/desktop/gaming/emulators.nix
+++ b/modules/desktop/gaming/emulators.nix
@ -1,34 +1,59 @@
 { config, lib, pkgs, ... }:

-with lib;
-with lib.my;
 let cfg = config.modules.desktop.gaming.emulators;
 in {
  options.modules.desktop.gaming.emulators = {
-    ds.enable       = mkBoolOpt false;
-    gb.enable       = mkBoolOpt false;
-    gba.enable      = mkBoolOpt false;
-    gamecube.enable = mkBoolOpt false;
-    ps2.enable      = mkBoolOpt false;
-    ps3.enable      = mkBoolOpt false;
-    psp.enable      = mkBoolOpt false;
-    snes.enable     = mkBoolOpt false;
-    wii.enable      = mkBoolOpt false;
+    ds.enable       = lib.mkOption {
+      default = false;
+      example = true;
+    };
+    gb.enable       = lib.mkOption {
+      default = false;
+      example = true;
+    };
+    gba.enable      = lib.mkOption {
+      default = false;
+      example = true;
+    };
+    gamecube.enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+    ps2.enable      = lib.mkOption {
+      default = false;
+      example = true;
+    };
+    ps3.enable      = lib.mkOption {
+      default = false;
+      example = true;
+    };
+    psp.enable      = lib.mkOption {
+      default = false;
+      example = true;
+    };
+    snes.enable     = lib.mkOption {
+      default = false;
+      example = true;
+    };
+    wii.enable      = lib.mkOption {
+      default = false;
+      example = true;
+    };
  };

  config = {
    user.packages = with pkgs; [
-      (mkIf cfg.ps2.enable pcsx2)
-      (mkIf cfg.ps3.enable rpcs3)
-      (mkIf cfg.psp.enable ppsspp)
-      (mkIf cfg.ds.enable desmume)
-      (mkIf (cfg.gba.enable ||
+      (lib.mkIf cfg.ps2.enable pcsx2)
+      (lib.mkIf cfg.ps3.enable rpcs3)
+      (lib.mkIf cfg.psp.enable ppsspp)
+      (lib.mkIf cfg.ds.enable desmume)
+      (lib.mkIf (cfg.gba.enable ||
             cfg.gb.enable  ||
             cfg.snes.enable)
        higan)
-      (mkIf (cfg.wii.enable ||
+      (lib.mkIf (cfg.wii.enable ||
             cfg.gamecube.enable)
        dolphin-emu)
    ];
  };
-}
+}
--- a/modules/desktop/gaming/lutris.nix
+++ b/modules/desktop/gaming/lutris.nix
@ -1,14 +1,15 @@
 { config, lib, pkgs, ... }:

-with lib;
-with lib.my;
 let cfg = config.modules.desktop.gaming.lutris;
 in {
  options.modules.desktop.gaming.lutris = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
  };

-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
    user.packages = with pkgs; [
      lutris
      vulkan-loader
--- a/modules/desktop/gaming/steam.nix
+++ b/modules/desktop/gaming/steam.nix
@ -1,16 +1,17 @@
 { config, lib, pkgs, ... }:

-with lib;
-with lib.my;
 let cfg = config.modules.desktop.gaming.steam;
 in {
  options.modules.desktop.gaming.steam = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
  };

-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
    programs.steam.enable = true;

    systemd.extraConfig = "DefaultLimitNOFILE=1048576";
  };
-}
+}
--- a/modules/desktop/gnome.nix
+++ b/modules/desktop/gnome.nix
@ -1,14 +1,15 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, inputs, ... }:

-with lib;
-with lib.my;
 let cfg = config.modules.desktop.gnome;
 in {
  options.modules.desktop.gnome = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
  };

-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
    services.xserver = {
      enable = true;
      displayManager.gdm.enable = true;
@ -98,8 +99,8 @@ in {
        window-gap = 8;
      };
      "org/gnome/desktop/background" = {
-        picture-uri = "file://${pkgs.gnome.gnome-backgrounds}/share/backgrounds/gnome/adwaita-l.jpg";
-        picture-uri-dark = "file://${pkgs.gnome.gnome-backgrounds}/share/backgrounds/gnome/adwaita-d.jpg";
+        picture-uri = "file://${inputs.wallpapers}/Aqua.png";
+        picture-uri-dark = "file://${inputs.wallpapers}/Aqua.png";
      };
      "org/gtk/settings/file-chooser" = {
        show-hidden = true;
@ -180,6 +181,7 @@ in {
      gnomeExtensions.pano
      gnomeExtensions.paperwm
      # gnomeExtensions.pip-on-top
+      gnomeExtensions.rounded-window-corners
      gnomeExtensions.search-light
      gnomeExtensions.smart-auto-move
      gnomeExtensions.space-bar
--- a/modules/desktop/media/graphics.nix
+++ b/modules/desktop/media/graphics.nix
@ -1,21 +1,28 @@
 { config, lib, pkgs, ... }:

-with lib;
-with lib.my;
 let cfg = config.modules.desktop.media.graphics;
 in {
  options.modules.desktop.media.graphics = {
-    modeling.enable = mkBoolOpt false;
-    raster.enable   = mkBoolOpt false;
-    vector.enable   = mkBoolOpt false;
+    modeling.enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+    raster.enable   = lib.mkOption {
+      default = false;
+      example = true;
+    };
+    vector.enable   = lib.mkOption {
+      default = false;
+      example = true;
+    };
  };

  config = {
    user.packages = with pkgs; [
-      (mkIf cfg.modeling.enable blender)
-      (mkIf cfg.raster.enable gimp)
-      (mkIf cfg.raster.enable krita)
-      (mkIf cfg.vector.enable inkscape)
+      (lib.mkIf cfg.modeling.enable blender)
+      (lib.mkIf cfg.raster.enable gimp)
+      (lib.mkIf cfg.raster.enable krita)
+      (lib.mkIf cfg.vector.enable inkscape)
    ];
  };
-}
+}
--- a/modules/desktop/media/recording.nix
+++ b/modules/desktop/media/recording.nix
@ -1,12 +1,16 @@
 { config, lib, pkgs, ... }:

-with lib;
-with lib.my;
 let cfg = config.modules.desktop.media.recording;
 in {
  options.modules.desktop.media.recording = {
-    audio.enable = mkBoolOpt false;
-    video.enable = mkBoolOpt false;
+    audio.enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+    video.enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
  };

  config = {
@ -21,4 +25,4 @@ in {
        obs-studio
      ] else []);
  };
-}
+}
--- a/modules/desktop/mimeapps.nix
+++ b/modules/desktop/mimeapps.nix
@ -1,17 +1,18 @@
 { config, lib, pkgs, ... }:

-with lib;
-with lib.my;
 let
  cfg = config.modules.desktop.mimeapps;
  avApp = "io.github.celluloid_player.Celluloid.desktop";
  imageApp = "org.gnome.eog.desktop";
 in {
  options.modules.desktop.mimeapps = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
  };

-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
    xdg.mime.defaultApplications = {
      # Audio/video
      "audio/x-vorbis+ogg" = avApp;
--- a/modules/desktop/office/libreoffice.nix
+++ b/modules/desktop/office/libreoffice.nix
@ -1,14 +1,15 @@
 { config, lib, pkgs, ... }:

-with lib;
-with lib.my;
 let cfg = config.modules.desktop.office.libreoffice;
 in {
  options.modules.desktop.office.libreoffice = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
  };

-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
    user.packages = with pkgs; [
      libreoffice
    ];
--- a/modules/dev/cc.nix
+++ b/modules/dev/cc.nix
@ -1,14 +1,15 @@
 { config, lib, pkgs, ... }:

-with lib;
-with lib.my;
 let cfg = config.modules.dev.cc;
 in {
  options.modules.dev.cc = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
  };

-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
    user.packages = with pkgs; [
      clang
      gcc
@ -17,4 +18,4 @@ in {
      llvmPackages.libcxx
    ];
  };
-}
+}
--- a/modules/dev/java.nix
+++ b/modules/dev/java.nix
@ -1,16 +1,17 @@
 { config, lib, pkgs, ... }:

-with lib;
-with lib.my;
 let cfg = config.modules.dev.java;
 in {
  options.modules.dev.java = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
  };

-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
    user.packages = with pkgs; [
      jdk
    ];
  };
-}
+}
--- a/modules/dev/lua.nix
+++ b/modules/dev/lua.nix
@ -1,16 +1,17 @@
 { config, lib, pkgs, ... }:

-with lib;
-with lib.my;
 let cfg = config.modules.dev.lua;
 in {
  options.modules.dev.lua = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
  };

-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
    user.packages = with pkgs; [
      lua
    ];
  };
-}
+}
--- a/modules/dev/node.nix
+++ b/modules/dev/node.nix
@ -1,16 +1,17 @@
 { config, lib, pkgs, ... }:

-with lib;
-with lib.my;
 let cfg = config.modules.dev.node;
 in {
  options.modules.dev.node = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
  };

-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
    user.packages = with pkgs; [
      nodejs_latest
    ];
  };
-}
+}
--- a/modules/dev/python.nix
+++ b/modules/dev/python.nix
@ -1,16 +1,17 @@
 { config, lib, pkgs, ... }:

-with lib;
-with lib.my;
 let cfg = config.modules.dev.python;
 in {
  options.modules.dev.python = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
  };

-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
    user.packages = with pkgs; [
      python310
    ];
  };
-}
+}
--- a/modules/dev/rust.nix
+++ b/modules/dev/rust.nix
@ -1,14 +1,15 @@
 { config, lib, pkgs, ... }:

-with lib;
-with lib.my;
 let cfg = config.modules.dev.rust;
 in {
  options.modules.dev.rust = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
  };

-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
    user.packages = with pkgs; [
      rustc
      rustup
@ -16,4 +17,4 @@ in {
      rust-bindgen
    ];
  };
-}
+}
--- a/modules/dev/scala.nix
+++ b/modules/dev/scala.nix
@ -1,18 +1,19 @@
 { config, lib, pkgs, ... }:

-with lib;
-with lib.my;
 let cfg = config.modules.dev.scala;
 in {
  options.modules.dev.scala = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
  };

-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
    user.packages = with pkgs; [
      jdk
      sbt
      scala
    ];
  };
-}
+}
--- a/modules/dev/shell.nix
+++ b/modules/dev/shell.nix
@ -1,16 +1,17 @@
 { config, lib, pkgs, ... }:

-with lib;
-with lib.my;
 let cfg = config.modules.dev.shell;
 in {
  options.modules.dev.shell = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
  };

-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
    user.packages = with pkgs; [
      shellcheck
    ];
  };
-}
+}
--- a/modules/dev/zig.nix
+++ b/modules/dev/zig.nix
@ -1,16 +1,17 @@
 { config, lib, pkgs, ... }:

-with lib;
-with lib.my;
 let cfg = config.modules.dev.zig;
 in {
  options.modules.dev.zig = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
  };

-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
    user.packages = with pkgs; [
      zig
    ];
  };
-}
+}
--- a/modules/editors/neovim/default.nix
+++ b/modules/editors/neovim/default.nix
@ -1,16 +1,17 @@
 { config, lib, pkgs, ... }:

-with lib;
-with lib.my;
 let
  cfg = config.modules.editors.neovim;
  dev = config.modules.dev;
 in {
  options.modules.editors.neovim = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
  };

-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
    user.packages = with pkgs; [
      (neovim.override {
        configure = {
--- a/modules/editors/vscode.nix
+++ b/modules/editors/vscode.nix
@ -1,16 +1,49 @@
 { config, lib, pkgs, ... }:

-with lib;
-with lib.my;
 let cfg = config.modules.editors.vscode;
 in {
  options.modules.editors.vscode = {
-    enable = mkBoolOpt false;
-  };
-
-  config = mkIf cfg.enable {
-    home.programs.vscode = {
-      enable = true;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
    };
  };
-}
+
+  config = lib.mkIf cfg.enable {
+    environment.sessionVariables.NIXOS_OZONE_WL = "1";
+
+    home.programs.vscode = {
+      enable = true;
+      extensions = with pkgs.vscode-extensions; [
+        asvetliakov.vscode-neovim
+        brettm12345.nixfmt-vscode
+        coolbear.systemd-unit-file
+        editorconfig.editorconfig
+        golang.go
+        graphql.vscode-graphql-syntax
+        mattn.lisp
+        # mkhl.direnv
+        ms-python.vscode-pylance
+        ms-vscode.cpptools
+        ms-vscode.hexeditor
+        piousdeer.adwaita-theme
+        # redhat.java
+        # sumneko.lua
+      ];
+      userSettings = {
+        "editor.renderLineHighlight" = "none";
+        "extensions.experimental.affinity" = {
+          "asvetliakov.vscode-neovim" = 1;
+        };
+        "files.autoSave" = "off";
+        "window.autoDetectColorScheme" = true;
+        "window.commandCenter" = true;
+        "window.titleBarStyle" = "custom";
+        "workbench.iconTheme" = null;
+        "workbench.preferredDarkColorTheme" = "Adwaita Dark";
+        "workbench.preferredLightColorTheme" = "Adwaita Light";
+        "workbench.tree.indent" = 12;
+      };
+    };
+  };
+}
--- a/modules/networking/tailscale.nix
+++ b/modules/networking/tailscale.nix
@ -1,15 +1,19 @@
 { config, lib, pkgs, ... }:

-with lib;
-with lib.my;
 let cfg = config.modules.networking.tailscale;
 in {
  options.modules.networking.tailscale = {
-    enable = mkBoolOpt false;
-    restrictSSH = mkBoolOpt true;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
+    restrictSSH = lib.mkOption {
+      default = true;
+      example = true;
+    };
  };

-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
    services.tailscale.enable = true;
    services.openssh.openFirewall = !cfg.restrictSSH;
    networking.firewall = {
--- a/modules/options.nix
+++ b/modules/options.nix
@ -1,21 +1,20 @@
 { config, options, lib, home-manager, ... }:

 with lib;
-with lib.my;
 {
  options = with types; {
-    user = mkOpt attrs { };
+    user = mkOption { type = attrs; default = { }; };

    home = {
-      configFile  = mkOpt' attrs { } "Files to place in $XDG_CONFIG_HOME";
-      dataFile    = mkOpt' attrs { } "Files to place in $XDG_DATA_HOME";
-      file        = mkOpt' attrs { } "Files to place directly in $HOME";
-      packages    = mkOpt' attrs { } "User-level installed packages";
-      programs    = mkOpt' attrs { } "Programs managed directly from home-manager";
-      services    = mkOpt' attrs { } "Services managed directly from home-manager";
+      configFile  = mkOption { type = attrs; default = { }; description = "Files to place in $XDG_CONFIG_HOME"; };
+      dataFile    = mkOption { type = attrs; default = { }; description = "Files to place in $XDG_DATA_HOME"; };
+      file        = mkOption { type = attrs; default = { }; description = "Files to place directly in $HOME"; };
+      packages    = mkOption { type = attrs; default = { }; description = "User-level installed packages"; };
+      programs    = mkOption { type = attrs; default = { }; description = "Programs managed directly from home-manager"; };
+      services    = mkOption { type = attrs; default = { }; description = "Services managed directly from home-manager"; };
    };

-    dconf.settings = mkOpt' attrs { } "dconf settings to enable";
+    dconf.settings = mkOption { type = attrs; default = { }; description = "dconf settings to enable"; };

    env = mkOption {
      type = attrsOf (oneOf [ str path (listOf (either str path)) ]);
@ -69,8 +68,6 @@ with lib.my;

    users.users.${config.user.name} = mkAliasDefinitions options.user;

-    nixpkgs.config.allowUnfree = true;
-
    environment.extraInit =
      concatStringsSep "\n"
        (mapAttrsToList (n: v: "export ${n}=\"${v}\"") config.env);
--- a/modules/security/gpg.nix
+++ b/modules/security/gpg.nix
@ -1,14 +1,15 @@
 { config, lib, pkgs, ... }:

-with lib;
-with lib.my;
 let cfg = config.modules.security.gpg;
 in {
  options.modules.security.gpg = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
  };

-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
    home.programs.gpg = {
      enable = true;
    };
@ -18,4 +19,4 @@ in {
      enableSshSupport = true;
    };
  };
-}
+}
--- a/modules/security/pass.nix
+++ b/modules/security/pass.nix
@ -1,17 +1,18 @@
 { config, lib, pkgs, ... }:

-with lib;
-with lib.my;
 let cfg = config.modules.security.pass;
 in {
  options.modules.security.pass = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
  };

-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
    home.programs.password-store = {
      enable = true;
      package = pkgs.pass.withExtensions (exts: [ exts.pass-otp ]);
    };
  };
-}
+}
--- a/modules/shell/git/default.nix
+++ b/modules/shell/git/default.nix
@ -1,14 +1,15 @@
 { config, lib, pkgs, ... }:

-with lib;
-with lib.my;
 let cfg = config.modules.shell.git;
 in {
  options.modules.shell.git = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
  };

-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
    home.programs.git = {
      enable = true;
      aliases = {
@ -35,4 +36,4 @@ in {
      "git/ignore".source = ./ignore;
    };
  };
-}
+}
--- a/modules/shell/zsh/default.nix
+++ b/modules/shell/zsh/default.nix
@ -1,14 +1,15 @@
 { config, lib, pkgs, ... }:

-with lib;
-with lib.my;
 let cfg = config.modules.shell.zsh;
 in {
  options.modules.shell.zsh = {
-    enable = mkBoolOpt false;
+    enable = lib.mkOption {
+      default = false;
+      example = true;
+    };
  };

-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
    users.defaultUserShell = pkgs.zsh;

    programs.zsh = {
--- a/overlays/gnome.nix
+++ b/overlays/gnome.nix
@ -4,7 +4,7 @@ self: super:
    mutter = gsuper.mutter.overrideAttrs (oldAttrs: {
      src = super.fetchurl {
        url = "https://gitlab.gnome.org/Community/Ubuntu/mutter/-/archive/triple-buffering-v4-45/mutter-triple-buffering-v4-45.tar.gz";
-        sha256 = "E+AdsQdotqlH/kYskl+Fwv0i+UTK7mfdkJ+zlfLdU9o=";
+        sha256 = "tN+zQ5brk+hc+louIipqPV/Bqft42ghKOzjZZMj5Q8A=";
      };
    });
  });
Author	SHA1	Message	Date
Jordan Holt	db6049f8ef	Wallpapers	2023-12-11 23:33:26 +00:00
Jordan Holt	cad9ab738d	flake.lock: Update Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/b4372c4924d9182034066c823df76d6eaf1f4ec4' (2023-12-07) → 'github:NixOS/nixpkgs/781e2a9797ecf0f146e81425c822dca69fe4a348' (2023-12-10)	2023-12-11 18:32:45 +00:00
Jordan Holt	88c3e1305c	Format hosts hardware-configuration.nix	2023-12-11 18:31:55 +00:00
Jordan Holt	3f8c817418	Remove custom lib usage	2023-12-10 23:53:54 +00:00
Jordan Holt	0d015ac418	Refactor sound card config	2023-12-10 19:45:31 +00:00
Jordan Holt	8380969c95	Remove FC from Studio 1824c channel map	2023-12-10 18:44:42 +00:00
Jordan Holt	9c97905bb6	flake.lock: Update Flake lock file updates: • Updated input 'firefox-gnome-theme': 'github:rafaelmardojai/firefox-gnome-theme/ec9421f82d922b7293ffd45a47f7abdee80038c6' (2023-11-30) → 'github:rafaelmardojai/firefox-gnome-theme/d2e6cfdd63651ae8168e5905d94138f406580dd6' (2023-12-09) • Updated input 'home-manager': 'github:nix-community/home-manager/aeb2232d7a32530d3448318790534d196bf9427a' (2023-11-24) → 'github:nix-community/home-manager/6761b8188b860f374b457eddfdb05c82eef9752f' (2023-12-10)	2023-12-10 11:17:41 +00:00
Jordan Holt	f6b9fb1429	Fix formatting	2023-12-08 22:38:26 +00:00
Jordan Holt	7e591ee7d5	Add GNOME rounded window corner extension	2023-12-08 21:06:58 +00:00
Jordan Holt	8ddc5c9269	Enable Wayland for vscode, add config	2023-12-08 21:06:23 +00:00
Jordan Holt	91103dc0e7	Enable vscode on odyssey	2023-12-08 20:50:48 +00:00
Jordan Holt	1c2ca078c8	Add vscode extensions	2023-12-08 20:50:27 +00:00
Jordan Holt	f98d1d546f	Update mutter triple buffering overlay	2023-12-08 13:28:21 +00:00
Jordan Holt	55cf784f56	flake.lock: Update Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/5de0b32be6e85dc1a9404c75131316e4ffbc634c' (2023-12-01) → 'github:NixOS/nixpkgs/b4372c4924d9182034066c823df76d6eaf1f4ec4' (2023-12-07) • Updated input 'thunderbird-gnome-theme': 'github:rafaelmardojai/thunderbird-gnome-theme/a899ca12204d19f4834fbd092aa5bb05dc4bd127' (2023-11-06) → 'github:rafaelmardojai/thunderbird-gnome-theme/966e9dd54bd2ce9d36d51cd6af8c3bac7a764a68' (2023-12-06)	2023-12-08 13:20:31 +00:00