opencode: ditch chatgpt

PR located here: https://github.com/Jovian-Experiments/Jovian-NixOS/pull/550

.gitattributes

@@ -1,5 +1,2 @@
-home-manager/secrets/factorio.nix filter=git-crypt diff=git-crypt
-etcnixos/secrets/secureboot.tar filter=git-crypt diff=git-crypt
-etcnixos/secrets/wifi-passwords.nix filter=git-crypt diff=git-crypt
-etcnixos/secrets/disk-password filter=git-crypt diff=git-crypt
-etcnixos/secrets/password-hash filter=git-crypt diff=git-crypt
+/system/secrets/** filter=git-crypt diff=git-crypt
+/home-manager/secrets/** filter=git-crypt diff=git-crypt

README.md

@@ -1,14 +1,10 @@
 # My Dotfiles ✨
 These are my dotfiles for my laptop and desktop (which I use [NixOS](https://nixos.org/) and [home-manager](https://github.com/nix-community/home-manager) on).
 
-## Structure
-The `nix` folder contains two sub directories, `etcnixos` and `home-manager`. The former is the contents of `/etc/nixos` (hence the name), whereas the latter is the contents of `~/.config/home-manager`.
-`justfile` is the [just](https://github.com/casey/just) script I use for updating my NixOS system and syncing the changes with this repo.
-
 ## What do I use?
 Browser: Firefox 🦊 (actually [Zen Browser](https://github.com/zen-browser/desktop) :p)
 
-Text Editor: [helix](https://github.com/helix-editor/helix)
+Text Editor: [Doom Emacs](https://github.com/doomemacs/doomemacs)
 
 Terminal: [alacritty](https://github.com/alacritty/alacritty)
 
@@ -20,3 +16,7 @@ There is more that I'm using, but those are the main ones! Read my configs to ge
 
 ### Background
   - Got my background from [here](https://old.reddit.com/r/celestegame/comments/11dtgwg/all_most_of_the_backgrounds_in_celeste_edited/) and used the command `magick input.png -filter Point -resize 2880x1920! output.png` to upscale it bilinearly
+
+## TODO!
+- [ ] further unify desktop and laptop configs
+- [ ] Seperate out common shell utilities into a module or some sort (could be used on other machines)

deploy.sh

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+ARG="$*"
+if [ "$ARG" = "" ]; then
+  ARG="boot"
+fi
+
+nixos-rebuild "$ARG" --flake . --use-remote-sudo

etcnixos/declarative-nm.nix

@@ -1,52 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-with lib;
-# from: https://discourse.nixos.org/t/imperative-declarative-wifi-networks-with-wpa-supplicant/12394/6
-let
-  cfg = config.networking.networkmanager;
-
-  getFileName = stringAsChars (x: if x == " " then "-" else x);
-
-  createWifi = ssid: opt: {
-    name = "NetworkManager/system-connections/${getFileName ssid}.nmconnection";
-    value = {
-      mode = "0400";
-      source = pkgs.writeText "${ssid}.nmconnection" ''
-        [connection]
-        id=${ssid}
-        type=wifi
-
-        [wifi]
-        ssid=${ssid}
-
-        [wifi-security]
-        ${optionalString (opt.psk != null) ''
-          key-mgmt=wpa-psk
-          psk=${opt.psk}''}
-      '';
-    };
-  };
-
-  keyFiles = mapAttrs' createWifi config.networking.wireless.networks;
-in
-{
-  config = mkIf cfg.enable {
-    environment.etc = keyFiles;
-
-    systemd.services.NetworkManager-predefined-connections = {
-      restartTriggers = mapAttrsToList (name: value: value.source) keyFiles;
-      serviceConfig = {
-        Type = "oneshot";
-        RemainAfterExit = true;
-        ExecStart = "${pkgs.coreutils}/bin/true";
-        ExecReload = "${pkgs.networkmanager}/bin/nmcli connection reload";
-      };
-      reloadIfChanged = true;
-      wantedBy = [ "multi-user.target" ];
-    };
-  };
-}

etcnixos/distrobox.nix

@@ -1,11 +0,0 @@
-{ pkgs, ... }:
-{
-  virtualisation.podman = {
-    enable = true;
-  };
-
-  environment.systemPackages = [
-    pkgs.distrobox
-    pkgs.podman-compose
-  ];
-}

etcnixos/flake.lock

@@ -1,457 +0,0 @@
-{
-  "nodes": {
-    "agenix": {
-      "inputs": {
-        "darwin": "darwin",
-        "home-manager": "home-manager",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1736955230,
-        "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=",
-        "owner": "ryantm",
-        "repo": "agenix",
-        "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ryantm",
-        "repo": "agenix",
-        "type": "github"
-      }
-    },
-    "chaotic": {
-      "inputs": {
-        "fenix": "fenix",
-        "flake-schemas": "flake-schemas",
-        "home-manager": "home-manager_2",
-        "jovian": "jovian",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1740016447,
-        "narHash": "sha256-96hBRGwuG+CFI5+inRIDCh0Za4LOt1dlbO3pFOokw6Y=",
-        "owner": "chaotic-cx",
-        "repo": "nyx",
-        "rev": "ed7900391a1969bb0bde432fd3952a6dda37114c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "chaotic-cx",
-        "ref": "nyxpkgs-unstable",
-        "repo": "nyx",
-        "type": "github"
-      }
-    },
-    "crane": {
-      "locked": {
-        "lastModified": 1731098351,
-        "narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=",
-        "owner": "ipetkov",
-        "repo": "crane",
-        "rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ipetkov",
-        "repo": "crane",
-        "type": "github"
-      }
-    },
-    "darwin": {
-      "inputs": {
-        "nixpkgs": [
-          "agenix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1700795494,
-        "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",
-        "owner": "lnl7",
-        "repo": "nix-darwin",
-        "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lnl7",
-        "ref": "master",
-        "repo": "nix-darwin",
-        "type": "github"
-      }
-    },
-    "disko": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1736864502,
-        "narHash": "sha256-ItkIZyebGvNH2dK9jVGzJHGPtb6BSWLN8Gmef16NeY0=",
-        "owner": "nix-community",
-        "repo": "disko",
-        "rev": "0141aabed359f063de7413f80d906e1d98c0c123",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "ref": "latest",
-        "repo": "disko",
-        "type": "github"
-      }
-    },
-    "fenix": {
-      "inputs": {
-        "nixpkgs": [
-          "chaotic",
-          "nixpkgs"
-        ],
-        "rust-analyzer-src": "rust-analyzer-src"
-      },
-      "locked": {
-        "lastModified": 1739946876,
-        "narHash": "sha256-ek0u5FT5yjqYKjF/0HQKwDH2ISZzyvYwu+My5hmSwbU=",
-        "owner": "nix-community",
-        "repo": "fenix",
-        "rev": "95c1eab59767a3dbb11d6616d4ff736813ce41d2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "fenix",
-        "type": "github"
-      }
-    },
-    "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "lanzaboote",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1730504689,
-        "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "506278e768c2a08bec68eb62932193e341f55c90",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "flake-schemas": {
-      "locked": {
-        "lastModified": 1721999734,
-        "narHash": "sha256-G5CxYeJVm4lcEtaO87LKzOsVnWeTcHGKbKxNamNWgOw=",
-        "rev": "0a5c42297d870156d9c57d8f99e476b738dcd982",
-        "revCount": 75,
-        "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.5/0190ef2f-61e0-794b-ba14-e82f225e55e6/source.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.5.tar.gz"
-      }
-    },
-    "gitignore": {
-      "inputs": {
-        "nixpkgs": [
-          "lanzaboote",
-          "pre-commit-hooks-nix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1709087332,
-        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "type": "github"
-      }
-    },
-    "home-manager": {
-      "inputs": {
-        "nixpkgs": [
-          "agenix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1703113217,
-        "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "home-manager_2": {
-      "inputs": {
-        "nixpkgs": [
-          "chaotic",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1739913864,
-        "narHash": "sha256-WhzgQjadrwnwPJQLLxZUUEIxojxa7UWDkf7raAkB1Lw=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "97ac0801d187b2911e8caa45316399de12f6f199",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "jovian": {
-      "inputs": {
-        "nix-github-actions": "nix-github-actions",
-        "nixpkgs": [
-          "chaotic",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1739952453,
-        "narHash": "sha256-+tyFW6nNj1fJ1VTtLeqe1PMp5F7Fb9zIkT6mUvdQHrM=",
-        "owner": "Jovian-Experiments",
-        "repo": "Jovian-NixOS",
-        "rev": "b2ed82d3ff837960df4518308dfe409dda3ae406",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Jovian-Experiments",
-        "repo": "Jovian-NixOS",
-        "type": "github"
-      }
-    },
-    "lanzaboote": {
-      "inputs": {
-        "crane": "crane",
-        "flake-compat": "flake-compat",
-        "flake-parts": "flake-parts",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "pre-commit-hooks-nix": "pre-commit-hooks-nix",
-        "rust-overlay": "rust-overlay"
-      },
-      "locked": {
-        "lastModified": 1739186342,
-        "narHash": "sha256-2j+sln9RwQn+g7J4GmdFFgvqXnLkvWBNMaUzONlkzUE=",
-        "owner": "nix-community",
-        "repo": "lanzaboote",
-        "rev": "3bdeebbc484a09391c4f0ec8a37bb77809426660",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "lanzaboote",
-        "type": "github"
-      }
-    },
-    "nix-github-actions": {
-      "inputs": {
-        "nixpkgs": [
-          "chaotic",
-          "jovian",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1729697500,
-        "narHash": "sha256-VFTWrbzDlZyFHHb1AlKRiD/qqCJIripXKiCSFS8fAOY=",
-        "owner": "zhaofengli",
-        "repo": "nix-github-actions",
-        "rev": "e418aeb728b6aa5ca8c5c71974e7159c2df1d8cf",
-        "type": "github"
-      },
-      "original": {
-        "owner": "zhaofengli",
-        "ref": "matrix-name",
-        "repo": "nix-github-actions",
-        "type": "github"
-      }
-    },
-    "nixos-hardware": {
-      "locked": {
-        "lastModified": 1739798439,
-        "narHash": "sha256-GyipmjbbQEaosel/+wq1xihCKbv0/e1LU00x/8b/fP4=",
-        "owner": "NixOS",
-        "repo": "nixos-hardware",
-        "rev": "3e2ea8a49d4d76276b0f4e2041df8ca5c0771371",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "master",
-        "repo": "nixos-hardware",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1739866667,
-        "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-stable": {
-      "locked": {
-        "lastModified": 1730741070,
-        "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-24.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "pre-commit-hooks-nix": {
-      "inputs": {
-        "flake-compat": [
-          "lanzaboote",
-          "flake-compat"
-        ],
-        "gitignore": "gitignore",
-        "nixpkgs": [
-          "lanzaboote",
-          "nixpkgs"
-        ],
-        "nixpkgs-stable": "nixpkgs-stable"
-      },
-      "locked": {
-        "lastModified": 1731363552,
-        "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=",
-        "owner": "cachix",
-        "repo": "pre-commit-hooks.nix",
-        "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "pre-commit-hooks.nix",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "agenix": "agenix",
-        "chaotic": "chaotic",
-        "disko": "disko",
-        "lanzaboote": "lanzaboote",
-        "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs"
-      }
-    },
-    "rust-analyzer-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1739913186,
-        "narHash": "sha256-7MSzs64dLDgq1wFw2eujZ01qdj9K+TwIlQMyWebotE8=",
-        "owner": "rust-lang",
-        "repo": "rust-analyzer",
-        "rev": "3028f844c5898dcf115f6bc67a5ce793989b04a1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rust-lang",
-        "ref": "nightly",
-        "repo": "rust-analyzer",
-        "type": "github"
-      }
-    },
-    "rust-overlay": {
-      "inputs": {
-        "nixpkgs": [
-          "lanzaboote",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1731897198,
-        "narHash": "sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "0be641045af6d8666c11c2c40e45ffc9667839b5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}

etcnixos/flake.nix

@@ -1,63 +0,0 @@
-{
-  description = "System nixOS flake";
-
-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-
-    lanzaboote = {
-      url = "github:nix-community/lanzaboote";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
-
-    agenix = {
-      url = "github:ryantm/agenix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    chaotic = {
-      url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    disko = {
-      url = "github:nix-community/disko/latest";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-  };
-
-  outputs =
-    {
-      self,
-      nixpkgs,
-      lanzaboote,
-      nixos-hardware,
-      agenix,
-      ...
-    }@inputs:
-    let
-      username = "primary";
-      system = "x86_64-linux";
-      hostnames = [
-        "mreow"
-        "yarn"
-      ];
-    in
-    {
-      nixosConfigurations = nixpkgs.lib.foldl' (
-        config: hostname:
-        config
-        // {
-          "${hostname}" = nixpkgs.lib.nixosSystem {
-            specialArgs = {
-              inherit inputs username hostname;
-            };
-            modules = [
-              ./system-${hostname}.nix
-            ];
-          };
-        }
-      ) { } hostnames;
-    };
-}

etcnixos/hardware_desktop.nix

@@ -1,59 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}:
-
-{
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-
-  boot.initrd.availableKernelModules = [
-    "nvme"
-    "xhci_pci"
-    "ahci"
-    "usb_storage"
-    "usbhid"
-    "sd_mod"
-  ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/ff51be5a-b87b-4e6a-9c1d-796ceeaca153";
-    fsType = "ext4";
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/3D37-E610";
-    fsType = "vfat";
-    options = [
-      "fmask=0022"
-      "dmask=0022"
-    ];
-  };
-
-  fileSystems."/media/games" = {
-    device = "/dev/disk/by-uuid/1878136e-765d-4784-b204-3536ab4fdac8";
-    fsType = "f2fs";
-    options = [ "nofail" ];
-  };
-
-  swapDevices = [ ];
-
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp5s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp4s0.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}

etcnixos/networking.nix

@@ -1,19 +0,0 @@
-{ hostname, ... }:
-{
-  hostName = hostname;
-
-  networkmanager = {
-    enable = true;
-
-    insertNameservers = [
-      "1.1.1.1"
-      "9.9.9.9"
-    ];
-
-    wifi = {
-      scanRandMacAddress = true;
-    };
-  };
-
-  wireless.networks = import ./secrets/wifi-passwords.nix;
-}

etcnixos/system-mreow.nix

@@ -1,129 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  username,
-  inputs,
-  ...
-}:
-
-let
-  untar = pkgs.callPackage ./util/untar.nix;
-in
-{
-  imports = [
-    ./common.nix
-    ./hardware_laptop.nix
-
-    inputs.nixos-hardware.nixosModules.framework-12th-gen-intel
-    inputs.lanzaboote.nixosModules.lanzaboote
-  ];
-
-  # hardware.framework.laptop13.audioEnhancement = {
-  #   enable = true;
-
-  #   # seems audio doesn't work without this
-  #   hideRawDevice = false;
-  # };
-
-  services.tlp = {
-    enable = true;
-    settings = {
-      CPU_SCALING_GOVERNOR_ON_AC = "powersave";
-      CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
-
-      CPU_ENERGY_PERF_POLICY_ON_BAT = "power";
-      CPU_ENERGY_PERF_POLICY_ON_AC = "default";
-
-      PCIE_ASPM_ON_BAT = "powersupersave";
-      PCIE_ASPM_ON_AC = "default";
-      PLATFORM_PROFILE_ON_BAT = "low-power";
-      PLATFORM_PROFILE_ON_AC = "balanced";
-    };
-  };
-
-  services = {
-    #using btrfs, so lets scrub!
-    btrfs.autoScrub = {
-      enable = true;
-      interval = "weekly";
-      fileSystems = [ "/" ];
-    };
-  };
-
-  services.greetd = {
-    enable = true;
-    settings = {
-      default_session = {
-        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd niri-session";
-        user = username;
-      };
-    };
-  };
-
-  boot = {
-    lanzaboote = {
-      enable = true;
-      # TODO: proper secrets management so this is not stored in nix store
-      pkiBundle = "${(untar { src = "${./secrets/secureboot.tar}"; })}";
-    };
-
-    # Bootloader.
-    loader = {
-      /*
-        Lanzaboote currently replaces the systemd-boot module.
-        This setting is usually set to true in configuration.nix
-        generated at installation time. So we force it to false
-        for now.
-      */
-      systemd-boot.enable = lib.mkForce false;
-    };
-
-    kernelParams = [
-      "mitigations=off"
-      "rcu_nocbs=all"
-      "rcutree.enable_rcu_lazy=1"
-      "rtc_cmos.use_acpi_alarm=1"
-    ];
-  };
-
-  programs.gamescope = {
-    enable = true;
-    capSysNice = true;
-  };
-
-  programs.steam = {
-    gamescopeSession.enable = true;
-  };
-
-  # this is a life saver.
-  # literally no documentation about this anywhere.
-  # might be good to write about this...
-  # https://www.reddit.com/r/NixOS/comments/u0cdpi/tuigreet_with_xmonad_how/
-  systemd.services.greetd.serviceConfig = {
-    Type = "idle";
-    StandardInput = "tty";
-    StandardOutput = "tty";
-    StandardError = "journal"; # Without this errors will spam on screen
-    # Without these bootlogs will spam on screen
-    TTYReset = true;
-    TTYVHangup = true;
-    TTYVTDisallocate = true;
-  };
-
-  system.activationScripts = {
-    # FIX: https://github.com/NixOS/nix/issues/2982
-    "profile-channel-dummy".text = ''
-      #!/bin/sh
-      mkdir -p /nix/var/nix/profiles/per-user/root/channels
-    '';
-  };
-
-  # weird hack to get swaylock working? idk, if you don't put this here, password entry doesnt work
-  # if I move to another lock screen program, i will have to replace `swaylock`
-  security.pam.services.swaylock = { };
-
-  # disable framework kernel module
-  # https://github.com/NixOS/nixos-hardware/issues/1330
-  hardware.framework.enableKmod = false;
-}

etcnixos/system-yarn.nix

@@ -1,96 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  username,
-  inputs,
-  ...
-}:
-{
-  imports = [
-    ./common.nix
-    ./hardware_desktop.nix
-    ./no-rgb.nix
-    ./vr.nix
-
-    inputs.nixos-hardware.nixosModules.common-cpu-amd-pstate
-    inputs.nixos-hardware.nixosModules.common-cpu-amd-zenpower
-  ];
-  nixpkgs.config.allowUnfree = true;
-
-  networking.hostId = "abf570f9";
-  boot = {
-    # fixes zenpower driver issue
-    kernelPackages = lib.mkForce pkgs.linuxPackages_latest;
-
-    kernelParams = [
-      # allow overclocking (I actually underclock but lol)
-      "amdgpu.ppfeaturemask=0xFFF7FFFF"
-    ];
-
-    kernelModules = [
-      # kernel module for case fan control
-      "nct6775"
-    ];
-  };
-
-  services.xserver.enable = false;
-  services.desktopManager.plasma6.enable = true;
-  services.displayManager = {
-    sddm = {
-      enable = true;
-      wayland.enable = true;
-    };
-
-    autoLogin = {
-      enable = true;
-      user = username;
-    };
-  };
-
-  # services.openssh = {
-  #   enable = true;
-  #   ports = [ 22 ];
-  #   settings = {
-  #     PasswordAuthentication = true;
-  #     AllowUsers = null; # Allows all users by default. Can be [ "user1" "user2" ]
-  #     UseDns = true;
-  #     X11Forwarding = false;
-  #     PermitRootLogin = "no"; # "yes", "without-password", "prohibit-password", "forced-commands-only", "no"
-  #   };
-  # };
-
-  programs.steam = {
-    remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
-  };
-
-  # LACT (Linux AMDGPU Configuration Tool): https://github.com/ilya-zlobintsev/LACT
-  environment.systemPackages = with pkgs; [
-    lact
-  ];
-  systemd.packages = with pkgs; [ lact ];
-  systemd.services.lactd.wantedBy = [ "multi-user.target" ];
-
-  # control case fans with gpu temperature
-  # I have case fans attached to my gpu for better cooling
-  hardware.fancontrol = {
-    enable = true;
-    config =
-      let
-        select_hwmon = "hwmon/hwmon[[:print:]]*";
-        gpu_path = "/sys/bus/pci/drivers/amdgpu/0000:0c:00.0/${select_hwmon}";
-        mobo_path = "/sys/devices/platform/nct6775.656/${select_hwmon}";
-        fan_speed = "${mobo_path}/pwm4";
-      in
-      ''
-        INTERVAL=10
-        FCTEMPS=${fan_speed}=${gpu_path}/temp1_input
-        FCFANS= ${fan_speed}=${mobo_path}/fan4_input
-        MINTEMP=${fan_speed}=40
-        MAXTEMP=${fan_speed}=80
-        MINSTART=${fan_speed}=150
-        MINSTOP=${fan_speed}=0
-        MAXPWM=${fan_speed}=255
-      '';
-  };
-}

etcnixos/util/untar.nix

@@ -1,21 +0,0 @@
-{
-  stdenv,
-  gnutar,
-  src,
-}:
-stdenv.mkDerivation {
-  pname = "untar";
-  version = "1.0";
-
-  inherit src;
-
-  buildInputs = [ gnutar ];
-
-  # input is a file, not a directory, skip unpackPhase
-  unpackPhase = "true";
-
-  installPhase = ''
-    mkdir -p $out
-    tar xf ${src} -C $out/
-  '';
-}

etcnixos/vm.nix

@@ -1,73 +0,0 @@
-{
-  pkgs,
-  username,
-  lib,
-  ...
-}:
-{
-
-  environment.systemPackages = with pkgs; [
-    # https://github.com/quickemu-project/quickemu
-    (quickemu.overrideAttrs (old: {
-      patches = [
-        # patch to allow forcing a specific ISO file via an environment variable `FILE_NAME`
-        (pkgs.fetchpatch {
-          url = "https://github.com/Titaniumtown/quickemu/commit/f96d52a6b6f4b3187171d8cab61a273475da3b6c.diff";
-          sha256 = "vXVI4EeJGhOlx8ARTCvB98Ajalk0bVakL98WojqcI3c=";
-        })
-      ];
-    }))
-  ];
-
-  programs.virt-manager.enable = true;
-
-  users.groups.libvirtd.members = [ username ];
-
-  virtualisation.libvirtd = {
-    enable = true;
-
-    package = pkgs.libvirt;
-
-    qemu = {
-      package = (
-        pkgs.qemu_kvm.overrideAttrs (old: {
-          patches = old.patches ++ [
-            # amd?
-            # (pkgs.fetchpatch {
-            #   url = "https://github.com/Scrut1ny/Hypervisor-Phantom/raw/d09d66813570704e2b05440f290d6f9bdf2d26c7/Hypervisor-Phantom/patches/QEMU/amd-qemu-9.2.0.patch";
-            #   sha256 = "BbzgjRa3qaYH1yXXqU6M/S68SxXWpAc9ObTG5qXu6YA=";
-            # })
-
-            # or intel!
-            (pkgs.fetchpatch {
-              url = "https://github.com/Scrut1ny/Hypervisor-Phantom/raw/d09d66813570704e2b05440f290d6f9bdf2d26c7/Hypervisor-Phantom/patches/QEMU/intel-qemu-9.2.0.patch";
-              sha256 = "kXY6R/0Tsotf0mGUIevDLlLWHEznnF1dt0K2ayX7XAg=";
-            })
-          ];
-        })
-      );
-
-      ovmf.packages = lib.mkForce [
-        (pkgs.OVMF.overrideAttrs (old: {
-          secureBoot = true;
-          tpmSupport = true;
-          # TODO! add patches from: https://github.com/Scrut1ny/Hypervisor-Phantom/tree/main/Hypervisor-Phantom/patches/EDK2
-        })).fd
-      ];
-    };
-  };
-
-  virtualisation.spiceUSBRedirection.enable = true;
-
-  users.users."${username}".extraGroups = [ "libvirtd" ];
-
-  # boot.kernelPatches = [
-  #   {
-  #     name = "undetected-kvm";
-  #     patch = pkgs.fetchurl {
-  #       url = "https://raw.githubusercontent.com/Scrut1ny/Hypervisor-Phantom/d09d66813570704e2b05440f290d6f9bdf2d26c7/Hypervisor-Phantom/patches/Kernel/linux-6.13-svm.patch";
-  #       sha256 = "zz18xerutulLGzlHhnu26WCY8rVQXApyeoDtCjbejIk=";
-  #     };
-  #   }
-  # ];
-}

flake.lock

@@ -0,0 +1,779 @@
+{
+  "nodes": {
+    "blueprint": {
+      "inputs": {
+        "nixpkgs": [
+          "llm-agents",
+          "nixpkgs"
+        ],
+        "systems": "systems_3"
+      },
+      "locked": {
+        "lastModified": 1771437256,
+        "narHash": "sha256-bLqwib+rtyBRRVBWhMuBXPCL/OThfokA+j6+uH7jDGU=",
+        "owner": "numtide",
+        "repo": "blueprint",
+        "rev": "06ee7190dc2620ea98af9eb225aa9627b68b0e33",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "blueprint",
+        "type": "github"
+      }
+    },
+    "crane": {
+      "locked": {
+        "lastModified": 1771121070,
+        "narHash": "sha256-aIlv7FRXF9q70DNJPI237dEDAznSKaXmL5lfK/Id/bI=",
+        "owner": "ipetkov",
+        "repo": "crane",
+        "rev": "a2812c19f1ed2e5ed5ce2ef7109798b575c180e1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ipetkov",
+        "repo": "crane",
+        "type": "github"
+      }
+    },
+    "deploy-rs": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "utils": "utils"
+      },
+      "locked": {
+        "lastModified": 1770019181,
+        "narHash": "sha256-hwsYgDnby50JNVpTRYlF3UR/Rrpt01OrxVuryF40CFY=",
+        "owner": "serokell",
+        "repo": "deploy-rs",
+        "rev": "77c906c0ba56aabdbc72041bf9111b565cdd6171",
+        "type": "github"
+      },
+      "original": {
+        "owner": "serokell",
+        "repo": "deploy-rs",
+        "type": "github"
+      }
+    },
+    "disko": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1768920986,
+        "narHash": "sha256-CNzzBsRhq7gg4BMBuTDObiWDH/rFYHEuDRVOwCcwXw4=",
+        "owner": "nix-community",
+        "repo": "disko",
+        "rev": "de5708739256238fb912c62f03988815db89ec9a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "latest",
+        "repo": "disko",
+        "type": "github"
+      }
+    },
+    "doomemacs": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1771637851,
+        "narHash": "sha256-GmrqCINhfdO3EthpVG8ZsoTdfzj3vaEdz9soJwiI2HY=",
+        "owner": "doomemacs",
+        "repo": "doomemacs",
+        "rev": "ac649cce2abd1eb9d6d3f161928f9a7665b63310",
+        "type": "github"
+      },
+      "original": {
+        "owner": "doomemacs",
+        "repo": "doomemacs",
+        "type": "github"
+      }
+    },
+    "emacs-overlay": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1771728721,
+        "narHash": "sha256-03w1Ka71dJlerySoIT5ZGm/+bx0qONZIjELY4ghkxIo=",
+        "owner": "nix-community",
+        "repo": "emacs-overlay",
+        "rev": "d7e50ce0c6e1ca698217a251d432799683d23831",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "emacs-overlay",
+        "type": "github"
+      }
+    },
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1733328505,
+        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1767039857,
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
+        "owner": "NixOS",
+        "repo": "flake-compat",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_5"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "gitignore": {
+      "inputs": {
+        "nixpkgs": [
+          "lanzaboote",
+          "pre-commit",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1709087332,
+        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
+    "home-manager": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1771683283,
+        "narHash": "sha256-WxAEkAbo8dP7qiyPM6VN4ZGAxfuBVlNBNPkrqkrXVEc=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "c6ed3eab64d23520bcbb858aa53fe2b533725d4a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "type": "github"
+      }
+    },
+    "impermanence": {
+      "inputs": {
+        "home-manager": [
+          "home-manager"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1769548169,
+        "narHash": "sha256-03+JxvzmfwRu+5JafM0DLbxgHttOQZkUtDWBmeUkN8Y=",
+        "owner": "nix-community",
+        "repo": "impermanence",
+        "rev": "7b1d382faf603b6d264f58627330f9faa5cba149",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "impermanence",
+        "type": "github"
+      }
+    },
+    "jovian-nixos": {
+      "inputs": {
+        "nix-github-actions": "nix-github-actions",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1772169624,
+        "narHash": "sha256-YHaTNllFu90LdXqiNNoeDFnKwioa6lT+gXGGBOAvlfo=",
+        "owner": "Titaniumtown",
+        "repo": "Jovian-NixOS",
+        "rev": "68f2a686a27f0b6899b085fd6e653fffa59db444",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Titaniumtown",
+        "ref": "pr/fix-sddm-switch-to-desktop",
+        "repo": "Jovian-NixOS",
+        "type": "github"
+      }
+    },
+    "json2steamshortcut": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1763116114,
+        "narHash": "sha256-0gI7PnQUDZTFjhHgg0eP1SCJOvW5gw3sQ2UAMspipnQ=",
+        "owner": "ChrisOboe",
+        "repo": "json2steamshortcut",
+        "rev": "b829fe2871fd1736d2406724e4abbb492527cb08",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ChrisOboe",
+        "repo": "json2steamshortcut",
+        "type": "github"
+      }
+    },
+    "lanzaboote": {
+      "inputs": {
+        "crane": "crane",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "pre-commit": "pre-commit",
+        "rust-overlay": [
+          "rust-overlay"
+        ]
+      },
+      "locked": {
+        "lastModified": 1771492583,
+        "narHash": "sha256-nQzvnU4BGu8dA6BsPPCqmVcab/3ebVmHtX3ZWbW3Hxc=",
+        "owner": "nix-community",
+        "repo": "lanzaboote",
+        "rev": "5e9380994665ef66c87ab8e22c913ff837174ce4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "lanzaboote",
+        "type": "github"
+      }
+    },
+    "llm-agents": {
+      "inputs": {
+        "blueprint": "blueprint",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "treefmt-nix": "treefmt-nix"
+      },
+      "locked": {
+        "lastModified": 1771730908,
+        "narHash": "sha256-AkmTeSJSGniBsCbc+Oy5emrQflyTzUweOVcQLf69z1A=",
+        "owner": "numtide",
+        "repo": "llm-agents.nix",
+        "rev": "352ee8c439a3c2c7987f6cfaebddcf87c924959a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "llm-agents.nix",
+        "type": "github"
+      }
+    },
+    "niri": {
+      "inputs": {
+        "niri-stable": "niri-stable",
+        "niri-unstable": "niri-unstable",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": [
+          "nixpkgs"
+        ],
+        "xwayland-satellite-stable": "xwayland-satellite-stable",
+        "xwayland-satellite-unstable": "xwayland-satellite-unstable"
+      },
+      "locked": {
+        "lastModified": 1771638124,
+        "narHash": "sha256-rIF69lE48tBvOMFiIyserOa0MF3SXh1ZiRqv7WqlUew=",
+        "owner": "sodiboo",
+        "repo": "niri-flake",
+        "rev": "a1dac2b08c329af22200104c3c4b18de5ded6034",
+        "type": "github"
+      },
+      "original": {
+        "owner": "sodiboo",
+        "repo": "niri-flake",
+        "type": "github"
+      }
+    },
+    "niri-stable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1756556321,
+        "narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=",
+        "owner": "YaLTeR",
+        "repo": "niri",
+        "rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294",
+        "type": "github"
+      },
+      "original": {
+        "owner": "YaLTeR",
+        "ref": "v25.08",
+        "repo": "niri",
+        "type": "github"
+      }
+    },
+    "niri-unstable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1771305475,
+        "narHash": "sha256-lqweVTwHhYc+9T33cysp38gVwxaibGJHriOPZXWyhCY=",
+        "owner": "YaLTeR",
+        "repo": "niri",
+        "rev": "a2a52911757cb3b497db9407592f9b4c439571ea",
+        "type": "github"
+      },
+      "original": {
+        "owner": "YaLTeR",
+        "repo": "niri",
+        "type": "github"
+      }
+    },
+    "nix-doom-emacs-unstraightened": {
+      "inputs": {
+        "doomemacs": "doomemacs",
+        "emacs-overlay": [
+          "emacs-overlay"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "systems": "systems_4"
+      },
+      "locked": {
+        "lastModified": 1771663801,
+        "narHash": "sha256-gh0OVgAERhv1uSXzTgd0p7GioEG1Jg44FVxc72aM//A=",
+        "owner": "marienz",
+        "repo": "nix-doom-emacs-unstraightened",
+        "rev": "0bf7a181e28a8c3d1e89b18f79b15d516f2fb670",
+        "type": "github"
+      },
+      "original": {
+        "owner": "marienz",
+        "repo": "nix-doom-emacs-unstraightened",
+        "type": "github"
+      }
+    },
+    "nix-flatpak": {
+      "locked": {
+        "lastModified": 1768656715,
+        "narHash": "sha256-Sbh037scxKFm7xL0ahgSCw+X2/5ZKeOwI2clqrYr9j4=",
+        "owner": "gmodena",
+        "repo": "nix-flatpak",
+        "rev": "123fe29340a5b8671367055b75a6e7c320d6f89a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "gmodena",
+        "repo": "nix-flatpak",
+        "type": "github"
+      }
+    },
+    "nix-github-actions": {
+      "inputs": {
+        "nixpkgs": [
+          "jovian-nixos",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1729697500,
+        "narHash": "sha256-VFTWrbzDlZyFHHb1AlKRiD/qqCJIripXKiCSFS8fAOY=",
+        "owner": "zhaofengli",
+        "repo": "nix-github-actions",
+        "rev": "e418aeb728b6aa5ca8c5c71974e7159c2df1d8cf",
+        "type": "github"
+      },
+      "original": {
+        "owner": "zhaofengli",
+        "ref": "matrix-name",
+        "repo": "nix-github-actions",
+        "type": "github"
+      }
+    },
+    "nixos-hardware": {
+      "locked": {
+        "lastModified": 1771423359,
+        "narHash": "sha256-yRKJ7gpVmXbX2ZcA8nFi6CMPkJXZGjie2unsiMzj3Ig=",
+        "owner": "NixOS",
+        "repo": "nixos-hardware",
+        "rev": "740a22363033e9f1bb6270fbfb5a9574067af15b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "master",
+        "repo": "nixos-hardware",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1771369470,
+        "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "0182a361324364ae3f436a63005877674cf45efb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "noctalia": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1771732280,
+        "narHash": "sha256-pwfFptl7m1Xu+I7eSjapRfIBtVH9rsLpzuaCouraz9U=",
+        "owner": "noctalia-dev",
+        "repo": "noctalia-shell",
+        "rev": "341c5ee138d688ac1a7ffb1543ce2a3c9801aa34",
+        "type": "github"
+      },
+      "original": {
+        "owner": "noctalia-dev",
+        "repo": "noctalia-shell",
+        "type": "github"
+      }
+    },
+    "oh-my-opencode": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1770618333,
+        "narHash": "sha256-7Y9e2nrsi4yKwBXZ7RUF1B5FN4RJUT4rYI1SvA0vDEw=",
+        "owner": "yebei199",
+        "repo": "oh-my-opencode",
+        "rev": "bde5264e4c3a91ded482acd35c8ed239d21d1de2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "yebei199",
+        "ref": "nix",
+        "repo": "oh-my-opencode",
+        "type": "github"
+      }
+    },
+    "pre-commit": {
+      "inputs": {
+        "flake-compat": "flake-compat_2",
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "lanzaboote",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1770726378,
+        "narHash": "sha256-kck+vIbGOaM/dHea7aTBxdFYpeUl/jHOy5W3eyRvVx8=",
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
+        "rev": "5eaaedde414f6eb1aea8b8525c466dc37bba95ae",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "deploy-rs": "deploy-rs",
+        "disko": "disko",
+        "emacs-overlay": "emacs-overlay",
+        "home-manager": "home-manager",
+        "impermanence": "impermanence",
+        "jovian-nixos": "jovian-nixos",
+        "json2steamshortcut": "json2steamshortcut",
+        "lanzaboote": "lanzaboote",
+        "llm-agents": "llm-agents",
+        "niri": "niri",
+        "nix-doom-emacs-unstraightened": "nix-doom-emacs-unstraightened",
+        "nix-flatpak": "nix-flatpak",
+        "nixos-hardware": "nixos-hardware",
+        "nixpkgs": "nixpkgs",
+        "noctalia": "noctalia",
+        "oh-my-opencode": "oh-my-opencode",
+        "rust-overlay": "rust-overlay",
+        "zen-browser": "zen-browser"
+      }
+    },
+    "rust-overlay": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1771729765,
+        "narHash": "sha256-HNsDSR5bhLSrIpi9bTb2uTK1qnPo1xFSBxs6YmFyprk=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "be926cb1a76e8450ab2b92121b2e88d09fa4d41c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_3": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_4": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_5": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "llm-agents",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1770228511,
+        "narHash": "sha256-wQ6NJSuFqAEmIg2VMnLdCnUc0b7vslUohqqGGD+Fyxk=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "337a4fe074be1042a35086f15481d763b8ddc0e7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
+    },
+    "utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "xwayland-satellite-stable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1755491097,
+        "narHash": "sha256-m+9tUfsmBeF2Gn4HWa6vSITZ4Gz1eA1F5Kh62B0N4oE=",
+        "owner": "Supreeeme",
+        "repo": "xwayland-satellite",
+        "rev": "388d291e82ffbc73be18169d39470f340707edaa",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Supreeeme",
+        "ref": "v0.7",
+        "repo": "xwayland-satellite",
+        "type": "github"
+      }
+    },
+    "xwayland-satellite-unstable": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1771195969,
+        "narHash": "sha256-BUE41HjLIGPjq3U8VXPjf8asH8GaMI7FYdgrIHKFMXA=",
+        "owner": "Supreeeme",
+        "repo": "xwayland-satellite",
+        "rev": "536bd32efc935bf876d6de385ec18a1b715c9358",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Supreeeme",
+        "repo": "xwayland-satellite",
+        "type": "github"
+      }
+    },
+    "zen-browser": {
+      "inputs": {
+        "home-manager": [
+          "home-manager"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1771719171,
+        "narHash": "sha256-ZDE3//9Hg+9X5xXcDJ4k/d6qcOVQ4MrTmvf1zv/omZY=",
+        "owner": "0xc000022070",
+        "repo": "zen-browser-flake",
+        "rev": "2a71f2e720db962f2522b38704e23e11163e91ae",
+        "type": "github"
+      },
+      "original": {
+        "owner": "0xc000022070",
+        "repo": "zen-browser-flake",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

flake.nix

@@ -0,0 +1,165 @@
+{
+  description = "System nixOS flake";
+
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+
+    lanzaboote = {
+      url = "github:nix-community/lanzaboote";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.rust-overlay.follows = "rust-overlay";
+    };
+
+    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
+
+    home-manager = {
+      url = "github:nix-community/home-manager";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    disko = {
+      url = "github:nix-community/disko/latest";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    rust-overlay = {
+      url = "github:oxalica/rust-overlay";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    zen-browser = {
+      url = "github:0xc000022070/zen-browser-flake";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.home-manager.follows = "home-manager";
+    };
+
+    niri = {
+      url = "github:sodiboo/niri-flake";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nixpkgs-stable.follows = "nixpkgs";
+    };
+
+    emacs-overlay = {
+      url = "github:nix-community/emacs-overlay";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.nixpkgs-stable.follows = "nixpkgs";
+    };
+
+    nix-flatpak.url = "github:gmodena/nix-flatpak/";
+
+    nix-doom-emacs-unstraightened = {
+      url = "github:marienz/nix-doom-emacs-unstraightened";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.emacs-overlay.follows = "emacs-overlay";
+    };
+
+    impermanence = {
+      url = "github:nix-community/impermanence";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.home-manager.follows = "home-manager";
+    };
+
+    deploy-rs = {
+      url = "github:serokell/deploy-rs";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    jovian-nixos = {
+      url = "github:Titaniumtown/Jovian-NixOS/pr/fix-sddm-switch-to-desktop";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    noctalia = {
+      url = "github:noctalia-dev/noctalia-shell";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    llm-agents = {
+      url = "github:numtide/llm-agents.nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    # wait for https://github.com/code-yeongyu/oh-my-opencode/pull/921 to be merged
+    oh-my-opencode = {
+      url = "github:yebei199/oh-my-opencode/nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    json2steamshortcut = {
+      url = "github:ChrisOboe/json2steamshortcut";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+  };
+
+  outputs =
+    {
+      self,
+      nixpkgs,
+      lanzaboote,
+      nixos-hardware,
+      home-manager,
+      deploy-rs,
+      jovian-nixos,
+      ...
+    }@inputs:
+    let
+      username = "primary";
+      system = "x86_64-linux";
+      hostnames = [
+        "mreow"
+        "yarn"
+      ];
+      niri-package = inputs.niri.packages.${system}.niri-unstable;
+    in
+    {
+      formatter.${system} = nixpkgs.legacyPackages.${system}.nixfmt-tree;
+
+      nixosConfigurations = nixpkgs.lib.foldl' (
+        config: hostname:
+        config
+        // {
+          "${hostname}" = nixpkgs.lib.nixosSystem {
+            specialArgs = {
+              inherit
+                inputs
+                username
+                hostname
+                niri-package
+                ;
+            };
+            modules = [
+              home-manager.nixosModules.home-manager
+              (
+                { config, ... }:
+                {
+                  # home-manager.useGlobalPkgs = true;
+                  home-manager.useUserPackages = true;
+                  home-manager.extraSpecialArgs = {
+                    inherit
+                      inputs
+                      hostname
+                      username
+                      niri-package
+                      ;
+                    homeDirectory = "/home/${username}";
+                    stateVersion = config.system.stateVersion;
+                  };
+                  home-manager.users.${username} = import ./home-manager/home-${hostname}.nix;
+                }
+              )
+              ./system/system-${hostname}.nix
+            ];
+          };
+        }
+      ) { } hostnames;
+
+      # Deploy-rs configuration for yarn host only
+      deploy.nodes.yarn = {
+        hostname = "desktop";
+        profiles.system = {
+          sshUser = "root";
+          path = deploy-rs.lib.${system}.activate.nixos self.nixosConfigurations.yarn;
+        };
+      };
+    };
+}

home-manager/desktop.nix

@@ -0,0 +1,33 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+{
+  imports = [
+    # niri wayland compositor
+    ./progs/niri.nix
+
+    # statusbar
+    # ./progs/eww/eww.nix
+
+    # lockscreen
+    ./progs/swaylock.nix
+
+    # notification daemon
+    ./progs/dunst.nix
+
+    # noctalia desktop shell
+    ./progs/noctalia.nix
+  ];
+
+  home.packages = with pkgs; [
+    wdisplays
+    blueman
+
+    # used by /etc/nixos logic to launch niri
+    config.programs.niri.package
+  ];
+
+}

home-manager/flake.lock

@@ -1,261 +0,0 @@
-{
-  "nodes": {
-    "agenix": {
-      "inputs": {
-        "darwin": "darwin",
-        "home-manager": [
-          "home-manager"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1736955230,
-        "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=",
-        "owner": "ryantm",
-        "repo": "agenix",
-        "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ryantm",
-        "repo": "agenix",
-        "type": "github"
-      }
-    },
-    "darwin": {
-      "inputs": {
-        "nixpkgs": [
-          "agenix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1700795494,
-        "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",
-        "owner": "lnl7",
-        "repo": "nix-darwin",
-        "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lnl7",
-        "ref": "master",
-        "repo": "nix-darwin",
-        "type": "github"
-      }
-    },
-    "home-manager": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1739992710,
-        "narHash": "sha256-9kEscmGnXHjSgcqyJR4TzzHhska4yz1inSQs6HuO9qU=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "1c189f011447810af939a886ba7bee33532bb1f9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "niri": {
-      "inputs": {
-        "niri-stable": "niri-stable",
-        "niri-unstable": "niri-unstable",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "nixpkgs-stable": "nixpkgs-stable",
-        "xwayland-satellite-stable": "xwayland-satellite-stable",
-        "xwayland-satellite-unstable": "xwayland-satellite-unstable"
-      },
-      "locked": {
-        "lastModified": 1740045415,
-        "narHash": "sha256-dLg4Re8AdmlTYWu6FHR60cem9fErXnWXRJi6/Du5L3M=",
-        "owner": "sodiboo",
-        "repo": "niri-flake",
-        "rev": "a622f76d3f97ce289f2103b6999f80a3732d629b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "sodiboo",
-        "repo": "niri-flake",
-        "type": "github"
-      }
-    },
-    "niri-stable": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1736614405,
-        "narHash": "sha256-AJ1rlgNOPb3/+DbS5hkhm21t6Oz8IgqLllwmZt0lyzk=",
-        "owner": "YaLTeR",
-        "repo": "niri",
-        "rev": "e05bc269e678ecf828b96ae79c991c13b00b38a5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "YaLTeR",
-        "ref": "v25.01",
-        "repo": "niri",
-        "type": "github"
-      }
-    },
-    "niri-unstable": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1740042509,
-        "narHash": "sha256-Yk1DXv4oRdbi2P8v4b7GV6wXJaAa5jOK0femtfxlGAg=",
-        "owner": "YaLTeR",
-        "repo": "niri",
-        "rev": "8885233c7e036a1e279c09e4fd96c1a1669156c3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "YaLTeR",
-        "repo": "niri",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1739866667,
-        "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-stable": {
-      "locked": {
-        "lastModified": 1739923778,
-        "narHash": "sha256-BqUY8tz0AQ4to2Z4+uaKczh81zsGZSYxjgvtw+fvIfM=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "36864ed72f234b9540da4cf7a0c49e351d30d3f1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-24.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "agenix": "agenix",
-        "home-manager": "home-manager",
-        "niri": "niri",
-        "nixpkgs": "nixpkgs",
-        "rust-overlay": "rust-overlay",
-        "zen-browser": "zen-browser"
-      }
-    },
-    "rust-overlay": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1740018520,
-        "narHash": "sha256-mU6H0Q1WPn0XuwBO9SLZb/1yeVMfvsifBJcXNlhB+Ts=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "7f6ecf3b7c5bfcc4730943a767630122efd09dc8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "xwayland-satellite-stable": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1730166465,
-        "narHash": "sha256-nq7bouXQXaaPPo/E+Jbq+wNHnatD4dY8OxSrRqzvy6s=",
-        "owner": "Supreeeme",
-        "repo": "xwayland-satellite",
-        "rev": "a713cf46cb7db84a0d1b57c3a397c610cad3cf98",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Supreeeme",
-        "ref": "v0.5",
-        "repo": "xwayland-satellite",
-        "type": "github"
-      }
-    },
-    "xwayland-satellite-unstable": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1739246919,
-        "narHash": "sha256-/hBM43/Gd0/tW+egrhlWgOIISeJxEs2uAOIYVpfDKeU=",
-        "owner": "Supreeeme",
-        "repo": "xwayland-satellite",
-        "rev": "44590a416d4a3e8220e19e29e0b6efe64a80315d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Supreeeme",
-        "repo": "xwayland-satellite",
-        "type": "github"
-      }
-    },
-    "zen-browser": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1739667343,
-        "narHash": "sha256-fNEz+Yd0t9jXz27qKRMAEBradTwYBeBLOECx+ydG25s=",
-        "owner": "0xc000022070",
-        "repo": "zen-browser-flake",
-        "rev": "8c7f6ca49f87b4e114f775a4dad956ceb6df4220",
-        "type": "github"
-      },
-      "original": {
-        "owner": "0xc000022070",
-        "repo": "zen-browser-flake",
-        "type": "github"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}

home-manager/flake.nix

@@ -1,100 +0,0 @@
-{
-  description = "My nixOS flake for home-manager";
-
-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-
-    home-manager = {
-      url = "github:nix-community/home-manager";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    niri = {
-      url = "github:sodiboo/niri-flake";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    agenix = {
-      url = "github:ryantm/agenix";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.home-manager.follows = "home-manager";
-    };
-
-    rust-overlay = {
-      url = "github:oxalica/rust-overlay";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    zen-browser = {
-      url = "github:0xc000022070/zen-browser-flake";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-  };
-
-  outputs =
-    {
-      self,
-      nixpkgs,
-      home-manager,
-      niri,
-      rust-overlay,
-      agenix,
-      ...
-    }@inputs:
-    let
-      username = "primary";
-      homeDirectory = "/home/${username}";
-      hostname = nixpkgs.lib.strings.removeSuffix "\n" (builtins.readFile /etc/hostname);
-
-      # stolen from: https://stackoverflow.com/a/42398526
-      optimizeWithFlags =
-        pkg: flags:
-        pkgs.lib.overrideDerivation pkg (
-          old:
-          let
-            newflags = pkgs.lib.foldl' (acc: x: "${acc} ${x}") "" flags;
-            oldflags = if (pkgs.lib.hasAttr "NIX_CFLAGS_COMPILE" old) then "${old.NIX_CFLAGS_COMPILE}" else "";
-          in
-          {
-            NIX_CFLAGS_COMPILE = "${oldflags} ${newflags}";
-            stdenv = pkgs.clang19Stdenv;
-          }
-        );
-
-      pkgs = (import nixpkgs { });
-    in
-    {
-      homeConfigurations."${username}" = home-manager.lib.homeManagerConfiguration {
-        inherit pkgs;
-        extraSpecialArgs = {
-          inherit
-            inputs
-            username
-            homeDirectory
-            optimizeWithFlags
-            ;
-        };
-
-        modules = [
-          ./system-${hostname}.nix
-          niri.homeModules.config
-          agenix.homeManagerModules.age
-
-          (
-            { pkgs, ... }:
-            {
-              nixpkgs.overlays = [
-                rust-overlay.overlays.default
-                inputs.niri.overlays.niri
-              ];
-
-              # home-manager stuff
-              home = {
-                inherit username homeDirectory;
-              };
-            }
-          )
-        ];
-      };
-    };
-}

home-manager/gui.nix

@@ -7,120 +7,139 @@
 {
   imports = [
     ./no-gui.nix
+    # ./progs/ghostty.nix
     ./progs/alacritty.nix
-    ./progs/gpt4all/gpt4all.nix
-    ./progs/trezor.nix
+    ./progs/emacs.nix
+    # ./progs/trezor.nix # - broken
+    ./progs/flatpak.nix
   ];
 
   nixpkgs.config.allowUnfreePredicate =
     pkg:
     builtins.elem (lib.getName pkg) [
       "apple_cursor"
+      "grayjay"
     ];
 
   home.packages =
     with pkgs;
-    [
-      #calculator
-      gnome-calculator
+    lib.concatLists [
+      # libreoffice
+      [
+        libreoffice
+        hunspell # spellcheck
+        hunspellDicts.en_US # spellcheck dictionary
+      ]
 
-      #productivity stuff
-      libreoffice
-      hunspell # spellcheck
-      hunspellDicts.en_US # spellcheck dictionary
+      # browsers
+      [
+        tor-browser
+        inputs.zen-browser.packages."${system}".twilight
+        grayjay
+      ]
 
-      #video and audio downloading
-      parabolic
+      # music library management
+      [
+        picard
+        puddletag
+        lrcget
+      ]
 
-      #soulseek client
-      nicotine-plus
+      # image editing
+      [
+        darktable
+        rawtherapee
+        hugin
 
-      #dark web browsing deep web browsing
-      tor-browser
+        gimp3
+        pinta
+      ]
 
-      #audio editing
-      audacity
+      [
+        #calculator
+        gnome-calculator
 
-      #fonts
-      noto-fonts
-      noto-fonts-emoji
-      liberation_ttf
+        # audio editing
+        audacity
 
-      #for ebook reading
-      foliate
+        #fonts
+        noto-fonts
+        noto-fonts-color-emoji
+        liberation_ttf
 
-      #audio mixer (pavucontrol but for pipewire)
-      pwvucontrol
+        #for ebook reading
+        foliate
 
-      #minecraft launcher
-      prismlauncher
+        #audio mixer (pavucontrol but for pipewire)
+        pwvucontrol
 
-      mpv
-      mumble
-      system76-keyboard-configurator
+        # minecraft launcher
+        prismlauncher
 
-      #jellyfin
-      finamp # music player
-      delfin # jellyfin client
+        mpv
+        mumble
+        system76-keyboard-configurator
 
-      signal-desktop
+        #jellyfin
+        finamp # music player
+        delfin # jellyfin client
 
-      #accounting
-      # gnucash
+        signal-desktop
 
-      # image tools
-      inkscape
-      nomacs
+        # accounting
+        # gnucash
 
-      # partitioning utilities
-      gparted
-      gnome-disk-utility
+        # image tools
+        inkscape
+        nomacs
 
-      # small nicities
-      wl-clipboard # wl-copy & wl-paste
-      libnotify # notifications library
-      xdg-utils # xdg utils
+        # partitioning utilities
+        gparted
+        gnome-disk-utility
 
-      # music tagging utility
-      picard
+        # small nicities
+        wl-clipboard # wl-copy & wl-paste
+        libnotify # notifications library
+        xdg-utils # xdg utils
 
-      # music lyric fetcher
-      lrcget
+        wireshark
 
-      inputs.zen-browser.packages."${system}".default
+        nautilus
+        nufraw-thumbnailer
+        gdk-pixbuf
 
-      # freecad-wayland
-      puddletag
+        enblend-enfuse
 
-      mcaselector
+        # simple screen recording on wayland
+        wl-screenrec
 
-      wireshark
+        # wayland-compatible color picker
+        hyprpicker
 
-      darktable
-      rawtherapee
-      hugin
+        blender
 
-      # nufraw
-      nufraw-thumbnailer
-      gdk-pixbuf
-      nautilus
+        ghidra-bin
 
-      enblend-enfuse
+        # for mod organizer 2
+        zenity
+        p7zip
 
-      savvycan
+        # password manager
+        keepassxc
 
-      # simple screen recording on wayland
-      wl-screenrec
+        freecad-wayland
 
-      gimp
-      pinta
+        localsend
 
-      # wayland-compatible color picker
-      hyprpicker
+        # openstreetmap
+        josm
 
-      blender
-    ]
-    ++ (builtins.filter lib.isDerivation (builtins.attrValues nerd-fonts));
+        # in unstable ATM, gotta wait for it to hit stable
+        # video-trimmer
+      ]
+      # all the fonts
+      (builtins.filter lib.isDerivation (builtins.attrValues nerd-fonts))
+    ];
 
   # programs.zed-editor = {
   #   enable = true;
@@ -152,8 +171,10 @@
   };
 
   home.sessionVariables = {
-    TERMINAL = "alacritty";
     BROWSER = "zen";
+    LD_LIBRARY_PATH = "${pkgs.lib.makeLibraryPath [
+      pkgs.stdenv.cc.cc
+    ]}";
   };
 
   # allow extra fonts to be detected by fontconfig

home-manager/home-mreow.nix

@@ -0,0 +1,33 @@
+{
+  config,
+  pkgs,
+  homeDirectory,
+  ...
+}:
+{
+  imports = [
+    ./gui.nix
+    ./desktop.nix
+    ./progs/borg.nix
+
+    # effects headphones too
+    # ./progs/framework-13-easyeffects.nix
+  ];
+
+  # media controls
+  systemd.user.services.mpris-proxy = {
+    Unit.Description = "Mpris proxy";
+    Install.After = [
+      "network.target"
+      "sound.target"
+    ];
+    Install.WantedBy = [ "default.target" ];
+    Service.ExecStart = "${pkgs.bluez}/bin/mpris-proxy";
+  };
+
+  programs.niri.settings.outputs = {
+    "BOE 0x095F Unknown" = {
+      scale = 1.5;
+    };
+  };
+}

home-manager/home-yarn.nix

@@ -0,0 +1,44 @@
+{
+  pkgs,
+  inputs,
+  lib,
+  config,
+  ...
+}:
+{
+  imports = [
+    ./gui.nix
+    ./desktop.nix
+    inputs.json2steamshortcut.homeModules.default
+  ];
+
+  home.packages = with pkgs; [
+    protontricks
+
+    # https://github.com/NixOS/nixpkgs/pull/339370#issuecomment-2731336341
+    bs-manager
+  ];
+
+  programs.obs-studio = {
+    enable = true;
+    plugins = with pkgs.obs-studio-plugins; [
+      wlrobs
+      obs-backgroundremoval
+      obs-pipewire-audio-capture
+    ];
+  };
+
+  services.steam-shortcuts = {
+    enable = true;
+    overwriteExisting = true;
+    steamUserId = lib.strings.toInt (lib.strings.trim (builtins.readFile ./secrets/steam-user-id));
+    shortcuts = [
+      {
+        AppName = "Prism Launcher";
+        Exe = "${pkgs.prismlauncher}/bin/prismlauncher";
+        Icon = "${pkgs.prismlauncher}/share/icons/hicolor/scalable/apps/org.prismlauncher.PrismLauncher.svg";
+        Tags = [ "Game" ];
+      }
+    ];
+  };
+}

home-manager/no-gui.nix

@@ -4,23 +4,13 @@
   lib,
   homeDirectory,
   config,
+  username,
+  stateVersion,
   ...
 }:
-{
-  imports = [
-    ./progs/fish.nix
-    ./progs/helix.nix
-  ];
-
-  home.stateVersion = "24.11";
-  home.enableNixpkgsReleaseCheck = false;
-
-  home.packages = with pkgs; [
-    # hex viewer
-    hexyl
-
-    # rust stuff
-    (rust-bin.stable.latest.default.override ({
+let
+  rust_pkgs = with pkgs; [
+    (rust-bin.nightly.latest.default.override ({
       extensions = [
         "rust-src"
         "rust-analyzer"
@@ -30,27 +20,51 @@
         "cargo"
       ];
       # thumbv7m-none-eabi target for stm32
-      targets = [ "thumbv7m-none-eabi" ];
+      targets = [
+        "thumbv7m-none-eabi"
+        "wasm32-unknown-unknown"
+      ];
     }))
     cargo-expand
+    cargo-edit # cargo upgrade and stuff
+    cargo-pgo
     rust-script
+    bolt_19
+    libllvm # llvm-profdata
+    cargo-show-asm
+    cargo-flamegraph
+  ];
 
-    # find typos in code
-    typos
+  lsps = with pkgs; [
+    # java
+    jdt-language-server
 
-    # python formatter
-    ruff
+    # HTML/CSS/JSON/ESLint language servers
+    vscode-langservers-extracted
+    nil # nix lsp
+    yaml-language-server # yaml lsp
+    marksman # markdown lsp
+    typescript-language-server # typescript lsp
+    cmake-language-server # cmake lsp
 
-    # for website generation
-    hugo
+    typescript
+  ];
 
+  java_tools = with pkgs; [
     # java development
     google-java-format # formatter
     jdk # java
-    jdt-language-server # lsp server
 
-    # for benchmaking stuff
-    hyperfine
+    # java assembler
+    jasmin
+  ];
+
+  common_tools = with pkgs; [
+    # hex viewer
+    hexyl
+
+    # find typos in code
+    typos
 
     # replacements for common posix tools
     eza # ls replacement
@@ -61,140 +75,173 @@
     gping # `ping`... but with a graph!!
     tldr # `man` but more straight-forward and simpler
     ripgrep # grep, but written in rust, respects .gitignore, and very very fast, command is `rg`
-    lurk # better strace
+    fd # alternative to `find`
+
+    # status tools
+    htop
+    bottom
+
+    # other tools
+    unzip
+    wget
+    killall
+    file
+    b3sum
+
+    # "A hexadecimal, binary, and ASCII dump utility with color support"
+    tinyxxd
+
+    # networking tool
+    lsof
+
+    # view SMART status of drives
+    smartmontools
 
     # adds `sensors` command
     lm_sensors
 
-    # rssfeed
-    newsboat
+    # lspci
+    pciutils
 
-    # HTML/CSS/JSON/ESLint language servers
-    vscode-langservers-extracted
+    # convert between various units
+    units
 
-    just
-
-    pfetch-rs
-    waypipe
-    htop
-    bottom
-    wget
-    unzip
-    compsize
-    killall
-
-    sshfs
-
-    # nix formatter
-    nixfmt-rfc-style
-
-    # serial viewer
-    minicom
-
-    # "~~matt's~~ my trace route"
-    mtr
-
-    file
-
-    b3sum
-
-    ffmpeg-full
-
-    # microcontroller tooling
-    probe-rs
-
-    (python312.withPackages (
-      ps: with ps; [
-        python-lsp-server # lsp
-        python-lsp-ruff # ruff integration
-
-        mypy # type checking
-
-        pyserial
-
-        numpy
-        matplotlib
-        notebook
-      ]
-    ))
-
-    # dep fails to build
-    # binwalk
-
-    smartmontools
-
-    nil # nix lsp
-    yaml-language-server # yaml lsp
-    marksman # markdown lsp
-    typescript-language-server # typescript lsp
-    cmake-language-server # cmake lsp
-
-    # clang-format and clang-tidy
-    clang-tools
-    clang
-
-    # broken
-    # lldb
-
-    fio
-
-    age
-    git-crypt
-
-    imagemagick
-
-    nixpkgs-review
-
-    nmap
-
-    # terminal image viewer
-    timg
-    lsof
-
-    tcpdump
-
-    cargo-flamegraph
-
-    borgbackup
+    jq
   ];
 
+in
+{
+  imports = [
+    ./progs/fish.nix
+    ./progs/helix.nix
+    ./progs/opencode.nix
+    (
+      { ... }:
+      {
+        nixpkgs.overlays = [
+          inputs.rust-overlay.overlays.default
+        ];
+      }
+    )
+  ];
+
+  home.stateVersion = stateVersion;
+
+  home.packages =
+    with pkgs;
+    lib.concatLists [
+      [
+        # python formatter
+        ruff
+
+        # for website generation
+        hugo
+        go
+
+        # for benchmaking stuff
+        hyperfine
+
+        pfetch-rs
+        waypipe
+
+        sshfs
+
+        # nix formatter
+        nixfmt-tree
+
+        # serial viewer
+        minicom
+
+        # "~~matt's~~ my trace route"
+        mtr
+
+        ffmpeg-full
+
+        # microcontroller tooling
+        probe-rs-tools
+
+        (python313.withPackages (
+          ps: with ps; [
+            mypy # type checking
+            types-requests # add types for requests methods
+
+            python-lsp-server # lsp
+            python-lsp-ruff # ruff integration
+            pyserial
+
+            numpy
+            matplotlib
+            notebook
+
+            pandas
+          ]
+        ))
+
+        binwalk
+
+        # clang-format and clang-tidy
+        clang-tools
+        clang
+        gdb
+
+        git-crypt
+
+        imagemagick
+
+        nixpkgs-review
+
+        nmap
+
+        # terminal image viewer
+        timg
+
+        tcpdump
+
+        borgbackup
+
+        # used to deploy nix system to server
+        # (and in the future, desktop)
+        deploy-rs
+
+        # power stuff
+        powerstat
+
+        nodePackages_latest.nodejs
+
+        yt-dlp
+      ]
+      rust_pkgs
+      lsps
+      java_tools
+      common_tools
+    ];
+
   # https://github.com/flamegraph-rs/flamegraph
   home.file.".cargo/config.toml".text = ''
-    [target.${lib.strings.removeSuffix "-linux" pkgs.system}-unknown-linux-gnu]
+    [target.${lib.strings.removeSuffix "-linux" pkgs.stdenv.hostPlatform.system}-unknown-linux-gnu]
     linker = "${lib.getExe pkgs.clang}"
     rustflags = ["-Clink-arg=-Wl,--no-rosegment"]
   '';
 
-  # default applications
-  home.sessionVariables = {
-    EDITOR = "hx";
-  };
-
-  # feed reader
-  programs.newsboat = {
-    enable = true;
-    # store rss feeds in a separate file because it's *a lot*
-    urls = import ./progs/rss.nix;
-  };
-
   # git (self explanatory)
   programs.git = {
     enable = true;
     package = pkgs.git;
-    userName = "Simon Gardling";
-    userEmail = "titaniumtown@proton.me";
-
-    # better way to view diffs
-    delta.enable = true;
 
     lfs.enable = true;
 
-    extraConfig = {
+    ignores = [ ".sisyphus" ];
+
+    settings = {
       init = {
         # master -> main
         defaultBranch = "main";
       };
       push.autoSetupRemote = true;
+      user = {
+        name = "Simon Gardling";
+        email = "titaniumtown@proton.me";
+      };
     };
 
     # gpg signing keys
@@ -204,5 +251,9 @@
     };
   };
 
-  programs.home-manager.enable = true;
+  # better way to view diffs
+  programs.delta = {
+    enable = true;
+    enableGitIntegration = true;
+  };
 }

home-manager/progs/alacritty.nix

@@ -1,5 +1,9 @@
 { pkgs, ... }:
 {
+  home.sessionVariables = {
+    TERMINAL = "alacritty";
+  };
+
   programs.alacritty = {
     enable = true;
     package = pkgs.alacritty;

home-manager/progs/borg.nix

@@ -1,52 +1,51 @@
-{ homeDirectory, borgPasswordFile }:
+{ pkgs, homeDirectory, ... }:
 {
+  programs.borgmatic = {
+    enable = true;
+    package = pkgs.borgmatic;
+    backups = {
+      home = {
+        location = {
+          sourceDirectories = (
+            map (f: "${homeDirectory}/${f}") [
+              ".zen"
+              ".local/share/fish"
+              ".ssh"
+              "Documents"
+              "projects"
+              "Pictures"
+              "school"
+            ]
+            ++ (map (f: ".config/Signal/${f}") [
+              "stickers.noindex"
+              "attachments.noindex"
+              "downloads.noindex"
+              "drafts.noindex"
+              "sql"
+              "IndexedDB"
+              "Local Storage"
+              "SharedStorage"
+              "config.json"
+              "Preferences"
+            ])
+          );
 
-  home = {
-    location = {
-      sourceDirectories = (
-        map (f: "${homeDirectory}/${f}") [
-          ".zen"
-          ".local/share/fish"
-          ".ssh"
-          "Documents"
-          "projects"
-          "Pictures"
-          "school"
-          "justfile"
-        ]
-        ++ (map (f: ".config/Signal/${f}") [
-          "stickers.noindex"
-          "attachments.noindex"
-          "downloads.noindex"
-          "drafts.noindex"
-          "sql"
-          "IndexedDB"
-          "Local Storage"
-          "SharedStorage"
-          "config.json"
-          "ephemeral.json"
-          "Preferences"
-        ])
-      );
+          excludeHomeManagerSymlinks = true;
+          repositories = [ "ssh://server-public/tank/bak/laptop" ];
 
-      excludeHomeManagerSymlinks = true;
-      repositories = [ "ssh://server-public/tank/bak/laptop" ];
+          extraConfig = {
+            compression = "zstd";
+          };
+        };
 
-      extraConfig = {
-        compression = "zstd";
+        retention = {
+          keepHourly = 10;
+          keepDaily = 30;
+          keepWeekly = 8;
+          keepMonthly = 2;
+          keepYearly = 0;
+        };
       };
     };
-
-    retention = {
-      keepHourly = 48;
-      keepDaily = 30;
-      keepWeekly = 26;
-      keepMonthly = 24;
-      keepYearly = 10;
-    };
-
-    storage = {
-      encryptionPasscommand = "cat ${borgPasswordFile}";
-    };
   };
 }

home-manager/progs/doom.d/config.el

@@ -0,0 +1,86 @@
+;;; $DOOMDIR/config.el -*- lexical-binding: t; -*-
+
+;; Place your private configuration here! Remember, you do not need to run 'doom
+;; sync' after modifying this file!
+
+
+;; Some functionality uses this to identify you, e.g. GPG configuration, email
+;; clients, file templates and snippets. It is optional.
+;; (setq user-full-name "John Doe"
+;;       user-mail-address "john@doe.com")
+
+;; Doom exposes five (optional) variables for controlling fonts in Doom:
+;;
+;; - `doom-font' -- the primary font to use
+;; - `doom-variable-pitch-font' -- a non-monospace font (where applicable)
+;; - `doom-big-font' -- used for `doom-big-font-mode'; use this for
+;;   presentations or streaming.
+;; - `doom-symbol-font' -- for symbols
+;; - `doom-serif-font' -- for the `fixed-pitch-serif' face
+;;
+;; See 'C-h v doom-font' for documentation and more examples of what they
+;; accept. For example:
+;;
+;;(setq doom-font (font-spec :family "Fira Code" :size 12 :weight 'semi-light)
+;;      doom-variable-pitch-font (font-spec :family "Fira Sans" :size 13))
+;;
+;; If you or Emacs can't find your font, use 'M-x describe-font' to look them
+;; up, `M-x eval-region' to execute elisp code, and 'M-x doom/reload-font' to
+;; refresh your font settings. If Emacs still can't find your font, it likely
+;; wasn't installed correctly. Font issues are rarely Doom issues!
+
+;; There are two ways to load a theme. Both assume the theme is installed and
+;; available. You can either set `doom-theme' or manually load a theme with the
+;; `load-theme' function. This is the default:
+(setq doom-theme 'doom-one)
+
+;; This determines the style of line numbers in effect. If set to `nil', line
+;; numbers are disabled. For relative line numbers, set this to `relative'.
+(setq display-line-numbers-type t)
+
+;; If you use `org' and don't want your org files in the default location below,
+;; change `org-directory'. It must be set before org loads!
+(setq org-directory "~/org/")
+
+
+;; Whenever you reconfigure a package, make sure to wrap your config in an
+;; `after!' block, otherwise Doom's defaults may override your settings. E.g.
+;;
+;;   (after! PACKAGE
+;;     (setq x y))
+;;
+;; The exceptions to this rule:
+;;
+;;   - Setting file/directory variables (like `org-directory')
+;;   - Setting variables which explicitly tell you to set them before their
+;;     package is loaded (see 'C-h v VARIABLE' to look up their documentation).
+;;   - Setting doom variables (which start with 'doom-' or '+').
+;;
+;; Here are some additional functions/macros that will help you configure Doom.
+;;
+;; - `load!' for loading external *.el files relative to this one
+;; - `use-package!' for configuring packages
+;; - `after!' for running code after a package has loaded
+;; - `add-load-path!' for adding directories to the `load-path', relative to
+;;   this file. Emacs searches the `load-path' when you load packages with
+;;   `require' or `use-package'.
+;; - `map!' for binding new keys
+;;
+;; To get information about any of these functions/macros, move the cursor over
+;; the highlighted symbol at press 'K' (non-evil users must press 'C-c c k').
+;; This will open documentation for it, including demos of how they are used.
+;; Alternatively, use `C-h o' to look up a symbol (functions, variables, faces,
+;; etc).
+;;
+;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how
+;; they are implemented.
+
+
+;; Ctrl + Shift + / = redo
+;; Ctrl + / = undo
+(after! undo-fu
+  (map! :map undo-fu-mode-map "C-?" #'undo-fu-only-redo))
+
+
+;; line wrapping
+(visual-line-mode t)

home-manager/progs/doom.d/init.el

@@ -0,0 +1,195 @@
+;;; init.el -*- lexical-binding: t; -*-
+
+;; This file controls what Doom modules are enabled and what order they load
+;; in. Remember to run 'doom sync' after modifying it!
+
+;; NOTE Press 'SPC h d h' (or 'C-h d h' for non-vim users) to access Doom's
+;;      documentation. There you'll find a link to Doom's Module Index where all
+;;      of our modules are listed, including what flags they support.
+
+;; NOTE Move your cursor over a module's name (or its flags) and press 'K' (or
+;;      'C-c c k' for non-vim users) to view its documentation. This works on
+;;      flags as well (those symbols that start with a plus).
+;;
+;;      Alternatively, press 'gd' (or 'C-c c d') on a module to browse its
+;;      directory (for easy access to its source code).
+
+(doom! :input
+       ;;bidi              ; (tfel ot) thgir etirw uoy gnipleh
+       ;;chinese
+       ;;japanese
+       ;;layout            ; auie,ctsrnm is the superior home row
+
+       :completion
+       ;;company           ; the ultimate code completion backend
+       (corfu +orderless)  ; complete with cap(f), cape and a flying feather!
+       ;;helm              ; the *other* search engine for love and life
+       ;;ido               ; the other *other* search engine...
+       ;;ivy               ; a search engine for love and life
+       vertico           ; the search engine of the future
+
+       :ui
+       ;;deft              ; notational velocity for Emacs
+       doom              ; what makes DOOM look the way it does
+       doom-dashboard    ; a nifty splash screen for Emacs
+       ;;doom-quit         ; DOOM quit-message prompts when you quit Emacs
+       ;;(emoji +unicode)  ; 🙂
+       hl-todo           ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
+       indent-guides     ; highlighted indent columns
+       ligatures         ; ligatures and symbols to make your code pretty again
+       ;;minimap           ; show a map of the code on the side
+       modeline          ; snazzy, Atom-inspired modeline, plus API
+       ;;nav-flash         ; blink cursor line after big motions
+       ;;neotree           ; a project drawer, like NERDTree for vim
+       ophints           ; highlight the region an operation acts on
+       (popup +defaults)   ; tame sudden yet inevitable temporary windows
+       smooth-scroll     ; So smooth you won't believe it's not butter
+       ;;tabs              ; a tab bar for Emacs
+       ;;treemacs          ; a project drawer, like neotree but cooler
+       unicode           ; extended unicode support for various languages
+       (vc-gutter +pretty) ; vcs diff in the fringe
+       vi-tilde-fringe   ; fringe tildes to mark beyond EOB
+       ;;window-select     ; visually switch windows
+       workspaces        ; tab emulation, persistence & separate workspaces
+       ;;zen               ; distraction-free coding or writing
+
+       :editor
+       (evil +everywhere); come to the dark side, we have cookies
+       file-templates    ; auto-snippets for empty files
+       fold              ; (nigh) universal code folding
+       (format +onsave)  ; automated prettiness
+       ;;god               ; run Emacs commands without modifier keys
+       ;;lispy             ; vim for lisp, for people who don't like vim
+       ;;multiple-cursors  ; editing in many places at once
+       ;;objed             ; text object editing for the innocent
+       ;;parinfer          ; turn lisp into python, sort of
+       ;;rotate-text       ; cycle region at point between text candidates
+       snippets          ; my elves. They type so I don't have to
+       word-wrap         ; soft wrapping with language-aware indent
+
+       :emacs
+       dired             ; making dired pretty [functional]
+       electric          ; smarter, keyword-based electric-indent
+       ;;eww               ; the internet is gross
+       ;;ibuffer           ; interactive buffer management
+       undo              ; persistent, smarter undo for your inevitable mistakes
+       vc                ; version-control and Emacs, sitting in a tree
+
+       :term
+       ;;eshell            ; the elisp shell that works everywhere
+       ;;shell             ; simple shell REPL for Emacs
+       ;;term              ; basic terminal emulator for Emacs
+       ;;vterm             ; the best terminal emulation in Emacs
+
+       :checkers
+       syntax              ; tasing you for every semicolon you forget
+       (spell +flyspell) ; tasing you for misspelling mispelling
+       grammar           ; tasing grammar mistake every you make
+
+       :tools
+       ;;ansible
+       ;;biblio            ; Writes a PhD for you (citation needed)
+       ;;collab            ; buffers with friends
+       ;;debugger          ; FIXME stepping through code, to help you add bugs
+       ;;direnv
+       ;;docker
+       ;;editorconfig      ; let someone else argue about tabs vs spaces
+       ;;ein               ; tame Jupyter notebooks with emacs
+       (eval +overlay)     ; run code, run (also, repls)
+       lookup              ; navigate your code and its documentation
+       ;;llm               ; when I said you needed friends, I didn't mean...
+       lsp               ; M-x vscode
+       magit             ; a git porcelain for Emacs
+       ;;make              ; run make tasks from Emacs
+       ;;pass              ; password manager for nerds
+       pdf               ; pdf enhancements
+       ;;terraform         ; infrastructure as code
+       ;;tmux              ; an API for interacting with tmux
+       tree-sitter       ; syntax and parsing, sitting in a tree...
+       ;;upload            ; map local to remote projects via ssh/ftp
+
+       :os
+       (:if (featurep :system 'macos) macos)  ; improve compatibility with macOS
+       ;;tty               ; improve the terminal Emacs experience
+
+       :lang
+       ;;agda              ; types of types of types of types...
+       ;;beancount         ; mind the GAAP
+       (cc +lsp)         ; C > C++ == 1
+       ;;clojure           ; java with a lisp
+       ;;common-lisp       ; if you've seen one lisp, you've seen them all
+       ;;coq               ; proofs-as-programs
+       ;;crystal           ; ruby at the speed of c
+       ;;csharp            ; unity, .NET, and mono shenanigans
+       ;;data              ; config/data formats
+       ;;(dart +flutter)   ; paint ui and not much else
+       ;;dhall
+       ;;elixir            ; erlang done right
+       ;;elm               ; care for a cup of TEA?
+       emacs-lisp        ; drown in parentheses
+       ;;erlang            ; an elegant language for a more civilized age
+       ;;ess               ; emacs speaks statistics
+       ;;factor
+       ;;faust             ; dsp, but you get to keep your soul
+       ;;fortran           ; in FORTRAN, GOD is REAL (unless declared INTEGER)
+       ;;fsharp            ; ML stands for Microsoft's Language
+       ;;fstar             ; (dependent) types and (monadic) effects and Z3
+       ;;gdscript          ; the language you waited for
+       ;;(go +lsp)         ; the hipster dialect
+       ;;(graphql +lsp)    ; Give queries a REST
+       ;;(haskell +lsp)    ; a language that's lazier than I am
+       ;;hy                ; readability of scheme w/ speed of python
+       ;;idris             ; a language you can depend on
+       json              ; At least it ain't XML
+       ;;janet             ; Fun fact: Janet is me!
+       (java +lsp)         ; the poster child for carpal tunnel syndrome
+       (javascript +lsp +tree-sitter)    ; all(hope(abandon(ye(who(enter(here))))))
+       ;;julia             ; a better, faster MATLAB
+       ;;kotlin            ; a better, slicker Java(Script)
+       ;;latex             ; writing papers in Emacs has never been so fun
+       ;;lean              ; for folks with too much to prove
+       ;;ledger            ; be audit you can be
+       ;;lua               ; one-based indices? one-based indices
+       markdown          ; writing docs for people to ignore
+       ;;nim               ; python + lisp at the speed of c
+       nix               ; I hereby declare "nix geht mehr!"
+       ;;ocaml             ; an objective camel
+       org               ; organize your plain life in plain text
+       ;;php               ; perl's insecure younger brother
+       ;;plantuml          ; diagrams for confusing people more
+       ;;graphviz          ; diagrams for confusing yourself even more
+       ;;purescript        ; javascript, but functional
+       python            ; beautiful is better than ugly
+       ;;qt                ; the 'cutest' gui framework ever
+       ;;racket            ; a DSL for DSLs
+       ;;raku              ; the artist formerly known as perl6
+       ;;rest              ; Emacs as a REST client
+       rst               ; ReST in peace
+       ;;(ruby +rails)     ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
+       (rust +lsp)       ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
+       ;;scala             ; java, but good
+       ;;(scheme +guile)   ; a fully conniving family of lisps
+       sh                ; she sells {ba,z,fi}sh shells on the C xor
+       ;;sml
+       ;;solidity          ; do you need a blockchain? No.
+       ;;swift             ; who asked for emoji variables?
+       ;;terra             ; Earth and Moon in alignment for performance.
+       ;;web               ; the tubes
+       yaml              ; JSON, but readable
+       ;;zig               ; C, but simpler
+
+       :email
+       ;;(mu4e +org +gmail)
+       ;;notmuch
+       ;;(wanderlust +gmail)
+
+       :app
+       ;;calendar
+       ;;emms
+       ;;everywhere        ; *leave* Emacs!? You must be joking
+       ;;irc               ; how neckbeards socialize
+       ;;(rss +org)        ; emacs as an RSS reader
+
+       :config
+       ;;literate
+       (default +bindings +smartparens))

home-manager/progs/doom.d/packages.el

@@ -0,0 +1,52 @@
+;; -*- no-byte-compile: t; -*-
+;;; $DOOMDIR/packages.el
+
+;; To install a package with Doom you must declare them here and run 'doom sync'
+;; on the command line, then restart Emacs for the changes to take effect -- or
+
+
+;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror:
+;; (package! some-package)
+
+;; To install a package directly from a remote git repo, you must specify a
+;; `:recipe'. You'll find documentation on what `:recipe' accepts here:
+;; https://github.com/radian-software/straight.el#the-recipe-format
+;; (package! another-package
+;;   :recipe (:host github :repo "username/repo"))
+
+;; If the package you are trying to install does not contain a PACKAGENAME.el
+;; file, or is located in a subdirectory of the repo, you'll need to specify
+;; `:files' in the `:recipe':
+;; (package! this-package
+;;   :recipe (:host github :repo "username/repo"
+;;            :files ("some-file.el" "src/lisp/*.el")))
+
+;; If you'd like to disable a package included with Doom, you can do so here
+;; with the `:disable' property:
+;; (package! builtin-package :disable t)
+
+;; You can override the recipe of a built in package without having to specify
+;; all the properties for `:recipe'. These will inherit the rest of its recipe
+;; from Doom or MELPA/ELPA/Emacsmirror:
+;; (package! builtin-package :recipe (:nonrecursive t))
+;; (package! builtin-package-2 :recipe (:repo "myfork/package"))
+
+;; Specify a `:branch' to install a package from a particular branch or tag.
+;; This is required for some packages whose default branch isn't 'master' (which
+;; our package manager can't deal with; see radian-software/straight.el#279)
+;; (package! builtin-package :recipe (:branch "develop"))
+
+;; Use `:pin' to specify a particular commit to install.
+;; (package! builtin-package :pin "1a2b3c4d5e")
+
+
+;; Doom's packages are pinned to a specific commit and updated from release to
+;; release. The `unpin!' macro allows you to unpin single packages...
+;; (unpin! pinned-package)
+;; ...or multiple packages
+;; (unpin! pinned-package another-pinned-package)
+;; ...Or *all* packages (NOT RECOMMENDED; will likely break things)
+;; (unpin! t)
+
+
+(package! yuck-mode)

home-manager/progs/dunst.nix

@@ -4,6 +4,7 @@
     enable = true;
     package = pkgs.dunst;
 
+    # docs: https://dunst-project.org/documentation/
     settings = {
       global = {
         width = 300;
@@ -12,12 +13,16 @@
         origin = "top-right";
 
         # 0 is the most opaque, 100 is completely transparent
-        transparency = 40;
+        transparency = 60;
 
         # have consistancy between niri frame color and dunst
         frame_color = config.programs.niri.settings.layout.focus-ring.active.color;
 
+        background = "#404040";
+
         font = "JetBrains Mono Nerd Font 9";
+
+        corner_radius = 10;
       };
 
       urgency_normal = {

home-manager/progs/emacs.nix

@@ -0,0 +1,43 @@
+{
+  pkgs,
+  config,
+  inputs,
+  ...
+}:
+{
+  imports = [
+    inputs.nix-doom-emacs-unstraightened.homeModule
+    (
+      { ... }:
+      {
+        nixpkgs.overlays = [
+          inputs.nix-doom-emacs-unstraightened.overlays.default
+          inputs.emacs-overlay.overlays.default
+        ];
+      }
+    )
+
+  ];
+
+  programs.doom-emacs = {
+    enable = true;
+    doomDir = ./doom.d;
+    emacs = pkgs.emacs-unstable-pgtk;
+    extraPackages =
+      epkgs:
+      with epkgs;
+      [
+        dracula-theme
+        treesit-grammars.with-all-grammars
+      ]
+      ++ (with pkgs; [
+        shellcheck
+        shfmt
+
+        # for file search
+        fd
+
+        pandoc
+      ]);
+  };
+}

home-manager/progs/eww/config/dashboard.yuck

@@ -1,17 +0,0 @@
-(defwindow dashboard
-  :monitor 0
-  :stacking "bg"
-  :exclusive false
-  :geometry (geometry
-    :y "50%"
-    :x "50%"
-    :width "20%"
-    :height "20%"
-
-  )(dashboard))
-
-
-(defwidget dashboard []
-  (box
-  (label :text "hi"))
-)

home-manager/progs/eww/config/eww.yuck

@@ -1,2 +1 @@
 (include "./statusbar.yuck")
-(include "./dashboard.yuck")

home-manager/progs/eww/config/scripts/clipboardInfo.zsh

@@ -1,14 +0,0 @@
-#!/usr/bin/env zsh
-if wl-paste | iconv -f UTF8 > /dev/null; then
-	case $1 in
-		head)
-			wl-paste 2> /dev/null |
-				head -1 |
-				awk 'length > 20{$0 = substr($0, 1, 17) "..."} {printf "%s", $0}' |
-				sed 's/^[[:space:]]*//g'
-			echo "";;
-		all)
-			wl-paste 2> /dev/null
-			true;;
-	esac
-fi

home-manager/progs/eww/config/scripts/currentWindow.fish

@@ -1,10 +0,0 @@
-#!/usr/bin/env fish
-name=$(niri msg focused-window | rg Title | sed -E "s/[[:space:]]+Title\: //g" | sed "s/\"//g")
-proc_name=$(echo "$name" | head -c 55)
-
-# TODO! fix this logic, add a '...' at the end
-if ["$name" != "$proc_name"]
-    proc_name="$proc_name..."
-end
-
-echo "$proc_name"

home-manager/progs/eww/config/scripts/currentWindow.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+niri_data=$(niri msg --json focused-window)
+
+if [[ "$niri_data" == "null" ]]; then
+    exit 0
+fi
+
+name=$(echo "$niri_data" | jq -r '.["app_id"], .["title"]' | tr '\n' ' ' | sed 's/.$//')
+proc_name=$(echo "$name" | head -c 55)
+
+
+# TODO! fix this logic, add a '...' at the end
+if [[ "$name" != "$proc_name" ]]; then
+    proc_name="$proc_name..."
+fi
+
+echo "$proc_name"

home-manager/progs/eww/config/scripts/currentWorkspace.fish

@@ -1,3 +0,0 @@
-#!/usr/bin/env fish
-
-niri msg workspaces | rg "^ \*" | sed -E 's/[[:space:]]+\* //g'

home-manager/progs/eww/config/scripts/currentWorkspace.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env fish
+
+niri msg --json workspaces | jq -r '.[] | select(.is_focused == true) | .["id"]'

home-manager/progs/eww/config/scripts/power_bat.rs

@@ -0,0 +1,58 @@
+#!/usr/bin/env rust-script
+
+use std::{fmt, fs::read_to_string, str::FromStr};
+
+const BASE_PATH: &str = "/sys/class/power_supply/BAT1/";
+const CURRENT_NOW_PATH: &str = "current_now";
+const VOLTAGE_NOW_PATH: &str = "voltage_now";
+const STATUS_PATH: &str = "status";
+const FACTOR: f32 = 1e6_f32;
+
+#[derive(Debug)]
+enum Status {
+    Charging,
+    Discharging,
+    NotCharging,
+}
+
+impl FromStr for Status {
+    type Err = &'static str;
+
+    fn from_str(input: &str) -> Result<Status, Self::Err> {
+        match input {
+            "Charging" => Ok(Status::Charging),
+            "Discharging" => Ok(Status::Discharging),
+            "Not charging" => Ok(Status::NotCharging),
+            _ => Err("unknown state"),
+        }
+    }
+}
+
+impl fmt::Display for Status {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        fmt::Debug::fmt(self, f)
+    }
+}
+
+fn fetch_and_trim_into<T: FromStr<Err = impl fmt::Debug>>(path: &str) -> T {
+    let mut content = read_to_string(BASE_PATH.to_owned() + path).unwrap();
+    content.pop();
+    T::from_str(&content).unwrap()
+}
+
+fn fetch_bat_info(path: &str) -> f32 {
+    let value: f32 = fetch_and_trim_into(path);
+    value / FACTOR
+}
+
+fn main() {
+    let current_now: f32 = fetch_bat_info(CURRENT_NOW_PATH);
+    let voltage_now: f32 = fetch_bat_info(VOLTAGE_NOW_PATH);
+    let watts: f32 = current_now * voltage_now;
+    let status: Status = fetch_and_trim_into(STATUS_PATH);
+
+    println!(
+        "voltage: {:.4}\ncurrent: {:.4}\nwatts: {:.4}\nstatus: {}",
+        voltage_now, current_now, watts, status
+    );
+}

home-manager/progs/eww/config/scripts/sound/getSink.sh

@@ -1,2 +1,2 @@
 #!/usr/bin/env sh
-wpctl inspect @DEFAULT_SINK@ | rg "node.description" | cut -d' ' -f6-
+wpctl inspect @DEFAULT_SINK@ | grep -E "^  +\* node\.description" | cut -d' ' -f6- | tr -d '"'

home-manager/progs/eww/config/scripts/sound/getVolume.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 output=$(wpctl get-volume @DEFAULT_SINK@ | cut -d' ' -f2- | sed -E 's/\.//g' | sed 's/^0*//g')
-count=$(echo "$output" | cut -d' ' -f1)
+count=$(echo "$output" | awk -F, '{print $1+0}')
 muted=$(echo "$output" | cut -d'[' -f2 | cut -d ']' -f1)
 
 # if not muted, set to empty string
@@ -8,11 +8,6 @@ if [ "$muted" == "$count" ]; then
   muted=""
 fi
 
-# fix removal of zero padding if volume is zero
-if [ "$count" == "" ]; then
-  count="0"
-fi
-
 color="green"
 if ((count > 75)); then color="yellow"; fi
 if ((count > 90)); then color="peach"; fi

home-manager/progs/eww/config/statusbar.yuck

@@ -1,55 +1,54 @@
 (defwindow statusbar
-  :monitor 0
-  :stacking "fg"
-  :exclusive true
-  :geometry (geometry
-    :y "0.5%"
-    :width "100%"
-    :height "24px"
-  :anchor "top center")
-  (statusbar))
+    :monitor 0
+    :stacking "fg"
+    :exclusive true
+    :geometry (geometry
+               :y "0.5%"
+               :width "100%"
+               :height "24px"
+               :anchor "top center")
+    (statusbar))
 
 (defwidget statusbar []
   (centerbox
-    (box :space-evenly false :halign 'start' :class 'padded'
-      (window-title))
-    (time)
-    (box :space-evenly false :halign 'end' :class 'padded'
-      (brightness-ctl)
-      (brightness-ctl-opener)
-      ; (clipboard)
-      (volume)
-      (battery)
-      (bluetooth)
-      (wifi))))
+   (box :space-evenly false :halign 'start' :class 'padded'
+        (window-title))
+   (time)
+   (box :space-evenly false :halign 'end' :class 'padded'
+        (brightness-ctl)
+        (brightness-ctl-opener)
+        (volume)
+        (battery)
+        (bluetooth)
+        (wifi))))
 
 (defwidget cmd-slider [?symbol value command max color]
-  (box :space-evenly false
-    (label :text symbol :class "symbol")
-    (scale
-      :min 0 :max max
-      :value value
-      :round-digits 0
-      :timeout "200ms"
-    :onchange command)
-    (label :text "${value}%" :class color)))
+           (box :space-evenly false
+                (label :text symbol :class "symbol")
+                (scale
+                 :min 0 :max max
+                 :value value
+                 :round-digits 0
+                 :timeout "200ms"
+                 :onchange command)
+                (label :text "${value}%" :class color)))
 
-(defpoll windowtitle :interval "1s" `scripts/currentWindow.fish`)
+(defpoll windowtitle :interval "1s" `scripts/currentWindow.sh`)
 
 (defwidget window-title []
   (label
-  :text {windowtitle == "" ? "" : "(${windowtitle})"}))
+   :text {windowtitle == "" ? "" : "(${windowtitle})"}))
 
 (defwidget brightness-ctl []
   (box :visible brightnessctl-open
-    (cmd-slider :symbol "󰃠" :value brightness
-      :command `brightnessctl set {}%`
-      :max 101 :color {
-      brightness >= 80 ? "green" :
-      brightness >= 50 ? "yellow" :
-      brightness >= 30 ? "peach" :
-      brightness >= 10 ? "maroon" : "red"
-    })))
+       (cmd-slider :symbol "󰃠" :value brightness
+                   :command `brightnessctl set {}%`
+                   :max 101 :color {
+                   brightness >= 80 ? "green" :
+                   brightness >= 50 ? "yellow" :
+                   brightness >= 30 ? "peach" :
+                   brightness >= 10 ? "maroon" : "red"
+                   })))
 
 
 (defpoll brightness :interval "1s" :run-while brightnessctl-open `brightnessctl -m | awk -F, '{print $4+0}'`)
@@ -62,11 +61,6 @@
       :onclick `${EWW_CMD} update brightnessctl-open=${!brightnessctl-open}`
     "󰃠")))
 
-(defwidget clipboard []
-  (label :text clipboard-short :tooltip clipboard :class "clipboard"))
-(defpoll clipboard :interval "5s" `scripts/clipboardInfo.zsh all`)
-(defpoll clipboard-short :interval "5s" `scripts/clipboardInfo.zsh head`)
-
 (defwidget wifi []
   (eventbox
     :class "button ${wifi-strength.colour}"
@@ -84,7 +78,8 @@
     (label
     :text "${bluetooth-name} 󰂯")))
 
-(defpoll bluetooth-name :interval "10s" `bluetoothctl devices Connected | awk '{print $3}'`)
+; `FNR == 1 + head -c 30` so the name doesn't explode the screen
+(defpoll bluetooth-name :interval "10s" `bluetoothctl devices Connected | awk '$1 == "Device" {print $0}' | cut -d' ' -f3-`)
 
 (defwidget time []
   (box
@@ -97,8 +92,7 @@
 
 (defpoll time :interval "1s" `date +'{"long":"%a %b %e %H:%M:%S %Z %Y","hour":"%H","minute":"%M"}'`)
 
-; TODO: make this a package or something, not using rust-script
-(defpoll powerstats :interval "2s" `~/Documents/power_bat.rs`)
+(defpoll powerstats :interval "2s" `power_bat`)
 
 (defwidget battery []
   (box :space-evenly false
@@ -133,5 +127,4 @@
   (label :text "${volumevalue.count}" :class {volumevalue.color})))
 
 
-(defpoll currentworkspace :interval "1s" `scripts/currentWorkspace.fish`)
-
+(defpoll currentworkspace :interval "1s" `scripts/currentWorkspace.sh`)

home-manager/progs/eww/eww.nix

@@ -1,13 +1,40 @@
-{ pkgs, ... }:
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
 {
   home.packages = with pkgs; [
     zsh
     bluez
     brightnessctl
+    (callPackage ./power_bat.nix { })
   ];
 
   programs.eww = {
     enable = true;
     configDir = ./config;
   };
+
+  programs.niri.settings.spawn-at-startup = [
+    {
+      command = [
+        (lib.getExe config.programs.eww.package)
+        "-c"
+        "${config.programs.eww.configDir}"
+        "open"
+        "statusbar"
+      ];
+    }
+
+    # swaybg works on more than just sway (sets a wallpaper)
+    {
+      command = [
+        (lib.getExe pkgs.swaybg)
+        "-i"
+        "${../wallpaper.png}"
+      ];
+    }
+  ];
 }

home-manager/progs/eww/power_bat.nix

@@ -0,0 +1,4 @@
+{ pkgs, lib, ... }:
+pkgs.writeShellScriptBin "power_bat" ''
+  exec ${lib.getExe pkgs.rust-script} ${./config/scripts/power_bat.rs} "$@"
+''

home-manager/progs/fish.nix

@@ -44,13 +44,12 @@ in
       pbpaste = "${pkgs.wl-clipboard}/bin/wl-paste";
 
       gcc-native = "${lib.getExe pkgs.gcc} -Q --help=target -mtune=native -march=native | ${lib.getExe pkgs.gnugrep} -E '^\\s+\-(mtune|march)=' | ${coreutils}/tr -d '[:blank:]'";
-
-      run-steam = "gamescope --backend sdl -W 2256 -H 1504 -f --steam -- steam -tenfoot -pipewire-dmabuf";
     };
 
     shellInit = ''
       fish_add_path ~/.local/bin
       fish_add_path ~/.cargo/bin
+      fish_add_path ~/.config/emacs/bin
       set hydro_color_pwd 62A
       set hydro_color_error red
       set hydro_color_duration yellow

home-manager/progs/flatpak.nix

@@ -0,0 +1,23 @@
+{
+  config,
+  lib,
+  pkgs,
+  inputs,
+  ...
+}:
+{
+  imports = [
+    inputs.nix-flatpak.homeManagerModules.nix-flatpak
+  ];
+
+  home.packages = with pkgs; [
+    flatpak
+  ];
+
+  services.flatpak = {
+    enable = true;
+    packages = [
+      "com.tdameritrade.ThinkOrSwim"
+    ];
+  };
+}

home-manager/progs/framework-13-easyeffects.nix

@@ -0,0 +1,125 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
+{
+
+  # https://community.frame.work/t/speakers-sound-quality/1078/83
+  # Filter: ON HPQ  Fc 100.0   Hz   Gain  0.0   dB  Q 1.0
+  # Filter: ON PK   Fc 150.0   Hz   Gain  4.02  dB  Q 3.0
+  # Filter: ON PK   Fc 600.0   Hz   Gain -5.07  dB  Q 4.000000000000008
+  # Filter: ON PK   Fc 1200.0  Hz   Gain -3.49  dB  Q 4.17
+  # Filter: ON PK   Fc 2000.0  Hz   Gain  1.43  dB  Q 4.0
+  # Filter: ON PK   Fc 5300.0  Hz   Gain  3.84  dB  Q 2.64
+  # Filter: ON HSC  Fc 6000.0  Hz   Gain  4.02  dB  Q 4.36
+  # Filter: ON PK   Fc 7500.0  Hz   Gain -2.09  dB  Q 3.0
+  # Filter: ON PK   Fc 8000.0  Hz   Gain  2.01  dB  Q 4.36
+  # Filter: ON PK   Fc 900.0   Hz   Gain -4.12  dB  Q 5.909999999999967
+  home.file.".config/easyeffects/output/${config.services.easyeffects.preset}.json".text =
+    let
+      baseBand = {
+        mode = "RLC (BT)";
+        mute = false;
+        solo = false;
+        slope = "1x";
+        type = "Bell";
+      };
+
+      bandList = [
+        {
+          frequency = 100.0;
+          gain = 0.0;
+          q = 1.0;
+          slope = "x4";
+          type = "Hi-pass";
+        }
+        {
+          frequency = 150.0;
+          gain = 4.02;
+          q = 3.0;
+        }
+        {
+          frequency = 600.0;
+          gain = -5.07;
+          q = 4.000000000000008;
+        }
+        {
+          frequency = 1200.0;
+          gain = -3.49;
+          q = 4.17;
+        }
+        {
+          frequency = 2000.0;
+          gain = 1.43;
+          q = 4.0;
+        }
+        {
+          frequency = 5300.0;
+          gain = 3.84;
+          q = 2.64;
+        }
+        {
+          frequency = 6000.0;
+          gain = 4.02;
+          q = 4.36;
+          type = "Hi-shelf";
+        }
+        {
+          frequency = 7500.0;
+          gain = -2.09;
+          q = 3.0;
+        }
+        {
+          frequency = 8000.0;
+          gain = 2.01;
+          q = 4.36;
+        }
+        {
+          frequency = 900.0;
+          gain = -4.12;
+          q = 5.909999999999967;
+        }
+      ];
+
+      bands = builtins.listToAttrs (
+        map (f: {
+          name = "band${toString f.snd}";
+          value = baseBand // f.fst;
+        }) (lib.lists.zipLists bandList (lib.range 0 (lib.length (bandList))))
+      );
+
+    in
+    builtins.toJSON {
+      output = {
+        blocklist = [ ];
+        equalizer = {
+          balance = 0.0;
+          bypass = false;
+          input-gain = 0.0;
+          left = bands;
+          right = bands;
+          mode = "IIR";
+          num-bands = 10;
+          output-gain = -1.5;
+          pitch-left = 0.0;
+          pitch-right = 0.0;
+          split-channels = false;
+        };
+        plugins_order = [
+          "equalizer"
+        ];
+      };
+    };
+
+  services.easyeffects = {
+    enable = true;
+    package = pkgs.easyeffects;
+    preset = "framework";
+  };
+
+  # easyeffects has issues stopping quickly, causing hands on logout/poweroff
+  # It's safe to just kill easyeffects instantly
+  systemd.user.services.easyeffects.Service.TimeoutStopSec = 0;
+}

home-manager/progs/ghostty.nix

@@ -0,0 +1,16 @@
+{ pkgs, ... }:
+{
+  # https://mynixos.com/home-manager/option/programs.ghostty
+  programs.ghostty = {
+    enable = true;
+    enableFishIntegration = true;
+    settings = {
+      theme = "Adventure";
+      background-opacity = 0.7;
+    };
+  };
+
+  home.sessionVariables = {
+    TERMINAL = "ghostty";
+  };
+}

home-manager/progs/gpt4all/disable-settings-err.patch

@@ -1,19 +0,0 @@
-diff --git a/main.qml b/main.qml
-index 1e685385..7c747eba 100644
---- a/main.qml
-+++ b/main.qml
-@@ -72,12 +72,14 @@ Window {
-             return;
-         }
- 
-+        /*
-         // check if we have access to settings and if not show an error
-         if (!hasShownSettingsAccess && !LLM.hasSettingsAccess()) {
-             errorSettingsAccess.open();
-             hasShownSettingsAccess = true;
-             return;
-         }
-+        */
- 
-         // check for first time start of this version
-         if (!hasCheckedFirstStart) {

home-manager/progs/gpt4all/disable-version-check.patch

@@ -1,17 +0,0 @@
-diff --git a/gpt4all-chat/main.qml b/gpt4all-chat/main.qml
-index 1e685385..31cf7efd 100644
---- a/main.qml
-+++ b/main.qml
-@@ -95,10 +95,12 @@ Window {
-         }
- 
-         // check for new version
-+        /*
-         if (Download.hasNewerRelease && !firstStartDialog.opened) {
-             newVersionDialog.open();
-             return;
-         }
-+        */
-     }
- 
-     PopupDialog {

home-manager/progs/gpt4all/gpt4all.nix

@@ -1,112 +0,0 @@
-{
-  pkgs,
-  lib,
-  optimizeWithFlags,
-  ...
-}:
-let
-  models = [
-    rec {
-      name = "DeepSeek-R1-Distill-Qwen-14B-IQ4_XS";
-      filename = src.name;
-      context_length = 131072;
-      gen_length = 32768;
-      src = pkgs.fetchurl {
-        url = "https://huggingface.co/bartowski/DeepSeek-R1-Distill-Qwen-14B-GGUF/resolve/main/DeepSeek-R1-Distill-Qwen-14B-IQ4_XS.gguf";
-        sha256 = "031b190e7aa81770b5d069de181dcfe4b284bf5d75fa12f82f5e54a3178adcfd";
-      };
-    }
-
-    rec {
-      name = "DeepScaleR-1.5B-Preview-Q8_0.gguf";
-      filename = src.name;
-      context_length = 131072;
-      gen_length = 32768;
-      src = pkgs.fetchurl {
-        url = "https://huggingface.co/bartowski/agentica-org_DeepScaleR-1.5B-Preview-GGUF/resolve/main/agentica-org_DeepScaleR-1.5B-Preview-Q8_0.gguf";
-        sha256 = "932ecb3ae043335c78dab621f032d32eb1868c80a27b4fe5f39c7850902de940";
-      };
-    }
-  ];
-
-  gpt4all_package = (
-    optimizeWithFlags
-      (pkgs.gpt4all.overrideAttrs (old: {
-        patches = old.patches ++ [
-          ./disable-settings-err.patch
-          ./disable-version-check.patch
-        ];
-      }))
-      # compile flags
-      [
-        "-O3"
-        "-march=native"
-        "-mtune=native"
-      ]
-  );
-
-  system_prompt = "You are a helpful and harmless assistant. You should think step-by-step. Explore multiple trains of thought and methods (to completion) in order to derive the correct answer.";
-  chat_name_prompt = "Make a 3 word headline for this conversation";
-in
-{
-  home.packages = [
-    gpt4all_package
-  ];
-
-  home.file =
-    lib.recursiveUpdate
-      {
-        ".config/nomic.ai/GPT4All.ini".text =
-          ''
-            [General]
-            chatTheme=Dark
-            suggestionMode=Off
-            threadCount=8
-            userDefaultModel=${
-              # select the first element of `models` to be the default model
-              (builtins.elemAt models 0).name
-            }
-
-            [download]
-            lastVersionStarted=${gpt4all_package.version}
-          ''
-          + (lib.concatMapStringsSep "\n" (model: ''
-            [model-${model.name}]
-            contextLength=${builtins.toString model.context_length}
-            filename=${model.filename}
-            maxLength=${builtins.toString model.gen_length}
-            promptBatchSize=256
-            chatNamePrompt=${chat_name_prompt}
-            systemMessage="${
-              # replace newlines with the string literal "\n" for gpt4all to properly parse
-              builtins.replaceStrings [ "\n" ] [ "\\n" ] system_prompt
-            }"
-          '') models)
-          + ''
-
-            [network]
-            isActive=false
-            usageStatsActive=false
-
-            [localdocs]
-            fileExtensions=${
-              lib.concatStringsSep ", " [
-                "docx"
-                "pdf"
-                "txt"
-                "md"
-                "rst"
-                "rs"
-              ]
-            }
-          '';
-      }
-      (
-        builtins.listToAttrs (
-          map (f: {
-            name = ".local/share/nomic.ai/GPT4All/${f.filename}";
-            value.source = f.src;
-          }) models
-        )
-      );
-}

home-manager/progs/helix.nix

@@ -1,5 +1,8 @@
 { pkgs, ... }:
 {
+  # set helix as default editor
+  home.sessionVariables.EDITOR = "hx";
+
   programs.helix = {
     enable = true;
     package = pkgs.helix;

home-manager/progs/niri.nix

@@ -2,11 +2,28 @@
   config,
   pkgs,
   lib,
+  inputs,
+  niri-package,
   ...
 }:
+let
+  invert_image_avg = pkgs.callPackage ../util/inverse_color.nix;
+in
 {
+  imports = [
+    inputs.niri.homeModules.config
+    (
+      { ... }:
+      {
+        nixpkgs.overlays = [
+          inputs.niri.overlays.niri
+        ];
+      }
+    )
+  ];
+
   programs.niri = {
-    package = pkgs.niri-stable;
+    package = niri-package;
     settings = {
       prefer-no-csd = true;
 
@@ -16,19 +33,13 @@
         };
       };
 
-      environment = {
-        DISPLAY = ":0";
+      clipboard = {
+        disable-primary = true;
       };
 
       # skip the hotkey menu thingy
       hotkey-overlay.skip-at-startup = true;
 
-      outputs = {
-        "BOE 0x095F Unknown" = {
-          scale = 1.5;
-        };
-      };
-
       layout = {
         gaps = 16;
         struts = {
@@ -40,39 +51,14 @@
         focus-ring = {
           enable = true;
           active = {
-            color = "#bf7778";
+            color = builtins.readFile (invert_image_avg {
+              src = ../wallpaper.png;
+            });
           };
         };
       };
 
-      spawn-at-startup = [
-        {
-          command = [
-            "${lib.getExe config.programs.eww.package}"
-            "-c"
-            "${config.programs.eww.configDir}"
-            "open"
-            "statusbar"
-          ];
-        }
-
-        # swaybg works on more than just sway (sets a wallpaper)
-        {
-          command = [
-            "${lib.getExe pkgs.swaybg}"
-            "-i"
-            "${../wallpaper.png}"
-          ];
-        }
-
-        # Xwayland on niri via xwayland-satellite
-        {
-          command = [
-            "${lib.getExe pkgs.xwayland-satellite}"
-            config.programs.niri.settings.environment.DISPLAY
-          ];
-        }
-      ];
+      xwayland-satellite.path = lib.getExe pkgs.xwayland-satellite;
 
       window-rules = [
         { draw-border-with-background = false; }
@@ -89,29 +75,58 @@
             };
         }
         { clip-to-geometry = true; }
+        {
+          matches = [
+            {
+              app-id = "^zen";
+              title = "^Picture-in-Picture$";
+            }
+            {
+              app-id = "Mullvad VPN";
+            }
+          ];
+
+          open-floating = true;
+          default-column-width = {
+            fixed = 480;
+          };
+          default-window-height = {
+            fixed = 270;
+          };
+        }
       ];
 
+      # XF86AudioMedia      allow-when-locked=true { spawn "playerctl" "play-pause"; }
+      # XF86AudioPlay        allow-when-locked=true { spawn "playerctl" "play-pause"; }
+      # XF86AudioPrev        allow-when-locked=true { spawn "playerctl" "previous"; }
+      # XF86AudioNext        allow-when-locked=true { spawn "playerctl" "next"; }
+
       # https://github.com/sodiboo/niri-flake/issues/591
       switch-events = with config.lib.niri.actions; {
-        "lid-close".action = spawn "${pkgs.swaylock}/bin/swaylock";
+        "lid-close".action = spawn (lib.getExe pkgs.swaylock);
       };
 
       binds = with config.lib.niri.actions; {
         # Application launcher
-        "Mod+Space".action = spawn [
-          "${pkgs.fuzzel}/bin/fuzzel"
-        ];
+        "Mod+Space".action = spawn (lib.getExe pkgs.fuzzel);
+
+        # TODO! make this work
+        "Mod+E".action = spawn "${config.programs.doom-emacs.finalDoomPackage}/bin/doom-emacs";
+
+        "Mod+O".action = toggle-overview;
 
         # open a terminal
-        "Mod+T".action = spawn "${pkgs.alacritty}/bin/alacritty";
+        "Mod+T".action = spawn config.home.sessionVariables.TERMINAL;
 
         # lock the screen
-        "Mod+X".action = spawn "${pkgs.swaylock}/bin/swaylock";
+        "Mod+X".action = spawn (lib.getExe pkgs.swaylock);
 
         # screenshotting
-        "Print".action = screenshot;
-        "Ctrl+Print".action = screenshot-screen;
-        "Alt+Print".action = screenshot-window;
+        "Print".action.screenshot = [ ];
+
+        # https://github.com/sodiboo/niri-flake/commit/a7949bd0f5551fdfffd04cb9735ad3cd3167d624#r153571513
+        # "Ctrl+Print".action = screenshot-screen;
+        "Alt+Print".action.screenshot-window = [ ];
 
         # Volume control
         "XF86AudioRaiseVolume".action = spawn [
@@ -144,7 +159,7 @@
 
         # color picker and copies to clipboard
         "Mod+Ctrl+Alt+C".action = spawn [
-          "${pkgs.hyprpicker}/bin/hyprpicker"
+          (lib.getExe pkgs.hyprpicker)
           "-za"
         ];
 

home-manager/progs/noctalia.nix

@@ -0,0 +1,92 @@
+{
+  pkgs,
+  inputs,
+  config,
+  lib,
+  ...
+}:
+{
+  imports = [
+    inputs.noctalia.homeModules.default
+  ];
+
+  programs.noctalia-shell = {
+    enable = true;
+    settings = {
+      bar = {
+        position = "top";
+        floating = true;
+        backgroundOpacity = 0.93;
+      };
+      general = {
+        animationSpeed = 1.5;
+        radiusRatio = 1.2;
+      };
+      colorSchemes = {
+        darkMode = true;
+        useWallpaperColors = true;
+      };
+      location = {
+        weatherEnabled = false;
+      };
+      wallpaper = {
+        enabled = true;
+      };
+    };
+  };
+
+  home.file.".cache/noctalia/wallpapers.json" = {
+    text = builtins.toJSON {
+      defaultWallpaper = "${../wallpaper.png}";
+      wallpapers = { };
+    };
+  };
+
+  programs.niri.settings = {
+    spawn-at-startup = [
+      {
+        command = [
+          "noctalia-shell"
+        ];
+      }
+    ]; # place noctalia overview wallpaper on the backdrop layer
+    layer-rules = [
+      {
+        matches = [
+          { namespace = "^noctalia-overview*"; }
+        ];
+        place-within-backdrop = true;
+      }
+    ];
+
+    # allow notification actions and window activation from noctalia
+    debug = {
+      honor-xdg-activation-with-invalid-serial = [ ];
+    };
+
+    binds =
+      with config.lib.niri.actions;
+      let
+        noctalia =
+          cmd:
+          [
+            "noctalia-shell"
+            "ipc"
+            "call"
+          ]
+          ++ (lib.splitString " " cmd);
+
+      in
+      {
+
+        # noctalia shell keybinds
+        "Mod+D".action = spawn (noctalia "launcher toggle");
+        "Mod+A".action = spawn (noctalia "controlCenter toggle");
+        "Mod+Escape".action = spawn (noctalia "sessionMenu toggle");
+        "Mod+Shift+X".action = spawn (noctalia "lockScreen lock");
+        "Mod+N".action = spawn (noctalia "notifications toggleHistory");
+
+      };
+  };
+
+}

home-manager/progs/opencode.nix

@@ -0,0 +1,206 @@
+{
+  config,
+  lib,
+  pkgs,
+  inputs,
+  ...
+}:
+let
+  # what model should be used in place of haiku?
+  haiku-model = "zai-coding-plan/glm-5";
+
+  opus-model = "zai-coding-plan/glm-5";
+
+  ohMyOpencodeConfig = {
+    "$schema" =
+      "https://raw.githubusercontent.com/code-yeongyu/oh-my-opencode/master/assets/oh-my-opencode.schema.json";
+    agents = {
+      sisyphus.model = opus-model;
+      sisyphus-junior.model = opus-model;
+      oracle = opus-model;
+      librarian.model = haiku-model;
+      explore.model = haiku-model;
+      multimodal-looker.model = "openrouter/qwen/qwen3-vl-30b-a3b-thinking";
+
+      prometheus.model = opus-model;
+      metis.model = opus-model;
+      momus = opus-model;
+      atlas.model = opus-model;
+    };
+    categories = {
+      visual-engineering.model = "openrouter/google/gemini-3-pro";
+      ultrabrain = opus-model;
+      artistry = {
+        model = "openrouter/google/gemini-3-pro";
+        variant = "max";
+      };
+      quick.model = haiku-model;
+      deep.model = opus-model;
+      writing.model = "openrouter/google/gemini-3-flash-preview";
+    };
+  };
+in
+{
+  home.packages =
+    let
+      ohMyOpencode =
+        let
+          orig = inputs.oh-my-opencode.packages.${pkgs.stdenv.hostPlatform.system};
+          fixed-node_modules = orig.node_modules.overrideAttrs (_: {
+            outputHash = "sha256-qq/eEoxFELVdt4qaJkrw8XNZ/Ph/RJdsyIp7LteQE5A=";
+          });
+        in
+        orig.oh-my-opencode.overrideAttrs (_: {
+          buildPhase = ''
+            cp -r ${fixed-node_modules}/node_modules .
+            chmod -R u+w node_modules
+            patchShebangs node_modules/
+            export HOME=$(mktemp -d)
+            bun run build
+          '';
+        });
+    in
+    [
+      ohMyOpencode
+      pkgs.playwright-driver.browsers
+    ];
+
+  home.sessionVariables = {
+    PLAYWRIGHT_BROWSERS_PATH = "${pkgs.playwright-driver.browsers}";
+    PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = "1";
+  };
+
+  xdg.configFile."opencode/oh-my-opencode.json".text = builtins.toJSON ohMyOpencodeConfig;
+
+  xdg.configFile."opencode/skills/playwright.md".text =
+    let
+      browsers = pkgs.playwright-driver.browsers;
+      chromiumDir = builtins.head (
+        builtins.filter (n: builtins.match "chromium-[0-9]+" n != null) (
+          builtins.attrNames browsers.passthru.entries
+        )
+      );
+      chromiumPath = "${browsers}/${chromiumDir}/chrome-linux64/chrome";
+    in
+    ''
+      ---
+      name: playwright
+      description: "MUST USE for any browser-related tasks. Browser automation via Playwright MCP - verification, browsing, information gathering, web scraping, testing, screenshots, and all browser interactions."
+      mcp:
+        playwright:
+          command: npx
+          args:
+            - "@playwright/mcp@latest"
+            - "--executable-path"
+            - "${chromiumPath}"
+            - "--user-data-dir"
+            - "${config.home.homeDirectory}/.cache/playwright-mcp"
+      ---
+
+      # Playwright Browser Automation
+
+      This skill provides browser automation capabilities via the Playwright MCP server.
+    '';
+
+  programs.opencode = {
+    package = inputs.llm-agents.packages.${pkgs.stdenv.targetPlatform.system}.opencode;
+    enable = true;
+    rules = ''
+      You are an intelligent and observant agent.
+      If instructed to commit, disable gpg signing.
+      You are on nixOS, if you don't have access to a tool, you can access it via the `nix-shell` command.
+
+      ## Think deeply about everything.
+      When given a problem, break it down, abstract it out, understand the fundamentals, then solve it in the real world.
+
+      ## Misc
+      For long-running commands, make sure you set the timeout of the Bash tool provided to a larger value.
+      Do NOT read secret files. Do not directly read files that are api keys or are contextually sensitive.
+      Do NOT run `skill_mcp [mcp_name=playwright, tool_name=browser_install]` as browsers are provided by NixOS via PLAYWRIGHT_BROWSERS_PATH.
+
+      ## Behavior
+      Do not be sycophantic in your responses.
+      Do not use emojis unless explicitly asked to. This includes in code.
+      Use Test Driven Development methodology.
+
+      ## Nix
+      For using `nix build` append `-L` to get better visibility into the logs.
+      If you get an error that a file can't be found, always try to `git add` the file before trying other troubleshooting steps.
+
+
+      ## Android UI Interaction Workflow Summary
+      1. Taking Screenshots
+      adb exec-out screencap -p > /tmp/screen.png
+      Captures the current screen state as a PNG image.
+
+      2. Analyzing Screenshots
+      I delegate screenshot analysis to an explore agent rather than analyzing images directly:
+      mcp_task(subagent_type="explore", prompt="Analyze /tmp/screen.png. What screen is this? What elements are visible?")
+      The agent describes the UI, identifies elements, and estimates Y coordinates.
+
+      3. Getting Precise Element Coordinates
+      UI Automator dump - extracts the full UI hierarchy as XML:
+      adb shell uiautomator dump /sdcard/ui.xml && adb pull /sdcard/ui.xml /tmp/ui.xml
+      Then grep for specific elements:
+      # Find by text
+      grep -oP 'text="Login".*?bounds="[^"]*"' /tmp/ui.xml
+      # Find by class
+      grep -oP 'class="android.widget.EditText".*?bounds="[^"]*"' /tmp/ui.xml
+      Bounds format: [left,top][right,bottom] → tap center: ((left+right)/2, (top+bottom)/2)
+
+      4. Tapping Elements
+      adb shell input tap X Y
+      Where X, Y are pixel coordinates from the bounds.
+
+      5. Text Input
+      adb shell input text "some_text"
+      Note: Special characters need escaping (\!, \;, etc.)
+
+      6. Other Gestures
+      # Swipe/scroll
+      adb shell input swipe startX startY endX endY duration_ms
+      # Key events
+      adb shell input keyevent KEYCODE_BACK
+      adb shell input keyevent KEYCODE_ENTER
+
+      7. WebView Limitation
+      - UI Automator can see WebView content if accessibility is enabled
+      - Touch events on iframe content (like Cloudflare Turnstile) often fail due to cross-origin isolation
+      - Form fields in WebViews work if you get exact bounds from the UI dump
+
+      Typical Flow
+      1. Take screenshot → analyze with explore agent (get rough layout)
+      2. Dump UI hierarchy → grep for exact element bounds
+         - NEVER ASSUME COORDINATES. You must ALWAYS check first.
+         - Do this before ANY tap action as elements on the screen may of changed.
+      3. Calculate center coordinates from bounds
+      4. Tap/interact
+      5. Wait → screenshot → verify result
+    '';
+    settings = {
+      theme = "opencode";
+
+      model = opus-model;
+      # small model used for titles
+      small_model = "openrouter/openai/gpt-oss-20b:free";
+
+      autoshare = false;
+      # note: this updates opencode (and plugins like oh-my-opencode) at launch,
+      # bypassing the version pinned in flake.lock
+      autoupdate = true;
+      agent = { };
+      plugin = [ "oh-my-opencode" ];
+      provider = {
+        openrouter = {
+          models = {
+            "openai/gpt-oss-20b:free" = { };
+          };
+          options = {
+            # TODO! use agenix here instead
+            apiKey = "{file:${../secrets/openrouter_api_key}}";
+          };
+        };
+      };
+    };
+  };
+}

home-manager/progs/rss.nix

@@ -1,81 +0,0 @@
-[
-  {
-    title = "Stratechery";
-    url = "https://stratechery.passport.online/feed/rss/2gi1tPZ8Ta36Tsx7rDLM5P";
-  }
-
-  {
-    title = "Factorio Blog";
-    url = "https://www.factorio.com/blog/rss";
-  }
-
-  {
-    title = "Servo Blog";
-    url = "https://servo.org/blog/feed.xml";
-  }
-
-  {
-    title = "Alyssa Rosenzweig";
-    url = "https://rosenzweig.io/feed.xml";
-  }
-
-  {
-    title = "Marc's Blog";
-    url = "https://brooker.co.za/blog/rss.xml";
-  }
-
-  {
-    title = "Fabien Sanglard";
-    url = "https://fabiensanglard.net/rss.xml";
-  }
-
-  {
-    title = "Xuanwo's Blog";
-    url = "https://xuanwo.io/index.xml";
-  }
-
-  {
-    title = "Carlos Galdino";
-    url = "https://blog.carlosgaldino.com/atom.xml";
-  }
-
-  {
-    title = "soatok";
-    url = "https://soatok.blog/feed/";
-  }
-
-  {
-    title = "Jack Garbus";
-    url = "https://jarbus.net/index.xml";
-  }
-
-  {
-    title = "GioCities";
-    url = "https://blog.giovanh.com/feeds/atom.xml";
-  }
-
-  {
-    title = "mcyoung";
-    url = "https://mcyoung.xyz/atom.xml";
-  }
-
-  {
-    title = "Chips and Cheese";
-    url = "https://chipsandcheese.com/feed/";
-  }
-
-  {
-    title = "System5";
-    url = "https://blogsystem5.substack.com/feed";
-  }
-
-  {
-    title = "lwn";
-    url = "https://lwn.net/headlines/Features";
-  }
-
-  {
-    title = "Jellyfin Blog";
-    url = "https://jellyfin.org/posts/rss.xml";
-  }
-]

home-manager/secrets/borg-laptop-password.age

@@ -1,10 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 JlUYaQ 0zR1i7aaaTiNatQ64adSfLAes3mxyErq3kZUziRInVc
-A8sfonsw2iodHRFsmYbmMNAviEUFSy9mkXuq6jefki8
--> ssh-ed25519 dHDJgQ CmnVM06YvF+mzPNF1LsHdyL1hk+d/yH3HTBcdRlX/2c
-79u1EAd+g/Cmb9TzAifO4VHqJZk5T88nP4DWfsJEuIw
--> >=ei241-grease co`|!7_c lx{qy
-A6d8YS1s8NZojKmRVWhmJDzOOFT/AEO/IRZN0LI30QP3jImoTJ4EFDQUm4p+0IWk
-dam3RKxF7XzF6dNigGDKKeIVXcSX1SiEgHyIo0+hPm2nZbM/p1IJ6fsACbTB6Q
---- /Za+90oVP7/fGDLBRr6s56UopJjz8f851js/htBcYWA
-6e0Y¼ìT0|`Hö”à>`æbª.å	XãG«<47>Xs1ãn.µï$×o

home-manager/secrets/secrets.nix

@@ -1,16 +0,0 @@
-let
-  laptop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO4jL6gYOunUlUtPvGdML0cpbKSsPNqQ1jit4E7U1RyH";
-  desktop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBJjT5QZ3zRDb+V6Em20EYpSEgPW5e/U+06uQGJdraxi";
-in
-(builtins.listToAttrs (
-  map
-    (f: {
-      f.publicKeys = [
-        laptop
-        desktop
-      ];
-    })
-    [
-      "borg-laptop-password.age"
-    ]
-))

home-manager/system-mreow.nix

@@ -1,59 +0,0 @@
-{
-  config,
-  pkgs,
-  homeDirectory,
-  ...
-}:
-{
-  imports = [
-    ./gui.nix
-
-    # niri wayland compositor
-    ./progs/niri.nix
-
-    # statusbar
-    ./progs/eww/eww.nix
-
-    # lockscreen
-    ./progs/swaylock.nix
-
-    # notification daemon
-    ./progs/dunst.nix
-  ];
-
-  home.packages = with pkgs; [
-    wdisplays
-    intel-gpu-tools
-
-    blueman
-
-    # used by /etc/nixos logic to launch niri
-    config.programs.niri.package
-  ];
-
-  # media controls
-  systemd.user.services.mpris-proxy = {
-    Unit.Description = "Mpris proxy";
-    Install.After = [
-      "network.target"
-      "sound.target"
-    ];
-    Install.WantedBy = [ "default.target" ];
-    Service.ExecStart = "${pkgs.bluez}/bin/mpris-proxy";
-  };
-
-  age.secrets.borg-laptop-password = {
-    file = ./secrets/borg-laptop-password.age;
-    path = "${homeDirectory}/.secrets/borg_bak_pass";
-  };
-
-  # backup utility
-  programs.borgmatic = {
-    enable = true;
-    package = pkgs.borgmatic;
-    backups = import ./progs/borg.nix {
-      borgPasswordFile = config.age.secrets.borg-laptop-password.path;
-      inherit homeDirectory;
-    };
-  };
-}

home-manager/system-yarn.nix

@@ -1,50 +0,0 @@
-{
-  pkgs,
-  inputs,
-  lib,
-  config,
-  ...
-}:
-{
-  imports = [ ./gui.nix ];
-
-  home.packages = with pkgs; [
-    protontricks
-    # beatsabermodmanager
-  ];
-
-  programs.alacritty.settings = {
-    window.decorations = lib.mkForce "full";
-    window.opacity = lib.mkForce 1.0;
-  };
-
-  programs.obs-studio = {
-    enable = true;
-    plugins = with pkgs.obs-studio-plugins; [
-      wlrobs
-      obs-backgroundremoval
-      obs-pipewire-audio-capture
-    ];
-  };
-
-  # https://wiki.nixos.org/wiki/VR
-  xdg.configFile."openvr/openvrpaths.vrpath".text = ''
-    {
-      "config" :
-      [
-        "${config.xdg.dataHome}/Steam/config"
-      ],
-      "external_drivers" : null,
-      "jsonid" : "vrpathreg",
-      "log" :
-      [
-        "${config.xdg.dataHome}/Steam/logs"
-      ],
-      "runtime" :
-      [
-        "${pkgs.opencomposite}/lib/opencomposite"
-      ],
-      "version" : 1
-    }
-  '';
-}

home-manager/util/inverse_color.nix

@@ -0,0 +1,26 @@
+{
+  stdenv,
+  imagemagick,
+  gawk,
+  src,
+}:
+stdenv.mkDerivation {
+  pname = "invert-image-avg";
+  version = "1.0";
+
+  inherit src;
+
+  buildInputs = [
+    imagemagick
+    gawk
+  ];
+
+  # input is a file, not a directory, skip unpackPhase
+  unpackPhase = "true";
+
+  # command taken from: https://old.reddit.com/r/swaywm/comments/oz3t7v/setting_a_blurred_background_with_swaylock_and/
+  buildPhase = ''
+    rm -fr $out
+    magick ${src} -channel RGB -negate -resize 1x1 txt: | awk 'FNR == 2 {print $3}' > $out
+  '';
+}

justfile

@@ -1,19 +0,0 @@
-update_all: system_update home_update sync_configs
-
-format_home:
-    nixfmt ~/.config/home-manager
-
-format_system:
-    doas nixfmt /etc/nixos
-
-system_update:
-    nh os boot -u /etc/nixos
-
-home_update:
-    rm -fr ~/.gtkrc-2.0
-    nh home switch -u ~/.config/home-manager -- --impure
-
-sync_configs: format_home format_system
-    rsync -a --delete /etc/nixos/ ~/projects/configs/dotfiles/etcnixos/
-    rsync -a --delete ~/.config/home-manager/ ~/projects/configs/dotfiles/home-manager/
-

system/common.nix

@@ -6,28 +6,65 @@
   system,
   hostname,
   inputs,
+  niri-package,
   ...
 }:
 {
   imports = [
-    ./declarative-nm.nix
-    ./distrobox.nix
     ./vm.nix
+    ./steam.nix
+    ./networking.nix
 
-    inputs.agenix.nixosModules.default
-    inputs.nixos-hardware.nixosModules.common-pc-ssd
-    inputs.chaotic.nixosModules.default
     inputs.disko.nixosModules.disko
+    inputs.lanzaboote.nixosModules.lanzaboote
+
+    inputs.nixos-hardware.nixosModules.common-cpu-amd-pstate
+    inputs.nixos-hardware.nixosModules.common-cpu-amd-zenpower
+    inputs.nixos-hardware.nixosModules.common-pc-ssd
   ];
 
-  nixpkgs.config.allowUnfreePredicate =
-    pkg:
-    builtins.elem (lib.getName pkg) [
-      "steam"
-      "steam-original"
-      "steam-unwrapped"
-      "steam-run"
-    ];
+  # allow overclocking (I actually underclock but lol)
+  hardware.amdgpu.overdrive.ppfeaturemask = "0xFFFFFFFF";
+
+  hardware.enableRedistributableFirmware = true;
+  hardware.cpu.amd.updateMicrocode = true;
+
+  services.kmscon.enable = true;
+
+  # Add niri to display manager session packages
+  services.displayManager.sessionPackages = [ niri-package ];
+
+  programs = {
+    gamescope = {
+      enable = true;
+      capSysNice = true;
+    };
+    steam = {
+      enable = true;
+      gamescopeSession.enable = true;
+    };
+  };
+
+  system.activationScripts = {
+    # FIX: https://github.com/NixOS/nix/issues/2982
+    "profile-channel-dummy".text = ''
+      #!/bin/sh
+      mkdir -p /nix/var/nix/profiles/per-user/root/channels
+    '';
+
+    # extract all my secureboot keys
+    # TODO! proper secrets management
+    "secureboot-keys".text = ''
+      #!/usr/bin/env sh
+      rm -fr ${config.boot.lanzaboote.pkiBundle} || true
+      mkdir -p ${config.boot.lanzaboote.pkiBundle}
+      ${lib.getExe pkgs.gnutar} xf ${./secrets/secureboot.tar} -C ${config.boot.lanzaboote.pkiBundle}
+      chown -R root:wheel ${config.boot.lanzaboote.pkiBundle}
+      chmod -R 500 ${config.boot.lanzaboote.pkiBundle}
+    '';
+  };
+
+  swapDevices = [ ];
 
   nix = {
     # optimize the store
@@ -40,40 +77,58 @@
     ];
   };
 
-  # https://github.com/viperML/nh
-  programs.nh = {
-    enable = true;
-    clean.enable = true;
-    clean.extraArgs = "--keep-since 4d --keep 3";
-  };
-
   # kernel options
   boot = {
-    kernelPackages = pkgs.linuxPackages_cachyos-lto;
-    # kernelPackages = pkgs.linuxPackages_latest;
+    kernelPackages = pkgs.linuxPackages_latest;
+    # kernelPackages = pkgs.linuxPackages;
 
-    kernel.sysctl = {
-      # dmesg shushhhhh
-      "kernel.printk" = "2 4 1 7";
+    lanzaboote = {
+      enable = true;
+      # TODO: proper secrets management so this is not stored in nix store
+      pkiBundle = "/var/lib/sbctl";
     };
 
     # Bootloader.
     loader = {
-      systemd-boot.enable = true;
       efi.canTouchEfiVariables = true;
 
       timeout = 1;
+      /*
+        Lanzaboote currently replaces the systemd-boot module.
+        This setting is usually set to true in configuration.nix
+        generated at installation time. So we force it to false
+        for now.
+      */
+      systemd-boot.enable = lib.mkForce false;
+      systemd-boot.configurationLimit = 10;
     };
 
     initrd = {
+      systemd.enable = true;
       compressor = "zstd";
+      availableKernelModules = [
+        "xhci_pci"
+        "thunderbolt"
+        "nvme"
+        "usbhid"
+        "amdgpu"
+      ];
     };
 
     kernelModules = [
+      "kvm-amd"
       "ip_tables"
       "iptable_nat"
       "msr"
+      "btusb"
     ];
+
+    kernelParams = [
+      # 1gb huge pages
+      "hugepagesz=1G"
+      "hugepages=3"
+    ];
+
   };
 
   environment.etc = {
@@ -98,18 +153,26 @@
     # Enable CUPS to print documents.
     printing = {
       enable = true;
-      # disabled, build broken
-      # drivers = with pkgs; [ hplip ];
+      drivers = with pkgs; [ hplip ];
     };
 
-    # disable fprintd (doesn't compile, idk)
+    # I don't want fingerprint login
     fprintd.enable = false;
 
     # Making sure mullvad works on boot
     mullvad-vpn.enable = true;
+
+    # power statistics
+    upower.enable = true;
+
+    # power profiles for noctalia shell
+    power-profiles-daemon.enable = true;
+
+    # geolocation (uses beacondb.net by default)
+    geoclue2.enable = true;
   };
 
-  # Set your time zone.
+  # EST
   time.timeZone = "America/New_York";
 
   security = {
@@ -126,26 +189,9 @@
     ];
   };
 
-  # age.identityPaths = [ "/home/${username}/.ssh/id_ed25519" ];
-
-  # networking
-  networking = import ./networking.nix { inherit hostname; };
-
   # 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";
-  };
-
   # Enable Bluetooth
   hardware.bluetooth = {
     enable = true;
@@ -160,7 +206,8 @@
 
   # Enable sound with pipewire.
   services.pulseaudio.enable = false; # pipewire >>>>>>> pulseaudio
-  security.rtkit.enable = true;
+  # BUG! disable rtkit in order to fix mumble: https://github.com/NixOS/nixpkgs/issues/392992#issuecomment-2799867278
+  security.rtkit.enable = false;
   services.pipewire = {
     enable = true;
     alsa.enable = true;
@@ -178,14 +225,13 @@
       "camera"
       "adbusers"
     ];
+    # TODO! this is really bad :( I should really figure out how to do proper secrets management
     hashedPasswordFile = "${./secrets/password-hash}";
   };
 
   services.gvfs.enable = true;
   programs.gphoto2.enable = true;
 
-  programs.adb.enable = true;
-
   # Enable thermal data
   services.thermald.enable = true;
 
@@ -196,23 +242,15 @@
     enableSSHSupport = false;
   };
 
-  programs.steam = {
-    enable = true;
-    localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers
-    extraCompatPackages = with pkgs; [ proton-ge-bin ];
-  };
-
   # System packages
   environment.systemPackages = with pkgs; [
-    mullvad-vpn
+    # mullvad-vpn is provided by services.mullvad-vpn.enable
 
     #secureboot ctl
     sbctl
 
     dmidecode
 
-    # (inputs.agenix.packages.${pkgs.system}.default.override { ageBin = "${pkgs.rage}/bin/rage"; })
-
     doas-sudo-shim
 
     glib
@@ -224,10 +262,8 @@
     # needed for home-manager
     git
 
-    home-manager
-
-    # https://github.com/chaotic-cx/nyx/issues/972
-    # config.boot.kernelPackages.perf
+    tmux
+    android-tools
   ];
 
   # wayland with electron/chromium applications
@@ -240,12 +276,17 @@
       if [[ $(${pkgs.procps}/bin/ps --no-header --pid=$PPID --format=comm) != "fish" && -z ''${BASH_EXECUTION_STRING} ]]
       then
         shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION=""
-        exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
+        exec ${lib.getExe pkgs.fish} $LOGIN_OPTION
       fi
     '';
   };
 
-  system.stateVersion = "24.11";
+  # port 53317 for localsend
+  networking.firewall.allowedUDPPorts = [ 53317 ];
+  networking.firewall.allowedTCPPorts = [ 53317 ];
+
+  system.stateVersion = "25.05";
+  nixpkgs.hostPlatform = "x86_64-linux";
 
   documentation.enable = true;
   documentation.man.enable = true;

system/disk_mreow.nix

@@ -6,15 +6,6 @@
   ...
 }:
 {
-  boot.initrd.availableKernelModules = [
-    "xhci_pci"
-    "thunderbolt"
-    "nvme"
-  ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
   disko.devices = {
     disk = {
       main = {
@@ -59,17 +50,4 @@
     };
   };
 
-  swapDevices = [ ];
-
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp166s0.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-
-  hardware.enableRedistributableFirmware = true;
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

system/disk_yarn.nix

@@ -0,0 +1,52 @@
+{
+  disko.devices = {
+    disk = {
+      main = {
+        type = "disk";
+        content = {
+          type = "gpt";
+          partitions = {
+            ESP = {
+              type = "EF00";
+              size = "500M";
+              content = {
+                type = "filesystem";
+                format = "vfat";
+                mountpoint = "/boot";
+              };
+            };
+            persistent = {
+              size = "100%";
+              content = {
+                type = "filesystem";
+                format = "f2fs";
+                mountpoint = "/persistent";
+              };
+            };
+            nix = {
+              size = "200G";
+              content = {
+                type = "filesystem";
+                format = "f2fs";
+                mountpoint = "/nix";
+              };
+            };
+          };
+        };
+      };
+    };
+    nodev = {
+      "/" = {
+        fsType = "tmpfs";
+        mountOptions = [
+          "defaults"
+          "size=2G"
+          "mode=755"
+        ];
+      };
+    };
+  };
+
+  fileSystems."/persistent".neededForBoot = true;
+  fileSystems."/nix".neededForBoot = true;
+}

system/impermanence.nix

@@ -0,0 +1,38 @@
+{
+  config,
+  lib,
+  username,
+  ...
+}:
+{
+  environment.persistence."/persistent" = {
+    hideMounts = true;
+    directories = [
+      "/var/log"
+      "/var/lib/systemd/coredump"
+      "/var/lib/nixos"
+      "/var/lib/systemd/timers"
+    ];
+
+    files = [
+      "/etc/ssh/ssh_host_ed25519_key"
+      "/etc/ssh/ssh_host_ed25519_key.pub"
+      "/etc/ssh/ssh_host_rsa_key"
+      "/etc/ssh/ssh_host_rsa_key.pub"
+      "/etc/machine-id"
+    ];
+  };
+
+  # Bind mount entire home directory from persistent storage
+  # (impermanence doesn't support "." so we do this directly)
+  fileSystems."/home/${username}" = {
+    device = "/persistent/home/${username}";
+    fsType = "none";
+    options = [ "bind" ];
+    neededForBoot = true;
+  };
+
+  systemd.tmpfiles.rules = [
+    "d /etc 755 root"
+  ];
+}

system/networking.nix

@@ -0,0 +1,26 @@
+{ hostname, ... }:
+{
+  # speed up boot times (by about three seconds)
+  systemd.services.NetworkManager-wait-online.enable = false;
+
+  networking = {
+    hostName = hostname;
+
+    networkmanager = {
+      enable = true;
+
+      insertNameservers = [
+        "1.1.1.1"
+        "9.9.9.9"
+      ];
+
+      wifi = {
+        scanRandMacAddress = true;
+        # fix suspend issue
+        # powersave = false;
+      };
+
+      ensureProfiles.profiles = import ./secrets/wifi-passwords.nix;
+    };
+  };
+}

system/steam.nix

@@ -0,0 +1,28 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}:
+{
+  nixpkgs.config.allowUnfreePredicate =
+    pkg:
+    builtins.elem (lib.getName pkg) [
+      "steam"
+      "steam-original"
+      "steam-unwrapped"
+      "steam-run"
+    ];
+
+  programs.steam = {
+    enable = true;
+    extraCompatPackages = with pkgs; [ proton-ge-bin ];
+  };
+
+  environment.systemPackages = with pkgs; [
+    steamtinkerlaunch
+    mangohud
+    goverlay
+    yad
+  ];
+}

system/system-mreow.nix

@@ -0,0 +1,43 @@
+{
+  config,
+  pkgs,
+  lib,
+  username,
+  inputs,
+  ...
+}:
+{
+  imports = [
+    ./common.nix
+    ./disk_mreow.nix
+
+    inputs.nixos-hardware.nixosModules.framework-amd-ai-300-series
+  ];
+
+  # Disable PSR, PSR-SU, and Panel Replay to fix display hangs and corruption.
+  # Panel Replay requires PSR/PSR-SU to also be disabled to avoid issues.
+  # This overrides nixos-hardware's 0x10 with 0x410 (last value wins in kernel cmdline).
+  # https://github.com/NixOS/nixos-hardware/pull/1692
+  boot.kernelParams = lib.mkAfter [ "amdgpu.dcdebugmask=0x410" ];
+
+  hardware.framework.laptop13.audioEnhancement.rawDeviceName =
+    lib.mkDefault "alsa_output.pci-0000_c1_00.6.analog-stereo";
+
+  # PST
+  # time.timeZone = lib.mkForce "America/Los_Angeles";
+
+  # weird hack to get swaylock working? idk, if you don't put this here, password entry doesnt work
+  # if I move to another lock screen program, i will have to replace `swaylock`
+  security.pam.services.swaylock = { };
+
+  # Greetd display manager
+  services.greetd = {
+    enable = true;
+    settings = {
+      default_session = {
+        command = "${lib.getExe pkgs.tuigreet} --time";
+        user = username;
+      };
+    };
+  };
+}

system/system-yarn.nix

@@ -0,0 +1,175 @@
+{
+  config,
+  pkgs,
+  lib,
+  username,
+  inputs,
+  ...
+}:
+{
+  imports = [
+    ./disk_yarn.nix
+    ./common.nix
+    ./impermanence.nix
+    ./no-rgb.nix
+    ./vr.nix
+
+    inputs.impermanence.nixosModules.impermanence
+    inputs.jovian-nixos.nixosModules.default
+  ];
+
+  fileSystems."/media/games" = {
+    device = "/dev/disk/by-uuid/1878136e-765d-4784-b204-3536ab4fdac8";
+    fsType = "f2fs";
+    options = [ "nofail" ];
+  };
+
+  systemd.targets = {
+    sleep.enable = false;
+    suspend.enable = false;
+    hibernate.enable = false;
+    hybrid-sleep.enable = false;
+  };
+
+  networking.hostId = "abf570f9";
+
+  # Static IP for consistent SSH access
+  networking.networkmanager.ensureProfiles.profiles.enp7s0-static = {
+    connection = {
+      id = "enp7s0-static";
+      type = "ethernet";
+      interface-name = "enp7s0";
+      autoconnect = true;
+    };
+    ipv4 = {
+      method = "manual";
+      address1 = "192.168.1.223/24,192.168.1.1";
+      dns = "1.1.1.1;9.9.9.9;";
+    };
+    ipv6.method = "disabled";
+  };
+
+  services.openssh = {
+    enable = true;
+    ports = [ 22 ];
+    settings = {
+      PasswordAuthentication = false;
+      PermitRootLogin = "yes";
+    };
+  };
+
+  users.users.${username}.openssh.authorizedKeys.keys = [
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO4jL6gYOunUlUtPvGdML0cpbKSsPNqQ1jit4E7U1RyH" # laptop
+  ];
+
+  users.users.root.openssh.authorizedKeys.keys = [
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO4jL6gYOunUlUtPvGdML0cpbKSsPNqQ1jit4E7U1RyH" # laptop
+  ];
+
+  programs.steam = {
+    remotePlay.openFirewall = true;
+    localNetworkGameTransfers.openFirewall = true;
+  };
+
+  # LACT (Linux AMDGPU Configuration Tool): https://github.com/ilya-zlobintsev/LACT
+  environment.systemPackages = with pkgs; [
+    lact
+  ];
+  systemd.packages = with pkgs; [ lact ];
+  systemd.services.lactd.wantedBy = [ "multi-user.target" ];
+
+  systemd.services.lactd.serviceConfig.ExecStartPre = "${lib.getExe pkgs.bash} -c \"sleep 3s\"";
+
+  nixpkgs.config.allowUnfreePredicate =
+    pkg:
+    builtins.elem (lib.getName pkg) [
+      "steamdeck-hw-theme"
+      "steam-jupiter-unwrapped"
+      "steam"
+      "steam-original"
+      "steam-unwrapped"
+      "steam-run"
+    ];
+
+  # Override jovian-stubs to disable steamos-update kernel check
+  # This prevents Steam from requesting reboots for "system updates"
+  # Steam client updates will still work normally
+  nixpkgs.overlays = [
+    (final: prev: {
+      jovian-stubs = prev.stdenv.mkDerivation {
+        name = "jovian-stubs-no-update";
+        dontUnpack = true;
+        installPhase = ''
+          mkdir -p $out/bin
+
+          # steamos-update: always report "no update available" (exit 7)
+          # This disables the kernel mismatch check that triggers reboot prompts
+          cat > $out/bin/steamos-update << 'STUB'
+          #!/bin/sh
+          >&2 echo "[JOVIAN] $0: stub called with: $* (system updates disabled)"
+          exit 7
+          STUB
+
+          # steamos-reboot: reboot the system
+          cat > $out/bin/steamos-reboot << 'STUB'
+          #!/bin/sh
+          >&2 echo "[JOVIAN] $0: stub called with: $*"
+          systemctl reboot
+          STUB
+
+          # steamos-select-branch: no-op stub
+          cat > $out/bin/steamos-select-branch << 'STUB'
+          #!/bin/sh
+          >&2 echo "[JOVIAN] $0: stub called with: $*"
+          exit 0
+          STUB
+
+          # steamos-factory-reset-config: no-op stub
+          cat > $out/bin/steamos-factory-reset-config << 'STUB'
+          #!/bin/sh
+          >&2 echo "[JOVIAN] $0: stub called with: $*"
+          exit 0
+          STUB
+
+          # steamos-firmware-update: no-op stub
+          cat > $out/bin/steamos-firmware-update << 'STUB'
+          #!/bin/sh
+          >&2 echo "[JOVIAN] $0: stub called with: $*"
+          exit 0
+          STUB
+
+          # pkexec: pass through to real pkexec
+          cat > $out/bin/pkexec << 'STUB'
+          #!/bin/sh
+          exec /run/wrappers/bin/pkexec "$@"
+          STUB
+
+          # sudo: pass through to doas
+          cat > $out/bin/sudo << 'STUB'
+          #!/bin/sh
+          exec /run/wrappers/bin/doas "$@"
+          STUB
+
+          chmod 755 $out/bin/*
+        '';
+      };
+    })
+  ];
+
+  jovian = {
+    devices.steamdeck.enable = false;
+    steam = {
+      enable = true;
+      autoStart = true;
+      desktopSession = "niri";
+      user = username;
+    };
+  };
+
+  # Jovian-NixOS requires sddm
+  # https://github.com/Jovian-Experiments/Jovian-NixOS/commit/52f140c07493f8bb6cd0773c7e1afe3e1fd1d1fa
+  services.displayManager.sddm.wayland.enable = true;
+
+  # Disable gamescope from common.nix to avoid conflict with jovian-nixos
+  programs.gamescope.enable = lib.mkForce false;
+}

system/vm.nix

@@ -0,0 +1,39 @@
+{
+  pkgs,
+  username,
+  lib,
+  ...
+}:
+{
+  # android virtualization
+  virtualisation.waydroid = {
+    enable = true;
+
+    # https://github.com/NixOS/nixpkgs/pull/466473
+    package = pkgs.waydroid-nftables;
+  };
+
+  programs.virt-manager.enable = true;
+
+  users.groups.libvirtd.members = [ username ];
+
+  virtualisation.libvirtd = {
+    enable = true;
+
+    package = pkgs.libvirt;
+  };
+
+  virtualisation.spiceUSBRedirection.enable = true;
+
+  users.users."${username}".extraGroups = [ "libvirtd" ];
+
+  # boot.kernelPatches = [
+  #   {
+  #     name = "undetected-kvm";
+  #     patch = pkgs.fetchurl {
+  #       url = "https://raw.githubusercontent.com/Scrut1ny/Hypervisor-Phantom/d09d66813570704e2b05440f290d6f9bdf2d26c7/Hypervisor-Phantom/patches/Kernel/linux-6.13-svm.patch";
+  #       sha256 = "zz18xerutulLGzlHhnu26WCY8rVQXApyeoDtCjbejIk=";
+  #     };
+  #   }
+  # ];
+}

system/vr.nix

@@ -5,12 +5,15 @@
   ...
 }:
 {
+
+  # for FO4 VR:
+  # doesn't work. it's like the wivrn stuff doesn't transfer past MO2
+  # `echo "PRESSURE_VESSEL_FILESYSTEMS_RW=$XDG_RUNTIME_DIR/wivrn/comp_ipc %command%" | sed -r "s/proton waitforexitandrun .*/proton waitforexitandrun \/media\/games\/fallout4vr_essentials_overhaul\/ModOrganizer.exe \"moshortcut:\/\/:Play Fallout Essentials\" /" | sh`
+
   services.wivrn = {
     enable = true;
     openFirewall = true;
 
-    package = pkgs.wivrn;
-
     # Write information to /etc/xdg/openxr/1/active_runtime.json, VR applications
     # will automatically read this and work with wivrn
     defaultRuntime = true;
@@ -39,7 +42,7 @@
           }
         ];
 
-        application = [ pkgs.wlx-overlay-s ];
+        application = [ pkgs.wayvr ];
       };
     };
   };