testing ControllerMode = bredr

https://unix.stackexchange.com/questions/736933/what-is-the-bluetooth-controllermode-in-etc-bluetooth-main-conf-what-is-bredr
https://github.com/bluez/bluez/blob/master/src/main.conf
https://bbs.archlinux.org/viewtopic.php?id=270465

.github/workflows/build_systems.yml

@@ -0,0 +1,22 @@
+name: build_jeeves
+on:
+  workflow_dispatch:
+  pull_request:
+  push:
+    branches: [main]
+
+jobs:
+  build:
+    name: build-${{ matrix.system }}
+    runs-on: self-hosted
+    strategy:
+      matrix:
+        system:
+          - "bob"
+          - "jeeves"
+          - "muninn"
+          - "rhapsody-in-green"
+    steps:
+      - uses: actions/checkout@v4
+      - name: Build default package
+        run: "nixos-rebuild build --flake ./#${{ matrix.system }}"

.github/workflows/update-flake-lock.yml

@@ -0,0 +1,21 @@
+name: update-flake-lock
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "0 0 * * *"
+
+jobs:
+  lockfile:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Install Nix
+        uses: DeterminateSystems/nix-installer-action@main
+      - name: Update flake.lock
+        uses: DeterminateSystems/update-flake-lock@main
+        with:
+          pr-title: "Update flake.lock"
+          pr-labels: |
+            dependencies
+            automated

.vscode/settings.json

@@ -16,6 +16,7 @@
     "audiobookshelf",
     "auditd",
     "autofetch",
+    "autologin",
     "autopull",
     "autotrim",
     "azuretools",
@@ -25,6 +26,7 @@
     "bitwarden",
     "blkdiscard",
     "breakpad",
+    "bredr",
     "btop",
     "cachix",
     "canmount",
@@ -71,6 +73,7 @@
     "formfill",
     "foxundermoon",
     "FULLSCREEN",
+    "fwupd",
     "fxaccounts",
     "gamemode",
     "gamescope",
@@ -80,6 +83,7 @@
     "globalprivacycontrol",
     "gparted",
     "gtts",
+    "hass",
     "healthreport",
     "Heatsink",
     "hediet",
@@ -234,6 +238,7 @@
     "urlclassifier",
     "usbhid",
     "usbutils",
+    "useragent",
     "usernamehw",
     "userprefs",
     "vfat",

build.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+nixos-rebuild build --flake /home/richie/projects/dotfiles#bob
+nixos-rebuild build --flake /home/richie/projects/dotfiles#jeeves
+nixos-rebuild build --flake /home/richie/projects/dotfiles#muninn
+nixos-rebuild build --flake /home/richie/projects/dotfiles#rhapsody-in-green

common/global/default.nix

@@ -2,12 +2,12 @@
   inputs,
   lib,
   outputs,
+  pkgs,
   ...
 }:
 {
   imports = [
     inputs.home-manager.nixosModules.home-manager
-    ./docker.nix
     ./fail2ban.nix
     ./fonts.nix
     ./libs.nix
@@ -19,7 +19,11 @@
     ./snapshot_manager.nix
   ];
 
-  boot.tmp.useTmpfs = true;
+  boot = {
+    tmp.useTmpfs = true;
+    kernelPackages = lib.mkDefault pkgs.linuxPackages_6_12;
+    zfs.package = lib.mkDefault pkgs.zfs;
+  };
 
   hardware.enableRedistributableFirmware = true;
 
@@ -36,10 +40,9 @@
     };
   };
 
-  programs = {
+  services.fwupd.enable = true;
-    zsh.enable = true;
+
-    fish.enable = true;
+  programs.zsh.enable = true;
-  };
 
   security.auditd.enable = lib.mkDefault true;
 

common/global/fonts.nix

@@ -4,7 +4,9 @@
     fontconfig.enable = true;
     enableDefaultPackages = true;
     packages = with pkgs; [
-      nerdfonts
+      nerd-fonts.roboto-mono
+      nerd-fonts.intone-mono
+      nerd-fonts.symbols-only
     ];
   };
 }

common/global/nix.nix

@@ -11,6 +11,21 @@ in {
         "root"
         "@wheel"
       ];
+      trusted-substituters = [
+        "https://cache.nixos.org"
+        "https://cache.tmmworkshop.com"
+        "https://nix-community.cachix.org"
+      ];
+      substituters = [
+        "https://cache.nixos.org/?priority=2&want-mass-query=true"
+        "https://cache.tmmworkshop.com/?priority=2&want-mass-query=true"
+        "https://nix-community.cachix.org/?priority=10&want-mass-query=true"
+      ];
+      trusted-public-keys = [
+        "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
+        "cache.tmmworkshop.com:jHffkpgbmEdstQPoihJPYW9TQe6jnQbWR2LqkNGV3iA="
+        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+      ];
       auto-optimise-store = lib.mkDefault true;
       experimental-features = [
         "nix-command"

common/global/programs.nix

@@ -2,6 +2,6 @@
 {
   environment.systemPackages = with pkgs; [
     git
-    python312
+    python313
   ];
 }

common/global/snapshot_config.toml

@@ -6,8 +6,8 @@ monthly = 0
 
 ["root_pool/home"]
 15_min = 8
-hourly = 24
+hourly = 12
-daily = 14
+daily = 1
 monthly = 0
 
 ["root_pool/root"]

common/optional/desktop.nix

@@ -1,11 +1,18 @@
-{ lib, pkgs, ... }:
+{ pkgs, ... }:
 {
   boot = {
-    kernelPackages = lib.mkDefault pkgs.master.linuxPackages_zen;
+    kernelPackages = pkgs.linuxPackages_6_12;
-    zfs.package = pkgs.master.zfs_unstable;
+    zfs.package = pkgs.zfs;
   };
+
   services = {
+    displayManager.sddm = {
+      enable = true;
+      wayland.enable = true;
+    };
+
     desktopManager.plasma6.enable = true;
+
     xserver = {
       enable = true;
       xkb = {
@@ -13,5 +20,13 @@
         variant = "";
       };
     };
+
+    pipewire = {
+      enable = true;
+      alsa.enable = true;
+      alsa.support32Bit = true;
+      pulse.enable = true;
+      wireplumber.enable = true;
+    };
   };
 }

common/optional/steam.nix

@@ -10,8 +10,13 @@
       gamescopeSession.enable = true;
       remotePlay.openFirewall = true;
       localNetworkGameTransfers.openFirewall = true;
+      protontricks.enable = true;
       extraCompatPackages = with pkgs; [proton-ge-bin];
       extest.enable = true;
     };
+    gamescope = {
+      enable = true;
+      capSysNice = true;
+    };
   };
 }

common/optional/update.nix

@@ -1,11 +1,24 @@
-{ lib, ... }:
+{  lib, pkgs, ... }:
 {
-  services.autopull = {
+  systemd = {
-    enable = lib.mkDefault true;
+    services."autopull@dotfiles" = {
-    repo.dotfiles = {
+      requires = [ "multi-user.target" ];
-      enable = lib.mkDefault true;
+      after = [ "multi-user.target" ];
-      ssh-key = lib.mkDefault "/root/.ssh/id_ed25519_ghdeploy";
+      description = "Pull the latest data for dotfiles";
-      path = lib.mkDefault /root/dotfiles;
+      serviceConfig = {
+        Type = "oneshot";
+        User = "root";
+        WorkingDirectory = /root/dotfiles;
+        ExecStart = "${pkgs.git}/bin/git pull --all --prune";
+      };
+    };
+    timers."autopull@dotfiles" = {
+      wantedBy = [ "timers.target" ];
+      timerConfig = {
+        OnBootSec = "1h";
+        OnUnitActiveSec = "1h";
+        Unit = "autopull@dotfiles.service";
+      };
     };
   };
 

common/optional/zerotier.nix

@@ -3,4 +3,9 @@
     enable = true;
     joinNetworks = [ "e4da7455b2ae64ca" ];
   };
+  nix.settings = {
+    trusted-substituters = [ "http://192.168.90.40:5000" ];
+    substituters = [ "http://192.168.90.40:5000/?priority=1&want-mass-query=true" ];
+    trusted-public-keys = [ "cache.tmmworkshop.com:jHffkpgbmEdstQPoihJPYW9TQe6jnQbWR2LqkNGV3iA=" ];
+  };
 }

flake.lock

@@ -9,11 +9,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1730520198,
+        "lastModified": 1735099403,
-        "narHash": "sha256-0G4QIsCmQyfwdWUws7UDZQYcCn5l9m42AE9c3Ak0+DY=",
+        "narHash": "sha256-22NF70bxkMY7/IY2NG0pC7WzgJ0bI67FGSUP37d2mQ8=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "ca0f5e3fd8a37605a6960fee549f6b79d3f83c28",
+        "rev": "5b2c380332cf5a3022fde931d0346e2b868b544e",
         "type": "gitlab"
       },
       "original": {
@@ -59,11 +59,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1710146030,
+        "lastModified": 1731533236,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
         "type": "github"
       },
       "original": {
@@ -79,11 +79,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730490306,
+        "lastModified": 1735053786,
-        "narHash": "sha256-AvCVDswOUM9D368HxYD25RsSKp+5o0L0/JHADjLoD38=",
+        "narHash": "sha256-Gm+0DcbUS338vvkwyYWms5jsWlx8z8MeQBzcnIDuIkw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "1743615b61c7285976f85b303a36cdf88a556503",
+        "rev": "35b98d20ca8f4ca1f6a2c30b8a2c8bb305a36d84",
         "type": "github"
       },
       "original": {
@@ -101,11 +101,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1703863825,
+        "lastModified": 1729742964,
-        "narHash": "sha256-rXwqjtwiGKJheXB43ybM8NwWB8rO2dSRrEqes0S7F5Y=",
+        "narHash": "sha256-B4mzTcQ0FZHdpeWcpDYPERtyjJd/NIuaQ9+BV1h+MpA=",
         "owner": "nix-community",
         "repo": "nix-github-actions",
-        "rev": "5163432afc817cf8bd1f031418d1869e4c9d5547",
+        "rev": "e04df33f62cdcf93d73e9a04142464753a16db67",
         "type": "github"
       },
       "original": {
@@ -124,11 +124,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1730511796,
+        "lastModified": 1735090583,
-        "narHash": "sha256-+ZBaUiJWig7LumIKi1fOExUke8XubkKJUlcrEa+UN+M=",
+        "narHash": "sha256-Tm+BsKXJS/EdJd9DvLxDbw+chPI1o7A9RHKIFxho36I=",
         "owner": "lilyinstarlight",
         "repo": "nixos-cosmic",
-        "rev": "1d5a818e3b5188f6aa106eed5f66e454787c5d70",
+        "rev": "847b93e3b63bcea9a477dd86bb4b56ce7e051f0e",
         "type": "github"
       },
       "original": {
@@ -139,11 +139,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1730537918,
+        "lastModified": 1734954597,
-        "narHash": "sha256-GJB1/aaTnAtt9sso/EQ77TAGJ/rt6uvlP0RqZFnWue8=",
+        "narHash": "sha256-QIhd8/0x30gEv8XEE1iAnrdMlKuQ0EzthfDR7Hwl+fk=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "f6e0cd5c47d150c4718199084e5764f968f1b560",
+        "rev": "def1d472c832d77885f174089b0d34854b007198",
         "type": "github"
       },
       "original": {
@@ -155,11 +155,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1730200266,
+        "lastModified": 1734649271,
-        "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=",
+        "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd",
+        "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507",
         "type": "github"
       },
       "original": {
@@ -171,11 +171,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1730587346,
+        "lastModified": 1735170897,
-        "narHash": "sha256-YAzfNPNFtztrOYe1Nhi6cTiT7kedRwmlfpijA9T2uuk=",
+        "narHash": "sha256-O1OXa12dHaObowGsfiM8pgphWfSXJj5v8sTxFoPXR0A=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a8ffc2295c358629bc1bda569bf8b3bbb21aa1be",
+        "rev": "138326d6e9841ab9e6161730d40e09cedd670c40",
         "type": "github"
       },
       "original": {
@@ -187,27 +187,27 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1730327045,
+        "lastModified": 1734875076,
-        "narHash": "sha256-xKel5kd1AbExymxoIfQ7pgcX6hjw9jCgbiBjiUfSVJ8=",
+        "narHash": "sha256-Pzyb+YNG5u3zP79zoi8HXYMs15Q5dfjDgwCdUI5B0nY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "080166c15633801df010977d9d7474b4a6c549d7",
+        "rev": "1807c2b91223227ad5599d7067a61665c52d1295",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-24.05",
+        "ref": "nixos-24.11",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs-stable_2": {
       "locked": {
-        "lastModified": 1730327045,
+        "lastModified": 1734835170,
-        "narHash": "sha256-xKel5kd1AbExymxoIfQ7pgcX6hjw9jCgbiBjiUfSVJ8=",
+        "narHash": "sha256-JG6n9tQET7ZLjvwjH9BdYE6pES/Alcduxv2FDXliuBM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "080166c15633801df010977d9d7474b4a6c549d7",
+        "rev": "6df924734e1b626efd70925545de844b1c25246f",
         "type": "github"
       },
       "original": {
@@ -232,11 +232,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1723343306,
+        "lastModified": 1731205797,
-        "narHash": "sha256-/6sRkPq7/5weX2y0V8sQ29Sz35nt8kyj+BsFtkhgbJE=",
+        "narHash": "sha256-F7N1mxH1VrkVNHR3JGNMRvp9+98KYO4b832KS8Gl2xI=",
         "owner": "nix-community",
         "repo": "poetry2nix",
-        "rev": "4a1c112ff0c67f496573dc345bd0b2247818fc29",
+        "rev": "f554d27c1544d9c56e5f1f8e2b8aff399803674e",
         "type": "github"
       },
       "original": {
@@ -266,11 +266,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730428392,
+        "lastModified": 1735007320,
-        "narHash": "sha256-2aRfq1P0usr+TlW9LUCoefqqpPum873ac0TgZzXYHKI=",
+        "narHash": "sha256-NdhUgB9BkLGW9I+Q1GyUUCc3CbDgsg7HLWjG7WZBR5Q=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "17eda17f5596a84e92ba94160139eb70f3c3e734",
+        "rev": "fb5fdba697ee9a2391ca9ceea3b853b4e3ce37a5",
         "type": "github"
       },
       "original": {
@@ -288,11 +288,11 @@
         "poetry2nix": "poetry2nix"
       },
       "locked": {
-        "lastModified": 1729617389,
+        "lastModified": 1733083480,
-        "narHash": "sha256-Q05Nhw84FprGiuQHd1ahOhKKIbxzp1rpeCqddjXUSVM=",
+        "narHash": "sha256-B13faNyBbA3MeI7Jp6pFVbp58rI2Rx5Uvd83csW2p48=",
         "owner": "RichieCahill",
         "repo": "system_tools",
-        "rev": "2a2aa711fcf67ed5e4db484e507a4a511b9b4230",
+        "rev": "bc357d8fabd83c1423611829091e5b1d86dd913c",
         "type": "github"
       },
       "original": {
@@ -354,11 +354,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719749022,
+        "lastModified": 1730120726,
-        "narHash": "sha256-ddPKHcqaKCIFSFc/cvxS14goUhCOAwsM1PbMr0ZtHMg=",
+        "narHash": "sha256-LqHYIxMrl/1p3/kvm2ir925tZ8DkI0KA10djk8wecSk=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "8df5ff62195d4e67e2264df0b7f5e8c9995fd0bd",
+        "rev": "9ef337e492a5555d8e17a51c911ff1f02635be15",
         "type": "github"
       },
       "original": {

flake.nix

@@ -3,8 +3,8 @@
 
   nixConfig = {
     extra-substituters = [
-      "https://cache.nixos.org/?priority=1&want-mass-query=true"
+      "https://cache.nixos.org/?priority=2&want-mass-query=true"
-      "https://cache.tmmworkshop.com/?priority=1&want-mass-query=true"
+      "https://cache.tmmworkshop.com/?priority=2&want-mass-query=true"
       "https://nix-community.cachix.org/?priority=10&want-mass-query=true"
     ];
     extra-trusted-public-keys = [

systems/bob/default.nix

@@ -3,12 +3,13 @@
     ../../users/richie
     ../../common/global
     ../../common/optional/desktop.nix
+    ../../common/optional/docker.nix
     ../../common/optional/scanner.nix
     ../../common/optional/steam.nix
     ../../common/optional/syncthing_base.nix
     ../../common/optional/systemd-boot.nix
-    ../../common/optional/zerotier.nix
     ../../common/optional/yubikey.nix
+    ../../common/optional/zerotier.nix
     ./hardware.nix
     ./nvidia.nix
     ./syncthing.nix
@@ -33,19 +34,10 @@
 
   services = {
 
-    displayManager.sddm.enable = true;
-
     openssh.ports = [ 262 ];
 
     printing.enable = true;
 
-    pipewire = {
-      enable = true;
-      alsa.enable = true;
-      alsa.support32Bit = true;
-      pulse.enable = true;
-    };
-
     snapshot_manager.enable = true;
 
     zfs = {

systems/bob/nvidia.nix

@@ -5,8 +5,9 @@
     nvidia = {
       modesetting.enable = true;
       powerManagement.enable = true;
-      package = config.boot.kernelPackages.nvidiaPackages.production;
+      package = config.boot.kernelPackages.nvidiaPackages.beta;
       nvidiaSettings = true;
+      open = true;
     };
     nvidia-container-toolkit.enable = true;
   };

systems/jeeves/arch_mirror.nix

@@ -1,39 +0,0 @@
-{ inputs, pkgs, ... }:
-let
-  vars = import ./vars.nix;
-in
-{
-  users = {
-    users.arch-mirror = {
-      isSystemUser = true;
-      group = "arch-mirror";
-    };
-    groups.arch-mirror = {};
-  };
-
-  virtualisation.oci-containers.containers.arch_mirror = {
-    image = "ubuntu/apache2:latest";
-    volumes = [
-      "${../../common/docker_templates}/file_server/sites/:/etc/apache2/sites-enabled/"
-      "${vars.media_mirror}:/data"
-    ];
-    ports = [ "800:80" ];
-    extraOptions = [ "--network=web" ];
-    autoStart = true;
-  };
-
-  systemd.services.sync_mirror = {
-    requires = [ "network-online.target" ];
-    after = [ "network-online.target" ];
-    wantedBy = [ "multi-user.target" ];
-    description = "validates startup";
-    path = [ pkgs.rsync ];
-    serviceConfig = {
-      Environment = "MIRROR_DIR=${vars.media_mirror}/archlinux/";
-      Type = "simple";
-      User = "arch-mirror";
-      Group = "arch-mirror";
-      ExecStart = "${inputs.system_tools.packages.x86_64-linux.default}/bin/sync_mirror";
-    };
-  };
-}

systems/jeeves/default.nix

@@ -5,15 +5,16 @@ in
   imports = [
     ../../users/richie
     ../../common/global
+    ../../common/optional/docker.nix
     ../../common/optional/ssh_decrypt.nix
     ../../common/optional/syncthing_base.nix
     ../../common/optional/zerotier.nix
-    ./arch_mirror.nix
     ./docker
     ./hardware.nix
     ./home_assistant.nix
     ./networking.nix
     ./programs.nix
+    ./runner.nix
     ./services.nix
     ./syncthing.nix
   ];
@@ -24,8 +25,6 @@ in
     "torrenting"
   ];
 
-  networking.firewall.allowedTCPPorts = [ 7654 ];
-
   services = {
     openssh.ports = [ 629 ];
 
@@ -41,14 +40,6 @@ in
       openFirewall = true;
     };
 
-    tang = {
-      enable = true;
-      ipAddressAllow = [
-        "192.168.98.1/24"
-        "192.168.95.1/24"
-      ];
-    };
-
     smartd.enable = true;
 
     snapshot_manager = {

systems/jeeves/docker/haproxy.cfg

@@ -29,7 +29,7 @@ frontend ContentSwitching
   acl host_cache  hdr(host) -i cache.tmmworkshop.com
   acl host_filebrowser  hdr(host) -i filebrowser.tmmworkshop.com
   acl host_grafana  hdr(host) -i grafana.tmmworkshop.com
-  acl host_mirror   hdr(host) -i mirror.tmmworkshop.com
+  acl host_homeassistant  hdr(host) -i homeassistant.tmmworkshop.com
   acl host_photoprism  hdr(host) -i photoprism.tmmworkshop.com
   acl host_uptime_kuma  hdr(host) -i uptimekuma-jeeves.tmmworkshop.com
 
@@ -37,7 +37,7 @@ frontend ContentSwitching
   use_backend cache_nodes  if host_cache
   use_backend filebrowser_nodes  if host_filebrowser
   use_backend grafana_nodes  if host_grafana
-  use_backend mirror_nodes   if host_mirror
+  use_backend homeassistant_nodes  if host_homeassistant
   use_backend photoprism_nodes  if host_photoprism
   use_backend uptime_kuma_nodes  if host_uptime_kuma
 
@@ -57,9 +57,9 @@ backend filebrowser_nodes
   mode http
   server server filebrowser:8080
 
-backend mirror_nodes
+backend homeassistant_nodes
   mode http
-  server server arch_mirror:80
+  server server 192.168.95.14:8123
 
 backend photoprism_nodes
   mode http

systems/jeeves/docker/postgresql.nix

@@ -13,20 +13,20 @@ in
     };
   };
 
-  # virtualisation.oci-containers.containers = {
+  virtualisation.oci-containers.containers = {
-  #   postgres = {
+    postgres = {
-  #     image = "postgres:16";
+      image = "postgres:17";
-  #     ports = [ "5432:5432" ];
+      ports = [ "5432:5432" ];
-  #     volumes = [ "${vars.media_database}/postgres:/var/lib/postgresql/data" ];
+      volumes = [ "${vars.media_database}/postgres:/var/lib/postgresql/data" ];
-  #     environment = {
+      environment = {
-  #       POSTGRES_USER = "admin";
+        POSTGRES_USER = "admin";
-  #       POSTGRES_DB = "archive";
+        POSTGRES_DB = "archive";
-  #       POSTGRES_INITDB_ARGS = "--auth-host=scram-sha-256";
+        POSTGRES_INITDB_ARGS = "--auth-host=scram-sha-256";
-  #     };
+      };
-  #     environmentFiles = [/root/secrets/docker/postgres];
+      environmentFiles = [ "${vars.storage_secrets}/docker/postgres" ];
-  #     autoStart = true;
+      autoStart = true;
-  #     user = "postgres:postgres";
+      user = "postgres:postgres";
-  #   };
+    };
-  # };
+  };
 
 }

systems/jeeves/docker/prowlarr.nix

@@ -1,17 +0,0 @@
-let
-  vars = import ../vars.nix;
-in
-{
-  networking.firewall.allowedTCPPorts = [ 9696 ];
-  virtualisation.oci-containers.containers.prowlarr = {
-    image = "ghcr.io/linuxserver/prowlarr:latest";
-    ports = [ "9696:9696" ];
-    environment = {
-      PUID = "600";
-      PGID = "100";
-      TZ = "America/New_York";
-    };
-    volumes = [ "${vars.media_docker_configs}/prowlarr:/config" ];
-    autoStart = true;
-  };
-}

systems/jeeves/docker/qbit.nix

@@ -4,10 +4,10 @@ in
 {
   networking.firewall = {
     allowedTCPPorts = [ 6881 8082 29432 ]; 
-    allowedUDPPorts = [ 6881 ];
+    allowedUDPPorts = [ 6881 29432 ];
   };
   virtualisation.oci-containers.containers.qbit = {
-    image = "ghcr.io/linuxserver/qbittorrent:latest";
+    image = "ghcr.io/linuxserver/qbittorrent:5.0.2";
     ports = [
       "6881:6881"
       "6881:6881/udp"

systems/jeeves/docker/qbitvpn.nix

@@ -7,7 +7,8 @@ in
     allowedUDPPorts = [ 6882 ];
   };
   virtualisation.oci-containers.containers.qbitvpn = {
-    image = "binhex/arch-qbittorrentvpn:latest";
+    image = "binhex/arch-qbittorrentvpn:5.0.3-1-01";
+    devices = [ "/dev/net/tun:/dev/net/tun" ];
     extraOptions = [ "--cap-add=NET_ADMIN" ];
     ports = [
       "6882:6881"

systems/jeeves/docker/reverse_proxy.nix

@@ -14,7 +14,6 @@ in
         "${./haproxy.cfg}:/usr/local/etc/haproxy/haproxy.cfg"
       ];
       dependsOn = [
-        "arch_mirror"
         "audiobookshelf"
         "filebrowser"
         "grafana"

systems/jeeves/docker/sonarr.nix

@@ -1,21 +0,0 @@
-let
-  vars = import ../vars.nix;
-in
-{
-  networking.firewall.allowedTCPPorts = [ 9696 8989 ];
-  virtualisation.oci-containers.containers.sonarr = {
-    image = "ghcr.io/linuxserver/sonarr:latest";
-    ports = [ "8989:8989" ];
-    environment = {
-      PUID = "600";
-      PGID = "100";
-      TZ = "America/New_York";
-    };
-    volumes = [
-      "${vars.media_docker_configs}/sonarr:/config"
-      "${vars.storage_plex}/tv:/tv"
-      "${vars.torrenting_qbitvpn}:/data"
-    ];
-    autoStart = true;
-  };
-}

systems/jeeves/home_assistant.nix

@@ -1,7 +1,11 @@
+let
+  vars = import ./vars.nix;
+in
 {
   services.home-assistant = {
     enable = true;
     openFirewall = true;
+    configDir = vars.media_home_assistant;
     config = {
       http = {
         server_port = 8123;
@@ -11,7 +15,7 @@
           "192.168.98.4"
         ];
         use_x_forwarded_for = true;
-        trusted_proxies = "172.100.0.4";
+        trusted_proxies = "172.18.0.0/24";
       };
       homeassistant = {
         time_zone = "America/New_York";
@@ -34,6 +38,10 @@
       sun = { };
       webhook = { };
       zeroconf = { };
+      automation = "!include automations.yaml";
+      script = "!include scripts.yaml";
+      scene = "!include scenes.yaml";
+      group = "!include groups.yaml";
     };
     extraPackages =
       python3Packages: with python3Packages; [

systems/jeeves/networking.nix

@@ -23,7 +23,8 @@
     networks = {
       "10-1GB_Primary" = {
         matchConfig.Name = "enp98s0f0";
-        DHCP = "yes";
+        address = [ "192.168.95.14/24" ];
+        routes = [{ Gateway = "192.168.95.1"; }];
         vlan = [ "ioit-vlan" ];
         linkConfig.RequiredForOnline = "routable";
       };

systems/jeeves/runner.nix

@@ -0,0 +1,29 @@
+{ pkgs, ... }:
+let
+  vars = import ./vars.nix;
+in
+{
+  users = {
+    users.github-runners = {
+      isSystemUser = true;
+      group = "github-runners";
+      uid = 601;
+    };
+    groups.github-runners = {
+      gid = 601;
+    };
+  };
+  
+  services.github-runners.nix_builder = {
+    enable = true;
+    replace = true;
+    workDir = "/zfs/media/github-runners/nix_builder/";
+    url = "https://github.com/RichieCahill/dotfiles";
+    extraLabels = [ "nixos" ];
+    tokenFile = "${vars.storage_secrets}/services/github_runners/nix_builder";
+    user = "github-runners";
+    group = "github-runners";
+    extraPackages = [ pkgs.nixos-rebuild ];
+    # extraEnvironment
+  };
+}

systems/jeeves/scripts/zfs.sh

@@ -18,11 +18,12 @@ sudo zpool add torrenting -o ashift=12 special
 # media datasets
 sudo zfs create -o compression=zstd-9 media/docker
 sudo zfs create -o recordsize=1M -o compression=zstd-19 media/library
+sudo zfs create -o compression=zstd-9 -o sync=disabled media/github-runners
 sudo zfs create -o exec=off media/minio
-sudo zfs create -o exec=off media/mirror
 sudo zfs create -o copies=3 media/notes
 sudo zfs create -o recordsize=16k -o primarycache=metadata -o mountpoint=/zfs/media/database/photoprism_mariadb media/photoprism_mariadb
 sudo zfs create -o compression=zstd-9 media/plex
+sudo zfs create -o compression=zstd-19 media/home_assistant
 sudo zfs create -o recordsize=16k -o primarycache=metadata -o mountpoint=/zfs/media/database/postgres media/postgres
 
 # storage datasets

systems/jeeves/vars.nix

@@ -12,6 +12,7 @@ in
   media_mirror = "${zfs_media}/mirror";
   media_notes = "${zfs_media}/notes";
   media_plex = "${zfs_media}/plex";
+  media_home_assistant = "${zfs_media}/home_assistant";
   # storage
   storage_main = "${zfs_storage}/main";
   storage_photos = "${zfs_storage}/photos";

systems/muninn/default.nix

@@ -1,11 +1,19 @@
+{ inputs, pkgs, ... }:
 {
   imports = [
+    ../../users/gaming
     ../../users/richie
     ../../common/global
     ../../common/optional/desktop.nix
     ../../common/optional/steam.nix
     ../../common/optional/systemd-boot.nix
+    ../../common/optional/update.nix
     ./hardware.nix
+    inputs.nixos-hardware.nixosModules.framework-11th-gen-intel
+  ];
+
+  environment.systemPackages = with pkgs; [
+    plex-media-player
   ];
 
   networking = {
@@ -20,26 +28,28 @@
     bluetooth = {
       enable = true;
       powerOnBoot = true;
+      settings.General.ControllerMode = "bredr";
     };
+    firmware = [ pkgs.sof-firmware ];
   };
 
   security.rtkit.enable = true;
 
   services = {
+    displayManager = {
+      enable = true;
+      autoLogin = {
+        user = "gaming";
+        enable = true;
+      };
+      defaultSession = "steam";
+      # defaultSession = "plasma";
+    };
 
-    displayManager.sddm.enable = true;
+    openssh.ports = [ 295 ];
-
-    openssh.ports = [ 262 ];
 
     printing.enable = true;
 
-    pipewire = {
-      enable = true;
-      alsa.enable = true;
-      alsa.support32Bit = true;
-      pulse.enable = true;
-    };
-
     snapshot_manager.enable = true;
 
     zfs = {

systems/muninn/hardware.nix

@@ -17,6 +17,8 @@
         device = "/dev/disk/by-id/nvme-INTEL_SSDPEKKW256G7_BTPY63820XBH256D-part2";
         bypassWorkqueues = true;
         allowDiscards = true;
+        keyFileSize = 4096;
+        keyFile = "/dev/disk/by-id/usb-SanDisk_Ultra_T_C_4C530001020919102244-0:0";
       };
     };
     kernelModules = [ "kvm-intel" ];

systems/rhapsody-in-green/default.nix

@@ -4,6 +4,8 @@
     ../../users/richie
     ../../common/global
     ../../common/optional/desktop.nix
+    ../../common/optional/docker.nix
+    ../../common/optional/steam.nix
     ../../common/optional/syncthing_base.nix
     ../../common/optional/systemd-boot.nix
     ../../common/optional/yubikey.nix
@@ -32,19 +34,10 @@
 
   services = {
 
-    displayManager.sddm.enable = true;
-
     openssh.ports = [ 922 ];
 
     printing.enable = true;
 
-    pipewire = {
-      enable = true;
-      alsa.enable = true;
-      alsa.support32Bit = true;
-      pulse.enable = true;
-    };
-
     snapshot_manager.enable = true;
 
     zfs = {

users/gaming/default.nix

@@ -0,0 +1,24 @@
+{
+  pkgs,
+  config,
+  ...
+}: 
+{
+  users = {
+    users.gaming = {
+      isNormalUser = true;
+      shell = pkgs.zsh;
+      group = "gaming";
+      extraGroups =
+      [
+        "audio"
+        "video"
+        "users"
+      ];
+      uid = 1100;
+    };
+
+    groups.gaming.gid = 1100;
+  };
+  home-manager.users.gaming = import ./systems/${config.networking.hostName}.nix; 
+}

users/gaming/home/firefox.nix

@@ -0,0 +1,251 @@
+{ inputs, ... }:
+{
+  programs.firefox = {
+    enable = true;
+    profiles.richie = {
+      extensions = with inputs.firefox-addons.packages.x86_64-linux; [
+        bitwarden
+        darkreader
+        dearrow
+        fastforwardteam
+        return-youtube-dislikes
+        sponsorblock
+        ublock-origin
+      ];
+      search = {
+        force = true;
+        default = "Google";
+        order = [ "Google" ];
+      };
+      settings = {
+        # Makes Firefox use the PlayStation 5 user agent
+        "general.useragent.override" = "Mozilla/5.0 (PlayStation; PlayStation 5/10.01) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/17.0 Safari/605.1.15,gzip(gfe),gzip(gfe)";
+
+        # SECTION: FASTFOX
+        # GENERAL
+        "content.notify.interval" = 100000;
+
+        # GFX
+        "gfx.canvas.accelerated.cache-items" = 4096;
+        "gfx.canvas.accelerated.cache-size" = 512;
+        "gfx.content.skia-font-cache-size" = 20;
+
+        # DISK CACHE
+        "browser.cache.jsbc_compression_level" = 3;
+
+        # MEDIA CACHE
+        "media.memory_cache_max_size" = 65536;
+        "media.cache_readahead_limit" = 7200;
+        "media.cache_resume_threshold" = 3600;
+
+        # IMAGE CACHE
+        "image.mem.decode_bytes_at_a_time" = 32768;
+
+        # NETWORK
+        "network.buffer.cache.size" = 262144;
+        "network.buffer.cache.count" = 128;
+        "network.http.max-connections" = 1800;
+        "network.http.max-persistent-connections-per-server" = 10;
+        "network.http.max-urgent-start-excessive-connections-per-host" = 5;
+        "network.http.pacing.requests.enabled" = false;
+        "network.dnsCacheExpiration" = 3600;
+        "network.dns.max_high_priority_threads" = 8;
+        "network.ssl_tokens_cache_capacity" = 10240;
+
+        # SPECULATIVE LOADING
+        "network.dns.disablePrefetch" = true;
+        "network.prefetch-next" = false;
+        "network.predictor.enabled" = false;
+
+        # EXPERIMENTAL
+        "layout.css.grid-template-masonry-value.enabled" = true;
+        "dom.enable_web_task_scheduling" = true;
+        "layout.css.has-selector.enabled" = true;
+        "dom.security.sanitizer.enabled" = true;
+
+        # SECTION: SECUREFOX
+        # TRACKING PROTECTION
+        "browser.contentblocking.category" = "strict";
+        "urlclassifier.trackingSkipURLs" = "*.reddit.com, *.twitter.com, *.twimg.com, *.tiktok.com";
+        "urlclassifier.features.socialtracking.skipURLs" = "*.instagram.com, *.twitter.com, *.twimg.com";
+        "network.cookie.sameSite.noneRequiresSecure" = true;
+        "browser.download.start_downloads_in_tmp_dir" = true;
+        "browser.helperApps.deleteTempFileOnExit" = true;
+        "browser.uitour.enabled" = false;
+        "privacy.globalprivacycontrol.enabled" = true;
+
+        # OCSP & CERTS / HPKP
+        "security.OCSP.enabled" = 0;
+        "security.remote_settings.crlite_filters.enabled" = true;
+        "security.pki.crlite_mode" = 2;
+
+        # SSL / TLS
+        "security.ssl.treat_unsafe_negotiation_as_broken" = true;
+        "browser.xul.error_pages.expert_bad_cert" = true;
+        "security.tls.enable_0rtt_data" = false;
+
+        # DISK AVOIDANCE
+        "browser.privatebrowsing.forceMediaMemoryCache" = true;
+        "browser.sessionstore.interval" = 60000;
+
+        # SHUTDOWN & SANITIZING
+        "privacy.history.custom" = true;
+
+        # SEARCH / URL BAR
+        "browser.search.separatePrivateDefault.ui.enabled" = true;
+        "browser.urlbar.update2.engineAliasRefresh" = true;
+        # PREF: restore search engine suggestions
+        "browser.search.suggest.enabled" = true;
+        "browser.urlbar.suggest.quicksuggest.sponsored" = false;
+        "browser.urlbar.suggest.quicksuggest.nonsponsored" = false;
+        "browser.formfill.enable" = false;
+        "security.insecure_connection_text.enabled" = true;
+        "security.insecure_connection_text.pbmode.enabled" = true;
+        "network.IDN_show_punycode" = true;
+
+        # HTTPS-FIRST POLICY
+        "dom.security.https_first" = true;
+        "dom.security.https_first_schemeless" = true;
+
+        # PASSWORDS
+        "signon.formlessCapture.enabled" = false;
+        "signon.rememberSignons" = false;
+        "signon.privateBrowsingCapture.enabled" = false;
+        "network.auth.subresource-http-auth-allow" = 1;
+        "editor.truncate_user_pastes" = false;
+
+        # MIXED CONTENT + CROSS-SITE
+        "security.mixed_content.block_display_content" = true;
+        "security.mixed_content.upgrade_display_content" = true;
+        "security.mixed_content.upgrade_display_content.image" = true;
+        "pdfjs.enableScripting" = false;
+        "extensions.postDownloadThirdPartyPrompt" = false;
+
+        # HEADERS / REFERERS
+        "network.http.referer.XOriginTrimmingPolicy" = 2;
+
+        # CONTAINERS
+        "privacy.userContext.ui.enabled" = true;
+
+        # WEBRTC
+        "media.peerconnection.ice.proxy_only_if_behind_proxy" = true;
+        "media.peerconnection.ice.default_address_only" = true;
+
+        # SAFE BROWSING
+        "browser.safebrowsing.downloads.remote.enabled" = false;
+
+        # MOZILLA
+        # PREF: allow websites to ask you to receive site notifications
+        "permissions.default.desktop-notification" = 0; # allow websites to ask
+        # PREF: allow websites to ask you for your location
+        "permissions.default.geo" = 0;
+        "geo.provider.network.url" = "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%";
+        "permissions.manager.defaultsUrl" = "";
+        "webchannel.allowObject.urlWhitelist" = "";
+
+        # TELEMETRY
+        "datareporting.policy.dataSubmissionEnabled" = false;
+        "datareporting.healthreport.uploadEnabled" = false;
+        "toolkit.telemetry.unified" = false;
+        "toolkit.telemetry.enabled" = false;
+        "toolkit.telemetry.server" = "data:,";
+        "toolkit.telemetry.archive.enabled" = false;
+        "toolkit.telemetry.newProfilePing.enabled" = false;
+        "toolkit.telemetry.shutdownPingSender.enabled" = false;
+        "toolkit.telemetry.updatePing.enabled" = false;
+        "toolkit.telemetry.bhrPing.enabled" = false;
+        "toolkit.telemetry.firstShutdownPing.enabled" = false;
+        "toolkit.telemetry.coverage.opt-out" = true;
+        "toolkit.coverage.opt-out" = true;
+        "toolkit.coverage.endpoint.base" = "";
+        "browser.ping-centre.telemetry" = false;
+        "browser.newtabpage.activity-stream.feeds.telemetry" = false;
+        "browser.newtabpage.activity-stream.telemetry" = false;
+
+        # EXPERIMENTS
+        "app.shield.optoutstudies.enabled" = false;
+        "app.normandy.enabled" = false;
+        "app.normandy.api_url" = "";
+
+        # CRASH REPORTS
+        "breakpad.reportURL" = "";
+        "browser.tabs.crashReporting.sendReport" = false;
+        "browser.crashReports.unsubmittedCheck.autoSubmit2" = false;
+
+        # DETECTION
+        "captivedetect.canonicalURL" = "";
+        "network.captive-portal-service.enabled" = false;
+        "network.connectivity-service.enabled" = false;
+
+        # SECTION: PESKYFOX
+        # MOZILLA UI
+        "browser.privatebrowsing.vpnpromourl" = "";
+        "extensions.getAddons.showPane" = false;
+        "extensions.htmlaboutaddons.recommendations.enabled" = false;
+        "browser.discovery.enabled" = false;
+        "browser.shell.checkDefaultBrowser" = false;
+        "browser.newtabpage.activity-stream.asrouter.userprefs.cfr.addons" = false;
+        "browser.newtabpage.activity-stream.asrouter.userprefs.cfr.features" = false;
+        "browser.preferences.moreFromMozilla" = false;
+        "browser.tabs.tabmanager.enabled" = false;
+        "browser.aboutConfig.showWarning" = false;
+        "browser.aboutwelcome.enabled" = false;
+
+        # THEME ADJUSTMENTS
+        "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
+        "browser.compactmode.show" = true;
+        "browser.display.focus_ring_on_anything" = true;
+        "browser.display.focus_ring_style" = 0;
+        "browser.display.focus_ring_width" = 0;
+        "layout.css.prefers-color-scheme.content-override" = 2;
+
+        # COOKIE BANNER HANDLING
+        "cookiebanners.service.mode" = 1;
+        "cookiebanners.service.mode.privateBrowsing" = 1;
+
+        # FULLSCREEN NOTICE
+        "full-screen-api.transition-duration.enter" = "0 0";
+        "full-screen-api.transition-duration.leave" = "0 0";
+        "full-screen-api.warning.delay" = -1;
+        "full-screen-api.warning.timeout" = 0;
+
+        # URL BAR
+        "browser.urlbar.suggest.calculator" = true;
+        "browser.urlbar.unitConversion.enabled" = true;
+        "browser.urlbar.trending.featureGate" = false;
+
+        # NEW TAB PAGE
+        "browser.newtabpage.activity-stream.feeds.topsites" = false;
+        "browser.newtabpage.activity-stream.feeds.section.topstories" = false;
+
+        # POCKET
+        "extensions.pocket.enabled" = false;
+
+        # DOWNLOADS
+        "browser.download.always_ask_before_handling_new_types" = true;
+        "browser.download.manager.addToRecentDocs" = false;
+
+        # PDF
+        "browser.download.open_pdf_attachments_inline" = true;
+
+        # TAB BEHAVIOR
+        "browser.bookmarks.openInTabClosesMenu" = false;
+        "browser.menu.showViewImageInfo" = true;
+        "findbar.highlightAll" = true;
+        "layout.word_select.eat_space_to_next_word" = false;
+
+        # SECTION: MY OVERRIDES
+        "browser.startup.homepage" = "https://google.com";
+        "identity.fxaccounts.enabled" = false;
+
+        # SECTION SMOOTHFOX
+        # OPTION: SHARPEN SCROLLING                                                           *
+        "apz.overscroll.enabled" = true; # DEFAULT NON-LINUX
+        "mousewheel.min_line_scroll_amount" = 10; # 10-40; adjust this number to your liking; default=5
+        "general.smoothScroll.mouseWheel.durationMinMS" = 80; # default=50
+        "general.smoothScroll.currentVelocityWeighting" = "0.15"; # default=.25
+        "general.smoothScroll.stopDecelerationWeighting" = "0.6"; # default=.4
+      };
+    };
+  };
+}

users/gaming/home/global.nix

@@ -0,0 +1,20 @@
+{ config, ... }:
+{
+  imports = [
+    ./programs.nix
+  ];
+
+  programs = {
+    home-manager.enable = true;
+    git.enable = true;
+  };
+
+  home = {
+    username = "gaming";
+    homeDirectory = "/home/${config.home.username}";
+    stateVersion = "24.05";
+    sessionVariables = {
+      FLAKE = "$HOME/Projects/dotfiles";
+    };
+  };
+}

users/gaming/home/programs.nix

@@ -0,0 +1,6 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    wget
+  ];
+}

users/gaming/systems/muninn.nix

@@ -0,0 +1,6 @@
+{
+  imports = [
+    ../home/global.nix
+    ../home/firefox.nix
+  ];
+}

users/richie/default.nix

@@ -23,6 +23,7 @@ in {
     ++ ifTheyExist [
       "dialout"
       "docker"
+      "hass"
       "libvirtd"
       "networkmanager"
       "plugdev"

users/richie/home/global.nix

@@ -1,35 +1,20 @@
+{ config, ... }:
 {
-  lib,
-  pkgs,
-  config,
-  ...
-}: {
   imports = [
     ./cli
     ./programs.nix
     ./ssh_config.nix
   ];
 
-  nix = {
-    package = lib.mkDefault pkgs.nix;
-    settings = {
-      experimental-features = [
-        "nix-command"
-        "flakes"
-        "ca-derivations"
-      ];
-    };
-  };
-
   programs = {
     home-manager.enable = true;
     git.enable = true;
   };
 
   home = {
-    username = lib.mkDefault "richie";
+    username = "richie";
-    homeDirectory = lib.mkDefault "/home/${config.home.username}";
+    homeDirectory = "/home/${config.home.username}";
-    stateVersion = lib.mkDefault "24.05";
+    stateVersion = "24.05";
     sessionVariables = {
       FLAKE = "$HOME/Projects/dotfiles";
     };

users/richie/home/gui/default.nix

@@ -3,6 +3,7 @@
   imports = [
     ./firefox
     ./vscode
+    ./kitty.nix
   ];
 
   home.packages = with pkgs; [

users/richie/home/gui/firefox/github.svg

@@ -0,0 +1,3 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16 0C7.16 0 0 7.16 0 16C0 23.08 4.58 29.06 10.94 31.18C11.74 31.32 12.04 30.84 12.04 30.42C12.04 30.04 12.02 28.78 12.02 27.44C8 28.18 6.96 26.46 6.64 25.56C6.46 25.1 5.68 23.68 5 23.3C4.44 23 3.64 22.26 4.98 22.24C6.24 22.22 7.14 23.4 7.44 23.88C8.88 26.3 11.18 25.62 12.1 25.2C12.24 24.16 12.66 23.46 13.12 23.06C9.56 22.66 5.84 21.28 5.84 15.16C5.84 13.42 6.46 11.98 7.48 10.86C7.32 10.46 6.76 8.82 7.64 6.62C7.64 6.62 8.98 6.2 12.04 8.26C13.32 7.9 14.68 7.72 16.04 7.72C17.4 7.72 18.76 7.9 20.04 8.26C23.1 6.18 24.44 6.62 24.44 6.62C25.32 8.82 24.76 10.46 24.6 10.86C25.62 11.98 26.24 13.4 26.24 15.16C26.24 21.3 22.5 22.66 18.94 23.06C19.52 23.56 20.02 24.52 20.02 26.02C20.02 28.16 20 29.88 20 30.42C20 30.84 20.3 31.34 21.1 31.18C27.42 29.06 32 23.06 32 16C32 7.16 24.84 0 16 0V0Z" fill="white"/>
+</svg>

users/richie/home/gui/firefox/search_engines.nix

@@ -61,5 +61,24 @@
       ];
       icon = ./kagi.png;
     };
+    github = {
+      urls = [
+        {
+          template = "https://github.com/search?";
+          params = [
+            {
+              name = "q";
+              value = "{searchTerms}";
+            }
+            {
+              name = "type";
+              value = "code";
+            }
+          ];
+        }
+      ];
+      icon = ./github.svg;
+      definedAliases = [ "@g" ];
+    };
   };
 }

users/richie/home/gui/kitty.nix

@@ -0,0 +1,12 @@
+{pkgs, ...}: {
+  programs.kitty = {
+    enable = true;
+    font.name = "IntoneMono Nerd Font";
+    settings = {
+      allow_remote_control = "no";
+      shell = "${pkgs.zsh}/bin/zsh";
+      wayland_titlebar_color = "background";
+    };
+    themeFile = "VSCode_Dark";
+  };
+}

users/richie/home/programs.nix

@@ -14,6 +14,7 @@
     jq
     ncdu
     neofetch
+    ouch
     p7zip
     poppler
     rar
@@ -35,7 +36,7 @@
     wget
     # python
     poetry
-    python312
+    python313
     ruff
     # Rust packages
     trunk

users/richie/home/ssh_config.nix

@@ -36,6 +36,12 @@
         identityFile = "~/.ssh/id_ed25519";
         port = 922;
       };
+      muninn = {
+        hostname = "192.168.98.52";
+        user = "richie";
+        identityFile = "~/.ssh/id_ed25519";
+        port = 295;
+      };      
     };
   };
 }