Fix odyssey nix store

Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/d4b5a67bbe9ef750bd2fdffd4cad400dd5553af8' (2023-11-14)
  → 'github:NixOS/nixpkgs/9fb122519e9cd465d532f736a98c1e1eb541ef6f' (2023-11-16)

README.md

@@ -7,7 +7,7 @@ System and user configuration for NixOS-based systems.
 | **Shell:** | zsh |
 | **DE:** | GNOME |
 | **Theme:** | adwaita |
-| **Terminal:** | gnome-console |
+| **Terminal:** | BlackBox |
 
 ## Quick start
 1. Copy SSH keypair and `known_hosts` to `~/.ssh`

flake.lock

@@ -3,11 +3,11 @@
     "firefox-gnome-theme": {
       "flake": false,
       "locked": {
-        "lastModified": 1686524487,
-        "narHash": "sha256-o53fws/jwhLfxiYfTyYpKSGi61d5LHzGgSCkt3DNGRI=",
+        "lastModified": 1699621711,
+        "narHash": "sha256-GUvBQbagF/7W1AriPVvJYA1cmk9Y/iWXghj3cIFYQzU=",
         "owner": "rafaelmardojai",
         "repo": "firefox-gnome-theme",
-        "rev": "83b5b96b0ff5f30543b4e6137e268bcf9933c328",
+        "rev": "1c32013cdbe17406de496cdf5f6899b84c4bbfed",
         "type": "github"
       },
       "original": {
@@ -23,11 +23,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1687647567,
-        "narHash": "sha256-Ua90LZYJO7/7KW/KK/AqijhIekd+wxPwbVKXuBYzJeQ=",
+        "lastModified": 1699748081,
+        "narHash": "sha256-MOmMapBydd7MTjhX4eeQZzKlCABWw8W6iSHSG4OeFKE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6ca1e16eb3016c94b7ac16699e1d4158bd4e39a4",
+        "rev": "04bac349d585c9df38d78e0285b780a140dc74a4",
         "type": "github"
       },
       "original": {
@@ -39,11 +39,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1687729501,
-        "narHash": "sha256-mTLkMePoHUWvTCf3NuKbeYEea/tsikSIKBWwb9OfRr4=",
+        "lastModified": 1700097215,
+        "narHash": "sha256-ODQ3gBTv1iHd7lG21H+ErVISB5wVeOhd/dEogOqHs/I=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "35130d4b4f0b8c50ed2aceb909a538c66c91d4a0",
+        "rev": "9fb122519e9cd465d532f736a98c1e1eb541ef6f",
         "type": "github"
       },
       "original": {
@@ -56,7 +56,24 @@
       "inputs": {
         "firefox-gnome-theme": "firefox-gnome-theme",
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs",
+        "thunderbird-gnome-theme": "thunderbird-gnome-theme"
+      }
+    },
+    "thunderbird-gnome-theme": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1699285862,
+        "narHash": "sha256-3TQYBJAeQ2fPFxQnD5iKRKKWFlN3GJhz1EkdwE+4m0k=",
+        "owner": "rafaelmardojai",
+        "repo": "thunderbird-gnome-theme",
+        "rev": "a899ca12204d19f4834fbd092aa5bb05dc4bd127",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rafaelmardojai",
+        "repo": "thunderbird-gnome-theme",
+        "type": "github"
       }
     }
   },

flake.nix

@@ -11,6 +11,10 @@
       url = "github:rafaelmardojai/firefox-gnome-theme";
       flake = false;
     };
+    thunderbird-gnome-theme = {
+      url = "github:rafaelmardojai/thunderbird-gnome-theme";
+      flake = false;
+    };
   };
 
   outputs = inputs @ { self, nixpkgs, home-manager, ... }:

hosts/atlas/default.nix

@@ -25,7 +25,10 @@ with lib.my;
 
   modules = {
     desktop = {
-      apps.qbittorrent.enable = true;
+      apps = {
+        qbittorrent.enable = true;
+        thunderbird.enable = true;
+      };
       browsers = {
         firefox.enable = true;
       };
@@ -33,6 +36,7 @@ with lib.my;
         raster.enable = true;
         vector.enable = true;
       };
+      office.libreoffice.enable = true;
     };
     dev = {
       node.enable = true;

hosts/desktop.nix

@@ -47,6 +47,11 @@ with lib.my;
   ];
 
   nix.settings = {
+    connect-timeout = 5;
+    log-lines = 25;
+    min-free = 128000000;
+    max-free = 1000000000;
+    fallback = true;
     auto-optimise-store = true;
     substituters = [
       "http://odyssey.mesh.vimium.net"

hosts/helios/default.nix

@@ -8,7 +8,6 @@ with lib.my;
   ];
 
   boot.loader.grub.enable = true;
-  boot.loader.grub.version = 2;
   boot.loader.grub.device = "/dev/sda";
   boot.loader.grub.zfsSupport = true;
 

hosts/odyssey/0001-Update-device-ID-for-PreSonus-1824c.patch

@@ -0,0 +1,57 @@
+From c16be6b3b4da5a55e3ff4258ada123b5f03757e5 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
+
+---
+ sound/usb/format.c       | 4 ++--
+ sound/usb/mixer_quirks.c | 2 +-
+ sound/usb/quirks.c       | 4 ++--
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/sound/usb/format.c b/sound/usb/format.c
+index ab5fed9f55b6..da50a4782414 100644
+--- a/sound/usb/format.c
++++ b/sound/usb/format.c
+@@ -378,8 +378,8 @@ static int parse_uac2_sample_rate_range(struct snd_usb_audio *chip,
+ 
+ 		for (rate = min; rate <= max; rate += res) {
+ 
+-			/* Filter out invalid rates on Presonus Studio 1810c */
+-			if (chip->usb_id == USB_ID(0x194f, 0x010c) &&
++			/* Filter out invalid rates on Presonus Studio 1824c */
++			if (chip->usb_id == USB_ID(0x194f, 0x010d) &&
+ 			    !s1810c_valid_sample_rate(fp, rate))
+ 				goto skip_rate;
+ 
+diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c
+index 898bc3baca7b..c3135459c38c 100644
+--- a/sound/usb/mixer_quirks.c
++++ b/sound/usb/mixer_quirks.c
+@@ -3445,7 +3445,7 @@ int snd_usb_mixer_apply_create_quirk(struct usb_mixer_interface *mixer)
+ 		err = snd_rme_controls_create(mixer);
+ 		break;
+ 
+-	case USB_ID(0x194f, 0x010c): /* Presonus Studio 1810c */
++	case USB_ID(0x194f, 0x010d): /* Presonus Studio 1824c */
+ 		err = snd_sc1810_init_mixer(mixer);
+ 		break;
+ 	case USB_ID(0x2a39, 0x3fb0): /* RME Babyface Pro FS */
+diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
+index ab2b938502eb..b86832edaaa0 100644
+--- a/sound/usb/quirks.c
++++ b/sound/usb/quirks.c
+@@ -1551,8 +1551,8 @@ int snd_usb_apply_interface_quirk(struct snd_usb_audio *chip,
+ 	/* fasttrackpro usb: skip altsets incompatible with device_setup */
+ 	if (chip->usb_id == USB_ID(0x0763, 0x2012))
+ 		return fasttrackpro_skip_setting_quirk(chip, iface, altno);
+-	/* presonus studio 1810c: skip altsets incompatible with device_setup */
+-	if (chip->usb_id == USB_ID(0x194f, 0x010c))
++	/* presonus studio 1824c: skip altsets incompatible with device_setup */
++	if (chip->usb_id == USB_ID(0x194f, 0x010d))
+ 		return s1810c_skip_setting_quirk(chip, iface, altno);
+ 
+ 
+-- 
+2.40.1
+

hosts/odyssey/default.nix

@@ -19,6 +19,29 @@ with lib.my;
 
   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
@@ -52,6 +75,7 @@ with lib.my;
         firefox.enable = true;
       };
       media.graphics = {
+        modeling.enable = true;
         raster.enable = true;
         vector.enable = true;
       };

hosts/odyssey/hardware-configuration.nix

@@ -3,7 +3,11 @@
 # 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")
     ];
@@ -11,8 +15,13 @@
   boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
+  boot.extraModulePackages = [
+    (snd-usb-audio-module.overrideAttrs (_: {
+      patches = [ ./0001-Update-device-ID-for-PreSonus-1824c.patch ];
+    }))
+  ];
   boot.supportedFilesystems = [ "ntfs" ];
+  boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
 
   hardware.nvidia = {
     modesetting.enable = true;
@@ -35,6 +44,11 @@
       fsType = "zfs";
     };
 
+  fileSystems."/nix" =
+    { device = "rpool/local/nix";
+      fsType = "zfs";
+    };
+
   fileSystems."/tmp" =
     { device = "rpool/local/tmp";
       fsType = "zfs";

hosts/odyssey/snd-usb-audio.nix

@@ -0,0 +1,36 @@
+{ pkgs, lib, kernel ? pkgs.linuxPackages_latest.kernel }:
+
+pkgs.stdenv.mkDerivation {
+  pname = "snd-usb-audio";
+  inherit (kernel) src version postPatch nativeBuildInputs;
+
+  kernel_dev = kernel.dev;
+  kernelVersion = kernel.modDirVersion;
+
+  modulePath = "sound/usb";
+
+  buildPhase = ''
+    BUILT_KERNEL=$kernel_dev/lib/modules/$kernelVersion/build
+
+    cp $BUILT_KERNEL/Module.symvers .
+    cp $BUILT_KERNEL/.config        .
+    cp $kernel_dev/vmlinux          .
+
+    make "-j$NIX_BUILD_CORES" modules_prepare
+    make "-j$NIX_BUILD_CORES" M=$modulePath modules
+  '';
+
+  installPhase = ''
+    make \
+      INSTALL_MOD_PATH="$out" \
+      XZ="xz -T$NIX_BUILD_CORES" \
+      M="$modulePath" \
+      modules_install
+  '';
+
+  meta = {
+    description = "USB Sound kernel module";
+    license = lib.licenses.gpl2;
+  };
+}
+

modules/default.nix

@@ -5,6 +5,7 @@
     ./desktop/mimeapps.nix
     ./desktop/apps/qbittorrent.nix
     ./desktop/apps/slack.nix
+    ./desktop/apps/thunderbird.nix
     ./desktop/apps/zoom.nix
     ./desktop/browsers/firefox.nix
     ./desktop/gaming/emulators.nix
@@ -12,6 +13,7 @@
     ./desktop/gaming/steam.nix
     ./desktop/media/graphics.nix
     ./desktop/media/recording.nix
+    ./desktop/office/libreoffice.nix
     ./dev/cc.nix
     ./dev/java.nix
     ./dev/lua.nix

modules/desktop/apps/thunderbird.nix

@@ -0,0 +1,32 @@
+{ 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;
+  };
+  
+  config = mkIf cfg.enable {
+    home.file.".thunderbird/Default/chrome/thunderbird-gnome-theme".source = inputs.thunderbird-gnome-theme;
+
+    home.programs.thunderbird = {
+      enable = true;
+      profiles.Default = {
+        isDefault = true;
+        userChrome = ''
+          @import "thunderbird-gnome-theme/userChrome.css";
+        '';
+        userContent = ''
+          @import "thunderbird-gnome-theme/userContent.css";
+        '';
+        settings = {
+          ## GNOME theme
+          "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
+          "svg.context-properties.content.enabled" = true;
+        };
+      };
+    };
+  };
+}

modules/desktop/gnome.nix

@@ -15,31 +15,42 @@ in {
       desktopManager.gnome.enable = true;
     };
 
+    services.flatpak.enable = true;
+
     programs.dconf.enable = true;
     dconf.settings = {
+      "com/raggesilver/BlackBox" = {
+        theme-dark = "Dracula";
+        font = "Ubuntu Mono 14";
+        remember-window-size = true;
+      };
       "org/gnome/shell" = {
         disable-user-extensions = false;
         enabled-extensions = [
-          "another-window-session-manager@gmail.com"
+          # "another-window-session-manager@gmail.com"
           "blur-my-shell@aunetx"
           "burn-my-windows@schneegans.github.com"
-          "desktop-cube@schneegans.github.com"
-          "desktop-zoom@colin.kinlo.ch"
+          # "desktop-cube@schneegans.github.com"
+          # "desktop-zoom@colin.kinlo.ch"
           "espresso@coadmunkee.github.com"
+          "flypie@schneegans.github.com"
           # "forge@jmmaranan.com"
           "hue-lights@chlumskyvaclav@gmail.com"
           "just-perfection-desktop@just-perfection"
-          "space-bar@luchrioh"
+          "paperwm@hedning:matrix.org"
+          # "search-light@icedman.github.com"
+          # "space-bar@luchrioh"
           # "smart-auto-move@khimaros.com"
           # "systemd-manager@hardpixel.eu"
           # "tailscale-status@maxgallup.github.com"
-          "tiling-assistant@leleat-on-github"
+          # "tiling-assistant@leleat-on-github"
+          "Vitals@CoreCoding.com"
           # "wsmatrix@martin.zurowietz.de"
         ];
         favorite-apps = [
           "firefox.desktop"
           "org.gnome.Nautilus.desktop"
-          "org.gnome.Console.desktop"
+          "com.raggesilver.BlackBox.desktop"
         ];
       };
       "org/gnome/shell/extensions/another-window-session-manager" = {
@@ -67,6 +78,9 @@ in {
           "com.obsproject.Studio.desktop"
         ];
       };
+      "org/gnome/shell/extensions/paperwm" = {
+        use-default-background = true;
+      };
       "org/gnome/shell/extensions/forge" = {
         window-gap-size = 8;
         window-gap-hidden-on-single = false;
@@ -109,6 +123,9 @@ in {
           "<Shift>F11"
           "XF86AudioLowerVolume"
         ];
+        screensaver = [
+          "<Shift><Super>l"
+        ];
       };
       "org/gnome/gnome-session" = {
         auto-save-session = true;
@@ -148,6 +165,7 @@ in {
 
     environment.systemPackages = with pkgs; [
       bind
+      blackbox-terminal
       bmon
       fd
       ffmpeg
@@ -160,18 +178,22 @@ in {
       gnomeExtensions.desktop-cube
       gnomeExtensions.desktop-zoom
       gnomeExtensions.espresso
+      gnome44Extensions."flypie@schneegans.github.com"
       # gnomeExtensions.forge
       # gnomeExtensions.gsnap
       gnomeExtensions.hue-lights
       gnomeExtensions.just-perfection
       # gnomeExtensions.mutter-primary-gpu
+      gnomeExtensions.paperwm
       # gnomeExtensions.pip-on-top
+      gnomeExtensions.search-light
       gnomeExtensions.smart-auto-move
       gnomeExtensions.space-bar
       gnomeExtensions.systemd-manager
       gnomeExtensions.tailscale-status
       gnomeExtensions.tiling-assistant
       # gnomeExtensions.todotxt
+      gnomeExtensions.vitals
       # gnomeExtensions.window-is-ready-remover
       # gnomeExtensions.worksets
       # gnomeExtensions.workspace-matrix

modules/desktop/office/libreoffice.nix

@@ -0,0 +1,16 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+with lib.my;
+let cfg = config.modules.desktop.office.libreoffice;
+in {
+  options.modules.desktop.office.libreoffice = {
+    enable = mkBoolOpt false;
+  };
+
+  config = mkIf cfg.enable {
+    user.packages = with pkgs; [
+      libreoffice
+    ];
+  };
+}

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-44/mutter-triple-buffering-v4-44.tar.gz";
-        sha256 = "Xgiu1ifgPijXPq6rYfPX81Nq97jw9m/hoWTKAgC3aeI=";
+        sha256 = "UhCbdAh5AtYWTi0GX8RmexUAS0nbvISPuErX/8NTdoA=";
       };
     });
   });