Oops, typo from dead code

A devshell for my pdf->ledger conversion script.

Eventually I should package up my script as a derivation, but let's
leave this for now.

.gitattributes

@@ -0,0 +1 @@
+*.ttf filter=lfs diff=lfs merge=lfs -text

.gitignore

@@ -0,0 +1 @@
+modules/secrets

.gitmodules

@@ -0,0 +1,9 @@
+[submodule "submodules/beets-config"]
+	path = submodules/beets-config
+	url = ssh://git@gitea.pestctrl.io:2223/pestctrl/beets-config.git
+[submodule "submodules/tmux-config"]
+	path = submodules/tmux-config
+	url = git@github.com:pestctrl/tmux-config
+[submodule "submodules/wezterm-config"]
+	path = submodules/wezterm-config
+	url = git@github.com:pestctrl/wezterm-config

common/base-packages.nix

@@ -1,6 +1,8 @@
 { pkgs }: with pkgs; [
   nix-index
   home-manager
+  nil
+  nvfetcher
 
   gcc
   git
@@ -10,12 +12,22 @@
   tailscale
   openvpn
 
+  samba
+  cifs-utils
   nfs-utils
+  sshfs
+
+  myEmacs
 
-  unstable.emacs
   notmuch mu isync
   keychain ledger gnupg
+  ledger2beancount beancount fava
+  hledger
   mailutils
+  pandoc texlive.combined.scheme-full
+  texlivePackages.noto
+  w3m lynx
+  fzf
   # sendmail
 
   cmake
@@ -23,13 +35,17 @@
   libtool
   pinentry-curses
   tmux
+  screen
   sqlite
 
+  docker-compose
+
   file
   lynx
   wget
   htop
   bind
+  traceroute
   nmap
   wol
   iperf
@@ -38,6 +54,10 @@
   usbutils # lsusb
   lm_sensors
   parallel
+  mtr
+  # tftp
+
+  zip
 
   (python311.withPackages (pythonPackages: with pythonPackages; [
     pymupdf
@@ -48,17 +68,12 @@
     pycryptodome
     pyacoustid
     beets
+    clint
     # chromaprint
+
+    lxml
   ]))
 
-  (beets.override {
-    pluginOverrides = {
-      extrafiles = {
-        enable = true;
-        propagatedBuildInputs = [ beetsPackages.extrafiles ];
-      };
-    };
-  })
   chromaprint
   ocrmypdf
 

common/configuration.nix

@@ -2,20 +2,53 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ inputs, config, pkgs, ... }:
+{ inputs, config, pkgs, lib, ... }:
-
+let
+  system = "x86_64-linux";
+in
 {
   imports = [
     ../modules/default.nix
+    ./flake-location.nix
   ];
 
-  nix.settings.experimental-features = "nix-command flakes";
+  nixpkgs.overlays = [
+    (final: prev: {
+      unstable = import inputs.unstable {
+        inherit system;
+        config.allowUnfree = true;
+      };
+    })
+    (final: prev: {
+      update = import inputs.update {
+        inherit system;
+        config.allowUnfree = true;
+      };
+    })
+  ] ++ import ./overlays.nix inputs ++ [
+    inputs.emacs-overlay.overlays.default
+  ];
 
-  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
+  nix = {
+    settings.experimental-features = "nix-command flakes";
 
-  # Configure network proxy if necessary
+    nixPath = [
-  # networking.proxy.default = "http://user:password@proxy:port/";
+      "/home/benson/.nix-defexpr/channels"
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
+      "nixpkgs=${inputs.nixpkgs}"
+      config.my.nixosConfigLocation
+      "/nix/var/nix/profiles/per-user/root/channels"];
+
+    # MY GOD, this is what is used for nix develop, nix run, etc.
+    registry = {
+      system = {
+        from = {
+          type = "indirect";
+          id = "system";
+        };
+        flake = inputs.nixpkgs;
+      };
+    };
+  };
 
   # Enable networking
   networking.networkmanager.enable = true;
@@ -63,6 +96,6 @@
   # this value at the release version of the first install of this system.
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "23.11"; # Did you read the comment?
+  system.stateVersion = "24.05"; # Did you read the comment?
 
 }

common/development-machine.nix

@@ -1,8 +1,20 @@
 { inputs, config, pkgs, ... }:
 
 {
+  environment.variables = {
+    # Valgrind like to use this instead of HOSTNAME
+    HOST = config.networking.hostName;
+    DIRENV_SKIP_TIMEOUT = "TRUE";
+  };
+
   environment.systemPackages = with pkgs; [
     sbcl
+    zstd.dev
+    zstd.out
+
+    devenv
+
+    racket
 
     ninja
     gdb
@@ -11,7 +23,54 @@
     lld
     clang-tools_16 # clangd, clang-format
     llvmPackages_16.libllvm
+    bear
+    rr
+    valgrind
+    xdot
+    graphviz
 
-    nodejs_21
+    # RE Tools
+    radare2
+    gcc-arm-embedded
+    rizin
+    cutter
+
+    nodejs_22
+    wireshark
+
+    minikube
+    kubectl
+    unstable.talosctl
+    k9s
+    (wrapHelm kubernetes-helm {
+      plugins = with pkgs.kubernetes-helmPlugins; [
+        # helm-secrets
+        helm-diff
+        helm-s3
+        helm-git
+      ];
+    })
+    sops
+    postgresql_16
+    basez
+
+    zeal
+
+    # mps.overrideAttrs (old: {
+    #   pname = "mps";
+    #   version = "1.118.0";
+
+    #   src = fetchFromGitHub {
+    #     owner = "Ravenbrook";
+    #     repo = "mps";
+    #     rev = "refs/tags/release-${version}";
+    #     hash = "sha256-3ql3jWLccgnQHKf23B1en+nJ9rxqmHcWd7aBr93YER0=";
+    #   };
+    # })
   ];
+
+  boot.kernel.sysctl = {
+    # "kernel.yama.ptrace_scope" = 0;
+    "kernel.perf_event_paranoid" = 1;
+  };
 }

common/exwm.nix

@@ -1,5 +1,4 @@
 { config, pkgs, ... }:
-
 {
   environment.systemPackages = with pkgs; [
     picom
@@ -7,17 +6,32 @@
     networkmanagerapplet
   ];
 
-  services.xserver.windowManager.exwm = {
+  services.xserver = {
-    enable = true;
+
-    enableDefaultConfig = false;
+    windowManager.session = [{
+      name = "my-exwm";
+      start = ''
+        ${pkgs.myEmacs}/bin/emacs -l /home/benson/.emacs.d/init.el
+      '';
+    }];
+
+    # gpg-agent = {
+    #   enable = true;
+    #   pinentryFlavor = "gtk2";
+    # };
+  };
+
+  services.displayManager = {
+    defaultSession = "none+my-exwm";
   };
 
   programs = {
     nm-applet.enable = true;
+
     gnupg.agent = {
       enable = true;
-      pinentryFlavor = "gtk2";
       enableSSHSupport = true;
+      pinentryPackage = pkgs.pinentry-gtk2;
     };
   };
 

common/flake-location.nix

@@ -0,0 +1,24 @@
+{ inputs, config, lib, pkgs, ... }:
+{
+  options = {
+    my.flakeLocation = lib.mkOption {
+      default = null;
+      description = "Location of nixos flake for config";
+      type = lib.types.nullOr lib.types.path;
+    };
+
+    my.nixosConfigLocation = lib.mkOption {
+      # default = "/etc/nixos/";
+      internal = true;
+      description = "Location of nixos configuration";
+      type = lib.types.path;
+    };
+  };
+  config = {
+    my.nixosConfigLocation =
+      if (config.my.flakeLocation != null)
+      then "${config.my.flakeLocation}/hosts/${config.networking.hostName}/configuration.nix"
+      else lib.warn "Didn't set 'my.flakeLocation', NIX_PATH functionality will degrade a little"
+        "${inputs.self}/hosts/${config.networking.hostName}/configuration.nix";
+  };
+}

common/laptop-things.nix

@@ -1,20 +1,41 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
 {
-  services.logind = {
+  imports = [
-    extraConfig = "HandlePowerKey=suspend";
+    ./user-facing.nix
-    lidSwitch = "suspend";
+  ];
-  };
 
   hardware.bluetooth.enable = true; # enables support for Bluetooth
 
-  # Configure keymap in X11
+  services = {
-  services.xserver = {
+    logind = {
-    layout = "us,us";
+      extraConfig = "HandlePowerKey=suspend";
-    xkbVariant = "dvorak,";
+      lidSwitch = "suspend";
-    xkbOptions = "grp:win_space_toggle";
+    };
+
+    # Configure keymap in X11
+    xserver = {
+      layout = lib.mkForce "neo_dvorak,us";
+      xkbOptions = "grp:ctrls_toggle";
+
+      xkb = {
+        extraLayouts = {
+          neo_dvorak = {
+            description = "Dvorak with Neo2 Extensions";
+            symbolsFile = ../res/xkb/symbols/neo_dvorak;
+            languages = [ "eng" ];
+          };
+        };
+      };
+    };
   };
 
   # Configure console keymap
   console.keyMap = "dvorak";
+
+  environment.systemPackages = with pkgs; [
+    brightnessctl
+    remmina
+    acpi
+  ];
 }

common/moms-house/default.nix

@@ -4,5 +4,6 @@
   imports = [
     ./sshd-home.nix
     ./printer.nix
+    ./hosts.nix
   ];
 }

common/moms-house/hosts.nix

@@ -0,0 +1,9 @@
+{ config, pkgs, ... }:
+
+{
+  # networking.hosts = {
+  #   "192.168.0.10" = [ "ProxFaith" "proxfaith.local" ];
+  #   "192.168.0.102" = [ "TrueFaith" "truefaith.local" ];
+  #   "192.168.0.100" = [ "FedoraFaith" "fedorafaith.local" ];
+  # };
+}

common/moms-house/printer.nix

@@ -16,12 +16,12 @@
     # Enable auto-discovery of printers
     avahi = {
       enable = true;
-      nssmdns = true;
+      nssmdns4 = true;
       openFirewall = true;
     };
   };
 
   networking.hosts = {
-    "192.168.1.78" = [ "BRWDCE994530FB4.local" "BRWDCE994530FB4" ];
+    "10.0.11.2" = [ "BrotherPrinter4.local" "BrotherPrinter4" ];
   };
 }

common/moms-house/sshd-home.nix

@@ -18,13 +18,7 @@
     extraConfig = ''
       ChallengeResponseAuthentication no
 
-      Match Address 192.168.1.0/24,!192.168.1.254
+      Match Address 10.0.0.0/8,!10.0.0.1
-          X11UseLocalhost yes
-          X11Forwarding yes
-          PasswordAuthentication yes
-          ChallengeResponseAuthentication yes
-
-      Match Address 192.168.0.0/24,!192.168.0.1
           X11UseLocalhost yes
           X11Forwarding yes
           PasswordAuthentication yes

common/overlays.nix

@@ -0,0 +1,22 @@
+inputs:
+[
+  (final: prev: {
+    mps-debug = prev.mps.overrideAttrs (old: {
+      pname = old.pname + "-debug";
+      # Need to do this to patch dwarf information. For some reason,
+      # stdenv copies the source into /build/source, and then builds
+      # from there, leaving all the dwarf information hanging.
+      env.NIX_CFLAGS_COMPILE = "-fdebug-prefix-map=/build/source=${old.src}";
+      dontStrip = true;
+    });
+  })
+
+  (final: prev: {
+      myEmacs =
+        ((prev.emacsPackagesFor final.emacs-unstable)
+          .emacsWithPackages (epkgs: with epkgs; [
+            treesit-grammars.with-all-grammars
+            mu4e
+          ]));
+    })
+]

common/user-facing.nix

@@ -1,47 +1,94 @@
 { inputs, config, pkgs, ... }:
 
 {
-  nix.settings.experimental-features = "nix-command flakes";
+  imports = [
+    ./exwm.nix
+  ];
 
   # Enable sound with pipewire.
-  sound.enable = true;
   hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;
-  services.pipewire = {
+  services = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-    jack.enable = true;
 
-    # use the example session manager (no others are packaged yet so this is enabled by default,
+    pipewire = {
-    # no need to redefine it in your config for now)
+      enable = true;
-    # media-session.enable = true;
+      alsa.enable = true;
+      alsa.support32Bit = true;
+      pulse.enable = true;
+      jack.enable = true;
+
+      # use the example session manager (no others are packaged yet so this is enabled by default,
+      # no need to redefine it in your config for now)
+      # media-session.enable = true;
+    };
+  };
+
+  services.xserver = {
+    # Enable the X11 windowing system.
+    enable = true;
+
+    # Enable the KDE Plasma Desktop Environment.
+    desktopManager.plasma5.enable = true;
+
+    # Enable sddm and startx
+    displayManager = {
+      startx.enable = true;
+    };
+
+    # Configure keymap in X11
+    xkb = {
+      layout = "us";
+      variant = "";
+    };
+  };
+
+  services.displayManager = {
+    sddm.enable = true;
+  };
+
+  services.libinput = {
+    enable = true;
+    touchpad = {
+      naturalScrolling = true;
+    };
   };
 
   fonts = {
     packages = with pkgs; [
       roboto-mono
+      noto-fonts
+      noto-fonts-extra
+      noto-fonts-cjk-sans
+      noto-fonts-cjk-serif
+      commit-mono
     ];
   };
 
   environment.systemPackages = with pkgs; [
-    unstable.firefox
+    update.firefox
-    unstable.google-chrome
+    update.google-chrome
+    bitwarden
     vlc
     mpv
     obs-studio
     gparted
     audacity
+    libreoffice
+
+    imagemagick
+    gimp
+    inkscape
 
     qdirstat
-    unstable.signal-desktop
+    update.signal-desktop
     parsec-bin
-    unstable.discord
+    update.discord
-    unstable.telegram-desktop
+    update.telegram-desktop
     dunst
     shutter
-    # unstable.rustdesk
+    # update.rustdesk
+
+    docker
 
     pcmanfm
     libsForQt5.dolphin
@@ -49,12 +96,43 @@
     libsForQt5.ffmpegthumbs
     libsForQt5.kdegraphics-thumbnailers
 
+    p7zip
+    unzip
+
+    qemu
+
     pavucontrol
 
-    xorg.xinit
+    update.yt-dlp
-    sx
+    ffmpeg
-
-    yt-dlp
     dconf
+
+    xfce.xfce4-terminal
+
+    # TODO: Re-enable extrafiles
+    (unstable.beets# .override {
+    #   pluginOverrides = {
+    #     extrafiles = {
+    #       enable = true;
+    #       propagatedBuildInputs = [ beetsPackages.extrafiles ];
+    #     };
+    #   };
+    # }
+    )
+
+    (gnuplot.override { withQt = true; })
+
+    appflowy
+
+    tageditor
+    easytag
+
+    seafile-client
+
+    wezterm
+
+    xorg.xkbcomp
+
+    insomnia
   ];
 }

flake.lock

@@ -1,36 +1,18 @@
 {
   "nodes": {
-    "bashcfg-input": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1704461224,
-        "narHash": "sha256-lbMvlgLwAgAytz/mmOFMYJu40bKGgtYGHWVG9T1Ypos=",
-        "owner": "pestctrl",
-        "repo": "bash-config",
-        "rev": "015ac81d3ee483ff0b3f13c5e9c912cf428dd745",
-        "type": "github"
-      },
-      "original": {
-        "owner": "pestctrl",
-        "ref": "master",
-        "repo": "bash-config",
-        "type": "github"
-      }
-    },
     "emacs-overlay": {
       "inputs": {
-        "flake-utils": "flake-utils",
         "nixpkgs": [
           "nixpkgs"
         ],
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1703984610,
+        "lastModified": 1750523034,
-        "narHash": "sha256-UMMRKB3qpm64rO3eVlDf2o7IHb68nRoWJE9LL9132A8=",
+        "narHash": "sha256-4jYxNHn/9iyAANAXc3pkhhNeTyAJISshP3lgjH9l70o=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "fae6a53b30177995da0262a1b539898c48071f4b",
+        "rev": "7a26e0974d0a1dd5d295a80f533814206d78523f",
         "type": "github"
       },
       "original": {
@@ -45,11 +27,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1701680307,
+        "lastModified": 1710146030,
-        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
         "type": "github"
       },
       "original": {
@@ -65,59 +47,77 @@
         ]
       },
       "locked": {
-        "lastModified": 1704099619,
+        "lastModified": 1736373539,
-        "narHash": "sha256-QRVMkdxLmv+aKGjcgeEg31xtJEIsYq4i1Kbyw5EPS6g=",
+        "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "7e398b3d76bc1503171b1364c9d4a07ac06f3851",
+        "rev": "bd65bc3cde04c16755955630b344bc9e35272c56",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-23.11",
+        "ref": "release-24.11",
         "repo": "home-manager",
         "type": "github"
       }
     },
+    "nixos-hardware": {
+      "locked": {
+        "lastModified": 1722332872,
+        "narHash": "sha256-2xLM4sc5QBfi0U/AANJAW21Bj4ZX479MHPMPkB+eKBU=",
+        "owner": "NixOS",
+        "repo": "nixos-hardware",
+        "rev": "14c333162ba53c02853add87a0000cbd7aa230c2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "master",
+        "repo": "nixos-hardware",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1701539137,
+        "lastModified": 1750330365,
-        "narHash": "sha256-nVO/5QYpf1GwjvtpXhyxx5M3U/WN0MwBro4Lsk+9mL0=",
+        "narHash": "sha256-hJ7XMNVsTnnbV2NPmStCC07gvv5l2x7+Skb7hyUzazg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "933d7dc155096e7575d207be6fb7792bc9f34f6d",
+        "rev": "d883b6213afa179b58ba8bace834f1419707d0ad",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-23.11",
+        "ref": "nixos-24.11",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1703467016,
+        "lastModified": 1750330365,
-        "narHash": "sha256-/5A/dNPhbQx/Oa2d+Get174eNI3LERQ7u6WTWOlR1eQ=",
+        "narHash": "sha256-hJ7XMNVsTnnbV2NPmStCC07gvv5l2x7+Skb7hyUzazg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d02d818f22c777aa4e854efc3242ec451e5d462a",
+        "rev": "d883b6213afa179b58ba8bace834f1419707d0ad",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-23.11",
+        "ref": "nixos-24.11",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "root": {
       "inputs": {
-        "bashcfg-input": "bashcfg-input",
         "emacs-overlay": "emacs-overlay",
+        "flake-utils": "flake-utils",
         "home-manager": "home-manager",
+        "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
-        "unstable": "unstable"
+        "unstable": "unstable",
+        "update": "update"
       }
     },
     "systems": {
@@ -137,11 +137,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1709961763,
+        "lastModified": 1746904237,
-        "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=",
+        "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34",
+        "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956",
         "type": "github"
       },
       "original": {
@@ -150,6 +150,22 @@
         "repo": "nixpkgs",
         "type": "github"
       }
+    },
+    "update": {
+      "locked": {
+        "lastModified": 1746957726,
+        "narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "a39ed32a651fdee6842ec930761e31d1f242cb94",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-24.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -1,102 +1,142 @@
 {
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
+    update.url = "github:nixos/nixpkgs/nixos-24.11";
     unstable.url = "github:nixos/nixpkgs/nixos-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+
+    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
+
+    home-manager = {
+      url = "github:nix-community/home-manager/release-24.11";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     emacs-overlay = {
       url = "github:nix-community/emacs-overlay/master";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-
-    home-manager = {
-      url = "github:nix-community/home-manager/release-23.11";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    bashcfg-input = {
-      url = "github:pestctrl/bash-config/master";
-      flake = false;
-    };
   };
 
-  outputs = { self, nixpkgs, unstable, home-manager, ... }@inputs:
+  outputs = { self, nixpkgs, update, unstable, home-manager, nixos-hardware, emacs-overlay, ... }@inputs:
     let
       system = "x86_64-linux";
-      pkgs = nixpkgs.legacyPackages.${system};
+      pkgs = import nixpkgs {
-      unstable-overlay = final: prev: {
+        inherit system;
-        unstable = import unstable {
+        overlays =
-          inherit system;
+          [emacs-overlay.overlays.default] ++
-          config.allowUnfree = true;
+          (import ./common/overlays.nix inputs);
-        };
       };
-      # Perhaps this could've been presented as an overlay?
+      mkSystem = h: {
-      # bashcfg-overlay = final: prev: {
+        "${h}" = nixpkgs.lib.nixosSystem {
-      # };
-    in {
-
-      nixosConfigurations = {
-        NixFrame = nixpkgs.lib.nixosSystem {
           inherit system;
-          # specialArgs = { inherit inputs; };
+          specialArgs = { inherit inputs; };
           modules = [
-            { nixpkgs.overlays = [ unstable-overlay ]; }
+            (./. + "/hosts/${h}/configuration.nix")
-            ./hosts/NixFrame/configuration.nix
             home-manager.nixosModules.home-manager
             {
               home-manager.extraSpecialArgs = { inherit inputs; };
               home-manager.useGlobalPkgs = true;
               home-manager.useUserPackages = true;
-              home-manager.users.benson.imports = [ ./home/home.nix ];
+              home-manager.users.benson.imports = [ ./home/users/benson.nix ];
             }
           ];
         };
+      };
+    in {
 
-        NixDawn = nixpkgs.lib.nixosSystem {
+      nixosConfigurations =
-          inherit system;
+        (pkgs.lib.foldr (a: b: a // b) {}
-          # specialArgs = { inherit inputs; };
+          (map mkSystem ["NixDawn" "NixFrame"]))
-          modules = [
-            { nixpkgs.overlays = [ unstable-overlay ]; }
-            ./hosts/NixDawn/configuration.nix
-            home-manager.nixosModule
-            {
-              home-manager = {
-                extraSpecialArgs = { inherit inputs; };
-                useGlobalPkgs = true;
-                useUserPackages = true;
-                users.benson.imports = [ ./home/home.nix ];
-              };
-            }
-          ];
-        };
 
+        // {
         NixGate = nixpkgs.lib.nixosSystem {
           inherit system;
           specialArgs = { inherit inputs; };
           modules = [
-            { nixpkgs.overlays = [ unstable-overlay ]; }
+            ./common/configuration.nix
             ./hosts/NixGate/configuration.nix
           ];
         };
 
-        NixAdvantage = nixpkgs.lib.nixosSystem {
+        NixSentinel = nixpkgs.lib.nixosSystem {
           inherit system;
           specialArgs = { inherit inputs; };
           modules = [
-            { nixpkgs.overlays = [ unstable-overlay ]; }
+            ./common/configuration.nix
-            ./hosts/NixAdvantage/configuration.nix
+            ./hosts/NixSentinel/configuration.nix
+          ];
+        };
+
+        # LenoNix = nixpkgs.lib.nixosSystem {
+        #   system = "x86_64-linux";
+        #   modules = [ ./hosts/NixFrame/configuration.nix ];
+        # };
+      };
+
+      packages."${system}" = {
+        mps-debug = pkgs.mps-debug;
+      };
+
+      devShells."${system}" = {
+        emacs-min = pkgs.mkShell {
+          packages = with pkgs; [
+            emacs
+            git
+            libtool
+            cmake gcc gnumake
+            roboto-mono ripgrep
+          ];
+        };
+
+        emacs-devel = pkgs.mkShell {
+          # packages = with pkgs; [mps-debug];
+          # nativeBuildInputs = with pkgs; [ mps-debug ] ++ pkgs.emacs.nativeBuildInputs;
+          # buildInputs = pkgs.emacs.buildInputs;
+          # packages = with pkgs; [ mps-debug ];
+          inputsFrom = with pkgs; [ emacs ];
+          packages = with pkgs; [ mps ];
+          buildInputs = with pkgs; [ xorg.libXrandr ];
+
+          shellHook = ''
+            echo "MPS debug environment!"
+            set -x
+            export MPS_LIB="${pkgs.mps-debug}/lib"
+            export MPS_INC="${pkgs.mps-debug}/include"
+            unset EMACSLOADPATH
+            set +x
+            echo "Configure Command: "
+            echo -n '  LDFLAGS="-L$MPS_LIB" CFLAGS="-O0 -g3 -isystem $MPS_INC" '
+            echo './configure --with-mps=debug --with-native-compilation=no --enable-checking="yes,glyphs"'
+          '';
+        };
+
+        pymupdf = pkgs.mkShell {
+          venvDir = "./venv";
+          buildInputs = with pkgs.python312Packages; [
+            venvShellHook
+            python
+            pymupdf
+            icecream
           ];
         };
       };
 
-      # nixosConfigurations.LenoNix = nixpkgs.lib.nixosSystem {
+      homeConfigurations = {
-      #   system = "x86_64-linux";
+        "benson" = home-manager.lib.homeManagerConfiguration {
-      #   modules = [ ./hosts/NixFrame/configuration.nix ];
+          inherit pkgs;
-      # };
+          extraSpecialArgs = { inherit inputs; };
+          modules = [
+            ./home/users/benson.nix
+          ];
+        };
 
-      homeConfigurations."benson" = home-manager.lib.homeManagerConfiguration {
+        "a0487752" = home-manager.lib.homeManagerConfiguration {
-        inherit pkgs;
+          inherit pkgs;
-        extraSpecialArgs = { inherit inputs; };
+          extraSpecialArgs = { inherit inputs; };
-        modules = [
+          modules = [
-          ./home/home.nix
+            ./home/users/work.nix
-        ];
+          ];
+        };
       };
     };
 }

home/modules/bash-config/default.nix

@@ -2,24 +2,46 @@
 let
   cfg = config.my.bash-config;
 
-  bash-drv = pkgs.stdenv.mkDerivation {
+  # bash-drv = pkgs.stdenv.mkDerivation {
-    name = "bash-config";
+  #   name = "bash-config";
-    src = inputs.bashcfg-input;
+  #   src = inputs.bashcfg-input;
-    dontBuild = true;
+  #   dontBuild = true;
-    installPhase = ''
+  #   installPhase = ''
-      mkdir -p $out
+  #     mkdir -p $out
-      cp *.sh $out
+  #     cp *.sh $out
-    '';
+  #   '';
-  };
+  # };
+
+  bash-drv = (import ../../../nvfetch/_sources/generated.nix {
+    inherit (pkgs) fetchurl fetchgit fetchFromGitHub dockerTools;
+  }).bash-config.src;
 in
 {
-  options.my.bash-config.enable = lib.mkEnableOption "Enable bash configuration file";
+  options = {
+    my.bash-config.enable = lib.mkEnableOption "Enable bash configuration file";
+  };
 
   config = lib.mkIf cfg.enable {
     # Why can't I do the following?
     # home.file."${config.xdg.configHome}/bash-config/emacs.sh"
     xdg.configFile."bash-config/emacs.sh".source = "${bash-drv}/emacs.sh";
 
-    home.file.".bashrc".source = "${bash-drv}/bashrc.sh";
+    # home.file.".bashrc".source = "${bash-drv}/bashrc.sh";
+    programs.bash = {
+      shellAliases = {
+        enable_gdb = "sudo sysctl kernel.yama.ptrace_scope=0";
+        disable_gdb = "sudo sysctl kernel.yama.ptrace_scope=3";
+      };
+
+      bashrcExtra = ''
+        source ${bash-drv}/bashrc.sh
+
+        # Need to figure out how to conditionally generate this
+        if [[ -n $(which kubectl) ]]; then
+          alias k=kubectl
+          source <(kubectl completion bash | sed s/kubectl/k/g)
+        fi
+      '';
+    };
   };
 }

home/users/benson.nix

@@ -0,0 +1,148 @@
+{ inputs, config, pkgs, lib, ... }@args:
+{
+  imports = [
+    ../modules
+    ../../submodules
+  ];
+
+  nixpkgs.overlays = [
+    inputs.emacs-overlay.overlays.default
+  ];
+
+  my.beets-config.enable = true;
+  my.tmux-config.enable = true;
+
+  my.flakeLocation = lib.mkIf (builtins.hasAttr "osConfig" args) args.osConfig.my.flakeLocation;
+
+  # Home Manager needs a bit of information about you and the paths it should
+  # manage.
+  home = {
+    username = "benson";
+    homeDirectory = "/home/benson";
+  };
+
+  nix = (lib.mkIf (!config.submoduleSupport.enable) {
+    package = pkgs.nix;
+    settings.experimental-features = "nix-command flakes";
+    registry.nixpkgs.flake = inputs.nixpkgs;
+  });
+
+  my.bash-config.enable = true;
+
+  # This value determines the Home Manager release that your configuration is
+  # compatible with. This helps avoid breakage when a new Home Manager release
+  # introduces backwards incompatible changes.
+  #
+  # You should not change this value, even if you update Home Manager. If you do
+  # want to update the value, then make sure to first check the Home Manager
+  # release notes.
+  home.stateVersion = "24.05"; # Please read the comment before changing.
+
+  # The home.packages option allows you to install Nix packages into your
+  # environment.
+  home.packages = with pkgs; [
+    # # You can also create simple shell scripts directly inside your
+    # # configuration. For example, this adds a command 'my-hello' to your
+    # # environment:
+    # (pkgs.writeShellScriptBin "my-hello" ''
+    #   echo "Hello, ${config.home.username}!"
+    # '')
+    roboto-mono
+    rizin radare2 cutter
+    ripgrep
+    git
+
+    cmake gnumake libtool gcc
+  ];
+
+  # Home Manager is pretty good at managing dotfiles. The primary way to manage
+  # plain files is through 'home.file'.
+  home.file = {
+    # # Building this configuration will create a copy of 'dotfiles/screenrc' in
+    # # the Nix store. Activating the configuration will then make '~/.screenrc' a
+    # # symlink to the Nix store copy.
+    # ".screenrc".source = dotfiles/screenrc;
+
+    # # You can also set the file content immediately.
+    # ".gradle/gradle.properties".text = ''
+    #   org.gradle.console=verbose
+    #   org.gradle.daemon.idletimeout=3600000
+    # '';
+  };
+
+  # Home Manager can also manage your environment variables through
+  # 'home.sessionVariables'. If you don't want to manage your shell through Home
+  # Manager then you have to manually source 'hm-session-vars.sh' located at
+  # either
+  #
+  #  ~/.nix-profile/etc/profile.d/hm-session-vars.sh
+  #
+  # or
+  #
+  #  ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh
+  #
+  # or
+  #
+  #  /etc/profiles/per-user/benson/etc/profile.d/hm-session-vars.sh
+  #
+  home.sessionVariables = {
+    EDITOR = "emacsclient -n";
+  };
+
+  accounts.email.accounts = {
+    fastmail = {
+      primary = true;
+      realName = "Benson Chu";
+      address = "bensonchu@fastmail.com";
+      aliases = ["dev@mail.pestctrl.io" "me@mail.pestctrl.io" "bensonchu457@fastmail.com"];
+      flavor = "fastmail.com";
+
+
+      imap.host = "imap.fastmail.com";
+      smtp.host = "smtp.fastmail.com";
+
+      userName = "bensonchu@fastmail.com";
+      passwordCommand = ''${pkgs.myEmacs}/bin/emacsclient -e '(get-authinfo "imap.fastmail.com" "993" "bensonchu457@fastmail.com")' | ${pkgs.coreutils}/bin/tr -d '"' '';
+
+      mu.enable = true;
+    };
+  };
+
+  # Let Home Manager install and manage itself.
+  programs = {
+    home-manager.enable = true;
+    git = {
+      enable = true;
+      userName = "Benson Chu";
+      userEmail = "dev@mail.pestctrl.io";
+      extraConfig = {
+        core = {
+          editor = "emacsclient";
+        };
+      };
+    };
+
+    emacs = {
+      package = pkgs.myEmacs;
+      enable = true;
+    };
+
+    direnv = {
+      enable = true;
+      enableBashIntegration = true; # see note on other shells below
+      nix-direnv.enable = true;
+    };
+
+    bash.enable = true; # see note on other shells below
+  };
+
+  services = {
+    kdeconnect.enable = true;
+    mbsync = {
+      enable = true;
+      frequency = "*:0/10";
+      verbose = true;
+      postExec = "${pkgs.mu}/bin/mu index";
+    };
+  };
+}

home/users/work.nix

@@ -1,16 +1,24 @@
-{ config, pkgs, ... }:
+{ inputs, config, pkgs, lib, ... }:
 
 {
   imports = [
-    ./modules
+    ../modules
   ];
 
   # Home Manager needs a bit of information about you and the paths it should
   # manage.
-  home.username = "benson";
+  # home.username = "cvs";
-  home.homeDirectory = "/home/benson";
+  # home.homeDirectory = "/home/cvs";
+  home.username = "a0487752";
+  home.homeDirectory = "/home/a0487752";
 
-  my.bash-config.enable = true;
+  # my.bash-config.enable = true;
+
+  nix = (lib.mkIf (!config.submoduleSupport.enable) {
+    package = pkgs.nix;
+    settings.experimental-features = "nix-command flakes";
+    registry.nixpkgs.flake = inputs.nixpkgs;
+  });
 
   # This value determines the Home Manager release that your configuration is
   # compatible with. This helps avoid breakage when a new Home Manager release
@@ -19,27 +27,28 @@
   # You should not change this value, even if you update Home Manager. If you do
   # want to update the value, then make sure to first check the Home Manager
   # release notes.
-  home.stateVersion = "23.11"; # Please read the comment before changing.
+  home.stateVersion = "24.05"; # Please read the comment before changing.
 
   # The home.packages option allows you to install Nix packages into your
   # environment.
-  home.packages = [
+  home.packages = with pkgs; [
-    # # Adds the 'hello' command to your environment. It prints a friendly
-    # # "Hello, world!" when run.
-    # pkgs.hello
-
-    # # It is sometimes useful to fine-tune packages, for example, by applying
-    # # overrides. You can do that directly here, just don't forget the
-    # # parentheses. Maybe you want to install Nerd Fonts with a limited number of
-    # # fonts?
-    # (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; })
-
     # # You can also create simple shell scripts directly inside your
     # # configuration. For example, this adds a command 'my-hello' to your
     # # environment:
     # (pkgs.writeShellScriptBin "my-hello" ''
     #   echo "Hello, ${config.home.username}!"
     # '')
+    roboto-mono
+
+    fastfetch
+
+    rizin radare2 cutter
+    ripgrep
+    git
+
+    cmatrix
+    cmake gnumake libtool roswell sbcl
+    dtc
   ];
 
   # Home Manager is pretty good at managing dotfiles. The primary way to manage
@@ -73,7 +82,7 @@
   #  /etc/profiles/per-user/benson/etc/profile.d/hm-session-vars.sh
   #
   home.sessionVariables = {
-    EDITOR = "emacsclient";
+    EDITOR = "emacsclient -n";
   };
 
   # Let Home Manager install and manage itself.
@@ -82,7 +91,7 @@
     git = {
       enable = true;
       userName = "Benson Chu";
-      userEmail = "bensonchu457@gmail.com";
+      userEmail = "b-chu1@ti.com";
       extraConfig = {
         core = {
           editor = "emacsclient";
@@ -92,14 +101,13 @@
 
     emacs = {
       enable = true;
-      extraPackages = epkgs: with epkgs; [
+      package = pkgs.myEmacs;
-        mu4e
-      ];
     };
+
+    # bash.enable = true; # see note on other shells below
   };
 
   services = {
-    kdeconnect.enable = true;
     mbsync = {
       enable = true;
       frequency = "*:0/10";

hosts/NixAdvantage/configuration.nix

@@ -1,64 +0,0 @@
-# Edit this configuration file to define what should be installed on
-# your system.  Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running ‘nixos-help’).
-
-{ config, pkgs, ... }:
-{
-  imports = [
-    ../../common/configuration.nix
-    ../../common/moms-house
-    # Include the results of the hardware scan.
-    ./hardware-configuration.nix
-  ];
-
-  # Bootloader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
-  boot.loader.grub.useOSProber = true;
-
-  networking.hostName = "NixAdvantage"; # Define your hostname.
-
-  # Enable the X11 windowing system.
-  services.xserver.enable = true;
-
-  # Enable the KDE Plasma Desktop Environment.
-  services.xserver.displayManager.sddm.enable = true;
-  services.xserver.desktopManager.plasma5.enable = true;
-
-  # Configure keymap in X11
-  services.xserver = {
-    layout = "us";
-    xkbVariant = "dvorak";
-  };
-
-  # Configure console keymap
-  console.keyMap = "dvorak";
-
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.benson = {
-    isNormalUser = true;
-    description = "Benson Chu";
-    extraGroups = [ "networkmanager" "wheel" ];
-    packages = with pkgs; [
-      firefox
-      kate
-    #  thunderbird
-    ];
-  };
-
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
-  environment.systemPackages = with pkgs; [
-
-  ];
-
-  # This value determines the NixOS release from which the default
-  # settings for stateful data, like file locations and database versions
-  # on your system were taken. It‘s perfectly fine and recommended to leave
-  # this value at the release version of the first install of this system.
-  # Before changing this value read the documentation for this option
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "23.11"; # Did you read the comment?
-
-}

hosts/NixDawn/configuration.nix

@@ -6,18 +6,22 @@
 {
   imports = [
     ../../common/configuration.nix
+    ../../common/user-facing.nix
+    ../../common/development-machine.nix
     ../../common/lxd-setup.nix
     ../../common/moms-house
-    ../../common/exwm.nix
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
   ];
 
+  my.flakeLocation = "/home/benson/nixos-config/";
+
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
   networking.hostName = "NixDawn"; # Define your hostname.
+  networking.hostId = "5640b87e";
 
   fileSystems."/home/benson/workspace" = {
     device = "/dev/disk/by-uuid/aa640eb6-0655-446a-8a12-5867eeef6638";
@@ -32,11 +36,17 @@
     description = "Benson Chu";
     extraGroups = [ "networkmanager" "wheel" ];
     packages = with pkgs; [
-      firefox
       kate
       steam
+      moonlight-qt
       dolphin
       breeze-icons
+      xautolock
+      unstable.mqtt-explorer
+      musescore
+      unstable.spotify
+      pulseaudio
+      immich-cli
     ];
   };
 
@@ -49,6 +59,7 @@
       remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
       dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
     };
+    coolercontrol.enable = true;
   };
 
   services = {
@@ -57,12 +68,21 @@
     # appearance.
     #
     # picom.enable = true;
+    pipewire.pulse.enable = true;
     pcscd.enable = true;
     tailscale.enable = true;
     gvfs.enable = true;
     udisks2.enable = true;
     devmon.enable = true;
     tumbler.enable = true;
+    fwupd.enable = true;
+
+    logind = {
+      extraConfig = ''
+        IdleAction=hybrid-sleep
+        IdleActionSec=30min
+      '';
+    };
 
     apcupsd = {
       enable = true;
@@ -85,27 +105,9 @@
 
     xserver = {
       # Enable the X11 windowing system.
-      enable = true;
-      exportConfiguration = true;
       videoDrivers = [ "amdgpu" ];
 
-      # Configure keymap in X11
+      exportConfiguration = true;
-      layout = "us";
-      xkbVariant = "";
-
-      libinput = {
-        enable = true;
-        touchpad = {
-          naturalScrolling = true;
-        };
-      };
-
-      displayManager = {
-        defaultSession = "none+exwm";
-        sddm.enable = true;
-      };
-      # Enable the KDE Plasma Desktop Environment.
-      desktopManager.plasma5.enable = true;
 
       xrandrHeads = [
         { output = "HDMI-1"; primary = false; monitorConfig = "Option \"PreferredMode\" \"2560x2880\""; }
@@ -118,13 +120,31 @@
     };
   };
 
-  virtualisation.virtualbox.host.enable = true;
+  xdg.portal = {
+    enable = true;
+    extraPortals = with pkgs; [
+      xdg-desktop-portal-gtk
+    ];
+    xdgOpenUsePortal = true;
+  };
+
+  virtualisation = {
+    virtualbox.host.enable = true;
+
+    docker.enable = true;
+  };
+
   users.extraGroups.vboxusers.members = [ "benson" ];
+  users.extraGroups.docker.members = [ "benson" ];
 
   environment.systemPackages = with pkgs; [
     pavucontrol
-    unstable.rustdesk
+    # unstable.rustdesk
-    gkraken
+    tarsnap
+    # (pkgs.callPackage /home/benson/workspace/peter-nixos/mfcl2690dw/default.nix { } )
+    clasp
+    leiningen
+    supercollider-with-sc3-plugins
   ];
 
   hardware.gkraken.enable = true;
@@ -139,7 +159,11 @@
     ];
 
     # Syncthing
-    allowedTCPPorts = [ 22000 ];
+    allowedTCPPorts = [
+      # vlc audio streaming
+      8888
+      22000
+    ];
     allowedUDPPorts = [ 22000 21027 ];
   };
 
@@ -147,12 +171,40 @@
   boot.supportedFilesystems = [ "nfs" ];
   services.rpcbind.enable = true;
 
+  networking.hosts = {
+    "10.254.0.1" = ["test.pestctrl.io"];
+  };
+
+  systemd = {
+    targets.machines.enable = true;
+
+    nspawn."arch" = {
+      enable = true;
+      execConfig = {Boot = true;};
+
+      filesConfig = {
+        # Bind resolve.conf to get networking
+        BindReadOnly = ["/etc/resolv.conf:/etc/resolv.conf"];
+        # Bind any directories that you want to be shared
+        # Bind = ["/home/benson/"];
+        # BindUser = ["benson"];
+      };
+      networkConfig = {Private = false;};
+    };
+
+    services."systemd-nspawn@arch" = {
+      enable = true;
+      requiredBy = ["machines.target"];
+      overrideStrategy = "asDropin";
+    };
+  };
+
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave
   # this value at the release version of the first install of this system.
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "23.11"; # Did you read the comment?
+  system.stateVersion = "24.05"; # Did you read the comment?
 
 }

hosts/NixFrame/configuration.nix

@@ -1,29 +1,22 @@
-{ config, pkgs, ... }:
+{ config, pkgs, inputs, ... }:
 {
   imports = [
     # ./home-git-repos.nix
     ../../common/configuration.nix
-    ../../common/user-facing.nix
     ../../common/development-machine.nix
     ../../common/laptop-things.nix
-    ../../common/exwm.nix
     # Include the results of the hardware scan.
+    inputs.nixos-hardware.nixosModules.framework-13-7040-amd
     ./hardware-configuration.nix
   ];
 
+  my.flakeLocation = "/home/benson/workspace/nixos-config";
+
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
   networking.hostName = "NixFrame"; # Define your hostname.
-  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-
-  # Enable the X11 windowing system.
-  services.xserver.enable = true;
-
-  # Enable the KDE Plasma Desktop Environment.
-  services.xserver.displayManager.sddm.enable = true;
-  services.xserver.desktopManager.plasma5.enable = true;
 
   services.syncthing = {
     enable = true;
@@ -32,13 +25,28 @@
     dataDir = "/home/benson/.config/syncthing/db"; # Folder for Syncthing's database
   };
 
+  services.fwupd.enable = true;
+
+  networking.firewall = {
+    enable = true;
+    allowedTCPPortRanges = [
+      { from = 1714; to = 1764; } # KDE Connect
+    ];
+    allowedUDPPortRanges = [
+      { from = 1714; to = 1764; } # KDE Connect
+    ];
+
+    # Syncthing
+    allowedTCPPorts = [ 22000 ];
+    allowedUDPPorts = [ 22000 21027 ];
+  };
+
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.benson = {
     isNormalUser = true;
     description = "Benson Chu";
     extraGroups = [ "networkmanager" "wheel" ];
     packages = with pkgs; [
-      firefox
       kate
       steam
     ];
@@ -57,6 +65,6 @@
   # this value at the release version of the first install of this system.
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "23.11"; # Did you read the comment?
+  system.stateVersion = "24.05"; # Did you read the comment?
 
 }

hosts/NixFrame/hardware-configuration.nix

@@ -19,7 +19,7 @@
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/7CFD-742B";
+    { device = "/dev/disk/by-uuid/D289-46FB";
       fsType = "vfat";
     };
 

hosts/NixGate/configuration.nix

@@ -7,7 +7,6 @@
 {
   imports = [
     ../../common/moms-house
-    ../../common/configuration.nix
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
   ];
@@ -18,11 +17,6 @@
   boot.loader.grub.useOSProber = true;
 
   networking.hostName = "NixGate"; # Define your hostname.
-  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-
-  # Configure network proxy if necessary
-  # networking.proxy.default = "http://user:password@proxy:port/";
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
 
   # Enable networking
   networking.networkmanager.enable = true;
@@ -51,6 +45,9 @@
     xkbVariant = "";
   };
 
+  # Virtualizer Agent
+  services.qemuGuest.enable = true;
+
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.benson = {
     isNormalUser = true;
@@ -59,6 +56,19 @@
     packages = with pkgs; [];
   };
 
+  users.users.nshields = {
+    isNormalUser = true;
+    description = "Nikolai Shields";
+    packages = with pkgs; [];
+    openssh.authorizedKeys.keys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA8O6W8B0w4JdCl+1AoHEQ861gVPkPxH0FWU1tM3JVxb"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOjlyVh1/GW3KTdGnzSDP6oii13NLIk61v6FFKuRcvz/"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINX5/yQ/mXI/qqWHWd0+lNt6rBnhDA9p5YgMBmfp3Xtk"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKtQOHXIfltnEVMxgHlxgUNB/o6Bey6vdMWtwSfo+U4q"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG90xfsjQSCH/nKyXlBujpJshZHb9yWzqDH8fLKKl9T2"
+    ];
+  };
+
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
 
@@ -94,5 +104,5 @@
   # this value at the release version of the first install of this system.
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "23.11"; # Did you read the comment?
+  system.stateVersion = "24.05"; # Did you read the comment?
 }

hosts/NixSentinel/configuration.nix

@@ -0,0 +1,134 @@
+# Edit this configuration file to define what should be installed on
+# your system.  Help is available in the configuration.nix(5) man page
+# and in the NixOS manual (accessible by running ‘nixos-help’).
+
+{ config, pkgs, ... }:
+
+{
+  imports = [
+    ../../common/moms-house
+    # Include the results of the hardware scan.
+    ./hardware-configuration.nix
+  ];
+
+  # Bootloader.
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  networking.hostName = "NixSentinel"; # Define your hostname.
+
+  # Enable networking
+  networking.networkmanager.enable = true;
+
+  # Set your time zone.
+  time.timeZone = "America/Chicago";
+
+  # Select internationalisation properties.
+  i18n.defaultLocale = "en_US.UTF-8";
+
+  i18n.extraLocaleSettings = {
+    LC_ADDRESS = "en_US.UTF-8";
+    LC_IDENTIFICATION = "en_US.UTF-8";
+    LC_MEASUREMENT = "en_US.UTF-8";
+    LC_MONETARY = "en_US.UTF-8";
+    LC_NAME = "en_US.UTF-8";
+    LC_NUMERIC = "en_US.UTF-8";
+    LC_PAPER = "en_US.UTF-8";
+    LC_TELEPHONE = "en_US.UTF-8";
+    LC_TIME = "en_US.UTF-8";
+  };
+
+  # Configure keymap in X11
+  services = {
+    # apcupsd = {
+    #   enable = true;
+
+    #   configText = ''
+    #     UPSTYPE usb
+    #     NISIP 127.0.0.1
+    #   '';
+    # };
+
+    xserver = {
+      layout = "us";
+      xkbVariant = "";
+    };
+  };
+
+  # power.ups = {
+  #   enable = true;
+  #   mode = "netserver";
+
+  #   ups."rack_ups" = {
+  #     driver = "usbhid-ups";
+  #     port = "auto";
+  #     description = "Server UPS";
+  #   };
+
+  #   users.upsmon = {
+  #     passwordFile = "/path/to/upsmon.password";
+  #     upsmon = "master";
+  #   };
+
+  #   upsmon.monitor."rack_ups".user = "upsmon";
+  # };
+
+  # Define a user account. Don't forget to set a password with ‘passwd’.
+  users.users.benson = {
+    isNormalUser = true;
+    description = "Benson Chu";
+    extraGroups = [ "networkmanager" "wheel" ];
+    packages = with pkgs; [];
+  };
+
+  users.users.nshields = {
+    isNormalUser = true;
+    description = "Nikolai Shields";
+    packages = with pkgs; [];
+    openssh.authorizedKeys.keys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA8O6W8B0w4JdCl+1AoHEQ861gVPkPxH0FWU1tM3JVxb"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOjlyVh1/GW3KTdGnzSDP6oii13NLIk61v6FFKuRcvz/"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINX5/yQ/mXI/qqWHWd0+lNt6rBnhDA9p5YgMBmfp3Xtk"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKtQOHXIfltnEVMxgHlxgUNB/o6Bey6vdMWtwSfo+U4q"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG90xfsjQSCH/nKyXlBujpJshZHb9yWzqDH8fLKKl9T2"
+    ];
+  };
+
+  # Allow unfree packages
+  nixpkgs.config.allowUnfree = true;
+
+  # List packages installed in system profile. To search, run:
+  # $ nix search wget
+  environment.systemPackages = with pkgs; [
+  #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
+  #  wget
+  ];
+
+  # Some programs need SUID wrappers, can be configured further or are
+  # started in user sessions.
+  # programs.mtr.enable = true;
+  # programs.gnupg.agent = {
+  #   enable = true;
+  #   enableSSHSupport = true;
+  # };
+
+  # List services that you want to enable:
+
+  # Enable the OpenSSH daemon.
+  # services.openssh.enable = true;
+
+  # Open ports in the firewall.
+  # networking.firewall.allowedTCPPorts = [ ... ];
+  # networking.firewall.allowedUDPPorts = [ ... ];
+  # Or disable the firewall altogether.
+  # networking.firewall.enable = false;
+
+  # This value determines the NixOS release from which the default
+  # settings for stateful data, like file locations and database versions
+  # on your system were taken. It‘s perfectly fine and recommended to leave
+  # this value at the release version of the first install of this system.
+  # Before changing this value read the documentation for this option
+  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
+  system.stateVersion = "24.05"; # Did you read the comment?
+
+}

hosts/NixSentinel/hardware-configuration.nix

@@ -8,31 +8,35 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usbhid" "usb_storage" "sd_mod" "sr_mod" ];
+  boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "usbhid" "usb_storage" "sd_mod" "sr_mod" "sdhci_pci" "rtsx_usb_sdmmc" ];
   boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
+  boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/88db2bfd-c26f-46c0-9772-a6646aa79210";
+    { device = "/dev/disk/by-uuid/479d8408-64ec-49d8-aeb3-486b0ac38f8a";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/7A70-B992";
+    { device = "/dev/disk/by-uuid/0599-A351";
       fsType = "vfat";
     };
 
-  swapDevices = [ ];
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/451811a1-9038-4c41-be53-e7f5f547d0dc"; }
+    ];
 
   # 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.enp4s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp0s21f0u2u2i5.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp5s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp2s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp3s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlo2.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

modules/secrets/default.nix

@@ -0,0 +1,3 @@
+{ inputs, config, pkgs, lib, ... }:
+{
+}

nvfetch/_sources/generated.json

@@ -0,0 +1,22 @@
+{
+    "bash-config": {
+        "cargoLocks": null,
+        "date": "2024-07-13",
+        "extract": null,
+        "name": "bash-config",
+        "passthru": null,
+        "pinned": false,
+        "src": {
+            "deepClone": false,
+            "fetchSubmodules": false,
+            "leaveDotGit": false,
+            "name": null,
+            "owner": "pestctrl",
+            "repo": "bash-config",
+            "rev": "f88071e92523a271dd553a20e60c8afaaf2dae0b",
+            "sha256": "sha256-+gQ28icbsv2+Jmxvm02OYWKCuFqtUoAdjDmWt3YgjKI=",
+            "type": "github"
+        },
+        "version": "f88071e92523a271dd553a20e60c8afaaf2dae0b"
+    }
+}

nvfetch/_sources/generated.nix

@@ -0,0 +1,16 @@
+# This file was generated by nvfetcher, please do not modify it manually.
+{ fetchgit, fetchurl, fetchFromGitHub, dockerTools }:
+{
+  bash-config = {
+    pname = "bash-config";
+    version = "f88071e92523a271dd553a20e60c8afaaf2dae0b";
+    src = fetchFromGitHub {
+      owner = "pestctrl";
+      repo = "bash-config";
+      rev = "f88071e92523a271dd553a20e60c8afaaf2dae0b";
+      fetchSubmodules = false;
+      sha256 = "sha256-+gQ28icbsv2+Jmxvm02OYWKCuFqtUoAdjDmWt3YgjKI=";
+    };
+    date = "2024-07-13";
+  };
+}

nvfetch/nvfetcher.toml

@@ -0,0 +1,5 @@
+[bash-config]
+src.git = "https://github.com/pestctrl/bash-config"
+src.branch = "master"
+# fetch.git = "https://github.com/pestctrl/bash-config"
+fetch.github = "pestctrl/bash-config"

res/xkb/set.sh

@@ -0,0 +1 @@
+setxkbmap -I. neo_dvorak -option grp:ctrls_toggle -print | xkbcomp -I. - $DISPLAY

res/xkb/symbols/neo_dvorak

@@ -0,0 +1,67 @@
+partial alphanumeric_keys
+xkb_symbols "neo_dvorak_base" {
+    include "de(neo_base)"
+
+    key.type[Group1] = "EIGHT_LEVEL_WITH_LEVEL5_LOCK";
+    key <AD01> { [ apostrophe,   quotedbl,            NoSymbol,    Greek_eta,   NoSymbol,         NoSymbol,  U2135,         NoSymbol ] };
+    key <AD02> { [ comma,        less,                NoSymbol,    U03F1,       NoSymbol,         NoSymbol,  U21D2,         NoSymbol ] };
+    key <AD03> { [ period,       greater,             NoSymbol,    U03D1,       NoSymbol,         NoSymbol,  U21A6,         NoSymbol ] };
+    key <AD11> { [ slash,        question,            NoSymbol,    NoSymbol,    NoSymbol,         NoSymbol,  union,         NoSymbol ] };
+    key <AD12> { [ equal,        plus,                dead_stroke, dead_psili,  dead_doubleacute, NoSymbol,  dead_breve,    NoSymbol] };
+    key <AC11> { [ minus,        underscore,          NoSymbol,    U2011,       NoSymbol,         NoSymbol,  hyphen,        NoSymbol ] };
+    key <AB01> { [ semicolon,    colon,               NoSymbol,    U03F5,       NoSymbol,         NoSymbol,  intersection,  NoSymbol ] };
+
+    key.type[Group1] = "EIGHT_LEVEL_ALPHABETIC_WITH_LEVEL5_LOCK";
+    key <AE11> { [ sharp,        U1E9E,               NoSymbol, Greek_finalsmallsigma,  NoSymbol,   NoSymbol, jot,               NoSymbol ] };
+    key <AD04> { [ p,            P,                   NoSymbol, Greek_pi,               NoSymbol,   NoSymbol, Greek_PI,          NoSymbol ] };
+    key <AD05> { [ y,            Y,                   NoSymbol, Greek_upsilon,          NoSymbol,   NoSymbol, nabla,             NoSymbol ] };
+    key <AD06> { [ f,            F,                   NoSymbol, Greek_phi,              NoSymbol,   NoSymbol, Greek_PHI,         NoSymbol ] };
+    key <AD07> { [ g,            G,                   NoSymbol, Greek_gamma,            NoSymbol,   NoSymbol, Greek_GAMMA,       NoSymbol ] };
+    key <AD08> { [ c,            C,                   NoSymbol, Greek_chi,              NoSymbol,   NoSymbol, U2102,             NoSymbol ] };
+    key <AD09> { [ r,            R,                   NoSymbol, Greek_rho,              NoSymbol,   NoSymbol, U211D,             NoSymbol ] };
+    key <AD10> { [ l,            L,                   NoSymbol, Greek_lambda,           NoSymbol,   NoSymbol, Greek_LAMBDA,      NoSymbol ] };
+    key <AC01> { [ a,            A,                   NoSymbol, Greek_alpha,            NoSymbol,   NoSymbol, U2200,             NoSymbol ] };
+    key <AC02> { [ o,            O,                   NoSymbol, Greek_omicron,          NoSymbol,   NoSymbol, elementof,         NoSymbol ] };
+    key <AC03> { [ e,            E,                   NoSymbol, Greek_epsilon,          NoSymbol,   NoSymbol, U2203,             NoSymbol ] };
+    key <AC04> { [ u,            U,                   NoSymbol, NoSymbol,               NoSymbol,   NoSymbol, includedin,        NoSymbol ] };
+    key <AC05> { [ i,            I,                   NoSymbol, Greek_iota,             NoSymbol,   NoSymbol, integral,          NoSymbol ] };
+    key <AC06> { [ d,            D,                   NoSymbol, Greek_delta,            NoSymbol,   NoSymbol, Greek_DELTA,       NoSymbol ] };
+    key <AC07> { [ h,            H,                   NoSymbol, Greek_psi,              NoSymbol,   NoSymbol, Greek_PSI,         NoSymbol ] };
+    key <AC08> { [ t,            T,                   NoSymbol, Greek_tau,              NoSymbol,   NoSymbol, partialderivative, NoSymbol ] };
+    key <AC09> { [ n,            N,                   NoSymbol, Greek_nu,               NoSymbol,   NoSymbol, U2115,             NoSymbol ] };
+    key <AC10> { [ s,            S,                   NoSymbol, Greek_sigma,            NoSymbol,   NoSymbol, Greek_SIGMA,       NoSymbol ] };
+    key <AB02> { [ q,            Q,                   NoSymbol, U03D5,                  NoSymbol,   NoSymbol, U211A,             NoSymbol ] };
+    key <AB03> { [ j,            J,                   NoSymbol, Greek_theta,            NoSymbol,   NoSymbol, Greek_THETA,       NoSymbol ] };
+    key <AB04> { [ k,            K,                   NoSymbol, Greek_kappa,            NoSymbol,   NoSymbol, multiply,          NoSymbol ] };
+    key <AB05> { [ x,            X,                   NoSymbol, Greek_xi,               NoSymbol,   NoSymbol, Greek_XI,          NoSymbol ] };
+    key <AB06> { [ b,            B,                   NoSymbol, Greek_beta,             NoSymbol,   NoSymbol, U21D0,             NoSymbol ] };
+    key <AB07> { [ m,            M,                   NoSymbol, Greek_mu,               NoSymbol,   NoSymbol, ifonlyif,          NoSymbol ] };
+    key <AB08> { [ w,            W,                   NoSymbol, Greek_omega,            NoSymbol,   NoSymbol, Greek_OMEGA,       NoSymbol ] };
+    key <AB09> { [ v,            V,                   NoSymbol, NoSymbol,               NoSymbol,   NoSymbol, radical,           NoSymbol ] };
+    key <AB10> { [ z,            Z,                   NoSymbol, Greek_zeta,             NoSymbol,   NoSymbol, U2124,             NoSymbol ] };
+
+    key <AE01> { [ 1,           exclam,       onesuperior,           onesubscript,           ordfeminine,     NoSymbol,      notsign,            NoSymbol ] };
+    key <AE02> { [ 2,           at,           twosuperior,           twosubscript,           masculine,       NoSymbol,      logicalor,          NoSymbol ] };
+    key <AE03> { [ 3,           numbersign,   threesuperior,         threesubscript,         numerosign,      NoSymbol,      logicaland,         NoSymbol ] };
+    key <AE04> { [ 4,           dollar,       U203A,                 femalesymbol,           NoSymbol,        NoSymbol,      U22A5,              NoSymbol ] };
+    key <AE05> { [ 5,           percent,      U2039,                 malesymbol,             periodcentered,  NoSymbol,      U2221,              NoSymbol ] };
+    key <AE06> { [ 6,           asciicircum,  cent,                  U26A5,                  sterling,        NoSymbol,      U2225,              NoSymbol ] };
+    key <AE07> { [ 7,           ampersand,    yen,                   U03F0,                  currency,        NoSymbol,      rightarrow,         NoSymbol ] };
+    key <AE08> { [ 8,           asterisk,     singlelowquotemark,    U27E8,                  Tab,             ISO_Left_Tab,  U221E,              NoSymbol ] };
+    key <AE09> { [ 9,           parenleft,    leftsinglequotemark,   U27E9,                  KP_Divide,       KP_Divide,     variation,          NoSymbol ] };
+    key <AE10> { [ 0,           parenright,   rightsinglequotemark,  zerosubscript,          KP_Multiply,     KP_Multiply,   emptyset,           NoSymbol ] };
+};
+
+default partial alphanumeric_keys modifier_keys keypad_keys
+xkb_symbols "neo_dvorak" {
+
+    include "neo_dvorak(neo_dvorak_base)"
+
+    name[Group1]= "English (Neo, DVORAK)";
+
+    include "shift(both_capslock)"
+    include "level3(caps_switch)"
+    include "level3(bksl_switch)"
+    include "level5(lsgt_switch_lock)"
+    include "level5(ralt_switch_lock)"
+};

submodules/beets-config

@@ -0,0 +1 @@
+Subproject commit 69ed4fe876144b2d8cd3fc7edeaa7a4c98b0616d

submodules/default.nix

@@ -0,0 +1,63 @@
+{ inputs, config, pkgs, lib, ... }@args:
+let
+  beets-cfg = config.my.beets-config;
+  tmux-cfg = config.my.tmux-config;
+  mkIfFlakeLoc = condition: errorMsg: value:
+    (lib.mkIf (condition &&
+               !(config.my.flakeLocation == null &&
+                 (lib.warn ("Didn't set 'my.flakeLocation', " + errorMsg) true)))
+      value);
+  flakeSubmodules = "${config.my.flakeLocation}/submodules";
+in
+{
+  options = {
+    my.flakeLocation = lib.mkOption {
+      default = null;
+      description = "Location of nixos flake for config";
+      type = lib.types.nullOr lib.types.path;
+    };
+    my.beets-config.enable = lib.mkEnableOption "Enable beets configuration file";
+    my.tmux-config.enable = lib.mkEnableOption "Enable tmux configuration file";
+  };
+
+  config = {
+    xdg = {
+      configFile = {
+        "beets/config.yaml" = (mkIfFlakeLoc beets-cfg.enable
+          "I won't symlink beets' config.yaml into place"
+          {
+            source = config.lib.file.mkOutOfStoreSymlink
+              "${flakeSubmodules}/beets-config/config.yaml";
+            # Recursive only applies to directories. If false, do one
+            # symlink (which is the directory). Otherwise, do every file
+            # recursively
+            #
+            # recursive = true;
+          });
+
+        "tmux/tmux.conf" = (mkIfFlakeLoc tmux-cfg.enable
+          "I won't symlink tmux's tmux.conf into place"
+          {
+            source = config.lib.file.mkOutOfStoreSymlink
+              "${flakeSubmodules}/tmux-config/tmux.conf";
+          });
+
+        "wezterm/" = (mkIfFlakeLoc beets-cfg.enable
+          "I won't symlink wezterm config folder into place"
+          {
+            source = config.lib.file.mkOutOfStoreSymlink
+              "${config.my.flakeLocation}/submodules/wezterm-config/";
+          });
+      };
+
+      dataFile = {
+        "fonts/王漢宗中明體注音.ttf" = (mkIfFlakeLoc true
+          "I won't symlink chinese fonts into place"
+          {
+            source = config.lib.file.mkOutOfStoreSymlink
+              "${flakeSubmodules}/fonts/王漢宗中明體注音.ttf";
+          });
+      };
+    };
+  };
+}

submodules/tmux-config

@@ -0,0 +1 @@
+Subproject commit e5aa35f4f8ed5aad24844d56d2782ba924a38c8a

submodules/wezterm-config

@@ -0,0 +1 @@
+Subproject commit dfaad48b33fdd89eef3f88da00bcfd13dcd11074