From 7ac28720f5cac3e4082341438d88fb2573893eca Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 26 Sep 2024 22:23:45 -0400 Subject: [PATCH 001/724] aaa? --- .git-crypt/.gitattributes | 4 + ...5E4754FE1AEDA15A6D47029AB28AC10ECE533D.gpg | Bin 0 -> 736 bytes .gitattributes | 3 + README.md | 19 + justfile | 21 + nix/etcnixos/common.nix | 203 ++++++++ nix/etcnixos/declarative-nm.nix | 52 ++ nix/etcnixos/flake.lock | 458 ++++++++++++++++++ nix/etcnixos/flake.nix | 78 +++ nix/etcnixos/hardware_desktop.nix | 59 +++ nix/etcnixos/hardware_laptop.nix | 53 ++ nix/etcnixos/networking.nix | 19 + nix/etcnixos/secrets/primary-password.age | Bin 0 -> 544 bytes nix/etcnixos/secrets/secrets.nix | 16 + nix/etcnixos/secrets/secureboot.tar | Bin 0 -> 30742 bytes nix/etcnixos/secrets/wifi-passwords.nix | Bin 0 -> 339 bytes nix/etcnixos/system-mreow.nix | 125 +++++ nix/etcnixos/system-nixos.nix | 148 ++++++ nix/home-manager/flake.lock | 400 +++++++++++++++ nix/home-manager/flake.nix | 103 ++++ nix/home-manager/gui.nix | 163 +++++++ nix/home-manager/no-gui.nix | 197 ++++++++ nix/home-manager/progs/alacritty.nix | 124 +++++ nix/home-manager/progs/borg.nix | 46 ++ nix/home-manager/progs/fish.nix | 65 +++ .../gpt4all-HEAD-disable-settings-err.patch | 19 + .../gpt4all-HEAD-disable-settings-err.patch | 19 + .../gpt4all-HEAD-embeddings-model.patch | 53 ++ nix/home-manager/progs/gpt4all/gpt4all.nix | 124 +++++ nix/home-manager/progs/helix.nix | 288 +++++++++++ nix/home-manager/progs/librewolf.nix | 77 +++ nix/home-manager/progs/niri.nix | 167 +++++++ nix/home-manager/progs/rss.nix | 91 ++++ nix/home-manager/progs/swaylock.nix | 31 ++ nix/home-manager/progs/waybar.nix | 253 ++++++++++ .../secrets/borg-laptop-password.age | 10 + nix/home-manager/secrets/factorio.nix | Bin 0 -> 99 bytes nix/home-manager/secrets/my-gpg.age | Bin 0 -> 2969 bytes nix/home-manager/secrets/secrets.nix | 18 + nix/home-manager/secrets/server-password.age | 9 + nix/home-manager/system-mreow.nix | 183 +++++++ nix/home-manager/system-nixos.nix | 45 ++ 42 files changed, 3743 insertions(+) create mode 100644 .git-crypt/.gitattributes create mode 100644 .git-crypt/keys/default/0/D15E4754FE1AEDA15A6D47029AB28AC10ECE533D.gpg create mode 100644 .gitattributes create mode 100644 README.md create mode 100644 justfile create mode 100644 nix/etcnixos/common.nix create mode 100644 nix/etcnixos/declarative-nm.nix create mode 100644 nix/etcnixos/flake.lock create mode 100644 nix/etcnixos/flake.nix create mode 100644 nix/etcnixos/hardware_desktop.nix create mode 100644 nix/etcnixos/hardware_laptop.nix create mode 100644 nix/etcnixos/networking.nix create mode 100644 nix/etcnixos/secrets/primary-password.age create mode 100644 nix/etcnixos/secrets/secrets.nix create mode 100644 nix/etcnixos/secrets/secureboot.tar create mode 100644 nix/etcnixos/secrets/wifi-passwords.nix create mode 100644 nix/etcnixos/system-mreow.nix create mode 100644 nix/etcnixos/system-nixos.nix create mode 100644 nix/home-manager/flake.lock create mode 100644 nix/home-manager/flake.nix create mode 100644 nix/home-manager/gui.nix create mode 100644 nix/home-manager/no-gui.nix create mode 100644 nix/home-manager/progs/alacritty.nix create mode 100644 nix/home-manager/progs/borg.nix create mode 100644 nix/home-manager/progs/fish.nix create mode 100644 nix/home-manager/progs/gpt4all-HEAD-disable-settings-err.patch create mode 100644 nix/home-manager/progs/gpt4all/gpt4all-HEAD-disable-settings-err.patch create mode 100644 nix/home-manager/progs/gpt4all/gpt4all-HEAD-embeddings-model.patch create mode 100644 nix/home-manager/progs/gpt4all/gpt4all.nix create mode 100644 nix/home-manager/progs/helix.nix create mode 100644 nix/home-manager/progs/librewolf.nix create mode 100644 nix/home-manager/progs/niri.nix create mode 100644 nix/home-manager/progs/rss.nix create mode 100644 nix/home-manager/progs/swaylock.nix create mode 100644 nix/home-manager/progs/waybar.nix create mode 100644 nix/home-manager/secrets/borg-laptop-password.age create mode 100644 nix/home-manager/secrets/factorio.nix create mode 100644 nix/home-manager/secrets/my-gpg.age create mode 100644 nix/home-manager/secrets/secrets.nix create mode 100644 nix/home-manager/secrets/server-password.age create mode 100644 nix/home-manager/system-mreow.nix create mode 100644 nix/home-manager/system-nixos.nix diff --git a/.git-crypt/.gitattributes b/.git-crypt/.gitattributes new file mode 100644 index 0000000..665b10e --- /dev/null +++ b/.git-crypt/.gitattributes @@ -0,0 +1,4 @@ +# Do not edit this file. To specify the files to encrypt, create your own +# .gitattributes file in the directory where your files are. +* !filter !diff +*.gpg binary diff --git a/.git-crypt/keys/default/0/D15E4754FE1AEDA15A6D47029AB28AC10ECE533D.gpg b/.git-crypt/keys/default/0/D15E4754FE1AEDA15A6D47029AB28AC10ECE533D.gpg new file mode 100644 index 0000000000000000000000000000000000000000..5b8cf6f4548731c0b709f46ec196113e6065c58b GIT binary patch literal 736 zcmZo=;$fb(sp}x$xnNsH{{NoO`${KXUpHN9V`t>PCvi*nWgw`m#o%upX!-6^h4*}`T05b^ywhRXxWFyj2+t#J^ZFTAyr_qR&QHzcgY>* zAd!$28ZyScarZ+auRrK$5BpyHIryaY#U)DYdkhk!&T(4tW-xGk=H3^tCLF=MLS;U|I1j%e&KDL*4LQW#EE-KWe8^8qxbGA%5az$k6 z0_~!-_1mB1o<6gov$5>`?ZZctqCd{sQhYe3K=HAxYh!rZUpKu+BJFHjUN5^|q*_ur zU(>6+{O$DpEBR+<@8{aRc)`+)eLG8dMJhE~|3AF$`+h}SRHLOfpZV{IzVqu1XZUlU zSaMDE?cd2UXOcxk;`C;|{_*L6veU=#>xB<`pDsUlulV1bfM*U#R}Szoaxw{IUewYG zQrW7^@FrP^@eb$m`w>r7{&opYJ!W0>=;rxU9!Aya@{>P`Ij{GUG}7=WH^;`C9e3^E`@g|@0ESHUF~{w(j=2DpJteO>>>>>> pulseaudio + security.rtkit.enable = true; + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + # If you want to use JACK applications, uncomment this + # jack.enable = true; + }; + + # Define my user account (the rest of the configuration if found in `~/.config/home-manager/...`) + users.users.${username} = { + isNormalUser = true; + extraGroups = [ + "networkmanager" + "wheel" + "video" + "camera" + ]; + hashedPasswordFile = config.age.secrets.primary-password.path; + }; + + services.gvfs.enable = true; + programs.gphoto2.enable = true; + + # Enable thermal data + services.thermald.enable = true; + + services.pcscd.enable = true; + programs.gnupg.agent = { + enable = true; + pinentryPackage = pkgs.pinentry-curses; + enableSSHSupport = false; + }; + + #System packages + environment.systemPackages = with pkgs; [ + mullvad-vpn + + #secureboot ctl + sbctl + + dmidecode + + (inputs.agenix.packages.${pkgs.system}.default.override { ageBin = "${pkgs.rage}/bin/rage"; }) + + qemu_full + + git-agecrypt + ]; + + #wayland with electron/chromium applications + environment.sessionVariables.NIXOS_OZONE_WL = "1"; + + system.stateVersion = "24.11"; +} diff --git a/nix/etcnixos/declarative-nm.nix b/nix/etcnixos/declarative-nm.nix new file mode 100644 index 0000000..7fea1a0 --- /dev/null +++ b/nix/etcnixos/declarative-nm.nix @@ -0,0 +1,52 @@ +{ + 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" ]; + }; + }; +} diff --git a/nix/etcnixos/flake.lock b/nix/etcnixos/flake.lock new file mode 100644 index 0000000..c371580 --- /dev/null +++ b/nix/etcnixos/flake.lock @@ -0,0 +1,458 @@ +{ + "nodes": { + "agenix": { + "inputs": { + "darwin": "darwin", + "home-manager": "home-manager", + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems" + }, + "locked": { + "lastModified": 1723293904, + "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=", + "owner": "ryantm", + "repo": "agenix", + "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41", + "type": "github" + }, + "original": { + "owner": "ryantm", + "repo": "agenix", + "type": "github" + } + }, + "alvr": { + "locked": { + "lastModified": 1727023213, + "narHash": "sha256-KPghRPcTbqCMktw9ahrtiq7a/seajAyLkEI2GS1x+sg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "7c2572e5cf4329ad9fa50d33015aa7be394b4026", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "pull/308097/head", + "repo": "nixpkgs", + "type": "github" + } + }, + "chaotic": { + "inputs": { + "fenix": "fenix", + "flake-schemas": "flake-schemas", + "home-manager": "home-manager_2", + "jovian": "jovian", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1727292492, + "narHash": "sha256-vKkVoZJB35xOb1kmAH6i74ziuP0ZGKnzM6+NVi/OhD8=", + "owner": "chaotic-cx", + "repo": "nyx", + "rev": "9b30ea4a39c8c5a2b6a6519f85da38f72b7f29f0", + "type": "github" + }, + "original": { + "owner": "chaotic-cx", + "ref": "nyxpkgs-unstable", + "repo": "nyx", + "type": "github" + } + }, + "crane": { + "inputs": { + "nixpkgs": [ + "lanzaboote", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1721842668, + "narHash": "sha256-k3oiD2z2AAwBFLa4+xfU+7G5fisRXfkvrMTCJrjZzXo=", + "owner": "ipetkov", + "repo": "crane", + "rev": "529c1a0b1f29f0d78fa3086b8f6a134c71ef3aaf", + "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" + } + }, + "fenix": { + "inputs": { + "nixpkgs": [ + "chaotic", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { + "lastModified": 1726900127, + "narHash": "sha256-v3r7yJY8YE4HAzD5DXOxLkzj8YZKQ0xuccp9yppGW1U=", + "owner": "nix-community", + "repo": "fenix", + "rev": "18eefba7fd0bf03e115785948758a44125a9fd68", + "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": 1719994518, + "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "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": 1726902823, + "narHash": "sha256-Gkc7pwTVLKj4HSvRt8tXNvosl8RS9hrBAEhOjAE0Tt4=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "14929f7089268481d86b83ed31ffd88713dcd415", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "jovian": { + "inputs": { + "nix-github-actions": "nix-github-actions", + "nixpkgs": [ + "chaotic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1726902390, + "narHash": "sha256-ESAD6AkxsQdV/j5ZBcO4Vg94J7Xd0nfpiEZpJtwSEhg=", + "owner": "Jovian-Experiments", + "repo": "Jovian-NixOS", + "rev": "faf4c746c068dd8e41b1fa5f18beeabd34d4064c", + "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": 1725379389, + "narHash": "sha256-qS1H/5/20ewJIXmf8FN2A5KTOKKU9elWvCPwdBi1P/U=", + "owner": "nix-community", + "repo": "lanzaboote", + "rev": "e7bd94e0b5ff3c1e686f2101004ebf4fcea9d871", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "lanzaboote", + "type": "github" + } + }, + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "chaotic", + "jovian", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1690328911, + "narHash": "sha256-fxtExYk+aGf2YbjeWQ8JY9/n9dwuEt+ma1eUFzF8Jeo=", + "owner": "zhaofengli", + "repo": "nix-github-actions", + "rev": "96df4a39c52f53cb7098b923224d8ce941b64747", + "type": "github" + }, + "original": { + "owner": "zhaofengli", + "ref": "matrix-name", + "repo": "nix-github-actions", + "type": "github" + } + }, + "nixos-hardware": { + "locked": { + "lastModified": 1727040444, + "narHash": "sha256-19FNN5QT9Z11ZUMfftRplyNN+2PgcHKb3oq8KMW/hDA=", + "owner": "NixOS", + "repo": "nixos-hardware", + "rev": "d0cb432a9d28218df11cbd77d984a2a46caeb5ac", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "master", + "repo": "nixos-hardware", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1727122398, + "narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1720386169, + "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", + "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": 1721042469, + "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, + "root": { + "inputs": { + "agenix": "agenix", + "alvr": "alvr", + "chaotic": "chaotic", + "lanzaboote": "lanzaboote", + "nixos-hardware": "nixos-hardware", + "nixpkgs": "nixpkgs" + } + }, + "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1726443025, + "narHash": "sha256-nCmG4NJpwI0IoIlYlwtDwVA49yuspA2E6OhfCOmiArQ=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "94b526fc86eaa0e90fb4d54a5ba6313aa1e9b269", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, + "rust-overlay": { + "inputs": { + "nixpkgs": [ + "lanzaboote", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1722219664, + "narHash": "sha256-xMOJ+HW4yj6e69PvieohUJ3dBSdgCfvI0nnCEe6/yVc=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "a6fbda5d9a14fb5f7c69b8489d24afeb349c7bb4", + "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 +} diff --git a/nix/etcnixos/flake.nix b/nix/etcnixos/flake.nix new file mode 100644 index 0000000..5a96564 --- /dev/null +++ b/nix/etcnixos/flake.nix @@ -0,0 +1,78 @@ +{ + description = "A simple 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"; + + alvr.url = "github:NixOS/nixpkgs/pull/308097/head"; + + chaotic = { + url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + agenix = { + url = "github:ryantm/agenix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + }; + + outputs = + { + self, + nixpkgs, + lanzaboote, + nixos-hardware, + chaotic, + agenix, + ... + }@inputs: + let + username = "primary"; + hostname = nixpkgs.lib.strings.removeSuffix "\n" (builtins.readFile /etc/hostname); + system = "x86_64-linux"; + + # pkgs = import nixpkgs { + # config.replaceStdenv = { pkgs }: pkgs.clangStdenv; + # }; + pkgs = import nixpkgs { + config.allowUnfreePredicate = + pkg: + builtins.elem (nixpkgs.lib.getName pkg) [ + "steam" + "steam-original" + "steam-run" + ]; + }; + in + { + nixosConfigurations.${hostname} = nixpkgs.lib.nixosSystem { + specialArgs = { + inherit inputs username hostname; + }; + inherit pkgs; + modules = + [ + ./system-${hostname}.nix + chaotic.nixosModules.default + agenix.nixosModules.default + + ] + ++ ( + if ("${hostname}" == "mreow") then # laptop + [ + nixos-hardware.nixosModules.framework-12th-gen-intel + lanzaboote.nixosModules.lanzaboote + ] + else + [ ] + ); + }; + }; +} diff --git a/nix/etcnixos/hardware_desktop.nix b/nix/etcnixos/hardware_desktop.nix new file mode 100644 index 0000000..3f45ceb --- /dev/null +++ b/nix/etcnixos/hardware_desktop.nix @@ -0,0 +1,59 @@ +# 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/steam" = { + device = "/dev/disk/by-uuid/df865fc2-6b26-4689-809b-1615f860507e"; + fsType = "btrfs"; + 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..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; +} diff --git a/nix/etcnixos/hardware_laptop.nix b/nix/etcnixos/hardware_laptop.nix new file mode 100644 index 0000000..17a48a2 --- /dev/null +++ b/nix/etcnixos/hardware_laptop.nix @@ -0,0 +1,53 @@ +{ + config, + lib, + pkgs, + modulesPath, + ... +}: +{ + imports = [ + #if this is removed, then niri doesn't start, TODO! look into wtf this does + (modulesPath + "/installer/scan/not-detected.nix") + ]; + boot.initrd.availableKernelModules = [ + "xhci_pci" + "thunderbolt" + "nvme" + ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/acbd96e3-e7c7-442d-82cc-ce2913a9e90c"; + fsType = "btrfs"; + options = [ + "subvol=@" + "compress=zstd" + "autodefrag" + "noatime" + "space_cache=v2" + "discard" + ]; + }; + + boot.initrd.luks.devices."luks-0f481d5f-528c-4838-bd8a-d2780b4ba234".device = "/dev/disk/by-uuid/0f481d5f-528c-4838-bd8a-d2780b4ba234"; + + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/4D19-520E"; + fsType = "vfat"; + }; + + swapDevices = [ ]; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp166s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/nix/etcnixos/networking.nix b/nix/etcnixos/networking.nix new file mode 100644 index 0000000..f660e51 --- /dev/null +++ b/nix/etcnixos/networking.nix @@ -0,0 +1,19 @@ +{ hostname, ... }: +{ + hostName = "${hostname}"; + + hostId = "cfe0ff46"; + + networkmanager = { + enable = true; + insertNameservers = [ + "1.1.1.1" + "8.8.8.8" + ]; + wifi = { + scanRandMacAddress = true; + }; + }; + + wireless.networks = import ./secrets/wifi-passwords.nix; +} diff --git a/nix/etcnixos/secrets/primary-password.age b/nix/etcnixos/secrets/primary-password.age new file mode 100644 index 0000000000000000000000000000000000000000..ca3ac41dc9112abfb2e0b195d029f728beaeedd8 GIT binary patch literal 544 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCUl$_b533{>!NEwJ>} z56MWcD9F#$chB>52?`6(i7fX@OG!#J3Dd7|HBJgn$t;X2_v9)KtI8~o$O;e5@Cgeu zaPc)yu`KrR^Got7^^bHmitupvEzT^-t|&{d$Vay=#lyubJy5~J)6?9&(#**)(yzoc zJGUUhI5EV?wJgc9B*`VqA}z`?)6c*#-7_<*%7UxXr82w3HLyIxH$2HdEvvM`v^Y6Z z+qAGSGt$M|B`hM(&od-4HQyk+I2&Y}uWou#YGQG!LWYGxL|{acLa0@;Teho$fsds& zSFTT#X|khhs<&x!q@PoGW=3XUka1N&P?)K?epOypNRV?{a9*iPWUhySS7kwBa7vJK zSY>&IfsvcJi;0oDA6L0)K#EyNNnmn#R+xX5XOebERYqB)fv2&FkA-%HtD|{wet~m& zg;`cnzN1;HVWM9km#(g^LWy&TWqv?zWpPQ4VNOVKdWLDPnO9&*VMRu|sX>l*M7l{( zXr)(>fw@OEmr(FopUIX?$LlK+94`5FdF{N&*P4~u&!7^?I@SBB7k}pgvGb9iF1^$GetS7e`pz*#M8z;={OLTpR5m)q#VT|9Q@1a3;{8`YTpP1=2gmA(dMg;Z Ua!SKnxmb&~bymkM=vuD>086*N@Bjb+ literal 0 HcmV?d00001 diff --git a/nix/etcnixos/secrets/secrets.nix b/nix/etcnixos/secrets/secrets.nix new file mode 100644 index 0000000..2aa18e7 --- /dev/null +++ b/nix/etcnixos/secrets/secrets.nix @@ -0,0 +1,16 @@ +let + laptop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO4jL6gYOunUlUtPvGdML0cpbKSsPNqQ1jit4E7U1RyH"; + desktop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBJjT5QZ3zRDb+V6Em20EYpSEgPW5e/U+06uQGJdraxi"; +in +(builtins.listToAttrs ( + map + (f: { + f.publicKeys = [ + laptop + desktop + ]; + }) + [ + "primary-password.age" + ] +)) diff --git a/nix/etcnixos/secrets/secureboot.tar b/nix/etcnixos/secrets/secureboot.tar new file mode 100644 index 0000000000000000000000000000000000000000..023a0a5ef1a3c05f62473d2f320ac835b9d29ee9 GIT binary patch literal 30742 zcmZQ@_Y83kiVO&0kX&t5{Ee#-4!d{f$a$7ROPD0_uRGWQ!m|4=v{qHs%>#1^K4&N1D62( z4Qo_({#bnHMPYcMg20+<{QKj%H_o2S@pS7Kv)Bt#VHZDsvh7LT5OHqK>D8Ipz1JJJ zKev2w>{`IGNBu{{=B>@xzx}u_ZpcGTN(ZJT&c_|Q^M!T&a&nfM!dd-s}5ey4Tk%}l`K83n?EDzj~_iE8P&d1lc_U_;ivZz)yke?PT@yO$(h5jq4_bCQ5k3JWk z@%`cAJlFa*=T_BdnN-Fc&g))AkwVw+T)x{W8OeJ9Mjx2gQZmTT`=0Kjhd+59!qb-##{S@I9CnqnWyOi;z5f zwB^*$<2Md>6!&>VR8Od9kXdueS1>fM{?3-Dp2DB^L~JUqw-w4*URv=hdBwX^>~l4z zD``)RnZNEW-^q)IjLj;|8Yz$Bunbdk(Us^s8SHkpC}Y%zClL^LM5Qwgty}Y+uFc`Ia}}W4T1|#jh>1CQR}^BW!kIQr+ClJ$#qtvp;u13Ek zh;z$(Cz;zb-6uwVbG9*+y~}e@RC}xA)0|C$)59g=3=gy~GB8bjF!5OE()VgHzsl|~ zusxK~DSj5ZtD$PTUeH9N8QYck*W8pm8*Qd^@A839hTP{Q61H9V8L4<|tN*SDpIdru z*AC1%s$;@$5_HZ-t?I#xWv9baAL&dBG-O(XcAdo0gOj_;nj<(I?cA1@mO zZymK?=vp`LLUTd8$In$tkyDnr9|e|zWS)vinXt`4)uKB~(xW}7#!`Mw%wgYsQL3l( zHyr-d!FgywHp9O&H+r7UUZ=gw^3v;5MuC95@O zEw)gOd}?MY=T$+3+A3L@qIaAA{>iLSvA83q zz*$z#e&D-#(V~q1HBXCD>RwEoyt;9f@aGje-OE?LF~A!-D_XEeph|^7bt>aC9(uudw}Afry4r%b#;C@2qVu7L=x~ z?ezcu;$Ys-yHh^rJ7$@$%MD!iwddJJ3Eil+UcFj}<3=iFfwNhkPsu&2>ZGGksG^Hh%oG!mTGV|*lo@>?qFSHkSt^e)3^r7RsZL>>u z$op)*Yd7J{-)BYZ&NV$hv90a=tGDcj>cY>2v8?XNS7b7q=_uZ3T_el?>B{Y>zH=`{ z9QLj&JEeW%?2@x(RSS&^pFXfWIfdnAR!jBHJzGq7^SoRVRBPM0_WOrh%`PreY@SLV z2w!jA$l7yH-I>F`K z$-Q`Epq+U-)2v-G>QTp)zXkXG44$-J|I0#^Ogr1N(xsitTsti|7ku;z6k5-Aw!=H! zG%|F;cb_h?gUcqoNl15DeTwTSL*e=VdrRjnt^eQdp!Sh@#YwM^e~owLx^8Hde#?xTTD%p7YT$$_pS=E01Msm|u$F$ALyR%Ge%ly4@E_~P5#Jv2MayNZ$*DGGD9U3-Q zukG5RFx$4|6_=Snb9liKogKB8*RrSGxY0G`+w1Jk7)Y_J)Kj9r-q!m zZ-b1=)zp*?55t}xiHWaS|45lNV0O5GX>CcN9_xmw?2F63XNjttzPfkI%{QfASM(ZF z`BR58s~5AI&fnkrGkxR7+wWh=KNnX$GVRQZ!bWMA37eyAo>xY#P1^frz0M7RNh^x^ zN|ao?sw^eG&Wbx@e!SNI+ni}?w?9mM*DQ4YT$Ier6duPlUV%$(pLVpx*zeK(?_J_) zxO`s2ov^qW(`^^KK2p)F4-2!H=_;bZ?PYdm;q@iAHIaBIM! z9`gkg7>qC8d&pt+SN{9ONToJm@#S-Q#GWNP{S7J8GRzUp(rq=4g5B zV%py?Tvos4Fsku(mT!GAP4Yui@R{qk&6ntTZfvkjwy0irmz!^2RP^@+LMjGXOf!Yf zDamm~6q=VaoSAy?^ZT{z=hwy_Va+c&;pwwS=G?wXPwt02Xq?E)a`y4!b2Xp7Mkwq) zulg<6xA*p*-zDvJ>}RC>YulwJ+a*m@d&j7-SgTRN|J3Br@QMmS~-sb%R$tLuescPH2> zxrroRIm+24=%MFvSeXC&xlIRV{xn;{H~;mwcRA73?e`7mh7>*jz5Bq@!uyWrc4=IX z(yL2apIp**iuYR0Vfj7pziqE8{@1-T)qH1Ywg=zel2DhkiUx5nZE|ijN1CdeMJ+LP zev@9lHEl5;L&I_VZD-48aLm2MCFPd`MftnW ztg+{%wco;+$^X3rpcvt!Lg!yA6Px81GO6YD#oX*s`Tf?iYg8Pk6srpN9JYCq`v zL-2dg-lTsYn*AQDB+oi``%L)FB+HBUt` zA*R0JC+CUZB8`hpa^@yntGXWVJ%3)YZi)ua&zwsuE6&FDe||SfX~8-EVoQaXy-k@$;bFY*G3KY>pcatt}ipln39$@ORnSJ(o@g> zxBuZfmfrXz$Uk4|X^hxvMF$P3_A9!7K5Y{5%L}e&Iwmu7YHRe_o7>kP+7Nhem-OSb z4U3plgQP6AeUldERVoU3%3ZjUDL$Fi{%zs2BQcvwwgnhl7&9Jt!QfXq_j1^hPnE0g zILR!LbLJC1n&SA<(^>ODNO*VXvh8W6N)sQ?7JOnk?~Bj0SYejTotA6PrfN87%kREY z@+jb-midHNd}oac;)Aoz1n=5Uo_E0bVA@BvAJcr+UiIZU@?N5zH|%zX*45>+w@vvU zA6wkJwkPNbr`K)QX<}8;GD_wQ#wtq}PWH;4w$>qPesNgosnv5T)?t&B+bjhu|fW3J~zqEU%iQ<`)ug~;f-Mm_G!Bqishs?iA zifSVrPu{59`E27(7enPt?msKD)W2~|D*Ux1%+Ese`^C~pS7uDETeC?}{KZ6lo&MTB zxqW6S-&ND)_V5dF-oGK1>s_^TW0F+Hn#X=$=bNSOGW#X(`pYxc?91fs|6_m3+~<zd%$X|WQyDiZ4a3$zb?a`s@q! z9s`y4?+c#izIyiiQ{6UwvvUlqq$1z^{55-BHkUV7OGDdU=PctN;qmR?q>zQrakr+40b{{|6Qn@edH{7vUUjJ`9f7r9; zu6KzXg}gIBD^_Gd8=nM7NYaeEV(ZD>hAcQ`3`nEY+#U*PLjV6_~3S`y}d%XH)2< zh#gAxT-|3hBqNURixiSf)L9gM>=etYw|8&fFxjl>F3hj-GOz!C)}QO9m)aOpx6blA zughlf=JCf&w-YmaTka^zJPX_}-Swh?f3C*KWxku2Sh{WC%8p&6HcytVT5hKFYL=6; zJ?)>BSqY!ANME7Jqn43uxy+ic)}uO6>40vQ}T{;T-4VnoA08r{9m%+995GU z{|aYYzkYckV*10LD6y+Ig!Dz z6ph-*nS9()M=kqQvz&y5T5)R2uRW*doH@+&;HJENzUXGIcPG49R<2rUJHf4|ZRY(4 z`xU107F}iMnI`{x*^Dj1rnRdNw{xA8j|vG+WB$MI?!+}eJdVlB6)Th4v| z4s8G7w8qi@JMYf=px}^8KTjsj2%GqEu1}%EI|q%VTge`_`4bjD_@Hs+SQnpnSybI2 zy=$p&^p~Z7HwozUT_?x?afPoG!<;ptN+}I{H&0);ebw$glU_2YhMfB2%6OMWt(DW~ z*)~t^%;Vx+p>Oog`#un{*Ux#e^UkWgj{Y2T`bN>7PP33l7rd;Qf1JMV_~h?Vp&Q*-LPO`Rm6d8$ z+4b*xTG-PbU$qG@F8(i*nQG#G`NVCtOY8URh?q^Zv|9F|cij}dGdJ7|o-m)$7vH~c zM^-q0tK@0(TY+1;QWj4XySwi7+AG>$zAL({`_524v!ecHAM1zMkPPdq&&~!eTvoKK z^63tN4H?P5ug`jPh(+OfF7xM$vB^rCdWAMmZmE%OEB>-;_1rs(mwD|ZI#m>0*H_$J zBh=qGE%ft!Ax;SwiQV^0D0l$WtCr__>m!7J#1pSdhyD1SE1VKW}cm1w_o}{ zk>WoS-TGj|ZG_);eP79>zspVX^V-+E4+<+aSl38=QsI9Y zJMY?3Cxf2ZUnRAiA1TEhn}2QA<82!4sgJCm?#bJs@ceq1wXTui-I{Y}F8KsM_Nxn7 ze_@)W<}`K1r^O1kxBF|@F2v2>Cr#kKP|okblq zZxttoB%Dvq{yCfHc8eBkLg~H#+0S-s>#H{%*e+aHZ^k(1UXF1?`N@Uq?8yXSkC(^Tz+I~oqL*rR$isDCC2EAM27q%SvI9*U_pWSIIHRgw3Y9jk5 zcTTe`=Ucx-{TaLT!9Tn2JyJX8keFmPlcZ$NMe+Z6NT{lT*y4y+}`xVJ->&v>o{k!?xYjF|-kCWIO7x5{M zV*mC(xafU}|Ez&l#m36|+_Rb&-+6X0Nv_$u{ax`dUXRGA`}Hcl6D_n~?tglYX@gHm z$lXV`Bnue6=G%Vk$q*{(4&D@1IajjoMs8x?s!}n|BabE=wYHMCxNvmO-q$hHLj%>P z-0(au`{=@FMbozIlCPEL`B$9S|Kc~>ij~prjE|>B@U3M2I)&q2>6w7LB0M_;{V#=T zRqUS2c~bB03H#M4R@!={-mHI}z2CMwh#PLoEJ;_@4ZfiFAWvFdnb(>pwtDGzz4UcC zMt7#kEct!vn%MMT5xYWnSuM@ov)}21MZVuXD?gF0{c8+9xG;M?I#A$PFf+P#$8_OY z9*g{t~qpm0DtaLe2NSk~a2x{Q6JeQ;ltrOLxrw z_kY8$H4GO@)%14l%HBDlGtoVo%`Bti&4X+H7ed9(dPgc&d>6DPGd2>zH#3 z%cM=cq08n!i7>Nlc^b>PbA5f4vx!M~|Gozu()(ws^&Q*#`hfL~HyW{=-_)*ma`bKg zIqmHd{aN8vr{?M}EMhtJLW9dY_~QPL=gYX}EV_G7Rqc1|2Ag#k1ZMp>xFC8(8cXu0 z2hq1{6@`w)Oy6>1LY4Eyy8XAyEF-HB^m zv7}Po?XI47m0zh*7}HNx_Qh^fmSvn1)A=U2v03`}B{SzWSqj&7Ji2|wN{{*ST(cXx zYN!3yZ~b<_`dYqUp!Jma-F=3FXTEK^b6~;AnAw+WgI5|KO#0#Pv^?isRP6^{&k1d< zf32KW)c#03{`^s4`SIvuvA1?h3;%z{dsFL)&1{~p?Xj7+v}a6Rw)g6Wn1FqUpIIE; zq;_QHaj7*c9QzN3CB3L^iYiWe?A;tNrKYofCVybmnd6H%nU}9N>F)HJoxkqfic@|X zGZvlMy?tp_O0C$E3wrt?iYv?~E>F9tq}}rP<;I+co7TP(Dwx{;=xagN6?r*lrRV1U z;onyognwVVsYm6PM|E$iug3|E3kT%Y|ET_vd)QJHZkzJ1Tx##iX<7vwSCXer{j~Y- zjkD|Q)3Vy70_H2}K6rKO^^#pR_c3~DdC-2x@Op}Zg%FqKo}@LQW-E71 z?YmH%!`#R$JjZUyqMNP$e~!(YDb1Vd$(b2`YN6w!>nnWu=HBwq*rl>;Rae#@8IC0^ z?GxUMWM6n7dn|~JS!mf~uEH6M?|JgqUrRg8X%wHP*7^Rz!<$6Q!`bl~&?vnki z;P!B5kJ!bTCD)5oPYZuI_IhjnB;KX-KN?SZ->M?E74oPx~}^ ze7j7)e34C6?tA{#x;7b?Wlz zrZckfP8;W-VJ?;yYO`2`5X?e(dVvp_Z zEr;{Y=IUkqR+AC9ctqz`(VMkik-HRUt1Mm3mwk!Vj4@%8+nPxXKR4Xzv=e^(V&%O3 zArAb91EXE;|JWaQ!u(|f!_sm=m4c>k5$xv`a@RaQIKPbP<%<~G8hiamy4Tu*m(*|E z-h6nU*nY!wmC_p}c`Ml--Zrt_%>RYE+wHASB-2z&LG2}1&-$f1u&M?7o&4wF@%o05 zyY|L32?;m> zbzHp^TKw9?6b0EOGZ(t3722sJs1#XcOu*^O3_Ze1}jt5 zjjL~W);d46I9geju`;4ZW3BMzA`UjrFAq}<7l(AnG&vryaJO7v^zqZ>nPFVhVzb(W zHhn!^t+Vr%=hj1v{tiMrxjWV-&9btHmXImWf1z?k?wLX0!aYUm6@G1rLJH?+@K4=- z?(hrFq{nBsHo4^Q^6K^atjZO1D_eQ-484;neimkO#|$<}>9Go)d~K$Z6)ZGIQD!N3 zaaSULUiHhK8F#0;#x1Lu-ne+ivj;&ZCd@lkKFRm!i}&w)x9wAojn(+h?0RCR-Tsui zSfrTzEorWn`@D(av2NjZVTHrp;M;H{rmH6<8qs8ds=p7 z|2fm;s((G9yH@Ze^YRBToE%na7`?xLwBqN##Fy_T@TSK3w*QJ(oSkcJ}ncOnI8S!k_TE zTJo?8eofbsmMA#U_VM`QE1q{c9D}@Amd@(^zv*=ShHXoyu(t-zUvz!-#IN2XoT;Y)sEZf7#13(QLo_Rsp^Iy~o$z`8V@` zsY#Tb^qcKX5zFH;v+OvmUkb0aQ`-CV!A(Xx6^5g#(tgvnrC<7VuIh%?^1jX1TrDDV zUrV{1nU(xxUg3%dEG+wfJeJ(P!jI$4ZjEXi^PLZmEL`^ZJO6L%)M<6clFsG7*e1v5 z?HK*`V|bZeR9d@CmX&Zd+h%?9ecRV{s&O1GIL9^jg)j53HRjgo?K}Lk*(+a`?Jcsc z-KUW(Vs!L#QCF7QJ^S#I)(!FvElE3$J-zYgdB*PeLbL4mZ<+VipPm!*Wp12Hyo9>a z>C&a!^wJM0PEq~$>n$tWbUmqeDBb-Hs7cCjQn4TvK;rmrROm#dQy+U(=G~ z7aX%`Q;BWr;;QvM_Efkg)ok(ipzRi`KPg79dbZnA+~Ur`2~1h}()SaXt!6q%9a`3^ za`Bwpj@xH>Yj1Y$KmPFI`Sl#9&u{0JyRzxq$32}_jGYrXo|-J1RmaB19=e0;T;`Wt zhZBdEY-eaV{bYyJi!WESlkO)*F+P+?S-9a8--B!7{TfDA&C5R7BJ* ziDkFKb~v;!MV{X;KfmmX*~E+0-u=4MSwnLD*YES`z3u-{{rTGPo%!N3|KIgVRGFN) z=H3=-!l7=_JTP6Nm~4E-#Oxw4HC=ae$Dtck;_Z1?hdQW zS*B>Iw5joL3%?Xj`n$^}`PoC0V}Gtp&N;VWhPvBC){6&(g{EIA{35^l(dMGt3s3Iq zeRKWoR7O3uonJn$HmOXlh@W9w_a{KZNd8Y(wswYz>sq_#%+g2KWc?`1T+O;fx9_KD zcYON=ma8}0?H8Qhdri%#*F_@Uc*4#{VR@&xxL$6zI#642_ntoMu{k}8*Z0XaUy}1s z$VukCR-&Z-`_SQ!U5$;4o=?A`H!WmFnEsA=#X=&Lb$j_9Z+$mEW|6XYhp6O4eV34w zUCTvmwRfLwKF_k*O!4+smpS59!QW4Rm{9cT-^RBYPx)4T{6GZOxa^HY_4DZ>Tbc4=Z}1!*etg{ zZ(UqnulBQen&>ovvI7ab-S;;xRSC2b2)&V3o5O#1_AfhS-n`EfqaJY0Ird47Im3VM zU7b1&hKY`L#%2pPY~CAbW`D=^B>Um3y}PGgI$#~1A17jS*1RaxptJ6%a;cQR=GD*V zo=-V0)3#;ptIk7Ca~Y;#SEXIU*g^gC0!j`WOA1T{# zTDk7vKh-;26U_9ro9B+>Mcd|^?A>j}nse7fGoVW%SV{K0sDOy?W7XKy zRlgSe%KE6mc=^E8dqsC*73#j}>6uqd7OLsV$oCRh+LbUfWkzRo?1y7&*LMjxy}ej6 zXV0@Twbr`G;9rTWuKW_+e&UhYrXA{WWi6)!Mb{j0;1Vqt*c?~wRS+m=U{|L)A;d#u z^XeZDw!YgiU3dSs9*a=Mn3x~@8gUP&H0w=&`mkoV{;r4HR=qLw_B}J%fth22Pt0oj z{mpZp&-(t=LNsl~sx$4JpVhCjNu)7$Z`^%j-nl7dYd%eVtHo~-GUfZGww^$~drUp< z`Z}VgvQytgo@JgQbM|-~M^5aTizhZ&vH$qtOixsI_(_ULlH*uZlertuEO!sk^0P2SgX|27@GF#8Qt1V~Yld86xb2j99Xl}&R zlbdB`+6nUeJxtqBC)GZOMfThA?SJwcuKNk+7F6DE-?Geb;hMCEYxc;+FTN$zdh@BI z>-8{;?|ZIW3GWGi`LM6`ZcfI{?#&u^uP3zmE`8v*ySVw>-X`mqgV%JNIjiPPoM~e0 zG-2}Umv);SmG52QlE3O^fWzJ^7?WDs{CSZ0u zE+%Z&(I59DWU_fL9M6i)4mI6o#HMs}v&H|$#-(3+PCVUuO8e}FM_UdG2S!aT@AQ9i zVTqgHuAa%Vb#KLW`#nD{k~ueRRq~6;_dAOv{xvJ+xoAxBI(KAG{p#nxi>o(#Kichf z-brH ze8K6D&($keZfdSOE$P>GR^aoh6~}F6Jov*?I)B5Kzdu%J?zm;5zH_(5?!4b^_jlKI zC|^0VQz@YH-hG9sd=bV8F@l!`jK1AwNYVdt?_c82XopLO`fNAeo?tttTJy$%uxefA zB&)iT7{%+w5?Sje_`N&qwf5~)E9 z;r!sfv_iX;**8KxR_cgzZ95-!onu1n5zF9{4(%Zue>65HoqOrGtn82Yy{J8>dxRA0 zz25IxvElnSxl>71i{JP?Tqw1%!~fogBjV9=G5%T1wfjoD9?9%FXjf9=)_L~y2LYD~ zruf{IT$_tF-BPIN=}>I6uvzX}nfPQCOYkw1i6(PGg!#QnEz;hJbCrNki!AXLrGe5Cq)~-+}-5FQ&P3i?p?UbUOmTVb$iC1{^eB$eXX5|= zv^3_$nd|FI4_w!1SH5o3RDDisNoa-o7E!zEw``hxo9*8}nR8Qu*{Q(X;Ng>8BZ;re zTYo1kQ~MOJ=pFbvcmAblLs{`*_uyClkVw#HTHsa_Vb^3^>>C9Tg?ThMnS%li&7gd%uwW)jmT{3g0LPKb+bI{dG zLD$l)9H0OGSIBhY>4gU_Z*osJsXsiQyd>+^1t~`^IU&}><)u827tIQ~VzDqYXX%xN zj4$J7U*C7aoGBsk`k&IEKNC4G?e0)izqRZy$9k9E`sinxw#|YSL0|R6Z=UH`Tc+UD z|2#ac_3)I_Q!K*16`g&}G=H+${R^3Ew(Si(dUEDGhTk8Qu3eN}qqyUDT+#oUxM|#N z+ox>am-h8tvFKwiyAQ|T@tone(OU7nBcA_Bzg6((%xU+cSI#k$3*&UKJekTE(x1gD z`Ev6wmgPs<2Esb5+tg}>r_b0=aN~v_;zxGb73z$mN*8bhX5>vj|Yubr?&Itk;stW>*&%`dc zkkI^f!T)Q2*}(Gf>BC4> z*9M-FA91d`w=zhJJNZ98yWOzk*{YdOHt9e5we!{m;RSvlCZGSe?QW-muHH}Qj0b$u zBAP`~`c`{3UzWXhGqI#5BxV0O8I2>`Jlf8b-gXV_zW79s%e^CpV_o0f_d+)}ExKWM zm9^aE+2vg~x4rziqGWovj_)zwJDZAISMB65w%#Jj!u)G5Iwh6dw2EnkGp>d{gJnP7%R_p)Yh;>j{nyBg>9aR1IMcXW zwPSYcVeTDi)^Tyo-(MR~Zj65*R>3&?#C2JbZ4-A~_1bWG3&XZx&J5RJzW(54f&Y)x zt*D!SvS-2b!ZSV}N;e)_SL7!9VR7ztH*U5wZJw<9|7|aCd3HRSMTFg9>FW0FM{XUh zYOa)Uyg$Vw=#=GSi}U~Ae*FFU(OqTX)=Nu$q7RnDo2Pwa=JNeLO~_FCL0KQ4;H6#G z&z@GPsz<8a3y6N&xpMQmijRytPoGmbx&Caq+54z_rZT<-0{QvxDthG_Ogl?f#Q%G~K~k=A!*%mQE&jbNfWjbSqIQJ9+Na z|2k5ai`U#p$UGf)QlYMjr9@50RBT!Hznk2g?d_}wzx-GEc=WZ%O;^VqtAxC|gczO( zbbB-GE@oP8GEd@k%HhfS789fc7lqVF>UIb-YjnuDyO(Vfo3ifdI^!sl9p5-Nr#>yd z$Q>t{XFuaL+w}cihu`VeeLY$uP_l5s)1bolhq#=X*bbYu2wjrB8MW$7rp@*Roux-# z&Tp12Q250d!xVes{?rY%#f^4#@0na}88uH!>znEL?^*NLPnc_K?FXhx$u&P8UECG_ zeaG}&A!}wd=x6k-y%ls@*ihosOdU79EjqfD>C%xiPMdI+2j)Bpy0C?ZEqC(~^@D|~ zk`_uj?OV8+7havK64jqwVCSS`s`|9FY{t6Pfm*wdOuDsxf<(a71)P7_`!;bue8MJj z;Nxmm5z*T_)1|}L^A$PS{gO52K(13-2j=nsc4t za0>Z%QS`jykGykhDqR=3y|XmtKDq2w+ZUahTS4FCs^%YBzR&32<`_*OCb?P7at^lrQVIseL| zoA#dTZ+x$`Q?1Lw<0>eyGVxVzip(s`!T zs>^b|eMt^asu~Lpho5iBo!(P+nTTp^Iq zB*gH2&ySghW#+BDZxu9mic59Y=8ccvPI{!rdo!E8#zNs-;QK~}jwlsjCWBcP>n6V{ zW>z`dk$G3)#HHoNSA}Q!6;z$$UUJ}xp>b;))1|=3m!|96dtw9SJwN_@CgBaik;26sLzeY?8E2}GXz!}t5x`OXr)gHJ>!!o( z+D>7~&sa;Qw<_GsG7@Rkn)bfr&%KW<4PTDSu%9Xwm@NEa3jZPZx02h;^OJgxzT|vj zT$rU{ymdjGLAv1E?1-V!DeEgFrw0zeVqt>l6 z*e9HQ7|b7>92KtOzuM(dv-UCX%US+e*Q(oXex_(HRobsO!KG9tIOz7mr&aQOF7JJ& zEo(RVdGcJ_o#l;pB|8}-O8j!uPx()Jw8d9r=9vPprQD>_N2pEa^a&IY&P$Cmnj}xQgv_;18RwiE3_JrG@{?-iTVT z;@!1n2F03ZoPJH7JaKbQ{B_gKy}jjp-zP7gsJ?!i?uu!1o_8%;_$Xt&?xJf)-Qrvu z@?##BE1KEKiPoP;T^HeD5k6ztljlK3N6Zwb?YpzeV)MNAnDp!?3zu#%irn;N>E^GE z>AeQmW^2W+zF2aBvBgXxK*TcdpnX-Y-?R;z*N2L69h$uU6#GrK#do-78O`8e@4mvl zSXwjCYo1j7qXZrGui5Ov@v@wTi3jTTo!D-6!1QZ&;RB^f zXa6*=nzC+UOm6%1Det5M4r^?e{abM0O1*--;m6$`ob%tV?$!Ju(NZnT0{$54VQIyxjS>r|oH6N|%b zer~VsTq#=ke{=Wdr<*EuW(zi(oDNWWWtU<-i+hS+MsNnx=NX<}x~$=|YhvqU$~7;T zUvpJra$^j;;~_Es{wLLKOK$w$Xi}*^f8Xzw)7K_marvDsxI5{ThxWPu&x>C>aoI>_ zYF4dKiP*!|Xk*`E!}s*;)W;4czh}sYo;l!MUwdj*DQkgHq2(`SKgHgCXBITht#6lM z{ZJbtYfjENH*dps#?{&u z#euUw+*@0JZE-cProxhsZ#S9Ael_k0J0h;7#I~U$HjiDAEmx_Y>(Q&5KMQVTKaMtK zwAr(A!kzR;!8m)dAjb`Y7tPq!?YDnV$p5_JwT14=r8b`=cl-9*SJ@wUmVfd{cJ%*m z{x=b*EUD zCKauiy+-(w^VXcRLQ_8qS`-R*DZRAF*8Fc~o&7R_=kD>(2AT~1`}Fockxq5aQV+0u z7xQ?%)18lJl`m|G$>jdK-s|TSIWcCxw|`su^L!>w_|3Or)0(SyRz9?U>gJqhyF;x` z=g<7wnVh#QUleI11+(g(V*RWe>AHC9tp^Vk{~KQ9RQSo0CLXIS>viqy#KCn79b3(~W0+dMwCJi%4$*>jgw z?Z-0zTu-~~<}5Hd+b`>q+5hABwb)|X=RGm2Q#g>lBc@3%`~Q`O*tmk6Lgq39&w?Dq z^QWrBu<+6Zs|M_kDU?pv=E>S6Cl>GQ2Z_IX{FKQaL z@}~|;Ip}UHay@c~X+;bBLBS16A1^ZQzc%OKp~*&}Iz4tl@^$=IMU>AttoM0f;=lIa zmc6RS-}}soXnExPCt%Nx{u?FbT7REQS?x4u76{Vn;$E?zeXHs|?+>50+`A@jB9Ubi z*L}c{(}KxP=VBd;(+wY`@Fx!L+7rZX zoa#Nn%DO=-P)KkhSO3SLqUW(ocl-_s7EsH*sJTwSf8F$Z#U7DOQQMa8HZTi+=FvRk zr+)+In+9=%-00V8)BbM#TzhA-ynxBtXvd;+<_n)bHD6cvC@M8a?3=~eCiP~4J12KP z?YraI@nXx7_O{JV)830-iT3%GWBa+laC%Go9+ACwcf_zwVL5o_NA1y#yCPdlzVD7y zVdx9tlPSNDE$oy%ZT*50j(F)64x1)hv+R?~-;mVGFeM}|j737T`Or_RGeP(L-nINo zm~*t)d=6t=$dr9zr;Otq?({4+&8`#Lr)qn5MtKC!{4l*nQTG2qUjm!#g?8@09d>03 zOKD6`;mPUp7wbQ*y;sWdrE!} z$o`Te68w20C(F{u^PPmRm$fS?G90e{#?LwKk=<9$tyr%vQ*2FMXiWeM#h;fag2zzRE3IB=y4i zz?3)E_lhokUc9%W@p!6Yljh|#8ec6V~S#Mt7dU>DU8!3*R ztn#O3Owln3`tr4Ayrm?k#q5n7Y!-fHnEf zrp>BSmVx{?CQKBFiQ0Nk_SnVKE8ivis)2T5^i# z-#qWrIU&O`{Gnsn<1LHJn**4>JdphQQHOh4xz6quhna6qti7V=KlSp`;{iHz7u@{M zslA9JPu9)&v-Y-X#%+q}w>BuGaxS{w%wC?u;cT?CxZT6|_tYK}vrzkI`&WE+FA7|F z{d@VRpRcQ>Tt14Q&w2?8y}i3y+g{}G{hrQQ_VLo9LdJD}w>|PVEjuib zar@_KJ=cuOSCVHHMP=wXsI1jlW@c0H@cF!>ze?t0YcsQ|n%S4_3Z1@o$^Boknmr2t z?gem(aP7>i778s$FI$pV%IYL7uH$I<_->uTo1<6$uZ!0F79E$&dwPzybl}XqttGkF zLk~@VT5NUo_@7e`-UgrD##%9L-3jmIziY$iCOQ`9Za=JE%(nTPt84qqNeY&kpPVF@ zOU$_bCRB6oihaM%%6F>PC!C+u@KfIAgrNL!*|d+`^QX=WdbMx;(7E=<_L!~8+(@eJlGs%{}x4VJs+R;^Hbxp8lhb^l3mh~SG4w@CxjLM-zs_@JpLUwt3)`$y{(HjMgP8VCSrpFPE4n-VgQSt! z<-Yx#bI-Zuhk1QutD4$!Wm8IdxsCOd>lde_(HW05LD@Y?Z*3<& zdmbSCWTN-OPrZs|Zq*6zPyGA&_D03R26=AR?bH8U>^>0iuCkpw)xt=mW!r_ArL3Dy z#kHSZ`2O!A(>|6WgEhYwoc*>uYOU**!1r6;{9H7Dy57CkwR70_w!g7od~Qd=rO6%( zJ9Gu+obgq$xoUr-=TzuW#t?FIkyefKo3&S(J_H38^w0C9A=`APwpVl-4G#xnbf4{Y1kV^pXk|t5F zHgASLeokhg`Y(?}G8LvQll2i7dg!0;(BN`T&HIpwu3oBqK2pIw zZdyLm3-M;1{URH=|E6*qM##LkkGaze1+mYMgjbTGh;^d}3OLz0#uR zTi!Y@ZT+eh@Y(jbdT*?zR95p3$Xm&O{8p4v zm392wpRa-^b+~?;XK{e}G1F7VBlqVRC|1t%a9tu$_j=uVWor?Mqx#2`@A1q3mCN($ z@V~QVN2yWx%MX0JZym2yxcqg!n#{tZabY~o-#IxX>--(OVsgWi;1 zQTfxa?t8NBr~ahu-u{EWF*zxn2c}QBCnl4@%VJveG=2Gmv!RW*&hOtB*Rf%yYLoZR za9y#eQ$96EEU#E?oK@ZR?0(-b+wTuKCmoD8YrMvB^rYF^ zZ969M^bfMvHybaBe|^P6k+x=DA%<|XVreP^3kXuZSC`1OxJCY-i2e5Ejd!7s1;u;k?E1M~Lh ze%rOdVpH9R3%8xN#jGm4-8<)rMW=f5jqpzHEk(iS7i{5dR+oK#)lpXZp7mp%A63CN zGH*5b{Z1(!&695be0KTwZx5QE{qMW0$`iBmjnbma+ty~kK3$e@^zg0>gS8f%Pi}KK zvM5HbofLCbueHh|-u?QPX=()(vh55vQjf>)HH^6VP2+m+&wnP(?x7Rn6K3sph}XM( ze~)ACjQXkW&u%`H3V6cic<`>SV{fr>%h3~yB`@$kp1^T@n+Wr*6Ed@O&OCfrXprQ% zDBHF5XWpamc~ebaO!fY|iE(SxkDZ-Qf32}@{W-&`X05^@*GapjMFUcdmPzb<_3+Te z(8b}qe0Dec?+UEXOVhci%ho!}Dtqqtz@Fsob<#hl9Jb83ye{{~v{g|LF8rPuu{m(x z>n!&v9->^4dtPtLTDxie!sENvv&@~jDpUUGxnu?=&qtqkU$uX__Qx#2tCu`0w+jBe zX&dj#>lb-um5u1l!gPj-yi4~c{IjcA|JT2E^X>gbp;>pmZ|r(bUmbW ze|LhYQc!T=wFg%;vw{Q|7TlVX_P1Gft<(vIw_C2u9}?xrZd;*)?BlsBU)56Cn_*#k=Vsv)ma}UQ<_AFR*b5;CgZ znKf&Lq0F<@rW|)oW_j5^uWXzfY|A(8tzd@5mT24T2?aV2?(LqiHGWcT_x_4jk*BYJ zAMJ_M>2@fO*tPu3ly_0Sff*B4F>bxS>|D}40oVG563sZa8xfg3iuXcXW-jTmtMn8h6$fzrsf~zS>Py| zIc=w6lz5%O#yQQF3iox*F5DH~%6L}BasKD}ts7j|PrG;a$g-LV63K?rRy7}7dgd-H zdcHCxkK^ohM$LVt=Qowu$ZS)8JvsWc!>(-?HDjmw&pBc9a;cuWZ}9o4lJEBF#))w3 zePnIYy|B4bk0tUEm+;QqKPv?HKJfkN-dugVrIppa%06!=@75Ep-VIhq-BWK=)_N}8 z^SN)wCn?idVappak4gzXl1)TE$&b0%b&mN>|%6OU+@`psqK8)yiIp{b^fxu zYT}m<tnKdtraN3(9#Q+M%GdX* z_0%_?%(9OOK1+L15i?8grFFxn|IX6w7evxk)$C{M{&^dF`;^axp1n59X8A2Q_o=_* zC?zMKz~A&<<&#!-UH#8J+Eqr^>~hw>IWPEWzeDv#oyzA`PfB_FHXnWIyXe)Y`<-cD zB<=I3J>K~GI)91&Q;}xNGcV5@FWy~iws-dI##N6uYAXmdXNSD!<>Z*VY*)B>1Xo|& zvL>#Xt8dB*o?n$H?9p^|$+Y!ruUf{HWZv2C8eCc*c{W7!_>SrgS1-J%&UoPP;c{k0 z`Rx-2=NGy+HGP=w%D(aL()SZ)P3f0Ad2qqOMTdS~IH?%jP%^{*fWOG2S?>Y@XUSE) zyR(7O;a+Ci^48GkA}=26ojJ~#j5lTNuNd#>+@`!Sy!peTkVVGa-OL}4?c=yB&|24E zV<{;!``;x2w(~mYpBzZ)5?poY?26>$ZEHXIEUs+UuCo)eXkzBq?2GF?^U$-;c*X{n z#3!b_zs2~>B-SW39_Q?+^L!9*kn(xu{fhl+&+{t#xn5mYTH5L48{e+OzPsV~#}?O? zH){lIip7P$p0m2aF7BL?Ry^IyTC=TKuQunKc!ig>+k4*t*I$o*iC*=exKGoHJK24{ zqr{QZAhzguS%$$ZY_sl)tf;(poYnG}rsz%!-Og6?xGih} zncjWhtsiNoeiRF>52>1Q-)htRwGMAzyqXcPLTk~IBc{3bCiff6Zv2b=X72gnvayxw zm#0q65l6O}a(+)|yO?LRcd6E&qt0Q=T{8c++DT8HSb1E<#<;Qkyirp3%yZhyd;ESF z3R(GC^>j1aF?fA;by=eD@%z7^&8{xqKPAdvybt3FG*dsm<@J=w4BM=q`0Z9@jlQbt z%GkF;E8y1DEem|L_%_o5+R_UNOB&lz?pXWTwGtMBOZe(v`=JG0>IXmH zA7}fvS6_8R+T8=1)27-ON9>%-CwV)P_YQlD^BaAx5>}@0!cBV}S-bc*3Ng%M%2-tN zXvNZ7Ymc!ghy-n`exB=c*#GL(ct?g4**Rx!IxRB&r2f!iv |i=Hz~5bf~#c&X}( zO3ekB-u` z62Y94R!Z!vw}Nr zJv{3<9y`64Nie5Uwq&ym0Z?DU&?u$v?p_>0dc^&u7=S!Ccq9m>c`Qf4i?MYbVkkUH#5f(V}0u z^w7W8bDlUyv2VQf{cimP0~Y6}i#++XdX^+ho%K&^yDM16amji1rPmL0J2naAr&v0s zU0r2<^z8AfFaC!l)3-#19ZAjSDEQ{=lh4^x_qRJH=#IN!+#Hx<^2e-$ITWTTFH|9yYz!ofdfHod&p+SD0NU60-N+M#lVr}m{s;>XS@`R``0 z>7I7hPEGbKch4t%sT*A#4{pYO`L&C`C*rmAy&RS~*B5MfEWlasvET>)oh=OEo{zq$ z+=*XXmHASGNiOJfeeKpc@=d(2d+u#yJYQM;`t0G@bw8LqS9#C+9cFmt4AaDJgZc@= z#T%J-iT(d|ap%mJhs{}zUSjpW*C-pgv^4kwe}0MMk4McxFZBBBZd>JX+J#R17`3Q- zn$edNswy4c7o%KPU;F%3>>(e|Yc1LLP3;>tgcj=<&3uASx1={|@Mlkb zvqJXey!)pb)Q$cy2D4pD3wSz5F0ziz_{aO>j5e0Pv{DAn|sW`g|Gf`$+|6*rCtn||prajng?;I0hVG-od3gqfVB?QYsjK9qdcjgm2c zahuO3T{ih5OGIc<7N1WrSJJjF-`kvw?=ITKyRH6v@zlNxE1GSu7sv{%RW>}c^Xf`I zi=qRUX7KPTxvh2id2(@%#?q3W_xsk!P1E_cP^|aYDwF+x>IFhxy;~;2v3Sj|f{7B4=u`#HsKn)~|T-*`q}5pOl%b)>(6dFX0~@{;u(ns+D6{ zzx`wIf$hrdDH>11szSL;mhrx05K4MmF!$EH&HZ%`r?&2Ct!P)i^6`&ah^yyYm);K- zGsKtt)PECd%X&pL4K-l3T%7G=I;^0YWH zIZCDEs9*fy8*?XYa{21H&`qNAqVK1KFvaCYekkO^=eX}Zn3ugS`?%LeukS;g@SI=%v1_k) zo${P?<zEOGDm`Y%EA4LTc^NOkB{o(y}&Z@yI?U)&oE1ulDEg`l^BPDzTL!i^Ly~P|03&h>+Rcp1p!d(0LZWjlC zon&#fST1D7DVf#1A%ZK*k5*+JW!Q0Q@*30o{-qmZQa$A>Tja{#u{LSHELo83!mj)N z;p}VLTg)fUaSZH`5!GlfShDGj3f143wq?=Q%VsZ3x;=LIGq8SZ zJmRJK&+hu6sBeAb9tQ?eYPF_-+ArV&ZFPLR6 zy;e%AzVG8)#ec?IgB|{AE)7zhaoL~q>}{Ez_Z%-GHTNBOcwDdG?aTQwEX7O{teJ{m zalH~2EsOrg8W9&q(oyD)xOF@0U* z{tXN7)jfW#Xy3fScel=Di~XBtw$^MdUioNB^3)b9?Oyq<+Fwru+wA%8T;}&UQAs5$=1hh+MZ`+d9Rx)&VH;0n^0h_tT5T9v*+TM2CIu zO`}O!cde@*I9#e?D?92FYCeJg=t0|X*GR@+R@WD~o__T$@Ybu?9PMK}d^8Jgd;BVG zEW`pn3ru-v_ZH;ycxzRj*Ppz23Gi~S>?y4O1_FW+|dx8{lYtS@8AY^c3pv+#{W zoqLSe?X~{=yCy|}U&-tCSjOLJgJ2S9SI9Hcpn*UJO0$X)a>~DyRol$ zM6S*2c&Ds;>b8iL(&tj$kNS5C7hJcRu{38_+55PC3C|;*c&u@#+IL@kpV!i~5{W%G zY8nrnEXluPc2L1zYukCnPr0QzEg?r-vQ#+2qZB_*n)1p}%`)teE*bvhSJ1;?_4BTwg5GY!pvF4_Q%WD!IO3--GUwo06wr&MYll zZzwJjwrDM9bb^t(@j1mq$70xDOxSq5UQpUbxL#R$b*tdcUvHb&=W+-hp0qeVc$xck zZ^yiOGFLLHT%XPI4GNTfmVG+p(EplT<+ZVz6M6YFn~nSQnf6}_sLuT8CbYz~)veQ|*|wlKqNnbFG+t+}dBNmqZKpHY4~^Jca3yH(DK#ri)td$?+S zznt_)#PocSsFcr)^#>AOMC^ZVbY{-Q|6wPSr|sq4&RJ@%yJUYIZ_cMWE6c}`kNNM) zSpEWW2<6qDJ(lLD@_u9Vi!J&3LHn}O!xS-$h zQ9r!v&S`U|<=2NA~{By}uvK^UMy52am`hP0l+iB-#NE9d(@6yk| z(Yo=_e#r&5C$Z;qzV;}de0<)E-`q^a|9anXuHY}rofvFtyiRJ#gVIORu?L*?)XR8V zgxOAu?$#D_<-QqycV>&27T@aS9^zhHf>*YEahmbmqc82^x;r+%XWB+{v*+h_$ZxMG z$d!#+Hrdmg#ZIuvqD-^+FlnHTutf*ra7@s!kCp6|Ov>oZGwE_LxNV zs~P;LCWzGH@-u)3qtCe)~|FL{s;4$Y>u4v`-fQ-(TIdg8@ zxxI2%wp4X`)lSo=TmFcaG@acu`OellgY#LvU-ZsRcz(uzoyGa&)oD}885D9pY@3p` z>+TBWYj3YHE3N*0`I$z)lvDc4wY|5mU!9_VY0LdH!E+@ncC5{K%+=d)>CSq=lXvN=PJC{*=w#OsO zZ4T2L%d{job|@#Eny|K|@624zX}{yyADHLJKjS!AUw5eda^FEN8OfLrBmi~pn|9`w$DZ>_A~ z%XPiCH(s?`p*JP6b9*?(P>XN9W}geiyQ1__x8`hEwd3 z>$Y9`MA$%X@l zzqY#PEKjok{J~#p+wy(u++8ZKvYn6V{c7|6+3b5iu4p{Sm?|fFIiPiF?XTH)9A-~F z>ixoalaJ?3$5#oPw_Pk`yR-VbZ_tO&5*(EwMQ1!L^zQCHenr7a`4eYH_)mue)1RJj zWjv$F<*RGSKV?-zl&||2>FKc^G4~4tWJRy9X(|)Qn7VM~EM^&3t)DXSLE)EouH<;Z z(zLCht>n_=HG!9p{7TbNt&+cJbN%(dK=!wPMBlC0e&4-E`QpOg6C!>WI=%e$X-f4b z4Zkf-$DWx6MTiT@UA}QzHfhycw+qu-S8l3pS)DRXJ2p0Rr{ojPAM!7{xz}F~O$gFI z6~=F+tt*~6W0BJ$%jPF;?-czePgS~fNL%3|7srERtB$QVF-(7WIaq}2G z7nyrxy%P8(P^cMZ@+SBV_bS())$Jcc4>f2m_1Uy0Tx85!Z2J54XR@4p zaYEdoG~o1}uhZUC=M){_-Zw!l(&uQN=ER#*rkcf`DGBqpk2Yi2&{(gamcP~im1E(I z&$*Edy5|opX!}>py`$=qmF)8sT$gS}A6AWjwr8(+gpRRoJonf3_a-X6UUS4JTniLl z&u+V|J5%>r=k+95S=`H>>(j=z2G8bIrSdxQ?{_ z{C(JQmP}5bjD6$u5Ep?;_13cJ^4JSOixx3R{L(LU?@49U3(am=^!J19ioetE-C~Gc zb9M22{z}Ow^9vUqZrHTlZOiA4Pg}g$k34vH$iMuP+t%KLmliyD`mOGh#hHf|3s$x+ zPi=cz8M>Nh-G39-$ij_5+Agty3|aE&sSHVZ%%1aWvpkm9**$jOE1A?Kt1Z#DZ#NIW4>_R=i36Hu*}Z-#3(6gP?qWy z7b%X2&PkJ*Q>-^;-u`1^f6~wC+M#t%RV}Ws)eT9Fy1@MGihsY$hi@!%>u-oZ(Jn~d zVYXhOT(>rG?}g_lw3%jK*!!SDcJ}jazs;ZTJuekhSI?*W$60=<^@1%kdl#LvnEH$P zs_BxC%9EZ6w5V?t@8!HJc;-Uf^w=5)-F-YqmajKGFd^#`{}=WN^W?M^RlmzRWj*W;BD_ibCdrpS;)NL&&nTPCtclZUpXVMe6H8^ynTPZaIIfr7eB@N zm9cC|(jQr_lfO@vFW~#Tbk{*%)umg!d(XvnYH6tjo&P?sBf~Z)?dM6+uy7TPb>C9T z_vUMu?X{U<lA&@wm9|l zkG_Q;dg{9Gmc5ZmdMh<&uJ5FsevAtJv4v|aZnsM@IeI8O^tvM)>T6mnbjGJkdfwiR zEKjE{?TkG4t(v9eq(b(NC7-`2bRIY1Q-AcZRq3nBHtzPeT<71HAOE^_VdDDc=V6f& zzMT6bB=x6W=w844)t?3bbT0q(eK+~kYlkh5H!u};t8+g7?fdO2pIKyfz=_Wfz4p)j zH}}H5yp=Jtj~E?%&Mw7pM4H{=)uwY3CM;J~x1TN`+jm6xz}$2GpO*4?P1?iN%*K=) zDN_}vQ)|LH;c17~(obA3H(zRgAymXT?Y`U`X)*R2D^C1&zcQUkCn}!VOToE0A>yi9 z@8VvsIMHmM`wX{NX{EBP53@3SQtrWWZlh$npUPhTXIjEFx#}NZ2ke=C|3J9I*Apim zgznz@%)=<}nBrIFWv_VE_7y693Z8Ro`i@ZPMb=qNNnUrKC^5cq7PDF_|J^TcnThjv z6+f1{YMH9voGzLDynJ`Zw;Can?-vN$ATa>HNg^oNU%y$32+S*4qoRj815%)Sd?WNRPy>*9X zekeP$e&P(5CHsT8cD&TTy}{0=_UB!<64P#J-9lrNM?du3?_LN~z51~_PSAvw(dxPsmN7d-XwTeD-yk@crDr0dppZ&27(Z|OP5=uB1P zy*16|;cJhvx~#Y5U3+o)1z*-z&Udo{5)^y3XvBIN{=R11s&@Et7}KNUw|1q!&1Jnf zY2K8#p&|-f{vBjkx-rO4_hMys(wst>%ic31_#SW0@_Z@wa6e18bVN;Kj?>Q-ZT2D0 z{1pA4xQOnEO!hxlk!0^1_41@;CzFc7_TY-k35ge$cU)T)o*(zTyeQ*+Ex$(hlpoW# zzw221U5@`vco?Uc`|&-uryZ*Omh7y}=9y|Z|FoIDsCDwqBMfS@nbye3Ncnd@Z3=as zch#;zAJPka2x#(2&YYsWQ?;>#JYX!B_||J9lKkon&^!MS19Th^Uf zm3aUC?9@&BZcn=LgvsvH9BDre_wuf=rnhJBo+=BJsxkeV6aISLgloxeudUC%=Uc&X z?`Khsd`tGhWf!%c)H8l$DslPjGV`b8w)c8xSFk@)ycGOd=5#Tm%d{P9CU{iuN@o$< z-yWKxnDsNk>ZRmo2T93C%f)-kSH5FdKI^@q@SScGAEzWIYhzY^_PtsK3*Sy$7hn*` z?B>G|a`nK@6BpeN_WfrOTkBbNa~prfnKKOQmfJYmZnnR%drH%L$6Ko(?rv;;&MJDh zBicq}4wu8ClS$gzOH+J{KYO;kN}XjBqsWoGg?rbZ-A$1n%a=wr&lRvUo4xaNub9Jp zpRCGH0=GLkUznOzXPU&=dmj}&_Wy;$AQMt-B6Kj@q&1|&_4P2IM|NR~f8D(= zTAr_QN1z6CqvxHV_fd)!r$sq0p1G*L*2Mb0gGlE=9*&?10hjmhVRciF2|C;Cs`Sr3 zy}#RdH`|}pin0HFRNh)n=}G_gf9B!;(;7Dxep!=d)O|SPuECDYEgz15S^i!~e3s%% z`TX5U+D~kn|3b&iK+FD#zvq0}@aCEN=No}D>TE7JrR^7EJa4&a_nyKNHzx$D zd_FI5=8p51qk63+J}%m)0}L0dzp6QYONKS1;p2+$@r}j#v3cx%8VC2xUB=Ft=D(n{ zR!+3$a>*|JA2yqgX^HZl6s$95k(?{n95PStPth@kQ(Ho0FVr%5a-U%j+{*FVY*rjY zbosNO>qd@i#IN0nc(X(%M7zH8b)wI&l2u;{vjs(BTn(p1=0;~d;`p+062EuM$EC{a zVs`6Ceq~#_-!b6r2k{A)QeZ)0r4BP*IQIU)wT(4Pg;(nt zp1$Pqw)VhTPcs|k&pXOpudMPqa?9iX1?Ar!C;uuhU}a5FeBmUtwnu8ZPVQ4T+1ok4 zMdtU~oSXfaea-yc*Iu+5q^?S+So>Y~+#kMJ1YGo!+4*(t zKWDaEnNmtd6E_I69B%vE2CY4 zaza7f4a^?q~Lx2*{8LWXZBhx_w;-eJmo`E z&bgic7|W&yD;7T#=2Mq&O$bnIS4vtio2BcQMgHbJ(=69+DhH<9f*Y66E<%Ab|({6166V20#BS&{SYw;DOc zr`(U6QSb1dPeWU`^|Q%iv0#ztRjcQuT>X@~ttqTqrAzt9$xTeRkFIZ=E0H~~kny8d zw`7NhT+NPtwcBe#nXlQEaNTCOdFNDTjYdbf(E^7TX|j8#*ej%^HtGCO{j=5bTDo)T zHl3x}`^3zoQ*p*Zzsvu`e)A0Gr*EIW ze5ks?x&C*^7xT;0t^ezF-=BYpPq+GO)bEM2mG*s@v{|EAR%{Aq(8bB_cH5=)yY zm!7#QG{Q(m<6gmPe#YlbQ5TlFwrrZU%V4=3XU-#^+p@R2D=cQa_r2h-{#dSg=4yV| zvij1n)XTqWq;5X1c9mHf<|y?;*GfX`oQP&=z;(~ByLj*JuJLc^Npdks;*9M0|M_sB zRFETw@!jYCF;`N5$Q@moKI_D;Oj9wV^sT$4K6?FGd+pcFtC|aEoL%&GHACN$RzIGI z6B9d|g{G`)=UnD!KPls8t(r!l^XJ$4(RZEah=-kds^{Wz*VjJAYTFZObv5tlNvfJX z9`Rir%q_lIsuS*Qa{s@wqPFbLkBEYW&)wYp@}?fRxT9xZ(d%Aj#@}xaZSFAnZTN5IE z?ET{pd!-%*=gwH_`>)Q_dR~!y#x>t7$C;P+Ri?51n$$4wXcwv+JG+ar>L-{uWKwXJzICX-&yC_tEsR0OZs}cGGaF+Y&*he$yk-Vi}|HNK|2E*A0DIcJje+k^@n2r4At)KH|2?`jF?@$`$btHOGfSVeNp)`h*LIa_ z&mSWTu47BMbWRy2r(ff}JLPbEv#fQJO_I_Xj_I6B+(UZTJ?q&rRrh8#m)dr|d&?po zgs%2tYif^LpJdA(b@8J3BGZH&^)I!o-O`h;EK!}%AaJBEN=B>H-f~(mmoWd18ryoY z{F!HW2dxX|dBBur82Y7{@542XVy)cGm6xNL_I&%^cBtTfp0~M5o}ZQMGx zth@UvQ~lVnEw?W9dz5~xeClHI#l88agUN*Ou)b7T*^M3(nN3(`U;n_)TEg++ne=qI z{r|)l+m=lC-gl<>hxI+7Hz83@G0V7lx5?j^(tUnjE}1v3@XbmV2Z_@uCITk%<&y=) zE-Vu}HSz5l_opjz{ko8)Dcj~foVypiE8 zIQ-Qzv?*cE9`PH0lF~cxKM0rglzv`1vFc`aNJ7SCTkpc^d)cYizVE%U`AyH$<9Bo? zcNDX#ww#Zjm;6of#;ZAf%o1xlDw5Q%^t;K+m~lS-=bgCt`b+otWl765=TCE->HF{&MAf)94!eVE2+|DM#KWCNG}cuQ^{`OtCV0*R)@Y zu5o;vnZ~iB+WpD@uD6{ky4TL!tvb$Q_wQ`0yXPOtjS68!ZS^(*h6dXXhPLN!eej_7 z?Zr9&YD5)(Pnl!YW-+DVsKCPKkG}q9>!0zV{+Z_Eh3hum{#^K=D`d*L$Ns;4-5MUB zS$XD2@cl1F!ZV{C8+@jnJo7@z`rzRb)y`>KCT)6p_)<>JT$!Al)sq+P&ZzyddD|Wp z(XDJhRxaWSyk^>RF<|!BS5cRj95%3gP@|;5!4UT^R{fWDIGd!6+*=)nf~}PsOd>Y- z_WEbt5OueBDE{bMmbQ1^3v<33c9W*Jm|0j`F*XS0XuRl7=gd2-JzsXqsgT^`=kCi- zsM#^6{;T)ngwKb6-dOVGamSV!A11X$hM(k{()1yM?@o`)vSlJY-*w|YOKxm;dY6{m z|8#PW>XG{H>0-`df|vhamzBKcxi;v7jZe3RN8ptgcfW@-ELpj}b2?|sok-`2Og}?J za)nPM_rH01&G(jJVSvq@9b7ZNuP~cG<+0GL{TI{SGI`@aS0xCqjJa7Ex^g9RV4B0- z!ZUeWU)`{qIk8|rpa1;cE0rI&ggvhc(yiNDd+n_1oc*(_uHINOp+dp0E=Pv@PPWsk zh%d6*ANWlD=JRoX>*Z2amsR$)KXPLekAKB)skB9{FLsHo+^Z=fe_q_ljM2qZX^Pu5 zFZr0~L0>p-HyqpiaH;fcwMkdBi@(ffc_8omKcZu*dXs*`HVxrxIW7I_N76T_{y)m> z6yM#z{mwcucxmrbhpxX1-T_`dm-$*ucqrm;@ewQ}bQJn$-;J-9YkB$9pQU!#ES-m_LDTrA)Iq(0;Z@1l>@ z0dgKf+JOq+n|@8=obNl^Gvc)5?zAoI#D3%kU*b!(6hAH=w z!IM2iCs{XN zMO!;v@YbPMYx|k~k4Ts+Y_2`fEq=kRI5gw<#|6daM=L+xxZre~cpElB8QVr1guc)pmM|zI9#InqH#x-u|(*M_E_ba|hr40^aMp@AG!)c zol8a5?k&AcY*!z2%}nOlRZ+}hP=EgMDqZ`HCmYJX)u?zf zMcb~ee|t;F_FC7&yQc!rbtz@>VZqd()ug}K@BpWT*^2u(? zT*f17lvVk!e7~XMYPhR3d9(dP@AOUKlUp1r&o?sMRu)KAIQg}bdyXoP@e8(yNmpbQ zb*8OoUoEA<|6pE<>w+`aQsk#xdHK`Cqb;!8{&>Q5sZZ4hUcLUWE6#UW+cWgnggX;2 z`cB^W_8!ODLv3O^8+ShIJaA2OTT|_wnK$*{zS+0MZFV(8M*xsvAd-`$q;cbj+w}2DW&pxt#?{YPcTfg_*zx_Kr@r&%82%VUV8;@8j?O1UB z!p#Y@h0eyEI6CvCbi?Nx|NnDMDGPpD)%@$Bef!i3%{;4+7j9{r-=1Fjq-9|a=Z*_o z_5VxC-jCURSx!@<`+JC+#Uk}PA8zMOwT;@Poy|L|XsM%t>RyNSCzDsI9A{B(pL}Nf zryp9k?y)bEH*T-oZdm)>YVW3l8Z*-35@c1D{yyrP>?s(`>-OH|#I7Ko&C`yUPjGZw z?UBo1e!$}HKh*y~7hyw`c7AI9=sax7B=&8Hc;veyE main + extraConfig = { + init = { + defaultBranch = "main"; + }; + push.autoSetupRemote = true; + }; + + #gpg signing keys + signing = { + key = "9AB28AC10ECE533D"; + signByDefault = true; + }; + }; + + age.secrets.serverpass = { + file = ./secrets/server-password.age; + path = "${homeDirectory}/.secrets/serverpass"; + }; + + age.secrets.gnupg = { + file = ./secrets/my-gpg.age; + path = "${homeDirectory}/.secrets/my-gpg.asc"; + }; + + home.activation.extractGnuPG = '' + ${pkgs.gnupg}/bin/gpg --import ${config.age.secrets.gnupg.path} + ''; + + #fish shell! + programs.fish = import ./progs/fish.nix { inherit pkgs; }; + + #text editor + programs.helix = import ./progs/helix.nix { inherit pkgs; }; + + # Let Home Manager install and manage itself. + programs.home-manager.enable = true; +} diff --git a/nix/home-manager/progs/alacritty.nix b/nix/home-manager/progs/alacritty.nix new file mode 100644 index 0000000..50cadaf --- /dev/null +++ b/nix/home-manager/progs/alacritty.nix @@ -0,0 +1,124 @@ +{ pkgs }: +{ + #use the fish shell + shell.program = "${pkgs.fish}/bin/fish"; + + #some programs can't handle alacritty + env.TERM = "xterm-256color"; + + window = { + #using a window manager, no decorations needed + decorations = "none"; + + #semi-transparent + opacity = 0.95; + + #padding between the content of the terminal and the edge + padding = { + x = 10; + y = 10; + }; + + dimensions = { + columns = 80; + lines = 40; + }; + }; + + scrolling = { + history = 1000; + multiplier = 3; + }; + + font = + let + baseFont = { + family = "JetBrains Mono Nerd Font"; + style = "Regular"; + }; + in + { + size = 12; + + normal = baseFont; + + bold = baseFont // { + style = "Bold"; + }; + + italic = baseFont // { + style = "Italic"; + }; + + offset.y = 0; + glyph_offset.y = 0; + }; + + #color scheme + colors = + let + normal = { + black = "0x1b1e28"; + red = "0xd0679d"; + green = "0x5de4c7"; + yellow = "0xfffac2"; + blue = "#435c89"; + magenta = "0xfcc5e9"; + cyan = "0xadd7ff"; + white = "0xffffff"; + }; + + bright = { + black = "0xa6accd"; + red = normal.red; + green = normal.green; + yellow = normal.yellow; + blue = normal.cyan; + magenta = "0xfae4fc"; + cyan = "0x89ddff"; + white = normal.white; + }; + in + { + inherit normal bright; + primary = { + background = "0x131621"; + foreground = bright.black; + }; + + cursor = { + text = "CellBackground"; + cursor = "CellForeground"; + }; + + search = + let + foreground = normal.black; + background = normal.cyan; + in + { + matches = { + inherit foreground background; + }; + + focused_match = { + inherit foreground background; + }; + }; + + selection = { + text = "CellForeground"; + background = "0x303340"; + }; + + vi_mode_cursor = { + text = "CellBackground"; + cursor = "CellForeground"; + }; + }; + + cursor = { + style = "Underline"; + vi_mode_style = "Underline"; + }; +} diff --git a/nix/home-manager/progs/borg.nix b/nix/home-manager/progs/borg.nix new file mode 100644 index 0000000..b928cd3 --- /dev/null +++ b/nix/home-manager/progs/borg.nix @@ -0,0 +1,46 @@ +{ homeDirectory, borgPasswordFile }: +{ + + home = { + location = { + sourceDirectories = + # stuff in my home directory: + ( + map (f: "${homeDirectory}/${f}") [ + ".zen" + ".local/share/fish" + ".gnupg" + ".config/Signal" + ".wallpaper.png" + ".ssh" + + "dotfiles" + "Documents" + "projects" + "Pictures" + "school" + "justfile" + ] + ); + + excludeHomeManagerSymlinks = true; + repositories = [ "ssh://server-public/tank/bak/laptop" ]; + + extraConfig = { + compression = "zstd"; + }; + }; + + retention = { + keepHourly = 48; + keepDaily = 30; + keepWeekly = 26; + keepMonthly = 24; + keepYearly = 10; + }; + + storage = { + encryptionPasscommand = "cat ${borgPasswordFile}"; + }; + }; +} diff --git a/nix/home-manager/progs/fish.nix b/nix/home-manager/progs/fish.nix new file mode 100644 index 0000000..25e6ac0 --- /dev/null +++ b/nix/home-manager/progs/fish.nix @@ -0,0 +1,65 @@ +{ pkgs }: +let + eza = "${pkgs.eza}/bin/eza --color=always --group-directories-first"; + cargo = "${pkgs.cargo}/bin/cargo"; + coreutil = "${pkgs.coreutils}/bin"; +in +{ + enable = true; + + interactiveShellInit = '' + #disable greeting + set fish_greeting + + #fixes gnupg password entry + export GPG_TTY=(${coreutil}/tty) + + #pfetch on shell start (disable pkgs because of execution time) + PF_INFO="ascii title os host kernel uptime memory editor wm" ${pkgs.pfetch-rs}/bin/pfetch + ''; + + shellAliases = { + c = cargo; + cr = "${cargo} run"; + cb = "${cargo} build"; + + # I hate the red background + run0 = "run0 --background=\"\""; + + # from DistroTube's dot files: Changing "ls" to "eza" + ls = "${eza} -al"; + la = "${eza} -a"; + ll = "${eza} -l"; + lt = "${eza} -aT"; + + # gets the largest files in a git repo's history + "git-size" = '' + ${pkgs.git}/bin/git rev-list --objects --all | + ${pkgs.git}/bin/git cat-file --batch-check='%(objecttype) %(objectname) %(objectsize) %(rest)' | + ${pkgs.gnused}/bin/sed -n 's/^blob //p' | + ${coreutil}/sort --numeric-sort --key=2 | + ${coreutil}/cut -c 1-12,41- | + ${coreutil}/numfmt --field=2 --to=iec-i --suffix=B --padding=7 --round=nearest''; + + #aliases for (I think) macos commands + pbcopy = "${pkgs.wl-clipboard}/bin/wl-copy"; + pbpaste = "${pkgs.wl-clipboard}/bin/wl-paste"; + }; + + shellInit = '' + fish_add_path ~/.local/bin + fish_add_path ~/.cargo/bin + set hydro_color_pwd 62A + set hydro_color_error red + set hydro_color_duration yellow + set hydro_color_prompt green + set hydro_color_git blue + ''; + + plugins = [ + { + name = "hydro"; + src = pkgs.fishPlugins.hydro.src; + } + ]; +} diff --git a/nix/home-manager/progs/gpt4all-HEAD-disable-settings-err.patch b/nix/home-manager/progs/gpt4all-HEAD-disable-settings-err.patch new file mode 100644 index 0000000..a6911ab --- /dev/null +++ b/nix/home-manager/progs/gpt4all-HEAD-disable-settings-err.patch @@ -0,0 +1,19 @@ +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) { diff --git a/nix/home-manager/progs/gpt4all/gpt4all-HEAD-disable-settings-err.patch b/nix/home-manager/progs/gpt4all/gpt4all-HEAD-disable-settings-err.patch new file mode 100644 index 0000000..a6911ab --- /dev/null +++ b/nix/home-manager/progs/gpt4all/gpt4all-HEAD-disable-settings-err.patch @@ -0,0 +1,19 @@ +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) { diff --git a/nix/home-manager/progs/gpt4all/gpt4all-HEAD-embeddings-model.patch b/nix/home-manager/progs/gpt4all/gpt4all-HEAD-embeddings-model.patch new file mode 100644 index 0000000..fb15635 --- /dev/null +++ b/nix/home-manager/progs/gpt4all/gpt4all-HEAD-embeddings-model.patch @@ -0,0 +1,53 @@ +commit 425b33877c819dd88f3692aae37452c767371f6b +Author: Simon Gardling +Date: Thu Sep 19 10:00:39 2024 -0400 + + use locally downloaded embeddings + +diff --git a/gpt4all-chat/CMakeLists.txt b/gpt4all-chat/CMakeLists.txt +index 900307ae..802fc31a 100644 +--- a//CMakeLists.txt ++++ b/CMakeLists.txt +@@ -120,6 +120,7 @@ elseif (APPLE) + endif() + + # Embedding model ++#[[ + set(LOCAL_EMBEDDING_MODEL "nomic-embed-text-v1.5.f16.gguf") + set(LOCAL_EMBEDDING_MODEL_MD5 "a5401e7f7e46ed9fcaed5b60a281d547") + set(LOCAL_EMBEDDING_MODEL_PATH "${CMAKE_BINARY_DIR}/resources/${LOCAL_EMBEDDING_MODEL}") +@@ -134,6 +135,7 @@ message(STATUS "Embedding model downloaded to ${LOCAL_EMBEDDING_MODEL_PATH}") + if (APPLE) + list(APPEND CHAT_EXE_RESOURCES "${LOCAL_EMBEDDING_MODEL_PATH}") + endif() ++]] + + set(QAPPLICATION_CLASS QGuiApplication) + add_subdirectory(deps/SingleApplication) +@@ -348,11 +350,13 @@ if (LLMODEL_CUDA) + endif() + endif() + ++#[[ + if (NOT APPLE) + install(FILES "${LOCAL_EMBEDDING_MODEL_PATH}" + DESTINATION resources + COMPONENT ${COMPONENT_NAME_MAIN}) + endif() ++]] + + set(CPACK_GENERATOR "IFW") + set(CPACK_VERBATIM_VARIABLES YES) +diff --git a/gpt4all-chat/src/embllm.cpp b/gpt4all-chat/src/embllm.cpp +index 81b1e9e1..e3266cc7 100644 +--- a/src/embllm.cpp ++++ b/src/embllm.cpp +@@ -84,7 +84,7 @@ bool EmbeddingLLMWorker::loadModel() + + QString filePath = embPathFmt.arg(QCoreApplication::applicationDirPath(), LOCAL_EMBEDDING_MODEL); + if (!QFileInfo::exists(filePath)) { +- qWarning() << "embllm WARNING: Local embedding model not found"; ++ qWarning() << "embllm WARNING: Local embedding model not found: " << filePath; + return false; + } + diff --git a/nix/home-manager/progs/gpt4all/gpt4all.nix b/nix/home-manager/progs/gpt4all/gpt4all.nix new file mode 100644 index 0000000..ef222f8 --- /dev/null +++ b/nix/home-manager/progs/gpt4all/gpt4all.nix @@ -0,0 +1,124 @@ +{ pkgs, lib, ... }: +let + models = [ + { + name = "Qwen2.5-14B-Instruct-Q4_K_S.gguf"; + context_length = "32768"; + gen_length = "8192"; + source = pkgs.fetchurl { + url = "https://huggingface.co/bartowski/Qwen2.5-14B-Instruct-GGUF/resolve/main/Qwen2.5-14B-Instruct-Q4_K_S.gguf?download=true"; + sha256 = "E1CmWUhMMbTXEjIRczzA3rSrVuR8qOL8BLagw7LiyZk="; + }; + } + { + name = "Qwen2.5-7B-Instruct-Q6_K_L.gguf"; + context_length = "32768"; + gen_length = "8192"; + source = pkgs.fetchurl { + url = "https://huggingface.co/bartowski/Qwen2.5-7B-Instruct-GGUF/resolve/main/Qwen2.5-7B-Instruct-Q6_K_L.gguf?download=true"; + sha256 = "thEXN06T/UVGfzdB83jlgpG7kuTzZtz1ZUAdupAnErM="; + }; + } + ]; + + # 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.clangStdenv; + } + ); + + model_files = builtins.listToAttrs ( + map (f: { + name = ".local/share/nomic.ai/GPT4All/${f.name}"; + value = { + source = f.source; + }; + }) models + ); + + gpt4all_package = ( + optimizeWithFlags + (pkgs.gpt4all.overrideAttrs (old: { + # https://github.com/NixOS/nixpkgs/pull/344001 3.2.1 -> 3.3.0 + version = "3.3.0"; + src = pkgs.fetchFromGitHub { + fetchSubmodules = true; + owner = "nomic-ai"; + repo = "gpt4all"; + rev = "HEAD"; + sha256 = "RDYf+VaI5pl46Cd04ADvvi4ygNfYa4fY9rTv9Ui3qUk="; + }; + + patches = [ + ./gpt4all-HEAD-embeddings-model.patch + ./gpt4all-HEAD-disable-settings-err.patch + ]; + })) + # compile flags + [ + "-Ofast" + "-march=native" + "-mtune=native" + "-fno-protect-parens" + "-fno-finite-math-only" # https://github.com/ggerganov/llama.cpp/pull/7154#issuecomment-2143844461 + ] + ); + +in +{ + home.packages = [ + gpt4all_package + ]; + + home.file = lib.recursiveUpdate { + ".config/nomic.ai/GPT4All.ini".text = + let + system_prompt = "You are an expert AI assistant who is thoughtful and works step-by-step from first principles derive an answer to the user's prompt. For each step, provide a title that describes what you're doing in that step, along with the content. Decide if you need another step or if you're ready to provide your answer to the user, make sure to exhaust ALL POSSIBILITIES before providing a response to the user. While your reasoning is not shown to the user, it is under high levels of scrutiny to ensure high-quality reasoning. WHEN YOU DETERMINE THAT YOU ARE READY TO GIVE A FINAL ANSWER TO THE USER GIVEN YOUR REASONING AND STEP-BY-STEP WORK. ONLY TEXT WRITTEN AFTER A SECTION NAMED \"Final Answer\" WILL BE SHOWN TO THE USER. ASSUME THAT NO REASONING STEPS ARE SHOWN TO THE USER. DO NOT THINK THAT THE USER CAN SEE YOUR INTERNAL REASONING STEPS. + USE AS MANY REASONING STEPS AS POSSIBLE. AT LEAST 3. BE AWARE OF YOUR LIMITATIONS AS AN LLM AND WHAT YOU CAN AND CANNOT DO. EXPLORE ALTERNATE ANSWERS AND CONSIDER THAT YOUR ANSWER MAY BE WRONG. IDENTIFY POSSIBLE ERRORS IN YOUR REASONING AND WHERE SUCH ERRORS MAY BE. FULLY TEST ALL OTHER POSSIBILITIES. YOU CAN BE WRONG. WHEN YOU SAY YOU ARE RE-EXAMINING, ACTUALLY RE-EXAMINE, AND USE ANOTHER APPROACH TO DO SO. DO NOT JUST SAY YOU ARE RE-EXAMINING. SHOW ALL YOUR WORK. USE AT LEAST 3 METHODS TO DERIVE THE ANSWER. USE BEST PRACTICES. WORK FROM FIRST PRINCIPLES TO CREATE YOUR ANSWER."; + in + '' + [General] + chatTheme=Dark + height=940 + suggestionMode=Off + threadCount=8 + uniqueId=7096f2d2-448d-4272-a132-d37e77f8a781 + userDefaultModel=${(builtins.elemAt models 0).name} + width=1472 + x=0 + y=0 + + [download] + lastVersionStarted=${gpt4all_package.version} + '' + + (lib.concatStrings ( + map (model: '' + [model-${model.name}] + contextLength=${model.context_length} + filename=${model.name} + maxLength=${model.gen_length} + promptBatchSize=256 + promptTemplate=<|im_start|>user\n%1<|im_end|>\n<|im_start|>assistant\n + systemPrompt="<|im_start|>system\n${ + # replace newlines with the string "\n" for gpt4all to properly parse + builtins.replaceStrings [ "\n" ] [ "\\n" ] system_prompt + }<|im_end|> + \n" + '') models + )) + + '' + [network] + isActive=true + usageStatsActive=true + ''; + } model_files; +} diff --git a/nix/home-manager/progs/helix.nix b/nix/home-manager/progs/helix.nix new file mode 100644 index 0000000..76f4a5e --- /dev/null +++ b/nix/home-manager/progs/helix.nix @@ -0,0 +1,288 @@ +{ pkgs }: +{ + enable = true; + package = pkgs.helix; + settings = { + theme = "my_theme"; + editor = { + cursor-shape = { + insert = "bar"; + normal = "block"; + select = "underline"; + }; + + file-picker = { + hidden = false; + }; + + #wrapping!! + soft-wrap.enable = true; + }; + }; + + languages = { + language = [ + { + name = "rust"; + auto-format = true; + } + ]; + }; + + themes = { + #modified fleet_dark theme + my_theme = + let + white = "#ffffff"; + gray-120 = "#d1d1d1"; + gray-110 = "#c2c2c2"; + gray-100 = "#a0a0a0"; + gray-90 = "#898989"; + gray-80 = "#767676"; + gray-70 = "#5d5d5d"; + gray-60 = "#484848"; + gray-50 = "#383838"; + gray-40 = "#333333"; + gray-30 = "#2d2d2d"; + gray-20 = "#292929"; + gray-15 = "#1F1F1F"; + gray-10 = "#181818"; + black = "#000000"; + blue-110 = "#6daaf7"; + blue-100 = "#4d9bf8"; + blue-90 = "#3691f9"; + blue-80 = "#1a85f6"; + blue-70 = "#0273eb"; + blue-60 = "#0c6ddd"; + blue-50 = "#195eb5"; + blue-40 = "#194176"; + blue-30 = "#163764"; + blue-20 = "#132c4f"; + blue-10 = "#0b1b32"; + red-80 = "#ec7388"; + red-70 = "#ea4b67"; + red-60 = "#d93953"; + red-50 = "#ce364d"; + red-40 = "#c03248"; + red-30 = "#a72a3f"; + red-20 = "#761b2d"; + red-10 = "#390813"; + green-50 = "#4ca988"; + green-40 = "#3ea17f"; + green-30 = "#028764"; + green-20 = "#134939"; + green-10 = "#081f19"; + yellow-60 = "#f8ab17"; + yellow-50 = "#e1971b"; + yellow-40 = "#b5791f"; + yellow-30 = "#7c511a"; + yellow-20 = "#5a3a14"; + yellow-10 = "#281806"; + purple-20 = "#c07bf3"; + purple-10 = "#b35def"; + + blue = "#87C3FF"; + blue-light = "#ADD1DE"; + coral = "#CC7C8A"; + cyan = "#82D2CE"; + cyan-dark = "#779E9E"; + lime = "#A8CC7C"; + orange = "#E09B70"; + pink = "#E394DC"; + violet = "#AF9CFF"; + yellow = "#EBC88D"; + in + { + "attribute" = lime; + "type" = blue; + "type.return" = blue-light; + "type.parameter" = blue-light; + "constructor" = yellow; + "constant" = violet; + "constant.builtin.boolean" = cyan; + "constant.character" = yellow; + "constant.character.escape" = cyan; + "constant.numeric" = yellow; + "string" = pink; + "string.regexp" = cyan; + "string.special" = { + fg = yellow; + modifiers = [ "underlined" ]; + }; # .path / .url / .symbol + + "comment" = gray-90; # .line + # "comment.block" = {} # .documentation + "variable" = gray-120; # .builtin + "variable.builtin" = { + fg = coral; + }; + # "variable.other" = {} # .member + "variable.other.member" = violet; + "label" = yellow; + "keyword" = cyan; # .operator / .directive / .function + "function" = yellow; + "function.declaration" = "#EFEFEF"; + "function.macro" = lime; + "function.builtin" = lime; + "function.special" = lime; + #"function.declaration.method" = { fg = "lightest", modifiers = ["bold"] } #depends on #4892 + "tag" = blue; + "special" = lime; + "namespace" = blue; + + # used in theming + # "markup" = {} # .normal / .quote / .raw + # "markup.normal" = {} # .completion / .hover + "markup.bold" = { + modifiers = [ "bold" ]; + }; + "markup.italic" = { + modifiers = [ "italic" ]; + }; + "markup.strikethrough" = { + modifiers = [ "crossed_out" ]; + }; + "markup.heading" = { + fg = cyan; + modifiers = [ "bold" ]; + }; # .marker / .1 / .2 / .3 / .4 / .5 / .6 + "markup.list" = pink; # .unnumbered / .numbered + "markup.list.numbered" = cyan; + "markup.list.unnumbered" = cyan; + # "markup.link" = "green" + "markup.link.url" = { + fg = pink; + modifiers = [ + "italic" + "underlined" + ]; + }; + "markup.link.text" = cyan; + "markup.link.label" = purple-20; + "markup.quote" = pink; + "markup.raw" = pink; + "markup.raw.inline" = cyan; # .completion / .hover + "markup.raw.block" = "#EB83E2"; + + "diff.plus" = green-50; + "diff.minus" = red-50; + "diff.delta" = blue-80; + + # ui specific + # "ui.background" = { bg = gray-10; }; # .separator + "ui.background" = { }; + "ui.statusline" = { + fg = gray-120; + bg = gray-20; + }; # .inactive / .normal / .insert / .select + "ui.statusline.normal" = { + fg = gray-120; + bg = gray-20; + }; + "ui.statusline.inactive" = { + fg = gray-90; + }; + "ui.statusline.insert" = { + fg = gray-20; + bg = blue-90; + }; + "ui.statusline.select" = { + fg = gray-20; + bg = yellow-60; + }; + + "ui.cursor" = { + modifiers = [ "reversed" ]; + }; # .insert / .select / .match / .primary + "ui.cursor.match" = { + bg = blue-30; + }; # .insert / .select / .match / .primary + "ui.selection" = { + bg = gray-50; + }; # .primary + "ui.selection.primary" = { + bg = blue-40; + }; + + "ui.cursorline" = { + bg = gray-15; + }; + "ui.linenr" = gray-70; + "ui.linenr.selected" = gray-110; + + "ui.popup" = { + fg = gray-120; + bg = gray-20; + }; # .info + "ui.window" = { + fg = gray-50; + }; + "ui.help" = { + fg = gray-120; + bg = gray-20; + }; + "ui.menu" = { + fg = gray-120; + bg = gray-20; + }; # .selected + "ui.menu.selected" = { + fg = white; + bg = blue-40; + }; # .selected + # Calculated as #ffffff with 30% opacity + "ui.menu.scroll" = { + fg = "#dfdfdf"; + }; + + "ui.text" = gray-120; # .focus / .info + "ui.text.focus" = { + fg = white; + bg = blue-40; + }; + + "ui.virtual" = gray-90; # .whitespace + "ui.virtual.inlay-hint" = { + fg = gray-70; + }; + "ui.virtual.ruler" = { + bg = gray-20; + }; + + "hint" = gray-80; + "info" = "#A366C4"; + "warning" = "#FACb66"; + "error" = "#FF5269"; + + "diagnostic.hint" = { + underline = { + color = gray-80; + style = "line"; + }; + }; + "diagnostic.info" = { + underline = { + color = "#A366C4"; + style = "line"; + }; + }; + "diagnostic.warning" = { + underline = { + color = "#FACB66"; + style = "line"; + }; + }; + "diagnostic.error" = { + underline = { + color = "#FF5269"; + style = "line"; + }; + }; + "diagnostic.unnecessary" = { + modifiers = [ "dim" ]; + }; + "diagnostic.deprecated" = { + modifiers = [ "crossed_out" ]; + }; + }; + }; +} diff --git a/nix/home-manager/progs/librewolf.nix b/nix/home-manager/progs/librewolf.nix new file mode 100644 index 0000000..c26fd13 --- /dev/null +++ b/nix/home-manager/progs/librewolf.nix @@ -0,0 +1,77 @@ +{ pkgs, inputs, ... }: +{ + home.packages = with pkgs; [ librewolf ]; + + programs.librewolf = { + enable = true; + settings = { + "webgl.disabled" = false; + "privacy.resistFingerprinting" = false; + "privacy.clearOnShutdown.history" = false; + "privacy.clearOnShutdown.cookies" = false; + "network.cookie.lifetimePolicy" = 0; + "general.useragent.compatMode.firefox" = true; + "identity.fxaccounts.enabled" = true; + "services.sync.prefs.sync.privacy.clearOnShutdown.cookies" = false; + "services.sync.prefs.sync.privacy.clearOnShutdown_v2.cookiesAndStorage" = false; + + "general.useragent.override" = "Mozilla/5.0 (X11; Linux x86_64; rv:${pkgs.firefox.version}) Gecko/20100101 Firefox/${pkgs.firefox.version}"; + + "extensions.activeThemeID" = "firefox-compact-dark@mozilla.org"; + + # For themeing + "toolkit.legacyUserProfileCustomizations.stylesheets" = true; + "browser.tabs.drawInTitlebar" = true; + "svg.context-properties.content.enabled" = true; + + #fake location, FIT (just about) + "geo.provider.network.url" = + "data:application/json," + + builtins.toJSON { + location = { + lat = 28.0749; + lng = -80.6302; + }; + accuracy = 1.0; + }; + }; + }; + + home.file = + let + chromeTheme = ".librewolf/tckj7njq.default-release/chrome"; + + firefoxThemeFile = file: src: { + target = "${chromeTheme}/${file}"; + source = "${inputs.firefox-mod-theme}/${src}/${file}"; + recursive = true; + }; + + baseThemeFile = { + file = ""; + src = ""; + }; + + modThemeFiles = [ + { + file = "userChrome.css"; + } + { + file = "userContent.css"; + } + { + file = "ASSETS"; + } + ]; + in + builtins.listToAttrs ( + map (f: { + name = "firefox-theme-${f.file}"; + value = firefoxThemeFile f.file f.src; + }) (map (f: baseThemeFile // f) modThemeFiles) + ); + + home.sessionVariables = { + BROWSER = "librewolf"; + }; +} diff --git a/nix/home-manager/progs/niri.nix b/nix/home-manager/progs/niri.nix new file mode 100644 index 0000000..a6aa705 --- /dev/null +++ b/nix/home-manager/progs/niri.nix @@ -0,0 +1,167 @@ +{ + config, + pkgs, + homeDirectory, +}: +{ + prefer-no-csd = true; + + spawn-at-startup = [ + #waybar + { command = [ "${pkgs.waybar}/bin/waybar" ]; } + + #swaybg works on more than just sway (sets a wallpaper) + { + command = [ + "${pkgs.swaybg}/bin/swaybg" + "-m" + "center" + "-i" + "${homeDirectory}/.wallpaper.png" + ]; + } + ]; + + window-rules = [ + { draw-border-with-background = false; } + { + geometry-corner-radius = { + top-left = 10.0; + top-right = 10.0; + bottom-right = 10.0; + bottom-left = 10.0; + }; + } + { clip-to-geometry = true; } + ]; + + binds = with config.lib.niri.actions; { + #application launcher + "Mod+Space".action = spawn [ + "${pkgs.rofi-wayland}/bin/rofi" + "-show" + "combi" + ]; + + #open a terminal + "Mod+T".action = spawn "${pkgs.alacritty}/bin/alacritty"; + + #lock the screen + "Mod+X".action = spawn "${pkgs.swaylock}/bin/swaylock"; + + #screenshotting + "Print".action = screenshot; + "Ctrl+Print".action = screenshot-screen; + "Alt+Print".action = screenshot-window; + + #Volume control + "XF86AudioRaiseVolume".action = spawn [ + "${pkgs.avizo}/bin/volumectl" + "-u" + "up" + ]; + "XF86AudioLowerVolume".action = spawn [ + "${pkgs.avizo}/bin/volumectl" + "-u" + "down" + ]; + "XF86AudioMute".action = spawn [ + "${pkgs.avizo}/bin/volumectl" + "toggle-mute" + ]; + "XF86AudioMicMute".action = spawn [ + "${pkgs.avizo}/bin/volumectl" + "-m" + "toggle-mute" + ]; + + #Display Brightness control + "XF86MonBrightnessUp".action = spawn [ + "${pkgs.avizo}/bin/lightctl" + "up" + ]; + "XF86MonBrightnessDown".action = spawn [ + "${pkgs.avizo}/bin/lightctl" + "down" + ]; + + #Force close a window + "Mod+Q".action = close-window; + + "Mod+Shift+Q".action = quit; + + #bindings for like window management ig + + "Mod+Left".action = focus-column-left; + "Mod+Down".action = focus-window-down; + "Mod+Up".action = focus-window-up; + "Mod+Right".action = focus-column-right; + + "Mod+H".action = focus-column-left; + "Mod+J".action = focus-window-down; + "Mod+K".action = focus-window-up; + "Mod+L".action = focus-column-right; + + "Mod+Ctrl+Left".action = move-column-left; + "Mod+Ctrl+Down".action = move-window-down; + "Mod+Ctrl+Up".action = move-window-up; + "Mod+Ctrl+Right".action = move-column-right; + + "Mod+Ctrl+H".action = move-column-left; + "Mod+Ctrl+J".action = move-window-down; + "Mod+Ctrl+K".action = move-window-up; + "Mod+Ctrl+L".action = move-column-right; + + #fine adjustments to height and width of window + "Mod+Minus".action = set-column-width "-10%"; + "Mod+Equal".action = set-column-width "+10%"; + "Mod+Shift+Minus".action = set-window-height "-10%"; + "Mod+Shift+Equal".action = set-window-height "+10%"; + + "Mod+Home".action = focus-column-first; + "Mod+End".action = focus-column-last; + "Mod+Ctrl+Home".action = move-column-to-first; + "Mod+Ctrl+End".action = move-column-to-last; + + "Mod+Shift+Left".action = focus-monitor-left; + "Mod+Shift+Down".action = focus-monitor-down; + "Mod+Shift+Up".action = focus-monitor-up; + "Mod+Shift+Right".action = focus-monitor-right; + + "Mod+Shift+H".action = focus-monitor-left; + "Mod+Shift+J".action = focus-monitor-down; + "Mod+Shift+K".action = focus-monitor-up; + "Mod+Shift+L".action = focus-monitor-right; + + "Mod+Shift+Ctrl+Left".action = move-column-to-monitor-left; + "Mod+Shift+Ctrl+Down".action = move-column-to-monitor-down; + "Mod+Shift+Ctrl+Up".action = move-column-to-monitor-up; + "Mod+Shift+Ctrl+Right".action = move-column-to-monitor-right; + + "Mod+Shift+Ctrl+H".action = move-column-to-monitor-left; + "Mod+Shift+Ctrl+J".action = move-column-to-monitor-down; + "Mod+Shift+Ctrl+K".action = move-column-to-monitor-up; + "Mod+Shift+Ctrl+L".action = move-column-to-monitor-right; + + "Mod+Page_Down".action = focus-workspace-down; + "Mod+Page_Up".action = focus-workspace-up; + "Mod+U".action = focus-workspace-down; + "Mod+I".action = focus-workspace-up; + + #move a window up and down workspaces + "Mod+Ctrl+Page_Down".action = move-column-to-workspace-down; + "Mod+Ctrl+Page_Up".action = move-column-to-workspace-up; + + "Mod+Ctrl+U".action = move-column-to-workspace-down; + "Mod+Ctrl+I".action = move-column-to-workspace-up; + + #does little squeeze thing into the left or right position with another window + "Mod+BracketLeft".action = consume-or-expel-window-left; + "Mod+BracketRight".action = consume-or-expel-window-right; + + "Mod+R".action = switch-preset-column-width; + "Mod+F".action = maximize-column; + "Mod+Shift+F".action = fullscreen-window; + "Mod+C".action = center-column; + }; +} diff --git a/nix/home-manager/progs/rss.nix b/nix/home-manager/progs/rss.nix new file mode 100644 index 0000000..97515ca --- /dev/null +++ b/nix/home-manager/progs/rss.nix @@ -0,0 +1,91 @@ +[ + { + title = "Stratechery"; + url = "https://stratechery.passport.online/feed/rss/2gi1tPZ8Ta36Tsx7rDLM5P"; + } + + { + title = "Factorio Blog"; + url = "https://www.factorio.com/blog/rss"; + } + + { + title = "Firefox Nightly News"; + url = "https://blog.nightly.mozilla.org/feed/"; + } + + { + 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 = "Terence Eden"; + url = "https://shkspr.mobi/blog/feed/atom/"; + } + + { + title = "GioCities"; + url = "https://blog.giovanh.com/feeds/atom.xml"; + } + + { + title = "mcyoung"; + url = "https://mcyoung.xyz/atom.xml"; + } + + { + title = "Embrace the Red"; + url = "https://embracethered.com/blog/index.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"; + } +] diff --git a/nix/home-manager/progs/swaylock.nix b/nix/home-manager/progs/swaylock.nix new file mode 100644 index 0000000..bb528c3 --- /dev/null +++ b/nix/home-manager/progs/swaylock.nix @@ -0,0 +1,31 @@ +{ + color = "24273a"; + bs-hl-color = "f4dbd6"; + caps-lock-bs-hl-color = "f4dbd6"; + caps-lock-key-hl-color = "a6da95"; + inside-color = 0; + inside-clear-color = 0; + inside-caps-lock-color = 0; + inside-ver-color = 0; + inside-wrong-color = 0; + key-hl-color = "a6da95"; + layout-bg-color = 0; + layout-border-color = 0; + layout-text-color = "cad3f5"; + line-color = 0; + line-clear-color = 0; + line-caps-lock-color = 0; + line-ver-color = 0; + line-wrong-color = 0; + ring-color = "b7bdf8"; + ring-clear-color = "f4dbd6"; + ring-caps-lock-color = "f5a97f"; + ring-ver-color = "8aadf4"; + ring-wrong-color = "ee99a0"; + separator-color = 0; + text-color = "cad3f5"; + text-clear-color = "f4dbd6"; + text-caps-lock-color = "f5a97f"; + text-ver-color = "8aadf4"; + text-wrong-color = "ee99a0"; +} diff --git a/nix/home-manager/progs/waybar.nix b/nix/home-manager/progs/waybar.nix new file mode 100644 index 0000000..5448024 --- /dev/null +++ b/nix/home-manager/progs/waybar.nix @@ -0,0 +1,253 @@ +{ pkgs }: +{ + enable = true; + settings.mainBar = { + layer = "top"; + position = "top"; + # mod = "dock"; + # exclusive = true; + # gtk-layer-shell = true; + margin-bottom = -1; + # passthrough = false; + height = 32; + modules-left = + [ + ]; + modules-center = [ "clock" ]; + modules-right = [ + "cpu" + "memory" + "tray" + "pulseaudio" + "network" + "battery" + ]; + cpu = { + interval = 5; + format = "ο‹› {usage}%"; + max-length = 10; + }; + memory = { + interval = 10; + format = " {percentage}%"; + max-length = 10; + tooltip = true; + tooltip-format = "RAM - {used:0.1f}GiB used"; + }; + tray = { + icon-size = 18; + spacing = 3; + }; + clock = { + format = " {:%R\n %d.%m.%Y}"; + tooltip-format = "{calendar}"; + calendar = { + mode = "year"; + mode-mon-col = 3; + weeks-pos = "right"; + on-scroll = 1; + on-click-right = "mode"; + format = { + months = "{}"; + days = "{}"; + weeks = "W{}"; + weekdays = "{}"; + today = "{}"; + }; + }; + actions = { + on-click-right = "mode"; + on-click-forward = "tz_up"; + on-click-backward = "tz_down"; + on-scroll-up = "shift_up"; + on-scroll-down = "shift_down"; + }; + }; + network = { + format-wifi = " {icon}"; + format-ethernet = "  "; + format-disconnected = "σ°Œ™ "; + format-icons = [ + "σ°€― " + "󰀟 " + "σ°€’ " + "σ°€’ " + "󰀨 " + ]; + }; + battery = { + states = { + good = 95; + warning = 30; + critical = 20; + }; + format = " {icon} {capacity}%"; + format-charging = "  {capacity}%"; + format-plugged = "  {capacity}%"; + format-alt = "{time} {icon}"; + format-icons = [ + "σ°‚Ž" + "󰁺" + "󰁻" + "󰁼" + "󰁽" + "󰁾" + "󰁿" + "σ°‚€" + "󰂁" + "σ°‚‚" + "󰁹" + ]; + }; + # not actually pulseaudio-specific + pulseaudio = { + max-volume = 100; + scroll-step = 10; + format = "{icon}"; + tooltip-format = "{volume}%"; + format-muted = "πŸ”‡"; + format-icons = { + default = [ + " " + " " + " " + ]; + }; + on-click = "${pkgs.pwvucontrol}/bin/pwvucontrol"; + }; + }; + + style = '' + /*base background color*/ + @define-color bg_main rgba(25, 25, 25, 1.0); + @define-color bg_main_tooltip rgba(0, 0, 0, 0.7); + + + /*base background color of selections */ + @define-color bg_hover rgba(200, 200, 200, 0.3); + /*base background color of active elements */ + @define-color bg_active rgba(100, 100, 100, 0.5); + + /*base border color*/ + @define-color border_main rgba(255, 255, 255, 0.2); + + /*text color for entries, views and content in general */ + @define-color content_main white; + /*text color for entries that are unselected */ + @define-color content_inactive rgba(255, 255, 255, 0.25); + + * { + text-shadow: none; + box-shadow: none; + border: none; + border-radius: 0; + font-family: "Segoe UI", "Ubuntu"; + font-weight: 600; + font-size: 12.7px; + } + + window#waybar { + background: @bg_main; + border-top: 0; + color: @content_main; + } + + tooltip { + background: @bg_main_tooltip; + border-radius: 5px; + border-width: 1px; + border-style: solid; + border-color: @border_main; + } + + tooltip label { + color: @content_main; + } + + #taskbar { + } + + #taskbar button { + min-width: 130px; + border-bottom: 3px solid rgba(255, 255, 255, 0.3); + margin-left: 2px; + margin-right: 2px; + padding-left: 8px; + padding-right: 8px; + color: white; + transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); + } + + #taskbar button.active { + border-bottom: 3px solid white; + background: @bg_active; + } + + #taskbar button:hover { + border-bottom: 3px solid white; + background: @bg_hover; + color: @content_main; + } + + #cpu, #memory { + padding:3px; + } + + #window { + border-radius: 10px; + margin-left: 20px; + margin-right: 20px; + } + + #tray { + margin-left: 5px; + margin-right: 5px; + } + + #tray > .passive { + border-bottom: none; + } + + #tray > .active { + border-bottom: 3px solid white; + } + + #tray > .needs-attention { + border-bottom: 3px solid @warning_color; + } + + #tray > widget { + transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); + } + + #tray > widget:hover { + background: @bg_hover; + } + + #pulseaudio { + font-family: "JetBrains Mono Nerd Font"; + padding-left: 3px; + padding-right: 3px; + transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); + } + + #pulseaudio:hover { + background: @bg_hover; + } + + #network { + padding-left: 3px; + padding-right: 3px; + } + + #clock { + padding-right: 5px; + padding-left: 5px; + transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); + } + + #clock:hover { + background: @bg_hover; + } + ''; +} diff --git a/nix/home-manager/secrets/borg-laptop-password.age b/nix/home-manager/secrets/borg-laptop-password.age new file mode 100644 index 0000000..abca559 --- /dev/null +++ b/nix/home-manager/secrets/borg-laptop-password.age @@ -0,0 +1,10 @@ +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«Xs1γn.΅ο$Χo \ No newline at end of file diff --git a/nix/home-manager/secrets/factorio.nix b/nix/home-manager/secrets/factorio.nix new file mode 100644 index 0000000000000000000000000000000000000000..549fa66986604a8664d199dcd7df193cb4e409a1 GIT binary patch literal 99 zcmZQ@_Y83kiVO&0u$|oeHY#57^Y&xY=CvYZmYF G^(+A7_%3Mx literal 0 HcmV?d00001 diff --git a/nix/home-manager/secrets/my-gpg.age b/nix/home-manager/secrets/my-gpg.age new file mode 100644 index 0000000000000000000000000000000000000000..2344279827bb9c4513889db7e4e07d4b66ddf8dd GIT binary patch literal 2969 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCUl$_b533{=Q=kMcK2 z$@6wMc8N*}cD4)%D^2tEjPfZAi12aD3k%80%W_OH$Vp6ej^xUS@(T^{5A*Uj4fFIV zFEw%s3Ns4LHxG98@-OoC4NcC#lyubJy5|dDay?>Si3Ac-{0N6 z*do~5#LYA>!qF?Oq$;_pB+aqX-Obse*eu)EEt0D++{DW{IVji2B0t!u%Am5KGR)N3 z+rZN@JulS2QoGc+GTkCGETYgY5Nw;DouaLqt8RKxYGQG!La<|=k*R`jqJMZl(~XP`@xMQCKOPlaz#QfW?=o1ur3XMS*6Zgyp$No0|^ zV_=18v3F)viKDl#b7n=h8<(q_OJ!0{p?8W=K!mqrO*Ss;gs&V_JY?fLpe3olHV5}(;HSD)wntl9Mi%~o}j)@)SVBXOZ5L0{D{M|E?` z+xZ{*jv&aJcdo>IAV zGAn=O-_7xNOh36yjS%!-qj_ll*_V00-euda>*Kx^YU13yL+Z=VO@*(_xssNP{Mc4} zIVV-$B+2~ksplUT3i~nsn^4uO_Un7ttCz7?%qH&s!MEMHsu%5TP`w!SeT`fCZSAE|x{lf&+yIkk> zj=y~*6?pE-RqiFZU#2xLw6#m&{*~)Fq4HO0>DSBCvQ~ZGtLDXhflF6ti`@hx{S|kF zf|GtG98BB$yY9)FFFZ02yC+=ec`ewqb;I{_J^UY+uB|rT6?W@K0=tq&v%$%idvz!O zzUH^ALgkbC<(Z2@8UvP|*SZ_>!b{gD^~wJn<~=Q&W%j)DloN>9rM*&2&-S&l$wQu3 zas~2C%w@`D`cB1LOJ{EXQt|YsOwEQX&R>6g%VCd>%dWI}-(&H6i=WxXjNKn2SI5>0 z&HC4tJ@aN!24Bj8wRhSpCCztKxXrxZd2vb3YODP3G1X7@Tn=zB{dM+%L56eO?%UH? z-+$k@y^x{e6uV1^!u2IapFZDs8|U-!yp5})zyGVd4zqnF3%HUy8J*UK_bDgzUtiw) zqWo=9xoY2vGt1t*c&of;`r&tfIXC!UcaGg6lPOpDRPe9m3+?H9Y#5%%c>T4pd6d=q zVD_YSW&6%vx$q##`Z9O=6b%JSivHp6-_x z-!SLFyybg-?8AKfCpD znqkUUpC$S&t8c#lm!H|UQ~v9Db0HJmvv*EU(tcLf|jIzxH@0)Mh1DNsI5CV=q?~Diq)I z)pTRvDZ$u=*V6^h-tI}+-TdjBgy^I2#)-NGXU^vB^G=9%?bVxkYvPH;cjx?aIz8>x z?_X;sJl!ns$gQ8Te$!GPUbDXY%Xa5}xA}Rdx7w1~ga7!nG~TSkTGQ`0PyH()+9l6r z5#@2!K4^aQG>*Svyas1p9k{;x)3uDs0!j9=i)>S$329B)|ITBr=Ts>_b+65#%Winw zxoNgv(!8}#XtL z*(ZHyol<`^;o5cnk~51BPRr}LHTA`vyDiI^jpXgW3Qa#+XE@D{=f~sg9p@8na%QJzKurPBC$C-n>HKFI_qsS$NMz9O_Fk0qoa>_T0_C zP96!eabaxfXY#HnQ19gZk+eC>Gl1jz%JiLgzb;912`-)Z;>W{4liB$T7VYzyKglgk z@6{I`5{HjP&ok?jEBCl*{_fP2c(&q6tVIhl)5_P@W^6gX!}o}$ z#&L_q_e&Zon;+%!EpYx@GM(quX0N%Q=cYWg5{Oxzz;B(2_iJO1z z8`GD6ItM@hFO}dtdR4$bwyDKXAd+eFN2L=D(k0RtRWF?~-5nP-t;X+I(TjRF&%ehf zJ*l7gOGf8I^4^M7z8eJ0SFp6NX#Q2QV6)-tX{VgJb~#j8E$~<_aerr2_Rgf`F9SUq z7@INz4kUbEbZ~wWM$H|u4o4368duT7?ZOrqG>APg^dLwYxSfWd4sGIyI3>2{{L=YzBcoO813vyuuN0hXV*TAI z%lV6|g-hJGgZ&m$cU@oUvFvdt*M-NMlZ_9|v9y2xlxfeZ!_H1MYBKA6On82+=Lxpa zUHa~4nb-EUtPefzr@1yY=M^jG3WTsFJYIIGT6GJnX0TNB9BG>;4`xqT5w*uy^wb8s zD=jN0wKq;W@bcbN^J!nsUa4?k_$;x&K55-%4+vacTUXUbaZFK$b=5M`A zPrk9)p)$8f{1Zb`S;dk3GMdSp8l&HOgn#I*~`($4^*f?hh{6dDZv)RNehG9J1Uht844y68@!5 g4amFDzH9plp+|h8ZY`g89+Zgwd4iAG&RRqa0JM&KLjV8( literal 0 HcmV?d00001 diff --git a/nix/home-manager/secrets/secrets.nix b/nix/home-manager/secrets/secrets.nix new file mode 100644 index 0000000..43b3368 --- /dev/null +++ b/nix/home-manager/secrets/secrets.nix @@ -0,0 +1,18 @@ +let + laptop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO4jL6gYOunUlUtPvGdML0cpbKSsPNqQ1jit4E7U1RyH"; + desktop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBJjT5QZ3zRDb+V6Em20EYpSEgPW5e/U+06uQGJdraxi"; +in +(builtins.listToAttrs ( + map + (f: { + f.publicKeys = [ + laptop + desktop + ]; + }) + [ + "server-password.age" + "borg-laptop-password.age" + "my-gpg.age" + ] +)) diff --git a/nix/home-manager/secrets/server-password.age b/nix/home-manager/secrets/server-password.age new file mode 100644 index 0000000..1df1be5 --- /dev/null +++ b/nix/home-manager/secrets/server-password.age @@ -0,0 +1,9 @@ +age-encryption.org/v1 +-> ssh-ed25519 JlUYaQ u9duGBEW7wp7aG5cqd1gfB8w+MDAirki9ZVSsotqtRM +9gyL9k29ytNJZ6Kp90309bDim1fZNqcLhPTVqs1py5s +-> ssh-ed25519 dHDJgQ ytHA01CSY/0dD6F8XC9ilzNaivZS84PsCmr5GFWAE1o +4jLi+spahOIExkrUyfpX8cYJFEKvWfErWskYJ2btBkw +-> Q-grease +n1QvV95VRYZ7CiOl6KOedEKr2L7tjTdj8aahF/DHOifCyWnc +--- iV/7+IbpWvsgrZIs2yPwOL0Xa6AlvkIfwbDotCh7iiQ +‡'F¬’hΈ2¬ΎΪmΚκYΈ΄iuαL/D*ΰƒ :•@Ν;f 9…v{Χΐ2aΗ«έΥή&³ \ No newline at end of file diff --git a/nix/home-manager/system-mreow.nix b/nix/home-manager/system-mreow.nix new file mode 100644 index 0000000..c042439 --- /dev/null +++ b/nix/home-manager/system-mreow.nix @@ -0,0 +1,183 @@ +{ + config, + pkgs, + lib, + homeDirectory, + ... +}: +{ + imports = [ ./gui.nix ]; + + home.packages = with pkgs; [ + wdisplays + intel-gpu-tools + swaylock + + #manage bluetooth devices + blueman + + niri-unstable + ]; + + #bluetooth manager + services.blueman-applet.enable = true; + + #notification daemon + services.dunst = { + enable = true; + package = pkgs.dunst; + }; + + #window manager + programs.niri = { + package = pkgs.niri-unstable; + settings = import ./progs/niri.nix { inherit config pkgs homeDirectory; }; + }; + + programs.swaylock = { + enable = true; + settings = import ./progs/swaylock.nix; + }; + + #waybar for status bar + programs.waybar = import ./progs/waybar.nix { inherit pkgs; }; + + #rofi for application launcher + programs.rofi = { + enable = true; + package = pkgs.rofi-wayland; + extraConfig = { + modi = "window,drun,ssh,combi"; + combi-modi = "window,drun,ssh"; + }; + }; + + 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 = + let + borgPasswordFile = config.age.secrets.borg-laptop-password.path; + in + import ./progs/borg.nix { inherit homeDirectory borgPasswordFile; }; + }; + + # 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/framework.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"; + }; +} diff --git a/nix/home-manager/system-nixos.nix b/nix/home-manager/system-nixos.nix new file mode 100644 index 0000000..1435381 --- /dev/null +++ b/nix/home-manager/system-nixos.nix @@ -0,0 +1,45 @@ +{ + pkgs, + inputs, + lib, + ... +}: +{ + imports = [ ./gui.nix ]; + nixpkgs.config.allowUnfree = true; + + nixpkgs.overlays = [ + # Add a protontricks-beta package so we can use protontricks with latest steam beta + # https://github.com/Matoking/protontricks/issues/304#issuecomment-2280920826 + ( + final: prev: + let + ps = prev.python312Packages; + in + { + vdf-patch = ps.vdf.overrideAttrs (oldAttrs: { + src = inputs.vdf-patch; + }); + protontricks-beta = prev.protontricks.overrideAttrs (oldAttrs: { + src = inputs.protontricks; + propagatedBuildInputs = [ + ps.setuptools # implicit dependency, used to find data/icon_placeholder.png + final.vdf-patch + ps.pillow + ]; + }); + } + ) + ]; + + home.packages = with pkgs; [ + protontricks-beta + beatsabermodmanager + protonup-qt + ]; + + programs.alacritty.settings = { + window.decorations = lib.mkForce "full"; + window.opacity = lib.mkForce 1.0; + }; +} From 3fa7282ee7844102aba1ea0e9a5d35b41eb8b492 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 27 Sep 2024 01:01:12 -0400 Subject: [PATCH 002/724] remove git-agecrypt --- nix/etcnixos/common.nix | 4 ---- nix/home-manager/flake.lock | 6 +++--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/nix/etcnixos/common.nix b/nix/etcnixos/common.nix index 799f352..f555fdb 100644 --- a/nix/etcnixos/common.nix +++ b/nix/etcnixos/common.nix @@ -190,10 +190,6 @@ dmidecode (inputs.agenix.packages.${pkgs.system}.default.override { ageBin = "${pkgs.rage}/bin/rage"; }) - - qemu_full - - git-agecrypt ]; #wayland with electron/chromium applications diff --git a/nix/home-manager/flake.lock b/nix/home-manager/flake.lock index 2966157..e38250a 100644 --- a/nix/home-manager/flake.lock +++ b/nix/home-manager/flake.lock @@ -281,11 +281,11 @@ ] }, "locked": { - "lastModified": 1727317727, - "narHash": "sha256-yGYahXzCquyYEgf5GTtvtaN5hXbw20Ok2+o8uVxoaFs=", + "lastModified": 1727404165, + "narHash": "sha256-kZCiYpQJBZ3kL9QymS88mCxpQwqo8KqvZeHk6LATuY8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a3d832f389606d7dc61a45b244c72ea472d1fcd4", + "rev": "76f0a61e733259e1034dd6523e039d04932ffefc", "type": "github" }, "original": { From ec81d973c43ea9a1d2c4878682f9c2bb0c339a66 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 27 Sep 2024 01:03:05 -0400 Subject: [PATCH 003/724] move some stuff around --- .gitattributes | 6 +++--- {nix/etcnixos => etcnixos}/common.nix | 0 {nix/etcnixos => etcnixos}/declarative-nm.nix | 0 {nix/etcnixos => etcnixos}/flake.lock | 0 {nix/etcnixos => etcnixos}/flake.nix | 0 {nix/etcnixos => etcnixos}/hardware_desktop.nix | 0 {nix/etcnixos => etcnixos}/hardware_laptop.nix | 0 {nix/etcnixos => etcnixos}/networking.nix | 0 .../secrets/primary-password.age | Bin {nix/etcnixos => etcnixos}/secrets/secrets.nix | 0 {nix/etcnixos => etcnixos}/secrets/secureboot.tar | Bin .../secrets/wifi-passwords.nix | Bin {nix/etcnixos => etcnixos}/system-mreow.nix | 0 {nix/etcnixos => etcnixos}/system-nixos.nix | 0 {nix/home-manager => home-manager}/flake.lock | 0 {nix/home-manager => home-manager}/flake.nix | 0 {nix/home-manager => home-manager}/gui.nix | 0 {nix/home-manager => home-manager}/no-gui.nix | 0 .../progs/alacritty.nix | 0 {nix/home-manager => home-manager}/progs/borg.nix | 0 {nix/home-manager => home-manager}/progs/fish.nix | 0 .../progs/gpt4all-HEAD-disable-settings-err.patch | 0 .../gpt4all/gpt4all-HEAD-disable-settings-err.patch | 0 .../gpt4all/gpt4all-HEAD-embeddings-model.patch | 0 .../progs/gpt4all/gpt4all.nix | 0 {nix/home-manager => home-manager}/progs/helix.nix | 0 .../progs/librewolf.nix | 0 {nix/home-manager => home-manager}/progs/niri.nix | 0 {nix/home-manager => home-manager}/progs/rss.nix | 0 .../progs/swaylock.nix | 0 {nix/home-manager => home-manager}/progs/waybar.nix | 0 .../secrets/borg-laptop-password.age | 0 .../secrets/factorio.nix | Bin .../secrets/my-gpg.age | Bin .../secrets/secrets.nix | 0 .../secrets/server-password.age | 0 {nix/home-manager => home-manager}/system-mreow.nix | 0 {nix/home-manager => home-manager}/system-nixos.nix | 0 justfile | 6 +++--- 39 files changed, 6 insertions(+), 6 deletions(-) rename {nix/etcnixos => etcnixos}/common.nix (100%) rename {nix/etcnixos => etcnixos}/declarative-nm.nix (100%) rename {nix/etcnixos => etcnixos}/flake.lock (100%) rename {nix/etcnixos => etcnixos}/flake.nix (100%) rename {nix/etcnixos => etcnixos}/hardware_desktop.nix (100%) rename {nix/etcnixos => etcnixos}/hardware_laptop.nix (100%) rename {nix/etcnixos => etcnixos}/networking.nix (100%) rename {nix/etcnixos => etcnixos}/secrets/primary-password.age (100%) rename {nix/etcnixos => etcnixos}/secrets/secrets.nix (100%) rename {nix/etcnixos => etcnixos}/secrets/secureboot.tar (100%) rename {nix/etcnixos => etcnixos}/secrets/wifi-passwords.nix (100%) rename {nix/etcnixos => etcnixos}/system-mreow.nix (100%) rename {nix/etcnixos => etcnixos}/system-nixos.nix (100%) rename {nix/home-manager => home-manager}/flake.lock (100%) rename {nix/home-manager => home-manager}/flake.nix (100%) rename {nix/home-manager => home-manager}/gui.nix (100%) rename {nix/home-manager => home-manager}/no-gui.nix (100%) rename {nix/home-manager => home-manager}/progs/alacritty.nix (100%) rename {nix/home-manager => home-manager}/progs/borg.nix (100%) rename {nix/home-manager => home-manager}/progs/fish.nix (100%) rename {nix/home-manager => home-manager}/progs/gpt4all-HEAD-disable-settings-err.patch (100%) rename {nix/home-manager => home-manager}/progs/gpt4all/gpt4all-HEAD-disable-settings-err.patch (100%) rename {nix/home-manager => home-manager}/progs/gpt4all/gpt4all-HEAD-embeddings-model.patch (100%) rename {nix/home-manager => home-manager}/progs/gpt4all/gpt4all.nix (100%) rename {nix/home-manager => home-manager}/progs/helix.nix (100%) rename {nix/home-manager => home-manager}/progs/librewolf.nix (100%) rename {nix/home-manager => home-manager}/progs/niri.nix (100%) rename {nix/home-manager => home-manager}/progs/rss.nix (100%) rename {nix/home-manager => home-manager}/progs/swaylock.nix (100%) rename {nix/home-manager => home-manager}/progs/waybar.nix (100%) rename {nix/home-manager => home-manager}/secrets/borg-laptop-password.age (100%) rename {nix/home-manager => home-manager}/secrets/factorio.nix (100%) rename {nix/home-manager => home-manager}/secrets/my-gpg.age (100%) rename {nix/home-manager => home-manager}/secrets/secrets.nix (100%) rename {nix/home-manager => home-manager}/secrets/server-password.age (100%) rename {nix/home-manager => home-manager}/system-mreow.nix (100%) rename {nix/home-manager => home-manager}/system-nixos.nix (100%) diff --git a/.gitattributes b/.gitattributes index 486a9c3..77298d2 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,3 @@ -nix/home-manager/secrets/factorio.nix filter=git-crypt diff=git-crypt -nix/etcnixos/secrets/secureboot.tar filter=git-crypt diff=git-crypt -nix/etcnixos/secrets/wifi-passwords.nix filter=git-crypt diff=git-crypt +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 diff --git a/nix/etcnixos/common.nix b/etcnixos/common.nix similarity index 100% rename from nix/etcnixos/common.nix rename to etcnixos/common.nix diff --git a/nix/etcnixos/declarative-nm.nix b/etcnixos/declarative-nm.nix similarity index 100% rename from nix/etcnixos/declarative-nm.nix rename to etcnixos/declarative-nm.nix diff --git a/nix/etcnixos/flake.lock b/etcnixos/flake.lock similarity index 100% rename from nix/etcnixos/flake.lock rename to etcnixos/flake.lock diff --git a/nix/etcnixos/flake.nix b/etcnixos/flake.nix similarity index 100% rename from nix/etcnixos/flake.nix rename to etcnixos/flake.nix diff --git a/nix/etcnixos/hardware_desktop.nix b/etcnixos/hardware_desktop.nix similarity index 100% rename from nix/etcnixos/hardware_desktop.nix rename to etcnixos/hardware_desktop.nix diff --git a/nix/etcnixos/hardware_laptop.nix b/etcnixos/hardware_laptop.nix similarity index 100% rename from nix/etcnixos/hardware_laptop.nix rename to etcnixos/hardware_laptop.nix diff --git a/nix/etcnixos/networking.nix b/etcnixos/networking.nix similarity index 100% rename from nix/etcnixos/networking.nix rename to etcnixos/networking.nix diff --git a/nix/etcnixos/secrets/primary-password.age b/etcnixos/secrets/primary-password.age similarity index 100% rename from nix/etcnixos/secrets/primary-password.age rename to etcnixos/secrets/primary-password.age diff --git a/nix/etcnixos/secrets/secrets.nix b/etcnixos/secrets/secrets.nix similarity index 100% rename from nix/etcnixos/secrets/secrets.nix rename to etcnixos/secrets/secrets.nix diff --git a/nix/etcnixos/secrets/secureboot.tar b/etcnixos/secrets/secureboot.tar similarity index 100% rename from nix/etcnixos/secrets/secureboot.tar rename to etcnixos/secrets/secureboot.tar diff --git a/nix/etcnixos/secrets/wifi-passwords.nix b/etcnixos/secrets/wifi-passwords.nix similarity index 100% rename from nix/etcnixos/secrets/wifi-passwords.nix rename to etcnixos/secrets/wifi-passwords.nix diff --git a/nix/etcnixos/system-mreow.nix b/etcnixos/system-mreow.nix similarity index 100% rename from nix/etcnixos/system-mreow.nix rename to etcnixos/system-mreow.nix diff --git a/nix/etcnixos/system-nixos.nix b/etcnixos/system-nixos.nix similarity index 100% rename from nix/etcnixos/system-nixos.nix rename to etcnixos/system-nixos.nix diff --git a/nix/home-manager/flake.lock b/home-manager/flake.lock similarity index 100% rename from nix/home-manager/flake.lock rename to home-manager/flake.lock diff --git a/nix/home-manager/flake.nix b/home-manager/flake.nix similarity index 100% rename from nix/home-manager/flake.nix rename to home-manager/flake.nix diff --git a/nix/home-manager/gui.nix b/home-manager/gui.nix similarity index 100% rename from nix/home-manager/gui.nix rename to home-manager/gui.nix diff --git a/nix/home-manager/no-gui.nix b/home-manager/no-gui.nix similarity index 100% rename from nix/home-manager/no-gui.nix rename to home-manager/no-gui.nix diff --git a/nix/home-manager/progs/alacritty.nix b/home-manager/progs/alacritty.nix similarity index 100% rename from nix/home-manager/progs/alacritty.nix rename to home-manager/progs/alacritty.nix diff --git a/nix/home-manager/progs/borg.nix b/home-manager/progs/borg.nix similarity index 100% rename from nix/home-manager/progs/borg.nix rename to home-manager/progs/borg.nix diff --git a/nix/home-manager/progs/fish.nix b/home-manager/progs/fish.nix similarity index 100% rename from nix/home-manager/progs/fish.nix rename to home-manager/progs/fish.nix diff --git a/nix/home-manager/progs/gpt4all-HEAD-disable-settings-err.patch b/home-manager/progs/gpt4all-HEAD-disable-settings-err.patch similarity index 100% rename from nix/home-manager/progs/gpt4all-HEAD-disable-settings-err.patch rename to home-manager/progs/gpt4all-HEAD-disable-settings-err.patch diff --git a/nix/home-manager/progs/gpt4all/gpt4all-HEAD-disable-settings-err.patch b/home-manager/progs/gpt4all/gpt4all-HEAD-disable-settings-err.patch similarity index 100% rename from nix/home-manager/progs/gpt4all/gpt4all-HEAD-disable-settings-err.patch rename to home-manager/progs/gpt4all/gpt4all-HEAD-disable-settings-err.patch diff --git a/nix/home-manager/progs/gpt4all/gpt4all-HEAD-embeddings-model.patch b/home-manager/progs/gpt4all/gpt4all-HEAD-embeddings-model.patch similarity index 100% rename from nix/home-manager/progs/gpt4all/gpt4all-HEAD-embeddings-model.patch rename to home-manager/progs/gpt4all/gpt4all-HEAD-embeddings-model.patch diff --git a/nix/home-manager/progs/gpt4all/gpt4all.nix b/home-manager/progs/gpt4all/gpt4all.nix similarity index 100% rename from nix/home-manager/progs/gpt4all/gpt4all.nix rename to home-manager/progs/gpt4all/gpt4all.nix diff --git a/nix/home-manager/progs/helix.nix b/home-manager/progs/helix.nix similarity index 100% rename from nix/home-manager/progs/helix.nix rename to home-manager/progs/helix.nix diff --git a/nix/home-manager/progs/librewolf.nix b/home-manager/progs/librewolf.nix similarity index 100% rename from nix/home-manager/progs/librewolf.nix rename to home-manager/progs/librewolf.nix diff --git a/nix/home-manager/progs/niri.nix b/home-manager/progs/niri.nix similarity index 100% rename from nix/home-manager/progs/niri.nix rename to home-manager/progs/niri.nix diff --git a/nix/home-manager/progs/rss.nix b/home-manager/progs/rss.nix similarity index 100% rename from nix/home-manager/progs/rss.nix rename to home-manager/progs/rss.nix diff --git a/nix/home-manager/progs/swaylock.nix b/home-manager/progs/swaylock.nix similarity index 100% rename from nix/home-manager/progs/swaylock.nix rename to home-manager/progs/swaylock.nix diff --git a/nix/home-manager/progs/waybar.nix b/home-manager/progs/waybar.nix similarity index 100% rename from nix/home-manager/progs/waybar.nix rename to home-manager/progs/waybar.nix diff --git a/nix/home-manager/secrets/borg-laptop-password.age b/home-manager/secrets/borg-laptop-password.age similarity index 100% rename from nix/home-manager/secrets/borg-laptop-password.age rename to home-manager/secrets/borg-laptop-password.age diff --git a/nix/home-manager/secrets/factorio.nix b/home-manager/secrets/factorio.nix similarity index 100% rename from nix/home-manager/secrets/factorio.nix rename to home-manager/secrets/factorio.nix diff --git a/nix/home-manager/secrets/my-gpg.age b/home-manager/secrets/my-gpg.age similarity index 100% rename from nix/home-manager/secrets/my-gpg.age rename to home-manager/secrets/my-gpg.age diff --git a/nix/home-manager/secrets/secrets.nix b/home-manager/secrets/secrets.nix similarity index 100% rename from nix/home-manager/secrets/secrets.nix rename to home-manager/secrets/secrets.nix diff --git a/nix/home-manager/secrets/server-password.age b/home-manager/secrets/server-password.age similarity index 100% rename from nix/home-manager/secrets/server-password.age rename to home-manager/secrets/server-password.age diff --git a/nix/home-manager/system-mreow.nix b/home-manager/system-mreow.nix similarity index 100% rename from nix/home-manager/system-mreow.nix rename to home-manager/system-mreow.nix diff --git a/nix/home-manager/system-nixos.nix b/home-manager/system-nixos.nix similarity index 100% rename from nix/home-manager/system-nixos.nix rename to home-manager/system-nixos.nix diff --git a/justfile b/justfile index d15b366..8db2e74 100644 --- a/justfile +++ b/justfile @@ -16,6 +16,6 @@ home_update: home-manager switch --impure sync_configs: format_home format_system - rsync -a --delete /etc/nixos/ ~/dotfiles/nix/etcnixos/ - rsync -a --delete ~/.config/home-manager/ ~/dotfiles/nix/home-manager/ - cp ~/justfile ~/dotfiles/ + rsync -a --delete /etc/nixos/ ~/projects/configs/dotfiles/nix/etcnixos/ + rsync -a --delete ~/.config/home-manager/ ~/projects/configs/dotfiles/nix/home-manager/ + From 904019899034370a8ce209137c56bd3f56f14358 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 27 Sep 2024 10:28:57 -0400 Subject: [PATCH 004/724] update things --- etcnixos/common.nix | 2 ++ etcnixos/flake.lock | 6 +++--- home-manager/progs/borg.nix | 1 - home-manager/progs/fish.nix | 2 ++ home-manager/system-nixos.nix | 2 ++ justfile | 4 ++-- 6 files changed, 11 insertions(+), 6 deletions(-) diff --git a/etcnixos/common.nix b/etcnixos/common.nix index f555fdb..29ecf53 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -190,6 +190,8 @@ dmidecode (inputs.agenix.packages.${pkgs.system}.default.override { ageBin = "${pkgs.rage}/bin/rage"; }) + + doas-sudo-shim ]; #wayland with electron/chromium applications diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index c371580..15b4c18 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -316,11 +316,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1727040444, - "narHash": "sha256-19FNN5QT9Z11ZUMfftRplyNN+2PgcHKb3oq8KMW/hDA=", + "lastModified": 1727437159, + "narHash": "sha256-v4qLwEw5OmprgQZTT7KZMNU7JjXJzRypw8+Cw6++fWk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d0cb432a9d28218df11cbd77d984a2a46caeb5ac", + "rev": "d830ad47cc992b4a46b342bbc79694cbd0e980b2", "type": "github" }, "original": { diff --git a/home-manager/progs/borg.nix b/home-manager/progs/borg.nix index b928cd3..a5fce86 100644 --- a/home-manager/progs/borg.nix +++ b/home-manager/progs/borg.nix @@ -14,7 +14,6 @@ ".wallpaper.png" ".ssh" - "dotfiles" "Documents" "projects" "Pictures" diff --git a/home-manager/progs/fish.nix b/home-manager/progs/fish.nix index 25e6ac0..f7a809a 100644 --- a/home-manager/progs/fish.nix +++ b/home-manager/progs/fish.nix @@ -44,6 +44,8 @@ in #aliases for (I think) macos commands pbcopy = "${pkgs.wl-clipboard}/bin/wl-copy"; pbpaste = "${pkgs.wl-clipboard}/bin/wl-paste"; + + nix-cleanup = "doas nix-collect-garbage --delete-older-than 1d && doas nix-store --optimise && doas nix-store --gc"; }; shellInit = '' diff --git a/home-manager/system-nixos.nix b/home-manager/system-nixos.nix index 1435381..4c0cb8c 100644 --- a/home-manager/system-nixos.nix +++ b/home-manager/system-nixos.nix @@ -11,6 +11,8 @@ nixpkgs.overlays = [ # Add a protontricks-beta package so we can use protontricks with latest steam beta # https://github.com/Matoking/protontricks/issues/304#issuecomment-2280920826 + + # nixpkgs update: https://github.com/NixOS/nixpkgs/pull/343068 ( final: prev: let diff --git a/justfile b/justfile index 8db2e74..a52d954 100644 --- a/justfile +++ b/justfile @@ -16,6 +16,6 @@ home_update: home-manager switch --impure sync_configs: format_home format_system - rsync -a --delete /etc/nixos/ ~/projects/configs/dotfiles/nix/etcnixos/ - rsync -a --delete ~/.config/home-manager/ ~/projects/configs/dotfiles/nix/home-manager/ + rsync -a --delete /etc/nixos/ ~/projects/configs/dotfiles/etcnixos/ + rsync -a --delete ~/.config/home-manager/ ~/projects/configs/dotfiles/home-manager/ From 4541b9b30bce3912a7b3e4cf94546d9811f5177d Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 27 Sep 2024 10:59:04 -0400 Subject: [PATCH 005/724] gpt4all: update --- home-manager/progs/gpt4all/gpt4all.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/home-manager/progs/gpt4all/gpt4all.nix b/home-manager/progs/gpt4all/gpt4all.nix index ef222f8..2d502f8 100644 --- a/home-manager/progs/gpt4all/gpt4all.nix +++ b/home-manager/progs/gpt4all/gpt4all.nix @@ -39,9 +39,7 @@ let model_files = builtins.listToAttrs ( map (f: { name = ".local/share/nomic.ai/GPT4All/${f.name}"; - value = { - source = f.source; - }; + value.source = f.source; }) models ); @@ -49,7 +47,7 @@ let optimizeWithFlags (pkgs.gpt4all.overrideAttrs (old: { # https://github.com/NixOS/nixpkgs/pull/344001 3.2.1 -> 3.3.0 - version = "3.3.0"; + version = "3.4.0-dev0"; src = pkgs.fetchFromGitHub { fetchSubmodules = true; owner = "nomic-ai"; @@ -72,7 +70,6 @@ let "-fno-finite-math-only" # https://github.com/ggerganov/llama.cpp/pull/7154#issuecomment-2143844461 ] ); - in { home.packages = [ @@ -92,7 +89,10 @@ in suggestionMode=Off threadCount=8 uniqueId=7096f2d2-448d-4272-a132-d37e77f8a781 - userDefaultModel=${(builtins.elemAt models 0).name} + userDefaultModel=${ + # select the first element of `models` to be the default model + (builtins.elemAt models 0).name + } width=1472 x=0 y=0 From 6c30d2189197a5055e86dcc9976727f81640ebbe Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 27 Sep 2024 12:08:34 -0400 Subject: [PATCH 006/724] reorganize home-manager --- home-manager/gui.nix | 9 +- home-manager/no-gui.nix | 11 +- home-manager/progs/alacritty.nix | 210 ++++++------ home-manager/progs/fish.nix | 102 +++--- home-manager/progs/helix.nix | 566 ++++++++++++++++--------------- home-manager/progs/librewolf.nix | 77 ----- 6 files changed, 450 insertions(+), 525 deletions(-) delete mode 100644 home-manager/progs/librewolf.nix diff --git a/home-manager/gui.nix b/home-manager/gui.nix index f04115d..09cf3ea 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -7,8 +7,8 @@ { imports = [ ./no-gui.nix - # ./progs/librewolf.nix ./progs/gpt4all/gpt4all.nix + ./progs/alacritty.nix ]; nixpkgs.config.allowUnfreePredicate = @@ -110,13 +110,6 @@ BROWSER = "zen"; }; - #Terminal emulator - programs.alacritty = { - enable = true; - package = pkgs.alacritty; - settings = import ./progs/alacritty.nix { inherit pkgs; }; - }; - #for trezor stuff /* trezor-udev-rules #trezor udev rules diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index edacfa4..16006e4 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -7,6 +7,11 @@ ... }: { + imports = [ + ./progs/fish.nix + ./progs/helix.nix + ]; + home.stateVersion = "24.11"; home.packages = with pkgs; [ @@ -186,12 +191,6 @@ ${pkgs.gnupg}/bin/gpg --import ${config.age.secrets.gnupg.path} ''; - #fish shell! - programs.fish = import ./progs/fish.nix { inherit pkgs; }; - - #text editor - programs.helix = import ./progs/helix.nix { inherit pkgs; }; - # Let Home Manager install and manage itself. programs.home-manager.enable = true; } diff --git a/home-manager/progs/alacritty.nix b/home-manager/progs/alacritty.nix index 50cadaf..aada011 100644 --- a/home-manager/progs/alacritty.nix +++ b/home-manager/progs/alacritty.nix @@ -1,124 +1,130 @@ -{ pkgs }: +{ pkgs, ... }: { - #use the fish shell - shell.program = "${pkgs.fish}/bin/fish"; + programs.alacritty = { + enable = true; + package = pkgs.alacritty; + settings = { + #use the fish shell + shell.program = "${pkgs.fish}/bin/fish"; - #some programs can't handle alacritty - env.TERM = "xterm-256color"; + #some programs can't handle alacritty + env.TERM = "xterm-256color"; - window = { - #using a window manager, no decorations needed - decorations = "none"; + window = { + #using a window manager, no decorations needed + decorations = "none"; - #semi-transparent - opacity = 0.95; + #semi-transparent + opacity = 0.95; - #padding between the content of the terminal and the edge - padding = { - x = 10; - y = 10; - }; + #padding between the content of the terminal and the edge + padding = { + x = 10; + y = 10; + }; - dimensions = { - columns = 80; - lines = 40; - }; - }; - - scrolling = { - history = 1000; - multiplier = 3; - }; - - font = - let - baseFont = { - family = "JetBrains Mono Nerd Font"; - style = "Regular"; - }; - in - { - size = 12; - - normal = baseFont; - - bold = baseFont // { - style = "Bold"; + dimensions = { + columns = 80; + lines = 40; + }; }; - italic = baseFont // { - style = "Italic"; + scrolling = { + history = 1000; + multiplier = 3; }; - offset.y = 0; - glyph_offset.y = 0; - }; - - #color scheme - colors = - let - normal = { - black = "0x1b1e28"; - red = "0xd0679d"; - green = "0x5de4c7"; - yellow = "0xfffac2"; - blue = "#435c89"; - magenta = "0xfcc5e9"; - cyan = "0xadd7ff"; - white = "0xffffff"; - }; - - bright = { - black = "0xa6accd"; - red = normal.red; - green = normal.green; - yellow = normal.yellow; - blue = normal.cyan; - magenta = "0xfae4fc"; - cyan = "0x89ddff"; - white = normal.white; - }; - in - { - inherit normal bright; - primary = { - background = "0x131621"; - foreground = bright.black; - }; - - cursor = { - text = "CellBackground"; - cursor = "CellForeground"; - }; - - search = + font = let - foreground = normal.black; - background = normal.cyan; + baseFont = { + family = "JetBrains Mono Nerd Font"; + style = "Regular"; + }; in { - matches = { - inherit foreground background; + size = 12; + + normal = baseFont; + + bold = baseFont // { + style = "Bold"; }; - focused_match = { - inherit foreground background; + italic = baseFont // { + style = "Italic"; + }; + + offset.y = 0; + glyph_offset.y = 0; + }; + + #color scheme + colors = + let + normal = { + black = "0x1b1e28"; + red = "0xd0679d"; + green = "0x5de4c7"; + yellow = "0xfffac2"; + blue = "#435c89"; + magenta = "0xfcc5e9"; + cyan = "0xadd7ff"; + white = "0xffffff"; + }; + + bright = { + black = "0xa6accd"; + red = normal.red; + green = normal.green; + yellow = normal.yellow; + blue = normal.cyan; + magenta = "0xfae4fc"; + cyan = "0x89ddff"; + white = normal.white; + }; + in + { + inherit normal bright; + primary = { + background = "0x131621"; + foreground = bright.black; + }; + + cursor = { + text = "CellBackground"; + cursor = "CellForeground"; + }; + + search = + let + foreground = normal.black; + background = normal.cyan; + in + { + matches = { + inherit foreground background; + }; + + focused_match = { + inherit foreground background; + }; + }; + + selection = { + text = "CellForeground"; + background = "0x303340"; + }; + + vi_mode_cursor = { + text = "CellBackground"; + cursor = "CellForeground"; }; }; - selection = { - text = "CellForeground"; - background = "0x303340"; - }; - - vi_mode_cursor = { - text = "CellBackground"; - cursor = "CellForeground"; + cursor = { + style = "Underline"; + vi_mode_style = "Underline"; }; }; - - cursor = { - style = "Underline"; - vi_mode_style = "Underline"; }; } diff --git a/home-manager/progs/fish.nix b/home-manager/progs/fish.nix index f7a809a..e3edb97 100644 --- a/home-manager/progs/fish.nix +++ b/home-manager/progs/fish.nix @@ -1,67 +1,69 @@ -{ pkgs }: +{ pkgs, ... }: let eza = "${pkgs.eza}/bin/eza --color=always --group-directories-first"; cargo = "${pkgs.cargo}/bin/cargo"; coreutil = "${pkgs.coreutils}/bin"; in { - enable = true; + programs.fish = { + enable = true; - interactiveShellInit = '' - #disable greeting - set fish_greeting + interactiveShellInit = '' + #disable greeting + set fish_greeting - #fixes gnupg password entry - export GPG_TTY=(${coreutil}/tty) + #fixes gnupg password entry + export GPG_TTY=(${coreutil}/tty) - #pfetch on shell start (disable pkgs because of execution time) - PF_INFO="ascii title os host kernel uptime memory editor wm" ${pkgs.pfetch-rs}/bin/pfetch - ''; + #pfetch on shell start (disable pkgs because of execution time) + PF_INFO="ascii title os host kernel uptime memory editor wm" ${pkgs.pfetch-rs}/bin/pfetch + ''; - shellAliases = { - c = cargo; - cr = "${cargo} run"; - cb = "${cargo} build"; + shellAliases = { + c = cargo; + cr = "${cargo} run"; + cb = "${cargo} build"; - # I hate the red background - run0 = "run0 --background=\"\""; + # I hate the red background + run0 = "run0 --background=\"\""; - # from DistroTube's dot files: Changing "ls" to "eza" - ls = "${eza} -al"; - la = "${eza} -a"; - ll = "${eza} -l"; - lt = "${eza} -aT"; + # from DistroTube's dot files: Changing "ls" to "eza" + ls = "${eza} -al"; + la = "${eza} -a"; + ll = "${eza} -l"; + lt = "${eza} -aT"; - # gets the largest files in a git repo's history - "git-size" = '' - ${pkgs.git}/bin/git rev-list --objects --all | - ${pkgs.git}/bin/git cat-file --batch-check='%(objecttype) %(objectname) %(objectsize) %(rest)' | - ${pkgs.gnused}/bin/sed -n 's/^blob //p' | - ${coreutil}/sort --numeric-sort --key=2 | - ${coreutil}/cut -c 1-12,41- | - ${coreutil}/numfmt --field=2 --to=iec-i --suffix=B --padding=7 --round=nearest''; + # gets the largest files in a git repo's history + "git-size" = '' + ${pkgs.git}/bin/git rev-list --objects --all | + ${pkgs.git}/bin/git cat-file --batch-check='%(objecttype) %(objectname) %(objectsize) %(rest)' | + ${pkgs.gnused}/bin/sed -n 's/^blob //p' | + ${coreutil}/sort --numeric-sort --key=2 | + ${coreutil}/cut -c 1-12,41- | + ${coreutil}/numfmt --field=2 --to=iec-i --suffix=B --padding=7 --round=nearest''; - #aliases for (I think) macos commands - pbcopy = "${pkgs.wl-clipboard}/bin/wl-copy"; - pbpaste = "${pkgs.wl-clipboard}/bin/wl-paste"; + #aliases for (I think) macos commands + pbcopy = "${pkgs.wl-clipboard}/bin/wl-copy"; + pbpaste = "${pkgs.wl-clipboard}/bin/wl-paste"; - nix-cleanup = "doas nix-collect-garbage --delete-older-than 1d && doas nix-store --optimise && doas nix-store --gc"; + nix-cleanup = "doas nix-collect-garbage --delete-older-than 1d && doas nix-store --optimise && doas nix-store --gc"; + }; + + shellInit = '' + fish_add_path ~/.local/bin + fish_add_path ~/.cargo/bin + set hydro_color_pwd 62A + set hydro_color_error red + set hydro_color_duration yellow + set hydro_color_prompt green + set hydro_color_git blue + ''; + + plugins = [ + { + name = "hydro"; + src = pkgs.fishPlugins.hydro.src; + } + ]; }; - - shellInit = '' - fish_add_path ~/.local/bin - fish_add_path ~/.cargo/bin - set hydro_color_pwd 62A - set hydro_color_error red - set hydro_color_duration yellow - set hydro_color_prompt green - set hydro_color_git blue - ''; - - plugins = [ - { - name = "hydro"; - src = pkgs.fishPlugins.hydro.src; - } - ]; } diff --git a/home-manager/progs/helix.nix b/home-manager/progs/helix.nix index 76f4a5e..4b6f271 100644 --- a/home-manager/progs/helix.nix +++ b/home-manager/progs/helix.nix @@ -1,288 +1,290 @@ -{ pkgs }: +{ pkgs, ... }: { - enable = true; - package = pkgs.helix; - settings = { - theme = "my_theme"; - editor = { - cursor-shape = { - insert = "bar"; - normal = "block"; - select = "underline"; - }; + programs.helix = { + enable = true; + package = pkgs.helix; + settings = { + theme = "my_theme"; + editor = { + cursor-shape = { + insert = "bar"; + normal = "block"; + select = "underline"; + }; - file-picker = { - hidden = false; - }; + file-picker = { + hidden = false; + }; - #wrapping!! - soft-wrap.enable = true; + #wrapping!! + soft-wrap.enable = true; + }; + }; + + languages = { + language = [ + { + name = "rust"; + auto-format = true; + } + ]; + }; + + themes = { + #modified fleet_dark theme + my_theme = + let + white = "#ffffff"; + gray-120 = "#d1d1d1"; + gray-110 = "#c2c2c2"; + gray-100 = "#a0a0a0"; + gray-90 = "#898989"; + gray-80 = "#767676"; + gray-70 = "#5d5d5d"; + gray-60 = "#484848"; + gray-50 = "#383838"; + gray-40 = "#333333"; + gray-30 = "#2d2d2d"; + gray-20 = "#292929"; + gray-15 = "#1F1F1F"; + gray-10 = "#181818"; + black = "#000000"; + blue-110 = "#6daaf7"; + blue-100 = "#4d9bf8"; + blue-90 = "#3691f9"; + blue-80 = "#1a85f6"; + blue-70 = "#0273eb"; + blue-60 = "#0c6ddd"; + blue-50 = "#195eb5"; + blue-40 = "#194176"; + blue-30 = "#163764"; + blue-20 = "#132c4f"; + blue-10 = "#0b1b32"; + red-80 = "#ec7388"; + red-70 = "#ea4b67"; + red-60 = "#d93953"; + red-50 = "#ce364d"; + red-40 = "#c03248"; + red-30 = "#a72a3f"; + red-20 = "#761b2d"; + red-10 = "#390813"; + green-50 = "#4ca988"; + green-40 = "#3ea17f"; + green-30 = "#028764"; + green-20 = "#134939"; + green-10 = "#081f19"; + yellow-60 = "#f8ab17"; + yellow-50 = "#e1971b"; + yellow-40 = "#b5791f"; + yellow-30 = "#7c511a"; + yellow-20 = "#5a3a14"; + yellow-10 = "#281806"; + purple-20 = "#c07bf3"; + purple-10 = "#b35def"; + + blue = "#87C3FF"; + blue-light = "#ADD1DE"; + coral = "#CC7C8A"; + cyan = "#82D2CE"; + cyan-dark = "#779E9E"; + lime = "#A8CC7C"; + orange = "#E09B70"; + pink = "#E394DC"; + violet = "#AF9CFF"; + yellow = "#EBC88D"; + in + { + "attribute" = lime; + "type" = blue; + "type.return" = blue-light; + "type.parameter" = blue-light; + "constructor" = yellow; + "constant" = violet; + "constant.builtin.boolean" = cyan; + "constant.character" = yellow; + "constant.character.escape" = cyan; + "constant.numeric" = yellow; + "string" = pink; + "string.regexp" = cyan; + "string.special" = { + fg = yellow; + modifiers = [ "underlined" ]; + }; # .path / .url / .symbol + + "comment" = gray-90; # .line + # "comment.block" = {} # .documentation + "variable" = gray-120; # .builtin + "variable.builtin" = { + fg = coral; + }; + # "variable.other" = {} # .member + "variable.other.member" = violet; + "label" = yellow; + "keyword" = cyan; # .operator / .directive / .function + "function" = yellow; + "function.declaration" = "#EFEFEF"; + "function.macro" = lime; + "function.builtin" = lime; + "function.special" = lime; + #"function.declaration.method" = { fg = "lightest", modifiers = ["bold"] } #depends on #4892 + "tag" = blue; + "special" = lime; + "namespace" = blue; + + # used in theming + # "markup" = {} # .normal / .quote / .raw + # "markup.normal" = {} # .completion / .hover + "markup.bold" = { + modifiers = [ "bold" ]; + }; + "markup.italic" = { + modifiers = [ "italic" ]; + }; + "markup.strikethrough" = { + modifiers = [ "crossed_out" ]; + }; + "markup.heading" = { + fg = cyan; + modifiers = [ "bold" ]; + }; # .marker / .1 / .2 / .3 / .4 / .5 / .6 + "markup.list" = pink; # .unnumbered / .numbered + "markup.list.numbered" = cyan; + "markup.list.unnumbered" = cyan; + # "markup.link" = "green" + "markup.link.url" = { + fg = pink; + modifiers = [ + "italic" + "underlined" + ]; + }; + "markup.link.text" = cyan; + "markup.link.label" = purple-20; + "markup.quote" = pink; + "markup.raw" = pink; + "markup.raw.inline" = cyan; # .completion / .hover + "markup.raw.block" = "#EB83E2"; + + "diff.plus" = green-50; + "diff.minus" = red-50; + "diff.delta" = blue-80; + + # ui specific + # "ui.background" = { bg = gray-10; }; # .separator + "ui.background" = { }; + "ui.statusline" = { + fg = gray-120; + bg = gray-20; + }; # .inactive / .normal / .insert / .select + "ui.statusline.normal" = { + fg = gray-120; + bg = gray-20; + }; + "ui.statusline.inactive" = { + fg = gray-90; + }; + "ui.statusline.insert" = { + fg = gray-20; + bg = blue-90; + }; + "ui.statusline.select" = { + fg = gray-20; + bg = yellow-60; + }; + + "ui.cursor" = { + modifiers = [ "reversed" ]; + }; # .insert / .select / .match / .primary + "ui.cursor.match" = { + bg = blue-30; + }; # .insert / .select / .match / .primary + "ui.selection" = { + bg = gray-50; + }; # .primary + "ui.selection.primary" = { + bg = blue-40; + }; + + "ui.cursorline" = { + bg = gray-15; + }; + "ui.linenr" = gray-70; + "ui.linenr.selected" = gray-110; + + "ui.popup" = { + fg = gray-120; + bg = gray-20; + }; # .info + "ui.window" = { + fg = gray-50; + }; + "ui.help" = { + fg = gray-120; + bg = gray-20; + }; + "ui.menu" = { + fg = gray-120; + bg = gray-20; + }; # .selected + "ui.menu.selected" = { + fg = white; + bg = blue-40; + }; # .selected + # Calculated as #ffffff with 30% opacity + "ui.menu.scroll" = { + fg = "#dfdfdf"; + }; + + "ui.text" = gray-120; # .focus / .info + "ui.text.focus" = { + fg = white; + bg = blue-40; + }; + + "ui.virtual" = gray-90; # .whitespace + "ui.virtual.inlay-hint" = { + fg = gray-70; + }; + "ui.virtual.ruler" = { + bg = gray-20; + }; + + "hint" = gray-80; + "info" = "#A366C4"; + "warning" = "#FACb66"; + "error" = "#FF5269"; + + "diagnostic.hint" = { + underline = { + color = gray-80; + style = "line"; + }; + }; + "diagnostic.info" = { + underline = { + color = "#A366C4"; + style = "line"; + }; + }; + "diagnostic.warning" = { + underline = { + color = "#FACB66"; + style = "line"; + }; + }; + "diagnostic.error" = { + underline = { + color = "#FF5269"; + style = "line"; + }; + }; + "diagnostic.unnecessary" = { + modifiers = [ "dim" ]; + }; + "diagnostic.deprecated" = { + modifiers = [ "crossed_out" ]; + }; + }; }; }; - - languages = { - language = [ - { - name = "rust"; - auto-format = true; - } - ]; - }; - - themes = { - #modified fleet_dark theme - my_theme = - let - white = "#ffffff"; - gray-120 = "#d1d1d1"; - gray-110 = "#c2c2c2"; - gray-100 = "#a0a0a0"; - gray-90 = "#898989"; - gray-80 = "#767676"; - gray-70 = "#5d5d5d"; - gray-60 = "#484848"; - gray-50 = "#383838"; - gray-40 = "#333333"; - gray-30 = "#2d2d2d"; - gray-20 = "#292929"; - gray-15 = "#1F1F1F"; - gray-10 = "#181818"; - black = "#000000"; - blue-110 = "#6daaf7"; - blue-100 = "#4d9bf8"; - blue-90 = "#3691f9"; - blue-80 = "#1a85f6"; - blue-70 = "#0273eb"; - blue-60 = "#0c6ddd"; - blue-50 = "#195eb5"; - blue-40 = "#194176"; - blue-30 = "#163764"; - blue-20 = "#132c4f"; - blue-10 = "#0b1b32"; - red-80 = "#ec7388"; - red-70 = "#ea4b67"; - red-60 = "#d93953"; - red-50 = "#ce364d"; - red-40 = "#c03248"; - red-30 = "#a72a3f"; - red-20 = "#761b2d"; - red-10 = "#390813"; - green-50 = "#4ca988"; - green-40 = "#3ea17f"; - green-30 = "#028764"; - green-20 = "#134939"; - green-10 = "#081f19"; - yellow-60 = "#f8ab17"; - yellow-50 = "#e1971b"; - yellow-40 = "#b5791f"; - yellow-30 = "#7c511a"; - yellow-20 = "#5a3a14"; - yellow-10 = "#281806"; - purple-20 = "#c07bf3"; - purple-10 = "#b35def"; - - blue = "#87C3FF"; - blue-light = "#ADD1DE"; - coral = "#CC7C8A"; - cyan = "#82D2CE"; - cyan-dark = "#779E9E"; - lime = "#A8CC7C"; - orange = "#E09B70"; - pink = "#E394DC"; - violet = "#AF9CFF"; - yellow = "#EBC88D"; - in - { - "attribute" = lime; - "type" = blue; - "type.return" = blue-light; - "type.parameter" = blue-light; - "constructor" = yellow; - "constant" = violet; - "constant.builtin.boolean" = cyan; - "constant.character" = yellow; - "constant.character.escape" = cyan; - "constant.numeric" = yellow; - "string" = pink; - "string.regexp" = cyan; - "string.special" = { - fg = yellow; - modifiers = [ "underlined" ]; - }; # .path / .url / .symbol - - "comment" = gray-90; # .line - # "comment.block" = {} # .documentation - "variable" = gray-120; # .builtin - "variable.builtin" = { - fg = coral; - }; - # "variable.other" = {} # .member - "variable.other.member" = violet; - "label" = yellow; - "keyword" = cyan; # .operator / .directive / .function - "function" = yellow; - "function.declaration" = "#EFEFEF"; - "function.macro" = lime; - "function.builtin" = lime; - "function.special" = lime; - #"function.declaration.method" = { fg = "lightest", modifiers = ["bold"] } #depends on #4892 - "tag" = blue; - "special" = lime; - "namespace" = blue; - - # used in theming - # "markup" = {} # .normal / .quote / .raw - # "markup.normal" = {} # .completion / .hover - "markup.bold" = { - modifiers = [ "bold" ]; - }; - "markup.italic" = { - modifiers = [ "italic" ]; - }; - "markup.strikethrough" = { - modifiers = [ "crossed_out" ]; - }; - "markup.heading" = { - fg = cyan; - modifiers = [ "bold" ]; - }; # .marker / .1 / .2 / .3 / .4 / .5 / .6 - "markup.list" = pink; # .unnumbered / .numbered - "markup.list.numbered" = cyan; - "markup.list.unnumbered" = cyan; - # "markup.link" = "green" - "markup.link.url" = { - fg = pink; - modifiers = [ - "italic" - "underlined" - ]; - }; - "markup.link.text" = cyan; - "markup.link.label" = purple-20; - "markup.quote" = pink; - "markup.raw" = pink; - "markup.raw.inline" = cyan; # .completion / .hover - "markup.raw.block" = "#EB83E2"; - - "diff.plus" = green-50; - "diff.minus" = red-50; - "diff.delta" = blue-80; - - # ui specific - # "ui.background" = { bg = gray-10; }; # .separator - "ui.background" = { }; - "ui.statusline" = { - fg = gray-120; - bg = gray-20; - }; # .inactive / .normal / .insert / .select - "ui.statusline.normal" = { - fg = gray-120; - bg = gray-20; - }; - "ui.statusline.inactive" = { - fg = gray-90; - }; - "ui.statusline.insert" = { - fg = gray-20; - bg = blue-90; - }; - "ui.statusline.select" = { - fg = gray-20; - bg = yellow-60; - }; - - "ui.cursor" = { - modifiers = [ "reversed" ]; - }; # .insert / .select / .match / .primary - "ui.cursor.match" = { - bg = blue-30; - }; # .insert / .select / .match / .primary - "ui.selection" = { - bg = gray-50; - }; # .primary - "ui.selection.primary" = { - bg = blue-40; - }; - - "ui.cursorline" = { - bg = gray-15; - }; - "ui.linenr" = gray-70; - "ui.linenr.selected" = gray-110; - - "ui.popup" = { - fg = gray-120; - bg = gray-20; - }; # .info - "ui.window" = { - fg = gray-50; - }; - "ui.help" = { - fg = gray-120; - bg = gray-20; - }; - "ui.menu" = { - fg = gray-120; - bg = gray-20; - }; # .selected - "ui.menu.selected" = { - fg = white; - bg = blue-40; - }; # .selected - # Calculated as #ffffff with 30% opacity - "ui.menu.scroll" = { - fg = "#dfdfdf"; - }; - - "ui.text" = gray-120; # .focus / .info - "ui.text.focus" = { - fg = white; - bg = blue-40; - }; - - "ui.virtual" = gray-90; # .whitespace - "ui.virtual.inlay-hint" = { - fg = gray-70; - }; - "ui.virtual.ruler" = { - bg = gray-20; - }; - - "hint" = gray-80; - "info" = "#A366C4"; - "warning" = "#FACb66"; - "error" = "#FF5269"; - - "diagnostic.hint" = { - underline = { - color = gray-80; - style = "line"; - }; - }; - "diagnostic.info" = { - underline = { - color = "#A366C4"; - style = "line"; - }; - }; - "diagnostic.warning" = { - underline = { - color = "#FACB66"; - style = "line"; - }; - }; - "diagnostic.error" = { - underline = { - color = "#FF5269"; - style = "line"; - }; - }; - "diagnostic.unnecessary" = { - modifiers = [ "dim" ]; - }; - "diagnostic.deprecated" = { - modifiers = [ "crossed_out" ]; - }; - }; - }; } diff --git a/home-manager/progs/librewolf.nix b/home-manager/progs/librewolf.nix deleted file mode 100644 index c26fd13..0000000 --- a/home-manager/progs/librewolf.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ pkgs, inputs, ... }: -{ - home.packages = with pkgs; [ librewolf ]; - - programs.librewolf = { - enable = true; - settings = { - "webgl.disabled" = false; - "privacy.resistFingerprinting" = false; - "privacy.clearOnShutdown.history" = false; - "privacy.clearOnShutdown.cookies" = false; - "network.cookie.lifetimePolicy" = 0; - "general.useragent.compatMode.firefox" = true; - "identity.fxaccounts.enabled" = true; - "services.sync.prefs.sync.privacy.clearOnShutdown.cookies" = false; - "services.sync.prefs.sync.privacy.clearOnShutdown_v2.cookiesAndStorage" = false; - - "general.useragent.override" = "Mozilla/5.0 (X11; Linux x86_64; rv:${pkgs.firefox.version}) Gecko/20100101 Firefox/${pkgs.firefox.version}"; - - "extensions.activeThemeID" = "firefox-compact-dark@mozilla.org"; - - # For themeing - "toolkit.legacyUserProfileCustomizations.stylesheets" = true; - "browser.tabs.drawInTitlebar" = true; - "svg.context-properties.content.enabled" = true; - - #fake location, FIT (just about) - "geo.provider.network.url" = - "data:application/json," - + builtins.toJSON { - location = { - lat = 28.0749; - lng = -80.6302; - }; - accuracy = 1.0; - }; - }; - }; - - home.file = - let - chromeTheme = ".librewolf/tckj7njq.default-release/chrome"; - - firefoxThemeFile = file: src: { - target = "${chromeTheme}/${file}"; - source = "${inputs.firefox-mod-theme}/${src}/${file}"; - recursive = true; - }; - - baseThemeFile = { - file = ""; - src = ""; - }; - - modThemeFiles = [ - { - file = "userChrome.css"; - } - { - file = "userContent.css"; - } - { - file = "ASSETS"; - } - ]; - in - builtins.listToAttrs ( - map (f: { - name = "firefox-theme-${f.file}"; - value = firefoxThemeFile f.file f.src; - }) (map (f: baseThemeFile // f) modThemeFiles) - ); - - home.sessionVariables = { - BROWSER = "librewolf"; - }; -} From 2410ecc0191eb18025b4145d6ad1a5b1a51ae9f3 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 29 Sep 2024 00:46:41 -0400 Subject: [PATCH 007/724] cleanup --- etcnixos/common.nix | 7 +++++ etcnixos/flake.lock | 12 ++++----- etcnixos/system-mreow.nix | 20 ++------------ home-manager/flake.lock | 36 +++++++++++++------------- home-manager/gui.nix | 2 -- home-manager/progs/gpt4all/gpt4all.nix | 2 +- 6 files changed, 34 insertions(+), 45 deletions(-) diff --git a/etcnixos/common.nix b/etcnixos/common.nix index 29ecf53..e0d204b 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -163,6 +163,7 @@ "wheel" "video" "camera" + "adbusers" ]; hashedPasswordFile = config.age.secrets.primary-password.path; }; @@ -170,6 +171,8 @@ services.gvfs.enable = true; programs.gphoto2.enable = true; + programs.adb.enable = true; + # Enable thermal data services.thermald.enable = true; @@ -192,6 +195,10 @@ (inputs.agenix.packages.${pkgs.system}.default.override { ageBin = "${pkgs.rage}/bin/rage"; }) doas-sudo-shim + + glib + usbutils + libmtp ]; #wayland with electron/chromium applications diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 15b4c18..3458432 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -316,11 +316,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1727437159, - "narHash": "sha256-v4qLwEw5OmprgQZTT7KZMNU7JjXJzRypw8+Cw6++fWk=", + "lastModified": 1727540359, + "narHash": "sha256-U+225h1kJZpWb23+RaX1sBkqC4fA7aa7eBbgiQ5HcO4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d830ad47cc992b4a46b342bbc79694cbd0e980b2", + "rev": "fb08bde00c20252b892a3e57fb094eb62b65ba61", "type": "github" }, "original": { @@ -332,11 +332,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1727122398, - "narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=", + "lastModified": 1727348695, + "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093", + "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", "type": "github" }, "original": { diff --git a/etcnixos/system-mreow.nix b/etcnixos/system-mreow.nix index ddfa0ad..00e4728 100644 --- a/etcnixos/system-mreow.nix +++ b/etcnixos/system-mreow.nix @@ -28,7 +28,7 @@ CPU_BOOST_ON_BAT = 0; START_CHARGE_THRESH_BAT0 = 90; - STOP_CHARGE_THRESH_BAT0 = 95; + STOP_CHARGE_THRESH_BAT0 = 90; RUNTIME_PM_ON_BAT = "auto"; }; }; @@ -53,8 +53,6 @@ }; boot = { - enableContainers = true; - lanzaboote = { enable = true; pkiBundle = "/etc/secureboot"; @@ -91,26 +89,12 @@ TTYVTDisallocate = true; }; - # Enable common container config files in /etc/containers - virtualisation = { - containers.enable = true; - podman = { - enable = true; - - # Required for containers under podman-compose to be able to talk to each other. - # defaultNetwork.settings.dns_enabled = true; - }; - }; - - environment.systemPackages = with pkgs; [ - distrobox - ]; - #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 = { }; system.activationScripts = { + # extract all my secureboot keys "secureboot-keys".text = let secureboot_path = "/etc/secureboot"; diff --git a/home-manager/flake.lock b/home-manager/flake.lock index e38250a..cbb88c9 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -33,11 +33,11 @@ ] }, "locked": { - "lastModified": 1727190706, - "narHash": "sha256-CUfCWwlZebQyZAQ5bmfmQJhOvc61HgExe1R/U202g2Q=", + "lastModified": 1727460389, + "narHash": "sha256-yxPhHEIUJbRQ9uet9slEE9tbu5A7Ls5RMoO4GOovJzE=", "owner": "orhun", "repo": "binsider", - "rev": "ec8dac79bf7f0d23257a521fc62b2888ebf55b86", + "rev": "3ec5db4e809e83d5dc88d6037904651082092e94", "type": "github" }, "original": { @@ -153,11 +153,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1727332193, - "narHash": "sha256-XnjG+n42JjrIj2Ts33Xa+Udg1QDp9N8FHYbvAkYL9qg=", + "lastModified": 1727573335, + "narHash": "sha256-RCcDnBgJpP8GVdIrmS7IFhpUCWQjaYS4j7NBT6cbZ3s=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "524000b81ba52f9d5a7b2ac78504468014121ebe", + "rev": "415bbec6b9482afa0605682cf31064964ae705c6", "type": "github" }, "original": { @@ -186,11 +186,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1726412705, - "narHash": "sha256-qRqGbvTpGRn3QhvjOyX0Sn/qPT1bLQUSSHz1vlW/7HE=", + "lastModified": 1727525902, + "narHash": "sha256-NUsPodaJn384rLdPawH1u1cxHzE25EdrXMLkpRTkGFA=", "owner": "YaLTeR", "repo": "niri", - "rev": "6ee5b5afa784c76b1c31c371b59177136e558fa6", + "rev": "c04ccafd0a2cb26c1f6a4835f4cbb01ffdb926a6", "type": "github" }, "original": { @@ -201,11 +201,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1727122398, - "narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=", + "lastModified": 1727348695, + "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093", + "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", "type": "github" }, "original": { @@ -229,11 +229,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1727264057, - "narHash": "sha256-KQPI8CTTnB9CrJ7LrmLC4VWbKZfljEPBXOFGZFRpxao=", + "lastModified": 1727540905, + "narHash": "sha256-40J9tW7Y794J7Uw4GwcAKlMxlX2xISBl6IBigo83ih8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "759537f06e6999e141588ff1c9be7f3a5c060106", + "rev": "fbca5e745367ae7632731639de5c21f29c8744ed", "type": "github" }, "original": { @@ -281,11 +281,11 @@ ] }, "locked": { - "lastModified": 1727404165, - "narHash": "sha256-kZCiYpQJBZ3kL9QymS88mCxpQwqo8KqvZeHk6LATuY8=", + "lastModified": 1727577080, + "narHash": "sha256-2LPT76Acp6ebt7fCt90eq/M8T2+X09s/yTVgfVFrtno=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "76f0a61e733259e1034dd6523e039d04932ffefc", + "rev": "73a833855442ce8cee710cf4d8d054fea1c81196", "type": "github" }, "original": { diff --git a/home-manager/gui.nix b/home-manager/gui.nix index 09cf3ea..68d11aa 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -73,8 +73,6 @@ inkscape nomacs - nautilus - lrcget #openstreetmap contributing diff --git a/home-manager/progs/gpt4all/gpt4all.nix b/home-manager/progs/gpt4all/gpt4all.nix index 2d502f8..93b3f65 100644 --- a/home-manager/progs/gpt4all/gpt4all.nix +++ b/home-manager/progs/gpt4all/gpt4all.nix @@ -53,7 +53,7 @@ let owner = "nomic-ai"; repo = "gpt4all"; rev = "HEAD"; - sha256 = "RDYf+VaI5pl46Cd04ADvvi4ygNfYa4fY9rTv9Ui3qUk="; + sha256 = "/w1VAfLYlhB5y08cVG2u9RT2kajtFtyTPziQXSwVFcE="; }; patches = [ From 44f32b01e583b1daafdcce6f7fa19dd427d2a1d6 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 29 Sep 2024 12:38:42 -0400 Subject: [PATCH 008/724] update --- etcnixos/common.nix | 2 +- etcnixos/flake.lock | 36 ++++++++++++++++++------------------ etcnixos/networking.nix | 2 +- home-manager/flake.lock | 6 +++--- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/etcnixos/common.nix b/etcnixos/common.nix index e0d204b..ce980bf 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -99,7 +99,7 @@ # Configure doas doas.extraRules = [ { - users = [ "${username}" ]; + users = [ username ]; keepEnv = true; persist = true; } diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 3458432..bdc5d3a 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -50,11 +50,11 @@ ] }, "locked": { - "lastModified": 1727292492, - "narHash": "sha256-vKkVoZJB35xOb1kmAH6i74ziuP0ZGKnzM6+NVi/OhD8=", + "lastModified": 1727620986, + "narHash": "sha256-4RlJt1MJmZcuP3ROlrb2YvG8WfH0BM/nGqDgNT/DAwE=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "9b30ea4a39c8c5a2b6a6519f85da38f72b7f29f0", + "rev": "0eee1b2134e9aa3427081715ada883f3523a9608", "type": "github" }, "original": { @@ -116,11 +116,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1726900127, - "narHash": "sha256-v3r7yJY8YE4HAzD5DXOxLkzj8YZKQ0xuccp9yppGW1U=", + "lastModified": 1727591515, + "narHash": "sha256-ar9oGR8kT3S5K3b0EJrcZp1LjfYQdzWl/bBLCp2o50Y=", "owner": "nix-community", "repo": "fenix", - "rev": "18eefba7fd0bf03e115785948758a44125a9fd68", + "rev": "c31647aab5e8a16087da6283ef9b2e6a9aae6772", "type": "github" }, "original": { @@ -231,11 +231,11 @@ ] }, "locked": { - "lastModified": 1726902823, - "narHash": "sha256-Gkc7pwTVLKj4HSvRt8tXNvosl8RS9hrBAEhOjAE0Tt4=", + "lastModified": 1727383923, + "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=", "owner": "nix-community", "repo": "home-manager", - "rev": "14929f7089268481d86b83ed31ffd88713dcd415", + "rev": "ffe2d07e771580a005e675108212597e5b367d2d", "type": "github" }, "original": { @@ -253,11 +253,11 @@ ] }, "locked": { - "lastModified": 1726902390, - "narHash": "sha256-ESAD6AkxsQdV/j5ZBcO4Vg94J7Xd0nfpiEZpJtwSEhg=", + "lastModified": 1727453186, + "narHash": "sha256-nZRCfVEZ9osWXsCD0xCpU66M8JkabMTukBzPRrD/CTA=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "faf4c746c068dd8e41b1fa5f18beeabd34d4064c", + "rev": "3390ff2632d0d8a14c92473db60fa52bf881f979", "type": "github" }, "original": { @@ -316,11 +316,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1727540359, - "narHash": "sha256-U+225h1kJZpWb23+RaX1sBkqC4fA7aa7eBbgiQ5HcO4=", + "lastModified": 1727613673, + "narHash": "sha256-qqIffTQfxMYo3MKQ9BoY2s2mdKZNnUiksdnxv81js9U=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "fb08bde00c20252b892a3e57fb094eb62b65ba61", + "rev": "f5c239fa9acb27f0a5326ba2949c00fada89ca9f", "type": "github" }, "original": { @@ -402,11 +402,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1726443025, - "narHash": "sha256-nCmG4NJpwI0IoIlYlwtDwVA49yuspA2E6OhfCOmiArQ=", + "lastModified": 1727465975, + "narHash": "sha256-jrr8r2CT9jsi6XDTTX+E39/CakTcQ9RYRp6rWGzLkk0=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "94b526fc86eaa0e90fb4d54a5ba6313aa1e9b269", + "rev": "546339a7be357b3e95fc4b79a8816dce540d477b", "type": "github" }, "original": { diff --git a/etcnixos/networking.nix b/etcnixos/networking.nix index f660e51..cbcae80 100644 --- a/etcnixos/networking.nix +++ b/etcnixos/networking.nix @@ -1,6 +1,6 @@ { hostname, ... }: { - hostName = "${hostname}"; + hostName = hostname; hostId = "cfe0ff46"; diff --git a/home-manager/flake.lock b/home-manager/flake.lock index cbb88c9..bbbb0a1 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -33,11 +33,11 @@ ] }, "locked": { - "lastModified": 1727460389, - "narHash": "sha256-yxPhHEIUJbRQ9uet9slEE9tbu5A7Ls5RMoO4GOovJzE=", + "lastModified": 1727595111, + "narHash": "sha256-i9Pz4vOnBdn1nqJmOL1+gP+A3nrK2WkOR8AO6RoIkQg=", "owner": "orhun", "repo": "binsider", - "rev": "3ec5db4e809e83d5dc88d6037904651082092e94", + "rev": "b1116e6118d3b6c481d9d99b25c23e2155260b97", "type": "github" }, "original": { From 7cbd04fec76cc8c0d2b17b941f26e69ca5718198 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 29 Sep 2024 13:46:11 -0400 Subject: [PATCH 009/724] borg: update backup dirs --- home-manager/progs/borg.nix | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/home-manager/progs/borg.nix b/home-manager/progs/borg.nix index a5fce86..c95e544 100644 --- a/home-manager/progs/borg.nix +++ b/home-manager/progs/borg.nix @@ -3,24 +3,21 @@ home = { location = { - sourceDirectories = - # stuff in my home directory: - ( - map (f: "${homeDirectory}/${f}") [ - ".zen" - ".local/share/fish" - ".gnupg" - ".config/Signal" - ".wallpaper.png" - ".ssh" + sourceDirectories = ( + map (f: "${homeDirectory}/${f}") [ + ".zen" + ".local/share/fish" + ".config/Signal" + ".wallpaper.png" + ".ssh" - "Documents" - "projects" - "Pictures" - "school" - "justfile" - ] - ); + "Documents" + "projects" + "Pictures" + "school" + "justfile" + ] + ); excludeHomeManagerSymlinks = true; repositories = [ "ssh://server-public/tank/bak/laptop" ]; From 6922052c97ce871994fa072e98108da27abcd5fa Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 30 Sep 2024 10:38:37 -0400 Subject: [PATCH 010/724] cachyos again + cleanup --- etcnixos/common.nix | 6 +-- etcnixos/flake.lock | 6 +-- etcnixos/system-nixos.nix | 3 ++ home-manager/flake.lock | 51 +++++++------------ home-manager/flake.nix | 11 +--- .../gpt4all-HEAD-disable-settings-err.patch | 19 ------- home-manager/system-mreow.nix | 3 -- 7 files changed, 26 insertions(+), 73 deletions(-) delete mode 100644 home-manager/progs/gpt4all-HEAD-disable-settings-err.patch diff --git a/etcnixos/common.nix b/etcnixos/common.nix index ce980bf..8d73567 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -31,10 +31,8 @@ #kernel options boot = { - # kernelPackages = pkgs.linuxPackages_cachyos-lto; - kernelPackages = pkgs.linuxPackages_6_10; - - supportedFilesystems = [ "zfs" ]; + kernelPackages = pkgs.linuxPackages_cachyos-lto; + # kernelPackages = pkgs.linuxPackages_6_10; kernel.sysctl = { #for profiling diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index bdc5d3a..df4f8c8 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -316,11 +316,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1727613673, - "narHash": "sha256-qqIffTQfxMYo3MKQ9BoY2s2mdKZNnUiksdnxv81js9U=", + "lastModified": 1727665282, + "narHash": "sha256-oKtfbQB1MBypqIyzkC8QCQcVGOa1soaXaGgcBIoh14o=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f5c239fa9acb27f0a5326ba2949c00fada89ca9f", + "rev": "11c43c830e533dad1be527ecce379fcf994fbbb5", "type": "github" }, "original": { diff --git a/etcnixos/system-nixos.nix b/etcnixos/system-nixos.nix index 5d2971f..1005cf6 100644 --- a/etcnixos/system-nixos.nix +++ b/etcnixos/system-nixos.nix @@ -15,6 +15,9 @@ ]; boot = { + kernelPackages = pkgs.linuxPackages_6_10; + supportedFilesystems = [ "zfs" ]; + kernelPatches = [ #for making ALVR support better :) { diff --git a/home-manager/flake.lock b/home-manager/flake.lock index bbbb0a1..c45c323 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -33,11 +33,11 @@ ] }, "locked": { - "lastModified": 1727595111, - "narHash": "sha256-i9Pz4vOnBdn1nqJmOL1+gP+A3nrK2WkOR8AO6RoIkQg=", + "lastModified": 1727688294, + "narHash": "sha256-bbisTJPMAObX/GD6tXjR1+4F/ED/jZgiZnFcXjnLC7k=", "owner": "orhun", "repo": "binsider", - "rev": "b1116e6118d3b6c481d9d99b25c23e2155260b97", + "rev": "3f4f742cfc759425ef767605417ff19d257023f9", "type": "github" }, "original": { @@ -68,22 +68,6 @@ "type": "github" } }, - "firefox-mod-theme": { - "flake": false, - "locked": { - "lastModified": 1727035403, - "narHash": "sha256-xkVZOZRGrL5YKEXb0R701F71vGJ+K5BFpugtqPwf4XQ=", - "owner": "datguypiko", - "repo": "Firefox-Mod-Blur", - "rev": "694566afa267fe6d5eb5c97a87e116ba794ea293", - "type": "github" - }, - "original": { - "owner": "datguypiko", - "repo": "Firefox-Mod-Blur", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -153,11 +137,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1727573335, - "narHash": "sha256-RCcDnBgJpP8GVdIrmS7IFhpUCWQjaYS4j7NBT6cbZ3s=", + "lastModified": 1727701561, + "narHash": "sha256-WY8hXcI5835QYQL7aSo2N2mpzt7iZzmt+I+//zqLNcA=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "415bbec6b9482afa0605682cf31064964ae705c6", + "rev": "31730f5948bdcbe2f909feb414912f0abdc1fbd7", "type": "github" }, "original": { @@ -186,11 +170,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1727525902, - "narHash": "sha256-NUsPodaJn384rLdPawH1u1cxHzE25EdrXMLkpRTkGFA=", + "lastModified": 1727699256, + "narHash": "sha256-/8+/LrIClf0ME2sC1R25p7JXT7n17xHDElCd8I/VOoc=", "owner": "YaLTeR", "repo": "niri", - "rev": "c04ccafd0a2cb26c1f6a4835f4cbb01ffdb926a6", + "rev": "b501a9b303d9722173565d4b8f7f044a38cbc099", "type": "github" }, "original": { @@ -264,7 +248,6 @@ "inputs": { "agenix": "agenix", "binsider": "binsider", - "firefox-mod-theme": "firefox-mod-theme", "home-manager": "home-manager", "niri": "niri", "nixpkgs": "nixpkgs", @@ -281,11 +264,11 @@ ] }, "locked": { - "lastModified": 1727577080, - "narHash": "sha256-2LPT76Acp6ebt7fCt90eq/M8T2+X09s/yTVgfVFrtno=", + "lastModified": 1727663505, + "narHash": "sha256-83j/GrHsx8GFUcQofKh+PRPz6pz8sxAsZyT/HCNdey8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "73a833855442ce8cee710cf4d8d054fea1c81196", + "rev": "c2099c6c7599ea1980151b8b6247a8f93e1806ee", "type": "github" }, "original": { @@ -381,15 +364,15 @@ ] }, "locked": { - "lastModified": 1727287465, - "narHash": "sha256-XQAf5M593WmxgaXagtkci/H9DA3jSVx1TJk6F3X5VQo=", - "owner": "MarceColl", + "lastModified": 1727680504, + "narHash": "sha256-QYlWZwUSwrM7BuO+dXclZIwoPvBIuJr6GpFKv9XKFPI=", + "owner": "ch4og", "repo": "zen-browser-flake", - "rev": "96f1b5d80bf7360cb77c9b521f388324f18383a0", + "rev": "a026029bd9c953559a6990a5c0c80e355ed8a9dc", "type": "github" }, "original": { - "owner": "MarceColl", + "owner": "ch4og", "repo": "zen-browser-flake", "type": "github" } diff --git a/home-manager/flake.nix b/home-manager/flake.nix index 6bba1fd..09cf59d 100644 --- a/home-manager/flake.nix +++ b/home-manager/flake.nix @@ -31,7 +31,7 @@ }; zen-browser = { - url = "github:MarceColl/zen-browser-flake"; + url = "github:ch4og/zen-browser-flake"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -46,12 +46,6 @@ url = "github:Matoking/vdf/support_new_bvdf"; flake = false; }; - - firefox-mod-theme = { - url = "github:datguypiko/Firefox-Mod-Blur"; - flake = false; - }; - }; outputs = @@ -71,7 +65,6 @@ pkgs = import nixpkgs { }; in { - homeConfigurations.${username} = home-manager.lib.homeManagerConfiguration { inherit pkgs; extraSpecialArgs = { @@ -82,13 +75,11 @@ niri.homeModules.config agenix.homeManagerModules.age - # add declarative rust modules ( { pkgs, ... }: { nixpkgs.overlays = [ rust-overlay.overlays.default - niri.overlays.niri ]; # home-manager stuff diff --git a/home-manager/progs/gpt4all-HEAD-disable-settings-err.patch b/home-manager/progs/gpt4all-HEAD-disable-settings-err.patch deleted file mode 100644 index a6911ab..0000000 --- a/home-manager/progs/gpt4all-HEAD-disable-settings-err.patch +++ /dev/null @@ -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) { diff --git a/home-manager/system-mreow.nix b/home-manager/system-mreow.nix index c042439..b68dab0 100644 --- a/home-manager/system-mreow.nix +++ b/home-manager/system-mreow.nix @@ -15,8 +15,6 @@ #manage bluetooth devices blueman - - niri-unstable ]; #bluetooth manager @@ -30,7 +28,6 @@ #window manager programs.niri = { - package = pkgs.niri-unstable; settings = import ./progs/niri.nix { inherit config pkgs homeDirectory; }; }; From b00e6758fe7ef1bc6dd571cb79404beb01e37700 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 30 Sep 2024 14:11:55 -0400 Subject: [PATCH 011/724] update --- etcnixos/common.nix | 1 - etcnixos/flake.lock | 6 +-- etcnixos/networking.nix | 2 +- etcnixos/system-mreow.nix | 2 +- home-manager/flake.lock | 12 ++--- home-manager/gui.nix | 1 + .../gpt4all-HEAD-embeddings-model.patch | 53 ------------------- home-manager/progs/gpt4all/gpt4all.nix | 5 +- home-manager/system-mreow.nix | 2 + 9 files changed, 16 insertions(+), 68 deletions(-) delete mode 100644 home-manager/progs/gpt4all/gpt4all-HEAD-embeddings-model.patch diff --git a/etcnixos/common.nix b/etcnixos/common.nix index 8d73567..6ca50d1 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -32,7 +32,6 @@ #kernel options boot = { kernelPackages = pkgs.linuxPackages_cachyos-lto; - # kernelPackages = pkgs.linuxPackages_6_10; kernel.sysctl = { #for profiling diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index df4f8c8..aa59c16 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -332,11 +332,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1727348695, - "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", + "lastModified": 1727634051, + "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", + "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9", "type": "github" }, "original": { diff --git a/etcnixos/networking.nix b/etcnixos/networking.nix index cbcae80..6cf27b9 100644 --- a/etcnixos/networking.nix +++ b/etcnixos/networking.nix @@ -8,7 +8,7 @@ enable = true; insertNameservers = [ "1.1.1.1" - "8.8.8.8" + "9.9.9.9" ]; wifi = { scanRandMacAddress = true; diff --git a/etcnixos/system-mreow.nix b/etcnixos/system-mreow.nix index 00e4728..04e5ec4 100644 --- a/etcnixos/system-mreow.nix +++ b/etcnixos/system-mreow.nix @@ -46,7 +46,7 @@ enable = true; settings = { default_session = { - command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd ${pkgs.niri}/bin/niri-session"; + command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd niri-session"; user = "${username}"; }; }; diff --git a/home-manager/flake.lock b/home-manager/flake.lock index c45c323..de9e670 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -137,11 +137,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1727701561, - "narHash": "sha256-WY8hXcI5835QYQL7aSo2N2mpzt7iZzmt+I+//zqLNcA=", + "lastModified": 1727714074, + "narHash": "sha256-8a75SFeO1y6ynzF4kLZOnbwZCMWZ51GeBo9u+/MF4xc=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "31730f5948bdcbe2f909feb414912f0abdc1fbd7", + "rev": "63a85add825d4bd6ef48780f9c32ac0d31a8929a", "type": "github" }, "original": { @@ -185,11 +185,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1727348695, - "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", + "lastModified": 1727634051, + "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", + "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9", "type": "github" }, "original": { diff --git a/home-manager/gui.nix b/home-manager/gui.nix index 68d11aa..fa8c684 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -87,6 +87,7 @@ xdg-utils # xdg utils puddletag + picard inputs.zen-browser.packages."${pkgs.system}".specific diff --git a/home-manager/progs/gpt4all/gpt4all-HEAD-embeddings-model.patch b/home-manager/progs/gpt4all/gpt4all-HEAD-embeddings-model.patch deleted file mode 100644 index fb15635..0000000 --- a/home-manager/progs/gpt4all/gpt4all-HEAD-embeddings-model.patch +++ /dev/null @@ -1,53 +0,0 @@ -commit 425b33877c819dd88f3692aae37452c767371f6b -Author: Simon Gardling -Date: Thu Sep 19 10:00:39 2024 -0400 - - use locally downloaded embeddings - -diff --git a/gpt4all-chat/CMakeLists.txt b/gpt4all-chat/CMakeLists.txt -index 900307ae..802fc31a 100644 ---- a//CMakeLists.txt -+++ b/CMakeLists.txt -@@ -120,6 +120,7 @@ elseif (APPLE) - endif() - - # Embedding model -+#[[ - set(LOCAL_EMBEDDING_MODEL "nomic-embed-text-v1.5.f16.gguf") - set(LOCAL_EMBEDDING_MODEL_MD5 "a5401e7f7e46ed9fcaed5b60a281d547") - set(LOCAL_EMBEDDING_MODEL_PATH "${CMAKE_BINARY_DIR}/resources/${LOCAL_EMBEDDING_MODEL}") -@@ -134,6 +135,7 @@ message(STATUS "Embedding model downloaded to ${LOCAL_EMBEDDING_MODEL_PATH}") - if (APPLE) - list(APPEND CHAT_EXE_RESOURCES "${LOCAL_EMBEDDING_MODEL_PATH}") - endif() -+]] - - set(QAPPLICATION_CLASS QGuiApplication) - add_subdirectory(deps/SingleApplication) -@@ -348,11 +350,13 @@ if (LLMODEL_CUDA) - endif() - endif() - -+#[[ - if (NOT APPLE) - install(FILES "${LOCAL_EMBEDDING_MODEL_PATH}" - DESTINATION resources - COMPONENT ${COMPONENT_NAME_MAIN}) - endif() -+]] - - set(CPACK_GENERATOR "IFW") - set(CPACK_VERBATIM_VARIABLES YES) -diff --git a/gpt4all-chat/src/embllm.cpp b/gpt4all-chat/src/embllm.cpp -index 81b1e9e1..e3266cc7 100644 ---- a/src/embllm.cpp -+++ b/src/embllm.cpp -@@ -84,7 +84,7 @@ bool EmbeddingLLMWorker::loadModel() - - QString filePath = embPathFmt.arg(QCoreApplication::applicationDirPath(), LOCAL_EMBEDDING_MODEL); - if (!QFileInfo::exists(filePath)) { -- qWarning() << "embllm WARNING: Local embedding model not found"; -+ qWarning() << "embllm WARNING: Local embedding model not found: " << filePath; - return false; - } - diff --git a/home-manager/progs/gpt4all/gpt4all.nix b/home-manager/progs/gpt4all/gpt4all.nix index 93b3f65..87d12fd 100644 --- a/home-manager/progs/gpt4all/gpt4all.nix +++ b/home-manager/progs/gpt4all/gpt4all.nix @@ -46,7 +46,6 @@ let gpt4all_package = ( optimizeWithFlags (pkgs.gpt4all.overrideAttrs (old: { - # https://github.com/NixOS/nixpkgs/pull/344001 3.2.1 -> 3.3.0 version = "3.4.0-dev0"; src = pkgs.fetchFromGitHub { fetchSubmodules = true; @@ -56,10 +55,10 @@ let sha256 = "/w1VAfLYlhB5y08cVG2u9RT2kajtFtyTPziQXSwVFcE="; }; - patches = [ - ./gpt4all-HEAD-embeddings-model.patch + patches = old.patches ++ [ ./gpt4all-HEAD-disable-settings-err.patch ]; + })) # compile flags [ diff --git a/home-manager/system-mreow.nix b/home-manager/system-mreow.nix index b68dab0..c9ba7fd 100644 --- a/home-manager/system-mreow.nix +++ b/home-manager/system-mreow.nix @@ -15,6 +15,8 @@ #manage bluetooth devices blueman + + niri ]; #bluetooth manager From f2fe3d193bf6a4d38ef6569c89f15ecc609a3192 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 1 Oct 2024 09:40:02 -0400 Subject: [PATCH 012/724] flake update --- etcnixos/flake.lock | 6 +++--- home-manager/flake.lock | 36 ++++++++++++++++++------------------ 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index aa59c16..28de1d7 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -50,11 +50,11 @@ ] }, "locked": { - "lastModified": 1727620986, - "narHash": "sha256-4RlJt1MJmZcuP3ROlrb2YvG8WfH0BM/nGqDgNT/DAwE=", + "lastModified": 1727734424, + "narHash": "sha256-COHPdJb8goIemave9L8kBKkQKEPHuilXZqR3nIBcQsM=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "0eee1b2134e9aa3427081715ada883f3523a9608", + "rev": "fed2d39a7c4614311e25a4281d056a7a2d36a6c8", "type": "github" }, "original": { diff --git a/home-manager/flake.lock b/home-manager/flake.lock index de9e670..3872f71 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -33,11 +33,11 @@ ] }, "locked": { - "lastModified": 1727688294, - "narHash": "sha256-bbisTJPMAObX/GD6tXjR1+4F/ED/jZgiZnFcXjnLC7k=", + "lastModified": 1727724920, + "narHash": "sha256-3dIJstoNLiERwtNIRFIxo1EP4vqizPHagAnoydhNSQs=", "owner": "orhun", "repo": "binsider", - "rev": "3f4f742cfc759425ef767605417ff19d257023f9", + "rev": "ad7cca36d365d9d0c78d542da2bf533d08580687", "type": "github" }, "original": { @@ -137,11 +137,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1727714074, - "narHash": "sha256-8a75SFeO1y6ynzF4kLZOnbwZCMWZ51GeBo9u+/MF4xc=", + "lastModified": 1727780469, + "narHash": "sha256-ujDpvGKpYLLFP5qPA4eSV0AAYllWT/J7zqJRFGmZuSo=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "63a85add825d4bd6ef48780f9c32ac0d31a8929a", + "rev": "72216d18036d31a22791af605b827a2dff64deb4", "type": "github" }, "original": { @@ -170,11 +170,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1727699256, - "narHash": "sha256-/8+/LrIClf0ME2sC1R25p7JXT7n17xHDElCd8I/VOoc=", + "lastModified": 1727778508, + "narHash": "sha256-9oMBzXZZzEVZAqHA79aJSQmNJ75hQuCpq0POB0Lxt7Q=", "owner": "YaLTeR", "repo": "niri", - "rev": "b501a9b303d9722173565d4b8f7f044a38cbc099", + "rev": "0cca7a21163f0d4c1e99c12844da027a23e76003", "type": "github" }, "original": { @@ -213,11 +213,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1727540905, - "narHash": "sha256-40J9tW7Y794J7Uw4GwcAKlMxlX2xISBl6IBigo83ih8=", + "lastModified": 1727672256, + "narHash": "sha256-9/79hjQc9+xyH+QxeMcRsA6hDyw6Z9Eo1/oxjvwirLk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fbca5e745367ae7632731639de5c21f29c8744ed", + "rev": "1719f27dd95fd4206afb9cec9f415b539978827e", "type": "github" }, "original": { @@ -264,11 +264,11 @@ ] }, "locked": { - "lastModified": 1727663505, - "narHash": "sha256-83j/GrHsx8GFUcQofKh+PRPz6pz8sxAsZyT/HCNdey8=", + "lastModified": 1727749966, + "narHash": "sha256-DUS8ehzqB1DQzfZ4bRXVSollJhu+y7cvh1DJ9mbWebE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c2099c6c7599ea1980151b8b6247a8f93e1806ee", + "rev": "00decf1b4f9886d25030b9ee4aed7bfddccb5f66", "type": "github" }, "original": { @@ -364,11 +364,11 @@ ] }, "locked": { - "lastModified": 1727680504, - "narHash": "sha256-QYlWZwUSwrM7BuO+dXclZIwoPvBIuJr6GpFKv9XKFPI=", + "lastModified": 1727727601, + "narHash": "sha256-YWOGgiqRCOAjHrXbCukCvg9alB9mLMXvrqaUmoFqt+o=", "owner": "ch4og", "repo": "zen-browser-flake", - "rev": "a026029bd9c953559a6990a5c0c80e355ed8a9dc", + "rev": "18dac9cd4633bf14d9e96be4d97cd9b358d1bca8", "type": "github" }, "original": { From 24b1f4de38dcdc959888ed099fad6eac7f43dba0 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 2 Oct 2024 13:04:36 -0400 Subject: [PATCH 013/724] misc changes --- etcnixos/flake.lock | 12 +++++------ etcnixos/flake.nix | 21 +++++-------------- etcnixos/system-mreow.nix | 6 +++++- etcnixos/system-nixos.nix | 4 ++++ home-manager/flake.lock | 44 +++++++++++++++++++-------------------- 5 files changed, 42 insertions(+), 45 deletions(-) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 28de1d7..06ab548 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -278,11 +278,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1725379389, - "narHash": "sha256-qS1H/5/20ewJIXmf8FN2A5KTOKKU9elWvCPwdBi1P/U=", + "lastModified": 1727792571, + "narHash": "sha256-KBzRQVE1j2vrSg8WfYJ+vEvFBC25+2VsFSK7VL2kc1M=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "e7bd94e0b5ff3c1e686f2101004ebf4fcea9d871", + "rev": "e2365a1d8dccdcf4bca5111672e80df67d90957d", "type": "github" }, "original": { @@ -332,11 +332,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1727634051, - "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", + "lastModified": 1727802920, + "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9", + "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", "type": "github" }, "original": { diff --git a/etcnixos/flake.nix b/etcnixos/flake.nix index 5a96564..75772fb 100644 --- a/etcnixos/flake.nix +++ b/etcnixos/flake.nix @@ -57,22 +57,11 @@ inherit inputs username hostname; }; inherit pkgs; - modules = - [ - ./system-${hostname}.nix - chaotic.nixosModules.default - agenix.nixosModules.default - - ] - ++ ( - if ("${hostname}" == "mreow") then # laptop - [ - nixos-hardware.nixosModules.framework-12th-gen-intel - lanzaboote.nixosModules.lanzaboote - ] - else - [ ] - ); + modules = [ + ./system-${hostname}.nix + chaotic.nixosModules.default + agenix.nixosModules.default + ]; }; }; } diff --git a/etcnixos/system-mreow.nix b/etcnixos/system-mreow.nix index 04e5ec4..5ba9d3e 100644 --- a/etcnixos/system-mreow.nix +++ b/etcnixos/system-mreow.nix @@ -4,12 +4,16 @@ lib, username, system, + inputs, ... }: { imports = [ ./common.nix ./hardware_laptop.nix + + inputs.nixos-hardware.nixosModules.framework-12th-gen-intel + inputs.lanzaboote.nixosModules.lanzaboote ]; services.tlp = { @@ -27,7 +31,7 @@ CPU_MAX_PERF_ON_BAT = 60; CPU_BOOST_ON_BAT = 0; - START_CHARGE_THRESH_BAT0 = 90; + START_CHARGE_THRESH_BAT0 = 80; STOP_CHARGE_THRESH_BAT0 = 90; RUNTIME_PM_ON_BAT = "auto"; }; diff --git a/etcnixos/system-nixos.nix b/etcnixos/system-nixos.nix index 1005cf6..9ba0080 100644 --- a/etcnixos/system-nixos.nix +++ b/etcnixos/system-nixos.nix @@ -12,6 +12,10 @@ imports = [ ./common.nix ./hardware_desktop.nix + + inputs.nixos-hardware.nixosModules.common-cpu-amd-pstate + inputs.nixos-hardware.nixosModules.common-cpu-amd-zenpower + inputs.nixos-hardware.nixosModules.common-pc-ssd ]; boot = { diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 3872f71..b5e451b 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -33,11 +33,11 @@ ] }, "locked": { - "lastModified": 1727724920, - "narHash": "sha256-3dIJstoNLiERwtNIRFIxo1EP4vqizPHagAnoydhNSQs=", + "lastModified": 1727805287, + "narHash": "sha256-sMQP+HesLU40wKPVR55lXyruU1NPbFDfqmaiLDMhVis=", "owner": "orhun", "repo": "binsider", - "rev": "ad7cca36d365d9d0c78d542da2bf533d08580687", + "rev": "aba611285f270eed7a087f437e7d5443e4a4d5b4", "type": "github" }, "original": { @@ -73,11 +73,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1726153070, - "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -111,11 +111,11 @@ ] }, "locked": { - "lastModified": 1727383923, - "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=", + "lastModified": 1727817100, + "narHash": "sha256-dlyV9/eiWkm/Y/t2+k4CFZ29tBvCANmJogEYaHeAOTw=", "owner": "nix-community", "repo": "home-manager", - "rev": "ffe2d07e771580a005e675108212597e5b367d2d", + "rev": "437ec62009fa8ceb684eb447d455ffba25911cf9", "type": "github" }, "original": { @@ -137,11 +137,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1727780469, - "narHash": "sha256-ujDpvGKpYLLFP5qPA4eSV0AAYllWT/J7zqJRFGmZuSo=", + "lastModified": 1727832097, + "narHash": "sha256-XMBkQoRgUGJKdux94mNDE+7PIGIxEk48ol9RcN+HSFg=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "72216d18036d31a22791af605b827a2dff64deb4", + "rev": "173d6304db132d8ba75765fe73bf75ed22bbbcc2", "type": "github" }, "original": { @@ -185,11 +185,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1727634051, - "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", + "lastModified": 1727802920, + "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9", + "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", "type": "github" }, "original": { @@ -201,14 +201,14 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1725233747, - "narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=", + "lastModified": 1727825735, + "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" } }, "nixpkgs-stable": { @@ -264,11 +264,11 @@ ] }, "locked": { - "lastModified": 1727749966, - "narHash": "sha256-DUS8ehzqB1DQzfZ4bRXVSollJhu+y7cvh1DJ9mbWebE=", + "lastModified": 1727836133, + "narHash": "sha256-JE0zciM5IGWvK8J/pE2VldNBf7oyMH5WrU8tZArefbg=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "00decf1b4f9886d25030b9ee4aed7bfddccb5f66", + "rev": "02321540b0c8000b36889b1b974d1fec585b25a4", "type": "github" }, "original": { From 03376f3a328b7c18aebd97614f3e91650166ce7a Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 2 Oct 2024 13:11:15 -0400 Subject: [PATCH 014/724] edit config to reflect protontricks update --- home-manager/flake.nix | 12 ------------ home-manager/system-nixos.nix | 28 +--------------------------- 2 files changed, 1 insertion(+), 39 deletions(-) diff --git a/home-manager/flake.nix b/home-manager/flake.nix index 09cf59d..4e524d3 100644 --- a/home-manager/flake.nix +++ b/home-manager/flake.nix @@ -34,18 +34,6 @@ url = "github:ch4og/zen-browser-flake"; inputs.nixpkgs.follows = "nixpkgs"; }; - - # sources to patch protontricks as it doesn't work with latest steam beta - # https://github.com/Matoking/protontricks/issues/304#issuecomment-2280920826 - protontricks = { - url = "github:Matoking/protontricks/appinfo_v29"; - flake = false; - }; - - vdf-patch = { - url = "github:Matoking/vdf/support_new_bvdf"; - flake = false; - }; }; outputs = diff --git a/home-manager/system-nixos.nix b/home-manager/system-nixos.nix index 4c0cb8c..35a6808 100644 --- a/home-manager/system-nixos.nix +++ b/home-manager/system-nixos.nix @@ -8,34 +8,8 @@ imports = [ ./gui.nix ]; nixpkgs.config.allowUnfree = true; - nixpkgs.overlays = [ - # Add a protontricks-beta package so we can use protontricks with latest steam beta - # https://github.com/Matoking/protontricks/issues/304#issuecomment-2280920826 - - # nixpkgs update: https://github.com/NixOS/nixpkgs/pull/343068 - ( - final: prev: - let - ps = prev.python312Packages; - in - { - vdf-patch = ps.vdf.overrideAttrs (oldAttrs: { - src = inputs.vdf-patch; - }); - protontricks-beta = prev.protontricks.overrideAttrs (oldAttrs: { - src = inputs.protontricks; - propagatedBuildInputs = [ - ps.setuptools # implicit dependency, used to find data/icon_placeholder.png - final.vdf-patch - ps.pillow - ]; - }); - } - ) - ]; - home.packages = with pkgs; [ - protontricks-beta + protontricks beatsabermodmanager protonup-qt ]; From 78fbf364bf273d3f401a4ac7413eb7e3bf05f765 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 2 Oct 2024 21:22:10 -0400 Subject: [PATCH 015/724] gpt4all: update and flake update --- home-manager/flake.lock | 42 ++------------------------ home-manager/progs/gpt4all/gpt4all.nix | 42 ++++++++++++++++++-------- 2 files changed, 33 insertions(+), 51 deletions(-) diff --git a/home-manager/flake.lock b/home-manager/flake.lock index b5e451b..0bf590d 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -137,11 +137,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1727832097, - "narHash": "sha256-XMBkQoRgUGJKdux94mNDE+7PIGIxEk48ol9RcN+HSFg=", + "lastModified": 1727886705, + "narHash": "sha256-MFZm6b3CcRiLjQ6MxtKu2rDu+KUBkr/R0kOSXoS2eG4=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "173d6304db132d8ba75765fe73bf75ed22bbbcc2", + "rev": "6384dde52d929f500ec75172ebfc26e8d009dbd3", "type": "github" }, "original": { @@ -227,23 +227,6 @@ "type": "github" } }, - "protontricks": { - "flake": false, - "locked": { - "lastModified": 1722530921, - "narHash": "sha256-t794WEMJx/JNX3gTMHfgquFWB7yXkleW07+QURm1NPM=", - "owner": "Matoking", - "repo": "protontricks", - "rev": "f7b1fa33b0438dbd72f7222703f8442e40edc510", - "type": "github" - }, - "original": { - "owner": "Matoking", - "ref": "appinfo_v29", - "repo": "protontricks", - "type": "github" - } - }, "root": { "inputs": { "agenix": "agenix", @@ -251,9 +234,7 @@ "home-manager": "home-manager", "niri": "niri", "nixpkgs": "nixpkgs", - "protontricks": "protontricks", "rust-overlay": "rust-overlay", - "vdf-patch": "vdf-patch", "zen-browser": "zen-browser" } }, @@ -307,23 +288,6 @@ "type": "github" } }, - "vdf-patch": { - "flake": false, - "locked": { - "lastModified": 1719784100, - "narHash": "sha256-OPonFrYrEFYtx0T2hvSYXl/idsm0iDPwqlnm1KbTPIo=", - "owner": "Matoking", - "repo": "vdf", - "rev": "981cad270c2558aeb8eccaf42cfcf9fabbbed199", - "type": "github" - }, - "original": { - "owner": "Matoking", - "ref": "support_new_bvdf", - "repo": "vdf", - "type": "github" - } - }, "xwayland-satellite-stable": { "flake": false, "locked": { diff --git a/home-manager/progs/gpt4all/gpt4all.nix b/home-manager/progs/gpt4all/gpt4all.nix index 87d12fd..b155fd5 100644 --- a/home-manager/progs/gpt4all/gpt4all.nix +++ b/home-manager/progs/gpt4all/gpt4all.nix @@ -1,24 +1,42 @@ { pkgs, lib, ... }: let models = [ + # { + # name = "Qwen2.5-14B-Instruct-Q4_K_S.gguf"; + # context_length = "32768"; + # gen_length = "8192"; + # source = pkgs.fetchurl { + # url = "https://huggingface.co/bartowski/Qwen2.5-14B-Instruct-GGUF/resolve/main/Qwen2.5-14B-Instruct-Q4_K_S.gguf?download=true"; + # sha256 = "E1CmWUhMMbTXEjIRczzA3rSrVuR8qOL8BLagw7LiyZk="; + # }; + # } { - name = "Qwen2.5-14B-Instruct-Q4_K_S.gguf"; + name = "Replete-LLM-V2.5-Qwen-14b-Q4_K_S.gguf"; context_length = "32768"; gen_length = "8192"; source = pkgs.fetchurl { - url = "https://huggingface.co/bartowski/Qwen2.5-14B-Instruct-GGUF/resolve/main/Qwen2.5-14B-Instruct-Q4_K_S.gguf?download=true"; - sha256 = "E1CmWUhMMbTXEjIRczzA3rSrVuR8qOL8BLagw7LiyZk="; - }; - } - { - name = "Qwen2.5-7B-Instruct-Q6_K_L.gguf"; - context_length = "32768"; - gen_length = "8192"; - source = pkgs.fetchurl { - url = "https://huggingface.co/bartowski/Qwen2.5-7B-Instruct-GGUF/resolve/main/Qwen2.5-7B-Instruct-Q6_K_L.gguf?download=true"; - sha256 = "thEXN06T/UVGfzdB83jlgpG7kuTzZtz1ZUAdupAnErM="; + url = "https://huggingface.co/bartowski/Replete-LLM-V2.5-Qwen-14b-GGUF/resolve/main/Replete-LLM-V2.5-Qwen-14b-Q4_K_S.gguf?download=true"; + sha256 = "/Oa1y4WVRGQkLEt5Sxxyt5plN5+tDFblLShPhMtzs7k="; }; } + # { + # name = "Qwen2.5-7B-Instruct-Q6_K_L.gguf"; + # context_length = "32768"; + # gen_length = "8192"; + # source = pkgs.fetchurl { + # url = "https://huggingface.co/bartowski/Qwen2.5-7B-Instruct-GGUF/resolve/main/Qwen2.5-7B-Instruct-Q6_K_L.gguf?download=true"; + # sha256 = "thEXN06T/UVGfzdB83jlgpG7kuTzZtz1ZUAdupAnErM="; + # }; + # } + # { + # name = "Replete-LLM-V2.5-Qwen-7b-Q6_K_L.gguf"; + # context_length = "32768"; + # gen_length = "8192"; + # source = pkgs.fetchurl { + # url = "https://huggingface.co/bartowski/Replete-LLM-V2.5-Qwen-7b-GGUF/resolve/main/Replete-LLM-V2.5-Qwen-7b-Q6_K_L.gguf?download=true"; + # sha256 = "dR7M5GKfGdiPI9mqBSH6naVr8XzuCjLLv514VYXSikg="; + # }; + # } ]; # stolen from: https://stackoverflow.com/a/42398526 From c57c41f7c45fa3138f896ab7a32d9ca6a705c6e8 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 2 Oct 2024 21:33:54 -0400 Subject: [PATCH 016/724] update no-rgb service --- etcnixos/system-nixos.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/etcnixos/system-nixos.nix b/etcnixos/system-nixos.nix index 9ba0080..2b477b1 100644 --- a/etcnixos/system-nixos.nix +++ b/etcnixos/system-nixos.nix @@ -67,9 +67,11 @@ let no-rgb = pkgs.writeScriptBin "no-rgb" '' #!/bin/sh - NUM_DEVICES=$(${pkgs.openrgb}/bin/openrgb --noautoconnect --list-devices | grep -E '^[0-9]+: ' | wc -l) + set -e - for i in $(seq 0 $(($NUM_DEVICES - 1))); do + NUM_DEVICES=$(${pkgs.openrgb}/bin/openrgb --noautoconnect --list-devices | ${pkgs.gnugrep}/bin/grep -E '^[0-9]+: ' | ${pkgs.coreutils}/bin/wc -l) + + for i in $(${pkgs.coreutils}/bin/seq 0 $(($NUM_DEVICES - 1))); do ${pkgs.openrgb}/bin/openrgb --noautoconnect --device $i --mode direct --color 000000 done ''; From 60a167839f2913d47e1bc709c470e34f0236b020 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 2 Oct 2024 22:07:32 -0400 Subject: [PATCH 017/724] update --- etcnixos/system-nixos.nix | 2 +- home-manager/progs/gpt4all/gpt4all.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/etcnixos/system-nixos.nix b/etcnixos/system-nixos.nix index 2b477b1..ecc7ddd 100644 --- a/etcnixos/system-nixos.nix +++ b/etcnixos/system-nixos.nix @@ -19,7 +19,7 @@ ]; boot = { - kernelPackages = pkgs.linuxPackages_6_10; + kernelPackages = lib.mkForce pkgs.linuxPackages_6_10; supportedFilesystems = [ "zfs" ]; kernelPatches = [ diff --git a/home-manager/progs/gpt4all/gpt4all.nix b/home-manager/progs/gpt4all/gpt4all.nix index b155fd5..10afa67 100644 --- a/home-manager/progs/gpt4all/gpt4all.nix +++ b/home-manager/progs/gpt4all/gpt4all.nix @@ -70,7 +70,7 @@ let owner = "nomic-ai"; repo = "gpt4all"; rev = "HEAD"; - sha256 = "/w1VAfLYlhB5y08cVG2u9RT2kajtFtyTPziQXSwVFcE="; + sha256 = "vzAfWLyljR0Cg6pCeeyQJZNeOJh5xOILlbJnwDWu62o="; }; patches = old.patches ++ [ From 54a90352e758056c704e7abc67d1a04b79385ee3 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 2 Oct 2024 23:40:07 -0400 Subject: [PATCH 018/724] cleanup --- home-manager/flake.lock | 6 +++--- home-manager/gui.nix | 4 ---- home-manager/no-gui.nix | 3 --- home-manager/progs/gpt4all/gpt4all.nix | 4 ++-- 4 files changed, 5 insertions(+), 12 deletions(-) diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 0bf590d..7ab71b4 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -245,11 +245,11 @@ ] }, "locked": { - "lastModified": 1727836133, - "narHash": "sha256-JE0zciM5IGWvK8J/pE2VldNBf7oyMH5WrU8tZArefbg=", + "lastModified": 1727922550, + "narHash": "sha256-pJoN5Qd83coaoEJmpkxw+cuh89IJORvLm8qyw3GMLIQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "02321540b0c8000b36889b1b974d1fec585b25a4", + "rev": "5e3eee4bc42a2504653bedfe95bceda9a1e85ae7", "type": "github" }, "original": { diff --git a/home-manager/gui.nix b/home-manager/gui.nix index fa8c684..c245018 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -75,9 +75,6 @@ lrcget - #openstreetmap contributing - josm - gparted gnome-disk-utility @@ -86,7 +83,6 @@ libnotify # notifications library xdg-utils # xdg utils - puddletag picard inputs.zen-browser.packages."${pkgs.system}".specific diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 16006e4..db3f1c3 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -79,11 +79,8 @@ bottom wget unzip - mold - gcc compsize killall - gnumake sshfs diff --git a/home-manager/progs/gpt4all/gpt4all.nix b/home-manager/progs/gpt4all/gpt4all.nix index 10afa67..c5bfdfc 100644 --- a/home-manager/progs/gpt4all/gpt4all.nix +++ b/home-manager/progs/gpt4all/gpt4all.nix @@ -96,8 +96,8 @@ in home.file = lib.recursiveUpdate { ".config/nomic.ai/GPT4All.ini".text = let - system_prompt = "You are an expert AI assistant who is thoughtful and works step-by-step from first principles derive an answer to the user's prompt. For each step, provide a title that describes what you're doing in that step, along with the content. Decide if you need another step or if you're ready to provide your answer to the user, make sure to exhaust ALL POSSIBILITIES before providing a response to the user. While your reasoning is not shown to the user, it is under high levels of scrutiny to ensure high-quality reasoning. WHEN YOU DETERMINE THAT YOU ARE READY TO GIVE A FINAL ANSWER TO THE USER GIVEN YOUR REASONING AND STEP-BY-STEP WORK. ONLY TEXT WRITTEN AFTER A SECTION NAMED \"Final Answer\" WILL BE SHOWN TO THE USER. ASSUME THAT NO REASONING STEPS ARE SHOWN TO THE USER. DO NOT THINK THAT THE USER CAN SEE YOUR INTERNAL REASONING STEPS. - USE AS MANY REASONING STEPS AS POSSIBLE. AT LEAST 3. BE AWARE OF YOUR LIMITATIONS AS AN LLM AND WHAT YOU CAN AND CANNOT DO. EXPLORE ALTERNATE ANSWERS AND CONSIDER THAT YOUR ANSWER MAY BE WRONG. IDENTIFY POSSIBLE ERRORS IN YOUR REASONING AND WHERE SUCH ERRORS MAY BE. FULLY TEST ALL OTHER POSSIBILITIES. YOU CAN BE WRONG. WHEN YOU SAY YOU ARE RE-EXAMINING, ACTUALLY RE-EXAMINE, AND USE ANOTHER APPROACH TO DO SO. DO NOT JUST SAY YOU ARE RE-EXAMINING. SHOW ALL YOUR WORK. USE AT LEAST 3 METHODS TO DERIVE THE ANSWER. USE BEST PRACTICES. WORK FROM FIRST PRINCIPLES TO CREATE YOUR ANSWER."; + system_prompt = "You are an expert LLM who is thoughtful and works step-by-step from first principles derive an answer to the user's prompt. For each step, provide a title that describes what you're doing in that step, along with the content, then decide if your work is comprehensive and if you're ready to provide your final answer. Make sure to exhaust ALL POSSIBILITIES before answering. While your reasoning is not shown to the user, it is under high levels of scrutiny to ensure high-quality reasoning. INTERNAL REASONING STEPS ARE NOT SHOWN TO THE USER, ONLY A \"Final Answer\" SECTION WILL BE SHOWN TO THE USER. +USE AS MANY REASONING STEPS AS POSSIBLE. AT LEAST 3. EXPLORE ALTERNATE ANSWERS AND CONSIDER THAT YOUR ANSWER MAY BE WRONG. IDENTIFY POSSIBLE ERRORS IN YOUR REASONING AND WHERE SUCH ERRORS MAY BE. FULLY TEST ALL OTHER POSSIBILITIES. YOU CAN BE WRONG. WHEN YOU SAY YOU ARE RE-EXAMINING, ACTUALLY RE-EXAMINE, AND USE ANOTHER APPROACH TO DO SO. BE VERBOSE IN YOUR REASONING AND RE-EXAMINING."; in '' [General] From 5c8ea59d530b48e54253638b02e2e9767116fa8f Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 3 Oct 2024 11:33:44 -0400 Subject: [PATCH 019/724] gpt4all: improvements and mkl --- home-manager/no-gui.nix | 3 +++ home-manager/progs/gpt4all/gpt4all.nix | 19 ++++++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index db3f1c3..49741b8 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -34,6 +34,7 @@ targets = [ "thumbv7m-none-eabi" ]; } )) + cargo-expand #find typos in code typos @@ -129,6 +130,8 @@ age git-crypt + + clang ]; home.file.".cargo/config.toml".text = '' diff --git a/home-manager/progs/gpt4all/gpt4all.nix b/home-manager/progs/gpt4all/gpt4all.nix index c5bfdfc..b0e2623 100644 --- a/home-manager/progs/gpt4all/gpt4all.nix +++ b/home-manager/progs/gpt4all/gpt4all.nix @@ -73,6 +73,22 @@ let sha256 = "vzAfWLyljR0Cg6pCeeyQJZNeOJh5xOILlbJnwDWu62o="; }; + cmakeFlags = old.cmakeFlags ++ [ + "-DGGML_VULKAN=ON" + "-DGGML_KOMPUTE=ON" + "-DGGML_BLAS=ON" + "-DGGML_VENDOR=Intel" + ]; + + nativeBuildInputs = old.nativeBuildInputs ++ [ + pkgs.pkg-config + ]; + + buildInputs = old.buildInputs ++ [ + pkgs.mkl + pkgs.blas + ]; + patches = old.patches ++ [ ./gpt4all-HEAD-disable-settings-err.patch ]; @@ -89,6 +105,7 @@ let ); in { + nixpkgs.config.allowUnfree = true; home.packages = [ gpt4all_package ]; @@ -96,7 +113,7 @@ in home.file = lib.recursiveUpdate { ".config/nomic.ai/GPT4All.ini".text = let - system_prompt = "You are an expert LLM who is thoughtful and works step-by-step from first principles derive an answer to the user's prompt. For each step, provide a title that describes what you're doing in that step, along with the content, then decide if your work is comprehensive and if you're ready to provide your final answer. Make sure to exhaust ALL POSSIBILITIES before answering. While your reasoning is not shown to the user, it is under high levels of scrutiny to ensure high-quality reasoning. INTERNAL REASONING STEPS ARE NOT SHOWN TO THE USER, ONLY A \"Final Answer\" SECTION WILL BE SHOWN TO THE USER. + system_prompt = "You are an expert LLM who is thoughtful and works step-by-step from first principles derive an answer to the user's prompt. For each step, title the step and begin showing your work, then decide if your work is comprehensive and if you're ready to provide your final answer. Make sure to exhaust ALL POSSIBILITIES before answering. While your reasoning is not shown to the user, it is under high levels of scrutiny to ensure high-quality reasoning. INTERNAL REASONING STEPS ARE NOT SHOWN TO THE USER, ONLY A \"Final Answer\" SECTION WILL BE SHOWN TO THE USER. USE AS MANY REASONING STEPS AS POSSIBLE. AT LEAST 3. EXPLORE ALTERNATE ANSWERS AND CONSIDER THAT YOUR ANSWER MAY BE WRONG. IDENTIFY POSSIBLE ERRORS IN YOUR REASONING AND WHERE SUCH ERRORS MAY BE. FULLY TEST ALL OTHER POSSIBILITIES. YOU CAN BE WRONG. WHEN YOU SAY YOU ARE RE-EXAMINING, ACTUALLY RE-EXAMINE, AND USE ANOTHER APPROACH TO DO SO. BE VERBOSE IN YOUR REASONING AND RE-EXAMINING."; in '' From 6c2d824e61ed62904aa35924ffebc7975f66ba50 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 4 Oct 2024 13:22:45 -0400 Subject: [PATCH 020/724] cleanup --- etcnixos/flake.lock | 36 +++++++++++++------------- etcnixos/hardware_laptop.nix | 6 ++--- etcnixos/system-mreow.nix | 2 +- home-manager/flake.lock | 24 ++++++++--------- home-manager/progs/gpt4all/gpt4all.nix | 16 ------------ 5 files changed, 33 insertions(+), 51 deletions(-) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 06ab548..626d04e 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -50,11 +50,11 @@ ] }, "locked": { - "lastModified": 1727734424, - "narHash": "sha256-COHPdJb8goIemave9L8kBKkQKEPHuilXZqR3nIBcQsM=", + "lastModified": 1728001451, + "narHash": "sha256-Ost5YHSZZE4ZIKBcWsXC1c7g7n3kIqaNNjs5ula/lAI=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "fed2d39a7c4614311e25a4281d056a7a2d36a6c8", + "rev": "25f420d9cf70929455ba14642b92ae715ae8d792", "type": "github" }, "original": { @@ -116,11 +116,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1727591515, - "narHash": "sha256-ar9oGR8kT3S5K3b0EJrcZp1LjfYQdzWl/bBLCp2o50Y=", + "lastModified": 1727937235, + "narHash": "sha256-Ih4RD65WZZDgtla9Uh8zm6gQJ1zgkXkiU4HKtEwQjvI=", "owner": "nix-community", "repo": "fenix", - "rev": "c31647aab5e8a16087da6283ef9b2e6a9aae6772", + "rev": "381781f96b880c2ced9019a9e2406b31ccea82b4", "type": "github" }, "original": { @@ -231,11 +231,11 @@ ] }, "locked": { - "lastModified": 1727383923, - "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=", + "lastModified": 1727817100, + "narHash": "sha256-dlyV9/eiWkm/Y/t2+k4CFZ29tBvCANmJogEYaHeAOTw=", "owner": "nix-community", "repo": "home-manager", - "rev": "ffe2d07e771580a005e675108212597e5b367d2d", + "rev": "437ec62009fa8ceb684eb447d455ffba25911cf9", "type": "github" }, "original": { @@ -253,11 +253,11 @@ ] }, "locked": { - "lastModified": 1727453186, - "narHash": "sha256-nZRCfVEZ9osWXsCD0xCpU66M8JkabMTukBzPRrD/CTA=", + "lastModified": 1727865565, + "narHash": "sha256-SBcqfosxb0XlKdIz6QGXCnK4W/TEVHLDZHkRHZ8Me60=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "3390ff2632d0d8a14c92473db60fa52bf881f979", + "rev": "703c0ac8432f3758987e0788248ddc1a8e0bf412", "type": "github" }, "original": { @@ -316,11 +316,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1727665282, - "narHash": "sha256-oKtfbQB1MBypqIyzkC8QCQcVGOa1soaXaGgcBIoh14o=", + "lastModified": 1728056216, + "narHash": "sha256-IrO06gFUDTrTlIP3Sz+mRB6WUoO2YsgMtOD3zi0VEt0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "11c43c830e533dad1be527ecce379fcf994fbbb5", + "rev": "b7ca02c7565fbf6d27ff20dd6dbd49c5b82eef28", "type": "github" }, "original": { @@ -402,11 +402,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1727465975, - "narHash": "sha256-jrr8r2CT9jsi6XDTTX+E39/CakTcQ9RYRp6rWGzLkk0=", + "lastModified": 1727778987, + "narHash": "sha256-OTI1eKQ3WIkj6q8PROpPY1vhaxYRdiS1btSfBowQPps=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "546339a7be357b3e95fc4b79a8816dce540d477b", + "rev": "e1a76671af2fbc74c84c18ba18fcda5e653d7531", "type": "github" }, "original": { diff --git a/etcnixos/hardware_laptop.nix b/etcnixos/hardware_laptop.nix index 17a48a2..a83a530 100644 --- a/etcnixos/hardware_laptop.nix +++ b/etcnixos/hardware_laptop.nix @@ -6,10 +6,6 @@ ... }: { - imports = [ - #if this is removed, then niri doesn't start, TODO! look into wtf this does - (modulesPath + "/installer/scan/not-detected.nix") - ]; boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" @@ -49,5 +45,7 @@ # 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; } diff --git a/etcnixos/system-mreow.nix b/etcnixos/system-mreow.nix index 5ba9d3e..c0cf093 100644 --- a/etcnixos/system-mreow.nix +++ b/etcnixos/system-mreow.nix @@ -51,7 +51,7 @@ settings = { default_session = { command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd niri-session"; - user = "${username}"; + user = username; }; }; }; diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 7ab71b4..bec1a73 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -111,11 +111,11 @@ ] }, "locked": { - "lastModified": 1727817100, - "narHash": "sha256-dlyV9/eiWkm/Y/t2+k4CFZ29tBvCANmJogEYaHeAOTw=", + "lastModified": 1728041527, + "narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=", "owner": "nix-community", "repo": "home-manager", - "rev": "437ec62009fa8ceb684eb447d455ffba25911cf9", + "rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e", "type": "github" }, "original": { @@ -137,11 +137,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1727886705, - "narHash": "sha256-MFZm6b3CcRiLjQ6MxtKu2rDu+KUBkr/R0kOSXoS2eG4=", + "lastModified": 1727997983, + "narHash": "sha256-t085RwS6OzkTco7VBU8MJRPcV9cSFeVkeI8ecfrSFZg=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "6384dde52d929f500ec75172ebfc26e8d009dbd3", + "rev": "5309bc679bdba91798076ed3676bff3d12db0d97", "type": "github" }, "original": { @@ -213,11 +213,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1727672256, - "narHash": "sha256-9/79hjQc9+xyH+QxeMcRsA6hDyw6Z9Eo1/oxjvwirLk=", + "lastModified": 1727907660, + "narHash": "sha256-QftbyPoieM5M50WKUMzQmWtBWib/ZJbHo7mhj5riQec=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1719f27dd95fd4206afb9cec9f415b539978827e", + "rev": "5966581aa04be7eff830b9e1457d56dc70a0b798", "type": "github" }, "original": { @@ -245,11 +245,11 @@ ] }, "locked": { - "lastModified": 1727922550, - "narHash": "sha256-pJoN5Qd83coaoEJmpkxw+cuh89IJORvLm8qyw3GMLIQ=", + "lastModified": 1728008962, + "narHash": "sha256-MjGMCVKqafsrqLQYJHHKXJkvocTjkxKjadBfN952/Zw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "5e3eee4bc42a2504653bedfe95bceda9a1e85ae7", + "rev": "862d0c1e5fe2348a22044f225afef39b75df8cf0", "type": "github" }, "original": { diff --git a/home-manager/progs/gpt4all/gpt4all.nix b/home-manager/progs/gpt4all/gpt4all.nix index b0e2623..ab1f81d 100644 --- a/home-manager/progs/gpt4all/gpt4all.nix +++ b/home-manager/progs/gpt4all/gpt4all.nix @@ -73,22 +73,6 @@ let sha256 = "vzAfWLyljR0Cg6pCeeyQJZNeOJh5xOILlbJnwDWu62o="; }; - cmakeFlags = old.cmakeFlags ++ [ - "-DGGML_VULKAN=ON" - "-DGGML_KOMPUTE=ON" - "-DGGML_BLAS=ON" - "-DGGML_VENDOR=Intel" - ]; - - nativeBuildInputs = old.nativeBuildInputs ++ [ - pkgs.pkg-config - ]; - - buildInputs = old.buildInputs ++ [ - pkgs.mkl - pkgs.blas - ]; - patches = old.patches ++ [ ./gpt4all-HEAD-disable-settings-err.patch ]; From dfff28238a990c717690b0b138ac7873daf44ac9 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 4 Oct 2024 14:40:57 -0400 Subject: [PATCH 021/724] gpt4all: update --- home-manager/progs/gpt4all/gpt4all.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/home-manager/progs/gpt4all/gpt4all.nix b/home-manager/progs/gpt4all/gpt4all.nix index ab1f81d..265307f 100644 --- a/home-manager/progs/gpt4all/gpt4all.nix +++ b/home-manager/progs/gpt4all/gpt4all.nix @@ -50,7 +50,7 @@ let in { NIX_CFLAGS_COMPILE = "${oldflags} ${newflags}"; - stdenv = pkgs.clangStdenv; + stdenv = pkgs.clang18Stdenv; } ); @@ -70,7 +70,7 @@ let owner = "nomic-ai"; repo = "gpt4all"; rev = "HEAD"; - sha256 = "vzAfWLyljR0Cg6pCeeyQJZNeOJh5xOILlbJnwDWu62o="; + sha256 = "7pUgCZJC5goMvpUNBQ3ssmwdWt3TnaQQ7RF98VdYzM8="; }; patches = old.patches ++ [ @@ -83,7 +83,6 @@ let "-Ofast" "-march=native" "-mtune=native" - "-fno-protect-parens" "-fno-finite-math-only" # https://github.com/ggerganov/llama.cpp/pull/7154#issuecomment-2143844461 ] ); From a388bbcf38e3521ce855ab6c36b3eb337ed4cd04 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 4 Oct 2024 15:31:54 -0400 Subject: [PATCH 022/724] fish: add gcc-native command --- home-manager/progs/fish.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home-manager/progs/fish.nix b/home-manager/progs/fish.nix index e3edb97..5979b29 100644 --- a/home-manager/progs/fish.nix +++ b/home-manager/progs/fish.nix @@ -47,6 +47,8 @@ in pbpaste = "${pkgs.wl-clipboard}/bin/wl-paste"; nix-cleanup = "doas nix-collect-garbage --delete-older-than 1d && doas nix-store --optimise && doas nix-store --gc"; + + gcc-native = "${pkgs.gcc}/bin/gcc -Q --help=target -mtune=native -march=native | ${pkgs.gnugrep}/bin/grep -E '(mtune|march)=' | ${pkgs.gnugrep}/bin/grep -v 'Known valid arguments' | ${pkgs.gnused}/bin/sed -E \"s/[[:space:]]+//g\""; }; shellInit = '' From 41319d9c5a6e3e045dfca3caf9cbfd6668ffeb3a Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 5 Oct 2024 01:19:33 -0400 Subject: [PATCH 023/724] fix secrets --- etcnixos/system-mreow.nix | 1 + home-manager/flake.lock | 6 +++--- home-manager/no-gui.nix | 5 ----- home-manager/secrets/secrets.nix | 1 - home-manager/secrets/server-password.age | 9 --------- 5 files changed, 4 insertions(+), 18 deletions(-) delete mode 100644 home-manager/secrets/server-password.age diff --git a/etcnixos/system-mreow.nix b/etcnixos/system-mreow.nix index c0cf093..5310d73 100644 --- a/etcnixos/system-mreow.nix +++ b/etcnixos/system-mreow.nix @@ -13,6 +13,7 @@ ./hardware_laptop.nix inputs.nixos-hardware.nixosModules.framework-12th-gen-intel + inputs.nixos-hardware.nixosModules.common-pc-ssd inputs.lanzaboote.nixosModules.lanzaboote ]; diff --git a/home-manager/flake.lock b/home-manager/flake.lock index bec1a73..07ddab2 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -245,11 +245,11 @@ ] }, "locked": { - "lastModified": 1728008962, - "narHash": "sha256-MjGMCVKqafsrqLQYJHHKXJkvocTjkxKjadBfN952/Zw=", + "lastModified": 1728095260, + "narHash": "sha256-X62hA5ivYLY5G5+mXI6l9eUDkgi6Wu/7QUrwXhJ09oo=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "862d0c1e5fe2348a22044f225afef39b75df8cf0", + "rev": "d1d2532ab267cfe6e40dff73fbaf34436c406d26", "type": "github" }, "original": { diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 49741b8..6efaf7d 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -177,11 +177,6 @@ }; }; - age.secrets.serverpass = { - file = ./secrets/server-password.age; - path = "${homeDirectory}/.secrets/serverpass"; - }; - age.secrets.gnupg = { file = ./secrets/my-gpg.age; path = "${homeDirectory}/.secrets/my-gpg.asc"; diff --git a/home-manager/secrets/secrets.nix b/home-manager/secrets/secrets.nix index 43b3368..8e37f18 100644 --- a/home-manager/secrets/secrets.nix +++ b/home-manager/secrets/secrets.nix @@ -11,7 +11,6 @@ in ]; }) [ - "server-password.age" "borg-laptop-password.age" "my-gpg.age" ] diff --git a/home-manager/secrets/server-password.age b/home-manager/secrets/server-password.age deleted file mode 100644 index 1df1be5..0000000 --- a/home-manager/secrets/server-password.age +++ /dev/null @@ -1,9 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 JlUYaQ u9duGBEW7wp7aG5cqd1gfB8w+MDAirki9ZVSsotqtRM -9gyL9k29ytNJZ6Kp90309bDim1fZNqcLhPTVqs1py5s --> ssh-ed25519 dHDJgQ ytHA01CSY/0dD6F8XC9ilzNaivZS84PsCmr5GFWAE1o -4jLi+spahOIExkrUyfpX8cYJFEKvWfErWskYJ2btBkw --> Q-grease -n1QvV95VRYZ7CiOl6KOedEKr2L7tjTdj8aahF/DHOifCyWnc ---- iV/7+IbpWvsgrZIs2yPwOL0Xa6AlvkIfwbDotCh7iiQ -‡'F¬’hΈ2¬ΎΪmΚκYΈ΄iuαL/D*ΰƒ :•@Ν;f 9…v{Χΐ2aΗ«έΥή&³ \ No newline at end of file From 376f28e8b7eae7072ae8abfa06c45f4c697d9183 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 6 Oct 2024 23:03:44 -0400 Subject: [PATCH 024/724] gpt4all: use qwen 2.5 14B IQ4_XS instead --- etcnixos/flake.lock | 42 +++++++++++++------------- home-manager/flake.lock | 30 +++++++++--------- home-manager/progs/gpt4all/gpt4all.nix | 35 +++------------------ 3 files changed, 40 insertions(+), 67 deletions(-) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 626d04e..d84f190 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -50,11 +50,11 @@ ] }, "locked": { - "lastModified": 1728001451, - "narHash": "sha256-Ost5YHSZZE4ZIKBcWsXC1c7g7n3kIqaNNjs5ula/lAI=", + "lastModified": 1728263170, + "narHash": "sha256-KBI154wGtVffFxsMbj7iOmaIJs+4L4EpXpmnNJQ8dtk=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "25f420d9cf70929455ba14642b92ae715ae8d792", + "rev": "2fa0269d0d5f4901cd42c91728266e51d562778f", "type": "github" }, "original": { @@ -116,11 +116,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1727937235, - "narHash": "sha256-Ih4RD65WZZDgtla9Uh8zm6gQJ1zgkXkiU4HKtEwQjvI=", + "lastModified": 1728196311, + "narHash": "sha256-JoDDlmjPj0sGo1beOo3bRh7BDppm0Kuet7I7BqTmSl4=", "owner": "nix-community", "repo": "fenix", - "rev": "381781f96b880c2ced9019a9e2406b31ccea82b4", + "rev": "26971356e387b5ec0578f52be1bbd82ecf6dbad4", "type": "github" }, "original": { @@ -231,11 +231,11 @@ ] }, "locked": { - "lastModified": 1727817100, - "narHash": "sha256-dlyV9/eiWkm/Y/t2+k4CFZ29tBvCANmJogEYaHeAOTw=", + "lastModified": 1728041527, + "narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=", "owner": "nix-community", "repo": "home-manager", - "rev": "437ec62009fa8ceb684eb447d455ffba25911cf9", + "rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e", "type": "github" }, "original": { @@ -253,11 +253,11 @@ ] }, "locked": { - "lastModified": 1727865565, - "narHash": "sha256-SBcqfosxb0XlKdIz6QGXCnK4W/TEVHLDZHkRHZ8Me60=", + "lastModified": 1728183036, + "narHash": "sha256-aq8i8LCbbo2gIBcFiMTFxyE4fdAKrjFU1c//zZn0bZM=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "703c0ac8432f3758987e0788248ddc1a8e0bf412", + "rev": "751641e82a34709ed2a177e69e23b1ea08a75561", "type": "github" }, "original": { @@ -278,11 +278,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1727792571, - "narHash": "sha256-KBzRQVE1j2vrSg8WfYJ+vEvFBC25+2VsFSK7VL2kc1M=", + "lastModified": 1728199407, + "narHash": "sha256-x4G0ja//3pT/epOvwxKR1XB7GAW7Yuwiy6RYCOgRjuQ=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "e2365a1d8dccdcf4bca5111672e80df67d90957d", + "rev": "0bc127c631999c9555cae2b0cdad2128ff058259", "type": "github" }, "original": { @@ -332,11 +332,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1727802920, - "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", + "lastModified": 1728018373, + "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", + "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", "type": "github" }, "original": { @@ -402,11 +402,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1727778987, - "narHash": "sha256-OTI1eKQ3WIkj6q8PROpPY1vhaxYRdiS1btSfBowQPps=", + "lastModified": 1728064742, + "narHash": "sha256-tFvUGvqUZjES1yxYT2zEFiTAE0iQKYd+eWKX/6ZqeVw=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "e1a76671af2fbc74c84c18ba18fcda5e653d7531", + "rev": "5982d9c420d0dc90739171829f0d2e9c80d98979", "type": "github" }, "original": { diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 07ddab2..ad2d4aa 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -137,11 +137,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1727997983, - "narHash": "sha256-t085RwS6OzkTco7VBU8MJRPcV9cSFeVkeI8ecfrSFZg=", + "lastModified": 1728240721, + "narHash": "sha256-kU1dKNIQI2Wue1d73D00OXX+dOFMpwLAq5CPvvCcdZk=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "5309bc679bdba91798076ed3676bff3d12db0d97", + "rev": "88749a1471ea2d707581bd0986fff9905d0eefbc", "type": "github" }, "original": { @@ -170,11 +170,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1727778508, - "narHash": "sha256-9oMBzXZZzEVZAqHA79aJSQmNJ75hQuCpq0POB0Lxt7Q=", + "lastModified": 1728236209, + "narHash": "sha256-Y8kOO0AiMsensF8JsleX2RD+6w4+Y3Kk42WsEveSH1I=", "owner": "YaLTeR", "repo": "niri", - "rev": "0cca7a21163f0d4c1e99c12844da027a23e76003", + "rev": "66be00041060ea092d611e8f2506a6ed5b3f2327", "type": "github" }, "original": { @@ -185,11 +185,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1727802920, - "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", + "lastModified": 1728018373, + "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", + "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", "type": "github" }, "original": { @@ -213,11 +213,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1727907660, - "narHash": "sha256-QftbyPoieM5M50WKUMzQmWtBWib/ZJbHo7mhj5riQec=", + "lastModified": 1728193676, + "narHash": "sha256-PbDWAIjKJdlVg+qQRhzdSor04bAPApDqIv2DofTyynk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5966581aa04be7eff830b9e1457d56dc70a0b798", + "rev": "ecbc1ca8ffd6aea8372ad16be9ebbb39889e55b6", "type": "github" }, "original": { @@ -245,11 +245,11 @@ ] }, "locked": { - "lastModified": 1728095260, - "narHash": "sha256-X62hA5ivYLY5G5+mXI6l9eUDkgi6Wu/7QUrwXhJ09oo=", + "lastModified": 1728268235, + "narHash": "sha256-lJMFnMO4maJuNO6PQ5fZesrTmglze3UFTTBuKGwR1Nw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "d1d2532ab267cfe6e40dff73fbaf34436c406d26", + "rev": "25685cc2c7054efc31351c172ae77b21814f2d42", "type": "github" }, "original": { diff --git a/home-manager/progs/gpt4all/gpt4all.nix b/home-manager/progs/gpt4all/gpt4all.nix index 265307f..d4635b9 100644 --- a/home-manager/progs/gpt4all/gpt4all.nix +++ b/home-manager/progs/gpt4all/gpt4all.nix @@ -1,42 +1,15 @@ { pkgs, lib, ... }: let models = [ - # { - # name = "Qwen2.5-14B-Instruct-Q4_K_S.gguf"; - # context_length = "32768"; - # gen_length = "8192"; - # source = pkgs.fetchurl { - # url = "https://huggingface.co/bartowski/Qwen2.5-14B-Instruct-GGUF/resolve/main/Qwen2.5-14B-Instruct-Q4_K_S.gguf?download=true"; - # sha256 = "E1CmWUhMMbTXEjIRczzA3rSrVuR8qOL8BLagw7LiyZk="; - # }; - # } { - name = "Replete-LLM-V2.5-Qwen-14b-Q4_K_S.gguf"; + name = "Qwen2.5-14B-Instruct-IQ4_XS.gguf"; context_length = "32768"; gen_length = "8192"; source = pkgs.fetchurl { - url = "https://huggingface.co/bartowski/Replete-LLM-V2.5-Qwen-14b-GGUF/resolve/main/Replete-LLM-V2.5-Qwen-14b-Q4_K_S.gguf?download=true"; - sha256 = "/Oa1y4WVRGQkLEt5Sxxyt5plN5+tDFblLShPhMtzs7k="; + url = "https://huggingface.co/bartowski/Qwen2.5-14B-Instruct-GGUF/resolve/main/Qwen2.5-14B-Instruct-IQ4_XS.gguf?download=true"; + sha256 = "+AHt49no0qQ48MoNsqGJV4FeJ3Cf2hSZqTMjNUIHaO4="; }; } - # { - # name = "Qwen2.5-7B-Instruct-Q6_K_L.gguf"; - # context_length = "32768"; - # gen_length = "8192"; - # source = pkgs.fetchurl { - # url = "https://huggingface.co/bartowski/Qwen2.5-7B-Instruct-GGUF/resolve/main/Qwen2.5-7B-Instruct-Q6_K_L.gguf?download=true"; - # sha256 = "thEXN06T/UVGfzdB83jlgpG7kuTzZtz1ZUAdupAnErM="; - # }; - # } - # { - # name = "Replete-LLM-V2.5-Qwen-7b-Q6_K_L.gguf"; - # context_length = "32768"; - # gen_length = "8192"; - # source = pkgs.fetchurl { - # url = "https://huggingface.co/bartowski/Replete-LLM-V2.5-Qwen-7b-GGUF/resolve/main/Replete-LLM-V2.5-Qwen-7b-Q6_K_L.gguf?download=true"; - # sha256 = "dR7M5GKfGdiPI9mqBSH6naVr8XzuCjLLv514VYXSikg="; - # }; - # } ]; # stolen from: https://stackoverflow.com/a/42398526 @@ -70,7 +43,7 @@ let owner = "nomic-ai"; repo = "gpt4all"; rev = "HEAD"; - sha256 = "7pUgCZJC5goMvpUNBQ3ssmwdWt3TnaQQ7RF98VdYzM8="; + sha256 = "YM/RdxklwIsTjD6xahZIcQoMnoabsmpQwDPEihm+h8A="; }; patches = old.patches ++ [ From 802496f5a88b934db8c72b99d69e05ad7b49e174 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 7 Oct 2024 11:05:14 -0400 Subject: [PATCH 025/724] update stuff --- etcnixos/flake.lock | 6 +++--- etcnixos/system-mreow.nix | 18 ++++++------------ home-manager/flake.lock | 18 +++++++++--------- home-manager/gui.nix | 10 +++++++--- home-manager/progs/gpt4all/gpt4all.nix | 6 +++--- home-manager/system-nixos.nix | 2 ++ 6 files changed, 30 insertions(+), 30 deletions(-) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index d84f190..3c7f369 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -316,11 +316,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1728056216, - "narHash": "sha256-IrO06gFUDTrTlIP3Sz+mRB6WUoO2YsgMtOD3zi0VEt0=", + "lastModified": 1728269138, + "narHash": "sha256-oKxDImsOvgUZMY4NwXVyUc/c1HiU2qInX+b5BU0yXls=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "b7ca02c7565fbf6d27ff20dd6dbd49c5b82eef28", + "rev": "ecfcd787f373f43307d764762e139a7cdeb9c22b", "type": "github" }, "original": { diff --git a/etcnixos/system-mreow.nix b/etcnixos/system-mreow.nix index 5310d73..967e113 100644 --- a/etcnixos/system-mreow.nix +++ b/etcnixos/system-mreow.nix @@ -32,8 +32,6 @@ CPU_MAX_PERF_ON_BAT = 60; CPU_BOOST_ON_BAT = 0; - START_CHARGE_THRESH_BAT0 = 80; - STOP_CHARGE_THRESH_BAT0 = 90; RUNTIME_PM_ON_BAT = "auto"; }; }; @@ -100,15 +98,11 @@ system.activationScripts = { # extract all my secureboot keys - "secureboot-keys".text = - let - secureboot_path = "/etc/secureboot"; - in - '' - #!/bin/sh - rm -fr ${secureboot_path} || true - mkdir -p ${secureboot_path} - ${pkgs.gnutar}/bin/tar xf /etc/nixos/secrets/secureboot.tar -C ${secureboot_path} - ''; + "secureboot-keys".text = '' + #!/bin/sh + rm -fr ${config.boot.lanzaboote.pkiBundle} || true + mkdir -p ${config.boot.lanzaboote.pkiBundle} + ${pkgs.gnutar}/bin/tar xf /etc/nixos/secrets/secureboot.tar -C ${config.boot.lanzaboote.pkiBundle} + ''; }; } diff --git a/home-manager/flake.lock b/home-manager/flake.lock index ad2d4aa..5f72987 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -111,11 +111,11 @@ ] }, "locked": { - "lastModified": 1728041527, - "narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=", + "lastModified": 1728306985, + "narHash": "sha256-l/KpcWTv2SjxCnqFs5GYhvjeVYd40WQV4/F2+w9btd4=", "owner": "nix-community", "repo": "home-manager", - "rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e", + "rev": "3ac39b2a8b7cbfc0f96628d8a84867c885bc988b", "type": "github" }, "original": { @@ -137,11 +137,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1728240721, - "narHash": "sha256-kU1dKNIQI2Wue1d73D00OXX+dOFMpwLAq5CPvvCcdZk=", + "lastModified": 1728280052, + "narHash": "sha256-8gy3keN+6vKnn5nFDXib00bXFBUW+Xf+x6TKbTDl/x0=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "88749a1471ea2d707581bd0986fff9905d0eefbc", + "rev": "037bd7f67212127eaa52fee8199f951d19b7954a", "type": "github" }, "original": { @@ -170,11 +170,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1728236209, - "narHash": "sha256-Y8kOO0AiMsensF8JsleX2RD+6w4+Y3Kk42WsEveSH1I=", + "lastModified": 1728277759, + "narHash": "sha256-pMUMUo4vMcdjU4d8wuEHI5i8fW8SzYptR3GZPeDru1c=", "owner": "YaLTeR", "repo": "niri", - "rev": "66be00041060ea092d611e8f2506a6ed5b3f2327", + "rev": "03c603918d817762ee95d21ea15a854adf47886e", "type": "github" }, "original": { diff --git a/home-manager/gui.nix b/home-manager/gui.nix index c245018..e6d622b 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -69,22 +69,26 @@ #accounting gnucash + # image tools imagemagick inkscape nomacs - lrcget - + # partitioning utilities gparted gnome-disk-utility - #small nicities + # small nicities wl-clipboard # wl-copy & wl-paste libnotify # notifications library xdg-utils # xdg utils + # music tagging utility picard + # music lyric fetcher + lrcget + inputs.zen-browser.packages."${pkgs.system}".specific (factorio.override (import ./secrets/factorio.nix)) diff --git a/home-manager/progs/gpt4all/gpt4all.nix b/home-manager/progs/gpt4all/gpt4all.nix index d4635b9..929a20e 100644 --- a/home-manager/progs/gpt4all/gpt4all.nix +++ b/home-manager/progs/gpt4all/gpt4all.nix @@ -23,7 +23,7 @@ let in { NIX_CFLAGS_COMPILE = "${oldflags} ${newflags}"; - stdenv = pkgs.clang18Stdenv; + stdenv = pkgs.clangStdenv; } ); @@ -69,8 +69,8 @@ in home.file = lib.recursiveUpdate { ".config/nomic.ai/GPT4All.ini".text = let - system_prompt = "You are an expert LLM who is thoughtful and works step-by-step from first principles derive an answer to the user's prompt. For each step, title the step and begin showing your work, then decide if your work is comprehensive and if you're ready to provide your final answer. Make sure to exhaust ALL POSSIBILITIES before answering. While your reasoning is not shown to the user, it is under high levels of scrutiny to ensure high-quality reasoning. INTERNAL REASONING STEPS ARE NOT SHOWN TO THE USER, ONLY A \"Final Answer\" SECTION WILL BE SHOWN TO THE USER. -USE AS MANY REASONING STEPS AS POSSIBLE. AT LEAST 3. EXPLORE ALTERNATE ANSWERS AND CONSIDER THAT YOUR ANSWER MAY BE WRONG. IDENTIFY POSSIBLE ERRORS IN YOUR REASONING AND WHERE SUCH ERRORS MAY BE. FULLY TEST ALL OTHER POSSIBILITIES. YOU CAN BE WRONG. WHEN YOU SAY YOU ARE RE-EXAMINING, ACTUALLY RE-EXAMINE, AND USE ANOTHER APPROACH TO DO SO. BE VERBOSE IN YOUR REASONING AND RE-EXAMINING."; + system_prompt = "You are an expert LLM who is thoughtful and works step-by-step from first principles derive an answer to the user's prompt. For each step, title the step and begin showing your work, then decide if your work is comprehensive and if you're ready to provide your final answer. Make sure to exhaust ALL POSSIBILITIES before answering. INTERNAL REASONING STEPS ARE NOT SHOWN TO THE USER, ONLY A \"Final Answer\" SECTION WILL BE SHOWN TO THE USER. +USE AS MANY REASONING STEPS AS POSSIBLE. AT LEAST 3. EXPLORE ALTERNATE ANSWERS AND CONSIDER THAT YOUR ANSWER OR ANY ASSUMPTIONS MAY BE WRONG. IDENTIFY POSSIBLE ERRORS IN YOUR REASONING AND WHERE SUCH ERRORS MAY BE. FULLY TEST ALL OTHER POSSIBILITIES. YOU CAN BE WRONG. SHOW YOUR WORK WHEN RE-EXAMINING."; in '' [General] diff --git a/home-manager/system-nixos.nix b/home-manager/system-nixos.nix index 35a6808..1a12ce8 100644 --- a/home-manager/system-nixos.nix +++ b/home-manager/system-nixos.nix @@ -6,6 +6,8 @@ }: { imports = [ ./gui.nix ]; + + # TODO! replace this with a per-package unfree whitelist (i.e what is done with apple_cursors) nixpkgs.config.allowUnfree = true; home.packages = with pkgs; [ From 39aa6b0d42be752d1a868c077d30e5d788052d91 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 8 Oct 2024 01:14:15 -0400 Subject: [PATCH 026/724] laptop: more power savings --- etcnixos/system-mreow.nix | 19 ++++++++++++++++++- home-manager/flake.lock | 12 ++++++------ home-manager/progs/gpt4all/gpt4all.nix | 3 +-- 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/etcnixos/system-mreow.nix b/etcnixos/system-mreow.nix index 967e113..12c5be3 100644 --- a/etcnixos/system-mreow.nix +++ b/etcnixos/system-mreow.nix @@ -24,14 +24,28 @@ CPU_SCALING_GOVERNOR_ON_BAT = "powersave"; CPU_ENERGY_PERF_POLICY_ON_BAT = "power"; - CPU_ENERGY_PERF_POLICY_ON_AC = "performance"; + CPU_ENERGY_PERF_POLICY_ON_AC = "balance_performance"; + + PCIE_ASPM_ON_BAT = "powersupersave"; + PLATFORM_PROFILE_ON_BAT = "low-power"; CPU_MIN_PERF_ON_AC = 0; CPU_MAX_PERF_ON_AC = 100; CPU_MIN_PERF_ON_BAT = 0; CPU_MAX_PERF_ON_BAT = 60; + CPU_BOOST_ON_AC = 1; CPU_BOOST_ON_BAT = 0; + CPU_HWP_DYN_BOOST_ON_AC = 1; + CPU_HWP_DYN_BOOST_ON_BAT = 0; + + INTEL_GPU_MIN_FREQ_ON_AC = 100; + INTEL_GPU_MIN_FREQ_ON_BAT = 100; + INTEL_GPU_MAX_FREQ_ON_AC = 1300; + INTEL_GPU_MAX_FREQ_ON_BAT = 450; + INTEL_GPU_BOOST_FREQ_ON_AC = 1300; + INTEL_GPU_BOOST_FREQ_ON_BAT = 450; + RUNTIME_PM_ON_BAT = "auto"; }; }; @@ -74,6 +88,9 @@ kernelParams = [ "mitigations=off" + "rcu_nocbs=all" + "rcutree.enable_rcu_lazy=1" + "rtc_cmos.use_acpi_alarm=1" ]; }; diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 5f72987..7a6e13a 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -111,11 +111,11 @@ ] }, "locked": { - "lastModified": 1728306985, - "narHash": "sha256-l/KpcWTv2SjxCnqFs5GYhvjeVYd40WQV4/F2+w9btd4=", + "lastModified": 1728337164, + "narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=", "owner": "nix-community", "repo": "home-manager", - "rev": "3ac39b2a8b7cbfc0f96628d8a84867c885bc988b", + "rev": "038630363e7de57c36c417fd2f5d7c14773403e4", "type": "github" }, "original": { @@ -245,11 +245,11 @@ ] }, "locked": { - "lastModified": 1728268235, - "narHash": "sha256-lJMFnMO4maJuNO6PQ5fZesrTmglze3UFTTBuKGwR1Nw=", + "lastModified": 1728354625, + "narHash": "sha256-r+Sa1NRRT7LXKzCaVaq75l1GdZcegODtF06uaxVVVbI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "25685cc2c7054efc31351c172ae77b21814f2d42", + "rev": "d216ade5a0091ce60076bf1f8bc816433a1fc5da", "type": "github" }, "original": { diff --git a/home-manager/progs/gpt4all/gpt4all.nix b/home-manager/progs/gpt4all/gpt4all.nix index 929a20e..4316963 100644 --- a/home-manager/progs/gpt4all/gpt4all.nix +++ b/home-manager/progs/gpt4all/gpt4all.nix @@ -69,8 +69,7 @@ in home.file = lib.recursiveUpdate { ".config/nomic.ai/GPT4All.ini".text = let - system_prompt = "You are an expert LLM who is thoughtful and works step-by-step from first principles derive an answer to the user's prompt. For each step, title the step and begin showing your work, then decide if your work is comprehensive and if you're ready to provide your final answer. Make sure to exhaust ALL POSSIBILITIES before answering. INTERNAL REASONING STEPS ARE NOT SHOWN TO THE USER, ONLY A \"Final Answer\" SECTION WILL BE SHOWN TO THE USER. -USE AS MANY REASONING STEPS AS POSSIBLE. AT LEAST 3. EXPLORE ALTERNATE ANSWERS AND CONSIDER THAT YOUR ANSWER OR ANY ASSUMPTIONS MAY BE WRONG. IDENTIFY POSSIBLE ERRORS IN YOUR REASONING AND WHERE SUCH ERRORS MAY BE. FULLY TEST ALL OTHER POSSIBILITIES. YOU CAN BE WRONG. SHOW YOUR WORK WHEN RE-EXAMINING."; + system_prompt = "You are an expert LLM who is thoughtful and works step-by-step from first principles derive an answer to the user's prompt. For each step, title the step and begin showing your work, then decide if your work is comprehensive and if you're ready to provide your final answer. Make sure to exhaust ALL POSSIBILITIES before answering. INTERNAL REASONING STEPS ARE NOT SHOWN TO THE USER, ONLY A \"Final Answer\" SECTION WILL BE SHOWN TO THE USER. USE AS MANY REASONING STEPS AS POSSIBLE. EXPLORE ALTERNATE ANSWERS AND CONSIDER THAT YOUR ANSWER OR ANY ASSUMPTIONS MAY BE WRONG. IDENTIFY POSSIBLE ERRORS IN YOUR REASONING AND WHERE SUCH ERRORS MAY BE. FULLY TEST ALL OTHER POSSIBILITIES. YOU CAN BE WRONG. SHOW YOUR WORK WHEN RE-EXAMINING."; in '' [General] From feef7e360562e7e64c3c079556c6bd817615d59d Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 8 Oct 2024 17:10:10 -0400 Subject: [PATCH 027/724] zen browser nixpkgs PR --- home-manager/flake.lock | 44 +++++++++++++++++++---------------------- home-manager/flake.nix | 4 ++-- home-manager/gui.nix | 3 ++- 3 files changed, 24 insertions(+), 27 deletions(-) diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 7a6e13a..990b96e 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -33,11 +33,11 @@ ] }, "locked": { - "lastModified": 1727805287, - "narHash": "sha256-sMQP+HesLU40wKPVR55lXyruU1NPbFDfqmaiLDMhVis=", + "lastModified": 1728371133, + "narHash": "sha256-Di+CMkvUU/GhRC6OWPcoA/Odb3a7HBgkMvjUhWNv3wM=", "owner": "orhun", "repo": "binsider", - "rev": "aba611285f270eed7a087f437e7d5443e4a4d5b4", + "rev": "4bc6b7a117743a8b8ddf8595e58c3596f94dd396", "type": "github" }, "original": { @@ -91,11 +91,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -137,11 +137,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1728280052, - "narHash": "sha256-8gy3keN+6vKnn5nFDXib00bXFBUW+Xf+x6TKbTDl/x0=", + "lastModified": 1728372489, + "narHash": "sha256-4Lm/bSzK5si/VM3E83d2xJDs5Es61TIfzNhK+dZHCl8=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "037bd7f67212127eaa52fee8199f951d19b7954a", + "rev": "9d1699bb73790d48345843ea11bd4fee5db052dd", "type": "github" }, "original": { @@ -185,11 +185,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728018373, - "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", + "lastModified": 1728241625, + "narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", + "rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1", "type": "github" }, "original": { @@ -322,22 +322,18 @@ } }, "zen-browser": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, "locked": { - "lastModified": 1727727601, - "narHash": "sha256-YWOGgiqRCOAjHrXbCukCvg9alB9mLMXvrqaUmoFqt+o=", - "owner": "ch4og", - "repo": "zen-browser-flake", - "rev": "18dac9cd4633bf14d9e96be4d97cd9b358d1bca8", + "lastModified": 1728420026, + "narHash": "sha256-92y3GEfyRJ0/UvFc0APLicE/L+KCaTSpPPfsoj08py0=", + "owner": "matthewpi", + "repo": "nixpkgs", + "rev": "97e4d2ac2a515aba2550b8aa348f288af972116c", "type": "github" }, "original": { - "owner": "ch4og", - "repo": "zen-browser-flake", + "owner": "matthewpi", + "ref": "zen-browser", + "repo": "nixpkgs", "type": "github" } } diff --git a/home-manager/flake.nix b/home-manager/flake.nix index 4e524d3..3e78340 100644 --- a/home-manager/flake.nix +++ b/home-manager/flake.nix @@ -31,8 +31,8 @@ }; zen-browser = { - url = "github:ch4og/zen-browser-flake"; - inputs.nixpkgs.follows = "nixpkgs"; + # https://github.com/NixOS/nixpkgs/pull/347222 + url = "github:matthewpi/nixpkgs/zen-browser"; }; }; diff --git a/home-manager/gui.nix b/home-manager/gui.nix index e6d622b..8657aff 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -89,7 +89,8 @@ # music lyric fetcher lrcget - inputs.zen-browser.packages."${pkgs.system}".specific + # inputs.zen-browser.packages."${pkgs.system}".specific + inputs.zen-browser.legacyPackages.${pkgs.system}.zen-browser (factorio.override (import ./secrets/factorio.nix)) ]; From 1e965e095d780219b70ed5a174f90497bc70d96d Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 8 Oct 2024 17:10:23 -0400 Subject: [PATCH 028/724] laptop: tlp modifications --- etcnixos/flake.lock | 12 ++++++------ etcnixos/system-mreow.nix | 25 ++++--------------------- 2 files changed, 10 insertions(+), 27 deletions(-) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 3c7f369..63622bf 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -50,11 +50,11 @@ ] }, "locked": { - "lastModified": 1728263170, - "narHash": "sha256-KBI154wGtVffFxsMbj7iOmaIJs+4L4EpXpmnNJQ8dtk=", + "lastModified": 1728392601, + "narHash": "sha256-0ZuowheyMfLuxr4ViAWiKjs0aow1pn8xtKlsYx+NVR4=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "2fa0269d0d5f4901cd42c91728266e51d562778f", + "rev": "147c0997fe3451b09fa30c47afa1577f91aa7524", "type": "github" }, "original": { @@ -332,11 +332,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728018373, - "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", + "lastModified": 1728241625, + "narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", + "rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1", "type": "github" }, "original": { diff --git a/etcnixos/system-mreow.nix b/etcnixos/system-mreow.nix index 12c5be3..8f81cab 100644 --- a/etcnixos/system-mreow.nix +++ b/etcnixos/system-mreow.nix @@ -20,33 +20,16 @@ services.tlp = { enable = true; settings = { - CPU_SCALING_GOVERNOR_ON_AC = "performance"; + 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 = "balance_performance"; + CPU_ENERGY_PERF_POLICY_ON_AC = "default"; PCIE_ASPM_ON_BAT = "powersupersave"; + PCIE_ASPM_ON_AC = "default"; PLATFORM_PROFILE_ON_BAT = "low-power"; - - CPU_MIN_PERF_ON_AC = 0; - CPU_MAX_PERF_ON_AC = 100; - CPU_MIN_PERF_ON_BAT = 0; - CPU_MAX_PERF_ON_BAT = 60; - - CPU_BOOST_ON_AC = 1; - CPU_BOOST_ON_BAT = 0; - CPU_HWP_DYN_BOOST_ON_AC = 1; - CPU_HWP_DYN_BOOST_ON_BAT = 0; - - INTEL_GPU_MIN_FREQ_ON_AC = 100; - INTEL_GPU_MIN_FREQ_ON_BAT = 100; - INTEL_GPU_MAX_FREQ_ON_AC = 1300; - INTEL_GPU_MAX_FREQ_ON_BAT = 450; - INTEL_GPU_BOOST_FREQ_ON_AC = 1300; - INTEL_GPU_BOOST_FREQ_ON_BAT = 450; - - RUNTIME_PM_ON_BAT = "auto"; + PLATFORM_PROFILE_ON_AC = "balanced"; }; }; From 64618b3c326e5614a82cc143c7c0693732771c9e Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 9 Oct 2024 15:25:12 -0400 Subject: [PATCH 029/724] cleanup --- home-manager/flake.lock | 79 +++--------------- home-manager/flake.nix | 5 -- home-manager/no-gui.nix | 51 ++++++------ home-manager/progs/alacritty.nix | 12 +-- home-manager/progs/gpt4all/gpt4all.nix | 110 +++++++++++++------------ 5 files changed, 98 insertions(+), 159 deletions(-) diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 990b96e..7b3803d 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -25,27 +25,6 @@ "type": "github" } }, - "binsider": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1728371133, - "narHash": "sha256-Di+CMkvUU/GhRC6OWPcoA/Odb3a7HBgkMvjUhWNv3wM=", - "owner": "orhun", - "repo": "binsider", - "rev": "4bc6b7a117743a8b8ddf8595e58c3596f94dd396", - "type": "github" - }, - "original": { - "owner": "orhun", - "repo": "binsider", - "type": "github" - } - }, "darwin": { "inputs": { "nixpkgs": [ @@ -86,24 +65,6 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -137,11 +98,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1728372489, - "narHash": "sha256-4Lm/bSzK5si/VM3E83d2xJDs5Es61TIfzNhK+dZHCl8=", + "lastModified": 1728467408, + "narHash": "sha256-pOYTUPWlxuK8Y4Q7UiDeXJRVallbRrGFtwQ4M+biZnM=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "9d1699bb73790d48345843ea11bd4fee5db052dd", + "rev": "321a4a598e765862874ccddbc4d1b68941a0b5ee", "type": "github" }, "original": { @@ -170,11 +131,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1728277759, - "narHash": "sha256-pMUMUo4vMcdjU4d8wuEHI5i8fW8SzYptR3GZPeDru1c=", + "lastModified": 1728463806, + "narHash": "sha256-RHfieDDCEjPxtevtpt/IyxBaw4ISjjyY0WGzw7zYCMg=", "owner": "YaLTeR", "repo": "niri", - "rev": "03c603918d817762ee95d21ea15a854adf47886e", + "rev": "e24723125f5ef91983735043fba893a940469686", "type": "github" }, "original": { @@ -213,11 +174,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1728193676, - "narHash": "sha256-PbDWAIjKJdlVg+qQRhzdSor04bAPApDqIv2DofTyynk=", + "lastModified": 1728328465, + "narHash": "sha256-a0a0M1TmXMK34y3M0cugsmpJ4FJPT/xsblhpiiX1CXo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ecbc1ca8ffd6aea8372ad16be9ebbb39889e55b6", + "rev": "1bfbbbe5bbf888d675397c66bfdb275d0b99361c", "type": "github" }, "original": { @@ -230,7 +191,6 @@ "root": { "inputs": { "agenix": "agenix", - "binsider": "binsider", "home-manager": "home-manager", "niri": "niri", "nixpkgs": "nixpkgs", @@ -245,11 +205,11 @@ ] }, "locked": { - "lastModified": 1728354625, - "narHash": "sha256-r+Sa1NRRT7LXKzCaVaq75l1GdZcegODtF06uaxVVVbI=", + "lastModified": 1728461096, + "narHash": "sha256-cd0cXB85B3kGpm+iumP9xCnqFErspXL9Z/2X59kQ6c4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "d216ade5a0091ce60076bf1f8bc816433a1fc5da", + "rev": "e310b9bd71fa6c6a9fec0a8cf5af43ce798a0ad6", "type": "github" }, "original": { @@ -273,21 +233,6 @@ "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" - } - }, "xwayland-satellite-stable": { "flake": false, "locked": { diff --git a/home-manager/flake.nix b/home-manager/flake.nix index 3e78340..99944fb 100644 --- a/home-manager/flake.nix +++ b/home-manager/flake.nix @@ -25,11 +25,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - binsider = { - url = "github:orhun/binsider"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - zen-browser = { # https://github.com/NixOS/nixpkgs/pull/347222 url = "github:matthewpi/nixpkgs/zen-browser"; diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 6efaf7d..77ca9c0 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -15,10 +15,10 @@ home.stateVersion = "24.11"; home.packages = with pkgs; [ - #hex viewer + # hex viewer hexyl - #rust stuff + # rust stuff (rust-bin.selectLatestNightlyWith ( toolchain: toolchain.default.override { @@ -30,30 +30,30 @@ "rust-std" "cargo" ]; - #thumbv7m-none-eabi target for stm32 + # thumbv7m-none-eabi target for stm32 targets = [ "thumbv7m-none-eabi" ]; } )) cargo-expand - #find typos in code + # find typos in code typos - #python formatter + # python formatter ruff - #for website generation + # for website generation hugo - #java development + # java development google-java-format # formatter jdk # java jdt-language-server # lsp server - #for benchmaking stuff + # for benchmaking stuff hyperfine - #replacements for common posix tools + # replacements for common posix tools eza # ls replacement bat # pretty `cat` clone delta # viewer for `git` and `diff` output @@ -63,13 +63,13 @@ tldr # `man` but more straight-forward and simpler ripgrep # grep, but written in rust, respects .gitignore, and very very fast, command is `rg` - #adds `sensors` command + # adds `sensors` command lm_sensors - #rssfeed + # rssfeed newsboat - #HTML/CSS/JSON/ESLint language servers + # HTML/CSS/JSON/ESLint language servers vscode-langservers-extracted just @@ -85,13 +85,13 @@ sshfs - #nix formatter + # nix formatter nixfmt-rfc-style - #serial viewer + # serial viewer minicom - #"~~matt's~~ my trace route" + # "~~matt's~~ my trace route" mtr file @@ -100,7 +100,7 @@ ffmpeg-full - #microcontroller tooling + # microcontroller tooling probe-rs (python312.withPackages ( @@ -118,11 +118,9 @@ yaml-language-server # yaml lsp marksman # markdown lsp - #clang-format and clang-tidy + # clang-format and clang-tidy clang-tools - # inputs.binsider.packages.${pkgs.system}.binsider - lldb fio @@ -140,37 +138,37 @@ rustflags = ["-C", "link-arg=-fuse-ld=${pkgs.mold}/bin/mold"] ''; - #default applications + # default applications home.sessionVariables = { EDITOR = "hx"; }; - #feed reader + # feed reader programs.newsboat = { enable = true; - #store rss feeds in a separate file because it's *a lot* + # store rss feeds in a separate file because it's *a lot* urls = import ./progs/rss.nix; }; - #git (self explanatory) + # git (self explanatory) programs.git = { enable = true; package = pkgs.git; userName = "Simon Gardling"; userEmail = "titaniumtown@proton.me"; - #better way to view diffs + # better way to view diffs delta.enable = true; - #master -> main extraConfig = { init = { + # master -> main defaultBranch = "main"; }; push.autoSetupRemote = true; }; - #gpg signing keys + # gpg signing keys signing = { key = "9AB28AC10ECE533D"; signByDefault = true; @@ -186,6 +184,5 @@ ${pkgs.gnupg}/bin/gpg --import ${config.age.secrets.gnupg.path} ''; - # Let Home Manager install and manage itself. programs.home-manager.enable = true; } diff --git a/home-manager/progs/alacritty.nix b/home-manager/progs/alacritty.nix index aada011..11219af 100644 --- a/home-manager/progs/alacritty.nix +++ b/home-manager/progs/alacritty.nix @@ -4,20 +4,20 @@ enable = true; package = pkgs.alacritty; settings = { - #use the fish shell + # use the fish shell shell.program = "${pkgs.fish}/bin/fish"; - #some programs can't handle alacritty + # some programs can't handle alacritty env.TERM = "xterm-256color"; window = { - #using a window manager, no decorations needed + # using a window manager, no decorations needed decorations = "none"; - #semi-transparent + # semi-transparent opacity = 0.95; - #padding between the content of the terminal and the edge + # padding between the content of the terminal and the edge padding = { x = 10; y = 10; @@ -58,7 +58,7 @@ glyph_offset.y = 0; }; - #color scheme + # color scheme colors = let normal = { diff --git a/home-manager/progs/gpt4all/gpt4all.nix b/home-manager/progs/gpt4all/gpt4all.nix index 4316963..0e4564c 100644 --- a/home-manager/progs/gpt4all/gpt4all.nix +++ b/home-manager/progs/gpt4all/gpt4all.nix @@ -27,23 +27,16 @@ let } ); - model_files = builtins.listToAttrs ( - map (f: { - name = ".local/share/nomic.ai/GPT4All/${f.name}"; - value.source = f.source; - }) models - ); - gpt4all_package = ( optimizeWithFlags (pkgs.gpt4all.overrideAttrs (old: { - version = "3.4.0-dev0"; + version = "3.4.0"; src = pkgs.fetchFromGitHub { fetchSubmodules = true; owner = "nomic-ai"; repo = "gpt4all"; - rev = "HEAD"; - sha256 = "YM/RdxklwIsTjD6xahZIcQoMnoabsmpQwDPEihm+h8A="; + rev = "v3.4.0"; + sha256 = "yXp9MyezXQJWUyEvyXc6++/Ow/NNqs1cjLIpEuKDrn0="; }; patches = old.patches ++ [ @@ -61,53 +54,62 @@ let ); in { - nixpkgs.config.allowUnfree = true; home.packages = [ gpt4all_package ]; - home.file = lib.recursiveUpdate { - ".config/nomic.ai/GPT4All.ini".text = - let - system_prompt = "You are an expert LLM who is thoughtful and works step-by-step from first principles derive an answer to the user's prompt. For each step, title the step and begin showing your work, then decide if your work is comprehensive and if you're ready to provide your final answer. Make sure to exhaust ALL POSSIBILITIES before answering. INTERNAL REASONING STEPS ARE NOT SHOWN TO THE USER, ONLY A \"Final Answer\" SECTION WILL BE SHOWN TO THE USER. USE AS MANY REASONING STEPS AS POSSIBLE. EXPLORE ALTERNATE ANSWERS AND CONSIDER THAT YOUR ANSWER OR ANY ASSUMPTIONS MAY BE WRONG. IDENTIFY POSSIBLE ERRORS IN YOUR REASONING AND WHERE SUCH ERRORS MAY BE. FULLY TEST ALL OTHER POSSIBILITIES. YOU CAN BE WRONG. SHOW YOUR WORK WHEN RE-EXAMINING."; - in - '' - [General] - chatTheme=Dark - height=940 - suggestionMode=Off - threadCount=8 - uniqueId=7096f2d2-448d-4272-a132-d37e77f8a781 - userDefaultModel=${ - # select the first element of `models` to be the default model - (builtins.elemAt models 0).name - } - width=1472 - x=0 - y=0 + home.file = + lib.recursiveUpdate + { + ".config/nomic.ai/GPT4All.ini".text = + let + system_prompt = "You are an expert LLM who is thoughtful and works step-by-step from first principles derive an answer to the user's prompt. For each step, title the step and begin showing your work, then decide if your work is comprehensive and if you're ready to provide your final answer. Make sure to exhaust ALL POSSIBILITIES before answering. INTERNAL REASONING STEPS ARE NOT SHOWN TO THE USER, ONLY A \"Final Answer\" SECTION WILL BE SHOWN TO THE USER. USE AS MANY REASONING STEPS AS POSSIBLE. EXPLORE ALTERNATE ANSWERS AND CONSIDER THAT YOUR ANSWER OR ANY ASSUMPTIONS MAY BE WRONG. IDENTIFY POSSIBLE ERRORS IN YOUR REASONING AND WHERE SUCH ERRORS MAY BE. FULLY TEST ALL OTHER POSSIBILITIES. YOU CAN BE WRONG. SHOW YOUR WORK WHEN RE-EXAMINING."; + in + '' + [General] + chatTheme=Dark + height=940 + suggestionMode=Off + threadCount=8 + uniqueId=7096f2d2-448d-4272-a132-d37e77f8a781 + userDefaultModel=${ + # select the first element of `models` to be the default model + (builtins.elemAt models 0).name + } + width=1472 + x=0 + y=0 - [download] - lastVersionStarted=${gpt4all_package.version} - '' - + (lib.concatStrings ( - map (model: '' - [model-${model.name}] - contextLength=${model.context_length} - filename=${model.name} - maxLength=${model.gen_length} - promptBatchSize=256 - promptTemplate=<|im_start|>user\n%1<|im_end|>\n<|im_start|>assistant\n - systemPrompt="<|im_start|>system\n${ - # replace newlines with the string "\n" for gpt4all to properly parse - builtins.replaceStrings [ "\n" ] [ "\\n" ] system_prompt - }<|im_end|> - \n" - '') models - )) - + '' - [network] - isActive=true - usageStatsActive=true - ''; - } model_files; + [download] + lastVersionStarted=${gpt4all_package.version} + '' + + (lib.concatStrings ( + map (model: '' + [model-${model.name}] + contextLength=${model.context_length} + filename=${model.name} + maxLength=${model.gen_length} + promptBatchSize=256 + promptTemplate=<|im_start|>user\n%1<|im_end|>\n<|im_start|>assistant\n + systemPrompt="<|im_start|>system\n${ + # replace newlines with the string "\n" for gpt4all to properly parse + builtins.replaceStrings [ "\n" ] [ "\\n" ] system_prompt + }<|im_end|> + \n" + '') models + )) + + '' + [network] + isActive=true + usageStatsActive=true + ''; + } + ( + builtins.listToAttrs ( + map (f: { + name = ".local/share/nomic.ai/GPT4All/${f.name}"; + value.source = f.source; + }) models + ) + ); } From 0fee5fbea0c687918820b65ce64d5deec9ffe950 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 10 Oct 2024 00:35:46 -0400 Subject: [PATCH 030/724] nits --- etcnixos/flake.lock | 30 +++++++++++++++--------------- home-manager/flake.lock | 6 +++--- home-manager/progs/fish.nix | 12 ++++++------ home-manager/progs/helix.nix | 4 ++-- home-manager/progs/niri.nix | 18 +++++++++--------- home-manager/system-mreow.nix | 14 +++++++------- 6 files changed, 42 insertions(+), 42 deletions(-) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 63622bf..295a5b1 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -50,11 +50,11 @@ ] }, "locked": { - "lastModified": 1728392601, - "narHash": "sha256-0ZuowheyMfLuxr4ViAWiKjs0aow1pn8xtKlsYx+NVR4=", + "lastModified": 1728518869, + "narHash": "sha256-E3UDvOmDuADBDxJIzPKiUmKC2CLoVvWP+9gjlw5xS8Y=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "147c0997fe3451b09fa30c47afa1577f91aa7524", + "rev": "8bfc88598cfc49588de18099d7962c623cb86310", "type": "github" }, "original": { @@ -116,11 +116,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1728196311, - "narHash": "sha256-JoDDlmjPj0sGo1beOo3bRh7BDppm0Kuet7I7BqTmSl4=", + "lastModified": 1728455642, + "narHash": "sha256-abYGwrL6ak5sBRqwPh+V3CPJ6Pa89p378t51b7BO1lE=", "owner": "nix-community", "repo": "fenix", - "rev": "26971356e387b5ec0578f52be1bbd82ecf6dbad4", + "rev": "3b47535a5c782e4f4ad59cd4bdb23636b6926e03", "type": "github" }, "original": { @@ -231,11 +231,11 @@ ] }, "locked": { - "lastModified": 1728041527, - "narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=", + "lastModified": 1728337164, + "narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=", "owner": "nix-community", "repo": "home-manager", - "rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e", + "rev": "038630363e7de57c36c417fd2f5d7c14773403e4", "type": "github" }, "original": { @@ -253,11 +253,11 @@ ] }, "locked": { - "lastModified": 1728183036, - "narHash": "sha256-aq8i8LCbbo2gIBcFiMTFxyE4fdAKrjFU1c//zZn0bZM=", + "lastModified": 1728410210, + "narHash": "sha256-vn6qupt1U0M6Hf3eXhK3/K4Du0Z7A60qYS1G14QsRY8=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "751641e82a34709ed2a177e69e23b1ea08a75561", + "rev": "a25f915ec05196d15e3f7f8555ffb612d4f1045d", "type": "github" }, "original": { @@ -402,11 +402,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1728064742, - "narHash": "sha256-tFvUGvqUZjES1yxYT2zEFiTAE0iQKYd+eWKX/6ZqeVw=", + "lastModified": 1728386838, + "narHash": "sha256-Lk64EoJkvp3WMGVJK3CR1TYcNghX0/BqHPLW5zdvmLE=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "5982d9c420d0dc90739171829f0d2e9c80d98979", + "rev": "efaf8bd5de34e2f47bd57425b83e0c7974902176", "type": "github" }, "original": { diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 7b3803d..8eaaec4 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -205,11 +205,11 @@ ] }, "locked": { - "lastModified": 1728461096, - "narHash": "sha256-cd0cXB85B3kGpm+iumP9xCnqFErspXL9Z/2X59kQ6c4=", + "lastModified": 1728527353, + "narHash": "sha256-GY755PX8CbGH3O9iKqauhkFTdP9WSKcOfOkZBe3SOqw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "e310b9bd71fa6c6a9fec0a8cf5af43ce798a0ad6", + "rev": "94749eee5a2b351b6893d5bddb0a18f7f01251ac", "type": "github" }, "original": { diff --git a/home-manager/progs/fish.nix b/home-manager/progs/fish.nix index 5979b29..9668a8c 100644 --- a/home-manager/progs/fish.nix +++ b/home-manager/progs/fish.nix @@ -2,7 +2,7 @@ let eza = "${pkgs.eza}/bin/eza --color=always --group-directories-first"; cargo = "${pkgs.cargo}/bin/cargo"; - coreutil = "${pkgs.coreutils}/bin"; + coreutils = "${pkgs.coreutils}/bin"; in { programs.fish = { @@ -13,7 +13,7 @@ in set fish_greeting #fixes gnupg password entry - export GPG_TTY=(${coreutil}/tty) + export GPG_TTY=(${coreutils}/tty) #pfetch on shell start (disable pkgs because of execution time) PF_INFO="ascii title os host kernel uptime memory editor wm" ${pkgs.pfetch-rs}/bin/pfetch @@ -38,11 +38,11 @@ in ${pkgs.git}/bin/git rev-list --objects --all | ${pkgs.git}/bin/git cat-file --batch-check='%(objecttype) %(objectname) %(objectsize) %(rest)' | ${pkgs.gnused}/bin/sed -n 's/^blob //p' | - ${coreutil}/sort --numeric-sort --key=2 | - ${coreutil}/cut -c 1-12,41- | - ${coreutil}/numfmt --field=2 --to=iec-i --suffix=B --padding=7 --round=nearest''; + ${coreutils}/sort --numeric-sort --key=2 | + ${coreutils}/cut -c 1-12,41- | + ${coreutils}/numfmt --field=2 --to=iec-i --suffix=B --padding=7 --round=nearest''; - #aliases for (I think) macos commands + # aliases for (I think) macos commands pbcopy = "${pkgs.wl-clipboard}/bin/wl-copy"; pbpaste = "${pkgs.wl-clipboard}/bin/wl-paste"; diff --git a/home-manager/progs/helix.nix b/home-manager/progs/helix.nix index 4b6f271..6dd51cb 100644 --- a/home-manager/progs/helix.nix +++ b/home-manager/progs/helix.nix @@ -16,7 +16,7 @@ hidden = false; }; - #wrapping!! + # wrapping!! soft-wrap.enable = true; }; }; @@ -31,7 +31,7 @@ }; themes = { - #modified fleet_dark theme + # modified fleet_dark theme my_theme = let white = "#ffffff"; diff --git a/home-manager/progs/niri.nix b/home-manager/progs/niri.nix index a6aa705..2acc71a 100644 --- a/home-manager/progs/niri.nix +++ b/home-manager/progs/niri.nix @@ -7,10 +7,10 @@ prefer-no-csd = true; spawn-at-startup = [ - #waybar + # waybar { command = [ "${pkgs.waybar}/bin/waybar" ]; } - #swaybg works on more than just sway (sets a wallpaper) + # swaybg works on more than just sway (sets a wallpaper) { command = [ "${pkgs.swaybg}/bin/swaybg" @@ -36,25 +36,25 @@ ]; binds = with config.lib.niri.actions; { - #application launcher + # application launcher "Mod+Space".action = spawn [ "${pkgs.rofi-wayland}/bin/rofi" "-show" "combi" ]; - #open a terminal + # open a terminal "Mod+T".action = spawn "${pkgs.alacritty}/bin/alacritty"; - #lock the screen + # lock the screen "Mod+X".action = spawn "${pkgs.swaylock}/bin/swaylock"; - #screenshotting + # screenshotting "Print".action = screenshot; "Ctrl+Print".action = screenshot-screen; "Alt+Print".action = screenshot-window; - #Volume control + # Volume control "XF86AudioRaiseVolume".action = spawn [ "${pkgs.avizo}/bin/volumectl" "-u" @@ -85,12 +85,12 @@ "down" ]; - #Force close a window + # Force close a window "Mod+Q".action = close-window; "Mod+Shift+Q".action = quit; - #bindings for like window management ig + # bindings for like window management ig "Mod+Left".action = focus-column-left; "Mod+Down".action = focus-window-down; diff --git a/home-manager/system-mreow.nix b/home-manager/system-mreow.nix index c9ba7fd..08c9efa 100644 --- a/home-manager/system-mreow.nix +++ b/home-manager/system-mreow.nix @@ -13,22 +13,22 @@ intel-gpu-tools swaylock - #manage bluetooth devices + # manage bluetooth devices blueman niri ]; - #bluetooth manager + # bluetooth manager services.blueman-applet.enable = true; - #notification daemon + # notification daemon services.dunst = { enable = true; package = pkgs.dunst; }; - #window manager + # window manager programs.niri = { settings = import ./progs/niri.nix { inherit config pkgs homeDirectory; }; }; @@ -38,10 +38,10 @@ settings = import ./progs/swaylock.nix; }; - #waybar for status bar + # waybar for status bar programs.waybar = import ./progs/waybar.nix { inherit pkgs; }; - #rofi for application launcher + # rofi for application launcher programs.rofi = { enable = true; package = pkgs.rofi-wayland; @@ -56,7 +56,7 @@ path = "${homeDirectory}/.secrets/borg_bak_pass"; }; - #backup utility + # backup utility programs.borgmatic = { enable = true; package = pkgs.borgmatic; From ed37ee73665b71a0416f126036ad65a0cb5299fc Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 11 Oct 2024 19:58:48 -0400 Subject: [PATCH 031/724] gpt4all: update and disable version check --- ...ngs-err.patch => disable-settings-err.patch} | 0 .../progs/gpt4all/disable-version-check.patch | 17 +++++++++++++++++ home-manager/progs/gpt4all/gpt4all.nix | 9 +++++---- 3 files changed, 22 insertions(+), 4 deletions(-) rename home-manager/progs/gpt4all/{gpt4all-HEAD-disable-settings-err.patch => disable-settings-err.patch} (100%) create mode 100644 home-manager/progs/gpt4all/disable-version-check.patch diff --git a/home-manager/progs/gpt4all/gpt4all-HEAD-disable-settings-err.patch b/home-manager/progs/gpt4all/disable-settings-err.patch similarity index 100% rename from home-manager/progs/gpt4all/gpt4all-HEAD-disable-settings-err.patch rename to home-manager/progs/gpt4all/disable-settings-err.patch diff --git a/home-manager/progs/gpt4all/disable-version-check.patch b/home-manager/progs/gpt4all/disable-version-check.patch new file mode 100644 index 0000000..d235f73 --- /dev/null +++ b/home-manager/progs/gpt4all/disable-version-check.patch @@ -0,0 +1,17 @@ +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 { diff --git a/home-manager/progs/gpt4all/gpt4all.nix b/home-manager/progs/gpt4all/gpt4all.nix index 0e4564c..63db51a 100644 --- a/home-manager/progs/gpt4all/gpt4all.nix +++ b/home-manager/progs/gpt4all/gpt4all.nix @@ -30,17 +30,18 @@ let gpt4all_package = ( optimizeWithFlags (pkgs.gpt4all.overrideAttrs (old: { - version = "3.4.0"; + version = "3.4.1"; src = pkgs.fetchFromGitHub { fetchSubmodules = true; owner = "nomic-ai"; repo = "gpt4all"; - rev = "v3.4.0"; - sha256 = "yXp9MyezXQJWUyEvyXc6++/Ow/NNqs1cjLIpEuKDrn0="; + rev = "v3.4.1"; + sha256 = "L29ZQlDDJlh538cgAGuo/ijtBQvZ0vloH4vdJ1oIe5I="; }; patches = old.patches ++ [ - ./gpt4all-HEAD-disable-settings-err.patch + ./disable-settings-err.patch + ./disable-version-check.patch ]; })) From e8f294992ef381a1cac054652639ca951c644c0c Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 11 Oct 2024 19:58:56 -0400 Subject: [PATCH 032/724] flake update --- etcnixos/flake.lock | 18 +++++++++--------- home-manager/flake.lock | 42 ++++++++++++++++++++--------------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 295a5b1..1455847 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -50,11 +50,11 @@ ] }, "locked": { - "lastModified": 1728518869, - "narHash": "sha256-E3UDvOmDuADBDxJIzPKiUmKC2CLoVvWP+9gjlw5xS8Y=", + "lastModified": 1728587571, + "narHash": "sha256-vQmYKJ9sLQP6VivCdKNdpisXrB6xpDaaTif5U+IogzQ=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "8bfc88598cfc49588de18099d7962c623cb86310", + "rev": "d73c548a001f367048d4f22cf2ae626cd2002503", "type": "github" }, "original": { @@ -278,11 +278,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1728199407, - "narHash": "sha256-x4G0ja//3pT/epOvwxKR1XB7GAW7Yuwiy6RYCOgRjuQ=", + "lastModified": 1728632221, + "narHash": "sha256-LnBVdKPsreziZkYbeFqiSYP7tPFlprt9ej2QGd2aNlw=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "0bc127c631999c9555cae2b0cdad2128ff058259", + "rev": "3326a0b3974fc04d991990f6497fe1a7d9892439", "type": "github" }, "original": { @@ -332,11 +332,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728241625, - "narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=", + "lastModified": 1728492678, + "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1", + "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "type": "github" }, "original": { diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 8eaaec4..7339faa 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -72,11 +72,11 @@ ] }, "locked": { - "lastModified": 1728337164, - "narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=", + "lastModified": 1728685293, + "narHash": "sha256-1WowL96pksT/XCi+ZXHgqiQ9NiU5oxWuNIQYWqOoEYc=", "owner": "nix-community", "repo": "home-manager", - "rev": "038630363e7de57c36c417fd2f5d7c14773403e4", + "rev": "2b13611eaed8326789f76f70d21d06fbb14e3e47", "type": "github" }, "original": { @@ -98,11 +98,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1728467408, - "narHash": "sha256-pOYTUPWlxuK8Y4Q7UiDeXJRVallbRrGFtwQ4M+biZnM=", + "lastModified": 1728579099, + "narHash": "sha256-cE2rv4xHe9l1xczfJmUnV7pKuDzFM8DtLDYndppiahg=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "321a4a598e765862874ccddbc4d1b68941a0b5ee", + "rev": "3f80dcf1833101dc377b1c4e1659da4b8e86f3eb", "type": "github" }, "original": { @@ -131,11 +131,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1728463806, - "narHash": "sha256-RHfieDDCEjPxtevtpt/IyxBaw4ISjjyY0WGzw7zYCMg=", + "lastModified": 1728546258, + "narHash": "sha256-iE6O7EBokq/HjjwouHfd7EGmED7TUkB9icSbUfPHWSo=", "owner": "YaLTeR", "repo": "niri", - "rev": "e24723125f5ef91983735043fba893a940469686", + "rev": "859c0be0e5fa5ccf3c59f0ae1764551a930656fd", "type": "github" }, "original": { @@ -146,11 +146,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728241625, - "narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=", + "lastModified": 1728492678, + "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1", + "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "type": "github" }, "original": { @@ -174,11 +174,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1728328465, - "narHash": "sha256-a0a0M1TmXMK34y3M0cugsmpJ4FJPT/xsblhpiiX1CXo=", + "lastModified": 1728500571, + "narHash": "sha256-dOymOQ3AfNI4Z337yEwHGohrVQb4yPODCW9MDUyAc4w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1bfbbbe5bbf888d675397c66bfdb275d0b99361c", + "rev": "d51c28603def282a24fa034bcb007e2bcb5b5dd0", "type": "github" }, "original": { @@ -205,11 +205,11 @@ ] }, "locked": { - "lastModified": 1728527353, - "narHash": "sha256-GY755PX8CbGH3O9iKqauhkFTdP9WSKcOfOkZBe3SOqw=", + "lastModified": 1728613723, + "narHash": "sha256-zVVj0PKguM8ZMdLE43YW7dzer3tl9e6i5Qs1fr878+c=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "94749eee5a2b351b6893d5bddb0a18f7f01251ac", + "rev": "ca93f28abd2147dd9997261dcaeacc5a30dba463", "type": "github" }, "original": { @@ -268,11 +268,11 @@ }, "zen-browser": { "locked": { - "lastModified": 1728420026, - "narHash": "sha256-92y3GEfyRJ0/UvFc0APLicE/L+KCaTSpPPfsoj08py0=", + "lastModified": 1728678863, + "narHash": "sha256-SsHAlGs227Ffnaujj/bSs8QT1nGZFMCNh23vqh1F7YQ=", "owner": "matthewpi", "repo": "nixpkgs", - "rev": "97e4d2ac2a515aba2550b8aa348f288af972116c", + "rev": "7bb3386ee928e23fafb333dbe733b5cae56f6d31", "type": "github" }, "original": { From 3ffcae71faa5a265b02d5a65e19e105a424055ab Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 13 Oct 2024 14:03:13 -0400 Subject: [PATCH 033/724] add freecad --- etcnixos/flake.lock | 6 +++--- home-manager/flake.lock | 30 +++++++++++++------------- home-manager/gui.nix | 2 ++ home-manager/progs/gpt4all/gpt4all.nix | 5 +++++ 4 files changed, 25 insertions(+), 18 deletions(-) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 1455847..a1bcb8c 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -316,11 +316,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1728269138, - "narHash": "sha256-oKxDImsOvgUZMY4NwXVyUc/c1HiU2qInX+b5BU0yXls=", + "lastModified": 1728729581, + "narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "ecfcd787f373f43307d764762e139a7cdeb9c22b", + "rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806", "type": "github" }, "original": { diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 7339faa..ac9a7a2 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -72,11 +72,11 @@ ] }, "locked": { - "lastModified": 1728685293, - "narHash": "sha256-1WowL96pksT/XCi+ZXHgqiQ9NiU5oxWuNIQYWqOoEYc=", + "lastModified": 1728791962, + "narHash": "sha256-nr5QiXwQcZmf6/auC1UpX8iAtINMtdi2mH+OkqJQVmU=", "owner": "nix-community", "repo": "home-manager", - "rev": "2b13611eaed8326789f76f70d21d06fbb14e3e47", + "rev": "64c6325b28ebd708653dd41d88f306023f296184", "type": "github" }, "original": { @@ -98,11 +98,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1728579099, - "narHash": "sha256-cE2rv4xHe9l1xczfJmUnV7pKuDzFM8DtLDYndppiahg=", + "lastModified": 1728829629, + "narHash": "sha256-y3fWim/0mDCSLjvqkmylN5mmVOfvwJG9Mt+Z8qIn44U=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "3f80dcf1833101dc377b1c4e1659da4b8e86f3eb", + "rev": "0a50b261ac5b6cdcc8eb7921a4f022c92b29d1ab", "type": "github" }, "original": { @@ -131,11 +131,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1728546258, - "narHash": "sha256-iE6O7EBokq/HjjwouHfd7EGmED7TUkB9icSbUfPHWSo=", + "lastModified": 1728822376, + "narHash": "sha256-HQc10OfFNie5YocsrJQCN6BOi+CZ0uuGGHGbJFXjgUI=", "owner": "YaLTeR", "repo": "niri", - "rev": "859c0be0e5fa5ccf3c59f0ae1764551a930656fd", + "rev": "d7156df8428cb9e6665a212e66c74bdb25842be8", "type": "github" }, "original": { @@ -174,11 +174,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1728500571, - "narHash": "sha256-dOymOQ3AfNI4Z337yEwHGohrVQb4yPODCW9MDUyAc4w=", + "lastModified": 1728740863, + "narHash": "sha256-u+rxA79a0lyhG+u+oPBRtTDtzz8kvkc9a6SWSt9ekVc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d51c28603def282a24fa034bcb007e2bcb5b5dd0", + "rev": "a3f9ad65a0bf298ed5847629a57808b97e6e8077", "type": "github" }, "original": { @@ -205,11 +205,11 @@ ] }, "locked": { - "lastModified": 1728613723, - "narHash": "sha256-zVVj0PKguM8ZMdLE43YW7dzer3tl9e6i5Qs1fr878+c=", + "lastModified": 1728786660, + "narHash": "sha256-qY+1e0o6oV5ySlErhj/dsWsPLWjrMKzq4QI7a1t9/Ps=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ca93f28abd2147dd9997261dcaeacc5a30dba463", + "rev": "174a8d9cec9e2c23877a7b887c52b68ef0421d8b", "type": "github" }, "original": { diff --git a/home-manager/gui.nix b/home-manager/gui.nix index 8657aff..fd55327 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -93,6 +93,8 @@ inputs.zen-browser.legacyPackages.${pkgs.system}.zen-browser (factorio.override (import ./secrets/factorio.nix)) + + freecad-wayland ]; # make chromium-based stuff use wayland diff --git a/home-manager/progs/gpt4all/gpt4all.nix b/home-manager/progs/gpt4all/gpt4all.nix index 63db51a..9867f33 100644 --- a/home-manager/progs/gpt4all/gpt4all.nix +++ b/home-manager/progs/gpt4all/gpt4all.nix @@ -39,6 +39,11 @@ let sha256 = "L29ZQlDDJlh538cgAGuo/ijtBQvZ0vloH4vdJ1oIe5I="; }; + cmakeFlags = old.cmakeFlags ++ [ + "-DGGML_VULKAN=ON" + "-DGGML_KOMPUTE=ON" + ]; + patches = old.patches ++ [ ./disable-settings-err.patch ./disable-version-check.patch From 4f086b94251c5f611356ee66552a3393ddfe05fe Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 13 Oct 2024 21:08:05 -0400 Subject: [PATCH 034/724] refactor some stuff --- etcnixos/common.nix | 14 +++++++++++++- etcnixos/flake.lock | 12 ++++++------ etcnixos/system-nixos.nix | 2 +- home-manager/progs/alacritty.nix | 2 +- 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/etcnixos/common.nix b/etcnixos/common.nix index 6ca50d1..9c78b7c 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -198,8 +198,20 @@ libmtp ]; - #wayland with electron/chromium applications + # wayland with electron/chromium applications environment.sessionVariables.NIXOS_OZONE_WL = "1"; + # https://nixos.wiki/wiki/Fish#Setting_fish_as_your_shell + programs.fish.enable = true; + programs.bash = { + interactiveShellInit = '' + 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 + fi + ''; + }; + system.stateVersion = "24.11"; } diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index a1bcb8c..7f882c6 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -50,11 +50,11 @@ ] }, "locked": { - "lastModified": 1728587571, - "narHash": "sha256-vQmYKJ9sLQP6VivCdKNdpisXrB6xpDaaTif5U+IogzQ=", + "lastModified": 1728835058, + "narHash": "sha256-GbcJ90E8+wBkBh9C1HxBTwKsOkGU41CRaPrd1ksFPtA=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "d73c548a001f367048d4f22cf2ae626cd2002503", + "rev": "ec6b449d3d096a0e79db5f8c4a321ea9ec836e40", "type": "github" }, "original": { @@ -278,11 +278,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1728632221, - "narHash": "sha256-LnBVdKPsreziZkYbeFqiSYP7tPFlprt9ej2QGd2aNlw=", + "lastModified": 1728833717, + "narHash": "sha256-GkS9SnKRb/PrdcqptLPNxweDdf3Zx2Lk5szEt07P4mE=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "3326a0b3974fc04d991990f6497fe1a7d9892439", + "rev": "6634ab618862f1d041c286567a58c554e6136068", "type": "github" }, "original": { diff --git a/etcnixos/system-nixos.nix b/etcnixos/system-nixos.nix index ecc7ddd..50cbb5e 100644 --- a/etcnixos/system-nixos.nix +++ b/etcnixos/system-nixos.nix @@ -38,7 +38,7 @@ "amdgpu.ppfeaturemask=0xFFF7FFFF" ]; - kernelModules = [ + initrd.availableKernelModules = [ # kernel module for case fan control "nct6775" ]; diff --git a/home-manager/progs/alacritty.nix b/home-manager/progs/alacritty.nix index 11219af..c8f9750 100644 --- a/home-manager/progs/alacritty.nix +++ b/home-manager/progs/alacritty.nix @@ -5,7 +5,7 @@ package = pkgs.alacritty; settings = { # use the fish shell - shell.program = "${pkgs.fish}/bin/fish"; + # shell.program = "${pkgs.fish}/bin/fish"; # some programs can't handle alacritty env.TERM = "xterm-256color"; From 76ecadbaaed01664add3d509de12b857f5692cb6 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 14 Oct 2024 01:09:14 -0400 Subject: [PATCH 035/724] desktop: add obs --- home-manager/system-nixos.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/home-manager/system-nixos.nix b/home-manager/system-nixos.nix index 1a12ce8..f6d692b 100644 --- a/home-manager/system-nixos.nix +++ b/home-manager/system-nixos.nix @@ -20,4 +20,13 @@ 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 + ]; + }; } From cd151b528d4ef14fabfec680d07fc7104c7b4ecd Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 15 Oct 2024 23:20:26 -0400 Subject: [PATCH 036/724] updates + remove factorio + disable gpt4all (broken) --- etcnixos/common.nix | 3 +- etcnixos/flake.lock | 42 +++++++++++-------------- home-manager/flake.lock | 42 ++++++++++++------------- home-manager/flake.nix | 22 ++++++++++++- home-manager/gui.nix | 10 +++--- home-manager/no-gui.nix | 2 ++ home-manager/progs/gpt4all/gpt4all.nix | 31 +++++++++--------- home-manager/secrets/factorio.nix | Bin 99 -> 0 bytes 8 files changed, 83 insertions(+), 69 deletions(-) delete mode 100644 home-manager/secrets/factorio.nix diff --git a/etcnixos/common.nix b/etcnixos/common.nix index 9c78b7c..4509cf9 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -46,11 +46,12 @@ loader = { systemd-boot.enable = true; efi.canTouchEfiVariables = true; + + timeout = 1; }; initrd = { compressor = "zstd"; - compressorArgs = [ "-19" ]; }; }; diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 7f882c6..dcaba38 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -65,18 +65,12 @@ } }, "crane": { - "inputs": { - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ] - }, "locked": { - "lastModified": 1721842668, - "narHash": "sha256-k3oiD2z2AAwBFLa4+xfU+7G5fisRXfkvrMTCJrjZzXo=", + "lastModified": 1728776144, + "narHash": "sha256-fROVjMcKRoGHofDm8dY3uDUtCMwUICh/KjBFQnuBzfg=", "owner": "ipetkov", "repo": "crane", - "rev": "529c1a0b1f29f0d78fa3086b8f6a134c71ef3aaf", + "rev": "f876e3d905b922502f031aeec1a84490122254b7", "type": "github" }, "original": { @@ -153,11 +147,11 @@ ] }, "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "type": "github" }, "original": { @@ -278,11 +272,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1728833717, - "narHash": "sha256-GkS9SnKRb/PrdcqptLPNxweDdf3Zx2Lk5szEt07P4mE=", + "lastModified": 1729028850, + "narHash": "sha256-eOhjiU+3TCaSYZESYhU2ZTUQKrBcer9cQ/XpVkergAg=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "6634ab618862f1d041c286567a58c554e6136068", + "rev": "bd01eac8c7cfa9b7e25304f0e7f0fed80de63f9d", "type": "github" }, "original": { @@ -332,11 +326,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728492678, - "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "lastModified": 1728888510, + "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", "type": "github" }, "original": { @@ -376,11 +370,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1721042469, - "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", + "lastModified": 1728778939, + "narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", + "rev": "ff68f91754be6f3427e4986d7949e6273659be1d", "type": "github" }, "original": { @@ -424,11 +418,11 @@ ] }, "locked": { - "lastModified": 1722219664, - "narHash": "sha256-xMOJ+HW4yj6e69PvieohUJ3dBSdgCfvI0nnCEe6/yVc=", + "lastModified": 1728959392, + "narHash": "sha256-fp4he1QQjE+vasDMspZYeXrwTm9otwEqLwEN6FKZ5v0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a6fbda5d9a14fb5f7c69b8489d24afeb349c7bb4", + "rev": "4c6e317300f05b8871f585b826b6f583e7dc4a9b", "type": "github" }, "original": { diff --git a/home-manager/flake.lock b/home-manager/flake.lock index ac9a7a2..5a07e0e 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -72,11 +72,11 @@ ] }, "locked": { - "lastModified": 1728791962, - "narHash": "sha256-nr5QiXwQcZmf6/auC1UpX8iAtINMtdi2mH+OkqJQVmU=", + "lastModified": 1729027341, + "narHash": "sha256-IqWD7bA9iJVifvJlB4vs2KUXVhN+d9lECWdNB4jJ0tE=", "owner": "nix-community", "repo": "home-manager", - "rev": "64c6325b28ebd708653dd41d88f306023f296184", + "rev": "2a4fd1cfd8ed5648583dadef86966a8231024221", "type": "github" }, "original": { @@ -98,11 +98,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1728829629, - "narHash": "sha256-y3fWim/0mDCSLjvqkmylN5mmVOfvwJG9Mt+Z8qIn44U=", + "lastModified": 1729023891, + "narHash": "sha256-8NCqlnMnKldeLEWUyXG8UYbu1Wx2wctsA3+fFnMhNO4=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "0a50b261ac5b6cdcc8eb7921a4f022c92b29d1ab", + "rev": "7084b0221f3dec7ea1f1c5203d9e389eb9908d07", "type": "github" }, "original": { @@ -131,11 +131,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1728822376, - "narHash": "sha256-HQc10OfFNie5YocsrJQCN6BOi+CZ0uuGGHGbJFXjgUI=", + "lastModified": 1728979917, + "narHash": "sha256-NWt6gwVP6072BcV2FvuZD8fikyDcT5WSBrs+6w9hTsk=", "owner": "YaLTeR", "repo": "niri", - "rev": "d7156df8428cb9e6665a212e66c74bdb25842be8", + "rev": "a13b9298c66f45e571533731e2a690a23534df01", "type": "github" }, "original": { @@ -146,11 +146,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728492678, - "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "lastModified": 1728888510, + "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", "type": "github" }, "original": { @@ -174,11 +174,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1728740863, - "narHash": "sha256-u+rxA79a0lyhG+u+oPBRtTDtzz8kvkc9a6SWSt9ekVc=", + "lastModified": 1728909085, + "narHash": "sha256-WLxED18lodtQiayIPDE5zwAfkPJSjHJ35UhZ8h3cJUg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a3f9ad65a0bf298ed5847629a57808b97e6e8077", + "rev": "c0b1da36f7c34a7146501f684e9ebdf15d2bebf8", "type": "github" }, "original": { @@ -205,11 +205,11 @@ ] }, "locked": { - "lastModified": 1728786660, - "narHash": "sha256-qY+1e0o6oV5ySlErhj/dsWsPLWjrMKzq4QI7a1t9/Ps=", + "lastModified": 1729045942, + "narHash": "sha256-HjmK0x5Zm2TK2vFpC7XBM2e3EDNVnAIuEoU2FkeN8xw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "174a8d9cec9e2c23877a7b887c52b68ef0421d8b", + "rev": "9de3cea452d2401d6f93c06ad985178a4e11d1fc", "type": "github" }, "original": { @@ -268,11 +268,11 @@ }, "zen-browser": { "locked": { - "lastModified": 1728678863, - "narHash": "sha256-SsHAlGs227Ffnaujj/bSs8QT1nGZFMCNh23vqh1F7YQ=", + "lastModified": 1729025440, + "narHash": "sha256-DUhI5F7bOf5x5q5dpBdLZOnFNi3My/ucqkJQ5j1FFjg=", "owner": "matthewpi", "repo": "nixpkgs", - "rev": "7bb3386ee928e23fafb333dbe733b5cae56f6d31", + "rev": "98eabdf0903f10fc768aebcbe356cd1621bcee8b", "type": "github" }, "original": { diff --git a/home-manager/flake.nix b/home-manager/flake.nix index 99944fb..c2d79a2 100644 --- a/home-manager/flake.nix +++ b/home-manager/flake.nix @@ -46,12 +46,32 @@ homeDirectory = "/home/${username}"; hostname = nixpkgs.lib.strings.removeSuffix "\n" (builtins.readFile /etc/hostname); pkgs = import nixpkgs { }; + + # 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; + } + ); in { homeConfigurations.${username} = home-manager.lib.homeManagerConfiguration { inherit pkgs; extraSpecialArgs = { - inherit inputs username homeDirectory; + inherit + inputs + username + homeDirectory + optimizeWithFlags + ; }; modules = [ ./system-${hostname}.nix diff --git a/home-manager/gui.nix b/home-manager/gui.nix index fd55327..1475943 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -2,20 +2,22 @@ pkgs, lib, inputs, + optimizeWithFlags, ... }: { imports = [ ./no-gui.nix - ./progs/gpt4all/gpt4all.nix ./progs/alacritty.nix + + # gpt4all broken https://github.com/NixOS/nixpkgs/pull/346185 + # ./progs/gpt4all/gpt4all.nix ]; nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "apple_cursor" - "factorio-alpha" ]; home.packages = with pkgs; [ @@ -70,7 +72,6 @@ gnucash # image tools - imagemagick inkscape nomacs @@ -89,11 +90,8 @@ # music lyric fetcher lrcget - # inputs.zen-browser.packages."${pkgs.system}".specific inputs.zen-browser.legacyPackages.${pkgs.system}.zen-browser - (factorio.override (import ./secrets/factorio.nix)) - freecad-wayland ]; diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 77ca9c0..059a93d 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -130,6 +130,8 @@ git-crypt clang + + imagemagick ]; home.file.".cargo/config.toml".text = '' diff --git a/home-manager/progs/gpt4all/gpt4all.nix b/home-manager/progs/gpt4all/gpt4all.nix index 9867f33..a4249d2 100644 --- a/home-manager/progs/gpt4all/gpt4all.nix +++ b/home-manager/progs/gpt4all/gpt4all.nix @@ -1,4 +1,9 @@ -{ pkgs, lib, ... }: +{ + pkgs, + lib, + optimizeWithFlags, + ... +}: let models = [ { @@ -10,23 +15,17 @@ let sha256 = "+AHt49no0qQ48MoNsqGJV4FeJ3Cf2hSZqTMjNUIHaO4="; }; } + { + name = "Rombos-LLM-V2.6-Qwen-14b.IQ4_XS.gguf"; + context_length = "32768"; + gen_length = "8192"; + source = pkgs.fetchurl { + url = "https://huggingface.co/mradermacher/Rombos-LLM-V2.6-Qwen-14b-GGUF/resolve/main/Rombos-LLM-V2.6-Qwen-14b.IQ4_XS.gguf?download=true"; + sha256 = "InSndYkZx6pZux1SWn/pjQUc0tvUigjsw+JdXc3Dsdg="; + }; + } ]; - # 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.clangStdenv; - } - ); - gpt4all_package = ( optimizeWithFlags (pkgs.gpt4all.overrideAttrs (old: { diff --git a/home-manager/secrets/factorio.nix b/home-manager/secrets/factorio.nix deleted file mode 100644 index 549fa66986604a8664d199dcd7df193cb4e409a1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 99 zcmZQ@_Y83kiVO&0u$|oeHY#57^Y&xY=CvYZmYF G^(+A7_%3Mx From cb1ff9de2bf1552a5cbf01d301ebd01ac44ed589 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 16 Oct 2024 22:01:25 -0400 Subject: [PATCH 037/724] fix gpt4all --- etcnixos/flake.lock | 64 +++++--------------------- home-manager/flake.lock | 12 ++--- home-manager/gui.nix | 2 +- home-manager/no-gui.nix | 7 ++- home-manager/progs/fish.nix | 2 + home-manager/progs/gpt4all/gpt4all.nix | 14 ++++-- 6 files changed, 34 insertions(+), 67 deletions(-) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index dcaba38..584b769 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -41,7 +41,6 @@ }, "chaotic": { "inputs": { - "fenix": "fenix", "flake-schemas": "flake-schemas", "home-manager": "home-manager_2", "jovian": "jovian", @@ -50,11 +49,11 @@ ] }, "locked": { - "lastModified": 1728835058, - "narHash": "sha256-GbcJ90E8+wBkBh9C1HxBTwKsOkGU41CRaPrd1ksFPtA=", + "lastModified": 1729092978, + "narHash": "sha256-2SMJFFgKSvrQfkfzdcYjwFGvgeoCtDdbl/CGZNIU7hs=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "ec6b449d3d096a0e79db5f8c4a321ea9ec836e40", + "rev": "9af42c96e8d666f1df2b087aba1a6349f1c22f4e", "type": "github" }, "original": { @@ -101,28 +100,6 @@ "type": "github" } }, - "fenix": { - "inputs": { - "nixpkgs": [ - "chaotic", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1728455642, - "narHash": "sha256-abYGwrL6ak5sBRqwPh+V3CPJ6Pa89p378t51b7BO1lE=", - "owner": "nix-community", - "repo": "fenix", - "rev": "3b47535a5c782e4f4ad59cd4bdb23636b6926e03", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -225,11 +202,11 @@ ] }, "locked": { - "lastModified": 1728337164, - "narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=", + "lastModified": 1728903686, + "narHash": "sha256-ZHFrGNWDDriZ4m8CA/5kDa250SG1LiiLPApv1p/JF0o=", "owner": "nix-community", "repo": "home-manager", - "rev": "038630363e7de57c36c417fd2f5d7c14773403e4", + "rev": "e1aec543f5caf643ca0d94b6a633101942fd065f", "type": "github" }, "original": { @@ -247,11 +224,11 @@ ] }, "locked": { - "lastModified": 1728410210, - "narHash": "sha256-vn6qupt1U0M6Hf3eXhK3/K4Du0Z7A60qYS1G14QsRY8=", + "lastModified": 1728974938, + "narHash": "sha256-pTPEx6WlM+nJVGrRUGx7Di4ljZMwE9HfvlZ6f3NzNfo=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "a25f915ec05196d15e3f7f8555ffb612d4f1045d", + "rev": "23170582b0658e6afd913149a58863af3a57b376", "type": "github" }, "original": { @@ -272,11 +249,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1729028850, - "narHash": "sha256-eOhjiU+3TCaSYZESYhU2ZTUQKrBcer9cQ/XpVkergAg=", + "lastModified": 1729064530, + "narHash": "sha256-oSr/w/5dvf/8ll6NvQlL7+rrK8wzjIcEMP1LvI4Ag08=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "bd01eac8c7cfa9b7e25304f0e7f0fed80de63f9d", + "rev": "2fa1368f938b50e35ca87334b5aeba38a3402165", "type": "github" }, "original": { @@ -393,23 +370,6 @@ "nixpkgs": "nixpkgs" } }, - "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1728386838, - "narHash": "sha256-Lk64EoJkvp3WMGVJK3CR1TYcNghX0/BqHPLW5zdvmLE=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "efaf8bd5de34e2f47bd57425b83e0c7974902176", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, "rust-overlay": { "inputs": { "nixpkgs": [ diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 5a07e0e..03720de 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -98,11 +98,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1729023891, - "narHash": "sha256-8NCqlnMnKldeLEWUyXG8UYbu1Wx2wctsA3+fFnMhNO4=", + "lastModified": 1729090125, + "narHash": "sha256-jZQe55BWLEv6OwItbL7mMsm8A3/1rrLk4vTm3k7+jqg=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "7084b0221f3dec7ea1f1c5203d9e389eb9908d07", + "rev": "44d93e05a400cad197fd10f9d50e9475fc519326", "type": "github" }, "original": { @@ -131,11 +131,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1728979917, - "narHash": "sha256-NWt6gwVP6072BcV2FvuZD8fikyDcT5WSBrs+6w9hTsk=", + "lastModified": 1729086716, + "narHash": "sha256-xF1AtbQ+ipQyzyXV8mWGlndbeqACM3IIadyCHO0OtpU=", "owner": "YaLTeR", "repo": "niri", - "rev": "a13b9298c66f45e571533731e2a690a23534df01", + "rev": "84655d3b2627687e14431adb49450cd6af1de40f", "type": "github" }, "original": { diff --git a/home-manager/gui.nix b/home-manager/gui.nix index 1475943..b298277 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -11,7 +11,7 @@ ./progs/alacritty.nix # gpt4all broken https://github.com/NixOS/nixpkgs/pull/346185 - # ./progs/gpt4all/gpt4all.nix + ./progs/gpt4all/gpt4all.nix ]; nixpkgs.config.allowUnfreePredicate = diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 059a93d..66bdeea 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -35,6 +35,7 @@ } )) cargo-expand + rust-script # find typos in code typos @@ -117,20 +118,18 @@ nil # nix lsp yaml-language-server # yaml lsp marksman # markdown lsp + typescript-language-server # typescript lsp # clang-format and clang-tidy clang-tools - + clang lldb fio age - git-crypt - clang - imagemagick ]; diff --git a/home-manager/progs/fish.nix b/home-manager/progs/fish.nix index 9668a8c..0bad518 100644 --- a/home-manager/progs/fish.nix +++ b/home-manager/progs/fish.nix @@ -49,6 +49,8 @@ in nix-cleanup = "doas nix-collect-garbage --delete-older-than 1d && doas nix-store --optimise && doas nix-store --gc"; gcc-native = "${pkgs.gcc}/bin/gcc -Q --help=target -mtune=native -march=native | ${pkgs.gnugrep}/bin/grep -E '(mtune|march)=' | ${pkgs.gnugrep}/bin/grep -v 'Known valid arguments' | ${pkgs.gnused}/bin/sed -E \"s/[[:space:]]+//g\""; + + chess = "${pkgs.chess-tui} -e ${pkgs.stockfish}/bin/stockfish"; }; shellInit = '' diff --git a/home-manager/progs/gpt4all/gpt4all.nix b/home-manager/progs/gpt4all/gpt4all.nix index a4249d2..59c7573 100644 --- a/home-manager/progs/gpt4all/gpt4all.nix +++ b/home-manager/progs/gpt4all/gpt4all.nix @@ -29,13 +29,13 @@ let gpt4all_package = ( optimizeWithFlags (pkgs.gpt4all.overrideAttrs (old: { - version = "3.4.1"; + version = "3.4.2"; src = pkgs.fetchFromGitHub { fetchSubmodules = true; owner = "nomic-ai"; repo = "gpt4all"; - rev = "v3.4.1"; - sha256 = "L29ZQlDDJlh538cgAGuo/ijtBQvZ0vloH4vdJ1oIe5I="; + rev = "v3.4.2"; + sha256 = "QzU22y6tt3UhazVSPcFuKejH4AV+mw7JExH61NtAKoM="; }; cmakeFlags = old.cmakeFlags ++ [ @@ -46,12 +46,18 @@ let patches = old.patches ++ [ ./disable-settings-err.patch ./disable-version-check.patch + (pkgs.fetchpatch { + url = "https://aur.archlinux.org/cgit/aur.git/plain/004-fix-build-with-qt-6.8.0.diff?h=gpt4all-chat&id=d14b12cb63fae95e578aa839a570189a23833051"; + sha256 = "3Zur9KFn45f4dgAzOF7p1q42IdLqXwioN4zMiBbWbVU="; + stripLen = 1; + }) ]; })) # compile flags [ - "-Ofast" + "-O3" + "-ffast-math" "-march=native" "-mtune=native" "-fno-finite-math-only" # https://github.com/ggerganov/llama.cpp/pull/7154#issuecomment-2143844461 From 3bc02415715392ce938504cd39077162c3eac196 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 16 Oct 2024 23:04:18 -0400 Subject: [PATCH 038/724] gpt4all: change order of models --- home-manager/flake.lock | 6 +++--- home-manager/progs/gpt4all/gpt4all.nix | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 03720de..8b1a3fe 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -205,11 +205,11 @@ ] }, "locked": { - "lastModified": 1729045942, - "narHash": "sha256-HjmK0x5Zm2TK2vFpC7XBM2e3EDNVnAIuEoU2FkeN8xw=", + "lastModified": 1729132166, + "narHash": "sha256-Mhl4T7gDGknG4nPbHNSGWynfSjZeoWBdsaIzhUYuIlU=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "9de3cea452d2401d6f93c06ad985178a4e11d1fc", + "rev": "32d889f9b9fc65cb65aa2d5db282d60ed06f348e", "type": "github" }, "original": { diff --git a/home-manager/progs/gpt4all/gpt4all.nix b/home-manager/progs/gpt4all/gpt4all.nix index 59c7573..1314aed 100644 --- a/home-manager/progs/gpt4all/gpt4all.nix +++ b/home-manager/progs/gpt4all/gpt4all.nix @@ -6,15 +6,6 @@ }: let models = [ - { - name = "Qwen2.5-14B-Instruct-IQ4_XS.gguf"; - context_length = "32768"; - gen_length = "8192"; - source = pkgs.fetchurl { - url = "https://huggingface.co/bartowski/Qwen2.5-14B-Instruct-GGUF/resolve/main/Qwen2.5-14B-Instruct-IQ4_XS.gguf?download=true"; - sha256 = "+AHt49no0qQ48MoNsqGJV4FeJ3Cf2hSZqTMjNUIHaO4="; - }; - } { name = "Rombos-LLM-V2.6-Qwen-14b.IQ4_XS.gguf"; context_length = "32768"; @@ -24,6 +15,15 @@ let sha256 = "InSndYkZx6pZux1SWn/pjQUc0tvUigjsw+JdXc3Dsdg="; }; } + { + name = "Qwen2.5-14B-Instruct-IQ4_XS.gguf"; + context_length = "32768"; + gen_length = "8192"; + source = pkgs.fetchurl { + url = "https://huggingface.co/bartowski/Qwen2.5-14B-Instruct-GGUF/resolve/main/Qwen2.5-14B-Instruct-IQ4_XS.gguf?download=true"; + sha256 = "+AHt49no0qQ48MoNsqGJV4FeJ3Cf2hSZqTMjNUIHaO4="; + }; + } ]; gpt4all_package = ( From 2847eba9f990d9711fb48594eddbddf7afbfe176 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 17 Oct 2024 00:05:49 -0400 Subject: [PATCH 039/724] fix chess command --- home-manager/progs/fish.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/progs/fish.nix b/home-manager/progs/fish.nix index 0bad518..c037d03 100644 --- a/home-manager/progs/fish.nix +++ b/home-manager/progs/fish.nix @@ -50,7 +50,7 @@ in gcc-native = "${pkgs.gcc}/bin/gcc -Q --help=target -mtune=native -march=native | ${pkgs.gnugrep}/bin/grep -E '(mtune|march)=' | ${pkgs.gnugrep}/bin/grep -v 'Known valid arguments' | ${pkgs.gnused}/bin/sed -E \"s/[[:space:]]+//g\""; - chess = "${pkgs.chess-tui} -e ${pkgs.stockfish}/bin/stockfish"; + chess = "${pkgs.chess-tui}/bin/chess-tui -e ${pkgs.stockfish}/bin/stockfish"; }; shellInit = '' From 4998d32c12798078a8a4cd0308a2495db50aab96 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 17 Oct 2024 00:19:54 -0400 Subject: [PATCH 040/724] simplify gcc-native command --- home-manager/progs/fish.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/progs/fish.nix b/home-manager/progs/fish.nix index c037d03..735cbf7 100644 --- a/home-manager/progs/fish.nix +++ b/home-manager/progs/fish.nix @@ -48,7 +48,7 @@ in nix-cleanup = "doas nix-collect-garbage --delete-older-than 1d && doas nix-store --optimise && doas nix-store --gc"; - gcc-native = "${pkgs.gcc}/bin/gcc -Q --help=target -mtune=native -march=native | ${pkgs.gnugrep}/bin/grep -E '(mtune|march)=' | ${pkgs.gnugrep}/bin/grep -v 'Known valid arguments' | ${pkgs.gnused}/bin/sed -E \"s/[[:space:]]+//g\""; + gcc-native = "${pkgs.gcc}/bin/gcc -Q --help=target -mtune=native -march=native | ${pkgs.gnugrep}/bin/grep -E '^\\s+\-(mtune|march)=' | ${pkgs.gnused}/bin/sed -E 's/\\s+//g'"; chess = "${pkgs.chess-tui}/bin/chess-tui -e ${pkgs.stockfish}/bin/stockfish"; }; From ff5a8c04698aebd3556fbbc7bdf67bc8ac843e31 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 17 Oct 2024 20:29:15 -0400 Subject: [PATCH 041/724] desktopy things --- etcnixos/system-nixos.nix | 11 ++++++++--- home-manager/flake.lock | 36 +++++++++++++++++------------------ home-manager/system-nixos.nix | 3 --- 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/etcnixos/system-nixos.nix b/etcnixos/system-nixos.nix index 50cbb5e..073c7e5 100644 --- a/etcnixos/system-nixos.nix +++ b/etcnixos/system-nixos.nix @@ -19,11 +19,11 @@ ]; boot = { - kernelPackages = lib.mkForce pkgs.linuxPackages_6_10; - supportedFilesystems = [ "zfs" ]; + # kernelPackages = lib.mkForce pkgs.linuxPackages_6_10; + # supportedFilesystems = [ "zfs" ]; kernelPatches = [ - #for making ALVR support better :) + # for making ALVR support better :) { name = "amdgpu-ignore-ctx-privileges"; patch = pkgs.fetchpatch { @@ -51,6 +51,11 @@ wayland.enable = true; }; + services.displayManager.autoLogin = { + enable = true; + user = "yourusername"; + }; + services.openssh = { enable = true; ports = [ 22 ]; diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 8b1a3fe..9131cd7 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -72,11 +72,11 @@ ] }, "locked": { - "lastModified": 1729027341, - "narHash": "sha256-IqWD7bA9iJVifvJlB4vs2KUXVhN+d9lECWdNB4jJ0tE=", + "lastModified": 1729174520, + "narHash": "sha256-QxCAdgQdeIOaCiE0Sr23s9lD0+T1b/wuz5pSiGwNrCQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "2a4fd1cfd8ed5648583dadef86966a8231024221", + "rev": "e78cbb20276f09c1802e62d2f77fc93ec32da268", "type": "github" }, "original": { @@ -98,11 +98,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1729090125, - "narHash": "sha256-jZQe55BWLEv6OwItbL7mMsm8A3/1rrLk4vTm3k7+jqg=", + "lastModified": 1729189676, + "narHash": "sha256-oTvN+vxzOW+zzkmSnRUtItzismkOL+Z5kAU26Tf2HSE=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "44d93e05a400cad197fd10f9d50e9475fc519326", + "rev": "c547a861a5f968b0b783de5dbfad159303c6c19a", "type": "github" }, "original": { @@ -131,11 +131,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1729086716, - "narHash": "sha256-xF1AtbQ+ipQyzyXV8mWGlndbeqACM3IIadyCHO0OtpU=", + "lastModified": 1729144746, + "narHash": "sha256-Ocq+8Kc4gp8PLPziHkMZN0F+HuCS9mbxusJHtFdKoP8=", "owner": "YaLTeR", "repo": "niri", - "rev": "84655d3b2627687e14431adb49450cd6af1de40f", + "rev": "8d08782eba427a46607a478d088744d023a292c3", "type": "github" }, "original": { @@ -174,11 +174,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1728909085, - "narHash": "sha256-WLxED18lodtQiayIPDE5zwAfkPJSjHJ35UhZ8h3cJUg=", + "lastModified": 1729044727, + "narHash": "sha256-GKJjtPY+SXfLF/yTN7M2cAnQB6RERFKnQhD8UvPSf3M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c0b1da36f7c34a7146501f684e9ebdf15d2bebf8", + "rev": "dc2e0028d274394f73653c7c90cc63edbb696be1", "type": "github" }, "original": { @@ -205,11 +205,11 @@ ] }, "locked": { - "lastModified": 1729132166, - "narHash": "sha256-Mhl4T7gDGknG4nPbHNSGWynfSjZeoWBdsaIzhUYuIlU=", + "lastModified": 1729184663, + "narHash": "sha256-uNyi5vQrzaLkt4jj6ZEOs4+4UqOAwP6jFG2s7LIDwIk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "32d889f9b9fc65cb65aa2d5db282d60ed06f348e", + "rev": "16fb78d443c1970dda9a0bbb93070c9d8598a925", "type": "github" }, "original": { @@ -253,11 +253,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1726378112, - "narHash": "sha256-OANPb73V/RQDqtpIcbzeJ93KuOHKFQv+1xXC44Ut7tY=", + "lastModified": 1729139001, + "narHash": "sha256-BADKw4fQma8tUNBRfmS9YLXTRXK4nYyXIxQdhGuEV0s=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "b962a0f33b503aa39c9cf6919f488b664e5b79b4", + "rev": "ab2d09962c425670a4a7ca6ef5d92a0f06632499", "type": "github" }, "original": { diff --git a/home-manager/system-nixos.nix b/home-manager/system-nixos.nix index f6d692b..607261a 100644 --- a/home-manager/system-nixos.nix +++ b/home-manager/system-nixos.nix @@ -7,9 +7,6 @@ { imports = [ ./gui.nix ]; - # TODO! replace this with a per-package unfree whitelist (i.e what is done with apple_cursors) - nixpkgs.config.allowUnfree = true; - home.packages = with pkgs; [ protontricks beatsabermodmanager From 3f888f5165a93dd9724ece55d3651e02d8b89a90 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 17 Oct 2024 12:36:04 -0400 Subject: [PATCH 042/724] gcc-native: sed -> tr --- home-manager/progs/fish.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/home-manager/progs/fish.nix b/home-manager/progs/fish.nix index 735cbf7..dc8ba6c 100644 --- a/home-manager/progs/fish.nix +++ b/home-manager/progs/fish.nix @@ -24,9 +24,6 @@ in cr = "${cargo} run"; cb = "${cargo} build"; - # I hate the red background - run0 = "run0 --background=\"\""; - # from DistroTube's dot files: Changing "ls" to "eza" ls = "${eza} -al"; la = "${eza} -a"; @@ -48,7 +45,7 @@ in nix-cleanup = "doas nix-collect-garbage --delete-older-than 1d && doas nix-store --optimise && doas nix-store --gc"; - gcc-native = "${pkgs.gcc}/bin/gcc -Q --help=target -mtune=native -march=native | ${pkgs.gnugrep}/bin/grep -E '^\\s+\-(mtune|march)=' | ${pkgs.gnused}/bin/sed -E 's/\\s+//g'"; + gcc-native = "${pkgs.gcc}/bin/gcc -Q --help=target -mtune=native -march=native | ${pkgs.gnugrep}/bin/grep -E '^\\s+\-(mtune|march)=' | ${coreutils}/tr -d '[:blank:]'"; chess = "${pkgs.chess-tui}/bin/chess-tui -e ${pkgs.stockfish}/bin/stockfish"; }; From 9e2cd0d3371a0b455d8642c65935636d53b4916e Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 17 Oct 2024 12:36:18 -0400 Subject: [PATCH 043/724] gpt4all: modify prompt --- home-manager/progs/gpt4all/gpt4all.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/progs/gpt4all/gpt4all.nix b/home-manager/progs/gpt4all/gpt4all.nix index 1314aed..f29ec41 100644 --- a/home-manager/progs/gpt4all/gpt4all.nix +++ b/home-manager/progs/gpt4all/gpt4all.nix @@ -74,7 +74,7 @@ in { ".config/nomic.ai/GPT4All.ini".text = let - system_prompt = "You are an expert LLM who is thoughtful and works step-by-step from first principles derive an answer to the user's prompt. For each step, title the step and begin showing your work, then decide if your work is comprehensive and if you're ready to provide your final answer. Make sure to exhaust ALL POSSIBILITIES before answering. INTERNAL REASONING STEPS ARE NOT SHOWN TO THE USER, ONLY A \"Final Answer\" SECTION WILL BE SHOWN TO THE USER. USE AS MANY REASONING STEPS AS POSSIBLE. EXPLORE ALTERNATE ANSWERS AND CONSIDER THAT YOUR ANSWER OR ANY ASSUMPTIONS MAY BE WRONG. IDENTIFY POSSIBLE ERRORS IN YOUR REASONING AND WHERE SUCH ERRORS MAY BE. FULLY TEST ALL OTHER POSSIBILITIES. YOU CAN BE WRONG. SHOW YOUR WORK WHEN RE-EXAMINING."; + system_prompt = "You are an expert LLM who works step-by-step from first principles to derive an answer to the user's prompt. For each step, title the step and begin showing your work, then decide if your work is comprehensive and if you're ready to provide your final answer. Make sure to exhaust ALL POSSIBILITIES before answering. INTERNAL REASONING STEPS ARE NOT SHOWN TO THE USER, ONLY A \"Final Answer\" SECTION WILL BE SHOWN TO THE USER. USE AS MANY REASONING STEPS AS POSSIBLE. EXPLORE ALTERNATE ANSWERS AND CONSIDER THAT YOUR ANSWER OR ANY ASSUMPTIONS MAY BE WRONG. IDENTIFY POSSIBLE ERRORS IN YOUR REASONING AND WHERE SUCH ERRORS MAY BE. FULLY TEST ALL OTHER POSSIBILITIES. YOU CAN BE WRONG. SHOW YOUR WORK WHEN RE-EXAMINING. FULLY COMPLETE THE PROBLEM BEFORE FINALIZING YOUR ANSWER, DO NOT LEAVE PLACEHOLDER INFORMATION IN YOUR ANSWER."; in '' [General] From a7eaa514782906c0cb230d12487f7f2b4dd567f0 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 17 Oct 2024 23:56:09 -0400 Subject: [PATCH 044/724] factorio prep and reorg --- etcnixos/common.nix | 5 + etcnixos/system-nixos.nix | 3 - home-manager/flake.lock | 6 +- home-manager/flake.nix | 2 + home-manager/progs/niri.nix | 316 +++++++++++++++++----------------- home-manager/system-mreow.nix | 12 +- 6 files changed, 177 insertions(+), 167 deletions(-) diff --git a/etcnixos/common.nix b/etcnixos/common.nix index 4509cf9..0f45292 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -181,6 +181,11 @@ enableSSHSupport = false; }; + programs.steam = { + enable = true; + localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers + }; + #System packages environment.systemPackages = with pkgs; [ mullvad-vpn diff --git a/etcnixos/system-nixos.nix b/etcnixos/system-nixos.nix index 073c7e5..021fc6c 100644 --- a/etcnixos/system-nixos.nix +++ b/etcnixos/system-nixos.nix @@ -107,10 +107,7 @@ }; programs.steam = { - enable = true; remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play - # dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server - localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers }; # services.ollama = { diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 9131cd7..fab84f3 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -205,11 +205,11 @@ ] }, "locked": { - "lastModified": 1729184663, - "narHash": "sha256-uNyi5vQrzaLkt4jj6ZEOs4+4UqOAwP6jFG2s7LIDwIk=", + "lastModified": 1729218602, + "narHash": "sha256-KDmYxpkFWa0Go0WnOpkgQOypVaQxbwgpEutET5ey1VQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "16fb78d443c1970dda9a0bbb93070c9d8598a925", + "rev": "9051466c82b9b3a6ba9e06be99621ad25423ec94", "type": "github" }, "original": { diff --git a/home-manager/flake.nix b/home-manager/flake.nix index c2d79a2..45a8079 100644 --- a/home-manager/flake.nix +++ b/home-manager/flake.nix @@ -73,6 +73,7 @@ optimizeWithFlags ; }; + modules = [ ./system-${hostname}.nix niri.homeModules.config @@ -83,6 +84,7 @@ { nixpkgs.overlays = [ rust-overlay.overlays.default + inputs.niri.overlays.niri ]; # home-manager stuff diff --git a/home-manager/progs/niri.nix b/home-manager/progs/niri.nix index 2acc71a..ddb77c5 100644 --- a/home-manager/progs/niri.nix +++ b/home-manager/progs/niri.nix @@ -2,166 +2,174 @@ config, pkgs, homeDirectory, + ... }: { - prefer-no-csd = true; + programs.niri = { + package = pkgs.niri-unstable; + settings = { + prefer-no-csd = true; - spawn-at-startup = [ - # waybar - { command = [ "${pkgs.waybar}/bin/waybar" ]; } + spawn-at-startup = [ + # waybar + { command = [ "${pkgs.waybar}/bin/waybar" ]; } - # swaybg works on more than just sway (sets a wallpaper) - { - command = [ - "${pkgs.swaybg}/bin/swaybg" - "-m" - "center" - "-i" - "${homeDirectory}/.wallpaper.png" + # swaybg works on more than just sway (sets a wallpaper) + { + command = [ + "${pkgs.swaybg}/bin/swaybg" + "-m" + "center" + "-i" + "${homeDirectory}/.wallpaper.png" + ]; + } + + { command = [ "${pkgs.xwayland-satellite-unstable}/bin/xwayland-satellite" ]; } ]; - } - ]; - window-rules = [ - { draw-border-with-background = false; } - { - geometry-corner-radius = { - top-left = 10.0; - top-right = 10.0; - bottom-right = 10.0; - bottom-left = 10.0; + window-rules = [ + { draw-border-with-background = false; } + { + geometry-corner-radius = { + top-left = 10.0; + top-right = 10.0; + bottom-right = 10.0; + bottom-left = 10.0; + }; + } + { clip-to-geometry = true; } + ]; + + binds = with config.lib.niri.actions; { + # application launcher + "Mod+Space".action = spawn [ + "${pkgs.rofi-wayland}/bin/rofi" + "-show" + "combi" + ]; + + # open a terminal + "Mod+T".action = spawn "${pkgs.alacritty}/bin/alacritty"; + + # lock the screen + "Mod+X".action = spawn "${pkgs.swaylock}/bin/swaylock"; + + # screenshotting + "Print".action = screenshot; + "Ctrl+Print".action = screenshot-screen; + "Alt+Print".action = screenshot-window; + + # Volume control + "XF86AudioRaiseVolume".action = spawn [ + "${pkgs.avizo}/bin/volumectl" + "-u" + "up" + ]; + "XF86AudioLowerVolume".action = spawn [ + "${pkgs.avizo}/bin/volumectl" + "-u" + "down" + ]; + "XF86AudioMute".action = spawn [ + "${pkgs.avizo}/bin/volumectl" + "toggle-mute" + ]; + "XF86AudioMicMute".action = spawn [ + "${pkgs.avizo}/bin/volumectl" + "-m" + "toggle-mute" + ]; + + #Display Brightness control + "XF86MonBrightnessUp".action = spawn [ + "${pkgs.avizo}/bin/lightctl" + "up" + ]; + "XF86MonBrightnessDown".action = spawn [ + "${pkgs.avizo}/bin/lightctl" + "down" + ]; + + # Force close a window + "Mod+Q".action = close-window; + + "Mod+Shift+Q".action = quit; + + # bindings for like window management ig + + "Mod+Left".action = focus-column-left; + "Mod+Down".action = focus-window-down; + "Mod+Up".action = focus-window-up; + "Mod+Right".action = focus-column-right; + + "Mod+H".action = focus-column-left; + "Mod+J".action = focus-window-down; + "Mod+K".action = focus-window-up; + "Mod+L".action = focus-column-right; + + "Mod+Ctrl+Left".action = move-column-left; + "Mod+Ctrl+Down".action = move-window-down; + "Mod+Ctrl+Up".action = move-window-up; + "Mod+Ctrl+Right".action = move-column-right; + + "Mod+Ctrl+H".action = move-column-left; + "Mod+Ctrl+J".action = move-window-down; + "Mod+Ctrl+K".action = move-window-up; + "Mod+Ctrl+L".action = move-column-right; + + #fine adjustments to height and width of window + "Mod+Minus".action = set-column-width "-10%"; + "Mod+Equal".action = set-column-width "+10%"; + "Mod+Shift+Minus".action = set-window-height "-10%"; + "Mod+Shift+Equal".action = set-window-height "+10%"; + + "Mod+Home".action = focus-column-first; + "Mod+End".action = focus-column-last; + "Mod+Ctrl+Home".action = move-column-to-first; + "Mod+Ctrl+End".action = move-column-to-last; + + "Mod+Shift+Left".action = focus-monitor-left; + "Mod+Shift+Down".action = focus-monitor-down; + "Mod+Shift+Up".action = focus-monitor-up; + "Mod+Shift+Right".action = focus-monitor-right; + + "Mod+Shift+H".action = focus-monitor-left; + "Mod+Shift+J".action = focus-monitor-down; + "Mod+Shift+K".action = focus-monitor-up; + "Mod+Shift+L".action = focus-monitor-right; + + "Mod+Shift+Ctrl+Left".action = move-column-to-monitor-left; + "Mod+Shift+Ctrl+Down".action = move-column-to-monitor-down; + "Mod+Shift+Ctrl+Up".action = move-column-to-monitor-up; + "Mod+Shift+Ctrl+Right".action = move-column-to-monitor-right; + + "Mod+Shift+Ctrl+H".action = move-column-to-monitor-left; + "Mod+Shift+Ctrl+J".action = move-column-to-monitor-down; + "Mod+Shift+Ctrl+K".action = move-column-to-monitor-up; + "Mod+Shift+Ctrl+L".action = move-column-to-monitor-right; + + "Mod+Page_Down".action = focus-workspace-down; + "Mod+Page_Up".action = focus-workspace-up; + "Mod+U".action = focus-workspace-down; + "Mod+I".action = focus-workspace-up; + + #move a window up and down workspaces + "Mod+Ctrl+Page_Down".action = move-column-to-workspace-down; + "Mod+Ctrl+Page_Up".action = move-column-to-workspace-up; + + "Mod+Ctrl+U".action = move-column-to-workspace-down; + "Mod+Ctrl+I".action = move-column-to-workspace-up; + + #does little squeeze thing into the left or right position with another window + "Mod+BracketLeft".action = consume-or-expel-window-left; + "Mod+BracketRight".action = consume-or-expel-window-right; + + "Mod+R".action = switch-preset-column-width; + "Mod+F".action = maximize-column; + "Mod+Shift+F".action = fullscreen-window; + "Mod+C".action = center-column; }; - } - { clip-to-geometry = true; } - ]; - - binds = with config.lib.niri.actions; { - # application launcher - "Mod+Space".action = spawn [ - "${pkgs.rofi-wayland}/bin/rofi" - "-show" - "combi" - ]; - - # open a terminal - "Mod+T".action = spawn "${pkgs.alacritty}/bin/alacritty"; - - # lock the screen - "Mod+X".action = spawn "${pkgs.swaylock}/bin/swaylock"; - - # screenshotting - "Print".action = screenshot; - "Ctrl+Print".action = screenshot-screen; - "Alt+Print".action = screenshot-window; - - # Volume control - "XF86AudioRaiseVolume".action = spawn [ - "${pkgs.avizo}/bin/volumectl" - "-u" - "up" - ]; - "XF86AudioLowerVolume".action = spawn [ - "${pkgs.avizo}/bin/volumectl" - "-u" - "down" - ]; - "XF86AudioMute".action = spawn [ - "${pkgs.avizo}/bin/volumectl" - "toggle-mute" - ]; - "XF86AudioMicMute".action = spawn [ - "${pkgs.avizo}/bin/volumectl" - "-m" - "toggle-mute" - ]; - - #Display Brightness control - "XF86MonBrightnessUp".action = spawn [ - "${pkgs.avizo}/bin/lightctl" - "up" - ]; - "XF86MonBrightnessDown".action = spawn [ - "${pkgs.avizo}/bin/lightctl" - "down" - ]; - - # Force close a window - "Mod+Q".action = close-window; - - "Mod+Shift+Q".action = quit; - - # bindings for like window management ig - - "Mod+Left".action = focus-column-left; - "Mod+Down".action = focus-window-down; - "Mod+Up".action = focus-window-up; - "Mod+Right".action = focus-column-right; - - "Mod+H".action = focus-column-left; - "Mod+J".action = focus-window-down; - "Mod+K".action = focus-window-up; - "Mod+L".action = focus-column-right; - - "Mod+Ctrl+Left".action = move-column-left; - "Mod+Ctrl+Down".action = move-window-down; - "Mod+Ctrl+Up".action = move-window-up; - "Mod+Ctrl+Right".action = move-column-right; - - "Mod+Ctrl+H".action = move-column-left; - "Mod+Ctrl+J".action = move-window-down; - "Mod+Ctrl+K".action = move-window-up; - "Mod+Ctrl+L".action = move-column-right; - - #fine adjustments to height and width of window - "Mod+Minus".action = set-column-width "-10%"; - "Mod+Equal".action = set-column-width "+10%"; - "Mod+Shift+Minus".action = set-window-height "-10%"; - "Mod+Shift+Equal".action = set-window-height "+10%"; - - "Mod+Home".action = focus-column-first; - "Mod+End".action = focus-column-last; - "Mod+Ctrl+Home".action = move-column-to-first; - "Mod+Ctrl+End".action = move-column-to-last; - - "Mod+Shift+Left".action = focus-monitor-left; - "Mod+Shift+Down".action = focus-monitor-down; - "Mod+Shift+Up".action = focus-monitor-up; - "Mod+Shift+Right".action = focus-monitor-right; - - "Mod+Shift+H".action = focus-monitor-left; - "Mod+Shift+J".action = focus-monitor-down; - "Mod+Shift+K".action = focus-monitor-up; - "Mod+Shift+L".action = focus-monitor-right; - - "Mod+Shift+Ctrl+Left".action = move-column-to-monitor-left; - "Mod+Shift+Ctrl+Down".action = move-column-to-monitor-down; - "Mod+Shift+Ctrl+Up".action = move-column-to-monitor-up; - "Mod+Shift+Ctrl+Right".action = move-column-to-monitor-right; - - "Mod+Shift+Ctrl+H".action = move-column-to-monitor-left; - "Mod+Shift+Ctrl+J".action = move-column-to-monitor-down; - "Mod+Shift+Ctrl+K".action = move-column-to-monitor-up; - "Mod+Shift+Ctrl+L".action = move-column-to-monitor-right; - - "Mod+Page_Down".action = focus-workspace-down; - "Mod+Page_Up".action = focus-workspace-up; - "Mod+U".action = focus-workspace-down; - "Mod+I".action = focus-workspace-up; - - #move a window up and down workspaces - "Mod+Ctrl+Page_Down".action = move-column-to-workspace-down; - "Mod+Ctrl+Page_Up".action = move-column-to-workspace-up; - - "Mod+Ctrl+U".action = move-column-to-workspace-down; - "Mod+Ctrl+I".action = move-column-to-workspace-up; - - #does little squeeze thing into the left or right position with another window - "Mod+BracketLeft".action = consume-or-expel-window-left; - "Mod+BracketRight".action = consume-or-expel-window-right; - - "Mod+R".action = switch-preset-column-width; - "Mod+F".action = maximize-column; - "Mod+Shift+F".action = fullscreen-window; - "Mod+C".action = center-column; + }; }; } diff --git a/home-manager/system-mreow.nix b/home-manager/system-mreow.nix index 08c9efa..18be137 100644 --- a/home-manager/system-mreow.nix +++ b/home-manager/system-mreow.nix @@ -6,7 +6,10 @@ ... }: { - imports = [ ./gui.nix ]; + imports = [ + ./gui.nix + ./progs/niri.nix + ]; home.packages = with pkgs; [ wdisplays @@ -16,7 +19,7 @@ # manage bluetooth devices blueman - niri + xwayland-satellite-unstable ]; # bluetooth manager @@ -28,11 +31,6 @@ package = pkgs.dunst; }; - # window manager - programs.niri = { - settings = import ./progs/niri.nix { inherit config pkgs homeDirectory; }; - }; - programs.swaylock = { enable = true; settings = import ./progs/swaylock.nix; From ab73dc26b240b44478c75765555a8921338ad435 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 18 Oct 2024 00:01:44 -0400 Subject: [PATCH 045/724] fixes --- home-manager/progs/niri.nix | 4 ++++ home-manager/system-mreow.nix | 2 ++ 2 files changed, 6 insertions(+) diff --git a/home-manager/progs/niri.nix b/home-manager/progs/niri.nix index ddb77c5..fcee89f 100644 --- a/home-manager/progs/niri.nix +++ b/home-manager/progs/niri.nix @@ -10,6 +10,10 @@ settings = { prefer-no-csd = true; + environment = { + DISPLAY = ":0"; + }; + spawn-at-startup = [ # waybar { command = [ "${pkgs.waybar}/bin/waybar" ]; } diff --git a/home-manager/system-mreow.nix b/home-manager/system-mreow.nix index 18be137..99ae2ba 100644 --- a/home-manager/system-mreow.nix +++ b/home-manager/system-mreow.nix @@ -20,6 +20,8 @@ blueman xwayland-satellite-unstable + + config.programs.niri.package ]; # bluetooth manager From c2754f9d7e7498e5e3e254d3adc10f287ccefffd Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 18 Oct 2024 10:34:25 -0400 Subject: [PATCH 046/724] trim signal backup --- home-manager/progs/borg.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/home-manager/progs/borg.nix b/home-manager/progs/borg.nix index c95e544..e0a7caa 100644 --- a/home-manager/progs/borg.nix +++ b/home-manager/progs/borg.nix @@ -7,7 +7,6 @@ map (f: "${homeDirectory}/${f}") [ ".zen" ".local/share/fish" - ".config/Signal" ".wallpaper.png" ".ssh" @@ -17,6 +16,19 @@ "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; From a5981be9172235c20fc9dc1177734323cc3c2d7a Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 18 Oct 2024 10:34:38 -0400 Subject: [PATCH 047/724] steam changes --- etcnixos/flake.lock | 8 ++++---- etcnixos/flake.nix | 10 ++++------ home-manager/flake.lock | 18 +++++++++--------- home-manager/progs/niri.nix | 7 ++++++- home-manager/system-mreow.nix | 3 +-- 5 files changed, 24 insertions(+), 22 deletions(-) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 584b769..31d757f 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -303,16 +303,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728888510, - "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", + "lastModified": 1729251725, + "narHash": "sha256-KmIA2i7s3jcVQWgUt6wqY9/5DkIp9uxsVhcwUxSnKHY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", + "rev": "babe2c97edf3750d3924c1c5eaa1fe94ac94e8d8", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "master", "repo": "nixpkgs", "type": "github" } diff --git a/etcnixos/flake.nix b/etcnixos/flake.nix index 75772fb..d8c03c5 100644 --- a/etcnixos/flake.nix +++ b/etcnixos/flake.nix @@ -2,7 +2,9 @@ description = "A simple NixOS flake"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + # nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/master"; + lanzaboote = { url = "github:nix-community/lanzaboote"; inputs.nixpkgs.follows = "nixpkgs"; @@ -38,16 +40,12 @@ hostname = nixpkgs.lib.strings.removeSuffix "\n" (builtins.readFile /etc/hostname); system = "x86_64-linux"; - # pkgs = import nixpkgs { - # config.replaceStdenv = { pkgs }: pkgs.clangStdenv; - # }; pkgs = import nixpkgs { config.allowUnfreePredicate = pkg: builtins.elem (nixpkgs.lib.getName pkg) [ + "steam-unwrapped" "steam" - "steam-original" - "steam-run" ]; }; in diff --git a/home-manager/flake.lock b/home-manager/flake.lock index fab84f3..49f9f6e 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -72,11 +72,11 @@ ] }, "locked": { - "lastModified": 1729174520, - "narHash": "sha256-QxCAdgQdeIOaCiE0Sr23s9lD0+T1b/wuz5pSiGwNrCQ=", + "lastModified": 1729260213, + "narHash": "sha256-jAvHoU/1y/yCuXzr2fNF+q6uKmr8Jj2xgAisK4QB9to=", "owner": "nix-community", "repo": "home-manager", - "rev": "e78cbb20276f09c1802e62d2f77fc93ec32da268", + "rev": "09a0c0c02953318bf94425738c7061ffdc4cba75", "type": "github" }, "original": { @@ -98,11 +98,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1729189676, - "narHash": "sha256-oTvN+vxzOW+zzkmSnRUtItzismkOL+Z5kAU26Tf2HSE=", + "lastModified": 1729237583, + "narHash": "sha256-DmbzRBqTP+LIzyPkle92bN83GOjO02pPxW0OAL6yTsI=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "c547a861a5f968b0b783de5dbfad159303c6c19a", + "rev": "1ca158ad24664a2608d9fe5f6627274bb7c6e939", "type": "github" }, "original": { @@ -131,11 +131,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1729144746, - "narHash": "sha256-Ocq+8Kc4gp8PLPziHkMZN0F+HuCS9mbxusJHtFdKoP8=", + "lastModified": 1729235169, + "narHash": "sha256-SPlS9YtGRWUjZZZRXlimHbSho+0hfrqGycErlI9XVXk=", "owner": "YaLTeR", "repo": "niri", - "rev": "8d08782eba427a46607a478d088744d023a292c3", + "rev": "dd8b2be044c6c67a1c9bf07f287b3967e958b8aa", "type": "github" }, "original": { diff --git a/home-manager/progs/niri.nix b/home-manager/progs/niri.nix index fcee89f..63aec80 100644 --- a/home-manager/progs/niri.nix +++ b/home-manager/progs/niri.nix @@ -29,7 +29,12 @@ ]; } - { command = [ "${pkgs.xwayland-satellite-unstable}/bin/xwayland-satellite" ]; } + { + command = [ + "${pkgs.xwayland-satellite-unstable}/bin/xwayland-satellite" + (builtins.toString config.programs.niri.settings.environment.DISPLAY) + ]; + } ]; window-rules = [ diff --git a/home-manager/system-mreow.nix b/home-manager/system-mreow.nix index 99ae2ba..98d28a3 100644 --- a/home-manager/system-mreow.nix +++ b/home-manager/system-mreow.nix @@ -19,8 +19,7 @@ # manage bluetooth devices blueman - xwayland-satellite-unstable - + # used by /etc/nixos logic to launch niri config.programs.niri.package ]; From eb7113f1e6feeec81b2196211f61b32d30b40b53 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 19 Oct 2024 12:58:04 -0400 Subject: [PATCH 048/724] fix justfile --- justfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/justfile b/justfile index a52d954..a175a0e 100644 --- a/justfile +++ b/justfile @@ -7,11 +7,11 @@ format_system: doas nixfmt /etc/nixos system_update: - doas nix flake update /etc/nixos + doas nix flake update --flake /etc/nixos doas nixos-rebuild boot --impure home_update: - nix flake update ~/.config/home-manager + nix flake update --flake ~/.config/home-manager rm -fr ~/.gtkrc-2.0 home-manager switch --impure From 4ae334d6acfd898ed12e7d88dd12d89bb0edf105 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 19 Oct 2024 21:36:47 -0400 Subject: [PATCH 049/724] stuff --- etcnixos/common.nix | 1 + etcnixos/flake.lock | 24 +++++++-------- etcnixos/system-mreow.nix | 9 ++++++ home-manager/flake.lock | 42 +++++++++++++------------- home-manager/progs/fish.nix | 2 ++ home-manager/progs/gpt4all/gpt4all.nix | 18 +++++------ home-manager/progs/niri.nix | 23 +++++++++----- home-manager/system-nixos.nix | 1 - 8 files changed, 69 insertions(+), 51 deletions(-) diff --git a/etcnixos/common.nix b/etcnixos/common.nix index 0f45292..82cc7bf 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -184,6 +184,7 @@ 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 diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 31d757f..e547165 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -49,11 +49,11 @@ ] }, "locked": { - "lastModified": 1729092978, - "narHash": "sha256-2SMJFFgKSvrQfkfzdcYjwFGvgeoCtDdbl/CGZNIU7hs=", + "lastModified": 1729348269, + "narHash": "sha256-KCjrPNlEgEVFYs8wHIpd4iBelAV9L9QYsynoMYihIFw=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "9af42c96e8d666f1df2b087aba1a6349f1c22f4e", + "rev": "528723447ef037a1c081add43f4fd46440c9c3b1", "type": "github" }, "original": { @@ -202,11 +202,11 @@ ] }, "locked": { - "lastModified": 1728903686, - "narHash": "sha256-ZHFrGNWDDriZ4m8CA/5kDa250SG1LiiLPApv1p/JF0o=", + "lastModified": 1729027341, + "narHash": "sha256-IqWD7bA9iJVifvJlB4vs2KUXVhN+d9lECWdNB4jJ0tE=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1aec543f5caf643ca0d94b6a633101942fd065f", + "rev": "2a4fd1cfd8ed5648583dadef86966a8231024221", "type": "github" }, "original": { @@ -287,11 +287,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1728729581, - "narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=", + "lastModified": 1729333370, + "narHash": "sha256-NU+tYe3QWzDNpB8RagpqR3hNQXn4BNuBd7ZGosMHLL8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806", + "rev": "38279034170b1e2929b2be33bdaedbf14a57bfeb", "type": "github" }, "original": { @@ -303,11 +303,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729251725, - "narHash": "sha256-KmIA2i7s3jcVQWgUt6wqY9/5DkIp9uxsVhcwUxSnKHY=", + "lastModified": 1729381852, + "narHash": "sha256-Tl9738VMXlVjv7EVq3znrsodyUy0w1ekD0wsouzDybg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "babe2c97edf3750d3924c1c5eaa1fe94ac94e8d8", + "rev": "75d8eea61e93c46fed1919f9ec798b7911378b22", "type": "github" }, "original": { diff --git a/etcnixos/system-mreow.nix b/etcnixos/system-mreow.nix index 8f81cab..efa9508 100644 --- a/etcnixos/system-mreow.nix +++ b/etcnixos/system-mreow.nix @@ -77,6 +77,15 @@ ]; }; + programs.gamescope = { + enable = true; + capSysNice = true; + }; + programs.steam = { + enable = true; + gamescopeSession.enable = true; + }; + # this is a life saver. # literally no documentation about this anywhere. # might be good to write about this... diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 49f9f6e..c964c67 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -72,11 +72,11 @@ ] }, "locked": { - "lastModified": 1729260213, - "narHash": "sha256-jAvHoU/1y/yCuXzr2fNF+q6uKmr8Jj2xgAisK4QB9to=", + "lastModified": 1729321331, + "narHash": "sha256-KVyQq+ez/oB30/WbdNgVD8g/bda34z8NiU187QKQb74=", "owner": "nix-community", "repo": "home-manager", - "rev": "09a0c0c02953318bf94425738c7061ffdc4cba75", + "rev": "122f70545b29ccb922e655b08acfe05bfb44ec68", "type": "github" }, "original": { @@ -98,11 +98,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1729237583, - "narHash": "sha256-DmbzRBqTP+LIzyPkle92bN83GOjO02pPxW0OAL6yTsI=", + "lastModified": 1729334880, + "narHash": "sha256-HUdIqrv4/s0bohHYtCHl44bJwyL1TMN1kzk+93oSAm8=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "1ca158ad24664a2608d9fe5f6627274bb7c6e939", + "rev": "28881a002ab986bd107c06cdc4b5df98bad29f7f", "type": "github" }, "original": { @@ -131,11 +131,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1729235169, - "narHash": "sha256-SPlS9YtGRWUjZZZRXlimHbSho+0hfrqGycErlI9XVXk=", + "lastModified": 1729330424, + "narHash": "sha256-fEev4uBYKTdFACj3zGmMniNV8IbzfoJ+LqZz2eWQWcw=", "owner": "YaLTeR", "repo": "niri", - "rev": "dd8b2be044c6c67a1c9bf07f287b3967e958b8aa", + "rev": "10f04fd19de3bc2951d42411c237c8b963e6c816", "type": "github" }, "original": { @@ -146,11 +146,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728888510, - "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", + "lastModified": 1729256560, + "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", + "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", "type": "github" }, "original": { @@ -174,11 +174,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1729044727, - "narHash": "sha256-GKJjtPY+SXfLF/yTN7M2cAnQB6RERFKnQhD8UvPSf3M=", + "lastModified": 1729181673, + "narHash": "sha256-LDiPhQ3l+fBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dc2e0028d274394f73653c7c90cc63edbb696be1", + "rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3", "type": "github" }, "original": { @@ -205,11 +205,11 @@ ] }, "locked": { - "lastModified": 1729218602, - "narHash": "sha256-KDmYxpkFWa0Go0WnOpkgQOypVaQxbwgpEutET5ey1VQ=", + "lastModified": 1729304879, + "narHash": "sha256-H7KGGJUU9BcDNnfXiATBGgs6FJKWQdfftNJS+/v2aMU=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "9051466c82b9b3a6ba9e06be99621ad25423ec94", + "rev": "b259ef799b5ac014604da71ecd92d4a52603ed2d", "type": "github" }, "original": { @@ -268,11 +268,11 @@ }, "zen-browser": { "locked": { - "lastModified": 1729025440, - "narHash": "sha256-DUhI5F7bOf5x5q5dpBdLZOnFNi3My/ucqkJQ5j1FFjg=", + "lastModified": 1729379018, + "narHash": "sha256-lyGz9ul5QzJ40tUNXlHyvVowz3tbCgUPdfoi6ogq+DY=", "owner": "matthewpi", "repo": "nixpkgs", - "rev": "98eabdf0903f10fc768aebcbe356cd1621bcee8b", + "rev": "d607bf5d03a31601893680192c85eec359649ea2", "type": "github" }, "original": { diff --git a/home-manager/progs/fish.nix b/home-manager/progs/fish.nix index dc8ba6c..4149a6a 100644 --- a/home-manager/progs/fish.nix +++ b/home-manager/progs/fish.nix @@ -48,6 +48,8 @@ in gcc-native = "${pkgs.gcc}/bin/gcc -Q --help=target -mtune=native -march=native | ${pkgs.gnugrep}/bin/grep -E '^\\s+\-(mtune|march)=' | ${coreutils}/tr -d '[:blank:]'"; chess = "${pkgs.chess-tui}/bin/chess-tui -e ${pkgs.stockfish}/bin/stockfish"; + + run-steam = "gamescope --backend sdl -W 2256 -H 1504 -f --steam -- steam -tenfoot -pipewire-dmabuf"; }; shellInit = '' diff --git a/home-manager/progs/gpt4all/gpt4all.nix b/home-manager/progs/gpt4all/gpt4all.nix index f29ec41..13efc73 100644 --- a/home-manager/progs/gpt4all/gpt4all.nix +++ b/home-manager/progs/gpt4all/gpt4all.nix @@ -6,15 +6,6 @@ }: let models = [ - { - name = "Rombos-LLM-V2.6-Qwen-14b.IQ4_XS.gguf"; - context_length = "32768"; - gen_length = "8192"; - source = pkgs.fetchurl { - url = "https://huggingface.co/mradermacher/Rombos-LLM-V2.6-Qwen-14b-GGUF/resolve/main/Rombos-LLM-V2.6-Qwen-14b.IQ4_XS.gguf?download=true"; - sha256 = "InSndYkZx6pZux1SWn/pjQUc0tvUigjsw+JdXc3Dsdg="; - }; - } { name = "Qwen2.5-14B-Instruct-IQ4_XS.gguf"; context_length = "32768"; @@ -24,6 +15,15 @@ let sha256 = "+AHt49no0qQ48MoNsqGJV4FeJ3Cf2hSZqTMjNUIHaO4="; }; } + { + name = "Qwen2.5-32B-Instruct-IQ4_XS.gguf"; + context_length = "32768"; + gen_length = "8192"; + source = pkgs.fetchurl { + url = "https://huggingface.co/bartowski/Qwen2.5-32B-Instruct-GGUF/resolve/main/Qwen2.5-32B-Instruct-IQ4_XS.gguf?download=true"; + sha256 = "iY14/8GApfYc5c0fTABsDO/X5/cxBpnbUbiUTcvzJQ4="; + }; + } ]; gpt4all_package = ( diff --git a/home-manager/progs/niri.nix b/home-manager/progs/niri.nix index 63aec80..15524e3 100644 --- a/home-manager/progs/niri.nix +++ b/home-manager/progs/niri.nix @@ -10,8 +10,14 @@ settings = { prefer-no-csd = true; - environment = { - DISPLAY = ":0"; + # environment = { + # DISPLAY = ":0"; + # }; + + outputs = { + "BOE 0x095F Unknown" = { + scale = 1.5; + }; }; spawn-at-startup = [ @@ -29,12 +35,13 @@ ]; } - { - command = [ - "${pkgs.xwayland-satellite-unstable}/bin/xwayland-satellite" - (builtins.toString config.programs.niri.settings.environment.DISPLAY) - ]; - } + # { + # command = [ + # "${pkgs.xwayland-satellite-unstable}/bin/xwayland-satellite" + # # (builtins.toString config.programs.niri.settings.environment.DISPLAY) + # ":0" + # ]; + # } ]; window-rules = [ diff --git a/home-manager/system-nixos.nix b/home-manager/system-nixos.nix index 607261a..d7483cb 100644 --- a/home-manager/system-nixos.nix +++ b/home-manager/system-nixos.nix @@ -10,7 +10,6 @@ home.packages = with pkgs; [ protontricks beatsabermodmanager - protonup-qt ]; programs.alacritty.settings = { From 06ce071e46f16f3f584a3909c3f4888fbf04cce4 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 20 Oct 2024 01:59:18 -0400 Subject: [PATCH 050/724] desktop: fixes and move from ALVR to WiVRn --- etcnixos/flake.lock | 42 +++++++++++++++++------------------ etcnixos/flake.nix | 2 +- etcnixos/system-nixos.nix | 30 ++++++++++++++++++++----- home-manager/flake.lock | 6 ++--- home-manager/system-nixos.nix | 23 +++++++++++++++++++ 5 files changed, 72 insertions(+), 31 deletions(-) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index e547165..e620779 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -23,22 +23,6 @@ "type": "github" } }, - "alvr": { - "locked": { - "lastModified": 1727023213, - "narHash": "sha256-KPghRPcTbqCMktw9ahrtiq7a/seajAyLkEI2GS1x+sg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "7c2572e5cf4329ad9fa50d33015aa7be394b4026", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "pull/308097/head", - "repo": "nixpkgs", - "type": "github" - } - }, "chaotic": { "inputs": { "flake-schemas": "flake-schemas", @@ -303,11 +287,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729381852, - "narHash": "sha256-Tl9738VMXlVjv7EVq3znrsodyUy0w1ekD0wsouzDybg=", + "lastModified": 1729403505, + "narHash": "sha256-1ILT9fxCbNQuToPWBhxC3N+hblIWW3WlEHnwcdoCBHE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "75d8eea61e93c46fed1919f9ec798b7911378b22", + "rev": "88d3f02d308cb29a07942d24539f960721a20fe0", "type": "github" }, "original": { @@ -363,11 +347,11 @@ "root": { "inputs": { "agenix": "agenix", - "alvr": "alvr", "chaotic": "chaotic", "lanzaboote": "lanzaboote", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "wivrn": "wivrn" } }, "rust-overlay": { @@ -405,6 +389,22 @@ "repo": "default", "type": "github" } + }, + "wivrn": { + "locked": { + "lastModified": 1729402130, + "narHash": "sha256-V9ZdbZ2iFVsN2AF/aJmSiRDp9rU5HYeQX+1NBYcKJzQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a2922fae7ea92ee5c3ddb5999ee1997c699d87f8", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "pull/349910/head", + "repo": "nixpkgs", + "type": "github" + } } }, "root": "root", diff --git a/etcnixos/flake.nix b/etcnixos/flake.nix index d8c03c5..0fded00 100644 --- a/etcnixos/flake.nix +++ b/etcnixos/flake.nix @@ -12,7 +12,7 @@ nixos-hardware.url = "github:NixOS/nixos-hardware/master"; - alvr.url = "github:NixOS/nixpkgs/pull/308097/head"; + wivrn.url = "github:NixOS/nixpkgs/pull/349910/head"; chaotic = { url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; diff --git a/etcnixos/system-nixos.nix b/etcnixos/system-nixos.nix index 021fc6c..171c3ef 100644 --- a/etcnixos/system-nixos.nix +++ b/etcnixos/system-nixos.nix @@ -38,7 +38,7 @@ "amdgpu.ppfeaturemask=0xFFF7FFFF" ]; - initrd.availableKernelModules = [ + kernelModules = [ # kernel module for case fan control "nct6775" ]; @@ -53,7 +53,7 @@ services.displayManager.autoLogin = { enable = true; - user = "yourusername"; + user = "primary"; }; services.openssh = { @@ -94,16 +94,35 @@ services.udev.packages = [ pkgs.openrgb ]; hardware.i2c.enable = true; - #System packages + # System packages environment.systemPackages = with pkgs; [ openrgb-with-all-plugins lact ]; - programs.alvr = { + services.wivrn = { enable = true; - package = inputs.alvr.legacyPackages.${pkgs.system}.alvr; openFirewall = true; + package = inputs.wivrn.legacyPackages.${pkgs.system}.wivrn; + defaultRuntime = true; + autoStart = true; + config = { + enable = true; + json = { + scale = 1.0; + bitrate = 100000000; + encoders = [ + { + encoder = "vaapi"; + codec = "h265"; + width = 1.0; + height = 1.0; + offset_x = 0.0; + offset_y = 0.0; + } + ]; + }; + }; }; programs.steam = { @@ -143,7 +162,6 @@ gpu_path = "/sys/devices/pci0000:00/0000:00:03.1/0000:09:00.0/0000:0a:00.0/0000:0b:00.0/${select_hwmon}"; mobo_path = "/sys/devices/platform/nct6775.656/${select_hwmon}"; fan_speed = "${mobo_path}/pwm4"; - in '' INTERVAL=10 diff --git a/home-manager/flake.lock b/home-manager/flake.lock index c964c67..e33cacb 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -205,11 +205,11 @@ ] }, "locked": { - "lastModified": 1729304879, - "narHash": "sha256-H7KGGJUU9BcDNnfXiATBGgs6FJKWQdfftNJS+/v2aMU=", + "lastModified": 1729391507, + "narHash": "sha256-as0I9xieJUHf7kiK2a9znDsVZQTFWhM1pLivII43Gi0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "b259ef799b5ac014604da71ecd92d4a52603ed2d", + "rev": "784981a9feeba406de38c1c9a3decf966d853cca", "type": "github" }, "original": { diff --git a/home-manager/system-nixos.nix b/home-manager/system-nixos.nix index d7483cb..138de80 100644 --- a/home-manager/system-nixos.nix +++ b/home-manager/system-nixos.nix @@ -2,6 +2,7 @@ pkgs, inputs, lib, + config, ... }: { @@ -25,4 +26,26 @@ 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 + } + ''; + } From 2e4880a5f757d7b5875c6db3158896219ac81cb1 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 20 Oct 2024 02:08:04 -0400 Subject: [PATCH 051/724] cleanup --- etcnixos/common.nix | 7 ++- etcnixos/no-rgb.nix | 33 ++++++++++++++ etcnixos/system-mreow.nix | 1 - etcnixos/system-nixos.nix | 96 ++------------------------------------- etcnixos/vr.nix | 35 ++++++++++++++ 5 files changed, 79 insertions(+), 93 deletions(-) create mode 100644 etcnixos/no-rgb.nix create mode 100644 etcnixos/vr.nix diff --git a/etcnixos/common.nix b/etcnixos/common.nix index 82cc7bf..8d70714 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -9,7 +9,12 @@ ... }: { - imports = [ ./declarative-nm.nix ]; + imports = [ + ./declarative-nm.nix + + inputs.nixos-hardware.nixosModules.common-pc-ssd + + ]; nix = { #garbage collection and cleanup stuff diff --git a/etcnixos/no-rgb.nix b/etcnixos/no-rgb.nix new file mode 100644 index 0000000..e3368f2 --- /dev/null +++ b/etcnixos/no-rgb.nix @@ -0,0 +1,33 @@ +{ pkgs, ... }: +{ + systemd.services.no-rgb = + let + no-rgb = pkgs.writeScriptBin "no-rgb" '' + #!/bin/sh + set -e + + NUM_DEVICES=$(${pkgs.openrgb}/bin/openrgb --noautoconnect --list-devices | ${pkgs.gnugrep}/bin/grep -E '^[0-9]+: ' | ${pkgs.coreutils}/bin/wc -l) + + for i in $(${pkgs.coreutils}/bin/seq 0 $(($NUM_DEVICES - 1))); do + ${pkgs.openrgb}/bin/openrgb --noautoconnect --device $i --mode direct --color 000000 + done + ''; + in + { + description = "disable rgb"; + serviceConfig = { + ExecStart = "${no-rgb}/bin/no-rgb"; + Type = "oneshot"; + }; + wantedBy = [ "multi-user.target" ]; + }; + + services.hardware.openrgb.enable = true; + services.udev.packages = [ pkgs.openrgb ]; + hardware.i2c.enable = true; + + environment.systemPackages = with pkgs; [ + openrgb-with-all-plugins + ]; + +} diff --git a/etcnixos/system-mreow.nix b/etcnixos/system-mreow.nix index efa9508..0f102c8 100644 --- a/etcnixos/system-mreow.nix +++ b/etcnixos/system-mreow.nix @@ -3,7 +3,6 @@ pkgs, lib, username, - system, inputs, ... }: diff --git a/etcnixos/system-nixos.nix b/etcnixos/system-nixos.nix index 171c3ef..bebf5c7 100644 --- a/etcnixos/system-nixos.nix +++ b/etcnixos/system-nixos.nix @@ -3,8 +3,6 @@ pkgs, lib, username, - system, - cpu_arch, inputs, ... }: @@ -12,27 +10,17 @@ 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 - inputs.nixos-hardware.nixosModules.common-pc-ssd ]; boot = { # kernelPackages = lib.mkForce pkgs.linuxPackages_6_10; # supportedFilesystems = [ "zfs" ]; - kernelPatches = [ - # for making ALVR support better :) - { - name = "amdgpu-ignore-ctx-privileges"; - patch = pkgs.fetchpatch { - name = "cap_sys_nice_begone.patch"; - url = "https://github.com/Frogging-Family/community-patches/raw/master/linux61-tkg/cap_sys_nice_begone.mypatch"; - sha256 = "Y3a0+x2xvHsfLax/uwycdJf3xLxvVfkfDVqjkxNaYEo="; - }; - } - ]; kernelParams = [ # allow overclocking (I actually underclock but lol) "amdgpu.ppfeaturemask=0xFFF7FFFF" @@ -68,87 +56,13 @@ }; }; - systemd.services.no-rgb = - let - no-rgb = pkgs.writeScriptBin "no-rgb" '' - #!/bin/sh - set -e - - NUM_DEVICES=$(${pkgs.openrgb}/bin/openrgb --noautoconnect --list-devices | ${pkgs.gnugrep}/bin/grep -E '^[0-9]+: ' | ${pkgs.coreutils}/bin/wc -l) - - for i in $(${pkgs.coreutils}/bin/seq 0 $(($NUM_DEVICES - 1))); do - ${pkgs.openrgb}/bin/openrgb --noautoconnect --device $i --mode direct --color 000000 - done - ''; - in - { - description = "disable rgb"; - serviceConfig = { - ExecStart = "${no-rgb}/bin/no-rgb"; - Type = "oneshot"; - }; - wantedBy = [ "multi-user.target" ]; - }; - - services.hardware.openrgb.enable = true; - services.udev.packages = [ pkgs.openrgb ]; - hardware.i2c.enable = true; - - # System packages - environment.systemPackages = with pkgs; [ - openrgb-with-all-plugins - lact - ]; - - services.wivrn = { - enable = true; - openFirewall = true; - package = inputs.wivrn.legacyPackages.${pkgs.system}.wivrn; - defaultRuntime = true; - autoStart = true; - config = { - enable = true; - json = { - scale = 1.0; - bitrate = 100000000; - encoders = [ - { - encoder = "vaapi"; - codec = "h265"; - width = 1.0; - height = 1.0; - offset_x = 0.0; - offset_y = 0.0; - } - ]; - }; - }; - }; - programs.steam = { remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play }; - # services.ollama = { - # enable = true; - # acceleration = "rocm"; - # environmentVariables = { - # HCC_AMDGPU_TARGET = "gfx1031"; # used to be necessary, but doesn't seem to anymore - # }; - # rocmOverrideGfx = "10.3.1"; - # }; - - # services.open-webui = { - # enable = true; - # openFirewall = true; - # port = 8082; - # environment = { - # # Disable authentication - # WEBUI_AUTH = "False"; - # PYDANTIC_SKIP_VALIDATING_CORE_SCHEMAS = "True"; - # }; - # }; - + environment.systemPackages = with pkgs; [ + lact + ]; systemd.packages = with pkgs; [ lact ]; systemd.services.lactd.wantedBy = [ "multi-user.target" ]; diff --git a/etcnixos/vr.nix b/etcnixos/vr.nix new file mode 100644 index 0000000..70bb4b5 --- /dev/null +++ b/etcnixos/vr.nix @@ -0,0 +1,35 @@ +{ pkgs, inputs, ... }: +{ + services.wivrn = { + enable = true; + openFirewall = true; + + # Use my fork for WiVRn 0.20 + package = inputs.wivrn.legacyPackages.${pkgs.system}.wivrn; + + # Executing it through the systemd service executes WiVRn w/ CAP_SYS_NICE + # Resulting in no stutters! + defaultRuntime = true; + autoStart = true; + + # Config for WiVRn + config = { + enable = true; + json = { + scale = 1.0; + # 100 Mb/s + bitrate = 100000000; + encoders = [ + { + encoder = "vaapi"; + codec = "h265"; + width = 1.0; + height = 1.0; + offset_x = 0.0; + offset_y = 0.0; + } + ]; + }; + }; + }; +} From 98742a9b2e8fac2c417d15c06bf533dac56ea1f7 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 20 Oct 2024 02:21:24 -0400 Subject: [PATCH 052/724] vr: organize --- etcnixos/vr.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/etcnixos/vr.nix b/etcnixos/vr.nix index 70bb4b5..069d009 100644 --- a/etcnixos/vr.nix +++ b/etcnixos/vr.nix @@ -7,15 +7,19 @@ # Use my fork for WiVRn 0.20 package = inputs.wivrn.legacyPackages.${pkgs.system}.wivrn; + # Write information to /etc/xdg/openxr/1/active_runtime.json, VR applications + # will automatically read this and work with wivrn + defaultRuntime = true; + # Executing it through the systemd service executes WiVRn w/ CAP_SYS_NICE # Resulting in no stutters! - defaultRuntime = true; autoStart = true; # Config for WiVRn config = { enable = true; json = { + # 1.0x display scaling scale = 1.0; # 100 Mb/s bitrate = 100000000; @@ -23,6 +27,7 @@ { encoder = "vaapi"; codec = "h265"; + # 1.0 x 1.0 scaling width = 1.0; height = 1.0; offset_x = 0.0; From 32749c6878af05d1092e8a2f377fc055d13d8557 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 20 Oct 2024 02:48:04 -0400 Subject: [PATCH 053/724] cleanup --- etcnixos/common.nix | 47 +++++++++++++++++---------------------- etcnixos/flake.lock | 4 ++-- etcnixos/networking.nix | 4 ++-- etcnixos/system-mreow.nix | 1 - etcnixos/system-nixos.nix | 20 ++++++++--------- 5 files changed, 34 insertions(+), 42 deletions(-) diff --git a/etcnixos/common.nix b/etcnixos/common.nix index 8d70714..778a456 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -13,37 +13,32 @@ ./declarative-nm.nix inputs.nixos-hardware.nixosModules.common-pc-ssd - ]; nix = { - #garbage collection and cleanup stuff + # garbage collection and cleanup stuff gc = { automatic = true; dates = "weekly"; options = "--delete-older-than 7d"; }; - #optimize the store + # optimize the store optimise.automatic = true; - #enable flakes! + # enable flakes! settings.experimental-features = [ "nix-command" "flakes" ]; }; - #kernel options + # kernel options boot = { kernelPackages = pkgs.linuxPackages_cachyos-lto; kernel.sysctl = { - #for profiling - "kernel.perf_event_paranoid" = 1; - "kernel.kptr_restrict" = 0; - - #dmesg shushhhhh + # dmesg shushhhhh "kernel.printk" = "2 4 1 7"; }; @@ -61,18 +56,18 @@ }; environment.etc = { - #override default nixos /etc/issue + # override default nixos /etc/issue "issue".text = ""; }; services = { - #fwupd for updating firmware + # fwupd for updating firmware fwupd = { enable = true; extraRemotes = [ "lvfs-testing" ]; }; - #auto detect network printers + # auto detect network printers avahi = { enable = true; nssmdns4 = true; @@ -85,10 +80,10 @@ drivers = with pkgs; [ hplip ]; }; - #disable fprintd (doesn't compile, idk) + # disable fprintd (doesn't compile, idk) fprintd.enable = false; - #Making sure mullvad works on boot + # Making sure mullvad works on boot mullvad-vpn.enable = true; }; @@ -96,7 +91,7 @@ time.timeZone = "America/New_York"; security = { - #lets use doas and not sudo! + # lets use doas and not sudo! doas.enable = true; sudo.enable = false; # Configure doas @@ -111,12 +106,7 @@ age.identityPaths = [ "/home/${username}/.ssh/id_ed25519" ]; - age.secrets.primary-password = { - file = ./secrets/primary-password.age; - path = "/etc/secrets/primary-password"; - }; - - #networking + # networking networking = import ./networking.nix { inherit hostname; }; # Select internationalisation properties. @@ -139,11 +129,11 @@ enable = true; powerOnBoot = true; - #Enable experimental features for battery % of bluetooth devices + # Enable experimental features for battery % of bluetooth devices settings.General.Experimental = true; }; - #apply gtk themes by enabling dconf + # Apply gtk themes by enabling dconf programs.dconf.enable = true; # Enable sound with pipewire. @@ -154,8 +144,11 @@ alsa.enable = true; alsa.support32Bit = true; pulse.enable = true; - # If you want to use JACK applications, uncomment this - # jack.enable = true; + }; + + age.secrets.primary-password = { + file = ./secrets/primary-password.age; + path = "/etc/secrets/primary-password"; }; # Define my user account (the rest of the configuration if found in `~/.config/home-manager/...`) @@ -192,7 +185,7 @@ extraCompatPackages = with pkgs; [ proton-ge-bin ]; }; - #System packages + # System packages environment.systemPackages = with pkgs; [ mullvad-vpn diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index e620779..607f9a8 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -392,11 +392,11 @@ }, "wivrn": { "locked": { - "lastModified": 1729402130, + "lastModified": 1729405003, "narHash": "sha256-V9ZdbZ2iFVsN2AF/aJmSiRDp9rU5HYeQX+1NBYcKJzQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a2922fae7ea92ee5c3ddb5999ee1997c699d87f8", + "rev": "414c84c95aab19cb7dc603f0139d6dea2bc9f053", "type": "github" }, "original": { diff --git a/etcnixos/networking.nix b/etcnixos/networking.nix index 6cf27b9..4d52c15 100644 --- a/etcnixos/networking.nix +++ b/etcnixos/networking.nix @@ -2,14 +2,14 @@ { hostName = hostname; - hostId = "cfe0ff46"; - networkmanager = { enable = true; + insertNameservers = [ "1.1.1.1" "9.9.9.9" ]; + wifi = { scanRandMacAddress = true; }; diff --git a/etcnixos/system-mreow.nix b/etcnixos/system-mreow.nix index 0f102c8..aa00cec 100644 --- a/etcnixos/system-mreow.nix +++ b/etcnixos/system-mreow.nix @@ -12,7 +12,6 @@ ./hardware_laptop.nix inputs.nixos-hardware.nixosModules.framework-12th-gen-intel - inputs.nixos-hardware.nixosModules.common-pc-ssd inputs.lanzaboote.nixosModules.lanzaboote ]; diff --git a/etcnixos/system-nixos.nix b/etcnixos/system-nixos.nix index bebf5c7..468858f 100644 --- a/etcnixos/system-nixos.nix +++ b/etcnixos/system-nixos.nix @@ -18,9 +18,6 @@ ]; boot = { - # kernelPackages = lib.mkForce pkgs.linuxPackages_6_10; - # supportedFilesystems = [ "zfs" ]; - kernelParams = [ # allow overclocking (I actually underclock but lol) "amdgpu.ppfeaturemask=0xFFF7FFFF" @@ -34,14 +31,16 @@ services.xserver.enable = false; services.desktopManager.plasma6.enable = true; - services.displayManager.sddm = { - enable = true; - wayland.enable = true; - }; + services.displayManager = { + sddm = { + enable = true; + wayland.enable = true; + }; - services.displayManager.autoLogin = { - enable = true; - user = "primary"; + autoLogin = { + enable = true; + user = username; + }; }; services.openssh = { @@ -60,6 +59,7 @@ 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 ]; From 8c923e1c9fca6ec3f1ed70913755c5a9bd843789 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 20 Oct 2024 02:49:02 -0400 Subject: [PATCH 054/724] remove trailing newline --- home-manager/system-nixos.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home-manager/system-nixos.nix b/home-manager/system-nixos.nix index 138de80..bc65ec1 100644 --- a/home-manager/system-nixos.nix +++ b/home-manager/system-nixos.nix @@ -47,5 +47,4 @@ "version" : 1 } ''; - } From 2881f01b9934ec4adcfea44aae6117d33a1ef810 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 20 Oct 2024 02:57:17 -0400 Subject: [PATCH 055/724] no-gui: add cmake-language-server --- home-manager/no-gui.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 66bdeea..6f34521 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -119,6 +119,7 @@ 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 From c61497cce4d2a471a7040e08567adeabfde2e752 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 20 Oct 2024 13:08:58 -0400 Subject: [PATCH 056/724] update --- etcnixos/flake.lock | 12 ++++++------ etcnixos/system-nixos.nix | 22 +++++++++++----------- home-manager/flake.lock | 14 +++++++------- home-manager/flake.nix | 3 ++- home-manager/progs/gpt4all/gpt4all.nix | 20 -------------------- 5 files changed, 26 insertions(+), 45 deletions(-) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 607f9a8..59082af 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -271,11 +271,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1729333370, - "narHash": "sha256-NU+tYe3QWzDNpB8RagpqR3hNQXn4BNuBd7ZGosMHLL8=", + "lastModified": 1729417461, + "narHash": "sha256-p0j/sUs7noqZw0W+SEuZXskzOfgOH7yY80ksIM0fCi4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "38279034170b1e2929b2be33bdaedbf14a57bfeb", + "rev": "8f38d8a4754cf673c2609c4ed399630db87e678b", "type": "github" }, "original": { @@ -287,11 +287,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729403505, - "narHash": "sha256-1ILT9fxCbNQuToPWBhxC3N+hblIWW3WlEHnwcdoCBHE=", + "lastModified": 1729441482, + "narHash": "sha256-45Qn8uQUJZZ3Dx1YOZ7nTBQK+pjLSxxLIi9Z4B6EfJA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "88d3f02d308cb29a07942d24539f960721a20fe0", + "rev": "295fe5fa5ea7159eede65f742cfbb379d94a2745", "type": "github" }, "original": { diff --git a/etcnixos/system-nixos.nix b/etcnixos/system-nixos.nix index 468858f..ff29462 100644 --- a/etcnixos/system-nixos.nix +++ b/etcnixos/system-nixos.nix @@ -43,17 +43,17 @@ }; }; - 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" - }; - }; + # 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 diff --git a/home-manager/flake.lock b/home-manager/flake.lock index e33cacb..ea6e216 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -72,11 +72,11 @@ ] }, "locked": { - "lastModified": 1729321331, - "narHash": "sha256-KVyQq+ez/oB30/WbdNgVD8g/bda34z8NiU187QKQb74=", + "lastModified": 1729414726, + "narHash": "sha256-Dtmm1OU8Ymiy9hVWn/a2B8DhRYo9Eoyx9veERdOBR4o=", "owner": "nix-community", "repo": "home-manager", - "rev": "122f70545b29ccb922e655b08acfe05bfb44ec68", + "rev": "fe56302339bb28e3471632379d733547caec8103", "type": "github" }, "original": { @@ -146,16 +146,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729256560, - "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", + "lastModified": 1729441716, + "narHash": "sha256-Fxgt9QFm2bxDoZgUiDlyJZo+554IQio3Lm8bjlQ8Hn4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", + "rev": "35f9ccf13b3e213b7d19984023aa75e283b3bced", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "master", "repo": "nixpkgs", "type": "github" } diff --git a/home-manager/flake.nix b/home-manager/flake.nix index 45a8079..b99e053 100644 --- a/home-manager/flake.nix +++ b/home-manager/flake.nix @@ -2,7 +2,8 @@ description = "My nixOS flake for home-manager"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + # nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/master"; home-manager = { url = "github:nix-community/home-manager"; diff --git a/home-manager/progs/gpt4all/gpt4all.nix b/home-manager/progs/gpt4all/gpt4all.nix index 13efc73..602756f 100644 --- a/home-manager/progs/gpt4all/gpt4all.nix +++ b/home-manager/progs/gpt4all/gpt4all.nix @@ -29,30 +29,10 @@ let gpt4all_package = ( optimizeWithFlags (pkgs.gpt4all.overrideAttrs (old: { - version = "3.4.2"; - src = pkgs.fetchFromGitHub { - fetchSubmodules = true; - owner = "nomic-ai"; - repo = "gpt4all"; - rev = "v3.4.2"; - sha256 = "QzU22y6tt3UhazVSPcFuKejH4AV+mw7JExH61NtAKoM="; - }; - - cmakeFlags = old.cmakeFlags ++ [ - "-DGGML_VULKAN=ON" - "-DGGML_KOMPUTE=ON" - ]; - patches = old.patches ++ [ ./disable-settings-err.patch ./disable-version-check.patch - (pkgs.fetchpatch { - url = "https://aur.archlinux.org/cgit/aur.git/plain/004-fix-build-with-qt-6.8.0.diff?h=gpt4all-chat&id=d14b12cb63fae95e578aa839a570189a23833051"; - sha256 = "3Zur9KFn45f4dgAzOF7p1q42IdLqXwioN4zMiBbWbVU="; - stripLen = 1; - }) ]; - })) # compile flags [ From 5fffad2192f00911c58f76b398575c3587a3be89 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 20 Oct 2024 16:35:33 -0400 Subject: [PATCH 057/724] fix wivrn build --- etcnixos/flake.lock | 8 ++++---- etcnixos/flake.nix | 2 +- etcnixos/vr.nix | 12 +++++++++++- home-manager/flake.lock | 6 +++--- home-manager/gui.nix | 2 +- 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 59082af..4e9c4c0 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -392,16 +392,16 @@ }, "wivrn": { "locked": { - "lastModified": 1729405003, - "narHash": "sha256-V9ZdbZ2iFVsN2AF/aJmSiRDp9rU5HYeQX+1NBYcKJzQ=", + "lastModified": 1729447101, + "narHash": "sha256-+amYWj/GpgYyYU1R2TTojPAXMNbCr93DVgVGcdIXgaQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "414c84c95aab19cb7dc603f0139d6dea2bc9f053", + "rev": "1c41a27405aa44b94ba10c2002c20209e4911ff5", "type": "github" }, "original": { "owner": "NixOS", - "ref": "pull/349910/head", + "ref": "pull/350069/head", "repo": "nixpkgs", "type": "github" } diff --git a/etcnixos/flake.nix b/etcnixos/flake.nix index 0fded00..d4cfe36 100644 --- a/etcnixos/flake.nix +++ b/etcnixos/flake.nix @@ -12,7 +12,7 @@ nixos-hardware.url = "github:NixOS/nixos-hardware/master"; - wivrn.url = "github:NixOS/nixpkgs/pull/349910/head"; + wivrn.url = "github:NixOS/nixpkgs/pull/350069/head"; chaotic = { url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; diff --git a/etcnixos/vr.nix b/etcnixos/vr.nix index 069d009..129efa5 100644 --- a/etcnixos/vr.nix +++ b/etcnixos/vr.nix @@ -5,7 +5,17 @@ openFirewall = true; # Use my fork for WiVRn 0.20 - package = inputs.wivrn.legacyPackages.${pkgs.system}.wivrn; + package = ( + inputs.wivrn.legacyPackages.${pkgs.system}.wivrn.overrideAttrs (old: { + patches = [ + (pkgs.fetchurl { + url = "https://github.com/WiVRn/WiVRn/commit/be95ec84b56794ca8d97bb8b21dec6443ba57bc4.diff"; + sha256 = "1tNQ57XIki0bomNG5xg+/4YbgKanrM5LOQvvCmZQFhw="; + }) + ]; + + }) + ); # Write information to /etc/xdg/openxr/1/active_runtime.json, VR applications # will automatically read this and work with wivrn diff --git a/home-manager/flake.lock b/home-manager/flake.lock index ea6e216..2eee3e7 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -146,11 +146,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729441716, - "narHash": "sha256-Fxgt9QFm2bxDoZgUiDlyJZo+554IQio3Lm8bjlQ8Hn4=", + "lastModified": 1729443752, + "narHash": "sha256-QKt5nqzfFoGp2jQyMvZwMp7zPXppZM517DzMCk44gbA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "35f9ccf13b3e213b7d19984023aa75e283b3bced", + "rev": "930dee9882d3a3e89b9cdc76cb9c2ab3fb4b52fa", "type": "github" }, "original": { diff --git a/home-manager/gui.nix b/home-manager/gui.nix index b298277..a26ef35 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -92,7 +92,7 @@ inputs.zen-browser.legacyPackages.${pkgs.system}.zen-browser - freecad-wayland + # freecad-wayland ]; # make chromium-based stuff use wayland From cb6b0be83622ad9873e0fed934516171ce90b2db Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 20 Oct 2024 16:36:33 -0400 Subject: [PATCH 058/724] remove newline --- etcnixos/vr.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/etcnixos/vr.nix b/etcnixos/vr.nix index 129efa5..8aeeb84 100644 --- a/etcnixos/vr.nix +++ b/etcnixos/vr.nix @@ -13,7 +13,6 @@ sha256 = "1tNQ57XIki0bomNG5xg+/4YbgKanrM5LOQvvCmZQFhw="; }) ]; - }) ); From 1cf3bea137c4e7a4771fe8d7ef911590caa5ae55 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 20 Oct 2024 16:49:57 -0400 Subject: [PATCH 059/724] add wlx-overlay-s --- etcnixos/vr.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/etcnixos/vr.nix b/etcnixos/vr.nix index 8aeeb84..472632e 100644 --- a/etcnixos/vr.nix +++ b/etcnixos/vr.nix @@ -43,6 +43,8 @@ offset_y = 0.0; } ]; + + application = [ pkgs.wlx-overlay-s ]; }; }; }; From 849384f8a88c557f1d2c004bcb01982880f5aebe Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 20 Oct 2024 16:57:18 -0400 Subject: [PATCH 060/724] rename nixos -> yarn --- etcnixos/{system-nixos.nix => system-yarn.nix} | 0 home-manager/flake.lock | 18 +++++++++--------- .../{system-nixos.nix => system-yarn.nix} | 0 3 files changed, 9 insertions(+), 9 deletions(-) rename etcnixos/{system-nixos.nix => system-yarn.nix} (100%) rename home-manager/{system-nixos.nix => system-yarn.nix} (100%) diff --git a/etcnixos/system-nixos.nix b/etcnixos/system-yarn.nix similarity index 100% rename from etcnixos/system-nixos.nix rename to etcnixos/system-yarn.nix diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 2eee3e7..d6ff3d2 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -98,11 +98,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1729334880, - "narHash": "sha256-HUdIqrv4/s0bohHYtCHl44bJwyL1TMN1kzk+93oSAm8=", + "lastModified": 1729450307, + "narHash": "sha256-jhpL4ttlp8kxBurzfdlNsnI0n3iOkpy0iDaSMG1DzqE=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "28881a002ab986bd107c06cdc4b5df98bad29f7f", + "rev": "bfe9f1a9906e66c83cb073d281920e902cd63e01", "type": "github" }, "original": { @@ -131,11 +131,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1729330424, - "narHash": "sha256-fEev4uBYKTdFACj3zGmMniNV8IbzfoJ+LqZz2eWQWcw=", + "lastModified": 1729444736, + "narHash": "sha256-/Q1yf6f9nUBFVqI/t89xfTPmQipaug63LP8TeENg4CA=", "owner": "YaLTeR", "repo": "niri", - "rev": "10f04fd19de3bc2951d42411c237c8b963e6c816", + "rev": "289ae3604d705cebc82cbcd23ee4534ded16d3af", "type": "github" }, "original": { @@ -146,11 +146,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729443752, - "narHash": "sha256-QKt5nqzfFoGp2jQyMvZwMp7zPXppZM517DzMCk44gbA=", + "lastModified": 1729456989, + "narHash": "sha256-NIYA85us3up/JreOXOyMmKRVoHuwo/hTgmX5lccVq38=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "930dee9882d3a3e89b9cdc76cb9c2ab3fb4b52fa", + "rev": "322eb94b182edf8b6d2ea4d96588bdb7b3580af9", "type": "github" }, "original": { diff --git a/home-manager/system-nixos.nix b/home-manager/system-yarn.nix similarity index 100% rename from home-manager/system-nixos.nix rename to home-manager/system-yarn.nix From a701cc8d4a3d13d06c0be18f529fd78bd114d73a Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 20 Oct 2024 16:58:53 -0400 Subject: [PATCH 061/724] update --- etcnixos/flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 4e9c4c0..2443a16 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -271,11 +271,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1729417461, - "narHash": "sha256-p0j/sUs7noqZw0W+SEuZXskzOfgOH7yY80ksIM0fCi4=", + "lastModified": 1729455275, + "narHash": "sha256-THqzn/7um3oMHUEGXyq+1CJQE7EogwR3HjLMNOlhFBE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "8f38d8a4754cf673c2609c4ed399630db87e678b", + "rev": "9fcf30fccf8435f6390efec4a4d38e69c2268a36", "type": "github" }, "original": { @@ -287,11 +287,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729441482, - "narHash": "sha256-45Qn8uQUJZZ3Dx1YOZ7nTBQK+pjLSxxLIi9Z4B6EfJA=", + "lastModified": 1729456989, + "narHash": "sha256-NIYA85us3up/JreOXOyMmKRVoHuwo/hTgmX5lccVq38=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "295fe5fa5ea7159eede65f742cfbb379d94a2745", + "rev": "322eb94b182edf8b6d2ea4d96588bdb7b3580af9", "type": "github" }, "original": { From 01cd8105a8e9e624ce5b6cf068dc958532a185a1 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 20 Oct 2024 20:32:59 -0400 Subject: [PATCH 062/724] update --- etcnixos/flake.lock | 6 +++--- home-manager/flake.lock | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 2443a16..4a27a3a 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -287,11 +287,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729456989, - "narHash": "sha256-NIYA85us3up/JreOXOyMmKRVoHuwo/hTgmX5lccVq38=", + "lastModified": 1729468141, + "narHash": "sha256-svEr78EEBcjQJaiZpaPtk+v2g+ok8EjeSYg0AnSyPxk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "322eb94b182edf8b6d2ea4d96588bdb7b3580af9", + "rev": "13bb3040aebb54bb116f2450eba78afa6ecaaffb", "type": "github" }, "original": { diff --git a/home-manager/flake.lock b/home-manager/flake.lock index d6ff3d2..9432534 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -72,11 +72,11 @@ ] }, "locked": { - "lastModified": 1729414726, - "narHash": "sha256-Dtmm1OU8Ymiy9hVWn/a2B8DhRYo9Eoyx9veERdOBR4o=", + "lastModified": 1729459288, + "narHash": "sha256-gBOVJv+q6Mx8jGvwX7cE6J8+sZmi1uxpRVsO7WxvVuQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "fe56302339bb28e3471632379d733547caec8103", + "rev": "1e27f213d77fc842603628bcf2df6681d7d08f7e", "type": "github" }, "original": { @@ -146,11 +146,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729456989, - "narHash": "sha256-NIYA85us3up/JreOXOyMmKRVoHuwo/hTgmX5lccVq38=", + "lastModified": 1729468141, + "narHash": "sha256-svEr78EEBcjQJaiZpaPtk+v2g+ok8EjeSYg0AnSyPxk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "322eb94b182edf8b6d2ea4d96588bdb7b3580af9", + "rev": "13bb3040aebb54bb116f2450eba78afa6ecaaffb", "type": "github" }, "original": { From 65fd0571b3cf5f70612d1b042a6220fe965180f0 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 20 Oct 2024 20:37:15 -0400 Subject: [PATCH 063/724] vr: update comments --- etcnixos/vr.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/etcnixos/vr.nix b/etcnixos/vr.nix index 472632e..9f648ca 100644 --- a/etcnixos/vr.nix +++ b/etcnixos/vr.nix @@ -4,10 +4,11 @@ enable = true; openFirewall = true; - # Use my fork for WiVRn 0.20 + # WiVRn 0.20 package = ( inputs.wivrn.legacyPackages.${pkgs.system}.wivrn.overrideAttrs (old: { patches = [ + # Fixes build, see: https://github.com/NixOS/nixpkgs/pull/350069#issuecomment-2425149854 (pkgs.fetchurl { url = "https://github.com/WiVRn/WiVRn/commit/be95ec84b56794ca8d97bb8b21dec6443ba57bc4.diff"; sha256 = "1tNQ57XIki0bomNG5xg+/4YbgKanrM5LOQvvCmZQFhw="; From 4d659f0792921c94a625c3b87b4c12a3d05b2f2d Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 20 Oct 2024 20:46:51 -0400 Subject: [PATCH 064/724] nh --- etcnixos/common.nix | 14 +++++++------- etcnixos/flake.lock | 6 +++--- home-manager/flake.lock | 6 +++--- justfile | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/etcnixos/common.nix b/etcnixos/common.nix index 778a456..4dd0823 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -16,13 +16,6 @@ ]; nix = { - # garbage collection and cleanup stuff - gc = { - automatic = true; - dates = "weekly"; - options = "--delete-older-than 7d"; - }; - # optimize the store optimise.automatic = true; @@ -33,6 +26,13 @@ ]; }; + # 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; diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 4a27a3a..08f5826 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -287,11 +287,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729468141, - "narHash": "sha256-svEr78EEBcjQJaiZpaPtk+v2g+ok8EjeSYg0AnSyPxk=", + "lastModified": 1729471405, + "narHash": "sha256-QNH6AVw/p0iMMj36RumeXNpqhFFrXyxIzAn5H+dwR+Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "13bb3040aebb54bb116f2450eba78afa6ecaaffb", + "rev": "dfd24c1593f41213e73e90effbbd963a45cd9413", "type": "github" }, "original": { diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 9432534..0709e7e 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -146,11 +146,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729468141, - "narHash": "sha256-svEr78EEBcjQJaiZpaPtk+v2g+ok8EjeSYg0AnSyPxk=", + "lastModified": 1729471405, + "narHash": "sha256-QNH6AVw/p0iMMj36RumeXNpqhFFrXyxIzAn5H+dwR+Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "13bb3040aebb54bb116f2450eba78afa6ecaaffb", + "rev": "dfd24c1593f41213e73e90effbbd963a45cd9413", "type": "github" }, "original": { diff --git a/justfile b/justfile index a175a0e..6f39649 100644 --- a/justfile +++ b/justfile @@ -8,12 +8,12 @@ format_system: system_update: doas nix flake update --flake /etc/nixos - doas nixos-rebuild boot --impure + nh os boot /etc/nixos -- --impure home_update: nix flake update --flake ~/.config/home-manager rm -fr ~/.gtkrc-2.0 - home-manager switch --impure + nh home switch ~/.config/home-manager -- --impure sync_configs: format_home format_system rsync -a --delete /etc/nixos/ ~/projects/configs/dotfiles/etcnixos/ From c181db21eaebe6cc60d35a8d451f2743d1d76d70 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 21 Oct 2024 20:43:23 -0400 Subject: [PATCH 065/724] vr: update build fix patch --- etcnixos/vr.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etcnixos/vr.nix b/etcnixos/vr.nix index 9f648ca..ebadbc8 100644 --- a/etcnixos/vr.nix +++ b/etcnixos/vr.nix @@ -10,8 +10,8 @@ patches = [ # Fixes build, see: https://github.com/NixOS/nixpkgs/pull/350069#issuecomment-2425149854 (pkgs.fetchurl { - url = "https://github.com/WiVRn/WiVRn/commit/be95ec84b56794ca8d97bb8b21dec6443ba57bc4.diff"; - sha256 = "1tNQ57XIki0bomNG5xg+/4YbgKanrM5LOQvvCmZQFhw="; + url = "https://github.com/WiVRn/WiVRn/commit/d85916b6aaba3b4e9a7367e973b14f60507701fd.diff"; + sha256 = "vm25kWfu2q1d7lL1zW8FNDUxUn25YpuoEYFbNChCWas="; }) ]; }) From 6b93e9d9fcddbb454fe63b992882d727a7ee7dc0 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 25 Oct 2024 10:25:44 -0400 Subject: [PATCH 066/724] gpt4all: cleanup config --- home-manager/progs/gpt4all/gpt4all.nix | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/home-manager/progs/gpt4all/gpt4all.nix b/home-manager/progs/gpt4all/gpt4all.nix index 602756f..a9a8cdf 100644 --- a/home-manager/progs/gpt4all/gpt4all.nix +++ b/home-manager/progs/gpt4all/gpt4all.nix @@ -8,22 +8,13 @@ let models = [ { name = "Qwen2.5-14B-Instruct-IQ4_XS.gguf"; - context_length = "32768"; - gen_length = "8192"; + context_length = 32768; + gen_length = 8192; source = pkgs.fetchurl { url = "https://huggingface.co/bartowski/Qwen2.5-14B-Instruct-GGUF/resolve/main/Qwen2.5-14B-Instruct-IQ4_XS.gguf?download=true"; sha256 = "+AHt49no0qQ48MoNsqGJV4FeJ3Cf2hSZqTMjNUIHaO4="; }; } - { - name = "Qwen2.5-32B-Instruct-IQ4_XS.gguf"; - context_length = "32768"; - gen_length = "8192"; - source = pkgs.fetchurl { - url = "https://huggingface.co/bartowski/Qwen2.5-32B-Instruct-GGUF/resolve/main/Qwen2.5-32B-Instruct-IQ4_XS.gguf?download=true"; - sha256 = "iY14/8GApfYc5c0fTABsDO/X5/cxBpnbUbiUTcvzJQ4="; - }; - } ]; gpt4all_package = ( @@ -77,9 +68,9 @@ in + (lib.concatStrings ( map (model: '' [model-${model.name}] - contextLength=${model.context_length} + contextLength=${builtins.toString model.context_length} filename=${model.name} - maxLength=${model.gen_length} + maxLength=${builtins.toString model.gen_length} promptBatchSize=256 promptTemplate=<|im_start|>user\n%1<|im_end|>\n<|im_start|>assistant\n systemPrompt="<|im_start|>system\n${ From e362afe8222ae18e5ad185c2da4ecad03d90bbab Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 25 Oct 2024 11:37:13 -0400 Subject: [PATCH 067/724] bluetooth overhaul --- home-manager/progs/waybar.nix | 21 +++++++++++++++++++-- home-manager/system-mreow.nix | 15 +++++++++++++-- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/home-manager/progs/waybar.nix b/home-manager/progs/waybar.nix index 5448024..45e3e90 100644 --- a/home-manager/progs/waybar.nix +++ b/home-manager/progs/waybar.nix @@ -18,6 +18,7 @@ "cpu" "memory" "tray" + "bluetooth" "pulseaudio" "network" "battery" @@ -63,8 +64,10 @@ on-scroll-down = "shift_down"; }; }; + network = { format-wifi = " {icon}"; + tooltip-format-wifi = "{essid} ({signalStrength}%)"; format-ethernet = "  "; format-disconnected = "σ°Œ™ "; format-icons = [ @@ -74,7 +77,9 @@ "σ°€’ " "󰀨 " ]; + # tooltip = false; }; + battery = { states = { good = 95; @@ -99,12 +104,13 @@ "󰁹" ]; }; - # not actually pulseaudio-specific + + # not actually pulseaudio-specific (I use pipewire!) pulseaudio = { max-volume = 100; scroll-step = 10; format = "{icon}"; - tooltip-format = "{volume}%"; + tooltip-format = "{desc} ({volume}%)"; format-muted = "πŸ”‡"; format-icons = { default = [ @@ -115,6 +121,17 @@ }; on-click = "${pkgs.pwvucontrol}/bin/pwvucontrol"; }; + + bluetooth = { + format = "οŠ” ({status}) "; + format-connected = "οŠ” {device_alias}"; + format-connected-battery = "οŠ” {device_alias} {device_battery_percentage}%"; + tooltip-format = "{controller_alias}\t{controller_address}\n\n{num_connections} connected"; + tooltip-format-connected = "{controller_alias}\t{controller_address}\n\n{num_connections} connected\n\n{device_enumerate}"; + tooltip-format-enumerate-connected = "{device_alias}\t{device_address}"; + tooltip-format-enumerate-connected-battery = "{device_alias}\t{device_address}\t{device_battery_percentage}%"; + on-click = "${pkgs.blueman}/bin/blueman-manager"; + }; }; style = '' diff --git a/home-manager/system-mreow.nix b/home-manager/system-mreow.nix index 98d28a3..4761f45 100644 --- a/home-manager/system-mreow.nix +++ b/home-manager/system-mreow.nix @@ -23,8 +23,19 @@ config.programs.niri.package ]; - # bluetooth manager - services.blueman-applet.enable = true; + # # bluetooth manager + # services.blueman-applet.enable = true; + + # bluetooth 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"; + }; # notification daemon services.dunst = { From 80480e6ad112477f4d3f27b72e22e3f8487e707b Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 25 Oct 2024 14:15:48 -0400 Subject: [PATCH 068/724] more overhaul --- etcnixos/flake.lock | 30 +- home-manager/flake.lock | 42 +-- home-manager/progs/swaylock.nix | 64 ++-- home-manager/progs/waybar.nix | 519 ++++++++++++++++---------------- home-manager/system-mreow.nix | 26 +- 5 files changed, 341 insertions(+), 340 deletions(-) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 08f5826..763f981 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -33,11 +33,11 @@ ] }, "locked": { - "lastModified": 1729348269, - "narHash": "sha256-KCjrPNlEgEVFYs8wHIpd4iBelAV9L9QYsynoMYihIFw=", + "lastModified": 1729599319, + "narHash": "sha256-e/4JPcIRte5zkwqmGFrFo3763e0iHURX6N0apz4jbI0=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "528723447ef037a1c081add43f4fd46440c9c3b1", + "rev": "1b86b304c8eb1437d9337a760e7f930826fc4d6d", "type": "github" }, "original": { @@ -186,11 +186,11 @@ ] }, "locked": { - "lastModified": 1729027341, - "narHash": "sha256-IqWD7bA9iJVifvJlB4vs2KUXVhN+d9lECWdNB4jJ0tE=", + "lastModified": 1729414726, + "narHash": "sha256-Dtmm1OU8Ymiy9hVWn/a2B8DhRYo9Eoyx9veERdOBR4o=", "owner": "nix-community", "repo": "home-manager", - "rev": "2a4fd1cfd8ed5648583dadef86966a8231024221", + "rev": "fe56302339bb28e3471632379d733547caec8103", "type": "github" }, "original": { @@ -208,11 +208,11 @@ ] }, "locked": { - "lastModified": 1728974938, - "narHash": "sha256-pTPEx6WlM+nJVGrRUGx7Di4ljZMwE9HfvlZ6f3NzNfo=", + "lastModified": 1729177642, + "narHash": "sha256-DdKal+ZhB9QD/tnEwFg4cZ4j4YnrkvSljBxnyG+3eE0=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "23170582b0658e6afd913149a58863af3a57b376", + "rev": "bb69165ff372ddbd3228a03513922acd783040e8", "type": "github" }, "original": { @@ -271,11 +271,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1729455275, - "narHash": "sha256-THqzn/7um3oMHUEGXyq+1CJQE7EogwR3HjLMNOlhFBE=", + "lastModified": 1729742320, + "narHash": "sha256-u3Of8xRkN//me8PU+RucKA59/6RNy4B2jcGAF36P4jI=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9fcf30fccf8435f6390efec4a4d38e69c2268a36", + "rev": "e8a2f6d5513fe7b7d15701b2d05404ffdc3b6dda", "type": "github" }, "original": { @@ -287,11 +287,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729471405, - "narHash": "sha256-QNH6AVw/p0iMMj36RumeXNpqhFFrXyxIzAn5H+dwR+Y=", + "lastModified": 1729878015, + "narHash": "sha256-CNWmKiA00tGw+N+fDnt4+JfLF500oofJ7BikcVxg0zw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dfd24c1593f41213e73e90effbbd963a45cd9413", + "rev": "6dbbd5a2622d9abf9263a5cb0a85ca218974b085", "type": "github" }, "original": { diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 0709e7e..1c568ab 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -72,11 +72,11 @@ ] }, "locked": { - "lastModified": 1729459288, - "narHash": "sha256-gBOVJv+q6Mx8jGvwX7cE6J8+sZmi1uxpRVsO7WxvVuQ=", + "lastModified": 1729864948, + "narHash": "sha256-CeGSqbN6S8JmzYJX/HqZjr7dMGlvHLLnJJarwB45lPs=", "owner": "nix-community", "repo": "home-manager", - "rev": "1e27f213d77fc842603628bcf2df6681d7d08f7e", + "rev": "0c0268a3c80d30b989d0aadbd65f38d4fa27a9a0", "type": "github" }, "original": { @@ -98,11 +98,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1729450307, - "narHash": "sha256-jhpL4ttlp8kxBurzfdlNsnI0n3iOkpy0iDaSMG1DzqE=", + "lastModified": 1729841254, + "narHash": "sha256-KywrT/D1yMOLxc2xDJAPx9Z+qVoQw5rCScQR/lU3NTc=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "bfe9f1a9906e66c83cb073d281920e902cd63e01", + "rev": "d7c058c0c0b8cd5b799a3a3ac4f8a1090454155e", "type": "github" }, "original": { @@ -131,11 +131,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1729444736, - "narHash": "sha256-/Q1yf6f9nUBFVqI/t89xfTPmQipaug63LP8TeENg4CA=", + "lastModified": 1729744939, + "narHash": "sha256-QbfaNQa93yt4KKg5XNi1tUIfGoDIohxFp/PmHi8sruU=", "owner": "YaLTeR", "repo": "niri", - "rev": "289ae3604d705cebc82cbcd23ee4534ded16d3af", + "rev": "c8044a9b5dbdb3e0648c86a00bfb63acfc06a559", "type": "github" }, "original": { @@ -146,11 +146,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729471405, - "narHash": "sha256-QNH6AVw/p0iMMj36RumeXNpqhFFrXyxIzAn5H+dwR+Y=", + "lastModified": 1729878015, + "narHash": "sha256-CNWmKiA00tGw+N+fDnt4+JfLF500oofJ7BikcVxg0zw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dfd24c1593f41213e73e90effbbd963a45cd9413", + "rev": "6dbbd5a2622d9abf9263a5cb0a85ca218974b085", "type": "github" }, "original": { @@ -174,11 +174,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1729181673, - "narHash": "sha256-LDiPhQ3l+fBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I=", + "lastModified": 1729691686, + "narHash": "sha256-BAuPWW+9fa1moZTU+jFh+1cUtmsuF8asgzFwejM4wac=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3", + "rev": "32e940c7c420600ef0d1ef396dc63b04ee9cad37", "type": "github" }, "original": { @@ -205,11 +205,11 @@ ] }, "locked": { - "lastModified": 1729391507, - "narHash": "sha256-as0I9xieJUHf7kiK2a9znDsVZQTFWhM1pLivII43Gi0=", + "lastModified": 1729823394, + "narHash": "sha256-RiinJqorqSLKh1oSpiMHnBe6nQdJzE45lX6fSnAuDnI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "784981a9feeba406de38c1c9a3decf966d853cca", + "rev": "7e52e80f5faa374ad4c607d62c6d362589cb523f", "type": "github" }, "original": { @@ -253,11 +253,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1729139001, - "narHash": "sha256-BADKw4fQma8tUNBRfmS9YLXTRXK4nYyXIxQdhGuEV0s=", + "lastModified": 1729838433, + "narHash": "sha256-o9D859STqawTSe6mkXpm3xR/gitYgOHy32xOhOfT3vw=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "ab2d09962c425670a4a7ca6ef5d92a0f06632499", + "rev": "67efa2c559b53d3ca90c131c06c247278783880d", "type": "github" }, "original": { diff --git a/home-manager/progs/swaylock.nix b/home-manager/progs/swaylock.nix index bb528c3..15177c8 100644 --- a/home-manager/progs/swaylock.nix +++ b/home-manager/progs/swaylock.nix @@ -1,31 +1,37 @@ +{ pkgs, ... }: { - color = "24273a"; - bs-hl-color = "f4dbd6"; - caps-lock-bs-hl-color = "f4dbd6"; - caps-lock-key-hl-color = "a6da95"; - inside-color = 0; - inside-clear-color = 0; - inside-caps-lock-color = 0; - inside-ver-color = 0; - inside-wrong-color = 0; - key-hl-color = "a6da95"; - layout-bg-color = 0; - layout-border-color = 0; - layout-text-color = "cad3f5"; - line-color = 0; - line-clear-color = 0; - line-caps-lock-color = 0; - line-ver-color = 0; - line-wrong-color = 0; - ring-color = "b7bdf8"; - ring-clear-color = "f4dbd6"; - ring-caps-lock-color = "f5a97f"; - ring-ver-color = "8aadf4"; - ring-wrong-color = "ee99a0"; - separator-color = 0; - text-color = "cad3f5"; - text-clear-color = "f4dbd6"; - text-caps-lock-color = "f5a97f"; - text-ver-color = "8aadf4"; - text-wrong-color = "ee99a0"; + programs.swaylock = { + enable = true; + settings = { + color = "24273a"; + bs-hl-color = "f4dbd6"; + caps-lock-bs-hl-color = "f4dbd6"; + caps-lock-key-hl-color = "a6da95"; + inside-color = 0; + inside-clear-color = 0; + inside-caps-lock-color = 0; + inside-ver-color = 0; + inside-wrong-color = 0; + key-hl-color = "a6da95"; + layout-bg-color = 0; + layout-border-color = 0; + layout-text-color = "cad3f5"; + line-color = 0; + line-clear-color = 0; + line-caps-lock-color = 0; + line-ver-color = 0; + line-wrong-color = 0; + ring-color = "b7bdf8"; + ring-clear-color = "f4dbd6"; + ring-caps-lock-color = "f5a97f"; + ring-ver-color = "8aadf4"; + ring-wrong-color = "ee99a0"; + separator-color = 0; + text-color = "cad3f5"; + text-clear-color = "f4dbd6"; + text-caps-lock-color = "f5a97f"; + text-ver-color = "8aadf4"; + text-wrong-color = "ee99a0"; + }; + }; } diff --git a/home-manager/progs/waybar.nix b/home-manager/progs/waybar.nix index 45e3e90..0ee2610 100644 --- a/home-manager/progs/waybar.nix +++ b/home-manager/progs/waybar.nix @@ -1,270 +1,273 @@ -{ pkgs }: +{ pkgs, ... }: { - enable = true; - settings.mainBar = { - layer = "top"; - position = "top"; - # mod = "dock"; - # exclusive = true; - # gtk-layer-shell = true; - margin-bottom = -1; - # passthrough = false; - height = 32; - modules-left = - [ + programs.waybar = { + enable = true; + settings.mainBar = { + layer = "top"; + position = "top"; + # mod = "dock"; + # exclusive = true; + # gtk-layer-shell = true; + margin-bottom = -1; + # passthrough = false; + height = 32; + modules-left = + [ + ]; + modules-center = [ "clock" ]; + modules-right = [ + "cpu" + "memory" + "tray" + "bluetooth" + "pulseaudio" + "network" + "battery" ]; - modules-center = [ "clock" ]; - modules-right = [ - "cpu" - "memory" - "tray" - "bluetooth" - "pulseaudio" - "network" - "battery" - ]; - cpu = { - interval = 5; - format = "ο‹› {usage}%"; - max-length = 10; - }; - memory = { - interval = 10; - format = " {percentage}%"; - max-length = 10; - tooltip = true; - tooltip-format = "RAM - {used:0.1f}GiB used"; - }; - tray = { - icon-size = 18; - spacing = 3; - }; - clock = { - format = " {:%R\n %d.%m.%Y}"; - tooltip-format = "{calendar}"; - calendar = { - mode = "year"; - mode-mon-col = 3; - weeks-pos = "right"; - on-scroll = 1; - on-click-right = "mode"; - format = { - months = "{}"; - days = "{}"; - weeks = "W{}"; - weekdays = "{}"; - today = "{}"; + cpu = { + interval = 5; + format = "ο‹› {usage}%"; + max-length = 10; + }; + memory = { + interval = 10; + format = " {percentage}%"; + max-length = 10; + tooltip = true; + tooltip-format = "RAM - {used:0.1f}GiB used"; + }; + tray = { + icon-size = 18; + spacing = 3; + }; + clock = { + format = " {:%R\n %d.%m.%Y}"; + tooltip-format = "{calendar}"; + calendar = { + mode = "year"; + mode-mon-col = 3; + weeks-pos = "right"; + on-scroll = 1; + on-click-right = "mode"; + format = { + months = "{}"; + days = "{}"; + weeks = "W{}"; + weekdays = "{}"; + today = "{}"; + }; + }; + actions = { + on-click-right = "mode"; + on-click-forward = "tz_up"; + on-click-backward = "tz_down"; + on-scroll-up = "shift_up"; + on-scroll-down = "shift_down"; }; }; - actions = { - on-click-right = "mode"; - on-click-forward = "tz_up"; - on-click-backward = "tz_down"; - on-scroll-up = "shift_up"; - on-scroll-down = "shift_down"; + + network = { + format-wifi = " {icon}"; + tooltip-format-wifi = "{essid} ({signalStrength}%)"; + format-ethernet = "  "; + format-disconnected = "σ°Œ™ "; + format-icons = [ + "σ°€― " + "󰀟 " + "σ°€’ " + "σ°€’ " + "󰀨 " + ]; + # tooltip = false; }; - }; - network = { - format-wifi = " {icon}"; - tooltip-format-wifi = "{essid} ({signalStrength}%)"; - format-ethernet = "  "; - format-disconnected = "σ°Œ™ "; - format-icons = [ - "σ°€― " - "󰀟 " - "σ°€’ " - "σ°€’ " - "󰀨 " - ]; - # tooltip = false; - }; - - battery = { - states = { - good = 95; - warning = 30; - critical = 20; - }; - format = " {icon} {capacity}%"; - format-charging = "  {capacity}%"; - format-plugged = "  {capacity}%"; - format-alt = "{time} {icon}"; - format-icons = [ - "σ°‚Ž" - "󰁺" - "󰁻" - "󰁼" - "󰁽" - "󰁾" - "󰁿" - "σ°‚€" - "󰂁" - "σ°‚‚" - "󰁹" - ]; - }; - - # not actually pulseaudio-specific (I use pipewire!) - pulseaudio = { - max-volume = 100; - scroll-step = 10; - format = "{icon}"; - tooltip-format = "{desc} ({volume}%)"; - format-muted = "πŸ”‡"; - format-icons = { - default = [ - " " - " " - " " + battery = { + states = { + good = 95; + warning = 30; + critical = 20; + }; + format = " {icon} {capacity}%"; + format-charging = "  {capacity}%"; + format-plugged = "  {capacity}%"; + format-alt = "{time} {icon}"; + format-icons = [ + "σ°‚Ž" + "󰁺" + "󰁻" + "󰁼" + "󰁽" + "󰁾" + "󰁿" + "σ°‚€" + "󰂁" + "σ°‚‚" + "󰁹" ]; }; - on-click = "${pkgs.pwvucontrol}/bin/pwvucontrol"; + + # not actually pulseaudio-specific (I use pipewire!) + pulseaudio = { + max-volume = 100; + scroll-step = 10; + format = "{icon}"; + tooltip-format = "{desc} ({volume}%)"; + format-muted = "πŸ”‡"; + format-icons = { + default = [ + " " + " " + " " + ]; + }; + on-click = "${pkgs.pwvucontrol}/bin/pwvucontrol"; + }; + + bluetooth = { + format = "οŠ” ({status}) "; + format-connected = "οŠ” {device_alias}"; + format-connected-battery = "οŠ” {device_alias} {device_battery_percentage}%"; + tooltip-format = "{controller_alias}\t{controller_address}\n\n{num_connections} connected"; + tooltip-format-connected = "{controller_alias}\t{controller_address}\n\n{num_connections} connected\n\n{device_enumerate}"; + tooltip-format-enumerate-connected = "{device_alias}\t{device_address}"; + tooltip-format-enumerate-connected-battery = "{device_alias}\t{device_address}\t{device_battery_percentage}%"; + + on-click = "${pkgs.blueman}/bin/blueman-manager"; + }; }; - bluetooth = { - format = "οŠ” ({status}) "; - format-connected = "οŠ” {device_alias}"; - format-connected-battery = "οŠ” {device_alias} {device_battery_percentage}%"; - tooltip-format = "{controller_alias}\t{controller_address}\n\n{num_connections} connected"; - tooltip-format-connected = "{controller_alias}\t{controller_address}\n\n{num_connections} connected\n\n{device_enumerate}"; - tooltip-format-enumerate-connected = "{device_alias}\t{device_address}"; - tooltip-format-enumerate-connected-battery = "{device_alias}\t{device_address}\t{device_battery_percentage}%"; - on-click = "${pkgs.blueman}/bin/blueman-manager"; - }; + style = '' + /*base background color*/ + @define-color bg_main rgba(25, 25, 25, 1.0); + @define-color bg_main_tooltip rgba(0, 0, 0, 0.7); + + + /*base background color of selections */ + @define-color bg_hover rgba(200, 200, 200, 0.3); + /*base background color of active elements */ + @define-color bg_active rgba(100, 100, 100, 0.5); + + /*base border color*/ + @define-color border_main rgba(255, 255, 255, 0.2); + + /*text color for entries, views and content in general */ + @define-color content_main white; + /*text color for entries that are unselected */ + @define-color content_inactive rgba(255, 255, 255, 0.25); + + * { + text-shadow: none; + box-shadow: none; + border: none; + border-radius: 0; + font-family: "Segoe UI", "Ubuntu"; + font-weight: 600; + font-size: 12.7px; + } + + window#waybar { + background: @bg_main; + border-top: 0; + color: @content_main; + } + + tooltip { + background: @bg_main_tooltip; + border-radius: 5px; + border-width: 1px; + border-style: solid; + border-color: @border_main; + } + + tooltip label { + color: @content_main; + } + + #taskbar { + } + + #taskbar button { + min-width: 130px; + border-bottom: 3px solid rgba(255, 255, 255, 0.3); + margin-left: 2px; + margin-right: 2px; + padding-left: 8px; + padding-right: 8px; + color: white; + transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); + } + + #taskbar button.active { + border-bottom: 3px solid white; + background: @bg_active; + } + + #taskbar button:hover { + border-bottom: 3px solid white; + background: @bg_hover; + color: @content_main; + } + + #cpu, #memory { + padding:3px; + } + + #window { + border-radius: 10px; + margin-left: 20px; + margin-right: 20px; + } + + #tray { + margin-left: 5px; + margin-right: 5px; + } + + #tray > .passive { + border-bottom: none; + } + + #tray > .active { + border-bottom: 3px solid white; + } + + #tray > .needs-attention { + border-bottom: 3px solid @warning_color; + } + + #tray > widget { + transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); + } + + #tray > widget:hover { + background: @bg_hover; + } + + #pulseaudio { + font-family: "JetBrains Mono Nerd Font"; + padding-left: 3px; + padding-right: 3px; + transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); + } + + #pulseaudio:hover { + background: @bg_hover; + } + + #network { + padding-left: 3px; + padding-right: 3px; + } + + #clock { + padding-right: 5px; + padding-left: 5px; + transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); + } + + #clock:hover { + background: @bg_hover; + } + ''; }; - - style = '' - /*base background color*/ - @define-color bg_main rgba(25, 25, 25, 1.0); - @define-color bg_main_tooltip rgba(0, 0, 0, 0.7); - - - /*base background color of selections */ - @define-color bg_hover rgba(200, 200, 200, 0.3); - /*base background color of active elements */ - @define-color bg_active rgba(100, 100, 100, 0.5); - - /*base border color*/ - @define-color border_main rgba(255, 255, 255, 0.2); - - /*text color for entries, views and content in general */ - @define-color content_main white; - /*text color for entries that are unselected */ - @define-color content_inactive rgba(255, 255, 255, 0.25); - - * { - text-shadow: none; - box-shadow: none; - border: none; - border-radius: 0; - font-family: "Segoe UI", "Ubuntu"; - font-weight: 600; - font-size: 12.7px; - } - - window#waybar { - background: @bg_main; - border-top: 0; - color: @content_main; - } - - tooltip { - background: @bg_main_tooltip; - border-radius: 5px; - border-width: 1px; - border-style: solid; - border-color: @border_main; - } - - tooltip label { - color: @content_main; - } - - #taskbar { - } - - #taskbar button { - min-width: 130px; - border-bottom: 3px solid rgba(255, 255, 255, 0.3); - margin-left: 2px; - margin-right: 2px; - padding-left: 8px; - padding-right: 8px; - color: white; - transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); - } - - #taskbar button.active { - border-bottom: 3px solid white; - background: @bg_active; - } - - #taskbar button:hover { - border-bottom: 3px solid white; - background: @bg_hover; - color: @content_main; - } - - #cpu, #memory { - padding:3px; - } - - #window { - border-radius: 10px; - margin-left: 20px; - margin-right: 20px; - } - - #tray { - margin-left: 5px; - margin-right: 5px; - } - - #tray > .passive { - border-bottom: none; - } - - #tray > .active { - border-bottom: 3px solid white; - } - - #tray > .needs-attention { - border-bottom: 3px solid @warning_color; - } - - #tray > widget { - transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); - } - - #tray > widget:hover { - background: @bg_hover; - } - - #pulseaudio { - font-family: "JetBrains Mono Nerd Font"; - padding-left: 3px; - padding-right: 3px; - transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); - } - - #pulseaudio:hover { - background: @bg_hover; - } - - #network { - padding-left: 3px; - padding-right: 3px; - } - - #clock { - padding-right: 5px; - padding-left: 5px; - transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); - } - - #clock:hover { - background: @bg_hover; - } - ''; } diff --git a/home-manager/system-mreow.nix b/home-manager/system-mreow.nix index 4761f45..6d469ec 100644 --- a/home-manager/system-mreow.nix +++ b/home-manager/system-mreow.nix @@ -8,25 +8,25 @@ { imports = [ ./gui.nix + + # niri wayland compositor ./progs/niri.nix + + # waybar for status bar + ./progs/waybar.nix + + ./progs/swaylock.nix ]; home.packages = with pkgs; [ wdisplays intel-gpu-tools - swaylock - - # manage bluetooth devices - blueman # used by /etc/nixos logic to launch niri config.programs.niri.package ]; - # # bluetooth manager - # services.blueman-applet.enable = true; - - # bluetooth media controls + # media controls systemd.user.services.mpris-proxy = { Unit.Description = "Mpris proxy"; Install.After = [ @@ -43,14 +43,6 @@ package = pkgs.dunst; }; - programs.swaylock = { - enable = true; - settings = import ./progs/swaylock.nix; - }; - - # waybar for status bar - programs.waybar = import ./progs/waybar.nix { inherit pkgs; }; - # rofi for application launcher programs.rofi = { enable = true; @@ -88,7 +80,7 @@ # 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/framework.json".text = + home.file.".config/easyeffects/output/${config.services.easyeffects.preset}.json".text = let baseBand = { mode = "RLC (BT)"; From 3826cd0d2b2e4a959a8b21e5e38ec075c44c30a9 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 29 Oct 2024 12:55:21 -0400 Subject: [PATCH 069/724] things --- etcnixos/flake.lock | 42 +++++++++++++-------------- etcnixos/vr.nix | 12 +------- home-manager/flake.lock | 54 +++++++++++++++++------------------ home-manager/flake.nix | 2 +- home-manager/progs/niri.nix | 40 ++++++++++++++++---------- home-manager/progs/waybar.nix | 26 +++++++++++++++-- home-manager/system-mreow.nix | 4 +++ 7 files changed, 102 insertions(+), 78 deletions(-) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 763f981..2c7cd0e 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -49,11 +49,11 @@ }, "crane": { "locked": { - "lastModified": 1728776144, - "narHash": "sha256-fROVjMcKRoGHofDm8dY3uDUtCMwUICh/KjBFQnuBzfg=", + "lastModified": 1730060262, + "narHash": "sha256-RMgSVkZ9H03sxC+Vh4jxtLTCzSjPq18UWpiM0gq6shQ=", "owner": "ipetkov", "repo": "crane", - "rev": "f876e3d905b922502f031aeec1a84490122254b7", + "rev": "498d9f122c413ee1154e8131ace5a35a80d8fa76", "type": "github" }, "original": { @@ -233,11 +233,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1729064530, - "narHash": "sha256-oSr/w/5dvf/8ll6NvQlL7+rrK8wzjIcEMP1LvI4Ag08=", + "lastModified": 1730107060, + "narHash": "sha256-EnVVq1oNcimZmQYl6UlLYs0jhC6aLah0bsFMy2syEak=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "2fa1368f938b50e35ca87334b5aeba38a3402165", + "rev": "0ad4ce46649b390da8bebcc229917f9863c98fe2", "type": "github" }, "original": { @@ -271,11 +271,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1729742320, - "narHash": "sha256-u3Of8xRkN//me8PU+RucKA59/6RNy4B2jcGAF36P4jI=", + "lastModified": 1730161780, + "narHash": "sha256-z5ILcmwMtiCoHTXS1KsQWqigO7HJO8sbyK7f7wn9F/E=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e8a2f6d5513fe7b7d15701b2d05404ffdc3b6dda", + "rev": "07d15e8990d5d86a631641b4c429bc0a7400cfb8", "type": "github" }, "original": { @@ -287,11 +287,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729878015, - "narHash": "sha256-CNWmKiA00tGw+N+fDnt4+JfLF500oofJ7BikcVxg0zw=", + "lastModified": 1730218704, + "narHash": "sha256-rAurlpnoe4bbg73RZRHjnAwVtz2LBWH/uEi9UY2sQyQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6dbbd5a2622d9abf9263a5cb0a85ca218974b085", + "rev": "963f723f4c5cf8267e0798630705eb87c1ac33fb", "type": "github" }, "original": { @@ -331,11 +331,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1728778939, - "narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=", + "lastModified": 1729104314, + "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "ff68f91754be6f3427e4986d7949e6273659be1d", + "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", "type": "github" }, "original": { @@ -362,11 +362,11 @@ ] }, "locked": { - "lastModified": 1728959392, - "narHash": "sha256-fp4he1QQjE+vasDMspZYeXrwTm9otwEqLwEN6FKZ5v0=", + "lastModified": 1729996302, + "narHash": "sha256-QEU1NQq1+7s1na69Chig9K0iDDTKN0O4Zreo9A9rccA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "4c6e317300f05b8871f585b826b6f583e7dc4a9b", + "rev": "a1b337569f334ff0a01b57627f17b201d746d24c", "type": "github" }, "original": { @@ -392,11 +392,11 @@ }, "wivrn": { "locked": { - "lastModified": 1729447101, - "narHash": "sha256-+amYWj/GpgYyYU1R2TTojPAXMNbCr93DVgVGcdIXgaQ=", + "lastModified": 1729988849, + "narHash": "sha256-5t+ZPFtNPpcNi02JOKLtvT0wx2IcaTWatJlJCb+rf0o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1c41a27405aa44b94ba10c2002c20209e4911ff5", + "rev": "adeeaf07e2742999b826a3126edd6ef366766464", "type": "github" }, "original": { diff --git a/etcnixos/vr.nix b/etcnixos/vr.nix index ebadbc8..527bce2 100644 --- a/etcnixos/vr.nix +++ b/etcnixos/vr.nix @@ -5,17 +5,7 @@ openFirewall = true; # WiVRn 0.20 - package = ( - inputs.wivrn.legacyPackages.${pkgs.system}.wivrn.overrideAttrs (old: { - patches = [ - # Fixes build, see: https://github.com/NixOS/nixpkgs/pull/350069#issuecomment-2425149854 - (pkgs.fetchurl { - url = "https://github.com/WiVRn/WiVRn/commit/d85916b6aaba3b4e9a7367e973b14f60507701fd.diff"; - sha256 = "vm25kWfu2q1d7lL1zW8FNDUxUn25YpuoEYFbNChCWas="; - }) - ]; - }) - ); + package = inputs.wivrn.legacyPackages.${pkgs.system}.wivrn.overrideAttrs; # Write information to /etc/xdg/openxr/1/active_runtime.json, VR applications # will automatically read this and work with wivrn diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 1c568ab..23a6986 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -72,11 +72,11 @@ ] }, "locked": { - "lastModified": 1729864948, - "narHash": "sha256-CeGSqbN6S8JmzYJX/HqZjr7dMGlvHLLnJJarwB45lPs=", + "lastModified": 1730016908, + "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=", "owner": "nix-community", "repo": "home-manager", - "rev": "0c0268a3c80d30b989d0aadbd65f38d4fa27a9a0", + "rev": "e83414058edd339148dc142a8437edb9450574c8", "type": "github" }, "original": { @@ -98,11 +98,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1729841254, - "narHash": "sha256-KywrT/D1yMOLxc2xDJAPx9Z+qVoQw5rCScQR/lU3NTc=", + "lastModified": 1730208970, + "narHash": "sha256-Rz6l5qHcMZ8YfPfoFaC1GTVP2LaYjrjy85eH/2cxxQI=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "d7c058c0c0b8cd5b799a3a3ac4f8a1090454155e", + "rev": "7e336c90d8e6ff2ea4b7f1db599cdf529a137770", "type": "github" }, "original": { @@ -131,11 +131,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1729744939, - "narHash": "sha256-QbfaNQa93yt4KKg5XNi1tUIfGoDIohxFp/PmHi8sruU=", + "lastModified": 1730139178, + "narHash": "sha256-qivw/zu3aaRl8g3Y3VGpu1WwGr6/uPehIP8K4YTsirg=", "owner": "YaLTeR", "repo": "niri", - "rev": "c8044a9b5dbdb3e0648c86a00bfb63acfc06a559", + "rev": "6ecbf2db8a31484fe88b8faa399b9832da6c8a6a", "type": "github" }, "original": { @@ -146,11 +146,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729878015, - "narHash": "sha256-CNWmKiA00tGw+N+fDnt4+JfLF500oofJ7BikcVxg0zw=", + "lastModified": 1730220530, + "narHash": "sha256-CRihEEXQNWxeo1uYmXWFR5RGUFiABbhFvuYX4RKX1J0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6dbbd5a2622d9abf9263a5cb0a85ca218974b085", + "rev": "885c7a77d4d1762cf456d4a7a77cb7061d412221", "type": "github" }, "original": { @@ -174,11 +174,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1729691686, - "narHash": "sha256-BAuPWW+9fa1moZTU+jFh+1cUtmsuF8asgzFwejM4wac=", + "lastModified": 1730137625, + "narHash": "sha256-9z8oOgFZiaguj+bbi3k4QhAD6JabWrnv7fscC/mt0KE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "32e940c7c420600ef0d1ef396dc63b04ee9cad37", + "rev": "64b80bfb316b57cdb8919a9110ef63393d74382a", "type": "github" }, "original": { @@ -205,11 +205,11 @@ ] }, "locked": { - "lastModified": 1729823394, - "narHash": "sha256-RiinJqorqSLKh1oSpiMHnBe6nQdJzE45lX6fSnAuDnI=", + "lastModified": 1730169013, + "narHash": "sha256-rvgF03ODu1uEYbdEsloN4fQrJ+k1NOv/7MJvCpHHnBk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "7e52e80f5faa374ad4c607d62c6d362589cb523f", + "rev": "92eb1268cc19609f2fe24311b871f37bf3dc5afd", "type": "github" }, "original": { @@ -253,11 +253,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1729838433, - "narHash": "sha256-o9D859STqawTSe6mkXpm3xR/gitYgOHy32xOhOfT3vw=", + "lastModified": 1730166465, + "narHash": "sha256-nq7bouXQXaaPPo/E+Jbq+wNHnatD4dY8OxSrRqzvy6s=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "67efa2c559b53d3ca90c131c06c247278783880d", + "rev": "a713cf46cb7db84a0d1b57c3a397c610cad3cf98", "type": "github" }, "original": { @@ -268,16 +268,16 @@ }, "zen-browser": { "locked": { - "lastModified": 1729379018, - "narHash": "sha256-lyGz9ul5QzJ40tUNXlHyvVowz3tbCgUPdfoi6ogq+DY=", - "owner": "matthewpi", + "lastModified": 1730058145, + "narHash": "sha256-msuIkiOd3D2bz/4zzCIKsoVDMp822HyMjE7s46nMX2Q=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "d607bf5d03a31601893680192c85eec359649ea2", + "rev": "f7aceec47e062f753d0c53ca245da58576997354", "type": "github" }, "original": { - "owner": "matthewpi", - "ref": "zen-browser", + "owner": "NixOS", + "ref": "pull/347222/head", "repo": "nixpkgs", "type": "github" } diff --git a/home-manager/flake.nix b/home-manager/flake.nix index b99e053..ae5106d 100644 --- a/home-manager/flake.nix +++ b/home-manager/flake.nix @@ -28,7 +28,7 @@ zen-browser = { # https://github.com/NixOS/nixpkgs/pull/347222 - url = "github:matthewpi/nixpkgs/zen-browser"; + url = "github:NixOS/nixpkgs/pull/347222/head"; }; }; diff --git a/home-manager/progs/niri.nix b/home-manager/progs/niri.nix index 15524e3..eba8111 100644 --- a/home-manager/progs/niri.nix +++ b/home-manager/progs/niri.nix @@ -21,7 +21,7 @@ }; spawn-at-startup = [ - # waybar + # waybar (status bar) { command = [ "${pkgs.waybar}/bin/waybar" ]; } # swaybg works on more than just sway (sets a wallpaper) @@ -47,18 +47,27 @@ window-rules = [ { draw-border-with-background = false; } { - geometry-corner-radius = { - top-left = 10.0; - top-right = 10.0; - bottom-right = 10.0; - bottom-left = 10.0; - }; + geometry-corner-radius = + let + radius = 10.0; + in + { + top-left = radius; + top-right = radius; + bottom-right = radius; + bottom-left = radius; + }; } { clip-to-geometry = true; } ]; + # https://github.com/sodiboo/niri-flake/issues/591 + # switch-events = with config.lib.niri.actions; { + # "lid-close" = spawn [ "${pkgs.swaylock}/bin/swaylock"]; + # }; + binds = with config.lib.niri.actions; { - # application launcher + # Application launcher "Mod+Space".action = spawn [ "${pkgs.rofi-wayland}/bin/rofi" "-show" @@ -82,37 +91,38 @@ "-u" "up" ]; + "XF86AudioLowerVolume".action = spawn [ "${pkgs.avizo}/bin/volumectl" "-u" "down" ]; + "XF86AudioMute".action = spawn [ "${pkgs.avizo}/bin/volumectl" "toggle-mute" ]; - "XF86AudioMicMute".action = spawn [ - "${pkgs.avizo}/bin/volumectl" - "-m" - "toggle-mute" - ]; #Display Brightness control "XF86MonBrightnessUp".action = spawn [ "${pkgs.avizo}/bin/lightctl" "up" ]; + "XF86MonBrightnessDown".action = spawn [ "${pkgs.avizo}/bin/lightctl" "down" ]; + # "Framework" key (F12) + # "XF86AudioMedia".action = spawn []; + # Force close a window "Mod+Q".action = close-window; "Mod+Shift+Q".action = quit; - # bindings for like window management ig + # bindings for window management "Mod+Left".action = focus-column-left; "Mod+Down".action = focus-window-down; @@ -177,7 +187,7 @@ "Mod+Ctrl+U".action = move-column-to-workspace-down; "Mod+Ctrl+I".action = move-column-to-workspace-up; - #does little squeeze thing into the left or right position with another window + # does little squeeze thing into the left or right position with another window "Mod+BracketLeft".action = consume-or-expel-window-left; "Mod+BracketRight".action = consume-or-expel-window-right; diff --git a/home-manager/progs/waybar.nix b/home-manager/progs/waybar.nix index 0ee2610..5b3f0ed 100644 --- a/home-manager/progs/waybar.nix +++ b/home-manager/progs/waybar.nix @@ -11,9 +11,10 @@ margin-bottom = -1; # passthrough = false; height = 32; - modules-left = - [ - ]; + modules-left = [ + "niri/workspaces" + "niri/window" + ]; modules-center = [ "clock" ]; modules-right = [ "cpu" @@ -24,11 +25,27 @@ "network" "battery" ]; + + "niri/workspaces" = { + format = "{icon}"; + format-icons = { + + # Icons by state + active = "ο†’"; + default = "ο„‘"; + }; + }; + + "niri/window" = { + format = "{}"; + }; + cpu = { interval = 5; format = "ο‹› {usage}%"; max-length = 10; }; + memory = { interval = 10; format = " {percentage}%"; @@ -36,10 +53,12 @@ tooltip = true; tooltip-format = "RAM - {used:0.1f}GiB used"; }; + tray = { icon-size = 18; spacing = 3; }; + clock = { format = " {:%R\n %d.%m.%Y}"; tooltip-format = "{calendar}"; @@ -57,6 +76,7 @@ today = "{}"; }; }; + actions = { on-click-right = "mode"; on-click-forward = "tz_up"; diff --git a/home-manager/system-mreow.nix b/home-manager/system-mreow.nix index 6d469ec..d83ef97 100644 --- a/home-manager/system-mreow.nix +++ b/home-manager/system-mreow.nix @@ -22,10 +22,14 @@ wdisplays intel-gpu-tools + blueman + # used by /etc/nixos logic to launch niri config.programs.niri.package ]; + services.blueman-applet.enable = true; + # media controls systemd.user.services.mpris-proxy = { Unit.Description = "Mpris proxy"; From 7216982046c87c72f468710d224526749bf85b1c Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 29 Oct 2024 12:57:11 -0400 Subject: [PATCH 070/724] niri: disable arrow key usage in bindings --- home-manager/progs/niri.nix | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/home-manager/progs/niri.nix b/home-manager/progs/niri.nix index eba8111..18f0bd5 100644 --- a/home-manager/progs/niri.nix +++ b/home-manager/progs/niri.nix @@ -103,7 +103,7 @@ "toggle-mute" ]; - #Display Brightness control + # Display Brightness control "XF86MonBrightnessUp".action = spawn [ "${pkgs.avizo}/bin/lightctl" "up" @@ -123,22 +123,11 @@ "Mod+Shift+Q".action = quit; # bindings for window management - - "Mod+Left".action = focus-column-left; - "Mod+Down".action = focus-window-down; - "Mod+Up".action = focus-window-up; - "Mod+Right".action = focus-column-right; - "Mod+H".action = focus-column-left; "Mod+J".action = focus-window-down; "Mod+K".action = focus-window-up; "Mod+L".action = focus-column-right; - "Mod+Ctrl+Left".action = move-column-left; - "Mod+Ctrl+Down".action = move-window-down; - "Mod+Ctrl+Up".action = move-window-up; - "Mod+Ctrl+Right".action = move-column-right; - "Mod+Ctrl+H".action = move-column-left; "Mod+Ctrl+J".action = move-window-down; "Mod+Ctrl+K".action = move-window-up; @@ -155,21 +144,11 @@ "Mod+Ctrl+Home".action = move-column-to-first; "Mod+Ctrl+End".action = move-column-to-last; - "Mod+Shift+Left".action = focus-monitor-left; - "Mod+Shift+Down".action = focus-monitor-down; - "Mod+Shift+Up".action = focus-monitor-up; - "Mod+Shift+Right".action = focus-monitor-right; - "Mod+Shift+H".action = focus-monitor-left; "Mod+Shift+J".action = focus-monitor-down; "Mod+Shift+K".action = focus-monitor-up; "Mod+Shift+L".action = focus-monitor-right; - "Mod+Shift+Ctrl+Left".action = move-column-to-monitor-left; - "Mod+Shift+Ctrl+Down".action = move-column-to-monitor-down; - "Mod+Shift+Ctrl+Up".action = move-column-to-monitor-up; - "Mod+Shift+Ctrl+Right".action = move-column-to-monitor-right; - "Mod+Shift+Ctrl+H".action = move-column-to-monitor-left; "Mod+Shift+Ctrl+J".action = move-column-to-monitor-down; "Mod+Shift+Ctrl+K".action = move-column-to-monitor-up; @@ -180,7 +159,7 @@ "Mod+U".action = focus-workspace-down; "Mod+I".action = focus-workspace-up; - #move a window up and down workspaces + # move a window up and down workspaces "Mod+Ctrl+Page_Down".action = move-column-to-workspace-down; "Mod+Ctrl+Page_Up".action = move-column-to-workspace-up; From f07f1825eae21224e00864f2a748e3b8644bb078 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 29 Oct 2024 13:02:59 -0400 Subject: [PATCH 071/724] move framework 13 easyeffects config to a seperate file --- .../progs/framework-13-easyeffects.nix | 121 ++++++++++++++++++ home-manager/system-mreow.nix | 114 +---------------- 2 files changed, 123 insertions(+), 112 deletions(-) create mode 100644 home-manager/progs/framework-13-easyeffects.nix diff --git a/home-manager/progs/framework-13-easyeffects.nix b/home-manager/progs/framework-13-easyeffects.nix new file mode 100644 index 0000000..1dca4e1 --- /dev/null +++ b/home-manager/progs/framework-13-easyeffects.nix @@ -0,0 +1,121 @@ +{ + 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"; + }; +} diff --git a/home-manager/system-mreow.nix b/home-manager/system-mreow.nix index d83ef97..778fd90 100644 --- a/home-manager/system-mreow.nix +++ b/home-manager/system-mreow.nix @@ -16,6 +16,8 @@ ./progs/waybar.nix ./progs/swaylock.nix + + ./progs/framework-13-easyeffects.nix ]; home.packages = with pkgs; [ @@ -73,116 +75,4 @@ import ./progs/borg.nix { inherit homeDirectory borgPasswordFile; }; }; - # 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"; - }; } From ee0f3913b55e33186e44333b54be236830d84f6b Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 29 Oct 2024 13:27:11 -0400 Subject: [PATCH 072/724] niri: adjust top gap --- home-manager/flake.lock | 6 +++--- home-manager/progs/niri.nix | 10 ++++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 23a6986..f0d022a 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -146,11 +146,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1730220530, - "narHash": "sha256-CRihEEXQNWxeo1uYmXWFR5RGUFiABbhFvuYX4RKX1J0=", + "lastModified": 1730221053, + "narHash": "sha256-jUBneD6xhjyIi5u0PqMKSUypaiTY9CBbsTBccPeywbo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "885c7a77d4d1762cf456d4a7a77cb7061d412221", + "rev": "99fc8650b2e85bf36a3d5c629b63a332c707c0fe", "type": "github" }, "original": { diff --git a/home-manager/progs/niri.nix b/home-manager/progs/niri.nix index 18f0bd5..f56a0e2 100644 --- a/home-manager/progs/niri.nix +++ b/home-manager/progs/niri.nix @@ -20,6 +20,16 @@ }; }; + layout = { + gaps = 16; + struts = { + # left = 16; + # right = 16; + top = -8; + # bottom = 16; + }; + }; + spawn-at-startup = [ # waybar (status bar) { command = [ "${pkgs.waybar}/bin/waybar" ]; } From 55ecee5642373c24841697b8e0711f81fb0567e1 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 29 Oct 2024 13:37:44 -0400 Subject: [PATCH 073/724] niri: focus-ring! --- home-manager/progs/niri.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/home-manager/progs/niri.nix b/home-manager/progs/niri.nix index f56a0e2..6537f57 100644 --- a/home-manager/progs/niri.nix +++ b/home-manager/progs/niri.nix @@ -28,6 +28,12 @@ top = -8; # bottom = 16; }; + focus-ring = { + enable = true; + active = { + color = "pink"; + }; + }; }; spawn-at-startup = [ From c11a6d1751ad4d0cf80df6acde004ef324ef44d9 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 31 Oct 2024 09:41:10 -0400 Subject: [PATCH 074/724] niri: switch-events lid-close --- home-manager/flake.lock | 40 ++++++++++++++++++------------------- home-manager/flake.nix | 4 ++-- home-manager/progs/niri.nix | 6 +++--- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/home-manager/flake.lock b/home-manager/flake.lock index f0d022a..d2d7d37 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -98,11 +98,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1730208970, - "narHash": "sha256-Rz6l5qHcMZ8YfPfoFaC1GTVP2LaYjrjy85eH/2cxxQI=", + "lastModified": 1730380035, + "narHash": "sha256-fyK2lLnsYJTBkPxhynNCmjxwbAItzRg6oLPF+NC2kgw=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "7e336c90d8e6ff2ea4b7f1db599cdf529a137770", + "rev": "e2a1396edb2410a04eb2b02c93fb9203352a8a92", "type": "github" }, "original": { @@ -131,11 +131,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1730139178, - "narHash": "sha256-qivw/zu3aaRl8g3Y3VGpu1WwGr6/uPehIP8K4YTsirg=", + "lastModified": 1730263923, + "narHash": "sha256-HFOXeh+WNtAwuV/KNtOSKXGnOoy465a/dud2zvtsCt8=", "owner": "YaLTeR", "repo": "niri", - "rev": "6ecbf2db8a31484fe88b8faa399b9832da6c8a6a", + "rev": "d3e72245b003cbeed0810bf00c4a445b7c8a652a", "type": "github" }, "original": { @@ -146,16 +146,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1730221053, - "narHash": "sha256-jUBneD6xhjyIi5u0PqMKSUypaiTY9CBbsTBccPeywbo=", + "lastModified": 1730200266, + "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "99fc8650b2e85bf36a3d5c629b63a332c707c0fe", + "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", "type": "github" }, "original": { "owner": "NixOS", - "ref": "master", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -205,11 +205,11 @@ ] }, "locked": { - "lastModified": 1730169013, - "narHash": "sha256-rvgF03ODu1uEYbdEsloN4fQrJ+k1NOv/7MJvCpHHnBk=", + "lastModified": 1730341826, + "narHash": "sha256-RFaeY7EWzXOmAL2IQEACbnrEza3TgD5UQApHR4hGHhY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "92eb1268cc19609f2fe24311b871f37bf3dc5afd", + "rev": "815d1b3ee71716fc91a7bd149801e1f04d45fbc5", "type": "github" }, "original": { @@ -236,16 +236,16 @@ "xwayland-satellite-stable": { "flake": false, "locked": { - "lastModified": 1718165778, - "narHash": "sha256-dwF9nI54a6Fo9XU5s4qmvMXSgCid3YQVGxch00qEMvI=", + "lastModified": 1730166465, + "narHash": "sha256-nq7bouXQXaaPPo/E+Jbq+wNHnatD4dY8OxSrRqzvy6s=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "b6d281967cb0b7bf1dfdb8d0f597b517dc4aa5c5", + "rev": "a713cf46cb7db84a0d1b57c3a397c610cad3cf98", "type": "github" }, "original": { "owner": "Supreeeme", - "ref": "v0.4", + "ref": "v0.5", "repo": "xwayland-satellite", "type": "github" } @@ -253,11 +253,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1730166465, - "narHash": "sha256-nq7bouXQXaaPPo/E+Jbq+wNHnatD4dY8OxSrRqzvy6s=", + "lastModified": 1730258684, + "narHash": "sha256-E+69sdxUhPSNI8+JlTL6KKbNv5qVD3L1y8hdVO37A44=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "a713cf46cb7db84a0d1b57c3a397c610cad3cf98", + "rev": "b0ee6db9fa9901c675b3c7e952c2a8ce987a0f58", "type": "github" }, "original": { diff --git a/home-manager/flake.nix b/home-manager/flake.nix index ae5106d..37ae0c4 100644 --- a/home-manager/flake.nix +++ b/home-manager/flake.nix @@ -2,8 +2,8 @@ description = "My nixOS flake for home-manager"; inputs = { - # nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - nixpkgs.url = "github:NixOS/nixpkgs/master"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + # nixpkgs.url = "github:NixOS/nixpkgs/master"; home-manager = { url = "github:nix-community/home-manager"; diff --git a/home-manager/progs/niri.nix b/home-manager/progs/niri.nix index 6537f57..b35d0e7 100644 --- a/home-manager/progs/niri.nix +++ b/home-manager/progs/niri.nix @@ -78,9 +78,9 @@ ]; # https://github.com/sodiboo/niri-flake/issues/591 - # switch-events = with config.lib.niri.actions; { - # "lid-close" = spawn [ "${pkgs.swaylock}/bin/swaylock"]; - # }; + switch-events = with config.lib.niri.actions; { + "lid-close".action = spawn "${pkgs.swaylock}/bin/swaylock"; + }; binds = with config.lib.niri.actions; { # Application launcher From 0f6ca8e4a3ab6918ba0b417e8c8154ba1ecb482c Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 31 Oct 2024 09:41:19 -0400 Subject: [PATCH 075/724] update --- etcnixos/flake.lock | 38 +++++++++++++++++++------------------- etcnixos/flake.nix | 4 ++-- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 2c7cd0e..4ca21f9 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -33,11 +33,11 @@ ] }, "locked": { - "lastModified": 1729599319, - "narHash": "sha256-e/4JPcIRte5zkwqmGFrFo3763e0iHURX6N0apz4jbI0=", + "lastModified": 1730321876, + "narHash": "sha256-hG8dCERfiM1yUDRWvEplr9kMgEe79xWaeF1On4H5gcs=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "1b86b304c8eb1437d9337a760e7f930826fc4d6d", + "rev": "6d2d6b13f317bcc6ef0709974962b1d49dedb102", "type": "github" }, "original": { @@ -186,11 +186,11 @@ ] }, "locked": { - "lastModified": 1729414726, - "narHash": "sha256-Dtmm1OU8Ymiy9hVWn/a2B8DhRYo9Eoyx9veERdOBR4o=", + "lastModified": 1730016908, + "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=", "owner": "nix-community", "repo": "home-manager", - "rev": "fe56302339bb28e3471632379d733547caec8103", + "rev": "e83414058edd339148dc142a8437edb9450574c8", "type": "github" }, "original": { @@ -208,11 +208,11 @@ ] }, "locked": { - "lastModified": 1729177642, - "narHash": "sha256-DdKal+ZhB9QD/tnEwFg4cZ4j4YnrkvSljBxnyG+3eE0=", + "lastModified": 1730248099, + "narHash": "sha256-Fl7BSdpLk0uTXF6ol/MR0q1EB4XQ8tn0ftig0pyYh5Y=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "bb69165ff372ddbd3228a03513922acd783040e8", + "rev": "c11bab124fc55a37cbd854ed28ea121ed609231f", "type": "github" }, "original": { @@ -255,11 +255,11 @@ ] }, "locked": { - "lastModified": 1690328911, - "narHash": "sha256-fxtExYk+aGf2YbjeWQ8JY9/n9dwuEt+ma1eUFzF8Jeo=", + "lastModified": 1729697500, + "narHash": "sha256-VFTWrbzDlZyFHHb1AlKRiD/qqCJIripXKiCSFS8fAOY=", "owner": "zhaofengli", "repo": "nix-github-actions", - "rev": "96df4a39c52f53cb7098b923224d8ce941b64747", + "rev": "e418aeb728b6aa5ca8c5c71974e7159c2df1d8cf", "type": "github" }, "original": { @@ -271,11 +271,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1730161780, - "narHash": "sha256-z5ILcmwMtiCoHTXS1KsQWqigO7HJO8sbyK7f7wn9F/E=", + "lastModified": 1730368399, + "narHash": "sha256-F8vJtG389i9fp3k2/UDYHMed3PLCJYfxCqwiVP7b9ig=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "07d15e8990d5d86a631641b4c429bc0a7400cfb8", + "rev": "da14839ac5f38ee6adbdb4e6db09b5eef6d6ccdc", "type": "github" }, "original": { @@ -287,16 +287,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1730218704, - "narHash": "sha256-rAurlpnoe4bbg73RZRHjnAwVtz2LBWH/uEi9UY2sQyQ=", + "lastModified": 1730200266, + "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "963f723f4c5cf8267e0798630705eb87c1ac33fb", + "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", "type": "github" }, "original": { "owner": "NixOS", - "ref": "master", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/etcnixos/flake.nix b/etcnixos/flake.nix index d4cfe36..81d2001 100644 --- a/etcnixos/flake.nix +++ b/etcnixos/flake.nix @@ -2,8 +2,8 @@ description = "A simple NixOS flake"; inputs = { - # nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - nixpkgs.url = "github:NixOS/nixpkgs/master"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + # nixpkgs.url = "github:NixOS/nixpkgs/master"; lanzaboote = { url = "github:nix-community/lanzaboote"; From c11f415516325fdf2e90961787e04976a17133b8 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 31 Oct 2024 17:13:50 -0400 Subject: [PATCH 076/724] niri: disable hotkey overlay --- etcnixos/flake.lock | 6 +++--- home-manager/flake.lock | 6 +++--- home-manager/progs/niri.nix | 3 +++ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 4ca21f9..45f18ea 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -33,11 +33,11 @@ ] }, "locked": { - "lastModified": 1730321876, - "narHash": "sha256-hG8dCERfiM1yUDRWvEplr9kMgEe79xWaeF1On4H5gcs=", + "lastModified": 1730390431, + "narHash": "sha256-M+rMhDB69Y35IlhmAMN4ErDige+wKPwhb6HDqpF14Rw=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "6d2d6b13f317bcc6ef0709974962b1d49dedb102", + "rev": "40388a7427ee32af175c5169ae7587ffd2dec125", "type": "github" }, "original": { diff --git a/home-manager/flake.lock b/home-manager/flake.lock index d2d7d37..17d79ff 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -268,11 +268,11 @@ }, "zen-browser": { "locked": { - "lastModified": 1730058145, - "narHash": "sha256-msuIkiOd3D2bz/4zzCIKsoVDMp822HyMjE7s46nMX2Q=", + "lastModified": 1730405295, + "narHash": "sha256-SBzYL8zvc3kLmYQW0bCUbx0/uDw5UeABnNXPiLTQ00o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f7aceec47e062f753d0c53ca245da58576997354", + "rev": "7f331be6dee99c4eb430ebedc9cece413aec4aad", "type": "github" }, "original": { diff --git a/home-manager/progs/niri.nix b/home-manager/progs/niri.nix index b35d0e7..083aaa9 100644 --- a/home-manager/progs/niri.nix +++ b/home-manager/progs/niri.nix @@ -14,6 +14,9 @@ # DISPLAY = ":0"; # }; + # skip the hotkey menu thingy + hotkey-overlay.skip-at-startup = true; + outputs = { "BOE 0x095F Unknown" = { scale = 1.5; From aaf3d5a879a6518fa16fd0f1c48995455401c43b Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 31 Oct 2024 17:18:37 -0400 Subject: [PATCH 077/724] vr: fix package --- etcnixos/vr.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etcnixos/vr.nix b/etcnixos/vr.nix index 527bce2..f0a36a1 100644 --- a/etcnixos/vr.nix +++ b/etcnixos/vr.nix @@ -5,7 +5,7 @@ openFirewall = true; # WiVRn 0.20 - package = inputs.wivrn.legacyPackages.${pkgs.system}.wivrn.overrideAttrs; + package = inputs.wivrn.legacyPackages.${pkgs.system}.wivrn; # Write information to /etc/xdg/openxr/1/active_runtime.json, VR applications # will automatically read this and work with wivrn From 9b34a0c3a203e448b21bcd6e6ce1660043264a3e Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 9 Nov 2024 13:24:47 -0500 Subject: [PATCH 078/724] things --- etcnixos/common.nix | 1 + etcnixos/distrobox.nix | 8 ++++ etcnixos/flake.lock | 66 ++++++++++++++-------------- etcnixos/secrets/wifi-passwords.nix | Bin 339 -> 423 bytes home-manager/flake.lock | 62 +++++++++++++------------- home-manager/gui.nix | 1 + home-manager/no-gui.nix | 2 + 7 files changed, 76 insertions(+), 64 deletions(-) create mode 100644 etcnixos/distrobox.nix diff --git a/etcnixos/common.nix b/etcnixos/common.nix index 4dd0823..31ff7e0 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -11,6 +11,7 @@ { imports = [ ./declarative-nm.nix + ./distrobox.nix inputs.nixos-hardware.nixosModules.common-pc-ssd ]; diff --git a/etcnixos/distrobox.nix b/etcnixos/distrobox.nix new file mode 100644 index 0000000..f85b99e --- /dev/null +++ b/etcnixos/distrobox.nix @@ -0,0 +1,8 @@ +{ pkgs, ... }: +{ + virtualisation.podman = { + enable = true; + }; + + environment.systemPackages = [ pkgs.distrobox ]; +} diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 45f18ea..6acf904 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -33,11 +33,11 @@ ] }, "locked": { - "lastModified": 1730390431, - "narHash": "sha256-M+rMhDB69Y35IlhmAMN4ErDige+wKPwhb6HDqpF14Rw=", + "lastModified": 1731000594, + "narHash": "sha256-Fl0SrKBg1aH1d/z4hflP54Htdw8P8KHfgXzipUnAVhQ=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "40388a7427ee32af175c5169ae7587ffd2dec125", + "rev": "95b190eebfa073bc748bf52dc874f69a5d22b8ef", "type": "github" }, "original": { @@ -49,11 +49,11 @@ }, "crane": { "locked": { - "lastModified": 1730060262, - "narHash": "sha256-RMgSVkZ9H03sxC+Vh4jxtLTCzSjPq18UWpiM0gq6shQ=", + "lastModified": 1730652660, + "narHash": "sha256-+XVYfmVXAiYA0FZT7ijHf555dxCe+AoAT5A6RU+6vSo=", "owner": "ipetkov", "repo": "crane", - "rev": "498d9f122c413ee1154e8131ace5a35a80d8fa76", + "rev": "a4ca93905455c07cb7e3aca95d4faf7601cba458", "type": "github" }, "original": { @@ -108,11 +108,11 @@ ] }, "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", "type": "github" }, "original": { @@ -186,11 +186,11 @@ ] }, "locked": { - "lastModified": 1730016908, - "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=", + "lastModified": 1730837930, + "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", "owner": "nix-community", "repo": "home-manager", - "rev": "e83414058edd339148dc142a8437edb9450574c8", + "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", "type": "github" }, "original": { @@ -208,11 +208,11 @@ ] }, "locked": { - "lastModified": 1730248099, - "narHash": "sha256-Fl7BSdpLk0uTXF6ol/MR0q1EB4XQ8tn0ftig0pyYh5Y=", + "lastModified": 1730962714, + "narHash": "sha256-Zi2NfnEqB+Xfxtnx6arIohSarXiJmwTqVa3nSpNWx30=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "c11bab124fc55a37cbd854ed28ea121ed609231f", + "rev": "93b525229c99fec0016db72a174f43b9d6237714", "type": "github" }, "original": { @@ -233,11 +233,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1730107060, - "narHash": "sha256-EnVVq1oNcimZmQYl6UlLYs0jhC6aLah0bsFMy2syEak=", + "lastModified": 1730739295, + "narHash": "sha256-aYeJ/P/9AuK6Kee63ZdsmDjEwhnksF+gIv/OyGtlBJE=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "0ad4ce46649b390da8bebcc229917f9863c98fe2", + "rev": "cef39a78679c266300874e7a7000b4da066228d4", "type": "github" }, "original": { @@ -271,11 +271,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1730368399, - "narHash": "sha256-F8vJtG389i9fp3k2/UDYHMed3PLCJYfxCqwiVP7b9ig=", + "lastModified": 1730919458, + "narHash": "sha256-yMO0T0QJlmT/x4HEyvrCyigGrdYfIXX3e5gWqB64wLg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "da14839ac5f38ee6adbdb4e6db09b5eef6d6ccdc", + "rev": "e1cc1f6483393634aee94514186d21a4871e78d7", "type": "github" }, "original": { @@ -287,11 +287,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1730200266, - "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", + "lastModified": 1730785428, + "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", + "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "type": "github" }, "original": { @@ -331,11 +331,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1729104314, - "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", + "lastModified": 1730302582, + "narHash": "sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", + "rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf", "type": "github" }, "original": { @@ -362,11 +362,11 @@ ] }, "locked": { - "lastModified": 1729996302, - "narHash": "sha256-QEU1NQq1+7s1na69Chig9K0iDDTKN0O4Zreo9A9rccA=", + "lastModified": 1730601085, + "narHash": "sha256-Sgax33jGuvVHTjl1P78IwzlhAGyOxtx5Q26inKja8S4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a1b337569f334ff0a01b57627f17b201d746d24c", + "rev": "8d1b40f8dfd7539aaa3de56e207e22b3cc451825", "type": "github" }, "original": { @@ -392,11 +392,11 @@ }, "wivrn": { "locked": { - "lastModified": 1729988849, - "narHash": "sha256-5t+ZPFtNPpcNi02JOKLtvT0wx2IcaTWatJlJCb+rf0o=", + "lastModified": 1730755482, + "narHash": "sha256-gqgtsxQY2+MqGf6KCr8AzZhrCQMPFEkmohiLhmUXTtQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "adeeaf07e2742999b826a3126edd6ef366766464", + "rev": "b8c29c40b67974daaf97e5f3a7bbe98b9f8b775e", "type": "github" }, "original": { diff --git a/etcnixos/secrets/wifi-passwords.nix b/etcnixos/secrets/wifi-passwords.nix index e1cbb8c990f55e1df3162b605be4531ba1c5ba10..4027cc30f16b386233d934dadf791e1da51bb80a 100644 GIT binary patch literal 423 zcmZQ@_Y83kiVO&0Sa<$`oBjT~>n(OEmG~}swk)^0u5PY(jhU9m9jBKPuO4|QGm8xrX52fslK0bRsmV(MGF#mi&OF1- zU%oc*m)p0}on__I%_CW+7pyZ`byWJD;pBxc9(|jmpOn8mKsMv-n^}67Z*CI{TII9( zM8Ul5!k6!SWeP7X=DWSZZ+}B-+UDnqE(_i7E>-v5x?O{s6%lcK;Iib>UhX3`brw?)oP%z2u#NOdcFcVEQw z8(})dDtAABn4Oq4rN!h>L*uv{y@@e|VV~}2DW&pxt#?{YPcTfg_*zx_Kr@r&%82%VUV8;@8j?O1UB z!p#Y@h0eyEI6CvCbi?Nx|NnDMDGPpD)%@$Bef!i3%{;4+7j9{r-=1Fjq-9|a=Z*_o z_5VxC-jCURSx!@<`+JC+#Uk}PA8zMOwT;@Poy|L|XsM%t>RyNSCzDsI9A{B(pL}Nf zryp9k?y)bEH*T-oZdm)>YVW3l8Z*-35@c1D{yyrP>?s(`>-OH|#I7Ko&C`yUPjGZw z?UBo1e!$}HKh*y~7hyw`c7AI9=sax7B=&8Hc;veyE main From 68501a7221cf3b0af32bf2394a770441b51b790a Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 16 Nov 2024 14:03:35 -0500 Subject: [PATCH 079/724] update --- etcnixos/flake.lock | 36 ++++++------- etcnixos/secrets/wifi-passwords.nix | Bin 423 -> 472 bytes home-manager/flake.lock | 81 +++++++++------------------- home-manager/gui.nix | 2 + home-manager/no-gui.nix | 2 + 5 files changed, 47 insertions(+), 74 deletions(-) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 6acf904..c23127e 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -33,11 +33,11 @@ ] }, "locked": { - "lastModified": 1731000594, - "narHash": "sha256-Fl0SrKBg1aH1d/z4hflP54Htdw8P8KHfgXzipUnAVhQ=", + "lastModified": 1731678403, + "narHash": "sha256-kcsXMNjQQK3hgUBaH9JoyHyESRvDhFV7L0GqVha3C40=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "95b190eebfa073bc748bf52dc874f69a5d22b8ef", + "rev": "d9d59a2819215227199b5eeab06a7e5fb56681f7", "type": "github" }, "original": { @@ -186,11 +186,11 @@ ] }, "locked": { - "lastModified": 1730837930, - "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", + "lastModified": 1731535640, + "narHash": "sha256-2EckCJn4wxran/TsRiCOFcmVpep2m9EBKl99NBh2GnM=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", + "rev": "35b055009afd0107b69c286fca34d2ad98940d57", "type": "github" }, "original": { @@ -208,11 +208,11 @@ ] }, "locked": { - "lastModified": 1730962714, - "narHash": "sha256-Zi2NfnEqB+Xfxtnx6arIohSarXiJmwTqVa3nSpNWx30=", + "lastModified": 1731227601, + "narHash": "sha256-aGUQ6W/Oxd9xjH9RQbnUtC61sTK2fWlKr+J7kavT/RQ=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "93b525229c99fec0016db72a174f43b9d6237714", + "rev": "7691d0ac1deb6ac7482c5a22fe1a14a34ca608b0", "type": "github" }, "original": { @@ -271,11 +271,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1730919458, - "narHash": "sha256-yMO0T0QJlmT/x4HEyvrCyigGrdYfIXX3e5gWqB64wLg=", + "lastModified": 1731740897, + "narHash": "sha256-teFd31vsE/0Z0WR6XVeKhKPw6Eyb2gXGpG0tjpMfBDM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e1cc1f6483393634aee94514186d21a4871e78d7", + "rev": "c2c275fbb2e656948ba6e1f67b8ddd430f158c5f", "type": "github" }, "original": { @@ -287,11 +287,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1730785428, - "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", + "lastModified": 1731319897, + "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", + "rev": "dc460ec76cbff0e66e269457d7b728432263166c", "type": "github" }, "original": { @@ -392,11 +392,11 @@ }, "wivrn": { "locked": { - "lastModified": 1730755482, - "narHash": "sha256-gqgtsxQY2+MqGf6KCr8AzZhrCQMPFEkmohiLhmUXTtQ=", + "lastModified": 1731261253, + "narHash": "sha256-1PbE3SspU7JNWxPPnedMbdQAHJEpgU6dbC7HOqhQ0lM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b8c29c40b67974daaf97e5f3a7bbe98b9f8b775e", + "rev": "e4af0971e2827ed49e0322850ec3d1b0b449558b", "type": "github" }, "original": { diff --git a/etcnixos/secrets/wifi-passwords.nix b/etcnixos/secrets/wifi-passwords.nix index 4027cc30f16b386233d934dadf791e1da51bb80a..0d5264cfe152a15e679c110864ef5cba4f259e0b 100644 GIT binary patch literal 472 zcmZQ@_Y83kiVO&0(9vd_xu8+!Cr6v|^-Y`JSwG&eTVipNTZrpN^R8pYyN^FSSN-3| zMR~vEKkfW>)3(B^LJK|~DZTQSr%Nq%w!D^#pvyDG4{it3qPBZa=vlwS?)Rcj3+^); zg@lR@tBd<){+-3~Thy!Up5fl(YkdbF#B@nHeB+CGlZ?@|A=_&qht&ty-X6nLn^ z>C%EnE}K0gxAvbG)>J%yl~1ljr!H#xw~widRx2!toFe~e@jixB**m&#uDD9tBt}+= zt%!I%{gYux`0^$PkJ>7WKPwh5eI3%!x+rncZpFDDBg2<71|iq literal 423 zcmZQ@_Y83kiVO&0Sa<$`oBjT~>n(OEmG~}swk)^0u5PY(jhU9m9jBKPuO4|QGm8xrX52fslK0bRsmV(MGF#mi&OF1- zU%oc*m)p0}on__I%_CW+7pyZ`byWJD;pBxc9(|jmpOn8mKsMv-n^}67Z*CI{TII9( zM8Ul5!k6!SWeP7X=DWSZZ+}B-+UDnqE(_i7E>-v5x?O{s6%lcK;Iib>UhX3`brw?)oP%z2u#NOdcFcVEQw z8(})dDtAABn4Oq4rN!h>L*uv{y@@e|VV~ Date: Sun, 24 Nov 2024 13:19:18 -0500 Subject: [PATCH 080/724] update --- etcnixos/common.nix | 1 + etcnixos/flake.lock | 42 ++++++++++++++--------------- home-manager/flake.lock | 50 +++++++++++++++++------------------ home-manager/gui.nix | 21 ++++++++++++++- home-manager/no-gui.nix | 1 + home-manager/progs/niri.nix | 26 +++++++++--------- home-manager/system-mreow.nix | 12 ++------- 7 files changed, 82 insertions(+), 71 deletions(-) diff --git a/etcnixos/common.nix b/etcnixos/common.nix index 31ff7e0..ebc0ff0 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -37,6 +37,7 @@ # kernel options boot = { kernelPackages = pkgs.linuxPackages_cachyos-lto; + # kernelPackages = pkgs.linuxPackages; kernel.sysctl = { # dmesg shushhhhh diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index c23127e..274e694 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -33,11 +33,11 @@ ] }, "locked": { - "lastModified": 1731678403, - "narHash": "sha256-kcsXMNjQQK3hgUBaH9JoyHyESRvDhFV7L0GqVha3C40=", + "lastModified": 1732400024, + "narHash": "sha256-uf1QzIl0Jj5dr7+erWjHWiCUEvywLaR7ir1jcqGgjeQ=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "d9d59a2819215227199b5eeab06a7e5fb56681f7", + "rev": "376a2e022a5d8fa21cecb5bb0fef0cb54db5cdfc", "type": "github" }, "original": { @@ -186,11 +186,11 @@ ] }, "locked": { - "lastModified": 1731535640, - "narHash": "sha256-2EckCJn4wxran/TsRiCOFcmVpep2m9EBKl99NBh2GnM=", + "lastModified": 1732303962, + "narHash": "sha256-5Umjb5AdtxV5jSJd5jxoCckh5mlg+FBQDsyAilu637g=", "owner": "nix-community", "repo": "home-manager", - "rev": "35b055009afd0107b69c286fca34d2ad98940d57", + "rev": "8cf9cb2ee78aa129e5b8220135a511a2be254c0c", "type": "github" }, "original": { @@ -208,11 +208,11 @@ ] }, "locked": { - "lastModified": 1731227601, - "narHash": "sha256-aGUQ6W/Oxd9xjH9RQbnUtC61sTK2fWlKr+J7kavT/RQ=", + "lastModified": 1732032028, + "narHash": "sha256-NjyfJQQxs/a2a/KwTmXM44K7XjeJwGsf4YFtebueQzo=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "7691d0ac1deb6ac7482c5a22fe1a14a34ca608b0", + "rev": "65dc04371cf914c9af4f073638821e4787303005", "type": "github" }, "original": { @@ -233,11 +233,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1730739295, - "narHash": "sha256-aYeJ/P/9AuK6Kee63ZdsmDjEwhnksF+gIv/OyGtlBJE=", + "lastModified": 1731941836, + "narHash": "sha256-zpmAzrvK8KdssBSwiIwwRxaUJ77oWORbW0XFvgCFpTE=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "cef39a78679c266300874e7a7000b4da066228d4", + "rev": "2f48272f34174fd2a5ab3df4d8a46919247be879", "type": "github" }, "original": { @@ -271,11 +271,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1731740897, - "narHash": "sha256-teFd31vsE/0Z0WR6XVeKhKPw6Eyb2gXGpG0tjpMfBDM=", + "lastModified": 1731797098, + "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "c2c275fbb2e656948ba6e1f67b8ddd430f158c5f", + "rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6", "type": "github" }, "original": { @@ -287,11 +287,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731319897, - "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dc460ec76cbff0e66e269457d7b728432263166c", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "type": "github" }, "original": { @@ -392,11 +392,11 @@ }, "wivrn": { "locked": { - "lastModified": 1731261253, - "narHash": "sha256-1PbE3SspU7JNWxPPnedMbdQAHJEpgU6dbC7HOqhQ0lM=", + "lastModified": 1732308363, + "narHash": "sha256-o/qgBWJ1JSeWvdcTqdqMDttoggejk25UnzHiaGrfZUU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e4af0971e2827ed49e0322850ec3d1b0b449558b", + "rev": "5c37b4d31e8531260cfe3d80a39cd9d62ecb547b", "type": "github" }, "original": { diff --git a/home-manager/flake.lock b/home-manager/flake.lock index c693ba9..6d6204f 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1731778696, - "narHash": "sha256-qQYeHamLt0z00G5MTSSxaTw/9zGdebEeYj4MDL+nOCI=", + "lastModified": 1732397793, + "narHash": "sha256-2jaf/zkug22hzlldm1PKdKJLVKgdjVXbf47SF+5mroU=", "owner": "nix-community", "repo": "home-manager", - "rev": "d154a557da07645aaea3b3375317c234cf2eed82", + "rev": "92fef254a9071fa41a13908281284e6a62b9c92e", "type": "github" }, "original": { @@ -79,11 +79,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1731726258, - "narHash": "sha256-hCybwO9VTRC34wG/dE7trehhAkNI0abuQYEd3ebOXgw=", + "lastModified": 1732366896, + "narHash": "sha256-dQrHznGma8aWeBESRUCc1onWYoGrM35GDl/uwEB7eG8=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "8fa219c123e66b7812748a8c380770b7b714bf29", + "rev": "3131d857c946c75557f5b6fb99a113b6949ea04d", "type": "github" }, "original": { @@ -95,16 +95,16 @@ "niri-stable": { "flake": false, "locked": { - "lastModified": 1731164272, - "narHash": "sha256-ea15x8+AAm90aeU1zNWXzX7ZfenzQRUgORyjOdn4Uoc=", + "lastModified": 1731483594, + "narHash": "sha256-Qjf7alRbPPERfiZsM9EMKX+HwjESky1tieh5PJIkLwE=", "owner": "YaLTeR", "repo": "niri", - "rev": "9d8f640503819ff1905c9040d3c7910a50400bbd", + "rev": "75c79116a7e40cbc0e110ce0cdd500e896458679", "type": "github" }, "original": { "owner": "YaLTeR", - "ref": "v0.1.10", + "ref": "v0.1.10.1", "repo": "niri", "type": "github" } @@ -112,11 +112,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1731575130, - "narHash": "sha256-V+bIsYXshtdMv7Ycw1Y/xVfKdWVywXuqHHII7FgV6dg=", + "lastModified": 1732363756, + "narHash": "sha256-/E2aRhcvlH2PkkpC2n79UCMZyIkQKWfG4m//UHkeNgU=", "owner": "YaLTeR", "repo": "niri", - "rev": "1a0612cbfd0abee0796efa86470226686ae78f21", + "rev": "9c7e8d04d27d2f914ad3e9a54c64b64c34aea4d4", "type": "github" }, "original": { @@ -127,11 +127,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731319897, - "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dc460ec76cbff0e66e269457d7b728432263166c", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "type": "github" }, "original": { @@ -143,11 +143,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1731652201, - "narHash": "sha256-XUO0JKP1hlww0d7mm3kpmIr4hhtR4zicg5Wwes9cPMg=", + "lastModified": 1731797254, + "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c21b77913ea840f8bcf9adf4c41cecc2abffd38d", + "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", "type": "github" }, "original": { @@ -174,11 +174,11 @@ ] }, "locked": { - "lastModified": 1731724228, - "narHash": "sha256-3R48B+BVeZ8IWsXF7TdRm441RsdJt21yQ5ZgxuNTXYc=", + "lastModified": 1732328983, + "narHash": "sha256-RHt12f/slrzDpSL7SSkydh8wUE4Nr4r23HlpWywed9E=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "f6c4c2a7b8969c2b172847b3ef474e0d3bd8bdce", + "rev": "ed8aa5b64f7d36d9338eb1d0a3bb60cf52069a72", "type": "github" }, "original": { @@ -222,11 +222,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1731123454, - "narHash": "sha256-W1UUok7DPi4IXCYtc273FbVH1ifuCIcl+oO6CDqt8Dk=", + "lastModified": 1732233710, + "narHash": "sha256-gWf9dX6DVx0ssK2G3yrFG9yMT9UU0mDwyD51z/Q6FTA=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "3e6f892d20d918479e67d1e6c90c4be824a9d4ab", + "rev": "02f30546264ff8407cbb39528b3a3cc3045e53c1", "type": "github" }, "original": { diff --git a/home-manager/gui.nix b/home-manager/gui.nix index 9237602..32206f0 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -60,7 +60,6 @@ mpv mumble system76-keyboard-configurator - mission-center #jellyfin finamp # music player @@ -96,8 +95,28 @@ puddletag epiphany + + mcaselector ]; + programs.zed-editor = { + enable = true; + userSettings = { + ui_font_size = 16; + buffer_font_size = 16; + theme = { + mode = "system"; + light = "Gruvbox Dark Hard"; + dark = "One Dark"; + }; + }; + extensions = [ + "nix" + "sql" + "CSV" + ]; + }; + # make chromium-based stuff use wayland home.file.".config/chromium-flags.conf".text = "--ozone-platform-hint=auto"; diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 5162b14..7677b86 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -13,6 +13,7 @@ ]; home.stateVersion = "24.11"; + home.enableNixpkgsReleaseCheck = false; home.packages = with pkgs; [ # hex viewer diff --git a/home-manager/progs/niri.nix b/home-manager/progs/niri.nix index 083aaa9..d28e532 100644 --- a/home-manager/progs/niri.nix +++ b/home-manager/progs/niri.nix @@ -6,13 +6,13 @@ }: { programs.niri = { - package = pkgs.niri-unstable; + package = pkgs.niri-stable; settings = { prefer-no-csd = true; - # environment = { - # DISPLAY = ":0"; - # }; + environment = { + DISPLAY = ":0"; + }; # skip the hotkey menu thingy hotkey-overlay.skip-at-startup = true; @@ -54,13 +54,13 @@ ]; } - # { - # command = [ - # "${pkgs.xwayland-satellite-unstable}/bin/xwayland-satellite" - # # (builtins.toString config.programs.niri.settings.environment.DISPLAY) - # ":0" - # ]; - # } + { + command = [ + "${pkgs.xwayland-satellite-unstable}/bin/xwayland-satellite" + # (builtins.toString config.programs.niri.settings.environment.DISPLAY) + ":0" + ]; + } ]; window-rules = [ @@ -88,9 +88,7 @@ binds = with config.lib.niri.actions; { # Application launcher "Mod+Space".action = spawn [ - "${pkgs.rofi-wayland}/bin/rofi" - "-show" - "combi" + "${pkgs.fuzzel}/bin/fuzzel" ]; # open a terminal diff --git a/home-manager/system-mreow.nix b/home-manager/system-mreow.nix index 778fd90..e20c30d 100644 --- a/home-manager/system-mreow.nix +++ b/home-manager/system-mreow.nix @@ -28,6 +28,8 @@ # used by /etc/nixos logic to launch niri config.programs.niri.package + + xwayland-satellite-unstable ]; services.blueman-applet.enable = true; @@ -49,16 +51,6 @@ package = pkgs.dunst; }; - # rofi for application launcher - programs.rofi = { - enable = true; - package = pkgs.rofi-wayland; - extraConfig = { - modi = "window,drun,ssh,combi"; - combi-modi = "window,drun,ssh"; - }; - }; - age.secrets.borg-laptop-password = { file = ./secrets/borg-laptop-password.age; path = "${homeDirectory}/.secrets/borg_bak_pass"; From 6e9312f2f52e128185cdc4e5f1438b877f745ac0 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 6 Dec 2024 10:10:23 -0500 Subject: [PATCH 081/724] update --- etcnixos/flake.lock | 36 ++++---- etcnixos/system-mreow.nix | 5 ++ home-manager/flake.lock | 70 +++++++++------ home-manager/flake.nix | 6 +- home-manager/gui.nix | 113 +++++++++++++------------ home-manager/no-gui.nix | 27 +++--- home-manager/progs/gpt4all/gpt4all.nix | 9 ++ 7 files changed, 147 insertions(+), 119 deletions(-) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 274e694..ce31284 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -33,11 +33,11 @@ ] }, "locked": { - "lastModified": 1732400024, - "narHash": "sha256-uf1QzIl0Jj5dr7+erWjHWiCUEvywLaR7ir1jcqGgjeQ=", + "lastModified": 1733319615, + "narHash": "sha256-QWQPdJiC6ab3J2rThuLoFJivkEOvMNkzOIn5qJLhIQg=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "376a2e022a5d8fa21cecb5bb0fef0cb54db5cdfc", + "rev": "d6a32b476215dbe915ccfa123fcd16d59d21a2c6", "type": "github" }, "original": { @@ -186,11 +186,11 @@ ] }, "locked": { - "lastModified": 1732303962, - "narHash": "sha256-5Umjb5AdtxV5jSJd5jxoCckh5mlg+FBQDsyAilu637g=", + "lastModified": 1733175814, + "narHash": "sha256-zFOtOaqjzZfPMsm1mwu98syv3y+jziAq5DfWygaMtLg=", "owner": "nix-community", "repo": "home-manager", - "rev": "8cf9cb2ee78aa129e5b8220135a511a2be254c0c", + "rev": "bf23fe41082aa0289c209169302afd3397092f22", "type": "github" }, "original": { @@ -208,11 +208,11 @@ ] }, "locked": { - "lastModified": 1732032028, - "narHash": "sha256-NjyfJQQxs/a2a/KwTmXM44K7XjeJwGsf4YFtebueQzo=", + "lastModified": 1732739177, + "narHash": "sha256-iL32+TA/8geCzcL1r3uthrH/GPvbUak5QE++WJUkaiI=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "65dc04371cf914c9af4f073638821e4787303005", + "rev": "8d7b2149e618696d5100c2683af1ffa893f02a75", "type": "github" }, "original": { @@ -271,11 +271,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1731797098, - "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=", + "lastModified": 1733481457, + "narHash": "sha256-IS3bxa4N1VMSh3/P6vhEAHQZecQ3oAlKCDvzCQSO5Is=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6", + "rev": "e563803af3526852b6b1d77107a81908c66a9fcf", "type": "github" }, "original": { @@ -287,11 +287,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "lastModified": 1733392399, + "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", "type": "github" }, "original": { @@ -392,11 +392,11 @@ }, "wivrn": { "locked": { - "lastModified": 1732308363, - "narHash": "sha256-o/qgBWJ1JSeWvdcTqdqMDttoggejk25UnzHiaGrfZUU=", + "lastModified": 1733023508, + "narHash": "sha256-z2bFIHL2wkuZKuOZvN1jqcTxFdyGo1Ps5Q0OKFqQsvo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5c37b4d31e8531260cfe3d80a39cd9d62ecb547b", + "rev": "b6991a56cb742bc8237db48578dd281224e01b94", "type": "github" }, "original": { diff --git a/etcnixos/system-mreow.nix b/etcnixos/system-mreow.nix index aa00cec..259a7c7 100644 --- a/etcnixos/system-mreow.nix +++ b/etcnixos/system-mreow.nix @@ -112,4 +112,9 @@ ${pkgs.gnutar}/bin/tar xf /etc/nixos/secrets/secureboot.tar -C ${config.boot.lanzaboote.pkiBundle} ''; }; + + # https://github.com/NixOS/nixos-hardware/pull/1253 + # hardware.framework.laptop13.audioEnhancement = { + # enable = true; + # }; } diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 6d6204f..e5fa70b 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1732397793, - "narHash": "sha256-2jaf/zkug22hzlldm1PKdKJLVKgdjVXbf47SF+5mroU=", + "lastModified": 1733484277, + "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", "owner": "nix-community", "repo": "home-manager", - "rev": "92fef254a9071fa41a13908281284e6a62b9c92e", + "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", "type": "github" }, "original": { @@ -79,11 +79,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1732366896, - "narHash": "sha256-dQrHznGma8aWeBESRUCc1onWYoGrM35GDl/uwEB7eG8=", + "lastModified": 1733474926, + "narHash": "sha256-OYp5iaVJc13jEndTrTRVq/C5jNLLW4B4bwJVRNJRsdU=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "3131d857c946c75557f5b6fb99a113b6949ea04d", + "rev": "5a93128d0685e0582428b573bb67f601b11b2ca0", "type": "github" }, "original": { @@ -112,11 +112,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1732363756, - "narHash": "sha256-/E2aRhcvlH2PkkpC2n79UCMZyIkQKWfG4m//UHkeNgU=", + "lastModified": 1733234028, + "narHash": "sha256-YITDP4Jr+sWuQ29WudIBDci7Mh6Ro70XcwYVkxQ1VVU=", "owner": "YaLTeR", "repo": "niri", - "rev": "9c7e8d04d27d2f914ad3e9a54c64b64c34aea4d4", + "rev": "34ce6d0b02420a8e4a5394cb4c4c603b6efef221", "type": "github" }, "original": { @@ -127,11 +127,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "lastModified": 1733392399, + "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", "type": "github" }, "original": { @@ -143,11 +143,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1731797254, - "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", + "lastModified": 1733220138, + "narHash": "sha256-Yh5XZ9yVurrcYdNTSWxYgW4+EJ0pcOqgM1043z9JaRc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", + "rev": "bcb68885668cccec12276bbb379f8f2557aa06ce", "type": "github" }, "original": { @@ -157,6 +157,22 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1732521221, + "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "agenix": "agenix", @@ -174,11 +190,11 @@ ] }, "locked": { - "lastModified": 1732328983, - "narHash": "sha256-RHt12f/slrzDpSL7SSkydh8wUE4Nr4r23HlpWywed9E=", + "lastModified": 1733452419, + "narHash": "sha256-eh2i2GtqdWVOP7yjiWtB8FMUWktCZ4vjo81n6g5mSiE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ed8aa5b64f7d36d9338eb1d0a3bb60cf52069a72", + "rev": "020701e6057992329a7cfafc6e3c5d5658bbcf79", "type": "github" }, "original": { @@ -236,18 +252,20 @@ } }, "zen-browser": { + "inputs": { + "nixpkgs": "nixpkgs_2" + }, "locked": { - "lastModified": 1731699950, - "narHash": "sha256-xrH3kz0hhu60CS/MnSWXn6R5NnUFYthWktQ0e8ljxb0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4a6be22d0d52df01d0be2346cc6504962251fea7", + "lastModified": 1732933979, + "narHash": "sha256-Z7X++lKZMNBu67BJl2LP23e7RBadp2C/RuRrygLehaE=", + "owner": "0xc000022070", + "repo": "zen-browser-flake", + "rev": "5a765451af1db68acceae07b98e5c768f238210c", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "pull/347222/head", - "repo": "nixpkgs", + "owner": "0xc000022070", + "repo": "zen-browser-flake", "type": "github" } } diff --git a/home-manager/flake.nix b/home-manager/flake.nix index 37ae0c4..821e55b 100644 --- a/home-manager/flake.nix +++ b/home-manager/flake.nix @@ -26,10 +26,8 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - zen-browser = { - # https://github.com/NixOS/nixpkgs/pull/347222 - url = "github:NixOS/nixpkgs/pull/347222/head"; - }; + zen-browser.url = "github:0xc000022070/zen-browser-flake"; + }; outputs = diff --git a/home-manager/gui.nix b/home-manager/gui.nix index 32206f0..affeb05 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -20,84 +20,85 @@ "apple_cursor" ]; - home.packages = with pkgs; [ - #calculator - gnome-calculator + home.packages = + with pkgs; + [ + #calculator + gnome-calculator - #productivity stuff - libreoffice - hunspell # spellcheck - hunspellDicts.en_US # spellcheck dictionary + #productivity stuff + libreoffice + hunspell # spellcheck + hunspellDicts.en_US # spellcheck dictionary - #video and audio downloading - parabolic + #video and audio downloading + parabolic - #soulseek client - nicotine-plus + #soulseek client + nicotine-plus - #dark web browsing deep web browsing - tor-browser + #dark web browsing deep web browsing + tor-browser - #audio editing - audacity + #audio editing + audacity - #fonts - noto-fonts - noto-fonts-emoji - liberation_ttf - nerdfonts - jetbrains-mono + #fonts + noto-fonts + noto-fonts-emoji + liberation_ttf - #for ebook reading - foliate + #for ebook reading + foliate - #audio mixer (pavucontrol but for pipewire) - pwvucontrol + #audio mixer (pavucontrol but for pipewire) + pwvucontrol - #minecraft launcher - prismlauncher + #minecraft launcher + prismlauncher - mpv - mumble - system76-keyboard-configurator + mpv + mumble + system76-keyboard-configurator - #jellyfin - finamp # music player - delfin # jellyfin client + #jellyfin + finamp # music player + delfin # jellyfin client - signal-desktop + signal-desktop - #accounting - gnucash + #accounting + gnucash - # image tools - inkscape - nomacs + # image tools + inkscape + nomacs - # partitioning utilities - gparted - gnome-disk-utility + # partitioning utilities + gparted + gnome-disk-utility - # small nicities - wl-clipboard # wl-copy & wl-paste - libnotify # notifications library - xdg-utils # xdg utils + # small nicities + wl-clipboard # wl-copy & wl-paste + libnotify # notifications library + xdg-utils # xdg utils - # music tagging utility - picard + # music tagging utility + picard - # music lyric fetcher - lrcget + # music lyric fetcher + lrcget - inputs.zen-browser.legacyPackages.${pkgs.system}.zen-browser + inputs.zen-browser.packages."${system}".specific - # freecad-wayland - puddletag + # freecad-wayland + puddletag - epiphany + epiphany - mcaselector - ]; + mcaselector + ] + ++ (builtins.filter lib.isDerivation (builtins.attrValues nerd-fonts)); programs.zed-editor = { enable = true; diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 7677b86..85c988e 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -20,21 +20,18 @@ hexyl # rust stuff - (rust-bin.selectLatestNightlyWith ( - toolchain: - toolchain.default.override { - extensions = [ - "rust-src" - "rust-analyzer" - "clippy" - "rustfmt" - "rust-std" - "cargo" - ]; - # thumbv7m-none-eabi target for stm32 - targets = [ "thumbv7m-none-eabi" ]; - } - )) + (rust-bin.stable.latest.default.override ({ + extensions = [ + "rust-src" + "rust-analyzer" + "clippy" + "rustfmt" + "rust-std" + "cargo" + ]; + # thumbv7m-none-eabi target for stm32 + targets = [ "thumbv7m-none-eabi" ]; + })) cargo-expand rust-script diff --git a/home-manager/progs/gpt4all/gpt4all.nix b/home-manager/progs/gpt4all/gpt4all.nix index a9a8cdf..d3e6a7f 100644 --- a/home-manager/progs/gpt4all/gpt4all.nix +++ b/home-manager/progs/gpt4all/gpt4all.nix @@ -15,6 +15,15 @@ let sha256 = "+AHt49no0qQ48MoNsqGJV4FeJ3Cf2hSZqTMjNUIHaO4="; }; } + { + name = "QwQ-32B-Preview-IQ4_XS.gguf"; + context_length = 32768; + gen_length = 8192; + source = pkgs.fetchurl { + url = "https://huggingface.co/bartowski/QwQ-32B-Preview-GGUF/resolve/main/QwQ-32B-Preview-IQ4_XS.gguf?download=true"; + sha256 = "0d4na9hyjmq2jan9svzpnjaq7khm86k049kn7yznfww4387c1gvw"; + }; + } ]; gpt4all_package = ( From c565d584cb899c513896e923dfea8e06dfd5ef60 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 11 Dec 2024 16:01:59 -0500 Subject: [PATCH 082/724] yarn changes --- etcnixos/flake.lock | 49 ++++++++++++------------------------ etcnixos/flake.nix | 19 ++++++++------ etcnixos/hardware_laptop.nix | 3 ++- etcnixos/vr.nix | 10 +++++--- home-manager/flake.lock | 48 +++++++++++++++++------------------ home-manager/system-yarn.nix | 2 +- 6 files changed, 61 insertions(+), 70 deletions(-) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index ce31284..942e075 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -33,11 +33,11 @@ ] }, "locked": { - "lastModified": 1733319615, - "narHash": "sha256-QWQPdJiC6ab3J2rThuLoFJivkEOvMNkzOIn5qJLhIQg=", + "lastModified": 1733919451, + "narHash": "sha256-CDz8tg4Qf85qzPhjSOwelxl1TAwn/T9IX9dO06OKi3g=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "d6a32b476215dbe915ccfa123fcd16d59d21a2c6", + "rev": "b95d66a950fd7b9d72a5ee6ee911cc3080b81997", "type": "github" }, "original": { @@ -186,11 +186,11 @@ ] }, "locked": { - "lastModified": 1733175814, - "narHash": "sha256-zFOtOaqjzZfPMsm1mwu98syv3y+jziAq5DfWygaMtLg=", + "lastModified": 1733484277, + "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", "owner": "nix-community", "repo": "home-manager", - "rev": "bf23fe41082aa0289c209169302afd3397092f22", + "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", "type": "github" }, "original": { @@ -208,11 +208,11 @@ ] }, "locked": { - "lastModified": 1732739177, - "narHash": "sha256-iL32+TA/8geCzcL1r3uthrH/GPvbUak5QE++WJUkaiI=", + "lastModified": 1733491721, + "narHash": "sha256-n4fTKTYXeGRngeanNDxSxbuWSRCQ6l74IwOBlqp8dcw=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "8d7b2149e618696d5100c2683af1ffa893f02a75", + "rev": "0f415721ee427270bc078ef3a5ba2a308d47461f", "type": "github" }, "original": { @@ -271,11 +271,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1733481457, - "narHash": "sha256-IS3bxa4N1VMSh3/P6vhEAHQZecQ3oAlKCDvzCQSO5Is=", + "lastModified": 1733861262, + "narHash": "sha256-+jjPup/ByS0LEVIrBbt7FnGugJgLeG9oc+ivFASYn2U=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e563803af3526852b6b1d77107a81908c66a9fcf", + "rev": "cf737e2eba82b603f54f71b10cb8fd09d22ce3f5", "type": "github" }, "original": { @@ -287,11 +287,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733392399, - "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", + "lastModified": 1733759999, + "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", + "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", "type": "github" }, "original": { @@ -350,8 +350,7 @@ "chaotic": "chaotic", "lanzaboote": "lanzaboote", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs", - "wivrn": "wivrn" + "nixpkgs": "nixpkgs" } }, "rust-overlay": { @@ -389,22 +388,6 @@ "repo": "default", "type": "github" } - }, - "wivrn": { - "locked": { - "lastModified": 1733023508, - "narHash": "sha256-z2bFIHL2wkuZKuOZvN1jqcTxFdyGo1Ps5Q0OKFqQsvo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b6991a56cb742bc8237db48578dd281224e01b94", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "pull/350069/head", - "repo": "nixpkgs", - "type": "github" - } } }, "root": "root", diff --git a/etcnixos/flake.nix b/etcnixos/flake.nix index 81d2001..cda24ab 100644 --- a/etcnixos/flake.nix +++ b/etcnixos/flake.nix @@ -12,8 +12,6 @@ nixos-hardware.url = "github:NixOS/nixos-hardware/master"; - wivrn.url = "github:NixOS/nixpkgs/pull/350069/head"; - chaotic = { url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; inputs.nixpkgs.follows = "nixpkgs"; @@ -41,12 +39,17 @@ system = "x86_64-linux"; pkgs = import nixpkgs { - config.allowUnfreePredicate = - pkg: - builtins.elem (nixpkgs.lib.getName pkg) [ - "steam-unwrapped" - "steam" - ]; + # config.allowUnfreePredicate = + # pkg: + # builtins.elem (nixpkgs.lib.getName pkg) [ + # "steam-unwrapped" + # "steam" + # ]; + + # idk pkgs.wivrn pulls a bunch of cuda stuff even though cudaSupport is disabled? + config.allowUnfree = true; + + config.cudaSupport = false; }; in { diff --git a/etcnixos/hardware_laptop.nix b/etcnixos/hardware_laptop.nix index a83a530..0a492ea 100644 --- a/etcnixos/hardware_laptop.nix +++ b/etcnixos/hardware_laptop.nix @@ -28,7 +28,8 @@ ]; }; - boot.initrd.luks.devices."luks-0f481d5f-528c-4838-bd8a-d2780b4ba234".device = "/dev/disk/by-uuid/0f481d5f-528c-4838-bd8a-d2780b4ba234"; + boot.initrd.luks.devices."luks-0f481d5f-528c-4838-bd8a-d2780b4ba234".device = + "/dev/disk/by-uuid/0f481d5f-528c-4838-bd8a-d2780b4ba234"; fileSystems."/boot" = { device = "/dev/disk/by-uuid/4D19-520E"; diff --git a/etcnixos/vr.nix b/etcnixos/vr.nix index f0a36a1..fbfd264 100644 --- a/etcnixos/vr.nix +++ b/etcnixos/vr.nix @@ -1,11 +1,15 @@ -{ pkgs, inputs, ... }: +{ + pkgs, + inputs, + lib, + ... +}: { services.wivrn = { enable = true; openFirewall = true; - # WiVRn 0.20 - package = inputs.wivrn.legacyPackages.${pkgs.system}.wivrn; + package = pkgs.wivrn; # Write information to /etc/xdg/openxr/1/active_runtime.json, VR applications # will automatically read this and work with wivrn diff --git a/home-manager/flake.lock b/home-manager/flake.lock index e5fa70b..f31ebcb 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1733484277, - "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", + "lastModified": 1733873195, + "narHash": "sha256-dTosiZ3sZ/NKoLKQ++v8nZdEHya0eTNEsaizNp+MUPM=", "owner": "nix-community", "repo": "home-manager", - "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", + "rev": "f26aa4b76fb7606127032d33ac73d7d507d82758", "type": "github" }, "original": { @@ -79,11 +79,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1733474926, - "narHash": "sha256-OYp5iaVJc13jEndTrTRVq/C5jNLLW4B4bwJVRNJRsdU=", + "lastModified": 1733946118, + "narHash": "sha256-yoUPXWTO/DXU58yY48CTtuQ7jF/Nmp+Fc/z6HSTjrkE=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "5a93128d0685e0582428b573bb67f601b11b2ca0", + "rev": "459933ba5e572d047ccb9a06760b431728433b20", "type": "github" }, "original": { @@ -112,11 +112,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1733234028, - "narHash": "sha256-YITDP4Jr+sWuQ29WudIBDci7Mh6Ro70XcwYVkxQ1VVU=", + "lastModified": 1733942398, + "narHash": "sha256-/77/rEaihWmhCFBXQQ5cMSzH/pQXJ9cGydUOH/qAk9Q=", "owner": "YaLTeR", "repo": "niri", - "rev": "34ce6d0b02420a8e4a5394cb4c4c603b6efef221", + "rev": "82e30246c1c86b6d20861ede98c8fac4df141aff", "type": "github" }, "original": { @@ -127,11 +127,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733392399, - "narHash": "sha256-kEsTJTUQfQFIJOcLYFt/RvNxIK653ZkTBIs4DG+cBns=", + "lastModified": 1733759999, + "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d0797a04b81caeae77bcff10a9dde78bc17f5661", + "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", "type": "github" }, "original": { @@ -143,11 +143,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1733220138, - "narHash": "sha256-Yh5XZ9yVurrcYdNTSWxYgW4+EJ0pcOqgM1043z9JaRc=", + "lastModified": 1733730953, + "narHash": "sha256-dlK7n82FEyZlHH7BFHQAM5tua+lQO1Iv7aAtglc1O5s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bcb68885668cccec12276bbb379f8f2557aa06ce", + "rev": "7109b680d161993918b0a126f38bc39763e5a709", "type": "github" }, "original": { @@ -159,11 +159,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1732521221, - "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", + "lastModified": 1733759999, + "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", + "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", "type": "github" }, "original": { @@ -190,11 +190,11 @@ ] }, "locked": { - "lastModified": 1733452419, - "narHash": "sha256-eh2i2GtqdWVOP7yjiWtB8FMUWktCZ4vjo81n6g5mSiE=", + "lastModified": 1733884434, + "narHash": "sha256-8GXR9kC07dyOIshAyfZhG11xfvBRSZzYghnZ2weOKJU=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "020701e6057992329a7cfafc6e3c5d5658bbcf79", + "rev": "d0483df44ddf0fd1985f564abccbe568e020ddf2", "type": "github" }, "original": { @@ -256,11 +256,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1732933979, - "narHash": "sha256-Z7X++lKZMNBu67BJl2LP23e7RBadp2C/RuRrygLehaE=", + "lastModified": 1733840403, + "narHash": "sha256-j5hmZ/Oudzr4/HB383uUvY86PxB4c94+7QRV109kOpE=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "5a765451af1db68acceae07b98e5c768f238210c", + "rev": "ddbfcd69583724e6d142af98010411ac26c2029d", "type": "github" }, "original": { diff --git a/home-manager/system-yarn.nix b/home-manager/system-yarn.nix index bc65ec1..ba456d5 100644 --- a/home-manager/system-yarn.nix +++ b/home-manager/system-yarn.nix @@ -10,7 +10,7 @@ home.packages = with pkgs; [ protontricks - beatsabermodmanager + # beatsabermodmanager ]; programs.alacritty.settings = { From fd21fd3cfbe812647712deb4a6793de1c1f92858 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 11 Dec 2024 19:59:31 -0500 Subject: [PATCH 083/724] aa --- home-manager/flake.lock | 26 ++++++-------------------- home-manager/flake.nix | 5 ++++- home-manager/gui.nix | 2 ++ home-manager/no-gui.nix | 2 ++ home-manager/progs/gpt4all/gpt4all.nix | 9 --------- 5 files changed, 14 insertions(+), 30 deletions(-) diff --git a/home-manager/flake.lock b/home-manager/flake.lock index f31ebcb..4513103 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1733873195, - "narHash": "sha256-dTosiZ3sZ/NKoLKQ++v8nZdEHya0eTNEsaizNp+MUPM=", + "lastModified": 1733951607, + "narHash": "sha256-CN6q6iCzxI1gkNyk4xLdwaMKi10r7n+aJkRzWj8PXwQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "f26aa4b76fb7606127032d33ac73d7d507d82758", + "rev": "6e5b2d9e8014b5572e3367937a329e7053458d34", "type": "github" }, "original": { @@ -157,22 +157,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1733759999, - "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "agenix": "agenix", @@ -253,7 +237,9 @@ }, "zen-browser": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1733840403, diff --git a/home-manager/flake.nix b/home-manager/flake.nix index 821e55b..4a6f7c4 100644 --- a/home-manager/flake.nix +++ b/home-manager/flake.nix @@ -26,7 +26,10 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - zen-browser.url = "github:0xc000022070/zen-browser-flake"; + zen-browser = { + url = "github:0xc000022070/zen-browser-flake"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; diff --git a/home-manager/gui.nix b/home-manager/gui.nix index affeb05..a0c4d4f 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -97,6 +97,8 @@ epiphany mcaselector + + wireshark ] ++ (builtins.filter lib.isDerivation (builtins.attrValues nerd-fonts)); diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 85c988e..390afa2 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -132,6 +132,8 @@ git-crypt imagemagick + + nixpkgs-review ]; home.file.".cargo/config.toml".text = '' diff --git a/home-manager/progs/gpt4all/gpt4all.nix b/home-manager/progs/gpt4all/gpt4all.nix index d3e6a7f..a9a8cdf 100644 --- a/home-manager/progs/gpt4all/gpt4all.nix +++ b/home-manager/progs/gpt4all/gpt4all.nix @@ -15,15 +15,6 @@ let sha256 = "+AHt49no0qQ48MoNsqGJV4FeJ3Cf2hSZqTMjNUIHaO4="; }; } - { - name = "QwQ-32B-Preview-IQ4_XS.gguf"; - context_length = 32768; - gen_length = 8192; - source = pkgs.fetchurl { - url = "https://huggingface.co/bartowski/QwQ-32B-Preview-GGUF/resolve/main/QwQ-32B-Preview-IQ4_XS.gguf?download=true"; - sha256 = "0d4na9hyjmq2jan9svzpnjaq7khm86k049kn7yznfww4387c1gvw"; - }; - } ]; gpt4all_package = ( From a4bee4c0435613704342037990c251bb0fd93e51 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 13 Dec 2024 18:59:29 -0500 Subject: [PATCH 084/724] update --- etcnixos/flake.lock | 24 +++++++++++------------ home-manager/flake.lock | 42 ++++++++++++++++++++--------------------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 942e075..c18bd3e 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -33,11 +33,11 @@ ] }, "locked": { - "lastModified": 1733919451, - "narHash": "sha256-CDz8tg4Qf85qzPhjSOwelxl1TAwn/T9IX9dO06OKi3g=", + "lastModified": 1734087975, + "narHash": "sha256-dQYXdA5zGKZ1G5HfPj9Gjf0JRGwXexl/dC9oZW5xOec=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "b95d66a950fd7b9d72a5ee6ee911cc3080b81997", + "rev": "1174e016e517f60a8cfe00f0a5785e4c8bd17b53", "type": "github" }, "original": { @@ -186,11 +186,11 @@ ] }, "locked": { - "lastModified": 1733484277, - "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", + "lastModified": 1733873195, + "narHash": "sha256-dTosiZ3sZ/NKoLKQ++v8nZdEHya0eTNEsaizNp+MUPM=", "owner": "nix-community", "repo": "home-manager", - "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", + "rev": "f26aa4b76fb7606127032d33ac73d7d507d82758", "type": "github" }, "original": { @@ -208,11 +208,11 @@ ] }, "locked": { - "lastModified": 1733491721, - "narHash": "sha256-n4fTKTYXeGRngeanNDxSxbuWSRCQ6l74IwOBlqp8dcw=", + "lastModified": 1733859890, + "narHash": "sha256-HnA6z2l2W38TJBarvWCcxjTjcpz7JrDj2u2umjYFcEo=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "0f415721ee427270bc078ef3a5ba2a308d47461f", + "rev": "77ffd839fd9d60d139dc4a2ad6b6d526f4ad5a17", "type": "github" }, "original": { @@ -287,11 +287,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733759999, - "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", + "lastModified": 1733940404, + "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", + "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713", "type": "github" }, "original": { diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 4513103..280eccf 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1733951607, - "narHash": "sha256-CN6q6iCzxI1gkNyk4xLdwaMKi10r7n+aJkRzWj8PXwQ=", + "lastModified": 1734093295, + "narHash": "sha256-hSwgGpcZtdDsk1dnzA0xj5cNaHgN9A99hRF/mxMtwS4=", "owner": "nix-community", "repo": "home-manager", - "rev": "6e5b2d9e8014b5572e3367937a329e7053458d34", + "rev": "66c5d8b62818ec4c1edb3e941f55ef78df8141a8", "type": "github" }, "original": { @@ -79,11 +79,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1733946118, - "narHash": "sha256-yoUPXWTO/DXU58yY48CTtuQ7jF/Nmp+Fc/z6HSTjrkE=", + "lastModified": 1734121763, + "narHash": "sha256-/g/L6UbunXn/63nHgaRGsw7o1u5rWE5ebKnhw61ckEo=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "459933ba5e572d047ccb9a06760b431728433b20", + "rev": "a41efc858ffab207bc11e2677ea7eca8b9cd804d", "type": "github" }, "original": { @@ -127,11 +127,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733759999, - "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", + "lastModified": 1733940404, + "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", + "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713", "type": "github" }, "original": { @@ -143,11 +143,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1733730953, - "narHash": "sha256-dlK7n82FEyZlHH7BFHQAM5tua+lQO1Iv7aAtglc1O5s=", + "lastModified": 1734017764, + "narHash": "sha256-msOfmyJSjAHgIygI/JD0Ae3JsDv4rT54Nlfr5t6MQMQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7109b680d161993918b0a126f38bc39763e5a709", + "rev": "64e9404f308e0f0a0d8cdd7c358f74e34802494b", "type": "github" }, "original": { @@ -174,11 +174,11 @@ ] }, "locked": { - "lastModified": 1733884434, - "narHash": "sha256-8GXR9kC07dyOIshAyfZhG11xfvBRSZzYghnZ2weOKJU=", + "lastModified": 1734057252, + "narHash": "sha256-fpSFuiW+O2L0ru2GrXBS0wcAYV9+yDE0Gf800UsWutY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "d0483df44ddf0fd1985f564abccbe568e020ddf2", + "rev": "1f56a5c88e4dcaa0ab1ba04c4bc5a977cff840b2", "type": "github" }, "original": { @@ -222,11 +222,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1732233710, - "narHash": "sha256-gWf9dX6DVx0ssK2G3yrFG9yMT9UU0mDwyD51z/Q6FTA=", + "lastModified": 1734112800, + "narHash": "sha256-9qSb6AJpmzV3oYRfsyEt0e9eju6UeXDSD1poeSwadKo=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "02f30546264ff8407cbb39528b3a3cc3045e53c1", + "rev": "c45c2ed990912c26e6aed0f47bfddb03993d7999", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1733840403, - "narHash": "sha256-j5hmZ/Oudzr4/HB383uUvY86PxB4c94+7QRV109kOpE=", + "lastModified": 1734038753, + "narHash": "sha256-v2NetNrFvObcTx5Gw0MV9leJQr0KfCLtbpC4gZaq+Tc=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "ddbfcd69583724e6d142af98010411ac26c2029d", + "rev": "b2a4aeaad1cdb4a0d8901313d6388a8b4bf2c59d", "type": "github" }, "original": { From 49e5d50b097d19d1d666eea9e1588c12ea6941bb Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 21 Dec 2024 22:29:12 +0100 Subject: [PATCH 085/724] timezone: in sweden rn --- etcnixos/system-mreow.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/etcnixos/system-mreow.nix b/etcnixos/system-mreow.nix index 259a7c7..45724fe 100644 --- a/etcnixos/system-mreow.nix +++ b/etcnixos/system-mreow.nix @@ -15,6 +15,8 @@ inputs.lanzaboote.nixosModules.lanzaboote ]; + time.timeZone = lib.mkForce "Europe/Stockholm"; + services.tlp = { enable = true; settings = { From ed866e810781dc9307aa32905aba320453a8ed26 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 24 Dec 2024 19:58:00 +0100 Subject: [PATCH 086/724] update things --- etcnixos/flake.lock | 81 +++++++++++++++++----------- etcnixos/secrets/wifi-passwords.nix | Bin 472 -> 646 bytes home-manager/flake.lock | 50 ++++++++--------- home-manager/flake.nix | 1 - home-manager/gui.nix | 4 +- home-manager/no-gui.nix | 2 + 6 files changed, 79 insertions(+), 59 deletions(-) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index c18bd3e..3391bf8 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -30,14 +30,15 @@ "jovian": "jovian", "nixpkgs": [ "nixpkgs" - ] + ], + "nixpkgs-small": "nixpkgs-small" }, "locked": { - "lastModified": 1734087975, - "narHash": "sha256-dQYXdA5zGKZ1G5HfPj9Gjf0JRGwXexl/dC9oZW5xOec=", + "lastModified": 1734987419, + "narHash": "sha256-2K4V615Y29QhMUShX9k52l7gXF2erkq9yH9qGRZGKQ0=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "1174e016e517f60a8cfe00f0a5785e4c8bd17b53", + "rev": "d61084b851dbf3072f8b40c3870b0f7938ca3f22", "type": "github" }, "original": { @@ -49,11 +50,11 @@ }, "crane": { "locked": { - "lastModified": 1730652660, - "narHash": "sha256-+XVYfmVXAiYA0FZT7ijHf555dxCe+AoAT5A6RU+6vSo=", + "lastModified": 1731098351, + "narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=", "owner": "ipetkov", "repo": "crane", - "rev": "a4ca93905455c07cb7e3aca95d4faf7601cba458", + "rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28", "type": "github" }, "original": { @@ -186,11 +187,11 @@ ] }, "locked": { - "lastModified": 1733873195, - "narHash": "sha256-dTosiZ3sZ/NKoLKQ++v8nZdEHya0eTNEsaizNp+MUPM=", + "lastModified": 1734622215, + "narHash": "sha256-OOfI0XhSJGHblfdNDhfnn8QnZxng63rWk9eeJ2tCbiI=", "owner": "nix-community", "repo": "home-manager", - "rev": "f26aa4b76fb7606127032d33ac73d7d507d82758", + "rev": "1395379a7a36e40f2a76e7b9936cc52950baa1be", "type": "github" }, "original": { @@ -208,11 +209,11 @@ ] }, "locked": { - "lastModified": 1733859890, - "narHash": "sha256-HnA6z2l2W38TJBarvWCcxjTjcpz7JrDj2u2umjYFcEo=", + "lastModified": 1734725857, + "narHash": "sha256-bivlV9l/UjMtTfz/CZaoNJ5RfH2Lre4P9Ds64conoUQ=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "77ffd839fd9d60d139dc4a2ad6b6d526f4ad5a17", + "rev": "dbae2fd6adaf34c947d310bec08deac7c4ed265b", "type": "github" }, "original": { @@ -233,11 +234,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1731941836, - "narHash": "sha256-zpmAzrvK8KdssBSwiIwwRxaUJ77oWORbW0XFvgCFpTE=", + "lastModified": 1734994463, + "narHash": "sha256-S9MgfQjNt4J3I7obdLOVY23h+Yl/hnyibwGfOl+1uOE=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "2f48272f34174fd2a5ab3df4d8a46919247be879", + "rev": "93e6f0d77548be8757c11ebda5c4235ef4f3bc67", "type": "github" }, "original": { @@ -271,11 +272,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1733861262, - "narHash": "sha256-+jjPup/ByS0LEVIrBbt7FnGugJgLeG9oc+ivFASYn2U=", + "lastModified": 1734954597, + "narHash": "sha256-QIhd8/0x30gEv8XEE1iAnrdMlKuQ0EzthfDR7Hwl+fk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "cf737e2eba82b603f54f71b10cb8fd09d22ce3f5", + "rev": "def1d472c832d77885f174089b0d34854b007198", "type": "github" }, "original": { @@ -287,11 +288,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733940404, - "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", "type": "github" }, "original": { @@ -301,13 +302,29 @@ "type": "github" } }, - "nixpkgs-stable": { + "nixpkgs-small": { "locked": { - "lastModified": 1720386169, - "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", + "lastModified": 1734838250, + "narHash": "sha256-Xi8ST/QiyuYXc3ujnMYOBuRUaMh6p16XWH6BKARa7xQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", + "rev": "da8a31d09dd004be34b5c54eda83f9a27b357726", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1730741070, + "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", "type": "github" }, "original": { @@ -331,11 +348,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1730302582, - "narHash": "sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU=", + "lastModified": 1731363552, + "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf", + "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", "type": "github" }, "original": { @@ -361,11 +378,11 @@ ] }, "locked": { - "lastModified": 1730601085, - "narHash": "sha256-Sgax33jGuvVHTjl1P78IwzlhAGyOxtx5Q26inKja8S4=", + "lastModified": 1731897198, + "narHash": "sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "8d1b40f8dfd7539aaa3de56e207e22b3cc451825", + "rev": "0be641045af6d8666c11c2c40e45ffc9667839b5", "type": "github" }, "original": { diff --git a/etcnixos/secrets/wifi-passwords.nix b/etcnixos/secrets/wifi-passwords.nix index 0d5264cfe152a15e679c110864ef5cba4f259e0b..88a9fc3afeaabb98b43477159a579d10f40294ed 100644 GIT binary patch literal 646 zcmZQ@_Y83kiVO&0Xcu^DwbUz6>HHy+h-rmJzk~h#d&p0@0EL(o);6Sk$qBb$NZL zp8mf>0X3gn-ZS}q>_}5hxum4j-r;|AacX`_?VTs$rNvRn+tZG3?ezJxpHosyYB9qR z6Vn9l`*AO{L``abNB&Ubdv@mdwPnno>te11ny&8Mu)u5KZvT6)Yy%P)d1Xw@j|eKt z)UKE@S$cE(t#5a=Sbr9t?BB(|{I=+l60HkGTRR-g=3Wr}-nHauUFk#FdlBUe51diX zNl?qIY-n%7& zer(=!sAx;J=5ve1ebx~V9C)jbs=Z!%w|@T9Bl#*%E=wNitdiLzxp&JM(W7&pyQS9J zx9`}={4G1x`)#IP+r!OU9~d2DN}c#4jkoPyhs&~u9#Ymue)3(B^LJK|~DZTQSr%Nq%w!D^#pvyDG4{it3qPBZa=vlwS?)Rcj3+^); zg@lR@tBd<){+-3~Thy!Up5fl(YkdbF#B@nHeB+CGlZ?@|A=_&qht&ty-X6nLn^ z>C%EnE}K0gxAvbG)>J%yl~1ljr!H#xw~widRx2!toFe~e@jixB**m&#uDD9tBt}+= zt%!I%{gYux`0^$PkJ>7WKPwh5eI3%!x+rncZpFDDBg2<71|iq diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 280eccf..1d27cad 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1734093295, - "narHash": "sha256-hSwgGpcZtdDsk1dnzA0xj5cNaHgN9A99hRF/mxMtwS4=", + "lastModified": 1735053786, + "narHash": "sha256-Gm+0DcbUS338vvkwyYWms5jsWlx8z8MeQBzcnIDuIkw=", "owner": "nix-community", "repo": "home-manager", - "rev": "66c5d8b62818ec4c1edb3e941f55ef78df8141a8", + "rev": "35b98d20ca8f4ca1f6a2c30b8a2c8bb305a36d84", "type": "github" }, "original": { @@ -79,11 +79,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1734121763, - "narHash": "sha256-/g/L6UbunXn/63nHgaRGsw7o1u5rWE5ebKnhw61ckEo=", + "lastModified": 1734988923, + "narHash": "sha256-DmCefR+2CwM0tdtJtpg1114kAwskNhyYyN8xoe/f9sI=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "a41efc858ffab207bc11e2677ea7eca8b9cd804d", + "rev": "3d268c743b568febe83dc49e926f21b41b6d72d2", "type": "github" }, "original": { @@ -112,11 +112,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1733942398, - "narHash": "sha256-/77/rEaihWmhCFBXQQ5cMSzH/pQXJ9cGydUOH/qAk9Q=", + "lastModified": 1734977336, + "narHash": "sha256-5klPkbBmEisNWWwnI4QYSum1syG5RyqBqEKNkHBA1ns=", "owner": "YaLTeR", "repo": "niri", - "rev": "82e30246c1c86b6d20861ede98c8fac4df141aff", + "rev": "955039b5ea07c3fb2ff3278c0543004d86b7dcc7", "type": "github" }, "original": { @@ -127,11 +127,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733940404, - "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=", + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", "type": "github" }, "original": { @@ -143,16 +143,16 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1734017764, - "narHash": "sha256-msOfmyJSjAHgIygI/JD0Ae3JsDv4rT54Nlfr5t6MQMQ=", + "lastModified": 1734875076, + "narHash": "sha256-Pzyb+YNG5u3zP79zoi8HXYMs15Q5dfjDgwCdUI5B0nY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "64e9404f308e0f0a0d8cdd7c358f74e34802494b", + "rev": "1807c2b91223227ad5599d7067a61665c52d1295", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } @@ -174,11 +174,11 @@ ] }, "locked": { - "lastModified": 1734057252, - "narHash": "sha256-fpSFuiW+O2L0ru2GrXBS0wcAYV9+yDE0Gf800UsWutY=", + "lastModified": 1735007320, + "narHash": "sha256-NdhUgB9BkLGW9I+Q1GyUUCc3CbDgsg7HLWjG7WZBR5Q=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "1f56a5c88e4dcaa0ab1ba04c4bc5a977cff840b2", + "rev": "fb5fdba697ee9a2391ca9ceea3b853b4e3ce37a5", "type": "github" }, "original": { @@ -222,11 +222,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1734112800, - "narHash": "sha256-9qSb6AJpmzV3oYRfsyEt0e9eju6UeXDSD1poeSwadKo=", + "lastModified": 1734745564, + "narHash": "sha256-JQNl4pqonVVPQ2JzEOLUcPVRNj//FFFNRDyvQoOkG7s=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "c45c2ed990912c26e6aed0f47bfddb03993d7999", + "rev": "94da1af75326d89ecb12aba0cc9362e93ffdc766", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1734038753, - "narHash": "sha256-v2NetNrFvObcTx5Gw0MV9leJQr0KfCLtbpC4gZaq+Tc=", + "lastModified": 1735042792, + "narHash": "sha256-L2kY/1dSrqFd+slZkp3M5jXEpwb+/6Vl3dCX/G3tf0s=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "b2a4aeaad1cdb4a0d8901313d6388a8b4bf2c59d", + "rev": "21695ffb62a6b535b074753841eb2263b392ba80", "type": "github" }, "original": { diff --git a/home-manager/flake.nix b/home-manager/flake.nix index 4a6f7c4..0808bfd 100644 --- a/home-manager/flake.nix +++ b/home-manager/flake.nix @@ -30,7 +30,6 @@ url = "github:0xc000022070/zen-browser-flake"; inputs.nixpkgs.follows = "nixpkgs"; }; - }; outputs = diff --git a/home-manager/gui.nix b/home-manager/gui.nix index a0c4d4f..7f042c1 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -89,7 +89,7 @@ # music lyric fetcher lrcget - inputs.zen-browser.packages."${system}".specific + inputs.zen-browser.packages."${system}" # freecad-wayland puddletag @@ -99,6 +99,8 @@ mcaselector wireshark + + darktable ] ++ (builtins.filter lib.isDerivation (builtins.attrValues nerd-fonts)); diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 390afa2..d633f9e 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -108,6 +108,8 @@ python-lsp-ruff # ruff integration mypy # type checking + + pyserial ] )) From edb9e429305581095881a9e9504f46d44d726ec5 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 31 Dec 2024 23:33:27 +0100 Subject: [PATCH 087/724] nixos-24.11 --- etcnixos/common.nix | 6 +- etcnixos/flake.lock | 136 +++------------------------------------- etcnixos/flake.nix | 11 +--- home-manager/flake.lock | 44 ++++++------- home-manager/flake.nix | 4 +- home-manager/gui.nix | 125 +++++++++++++++++++----------------- home-manager/no-gui.nix | 2 +- 7 files changed, 103 insertions(+), 225 deletions(-) diff --git a/etcnixos/common.nix b/etcnixos/common.nix index ebc0ff0..48869fa 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -36,8 +36,7 @@ # kernel options boot = { - kernelPackages = pkgs.linuxPackages_cachyos-lto; - # kernelPackages = pkgs.linuxPackages; + kernelPackages = pkgs.linuxPackages_latest; kernel.sysctl = { # dmesg shushhhhh @@ -79,7 +78,8 @@ # Enable CUPS to print documents. printing = { enable = true; - drivers = with pkgs; [ hplip ]; + # disabled, build broken + # drivers = with pkgs; [ hplip ]; }; # disable fprintd (doesn't compile, idk) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 3391bf8..b79e967 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -23,31 +23,6 @@ "type": "github" } }, - "chaotic": { - "inputs": { - "flake-schemas": "flake-schemas", - "home-manager": "home-manager_2", - "jovian": "jovian", - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-small": "nixpkgs-small" - }, - "locked": { - "lastModified": 1734987419, - "narHash": "sha256-2K4V615Y29QhMUShX9k52l7gXF2erkq9yH9qGRZGKQ0=", - "owner": "chaotic-cx", - "repo": "nyx", - "rev": "d61084b851dbf3072f8b40c3870b0f7938ca3f22", - "type": "github" - }, - "original": { - "owner": "chaotic-cx", - "ref": "nyxpkgs-unstable", - "repo": "nyx", - "type": "github" - } - }, "crane": { "locked": { "lastModified": 1731098351, @@ -122,20 +97,6 @@ "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": [ @@ -179,49 +140,6 @@ "type": "github" } }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "chaotic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1734622215, - "narHash": "sha256-OOfI0XhSJGHblfdNDhfnn8QnZxng63rWk9eeJ2tCbiI=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "1395379a7a36e40f2a76e7b9936cc52950baa1be", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "jovian": { - "inputs": { - "nix-github-actions": "nix-github-actions", - "nixpkgs": [ - "chaotic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1734725857, - "narHash": "sha256-bivlV9l/UjMtTfz/CZaoNJ5RfH2Lre4P9Ds64conoUQ=", - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", - "rev": "dbae2fd6adaf34c947d310bec08deac7c4ed265b", - "type": "github" - }, - "original": { - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", - "type": "github" - } - }, "lanzaboote": { "inputs": { "crane": "crane", @@ -247,36 +165,13 @@ "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": 1734954597, - "narHash": "sha256-QIhd8/0x30gEv8XEE1iAnrdMlKuQ0EzthfDR7Hwl+fk=", + "lastModified": 1735388221, + "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "def1d472c832d77885f174089b0d34854b007198", + "rev": "7c674c6734f61157e321db595dbfcd8523e04e19", "type": "github" }, "original": { @@ -288,32 +183,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1734649271, - "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "lastModified": 1735531152, + "narHash": "sha256-As8I+ebItDKtboWgDXYZSIjGlKeqiLBvjxsQHUmAf1Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "rev": "3ffbbdbac0566a0977da3d2657b89cbcfe9a173b", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-small": { - "locked": { - "lastModified": 1734838250, - "narHash": "sha256-Xi8ST/QiyuYXc3ujnMYOBuRUaMh6p16XWH6BKARa7xQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "da8a31d09dd004be34b5c54eda83f9a27b357726", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable-small", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } @@ -364,7 +243,6 @@ "root": { "inputs": { "agenix": "agenix", - "chaotic": "chaotic", "lanzaboote": "lanzaboote", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs" diff --git a/etcnixos/flake.nix b/etcnixos/flake.nix index cda24ab..91c57ec 100644 --- a/etcnixos/flake.nix +++ b/etcnixos/flake.nix @@ -1,8 +1,8 @@ { - description = "A simple NixOS flake"; + description = "System nixOS flake"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; # nixpkgs.url = "github:NixOS/nixpkgs/master"; lanzaboote = { @@ -12,11 +12,6 @@ nixos-hardware.url = "github:NixOS/nixos-hardware/master"; - chaotic = { - url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - agenix = { url = "github:ryantm/agenix"; inputs.nixpkgs.follows = "nixpkgs"; @@ -29,7 +24,6 @@ nixpkgs, lanzaboote, nixos-hardware, - chaotic, agenix, ... }@inputs: @@ -60,7 +54,6 @@ inherit pkgs; modules = [ ./system-${hostname}.nix - chaotic.nixosModules.default agenix.nixosModules.default ]; }; diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 1d27cad..a6a2fb5 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1735053786, - "narHash": "sha256-Gm+0DcbUS338vvkwyYWms5jsWlx8z8MeQBzcnIDuIkw=", + "lastModified": 1735381016, + "narHash": "sha256-CyCZFhMUkuYbSD6bxB/r43EdmDE7hYeZZPTCv0GudO4=", "owner": "nix-community", "repo": "home-manager", - "rev": "35b98d20ca8f4ca1f6a2c30b8a2c8bb305a36d84", + "rev": "10e99c43cdf4a0713b4e81d90691d22c6a58bdf2", "type": "github" }, "original": { @@ -79,11 +79,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1734988923, - "narHash": "sha256-DmCefR+2CwM0tdtJtpg1114kAwskNhyYyN8xoe/f9sI=", + "lastModified": 1735591802, + "narHash": "sha256-oAridSudDNmdIFXYAj7tikcU0NwM3RNSLY4Qu1Khv8A=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "3d268c743b568febe83dc49e926f21b41b6d72d2", + "rev": "bdcb629b3a8d62b4aff1b0484f74d5ad33dcf544", "type": "github" }, "original": { @@ -112,11 +112,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1734977336, - "narHash": "sha256-5klPkbBmEisNWWwnI4QYSum1syG5RyqBqEKNkHBA1ns=", + "lastModified": 1735586144, + "narHash": "sha256-YenL+60BJHF2cc4htz/iKEMgYd9dNfegzgH9tMBMhEY=", "owner": "YaLTeR", "repo": "niri", - "rev": "955039b5ea07c3fb2ff3278c0543004d86b7dcc7", + "rev": "4741ab2e0465275d58c36db426b169c742d964cf", "type": "github" }, "original": { @@ -127,27 +127,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1734649271, - "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "lastModified": 1735531152, + "narHash": "sha256-As8I+ebItDKtboWgDXYZSIjGlKeqiLBvjxsQHUmAf1Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "rev": "3ffbbdbac0566a0977da3d2657b89cbcfe9a173b", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1734875076, - "narHash": "sha256-Pzyb+YNG5u3zP79zoi8HXYMs15Q5dfjDgwCdUI5B0nY=", + "lastModified": 1735531152, + "narHash": "sha256-As8I+ebItDKtboWgDXYZSIjGlKeqiLBvjxsQHUmAf1Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1807c2b91223227ad5599d7067a61665c52d1295", + "rev": "3ffbbdbac0566a0977da3d2657b89cbcfe9a173b", "type": "github" }, "original": { @@ -174,11 +174,11 @@ ] }, "locked": { - "lastModified": 1735007320, - "narHash": "sha256-NdhUgB9BkLGW9I+Q1GyUUCc3CbDgsg7HLWjG7WZBR5Q=", + "lastModified": 1735612067, + "narHash": "sha256-rsjojgfPUf9tWuMXuuo2KAIoUZ49XGZQJSjFGOO8Cq4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "fb5fdba697ee9a2391ca9ceea3b853b4e3ce37a5", + "rev": "d199142e84bfaae476ffb4e09a70879d7918784d", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1735042792, - "narHash": "sha256-L2kY/1dSrqFd+slZkp3M5jXEpwb+/6Vl3dCX/G3tf0s=", + "lastModified": 1735682290, + "narHash": "sha256-RFx8K81xEIca2zRvq5U7ufbB4BtX7NHbd32XM2Rd0mQ=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "21695ffb62a6b535b074753841eb2263b392ba80", + "rev": "b5e7bd3defc733771f8aad0532c39d567f8f2aed", "type": "github" }, "original": { diff --git a/home-manager/flake.nix b/home-manager/flake.nix index 0808bfd..e376bec 100644 --- a/home-manager/flake.nix +++ b/home-manager/flake.nix @@ -2,8 +2,8 @@ description = "My nixOS flake for home-manager"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - # nixpkgs.url = "github:NixOS/nixpkgs/master"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; + # nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; home-manager = { url = "github:nix-community/home-manager"; diff --git a/home-manager/gui.nix b/home-manager/gui.nix index 7f042c1..2a4a435 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -20,89 +20,96 @@ "apple_cursor" ]; - home.packages = - with pkgs; - [ - #calculator - gnome-calculator + home.packages = with pkgs; [ + #calculator + gnome-calculator - #productivity stuff - libreoffice - hunspell # spellcheck - hunspellDicts.en_US # spellcheck dictionary + #productivity stuff + libreoffice + hunspell # spellcheck + hunspellDicts.en_US # spellcheck dictionary - #video and audio downloading - parabolic + #video and audio downloading + parabolic - #soulseek client - nicotine-plus + #soulseek client + nicotine-plus - #dark web browsing deep web browsing - tor-browser + #dark web browsing deep web browsing + tor-browser - #audio editing - audacity + #audio editing + audacity - #fonts - noto-fonts - noto-fonts-emoji - liberation_ttf + #fonts + noto-fonts + noto-fonts-emoji + liberation_ttf - #for ebook reading - foliate + #for ebook reading + foliate - #audio mixer (pavucontrol but for pipewire) - pwvucontrol + #audio mixer (pavucontrol but for pipewire) + pwvucontrol - #minecraft launcher - prismlauncher + #minecraft launcher + prismlauncher - mpv - mumble - system76-keyboard-configurator + mpv + mumble + system76-keyboard-configurator - #jellyfin - finamp # music player - delfin # jellyfin client + #jellyfin + finamp # music player + delfin # jellyfin client - signal-desktop + signal-desktop - #accounting - gnucash + #accounting + # gnucash - # image tools - inkscape - nomacs + # image tools + inkscape + nomacs - # partitioning utilities - gparted - gnome-disk-utility + # partitioning utilities + gparted + gnome-disk-utility - # small nicities - wl-clipboard # wl-copy & wl-paste - libnotify # notifications library - xdg-utils # xdg utils + # small nicities + wl-clipboard # wl-copy & wl-paste + libnotify # notifications library + xdg-utils # xdg utils - # music tagging utility - picard + # music tagging utility + picard - # music lyric fetcher - lrcget + # music lyric fetcher + lrcget - inputs.zen-browser.packages."${system}" + inputs.zen-browser.packages."${system}".default - # freecad-wayland - puddletag + # freecad-wayland + puddletag - epiphany + epiphany - mcaselector + mcaselector - wireshark + wireshark - darktable - ] - ++ (builtins.filter lib.isDerivation (builtins.attrValues nerd-fonts)); + darktable + rawtherapee + hugin + + nautilus + nufraw + + enblend-enfuse + + nerdfonts + ]; + # ++ (builtins.filter lib.isDerivation (builtins.attrValues nerd-fonts)); programs.zed-editor = { enable = true; diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index d633f9e..5816a1a 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -88,7 +88,7 @@ nixfmt-rfc-style # serial viewer - minicom + # minicom # "~~matt's~~ my trace route" mtr From af6947fb299f0f846035c5c747239cb5c176b5cf Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 24 Jan 2025 16:18:14 -0500 Subject: [PATCH 088/724] things --- etcnixos/common.nix | 13 +++++++ etcnixos/distrobox.nix | 5 ++- etcnixos/flake.lock | 24 ++++++------- etcnixos/system-mreow.nix | 9 +++-- etcnixos/vm.nix | 14 ++++++++ home-manager/flake.lock | 62 ++++++++++++++++---------------- home-manager/gui.nix | 42 +++++++++++++++++----- home-manager/libs.nix | 4 +++ home-manager/no-gui.nix | 8 ++++- home-manager/progs/alacritty.nix | 2 +- home-manager/progs/niri.nix | 3 +- home-manager/progs/rss.nix | 15 -------- home-manager/progs/trezor.nix | 12 +++++++ 13 files changed, 138 insertions(+), 75 deletions(-) create mode 100644 etcnixos/vm.nix create mode 100644 home-manager/libs.nix create mode 100644 home-manager/progs/trezor.nix diff --git a/etcnixos/common.nix b/etcnixos/common.nix index 48869fa..70f49ec 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -12,6 +12,7 @@ imports = [ ./declarative-nm.nix ./distrobox.nix + ./vm.nix inputs.nixos-hardware.nixosModules.common-pc-ssd ]; @@ -54,6 +55,11 @@ initrd = { compressor = "zstd"; }; + + kernelModules = [ + "ip_tables" + "iptable_nat" + ]; }; environment.etc = { @@ -203,6 +209,8 @@ glib usbutils libmtp + man-pages + man-pages-posix ]; # wayland with electron/chromium applications @@ -221,4 +229,9 @@ }; system.stateVersion = "24.11"; + + documentation.enable = true; + documentation.man.enable = true; + documentation.dev.enable = true; + } diff --git a/etcnixos/distrobox.nix b/etcnixos/distrobox.nix index f85b99e..cd1a5b8 100644 --- a/etcnixos/distrobox.nix +++ b/etcnixos/distrobox.nix @@ -4,5 +4,8 @@ enable = true; }; - environment.systemPackages = [ pkgs.distrobox ]; + environment.systemPackages = [ + pkgs.distrobox + pkgs.podman-compose + ]; } diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index b79e967..7473c52 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -10,11 +10,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1723293904, - "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=", + "lastModified": 1736955230, + "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=", "owner": "ryantm", "repo": "agenix", - "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41", + "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c", "type": "github" }, "original": { @@ -152,11 +152,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1734994463, - "narHash": "sha256-S9MgfQjNt4J3I7obdLOVY23h+Yl/hnyibwGfOl+1uOE=", + "lastModified": 1737639419, + "narHash": "sha256-AEEDktApTEZ5PZXNDkry2YV2k6t0dTgLPEmAZbnigXU=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "93e6f0d77548be8757c11ebda5c4235ef4f3bc67", + "rev": "a65905a09e2c43ff63be8c0e86a93712361f871e", "type": "github" }, "original": { @@ -167,11 +167,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1735388221, - "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=", + "lastModified": 1737590910, + "narHash": "sha256-qM/y6Dtpu9Wmf5HqeZajQdn+cS0aljdYQQQnrvx+LJE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "7c674c6734f61157e321db595dbfcd8523e04e19", + "rev": "9368027715d8dde4b84c79c374948b5306fdd2db", "type": "github" }, "original": { @@ -183,11 +183,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1735531152, - "narHash": "sha256-As8I+ebItDKtboWgDXYZSIjGlKeqiLBvjxsQHUmAf1Q=", + "lastModified": 1737569578, + "narHash": "sha256-6qY0pk2QmUtBT9Mywdvif0i/CLVgpCjMUn6g9vB+f3M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3ffbbdbac0566a0977da3d2657b89cbcfe9a173b", + "rev": "47addd76727f42d351590c905d9d1905ca895b82", "type": "github" }, "original": { diff --git a/etcnixos/system-mreow.nix b/etcnixos/system-mreow.nix index 45724fe..f1079b8 100644 --- a/etcnixos/system-mreow.nix +++ b/etcnixos/system-mreow.nix @@ -15,8 +15,6 @@ inputs.lanzaboote.nixosModules.lanzaboote ]; - time.timeZone = lib.mkForce "Europe/Stockholm"; - services.tlp = { enable = true; settings = { @@ -118,5 +116,10 @@ # https://github.com/NixOS/nixos-hardware/pull/1253 # hardware.framework.laptop13.audioEnhancement = { # enable = true; - # }; + # };i + + # disable framework kernel module + # https://github.com/NixOS/nixos-hardware/issues/1330 + + hardware.framework.enableKmod = false; } diff --git a/etcnixos/vm.nix b/etcnixos/vm.nix new file mode 100644 index 0000000..f3428a1 --- /dev/null +++ b/etcnixos/vm.nix @@ -0,0 +1,14 @@ +{ pkgs, username, ... }: +{ + + programs.virt-manager.enable = true; + + users.groups.libvirtd.members = [ username ]; + + virtualisation.libvirtd.enable = true; + + virtualisation.spiceUSBRedirection.enable = true; + + users.users."${username}".extraGroups = [ "libvirtd" ]; + +} diff --git a/home-manager/flake.lock b/home-manager/flake.lock index a6a2fb5..2c96501 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -12,11 +12,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1723293904, - "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=", + "lastModified": 1736955230, + "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=", "owner": "ryantm", "repo": "agenix", - "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41", + "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c", "type": "github" }, "original": { @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1735381016, - "narHash": "sha256-CyCZFhMUkuYbSD6bxB/r43EdmDE7hYeZZPTCv0GudO4=", + "lastModified": 1737669579, + "narHash": "sha256-v9WQ3c4ctwPMfdBZMZxpdM9xXev4uChce4BxOpvsu0E=", "owner": "nix-community", "repo": "home-manager", - "rev": "10e99c43cdf4a0713b4e81d90691d22c6a58bdf2", + "rev": "7b9ece1bf3c8780cde9b975b28c2d9ccd7e9cdb9", "type": "github" }, "original": { @@ -79,11 +79,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1735591802, - "narHash": "sha256-oAridSudDNmdIFXYAj7tikcU0NwM3RNSLY4Qu1Khv8A=", + "lastModified": 1737627930, + "narHash": "sha256-oaAatwNVaX36xmI2AKIVu2oG07XJmHq2T+Y66hEprd8=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "bdcb629b3a8d62b4aff1b0484f74d5ad33dcf544", + "rev": "f79aa307f4bc0bfbabee404e6354fd2a1edfcb01", "type": "github" }, "original": { @@ -95,16 +95,16 @@ "niri-stable": { "flake": false, "locked": { - "lastModified": 1731483594, - "narHash": "sha256-Qjf7alRbPPERfiZsM9EMKX+HwjESky1tieh5PJIkLwE=", + "lastModified": 1736614405, + "narHash": "sha256-AJ1rlgNOPb3/+DbS5hkhm21t6Oz8IgqLllwmZt0lyzk=", "owner": "YaLTeR", "repo": "niri", - "rev": "75c79116a7e40cbc0e110ce0cdd500e896458679", + "rev": "e05bc269e678ecf828b96ae79c991c13b00b38a5", "type": "github" }, "original": { "owner": "YaLTeR", - "ref": "v0.1.10.1", + "ref": "v25.01", "repo": "niri", "type": "github" } @@ -112,11 +112,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1735586144, - "narHash": "sha256-YenL+60BJHF2cc4htz/iKEMgYd9dNfegzgH9tMBMhEY=", + "lastModified": 1737623252, + "narHash": "sha256-orq/c8lOUrZfCHQhfuLEJtMZpfBYhMtGv1Xuz99Pxj0=", "owner": "YaLTeR", "repo": "niri", - "rev": "4741ab2e0465275d58c36db426b169c742d964cf", + "rev": "128b01e04905d833214f52a3c6fab308bcc15ce0", "type": "github" }, "original": { @@ -127,11 +127,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1735531152, - "narHash": "sha256-As8I+ebItDKtboWgDXYZSIjGlKeqiLBvjxsQHUmAf1Q=", + "lastModified": 1737569578, + "narHash": "sha256-6qY0pk2QmUtBT9Mywdvif0i/CLVgpCjMUn6g9vB+f3M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3ffbbdbac0566a0977da3d2657b89cbcfe9a173b", + "rev": "47addd76727f42d351590c905d9d1905ca895b82", "type": "github" }, "original": { @@ -143,11 +143,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1735531152, - "narHash": "sha256-As8I+ebItDKtboWgDXYZSIjGlKeqiLBvjxsQHUmAf1Q=", + "lastModified": 1737569578, + "narHash": "sha256-6qY0pk2QmUtBT9Mywdvif0i/CLVgpCjMUn6g9vB+f3M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3ffbbdbac0566a0977da3d2657b89cbcfe9a173b", + "rev": "47addd76727f42d351590c905d9d1905ca895b82", "type": "github" }, "original": { @@ -174,11 +174,11 @@ ] }, "locked": { - "lastModified": 1735612067, - "narHash": "sha256-rsjojgfPUf9tWuMXuuo2KAIoUZ49XGZQJSjFGOO8Cq4=", + "lastModified": 1737599167, + "narHash": "sha256-S2rHCrQWCDVp63XxL/AQbGr1g5M8Zx14C7Jooa4oM8o=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "d199142e84bfaae476ffb4e09a70879d7918784d", + "rev": "38374302ae9edf819eac666d1f276d62c712dd06", "type": "github" }, "original": { @@ -222,11 +222,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1734745564, - "narHash": "sha256-JQNl4pqonVVPQ2JzEOLUcPVRNj//FFFNRDyvQoOkG7s=", + "lastModified": 1736487362, + "narHash": "sha256-4kGoOA7FgK9N2mzS+TFEn41kUUNY6KwdiA/0rqlr868=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "94da1af75326d89ecb12aba0cc9362e93ffdc766", + "rev": "8f55e27f63a749881c4bbfbb6b1da028342a91d1", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1735682290, - "narHash": "sha256-RFx8K81xEIca2zRvq5U7ufbB4BtX7NHbd32XM2Rd0mQ=", + "lastModified": 1737656612, + "narHash": "sha256-Lfi7TNgkEEz1mbTpwltdzUfTdZ1Ez1F9M9a7NRU3K3I=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "b5e7bd3defc733771f8aad0532c39d567f8f2aed", + "rev": "654bb9ee35d1116f401c72f545bf307fb62bfb3c", "type": "github" }, "original": { diff --git a/home-manager/gui.nix b/home-manager/gui.nix index 2a4a435..60f19c8 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -12,6 +12,7 @@ # gpt4all broken https://github.com/NixOS/nixpkgs/pull/346185 ./progs/gpt4all/gpt4all.nix + ./progs/trezor.nix ]; nixpkgs.config.allowUnfreePredicate = @@ -102,12 +103,19 @@ rawtherapee hugin + # nufraw + nufraw-thumbnailer + gdk-pixbuf nautilus - nufraw enblend-enfuse nerdfonts + + savvycan + + # simple screen recording on wayland + wl-screenrec ]; # ++ (builtins.filter lib.isDerivation (builtins.attrValues nerd-fonts)); @@ -126,6 +134,7 @@ "nix" "sql" "CSV" + "assembly" ]; }; @@ -171,14 +180,22 @@ }; }; - #qt application theming - qt = { - enable = true; - style = { - name = "breeze-dark"; - package = pkgs.kdePackages.breeze; - }; - }; + #qt application theming - BROKEN and on fire + # qt = { + # enable = true; + # platformTheme = { + # name = "adwaita"; + # package = [ + # pkgs.adwaita-qt + # pkgs.adwaita-qt6 + # ]; + # }; + + # style = { + # name = "adwaita-dark"; + # package = pkgs.adwaita-qt; + # }; + # }; #macOS cursor! home.pointerCursor = { @@ -187,4 +204,11 @@ name = "macOS"; size = 24; }; + + dconf.settings = { + "org/virt-manager/virt-manager/connections" = { + autoconnect = [ "qemu:///system" ]; + uris = [ "qemu:///system" ]; + }; + }; } diff --git a/home-manager/libs.nix b/home-manager/libs.nix new file mode 100644 index 0000000..c62047c --- /dev/null +++ b/home-manager/libs.nix @@ -0,0 +1,4 @@ +{ pkgs, ... }: +{ + +} diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 5816a1a..76c474f 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -88,7 +88,7 @@ nixfmt-rfc-style # serial viewer - # minicom + minicom # "~~matt's~~ my trace route" mtr @@ -110,6 +110,10 @@ mypy # type checking pyserial + + numpy + matplotlib + notebook ] )) @@ -136,6 +140,8 @@ imagemagick nixpkgs-review + + nmap ]; home.file.".cargo/config.toml".text = '' diff --git a/home-manager/progs/alacritty.nix b/home-manager/progs/alacritty.nix index c8f9750..b7e2c6a 100644 --- a/home-manager/progs/alacritty.nix +++ b/home-manager/progs/alacritty.nix @@ -15,7 +15,7 @@ decorations = "none"; # semi-transparent - opacity = 0.95; + opacity = 0.975; # padding between the content of the terminal and the edge padding = { diff --git a/home-manager/progs/niri.nix b/home-manager/progs/niri.nix index d28e532..fb38db3 100644 --- a/home-manager/progs/niri.nix +++ b/home-manager/progs/niri.nix @@ -57,8 +57,7 @@ { command = [ "${pkgs.xwayland-satellite-unstable}/bin/xwayland-satellite" - # (builtins.toString config.programs.niri.settings.environment.DISPLAY) - ":0" + (builtins.toString config.programs.niri.settings.environment.DISPLAY) ]; } ]; diff --git a/home-manager/progs/rss.nix b/home-manager/progs/rss.nix index 97515ca..8add383 100644 --- a/home-manager/progs/rss.nix +++ b/home-manager/progs/rss.nix @@ -9,11 +9,6 @@ url = "https://www.factorio.com/blog/rss"; } - { - title = "Firefox Nightly News"; - url = "https://blog.nightly.mozilla.org/feed/"; - } - { title = "Servo Blog"; url = "https://servo.org/blog/feed.xml"; @@ -54,11 +49,6 @@ url = "https://jarbus.net/index.xml"; } - { - title = "Terence Eden"; - url = "https://shkspr.mobi/blog/feed/atom/"; - } - { title = "GioCities"; url = "https://blog.giovanh.com/feeds/atom.xml"; @@ -69,11 +59,6 @@ url = "https://mcyoung.xyz/atom.xml"; } - { - title = "Embrace the Red"; - url = "https://embracethered.com/blog/index.xml"; - } - { title = "Chips and Cheese"; url = "https://chipsandcheese.com/feed/"; diff --git a/home-manager/progs/trezor.nix b/home-manager/progs/trezor.nix new file mode 100644 index 0000000..86e5f20 --- /dev/null +++ b/home-manager/progs/trezor.nix @@ -0,0 +1,12 @@ +{ pkgs, lib, ... }: +{ + nixpkgs.config.allowUnfree = true; + home.packages = with pkgs; [ + trezor-udev-rules + trezord + trezor-suite + monero-gui + monero-cli + trezorctl + ]; +} From 1e63fed148871e8de78f747b4583e13d314ffe24 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 24 Jan 2025 19:57:23 -0500 Subject: [PATCH 089/724] desktop: zfs with old drives --- etcnixos/flake.lock | 12 ++++++------ etcnixos/system-yarn.nix | 13 +++++++++++++ home-manager/flake.lock | 42 ++++++++++++++++++++-------------------- 3 files changed, 40 insertions(+), 27 deletions(-) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 7473c52..dda74e8 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -167,11 +167,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1737590910, - "narHash": "sha256-qM/y6Dtpu9Wmf5HqeZajQdn+cS0aljdYQQQnrvx+LJE=", + "lastModified": 1737751639, + "narHash": "sha256-ZEbOJ9iT72iwqXsiEMbEa8wWjyFvRA9Ugx8utmYbpz4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9368027715d8dde4b84c79c374948b5306fdd2db", + "rev": "dfad538f751a5aa5d4436d9781ab27a6128ec9d4", "type": "github" }, "original": { @@ -183,11 +183,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1737569578, - "narHash": "sha256-6qY0pk2QmUtBT9Mywdvif0i/CLVgpCjMUn6g9vB+f3M=", + "lastModified": 1737672001, + "narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "47addd76727f42d351590c905d9d1905ca895b82", + "rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8", "type": "github" }, "original": { diff --git a/etcnixos/system-yarn.nix b/etcnixos/system-yarn.nix index ff29462..a0a8d92 100644 --- a/etcnixos/system-yarn.nix +++ b/etcnixos/system-yarn.nix @@ -17,18 +17,31 @@ inputs.nixos-hardware.nixosModules.common-cpu-amd-zenpower ]; + networking.hostId = "abf570f9"; boot = { + kernelPackages = lib.mkForce pkgs.linuxPackages; + kernelParams = [ # allow overclocking (I actually underclock but lol) "amdgpu.ppfeaturemask=0xFFF7FFFF" + + # 2048MB + "zfs.zfs_arc_max=2048000000" ]; + supportedFilesystems = [ "zfs" ]; + zfs.extraPools = [ "laptop_hdds" ]; + kernelModules = [ # kernel module for case fan control "nct6775" ]; }; + systemd.tmpfiles.rules = [ + "d /laptop_hdds 0755 ${username} users" + ]; + services.xserver.enable = false; services.desktopManager.plasma6.enable = true; services.displayManager = { diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 2c96501..a417ce9 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1737669579, - "narHash": "sha256-v9WQ3c4ctwPMfdBZMZxpdM9xXev4uChce4BxOpvsu0E=", + "lastModified": 1737704314, + "narHash": "sha256-zta8jvOQ2wRCZmiwFEnS5iCulWAh8e+fLUlQxrgOBjM=", "owner": "nix-community", "repo": "home-manager", - "rev": "7b9ece1bf3c8780cde9b975b28c2d9ccd7e9cdb9", + "rev": "a0428685572b134f6594e7d7f5db5e1febbab2d7", "type": "github" }, "original": { @@ -79,11 +79,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1737627930, - "narHash": "sha256-oaAatwNVaX36xmI2AKIVu2oG07XJmHq2T+Y66hEprd8=", + "lastModified": 1737746480, + "narHash": "sha256-Lccg6b+Sz6TSDj4BpLZhugauwDa/CyCjF7E6W3VvYa0=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "f79aa307f4bc0bfbabee404e6354fd2a1edfcb01", + "rev": "afeb7877090d50d02c1ecab3159b328b85a44868", "type": "github" }, "original": { @@ -112,11 +112,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1737623252, - "narHash": "sha256-orq/c8lOUrZfCHQhfuLEJtMZpfBYhMtGv1Xuz99Pxj0=", + "lastModified": 1737697331, + "narHash": "sha256-9k77pFW2ANx8bZc+RcF6YP9McFZsUCWWY+XwBX0P3/Q=", "owner": "YaLTeR", "repo": "niri", - "rev": "128b01e04905d833214f52a3c6fab308bcc15ce0", + "rev": "748d90b443b9f20134020c21760b5b6c2c42a7de", "type": "github" }, "original": { @@ -127,11 +127,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1737569578, - "narHash": "sha256-6qY0pk2QmUtBT9Mywdvif0i/CLVgpCjMUn6g9vB+f3M=", + "lastModified": 1737672001, + "narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "47addd76727f42d351590c905d9d1905ca895b82", + "rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8", "type": "github" }, "original": { @@ -143,11 +143,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1737569578, - "narHash": "sha256-6qY0pk2QmUtBT9Mywdvif0i/CLVgpCjMUn6g9vB+f3M=", + "lastModified": 1737672001, + "narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "47addd76727f42d351590c905d9d1905ca895b82", + "rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8", "type": "github" }, "original": { @@ -174,11 +174,11 @@ ] }, "locked": { - "lastModified": 1737599167, - "narHash": "sha256-S2rHCrQWCDVp63XxL/AQbGr1g5M8Zx14C7Jooa4oM8o=", + "lastModified": 1737685583, + "narHash": "sha256-p+NVABRpGi+pT+xxf9HcLcFVxG6L+vEEy+NwzB9T0f8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "38374302ae9edf819eac666d1f276d62c712dd06", + "rev": "eb64cbcc8eee0fa87ebded92805280d2ec97415a", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1737656612, - "narHash": "sha256-Lfi7TNgkEEz1mbTpwltdzUfTdZ1Ez1F9M9a7NRU3K3I=", + "lastModified": 1737688749, + "narHash": "sha256-c67wGumgDSYe6T6OJOKP15H2ODxItUXXekQqDSPjEa0=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "654bb9ee35d1116f401c72f545bf307fb62bfb3c", + "rev": "44a3c15f50dba8073feca64ec500daa44d9f366d", "type": "github" }, "original": { From 56e25358ec7b80760e139d2ec75930ad35c78623 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 26 Jan 2025 01:18:03 -0500 Subject: [PATCH 090/724] remove stupid gpg key stuff --- home-manager/flake.lock | 36 +++++++++++++++---------------- home-manager/no-gui.nix | 9 -------- home-manager/secrets/my-gpg.age | Bin 2969 -> 0 bytes home-manager/secrets/secrets.nix | 1 - 4 files changed, 18 insertions(+), 28 deletions(-) delete mode 100644 home-manager/secrets/my-gpg.age diff --git a/home-manager/flake.lock b/home-manager/flake.lock index a417ce9..1c05ef5 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1737704314, - "narHash": "sha256-zta8jvOQ2wRCZmiwFEnS5iCulWAh8e+fLUlQxrgOBjM=", + "lastModified": 1737762889, + "narHash": "sha256-5HGG09bh/Yx0JA8wtBMAzt0HMCL1bYZ93x4IqzVExio=", "owner": "nix-community", "repo": "home-manager", - "rev": "a0428685572b134f6594e7d7f5db5e1febbab2d7", + "rev": "daf04c5950b676f47a794300657f1d3d14c1a120", "type": "github" }, "original": { @@ -79,11 +79,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1737746480, - "narHash": "sha256-Lccg6b+Sz6TSDj4BpLZhugauwDa/CyCjF7E6W3VvYa0=", + "lastModified": 1737840481, + "narHash": "sha256-WjW3cdrmh1sGMT3CBqCFzT9BOktTa1u9ldoWEqTj7xk=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "afeb7877090d50d02c1ecab3159b328b85a44868", + "rev": "8fc9dba8df75d9d004d9369b513b81180788ec15", "type": "github" }, "original": { @@ -112,11 +112,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1737697331, - "narHash": "sha256-9k77pFW2ANx8bZc+RcF6YP9McFZsUCWWY+XwBX0P3/Q=", + "lastModified": 1737795105, + "narHash": "sha256-zQSNUKj671I9M4DdMD4iMUnIIWN5oiaWdqDHUSVcaVE=", "owner": "YaLTeR", "repo": "niri", - "rev": "748d90b443b9f20134020c21760b5b6c2c42a7de", + "rev": "78697d1cea20e6b53013e820999b0403c45d9f00", "type": "github" }, "original": { @@ -174,11 +174,11 @@ ] }, "locked": { - "lastModified": 1737685583, - "narHash": "sha256-p+NVABRpGi+pT+xxf9HcLcFVxG6L+vEEy+NwzB9T0f8=", + "lastModified": 1737858462, + "narHash": "sha256-rohhmT/b8QNaIL3nY01jFtCyZu2dGTufef5YieECWZM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "eb64cbcc8eee0fa87ebded92805280d2ec97415a", + "rev": "dd236609a6c272d00ceaa042b1a81a31968e7f4d", "type": "github" }, "original": { @@ -222,11 +222,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1736487362, - "narHash": "sha256-4kGoOA7FgK9N2mzS+TFEn41kUUNY6KwdiA/0rqlr868=", + "lastModified": 1737837494, + "narHash": "sha256-wIMowP8Juas4ZwMRcpc+58sZ0kKTDu8fm13THPmv/F8=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "8f55e27f63a749881c4bbfbb6b1da028342a91d1", + "rev": "3944c9a0e40e5629f16ad023bbc90dac80d35a0f", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1737688749, - "narHash": "sha256-c67wGumgDSYe6T6OJOKP15H2ODxItUXXekQqDSPjEa0=", + "lastModified": 1737869730, + "narHash": "sha256-4u/VS7fiqAtnEnm2z7DSNzNyM7sUB+nq3aGKcKBwodg=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "44a3c15f50dba8073feca64ec500daa44d9f366d", + "rev": "39c4c603ee641aed350dce31562ad6dd6f0044d8", "type": "github" }, "original": { diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 76c474f..080888b 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -189,14 +189,5 @@ }; }; - age.secrets.gnupg = { - file = ./secrets/my-gpg.age; - path = "${homeDirectory}/.secrets/my-gpg.asc"; - }; - - home.activation.extractGnuPG = '' - ${pkgs.gnupg}/bin/gpg --import ${config.age.secrets.gnupg.path} - ''; - programs.home-manager.enable = true; } diff --git a/home-manager/secrets/my-gpg.age b/home-manager/secrets/my-gpg.age deleted file mode 100644 index 2344279827bb9c4513889db7e4e07d4b66ddf8dd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2969 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCUl$_b533{=Q=kMcK2 z$@6wMc8N*}cD4)%D^2tEjPfZAi12aD3k%80%W_OH$Vp6ej^xUS@(T^{5A*Uj4fFIV zFEw%s3Ns4LHxG98@-OoC4NcC#lyubJy5|dDay?>Si3Ac-{0N6 z*do~5#LYA>!qF?Oq$;_pB+aqX-Obse*eu)EEt0D++{DW{IVji2B0t!u%Am5KGR)N3 z+rZN@JulS2QoGc+GTkCGETYgY5Nw;DouaLqt8RKxYGQG!La<|=k*R`jqJMZl(~XP`@xMQCKOPlaz#QfW?=o1ur3XMS*6Zgyp$No0|^ zV_=18v3F)viKDl#b7n=h8<(q_OJ!0{p?8W=K!mqrO*Ss;gs&V_JY?fLpe3olHV5}(;HSD)wntl9Mi%~o}j)@)SVBXOZ5L0{D{M|E?` z+xZ{*jv&aJcdo>IAV zGAn=O-_7xNOh36yjS%!-qj_ll*_V00-euda>*Kx^YU13yL+Z=VO@*(_xssNP{Mc4} zIVV-$B+2~ksplUT3i~nsn^4uO_Un7ttCz7?%qH&s!MEMHsu%5TP`w!SeT`fCZSAE|x{lf&+yIkk> zj=y~*6?pE-RqiFZU#2xLw6#m&{*~)Fq4HO0>DSBCvQ~ZGtLDXhflF6ti`@hx{S|kF zf|GtG98BB$yY9)FFFZ02yC+=ec`ewqb;I{_J^UY+uB|rT6?W@K0=tq&v%$%idvz!O zzUH^ALgkbC<(Z2@8UvP|*SZ_>!b{gD^~wJn<~=Q&W%j)DloN>9rM*&2&-S&l$wQu3 zas~2C%w@`D`cB1LOJ{EXQt|YsOwEQX&R>6g%VCd>%dWI}-(&H6i=WxXjNKn2SI5>0 z&HC4tJ@aN!24Bj8wRhSpCCztKxXrxZd2vb3YODP3G1X7@Tn=zB{dM+%L56eO?%UH? z-+$k@y^x{e6uV1^!u2IapFZDs8|U-!yp5})zyGVd4zqnF3%HUy8J*UK_bDgzUtiw) zqWo=9xoY2vGt1t*c&of;`r&tfIXC!UcaGg6lPOpDRPe9m3+?H9Y#5%%c>T4pd6d=q zVD_YSW&6%vx$q##`Z9O=6b%JSivHp6-_x z-!SLFyybg-?8AKfCpD znqkUUpC$S&t8c#lm!H|UQ~v9Db0HJmvv*EU(tcLf|jIzxH@0)Mh1DNsI5CV=q?~Diq)I z)pTRvDZ$u=*V6^h-tI}+-TdjBgy^I2#)-NGXU^vB^G=9%?bVxkYvPH;cjx?aIz8>x z?_X;sJl!ns$gQ8Te$!GPUbDXY%Xa5}xA}Rdx7w1~ga7!nG~TSkTGQ`0PyH()+9l6r z5#@2!K4^aQG>*Svyas1p9k{;x)3uDs0!j9=i)>S$329B)|ITBr=Ts>_b+65#%Winw zxoNgv(!8}#XtL z*(ZHyol<`^;o5cnk~51BPRr}LHTA`vyDiI^jpXgW3Qa#+XE@D{=f~sg9p@8na%QJzKurPBC$C-n>HKFI_qsS$NMz9O_Fk0qoa>_T0_C zP96!eabaxfXY#HnQ19gZk+eC>Gl1jz%JiLgzb;912`-)Z;>W{4liB$T7VYzyKglgk z@6{I`5{HjP&ok?jEBCl*{_fP2c(&q6tVIhl)5_P@W^6gX!}o}$ z#&L_q_e&Zon;+%!EpYx@GM(quX0N%Q=cYWg5{Oxzz;B(2_iJO1z z8`GD6ItM@hFO}dtdR4$bwyDKXAd+eFN2L=D(k0RtRWF?~-5nP-t;X+I(TjRF&%ehf zJ*l7gOGf8I^4^M7z8eJ0SFp6NX#Q2QV6)-tX{VgJb~#j8E$~<_aerr2_Rgf`F9SUq z7@INz4kUbEbZ~wWM$H|u4o4368duT7?ZOrqG>APg^dLwYxSfWd4sGIyI3>2{{L=YzBcoO813vyuuN0hXV*TAI z%lV6|g-hJGgZ&m$cU@oUvFvdt*M-NMlZ_9|v9y2xlxfeZ!_H1MYBKA6On82+=Lxpa zUHa~4nb-EUtPefzr@1yY=M^jG3WTsFJYIIGT6GJnX0TNB9BG>;4`xqT5w*uy^wb8s zD=jN0wKq;W@bcbN^J!nsUa4?k_$;x&K55-%4+vacTUXUbaZFK$b=5M`A zPrk9)p)$8f{1Zb`S;dk3GMdSp8l&HOgn#I*~`($4^*f?hh{6dDZv)RNehG9J1Uht844y68@!5 g4amFDzH9plp+|h8ZY`g89+Zgwd4iAG&RRqa0JM&KLjV8( diff --git a/home-manager/secrets/secrets.nix b/home-manager/secrets/secrets.nix index 8e37f18..4bcb160 100644 --- a/home-manager/secrets/secrets.nix +++ b/home-manager/secrets/secrets.nix @@ -12,6 +12,5 @@ in }) [ "borg-laptop-password.age" - "my-gpg.age" ] )) From d2d7e22167071082647cbec079a7f399b7c21a92 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 29 Jan 2025 00:06:21 -0500 Subject: [PATCH 091/724] mreow: use nixos-hardware's framework speaker tuning --- etcnixos/system-mreow.nix | 7 +++++++ home-manager/system-mreow.nix | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/etcnixos/system-mreow.nix b/etcnixos/system-mreow.nix index f1079b8..7464795 100644 --- a/etcnixos/system-mreow.nix +++ b/etcnixos/system-mreow.nix @@ -15,6 +15,13 @@ inputs.lanzaboote.nixosModules.lanzaboote ]; + hardware.framework.laptop13.audioEnhancement = { + enable = true; + + # seems audio doesn't work without this + hideRawDevice = false; + }; + services.tlp = { enable = true; settings = { diff --git a/home-manager/system-mreow.nix b/home-manager/system-mreow.nix index e20c30d..db80d0b 100644 --- a/home-manager/system-mreow.nix +++ b/home-manager/system-mreow.nix @@ -17,7 +17,7 @@ ./progs/swaylock.nix - ./progs/framework-13-easyeffects.nix + # ./progs/framework-13-easyeffects.nix ]; home.packages = with pkgs; [ From 440d2f08f01608bf857046de6d7af991e8ebb99f Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 1 Feb 2025 23:26:22 -0500 Subject: [PATCH 092/724] major improvements on purity --- etcnixos/common.nix | 11 +++++++++++ etcnixos/flake.lock | 12 ++++++------ etcnixos/flake.nix | 35 ++++++++++++++++------------------ home-manager/flake.lock | 42 ++++++++++++++++++++--------------------- 4 files changed, 54 insertions(+), 46 deletions(-) diff --git a/etcnixos/common.nix b/etcnixos/common.nix index 70f49ec..531dc93 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -14,9 +14,19 @@ ./distrobox.nix ./vm.nix + inputs.agenix.nixosModules.default inputs.nixos-hardware.nixosModules.common-pc-ssd ]; + nixpkgs.config.allowUnfreePredicate = + pkg: + builtins.elem (lib.getName pkg) [ + "steam" + "steam-original" + "steam-unwrapped" + "steam-run" + ]; + nix = { # optimize the store optimise.automatic = true; @@ -59,6 +69,7 @@ kernelModules = [ "ip_tables" "iptable_nat" + "msr" ]; }; diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index dda74e8..cbc1b5f 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -167,11 +167,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1737751639, - "narHash": "sha256-ZEbOJ9iT72iwqXsiEMbEa8wWjyFvRA9Ugx8utmYbpz4=", + "lastModified": 1738391520, + "narHash": "sha256-6HI58PKjddsC0RA0gBQlt6ox47oH//jLUHwx05RO8g0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "dfad538f751a5aa5d4436d9781ab27a6128ec9d4", + "rev": "34b64e4e1ddb14e3ffc7db8d4a781396dbbab773", "type": "github" }, "original": { @@ -183,11 +183,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1737672001, - "narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=", + "lastModified": 1738277201, + "narHash": "sha256-6L+WXKCw5mqnUIExvqkD99pJQ41xgyCk6z/H9snClwk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8", + "rev": "666e1b3f09c267afd66addebe80fb05a5ef2b554", "type": "github" }, "original": { diff --git a/etcnixos/flake.nix b/etcnixos/flake.nix index 91c57ec..9dbee29 100644 --- a/etcnixos/flake.nix +++ b/etcnixos/flake.nix @@ -29,32 +29,29 @@ }@inputs: let username = "primary"; - hostname = nixpkgs.lib.strings.removeSuffix "\n" (builtins.readFile /etc/hostname); system = "x86_64-linux"; - pkgs = import nixpkgs { - # config.allowUnfreePredicate = - # pkg: - # builtins.elem (nixpkgs.lib.getName pkg) [ - # "steam-unwrapped" - # "steam" - # ]; - - # idk pkgs.wivrn pulls a bunch of cuda stuff even though cudaSupport is disabled? - config.allowUnfree = true; - - config.cudaSupport = false; - }; in { - nixosConfigurations.${hostname} = nixpkgs.lib.nixosSystem { + # desktop + nixosConfigurations.yarn = nixpkgs.lib.nixosSystem { specialArgs = { - inherit inputs username hostname; + hostname = "yarn"; + inherit inputs username; }; - inherit pkgs; modules = [ - ./system-${hostname}.nix - agenix.nixosModules.default + ./system-yarn.nix + ]; + }; + + # laptop + nixosConfigurations.mreow = nixpkgs.lib.nixosSystem { + specialArgs = { + hostname = "mreow"; + inherit inputs username; + }; + modules = [ + ./system-mreow.nix ]; }; }; diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 1c05ef5..d1ea531 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1737762889, - "narHash": "sha256-5HGG09bh/Yx0JA8wtBMAzt0HMCL1bYZ93x4IqzVExio=", + "lastModified": 1738415006, + "narHash": "sha256-ZlLTnqIQQ8OE6AtT+fluB642j2R9tnvxHHtpnmLjSxQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "daf04c5950b676f47a794300657f1d3d14c1a120", + "rev": "8544cd092047a7e92d0dce011108a563de7fc0f2", "type": "github" }, "original": { @@ -79,11 +79,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1737840481, - "narHash": "sha256-WjW3cdrmh1sGMT3CBqCFzT9BOktTa1u9ldoWEqTj7xk=", + "lastModified": 1738410471, + "narHash": "sha256-j0XZIViI4ZEFwhrEzVKz696/4DZ9pRiWtGfxJogA+MM=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "8fc9dba8df75d9d004d9369b513b81180788ec15", + "rev": "16f8e14385163479aca7231d8fab0091adac2e56", "type": "github" }, "original": { @@ -112,11 +112,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1737795105, - "narHash": "sha256-zQSNUKj671I9M4DdMD4iMUnIIWN5oiaWdqDHUSVcaVE=", + "lastModified": 1738404307, + "narHash": "sha256-BFtfL5kZbIsDAMgbVP5E0HbqDapYWw4NBw1xS0AOCCc=", "owner": "YaLTeR", "repo": "niri", - "rev": "78697d1cea20e6b53013e820999b0403c45d9f00", + "rev": "32ad545f842f4c176548e30d183d10e0a2bab752", "type": "github" }, "original": { @@ -127,11 +127,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1737672001, - "narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=", + "lastModified": 1738277201, + "narHash": "sha256-6L+WXKCw5mqnUIExvqkD99pJQ41xgyCk6z/H9snClwk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8", + "rev": "666e1b3f09c267afd66addebe80fb05a5ef2b554", "type": "github" }, "original": { @@ -143,11 +143,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1737672001, - "narHash": "sha256-YnHJJ19wqmibLQdUeq9xzE6CjrMA568KN/lFPuSVs4I=", + "lastModified": 1738277201, + "narHash": "sha256-6L+WXKCw5mqnUIExvqkD99pJQ41xgyCk6z/H9snClwk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "035f8c0853c2977b24ffc4d0a42c74f00b182cd8", + "rev": "666e1b3f09c267afd66addebe80fb05a5ef2b554", "type": "github" }, "original": { @@ -174,11 +174,11 @@ ] }, "locked": { - "lastModified": 1737858462, - "narHash": "sha256-rohhmT/b8QNaIL3nY01jFtCyZu2dGTufef5YieECWZM=", + "lastModified": 1738376888, + "narHash": "sha256-S6ErHxkSm0iA7ZMsjjDaASWxbELYcdfv8BhOkkj1rHw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "dd236609a6c272d00ceaa042b1a81a31968e7f4d", + "rev": "83284068670d5ae4a43641c4afb150f3446be70d", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1737869730, - "narHash": "sha256-4u/VS7fiqAtnEnm2z7DSNzNyM7sUB+nq3aGKcKBwodg=", + "lastModified": 1738421728, + "narHash": "sha256-+4w7zluaVoM1WrbhuBkWUF5hiXVCmXORlVT/p0Dm4vQ=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "39c4c603ee641aed350dce31562ad6dd6f0044d8", + "rev": "d0022d9a6c2a18ea8da0ecaa6482b4607f3d7591", "type": "github" }, "original": { From 080e09445c78aa7ae74254cd943330ecf5b27f18 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 3 Feb 2025 23:34:15 -0500 Subject: [PATCH 093/724] ricing and config changes --- etcnixos/common.nix | 5 +- etcnixos/flake.lock | 159 +++++++++++++++++++++++++++++-- etcnixos/flake.nix | 47 ++++----- etcnixos/vm.nix | 67 ++++++++++++- home-manager/flake.lock | 44 ++++----- home-manager/flake.nix | 3 +- home-manager/gui.nix | 138 ++++++++++++++------------- home-manager/libs.nix | 4 - home-manager/no-gui.nix | 10 +- home-manager/progs/alacritty.nix | 2 +- home-manager/progs/fish.nix | 4 - home-manager/progs/helix.nix | 6 ++ home-manager/progs/niri.nix | 4 +- home-manager/progs/waybar.nix | 5 +- home-manager/system-mreow.nix | 2 - home-manager/wallpaper.png | Bin 0 -> 22568 bytes 16 files changed, 353 insertions(+), 147 deletions(-) delete mode 100644 home-manager/libs.nix create mode 100644 home-manager/wallpaper.png diff --git a/etcnixos/common.nix b/etcnixos/common.nix index 531dc93..34020de 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -16,6 +16,7 @@ inputs.agenix.nixosModules.default inputs.nixos-hardware.nixosModules.common-pc-ssd + inputs.chaotic.nixosModules.default ]; nixpkgs.config.allowUnfreePredicate = @@ -47,7 +48,7 @@ # kernel options boot = { - kernelPackages = pkgs.linuxPackages_latest; + kernelPackages = pkgs.linuxPackages_cachyos-lto; kernel.sysctl = { # dmesg shushhhhh @@ -156,7 +157,7 @@ programs.dconf.enable = true; # Enable sound with pipewire. - hardware.pulseaudio.enable = false; # pipewire >>>>>>> pulseaudio + services.pulseaudio.enable = false; # pipewire >>>>>>> pulseaudio security.rtkit.enable = true; services.pipewire = { enable = true; diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index cbc1b5f..36f19af 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -23,6 +23,31 @@ "type": "github" } }, + "chaotic": { + "inputs": { + "fenix": "fenix", + "flake-schemas": "flake-schemas", + "home-manager": "home-manager_2", + "jovian": "jovian", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1738552004, + "narHash": "sha256-eYE+8F0ZrSIYvlVkgTjTBlnM1COqUdSs4GKyWnel6I4=", + "owner": "chaotic-cx", + "repo": "nyx", + "rev": "894d1db77131a4a449d1993c7ba314ee15dd4e36", + "type": "github" + }, + "original": { + "owner": "chaotic-cx", + "ref": "nyxpkgs-unstable", + "repo": "nyx", + "type": "github" + } + }, "crane": { "locked": { "lastModified": 1731098351, @@ -60,6 +85,28 @@ "type": "github" } }, + "fenix": { + "inputs": { + "nixpkgs": [ + "chaotic", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { + "lastModified": 1738477724, + "narHash": "sha256-S1x0F7q9cJ6EEmZsakse2Ps6Adi7NadxRtGiuWUlwT0=", + "owner": "nix-community", + "repo": "fenix", + "rev": "1936bb37b1d8597273e3611873dc09dd61b09818", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -97,6 +144,20 @@ "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": [ @@ -140,6 +201,49 @@ "type": "github" } }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "chaotic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1738448366, + "narHash": "sha256-4ATtQqBlgsGqkHTemta0ydY6f7JBRXz4Hf574NHQpkg=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "18fa9f323d8adbb0b7b8b98a8488db308210ed93", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "jovian": { + "inputs": { + "nix-github-actions": "nix-github-actions", + "nixpkgs": [ + "chaotic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1738478597, + "narHash": "sha256-it7lc+HRSQiLV+3CcA+c6fkr2355HyT2GGUowHdfa/E=", + "owner": "Jovian-Experiments", + "repo": "Jovian-NixOS", + "rev": "77fb0818cb42ca0db98839d47bbc6a317c286282", + "type": "github" + }, + "original": { + "owner": "Jovian-Experiments", + "repo": "Jovian-NixOS", + "type": "github" + } + }, "lanzaboote": { "inputs": { "crane": "crane", @@ -165,13 +269,36 @@ "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": 1738391520, - "narHash": "sha256-6HI58PKjddsC0RA0gBQlt6ox47oH//jLUHwx05RO8g0=", + "lastModified": 1738638143, + "narHash": "sha256-ZYMe4c4OCtIUBn5hx15PEGr0+B1cNEpl2dsaLxwY2W0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "34b64e4e1ddb14e3ffc7db8d4a781396dbbab773", + "rev": "9bdd53f5908453e4d03f395eb1615c3e9a351f70", "type": "github" }, "original": { @@ -183,16 +310,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1738277201, - "narHash": "sha256-6L+WXKCw5mqnUIExvqkD99pJQ41xgyCk6z/H9snClwk=", + "lastModified": 1738410390, + "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "666e1b3f09c267afd66addebe80fb05a5ef2b554", + "rev": "3a228057f5b619feb3186e986dbe76278d707b6e", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -243,11 +370,29 @@ "root": { "inputs": { "agenix": "agenix", + "chaotic": "chaotic", "lanzaboote": "lanzaboote", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs" } }, + "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1738433753, + "narHash": "sha256-lyhEsEf5FQzV+KHVkfxIApMOFWHqyls5+llcQ/uhV6Y=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "88b901878e684e4f68f104fdbc48749f41bcccd3", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, "rust-overlay": { "inputs": { "nixpkgs": [ diff --git a/etcnixos/flake.nix b/etcnixos/flake.nix index 9dbee29..5366a77 100644 --- a/etcnixos/flake.nix +++ b/etcnixos/flake.nix @@ -2,8 +2,7 @@ description = "System nixOS flake"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; - # nixpkgs.url = "github:NixOS/nixpkgs/master"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; lanzaboote = { url = "github:nix-community/lanzaboote"; @@ -16,6 +15,11 @@ url = "github:ryantm/agenix"; inputs.nixpkgs.follows = "nixpkgs"; }; + + chaotic = { + url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = @@ -30,29 +34,26 @@ let username = "primary"; system = "x86_64-linux"; + hostnames = [ + "mreow" + "yarn" + ]; in { - # desktop - nixosConfigurations.yarn = nixpkgs.lib.nixosSystem { - specialArgs = { - hostname = "yarn"; - inherit inputs username; - }; - modules = [ - ./system-yarn.nix - ]; - }; - - # laptop - nixosConfigurations.mreow = nixpkgs.lib.nixosSystem { - specialArgs = { - hostname = "mreow"; - inherit inputs username; - }; - modules = [ - ./system-mreow.nix - ]; - }; + nixosConfigurations = nixpkgs.lib.foldl' ( + config: hostname: + config + // { + "${hostname}" = nixpkgs.lib.nixosSystem { + specialArgs = { + inherit inputs username hostname; + }; + modules = [ + ./system-${hostname}.nix + ]; + }; + } + ) { } hostnames; }; } diff --git a/etcnixos/vm.nix b/etcnixos/vm.nix index f3428a1..112b2d9 100644 --- a/etcnixos/vm.nix +++ b/etcnixos/vm.nix @@ -1,14 +1,77 @@ -{ pkgs, username, ... }: { + pkgs, + username, + lib, + ... +}: +{ + + environment.systemPackages = with pkgs; [ + # https://github.com/quickemu-project/quickemu + (quickemu.overrideAttrs (old: { + patches = [ + (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; + 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="; + }) + + (pkgs.fetchpatch { + url = "https://github.com/Scrut1ny/Hypervisor-Phantom/raw/d09d66813570704e2b05440f290d6f9bdf2d26c7/Hypervisor-Phantom/patches/QEMU/qemu-9.2.0-libnfs6.patch"; + sha256 = "DkkC7KiQLnL7jbBOtgyLKVvozEG388hdfl5seEqvu3o="; + }) + ]; + }) + ); + + ovmf.packages = lib.mkForce [ + (pkgs.OVMF.overrideAttrs (old: { + secureBoot = true; + tpmSupport = true; + })).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="; + }; + } + ]; + } diff --git a/home-manager/flake.lock b/home-manager/flake.lock index d1ea531..2e552d9 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1738415006, - "narHash": "sha256-ZlLTnqIQQ8OE6AtT+fluB642j2R9tnvxHHtpnmLjSxQ=", + "lastModified": 1738610386, + "narHash": "sha256-yb6a5efA1e8xze1vcdN2HBxqYr340EsxFMrDUHL3WZM=", "owner": "nix-community", "repo": "home-manager", - "rev": "8544cd092047a7e92d0dce011108a563de7fc0f2", + "rev": "066ba0c5cfddbc9e0dddaec73b1561ad38aa8abe", "type": "github" }, "original": { @@ -79,11 +79,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1738410471, - "narHash": "sha256-j0XZIViI4ZEFwhrEzVKz696/4DZ9pRiWtGfxJogA+MM=", + "lastModified": 1738583235, + "narHash": "sha256-Tk5w3uqp045W/W0mDQT0swwy90ex0l3JWS2crimG8Wo=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "16f8e14385163479aca7231d8fab0091adac2e56", + "rev": "1511396846427b58f1d6ca5442a228ede7673c67", "type": "github" }, "original": { @@ -112,11 +112,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1738404307, - "narHash": "sha256-BFtfL5kZbIsDAMgbVP5E0HbqDapYWw4NBw1xS0AOCCc=", + "lastModified": 1738579367, + "narHash": "sha256-820QsR/C9+Gyn3v65LHNwwW7KxSA6u6MQtky3SUrZ3A=", "owner": "YaLTeR", "repo": "niri", - "rev": "32ad545f842f4c176548e30d183d10e0a2bab752", + "rev": "553b1ba85256e2cb290e8a67f709a14e603606bc", "type": "github" }, "original": { @@ -127,27 +127,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1738277201, - "narHash": "sha256-6L+WXKCw5mqnUIExvqkD99pJQ41xgyCk6z/H9snClwk=", + "lastModified": 1738410390, + "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "666e1b3f09c267afd66addebe80fb05a5ef2b554", + "rev": "3a228057f5b619feb3186e986dbe76278d707b6e", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1738277201, - "narHash": "sha256-6L+WXKCw5mqnUIExvqkD99pJQ41xgyCk6z/H9snClwk=", + "lastModified": 1738435198, + "narHash": "sha256-5+Hmo4nbqw8FrW85FlNm4IIrRnZ7bn0cmXlScNsNRLo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "666e1b3f09c267afd66addebe80fb05a5ef2b554", + "rev": "f6687779bf4c396250831aa5a32cbfeb85bb07a3", "type": "github" }, "original": { @@ -174,11 +174,11 @@ ] }, "locked": { - "lastModified": 1738376888, - "narHash": "sha256-S6ErHxkSm0iA7ZMsjjDaASWxbELYcdfv8BhOkkj1rHw=", + "lastModified": 1738635966, + "narHash": "sha256-5MbJhh6nz7tx8FYVOJ0+ixMaEn0ibGzV/hScPMmqVTE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "83284068670d5ae4a43641c4afb150f3446be70d", + "rev": "1ff8663cd75a11e61f8046c62f4dbb05d1907b44", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1738421728, - "narHash": "sha256-+4w7zluaVoM1WrbhuBkWUF5hiXVCmXORlVT/p0Dm4vQ=", + "lastModified": 1738639173, + "narHash": "sha256-fZnh8ypF2NJ99heI3C/MdtvRUDlIhuSCnhduKEJy86o=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "d0022d9a6c2a18ea8da0ecaa6482b4607f3d7591", + "rev": "5bce21504d22f7d9d984b4f008cbc74b4ce76273", "type": "github" }, "original": { diff --git a/home-manager/flake.nix b/home-manager/flake.nix index e376bec..954a3e0 100644 --- a/home-manager/flake.nix +++ b/home-manager/flake.nix @@ -2,8 +2,7 @@ description = "My nixOS flake for home-manager"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; - # nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; home-manager = { url = "github:nix-community/home-manager"; diff --git a/home-manager/gui.nix b/home-manager/gui.nix index 60f19c8..6bb51b1 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -21,103 +21,105 @@ "apple_cursor" ]; - home.packages = with pkgs; [ - #calculator - gnome-calculator + home.packages = + with pkgs; + [ + #calculator + gnome-calculator - #productivity stuff - libreoffice - hunspell # spellcheck - hunspellDicts.en_US # spellcheck dictionary + #productivity stuff + libreoffice + hunspell # spellcheck + hunspellDicts.en_US # spellcheck dictionary - #video and audio downloading - parabolic + #video and audio downloading + parabolic - #soulseek client - nicotine-plus + #soulseek client + nicotine-plus - #dark web browsing deep web browsing - tor-browser + #dark web browsing deep web browsing + tor-browser - #audio editing - audacity + #audio editing + audacity - #fonts - noto-fonts - noto-fonts-emoji - liberation_ttf + #fonts + noto-fonts + noto-fonts-emoji + liberation_ttf - #for ebook reading - foliate + #for ebook reading + foliate - #audio mixer (pavucontrol but for pipewire) - pwvucontrol + #audio mixer (pavucontrol but for pipewire) + pwvucontrol - #minecraft launcher - prismlauncher + #minecraft launcher + prismlauncher - mpv - mumble - system76-keyboard-configurator + mpv + mumble + system76-keyboard-configurator - #jellyfin - finamp # music player - delfin # jellyfin client + #jellyfin + finamp # music player + delfin # jellyfin client - signal-desktop + signal-desktop - #accounting - # gnucash + #accounting + # gnucash - # image tools - inkscape - nomacs + # image tools + inkscape + nomacs - # partitioning utilities - gparted - gnome-disk-utility + # partitioning utilities + gparted + gnome-disk-utility - # small nicities - wl-clipboard # wl-copy & wl-paste - libnotify # notifications library - xdg-utils # xdg utils + # small nicities + wl-clipboard # wl-copy & wl-paste + libnotify # notifications library + xdg-utils # xdg utils - # music tagging utility - picard + # music tagging utility + picard - # music lyric fetcher - lrcget + # music lyric fetcher + lrcget - inputs.zen-browser.packages."${system}".default + inputs.zen-browser.packages."${system}".default - # freecad-wayland - puddletag + # freecad-wayland + puddletag - epiphany + epiphany - mcaselector + mcaselector - wireshark + wireshark - darktable - rawtherapee - hugin + darktable + rawtherapee + hugin - # nufraw - nufraw-thumbnailer - gdk-pixbuf - nautilus + # nufraw + nufraw-thumbnailer + gdk-pixbuf + nautilus - enblend-enfuse + enblend-enfuse - nerdfonts + savvycan - savvycan + # nerdfonts - # simple screen recording on wayland - wl-screenrec - ]; - # ++ (builtins.filter lib.isDerivation (builtins.attrValues nerd-fonts)); + # simple screen recording on wayland + wl-screenrec + ] + ++ (builtins.filter lib.isDerivation (builtins.attrValues nerd-fonts)); programs.zed-editor = { enable = true; diff --git a/home-manager/libs.nix b/home-manager/libs.nix deleted file mode 100644 index c62047c..0000000 --- a/home-manager/libs.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ pkgs, ... }: -{ - -} diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 080888b..13816ba 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -144,11 +144,11 @@ nmap ]; - home.file.".cargo/config.toml".text = '' - [target.${lib.strings.removeSuffix "-linux" pkgs.system}-unknown-linux-gnu] - linker = "${pkgs.clang}/bin/clang" - rustflags = ["-C", "link-arg=-fuse-ld=${pkgs.mold}/bin/mold"] - ''; + # home.file.".cargo/config.toml".text = '' + # [target.${lib.strings.removeSuffix "-linux" pkgs.system}-unknown-linux-gnu] + # linker = "${pkgs.clang}/bin/clang" + # rustflags = ["-C", "link-arg=-fuse-ld=${pkgs.mold}/bin/mold"] + # ''; # default applications home.sessionVariables = { diff --git a/home-manager/progs/alacritty.nix b/home-manager/progs/alacritty.nix index b7e2c6a..49de2b1 100644 --- a/home-manager/progs/alacritty.nix +++ b/home-manager/progs/alacritty.nix @@ -15,7 +15,7 @@ decorations = "none"; # semi-transparent - opacity = 0.975; + opacity = 0.90; # padding between the content of the terminal and the edge padding = { diff --git a/home-manager/progs/fish.nix b/home-manager/progs/fish.nix index 4149a6a..29e64de 100644 --- a/home-manager/progs/fish.nix +++ b/home-manager/progs/fish.nix @@ -43,12 +43,8 @@ in pbcopy = "${pkgs.wl-clipboard}/bin/wl-copy"; pbpaste = "${pkgs.wl-clipboard}/bin/wl-paste"; - nix-cleanup = "doas nix-collect-garbage --delete-older-than 1d && doas nix-store --optimise && doas nix-store --gc"; - gcc-native = "${pkgs.gcc}/bin/gcc -Q --help=target -mtune=native -march=native | ${pkgs.gnugrep}/bin/grep -E '^\\s+\-(mtune|march)=' | ${coreutils}/tr -d '[:blank:]'"; - chess = "${pkgs.chess-tui}/bin/chess-tui -e ${pkgs.stockfish}/bin/stockfish"; - run-steam = "gamescope --backend sdl -W 2256 -H 1504 -f --steam -- steam -tenfoot -pipewire-dmabuf"; }; diff --git a/home-manager/progs/helix.nix b/home-manager/progs/helix.nix index 6dd51cb..3f5919e 100644 --- a/home-manager/progs/helix.nix +++ b/home-manager/progs/helix.nix @@ -18,7 +18,13 @@ # wrapping!! soft-wrap.enable = true; + + end-of-line-diagnostics = "hint"; + inline-diagnostics = { + cursor-line = "warning"; + }; }; + }; languages = { diff --git a/home-manager/progs/niri.nix b/home-manager/progs/niri.nix index fb38db3..5c3c8ea 100644 --- a/home-manager/progs/niri.nix +++ b/home-manager/progs/niri.nix @@ -47,10 +47,8 @@ { command = [ "${pkgs.swaybg}/bin/swaybg" - "-m" - "center" "-i" - "${homeDirectory}/.wallpaper.png" + "${../wallpaper.png}" ]; } diff --git a/home-manager/progs/waybar.nix b/home-manager/progs/waybar.nix index 5b3f0ed..6e3ee36 100644 --- a/home-manager/progs/waybar.nix +++ b/home-manager/progs/waybar.nix @@ -158,9 +158,10 @@ style = '' /*base background color*/ - @define-color bg_main rgba(25, 25, 25, 1.0); - @define-color bg_main_tooltip rgba(0, 0, 0, 0.7); + /* color picked from a celeste background bc it looks pretty and matches my background */ + @define-color bg_main rgba(39.6, 51.4, 76.1, 1.0); + @define-color bg_main_tooltip rgba(0, 0, 0, 0.7); /*base background color of selections */ @define-color bg_hover rgba(200, 200, 200, 0.3); diff --git a/home-manager/system-mreow.nix b/home-manager/system-mreow.nix index db80d0b..b5e35ff 100644 --- a/home-manager/system-mreow.nix +++ b/home-manager/system-mreow.nix @@ -32,8 +32,6 @@ xwayland-satellite-unstable ]; - services.blueman-applet.enable = true; - # media controls systemd.user.services.mpris-proxy = { Unit.Description = "Mpris proxy"; diff --git a/home-manager/wallpaper.png b/home-manager/wallpaper.png new file mode 100644 index 0000000000000000000000000000000000000000..6806bd75f2538cfe13a51cf017baeeb56a27ead1 GIT binary patch literal 22568 zcmeAS@N?(olHy`uVBq!ia0y~y;C5hOU~gbyW?*1guX%bh0|SFXvPY0F14ES>14Ba# z1H&%{28MBE85kHi3p^r=85p>QL70(Y z)*J~21_t&LPhVH|mrN`y;*7N$EEpLW!cKd-IEGZ*dVAM*ld9*;=b1WT1&`J!_&Xe7 zYPjRTGR4Dxr4Li0$HT46)5}&?b}WCgLwzp;i(uGIi!IjQ?|n{{&-xW^T01W=^+Dco zpZnqU6NNX`eKTel1vC$VhULrFZ}+ZeKA^~H;;@)SYC#|q?*)xUwu~tb%qCt77^PG% zF!Ty#G`OKkb7%<0|7E+;h*Qyq)g|%MEtmFlFPK+S#47cmk5W>?&uZx_t^)U6$C!AD zCePYk%Kj7f%O)ed%KW+Y(*CZ+9_v3vzx=!)_T}9<@2A*l^(pN=mA~|SbJ^1J;(fut zR#(b_-Nj{nxwduM<8y{D!KfN%8m0=?yXz4Wcfj+m#LY@G;KM*886+wTJvS*28XK1S%qHyO@Dn}zRjY{ zh+5y5yxC4wTz3qXZhyq!$9lf<+-8m3cO`wgwyb$GE=3nIEN^;l^E`5jS-I8mY4e!O zeO|7$Xb3)7JnyrP*KF&#$=?2r(#yVt$sAbu!18>h*wV9e&uv_~`~Yuol{VjlkPma7 z+jL)g=J))@rQio`ntMgr3$!ZE70+|cEM8um^HQ_m@RWO9%od_H&n?d{+OqSq<+d*( zI}*L}k222Tn)i85df=@)FJ+=>>%28z_JzjAXw8Ub-&N@K{>p(%o432T8!t6)yyW+C zu2e+Tw`ngjmVHqRxTU!_nA!XMJt5h%Q|_^NSuZWmN_crQdeP#Umu5R;F8|`kt7BX3 zU1AbkC9Lsw%Dt71OVjf^`_jDfnU>DIWNo_P%NyN`7kys(F4z)WwVZ9*yuGScvo!Z| zPAT(xFYDe~I?NI=`1s znYMYlxBQ)R=`?H3NmN z+A=A_VelBR{bAcYJL44^wRbNqTl;*v+=GJ4{_`b6rtHhhynOAmH-Ev7m&?!dXnDnN z-;(+I=TdfyJ6|rRvxzQUAAM`f*FTq-W%7Q#G;Z#?bX_<1R#n|gMn3buUuHVGzI;8+ zEZ27b7l!uPb-&ImSoEdTd-k?@@l_3neeG-00s?>STIw5pUf=e>u1k-j6ly~@MEts> z;`@6}M%9wirR_T$eyvE@_+_c*tZ$YVzj(a%;xBCc5_mA_rT1i$x5bNIPP{f%?h(_= z#Z5;qO;^jj_1xvM@>*@%BdnL)S-Y3&`(D~|zH^y-RCrYf_mX}tG4J?UOETvR`}S{H z_eDV5Lta#8+CCG{%XaFsp z#Jpg}qTMln+56MAEMpqwE>DqTI4W}Y=_~sRo8XfVxxUO;_Ju)X*$ch!{|6t>^x_L& zaNJ}myMv)?`OaVba_2*eb}-p4)3jyi(%g0WYW;_bWs?qzzA*HC$r#`Rcgnjr@w)rN zRnMnvXAkzcxK`G?swBtYs#MnP>hy)t=4+#c-V|S77Ui5<{a&Z!^|Dg$rrLM6Lb6xn zzMtEgcXvyk=Z5pKv$J@&zTLa|!rIx_bUDB6%nn|=aNFK;v0bH?cc~t8CL|EV&C07kmzIl{;%fWMW2^`wpLzLZ6|Hfllg3~{nGf7eI<42E+yyF zncEG|?)kp_OZU0y=ic{py!)B+z+l(6K4$+*$#A~BK5246M+pBEiAH-`t zbxXM>kRcJhYroRx28Y8pF8vjq$<88mY}&i^Cu|fh7;G!4cYVg#*tT)$Z*3!f4wD|; zyYUk%9Tp_!y!_Y2W3XrK|I-ofm)v%GCgcb2 zGG0^SwVrRocFntzVOC4S*>BvQ@{UJ)?xoetZ*slL+ot-xyvq2^Y^n8OujOA}F;vgK zG&gZ+a8+r;Uf-AJHeAx&Yjxn>vXXSLaa|gF#b3UcJT+wVs%|q{dijX@@-K1)F-xbL{3u1^5tZkc{kPP%l)-o{)JP_rm9gcctk0VULd_}HGj^=kFVWIqkg@-G9~V> z8SC?jaUD+c3w17EW#=*pT@t?E_h97`@kJNXWlooTZDjHleR(xMxIpe@tHu|}<3_Qy z3mk%7tG?bAnd4ri$W?o6qffZJ#)XiHlp6KQa_RCtSHoW_y}z56q_wWF%KU!RchTUr z2bY*Ho)>&n_0G}om!b3YZL`Hz?Kt-GZcX;xaG$MglkfFZ`H4<15RYFPUb*kfn#dK8 zq?VU|URxS(cvZ@$%J`LKXw0G5nyGP5e_q<0wy-OE&b_nSuhkw6$u@X-cE$6MLeBD! zp;c3#d!L`xI#Ml7R(SqJ%S^?#TX62Rt?GNVe0N@vo8@r5*e^fa`O;>Ii4OVYD{W00 z*FB$eZ(ZAxbVH@ad+&m(Gnit}TkehJ^*o>C!nF79(r*`7cFilU+ATF{-q8-0s@>ji z7jl-^KL1i?3No4VOWE{W&cZLM&b@q_4o>_6ff(m7q#6h>bpZFP2mFTa^vrj zcg&y9S?RnWe&=uzDY)S<|MKG{TfD25yA}NYf8g$G`(nR*C&QPQ=Na~Y;ePYf!u!bo z_ml3e6yzw0W|fV^YR)62Dd-?Ic zjlJ|K)xWvy3KwJ?t9JfUz2GaH(WkIC=C9C;Wt=AN6XMp@ah6Y0 z!6nmI$1~kEX?(_U>GW0o#=Kb$#VjwMzMAe}?z_OU=}Xa9?*+5fh%}Cw^;hTe*KYeS zoo0Q_@g@CviOUWDs+|e4jsM=v>ErnAsV}}p`NI6Umjx5;Up{RrW%;$a*h=Y*`reog zeGc_ye(o)QmrUorCivp~InX%4m!gAKOn+}$$_jp)9H$rIzF_^F%chFYC*8BF@C30Z zDhwjFy!G;K$H{sxkEZZ2{k>rs%QUORQ(rAv;KlKCFNH2F@vbtIY<93O^PAqF7JI4t zqy)>ajm5iIOkPfk^Esw)p?~gW)dil@za$y4HP*eEqsQpGYl-+|Lyj-W&r3KnE~)OF z(c`#4-g>#W1JsJW9=o_dl)ub&FlE~7@hk0+Ig_nGW1LE@@k8lGxef>YN&9Ag=yl+C zSs?Ct-{*(h0(PYf-AnS-YLqW93%+o@WG=i<@I@oX7p0f8Iq!3PabT&M_~mR%K1-DX zk;Z-6Tq<4UxxYN>SJ$De!}srnU%Fi3v!LH1v?Afh?cZKiQvIA?1ebI1^VC)N1dx?Ow!W`{_&K z%rB+V@4C3YoVeVcdg*%Z4sERq%Kq}xJZY==#WjcfWuE7c*d1Vc>HWCwuHpqTj!V;z z{oUofKv!Uie(&$nc86#Mk9eu?ulX9cIZW7R^6t7UQ*NU|ZRVZz)-1P}9DiNf5ns-+ zg|+F+(!%}k1Twf;zy<}HT=@TO^Vwxzew3HYGo8@1&nsX2Xw0SCw+}zHRA|i0InFXG zTJPoCw+}zbOmHyYmdtckclwua-wG=EJQhgbHf(%0&AY0)dWQ|W%7xyyGaQOftM1)v z8#9kt=*6)zp9MRgPP%tbPVYP;XGyZP+J!qsp85Iw)1No6?Aj5K&q^`SqW%7xT=ov$!ie)Rt{5yL~%bl-mD z{8BhqEcejz{fZY_bfa%Q7Jl*AO7~Waf4%bp&ggAhj;midUK+K9bN;_J2jOiwnf?9? z`d@F!5Vrfv+o+av^OD?r2l?xn7u9NhNi+H0*tFEvuF-DYMj+K}p9UBgrx zv)py|hnM*rCW)t~efz=kYlmOA*~82C1u_mz)6KolwY|Lj|F&n!m$|QsANQVr$?)!* zUFA$?qx+`YE&aV~ro-nskC*zt+?S_z!RC3z%ivw>XLFjIw~YHW<=yKvrnALVR2Iut zwg2%9uJ^|)pNYr5`}6nm+3h{+{$yTk4715zk$g?`#`?OKf6i67Hs;k>v(9=f^dfz| z#)aPeNVDV>tee5 zqm0Ysxax)Tae)h@@B1}A+rjedrZ!i}wfr;U0yQ(B0IeHf6jlH{rAq48IEuLwG?fZe>vN-o^{tgO~d9}^Fy2}{J4z zMs}~8tEL6~p6tbOUbEKtVRqxXe6KSLzNt?Ym>2vj?a+0m*!vVYAlC3g^RHExer~g! zIZ3+OtAEQH%~*zA<@aVZ)O*J_DK!3D^2BW3C1u@gulsqs)Gxf|{GzV9{o@q5%*fzh zWtVLm9_;tV`QxzvKK;#q`(nWUkFp_o!=A_T4SvY4pdxAimlLO%F3mT;EBxXs%dg3kZdZVdE(1`S1zAfe?mszS@6ZVn7q3E4%{a0Di`MNyz{57Q7og+V}W(?&YypobT7zE zbSQsT^!Yby)B;PT#&>6)KKstS#i7`R>F&(aXWxrwG(PKK*=0O^_I>>eOlJi-OVahs z_s1__ouw>9g29XUnCAK=eZIszYw7QtY$HadyZgU1qzPt3_$~N7UG9Po6YpuxlK+>O zXSps&v}}AAU*)iw!$e2@!e4Lx46(+xr!2ebUoxImy0Br6!*_k#1(7UL(}Z9ATgqO)_g7q}~2VDg>LQpLigd!fXWdR)!l^=IGB(G%Cs z^{sP#sm=D9(E~?Qr6z?r}^HsE53ZW zbiY{Q+uu``bJgqwU(E9I*Z*tVo_K%#oXeSygd5kb97+oIE-1FjdK#-$^XJd~gk@iD zNz`dF#a{U3X8Jnl;p6B3*^HN7KlZ^}@I})#^Hq`4x#aEto6pePYt|Ou+VoUU|%b!~pgW<626x_|iw!Bx3D z`$Zb{GHMskDqZ>E+UsAAIh#cRHJ zep9y9oLz9-vbN|uM~P3>m#0hoH_5;ByxC%X?&aj&?hBGHE!J1Bo%Gkk|CHLDLcjTU zY?)*y%hg)GoczYUD#+|%U-7Re?*w1W`10bk=lm4=OOrQome0AYUf%C;e2II!-!GNl z6X#9w-SK#i-Og$jD>d6+MVHiX_J3KDb4d32my>suFBrbOIDN9+$+{)#slx9pmixb( zce7DX-*&RuQt_mM>BlcyF2Aq;{pDTH`RS5OcV~QY;(7O}!s_{#-%suKTEG0P=^B>57z;f~XfU(UJwe){h(@0Oh3%+r|XQ>DmOUTHJ8 z_}AZ}`S<32shp;Gq1RLY$OFCp<;8ycY^H1D>Vch2%}-A@1ae!px^3%oeCgbt1j)V|<8``^DyvkwX`*8aQHUCqe zDW7}k$Qa5|lFPsEztLyG=U)~yXtC_tM!9ttLl*QW7H&HK(wyy<%7vqxCIM{@;_4S1 zB$;C8I54MjloT@YPEo`yVYoeeZk_f5SteQK3kQ;kBIlNWyr0OJC-}mqku6V%auQ>K zPzL_>LsXH@JofZ;=((5Q+xBvpoE6BZ@LiDE=5RQh$=8@gDo!|Kmg0pEvm7q-G`3x5 znU%(2vPbQLiSvSorj5%anRwT8;?@#;^wf`a)Bh!CI4oG{1Zo;A;{vq?W@&*M02!+U zKn)0-5}qsOzCLyC<>#jgEVEil99d`SahPzvY~nJB703{}#44JxOW}gb5^k*vC5{U` zJ;Xy6ylirqJV9@T!)4Y+HO1I~#%0`0zD~OqF!_oTHX!q|s%)g3=lbIsEVImFFL6Ga z_@%1HX+h>?)wv4P6Rvyq;-%LvpTnN~d)9gX+HqeXG59A1(HWq_bxQsllk)FJ(UYRk0#v8+PvYDhH+Kxi{{_F0~GBbvW#o^KRXxxu68CZdM-t@?41Gg$=^9 zcdsrFuYp z^`^%Ci^=!dYPYhM>8!`0>$%hOcZF2_EZ%E)_1BVboF>Yg@!Mnfy$pK!^!(RjA+IOj zQoqonLN&v_Yh4gkXV8zmB))J>@yX4e^=FuxYtmeqe7W^rb_ZPB`Q+vj`?N+!yUj|C z%UGv>an*Po^C{<&{N@7+^CKrZTyFCIr8K2fuhQ&ge`Lah^J_d7WFAzl6+C4%-DdWe z<2nW>(!*3PYCia zz9_EnTyXPl&xd*G|8{PhD{XZz_5Gy_&p%9Z*t}cvq3!uU#ktnzC3{ZaTe|T4L)FH# za^pkQ=nnOby&E2}dxiUgmEH>y%^H{KHMZSknYD{WDor@!l~BeEUu+VyF4pZnuWG;j z_4MU@jmspbm(;&DTQ?{<$uASkAI_P_^jk2)YFb{h@VS?o8{`|8CBHN?qo%Oiq`pka zm%&S<8q-u>Zs9WN<}gwATpqe0(q)09r`1}fvr0^7JuYR6W{3%9xJ~j~?XbDS!FW*T-LgvqjaH1Wo}qwnjjHIps#tRN}C1Of@+!?e&gu*`mfj4*MGjbN1emu zfFALyi>5d*Z+W`w^!Go%B3H6XEl|O|Fx++X?}F0)82kie}7eQ|lH#fAMp&*ty* zuNQJSU$<}HY5vK&7Z{{b*P5dQ%`M#v`u~r|FWWD)fIIro@7dLL0vQcwiT6;*QiuP~ z_PxLC&TwJg{QQ-l7dz}%yuiSX!$wiAFZusJ@2j`@KK*4gV@K7!`| zifcg&=dbd9sn`2xZ~y;*{^fR-fQyf0?tf`^V4k9ebzwbN`>J+_`j7JF^51KJ@i21z z{&`kU|Kz8f{k3-^8`&y6a4yOR>qT~1sl*F^7AcEu@qeCu{?EEA-uBP_=*R+r9tt z-(Su@Q>gCiG5yQ>EW3aG{CscUKB4XZKk)D0^|t>1-8qZ6Oo};7k_9uYlrHqRE_m7D zU@X?SOquCy1k0>G5+(X1GnU#-i$DAQ^q1X-%I5F-GduQg|Np-;9X3xS&D7K>4)sOP zS@-*&Z%7v_`8n^4`T-~YMZXTeep>hG`Mi?I1vfnwNcKB$m#DMM`pB`xq1=f&TpsZk z^*{RW+kC05()#1wsMl>Wccb z3Z}CwSfUopR=?2WwSaY3C3U!2cO3rLo%8c5B~%S}(r#^=F6w!M|)Q_8eXL>v+C%|Cfy5v1&HSEy>@5&-kaU=%bwqxI{$pmJN~6idvAPysr)E{i{+Jl*Re{`M!9AO z;~7kiLK%(gToy?BG&*o@aR^tsz_ZL@0ZY^ZZNUt-V1)oC-3wDWOqw+XG#bTTc(Ken zD8eztfxASN>1+ZQ3n=!58q*9|nN%+@#dZ>5++((1--~b8JgtxY`snu;HIp~bR~!Fc zcIEf6$d#H)D^|Y?-{q#s`s)J7p8Tl}++Xs@WL@=WjJy9dyS}bA;^p3qQ|Fy?b)SWA z|7%pc!Q}1js)tqKnlqVdU6{^x>{~0ou6*hw%?s`-7kXX{E~!waScB8&z5mu$c^|5q z*q2>t|0m1N+F+j7+CSmPv;ID)=lb%IV~ebW&)NvCEe`qW7s?V0wkBy_VA?y^;dbM} zD_u(+xWAM!<+8H{Yfod+y>Oe8SjFu;U*2C2E&ur5X2<>e;WsDEulGB$KK}o&efz5p z$n4*wa5mrX-}Zd*xsQKti_*w{y5<-^SBWOmUiQXkjrrLopYqOS{aN5JUFkx#K!)6p zZEni%pA9`F?*v|yy4Hn%5`A~)oBY4JPI2Gg<;LHiJTEu?c;VO4Kdx4DtbZj2PPs4l zW6swZ)?rd#&;JgyieVKB-;(rS;llqa@dcR8l>Mn6D zSGi!LcwzURy$<^~);ZTtT=$}nWtKWi)%5M+FU+syztF!VdUvA3=N5=R5~pX|5a;p zod3+;U+3q2-u+s&@?O``efu}}`zuY;d!^=`{pVW#x_{c5-AjuP`^5kIzMy{nlz#TQ z_?6jAx)%bO&c-mse#>R8TKN9G&ad%MmNU2_-)-?`B$AaYQb^k3#s?R z7Ks1)cP=UJzh|S^i;o;7H@AzvXx+De^Nj2DK?_)`YzEeto#wd;=hol*@GI^A?_KS= zyr-5eD7*Vq{@UDYvHSlW4=%qk{r*ztBfJ;&o-3(e;O5-oAgplV?%v;%%tc;UG^Q~( zzI%6f`ksXj$2m=;IZDdk?|Z__YUQ`!ro)2W)!$X~H7*n~on>RXdv~{frE_DSaE6({ zi+A^GPfBx@%yHP<=urOso%g+f1&>)~@v{6N?D>7+??yc{l$t&_re>$ z1*}!Fjba&P>KB;y_Bn8y>=w>wjB{VWI_oay7e}VO#eMIirmvURT2_5u;QFsglZ=1= zz1016cgZrh&v*A-oxNY^{NCH&kFr!P-nLoo!gh|5*DSw`8}F@nyN2_NF4JAB#(zEw z%(JYsnQFTow)-ux7k<%u>)b4d`$`wq3col{Uu|M6R^KPRzQ68Lf4$`U`JYYyls4Ya ze12c*<P=UwftI6~?>pDx7b)#5@m*9)=-D;px&LOzVVgD`D z#(RDXSZ4*X{JOf1^Gg|%?u98z7uJ{gF4!)d(YQ>cv2JTNsHEgJS<3Ncb*%7i&=XeN=AlwST2|zTan!eCZpdFn9C2n(zI;KR&I0V{9sV z-Frc}@Qb}m%rhHH-tSVraQfO17I>Y$_t}re*VlD_e%bk7?Du97{VS)ot@*yZgy{T7*za{3V`YcEA$(t9A=6&r zMzI%DXMcDQ$rStZ*ip_eek@T7!t)L_r*oD(l@?dOU@e%@7`Ky?f1c`vsrfN;9NxQ- zWWaR(l9wXWH~h=a(s66N@HVG#PyD~9_t)8<>0NzeBJ;GW)amjsc3g?x{ioGozuE<+ z*k*_G3Ky9EPIKTc;bpRIcHsUJ&7^z5l;aBzlkSCl&Mgkt6)qTaY;o8RY8BH!@t02y z@y~x8uFt*hyZ^LTc}08O`N+_vb;VjQw@iEaY4@&nvlD!rB>`4jKy!Q1{J9fkg{cxJr5)@@=;`mU%2_zO+#Eg+$}Ms*L706CBu=I%{7rWZL`n z0^3c+Mn13hum#C1Rj(KFZgOUlox-=);W)>aYtGUs?JQOrvQdqFf-lyBEVSkSvgpg& z^l?&}V zg5x>9+ynJdgkCt`S*g!bmCvMmL6q~0;=3#2Onc26#a?u={1PaC#ob7(HPR**TAQ|8 zUHkPna`VZ5Z`=B#LSNNah)W!_i#PJNI-UiiA-Wx-6>1*}mEUe|Xz z7*st@3m>S@QaHe?;&Mz4x8U5^i<301F-YZqx^?!ciwhx_g?fv>`f6mV}``Nio|JSN= z&6(TmMbCeHXPQ?$>8&ux!lL}|d1vFJd=|7Tf*k(z-n+ZA_HUWt!0!xl<>|e5cbnE{ z8aB$cft)nGdUtvDze`C>wmcxO>3uJIf9=oGqbyYtAb-TZdwXx~Pw#HdF9sk-@49n) zZ}jKsV!|&HL7p$!xxIS(GksmP3x_#ae=*GaBfap+glF%{H)<^3zKMDB=}*6xYX16r z*>ZpBXT$xwCqH_BWVj(G?w>ZpdP!{F(fR9d{jUGJ z|Ns8~&p+G$%&oGuE>fOnZCAB!r~Ss;&FEkTXW|>th5qF$rmnhR& zJD&B)On12&)8yN(8#d;(I&9`Y{CbANcBch5+aH$tEQnSlXpB`x_T=}!GS9uZdwYpK z`>y}`XQtbU#QnORUcd8Kf88H&al+1GI_Xc%r zF0)j{fVw<$)h;{+cZN(F<)(wWNy|CE>;QG3tb7+7R|R#g6nB^YWXsJxz3=~}-+N`` zkI4W3b|~KN|7H6%-3OY*IKS|MtVrW)Rj%p-FNLLHQBN5 zim;P=v(Mpww}W_Cmcje-`ryVi$;Ng53%IpSXMEqif2G6b9*67d7h0!Eo%wzDe#nAI zw*{|-UmWt{efIZVzSadDs&a!=l>rzCf^AT;gk3_I_Q7?_gR|5#E~i1)9MJ*-ZR8#e4l*UQtj>T-2cD+&;Rjp z{%=Fuedf%6G;4h&Lr<=#soC?1>271~cHaew6DI}!{890gbr~{5Fe}n5N{^{{HZ|1=bth zZ{sx42{O`>2YInP;eM`gM#Peo5IeiL%EosG_T5&yu)%|Ji|fxgEbrd6ym$B4cBAUc zw>&O~Z{z;|WBZ5rU;kQ{Oqw}!_jjhdvwOY2wa>KwY-oEpRoVCcT|JI3W~#=<ug0XJ?-(NzlqPz*Z7<- zxao1Zd^hHs6=Kq{A@8PD2%iiaSvsBFnd#sk#O7{5U-!tS2 zCwBhd@=xd<&l&mjKjOOGzdqf6SMyn~_;dN+c)q{4=c>Q^e{QyX;DdwterfNT|9w1N zzjx;hd97H(#%D`YZ(n|Or2bY(!@1`6P78KVJa_%0?(KPD>i;e;fW7xmm>@-=0$)HTQ@AY`qU( zzly%#eZS|YAk*F6l6`&oH@|JM`Z(V#_QC7d+83nnRen}x*(Lq5M)v-ux0$7n>~nV= zxPCo+f%%@#&)hjm%rE`4+DBuLY)|;hzWMH^r8nbG=Ks$8$yzu2@uJQdv2C{->%RKW z|Fd&0)8FH>|8KjcexbfP@o4k@J+GesKmLaOZ-hm#_WBtPpW~VS>NDBCfBS6z=WXZ3 zG8)|$tZxq3VLRLV>!-K>j6R>|+~P2O)4$U<^PYZtv+T+Czgu3oaevvfefIxzx9y@A zuu3)V<8ylWEl2O_>FvKypRrfJz!ZDxmwx*0skb-Jo^=1)^@bzWd+p`klYJ*8ZP5`*!2M z!eb5h_uE|Ef2Za{vxB|t;nn;9|H}UV_wGD7@u!|OELHbT z$N#@9pU(5+@9E&Zb3GgDTo<@+E3K}InWFwt@I|G5{a^q3Iff6u>-&E#Q)B%l+9-GP z+S`|ff%A^IFL=K9&sY1uPz!I*6nPQOQk4?Defe?MN+J2idEY->|NrH_HvJmjt_MQss(Q`5*k$1|`0iQH{S9FEsy*$hy-SV&Cw5y~+iq*k#$Q z@7f*spCzv>6c75#FmL}P2kw%Y>qK|RGuh7QUwSOo<12H;KQAWT3#q$kW#}5dFKySC zwK1LExOiQEa_HlEt&bg((pi3eo3AbXLSFmrvHSCGNxj&AuA-Yid)u4jkB0?bEWY)b zEBE@>LXI!%SbniK+O4u(f1xZ^zTM%y*Mj&#EFB^I;??x-_OktkvsL|`KHfLKM7C@B z%v!k@_W#!QU4OXu?eQDi)^L4kwvWy9{vK)3`0jq5`O+CjR@U74KAENJ{$kM=^+GTH zy)6sw@|<((c&)wXg73CbjsMgKPT}&a|9uZR*{QtC%U>isOSRVNpz^MBADbP_U%0)w zbo#fIpC8@7sqnMiyJ|M3yNxee(mdx+0QF|xKXm?;_FchhVdN!sa96SV$Ao=1 zZ9DujrhVb$+~UCfMb2(Xei=W+Tu={ZZ#)0X*>{@<*a+VL6V`nUlmBi#>;L3;Z%;Wa z4}Z1pc;mmq$CvHbL@(&NuYW;j8s8d_4-d<}JixWZf!pNHM4|`UxS!X0m;3AZG8eAW^Qd&SOEk%&|x8oF-?K zFYt4I={X$nN1?H;lI53T_S8utR z+mkL=J1%&*km;+y3-SI4$!@)W*&5SW8{4Eu z^V#|T>_4&2bj?-UF3rHepjzS@QIe8al4_M)l$uzQ%3x$*WU6amq-$UjVqjurU}9xz zp>1GbWnd6`HgGkHhTQy=%(P0}8dN5{6lY*y(16=el9`)YT#}eufTqXD*vh~VVu^^a R;&IT4u%51dF6*2UngCqy-HQMK literal 0 HcmV?d00001 From 43af3093b16083dd51a7e541ca0f115ff0501ad9 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 4 Feb 2025 14:27:15 -0500 Subject: [PATCH 094/724] eww --- etcnixos/common.nix | 4 +- etcnixos/flake.lock | 12 +- etcnixos/flake.nix | 1 - etcnixos/vm.nix | 25 +- home-manager/flake.lock | 36 +-- home-manager/flake.nix | 1 + home-manager/gui.nix | 43 ++- home-manager/no-gui.nix | 4 + home-manager/progs/eww/config/eww.scss | 108 +++++++ home-manager/progs/eww/config/eww.yuck | 117 +++++++ .../eww/config/scripts/clipboardInfo.zsh | 14 + .../eww/config/scripts/currentWindow.fish | 2 + .../eww/config/scripts/currentWorkspace.fish | 3 + .../progs/eww/config/scripts/dateInfo.fish | 2 + .../progs/eww/config/scripts/wifiInfo.zsh | 23 ++ home-manager/progs/eww/eww.nix | 13 + .../progs/framework-13-easyeffects.nix | 121 ------- home-manager/progs/niri.nix | 19 +- home-manager/progs/waybar.nix | 294 ------------------ home-manager/system-mreow.nix | 8 +- 20 files changed, 362 insertions(+), 488 deletions(-) create mode 100644 home-manager/progs/eww/config/eww.scss create mode 100644 home-manager/progs/eww/config/eww.yuck create mode 100755 home-manager/progs/eww/config/scripts/clipboardInfo.zsh create mode 100755 home-manager/progs/eww/config/scripts/currentWindow.fish create mode 100755 home-manager/progs/eww/config/scripts/currentWorkspace.fish create mode 100755 home-manager/progs/eww/config/scripts/dateInfo.fish create mode 100755 home-manager/progs/eww/config/scripts/wifiInfo.zsh create mode 100644 home-manager/progs/eww/eww.nix delete mode 100644 home-manager/progs/framework-13-easyeffects.nix delete mode 100644 home-manager/progs/waybar.nix diff --git a/etcnixos/common.nix b/etcnixos/common.nix index 34020de..0f0c21e 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -48,7 +48,9 @@ # kernel options boot = { - kernelPackages = pkgs.linuxPackages_cachyos-lto; + #cachyos-lto currently broken + # kernelPackages = pkgs.linuxPackages_cachyos-lto; + kernelPackages = pkgs.linuxPackages_latest; kernel.sysctl = { # dmesg shushhhhh diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 36f19af..691061a 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -34,11 +34,11 @@ ] }, "locked": { - "lastModified": 1738552004, - "narHash": "sha256-eYE+8F0ZrSIYvlVkgTjTBlnM1COqUdSs4GKyWnel6I4=", + "lastModified": 1738675414, + "narHash": "sha256-DwKipTgF2DEyNm6+Rj6FXg0DbNNNbt+h4fj9aTO4Q68=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "894d1db77131a4a449d1993c7ba314ee15dd4e36", + "rev": "59029b0faeee6d2d5284af29830d85fb2caa30ee", "type": "github" }, "original": { @@ -310,11 +310,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1738410390, - "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=", + "lastModified": 1738546358, + "narHash": "sha256-nLivjIygCiqLp5QcL7l56Tca/elVqM9FG1hGd9ZSsrg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3a228057f5b619feb3186e986dbe76278d707b6e", + "rev": "c6e957d81b96751a3d5967a0fd73694f303cc914", "type": "github" }, "original": { diff --git a/etcnixos/flake.nix b/etcnixos/flake.nix index 5366a77..3fc0e98 100644 --- a/etcnixos/flake.nix +++ b/etcnixos/flake.nix @@ -38,7 +38,6 @@ "mreow" "yarn" ]; - in { nixosConfigurations = nixpkgs.lib.foldl' ( diff --git a/etcnixos/vm.nix b/etcnixos/vm.nix index 112b2d9..11fa51c 100644 --- a/etcnixos/vm.nix +++ b/etcnixos/vm.nix @@ -10,6 +10,7 @@ # 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="; @@ -42,11 +43,6 @@ url = "https://github.com/Scrut1ny/Hypervisor-Phantom/raw/d09d66813570704e2b05440f290d6f9bdf2d26c7/Hypervisor-Phantom/patches/QEMU/intel-qemu-9.2.0.patch"; sha256 = "kXY6R/0Tsotf0mGUIevDLlLWHEznnF1dt0K2ayX7XAg="; }) - - (pkgs.fetchpatch { - url = "https://github.com/Scrut1ny/Hypervisor-Phantom/raw/d09d66813570704e2b05440f290d6f9bdf2d26c7/Hypervisor-Phantom/patches/QEMU/qemu-9.2.0-libnfs6.patch"; - sha256 = "DkkC7KiQLnL7jbBOtgyLKVvozEG388hdfl5seEqvu3o="; - }) ]; }) ); @@ -55,6 +51,7 @@ (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 ]; }; @@ -64,14 +61,14 @@ 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="; - }; - } - ]; + # 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="; + # }; + # } + # ]; } diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 2e552d9..240b2ae 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1738610386, - "narHash": "sha256-yb6a5efA1e8xze1vcdN2HBxqYr340EsxFMrDUHL3WZM=", + "lastModified": 1738667255, + "narHash": "sha256-sMMQb9NydZqQ/MvvtPp+Ny0W9P0Jk0moU7SrTBlO5Vo=", "owner": "nix-community", "repo": "home-manager", - "rev": "066ba0c5cfddbc9e0dddaec73b1561ad38aa8abe", + "rev": "7abcf59a365430b36f84eaa452a466b11e469e33", "type": "github" }, "original": { @@ -79,11 +79,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1738583235, - "narHash": "sha256-Tk5w3uqp045W/W0mDQT0swwy90ex0l3JWS2crimG8Wo=", + "lastModified": 1738659223, + "narHash": "sha256-fr3uPkLEDdmyD3CQwFBcRDl96VmkK0Lgr21BIxqk+gY=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "1511396846427b58f1d6ca5442a228ede7673c67", + "rev": "297a7208e396ab6e9de88363c538baec8d75ccbb", "type": "github" }, "original": { @@ -112,11 +112,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1738579367, - "narHash": "sha256-820QsR/C9+Gyn3v65LHNwwW7KxSA6u6MQtky3SUrZ3A=", + "lastModified": 1738654964, + "narHash": "sha256-30l3hOfTW1kJXcTRQsJ9f0/wE1aaTTACKb4ch6ZlLNU=", "owner": "YaLTeR", "repo": "niri", - "rev": "553b1ba85256e2cb290e8a67f709a14e603606bc", + "rev": "7d24ad23c2bc690b22b1f13ad4598dc8323d128b", "type": "github" }, "original": { @@ -127,11 +127,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1738410390, - "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=", + "lastModified": 1738546358, + "narHash": "sha256-nLivjIygCiqLp5QcL7l56Tca/elVqM9FG1hGd9ZSsrg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3a228057f5b619feb3186e986dbe76278d707b6e", + "rev": "c6e957d81b96751a3d5967a0fd73694f303cc914", "type": "github" }, "original": { @@ -143,11 +143,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1738435198, - "narHash": "sha256-5+Hmo4nbqw8FrW85FlNm4IIrRnZ7bn0cmXlScNsNRLo=", + "lastModified": 1738574474, + "narHash": "sha256-rvyfF49e/k6vkrRTV4ILrWd92W+nmBDfRYZgctOyolQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f6687779bf4c396250831aa5a32cbfeb85bb07a3", + "rev": "fecfeb86328381268e29e998ddd3ebc70bbd7f7c", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1738639173, - "narHash": "sha256-fZnh8ypF2NJ99heI3C/MdtvRUDlIhuSCnhduKEJy86o=", + "lastModified": 1738682295, + "narHash": "sha256-Jx0SfHYrCFWztBYV6ySVBCcYlEA90NVNOUZLEm9DSu4=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "5bce21504d22f7d9d984b4f008cbc74b4ce76273", + "rev": "c49f8dcb66ff8cb75fd8de4ca40ea953a97a140a", "type": "github" }, "original": { diff --git a/home-manager/flake.nix b/home-manager/flake.nix index 954a3e0..66e2589 100644 --- a/home-manager/flake.nix +++ b/home-manager/flake.nix @@ -45,6 +45,7 @@ username = "primary"; homeDirectory = "/home/${username}"; hostname = nixpkgs.lib.strings.removeSuffix "\n" (builtins.readFile /etc/hostname); + pkgs = import nixpkgs { }; # stolen from: https://stackoverflow.com/a/42398526 diff --git a/home-manager/gui.nix b/home-manager/gui.nix index 6bb51b1..7efcd45 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -2,15 +2,12 @@ pkgs, lib, inputs, - optimizeWithFlags, ... }: { imports = [ ./no-gui.nix ./progs/alacritty.nix - - # gpt4all broken https://github.com/NixOS/nixpkgs/pull/346185 ./progs/gpt4all/gpt4all.nix ./progs/trezor.nix ]; @@ -114,31 +111,31 @@ savvycan - # nerdfonts - # simple screen recording on wayland wl-screenrec + + gimp ] ++ (builtins.filter lib.isDerivation (builtins.attrValues nerd-fonts)); - programs.zed-editor = { - enable = true; - userSettings = { - ui_font_size = 16; - buffer_font_size = 16; - theme = { - mode = "system"; - light = "Gruvbox Dark Hard"; - dark = "One Dark"; - }; - }; - extensions = [ - "nix" - "sql" - "CSV" - "assembly" - ]; - }; + # programs.zed-editor = { + # enable = true; + # userSettings = { + # ui_font_size = 16; + # buffer_font_size = 16; + # theme = { + # mode = "system"; + # light = "Gruvbox Dark Hard"; + # dark = "One Dark"; + # }; + # }; + # extensions = [ + # "nix" + # "sql" + # "CSV" + # "assembly" + # ]; + # }; # make chromium-based stuff use wayland home.file.".config/chromium-flags.conf".text = "--ozone-platform-hint=auto"; diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 13816ba..9efb971 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -61,6 +61,7 @@ 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 # adds `sensors` command lm_sensors @@ -142,6 +143,9 @@ nixpkgs-review nmap + + # terminal image viewer + timg ]; # home.file.".cargo/config.toml".text = '' diff --git a/home-manager/progs/eww/config/eww.scss b/home-manager/progs/eww/config/eww.scss new file mode 100644 index 0000000..4bee480 --- /dev/null +++ b/home-manager/progs/eww/config/eww.scss @@ -0,0 +1,108 @@ +$background: #1e1e2e; +$pink: #f5c2e7; +$lavendar: #b4befe; +$red: #f38ba8; +$maroon: #eba0ac; +$peach: #fab387; +$yellow: #f9e2af; +$green: #a6e3a1; +$text: #cdd6f4; +$subtext: #a6adc8; +$surface: #585b70; + +* { + color: $text; + font-family: CaskaydiaCove Nerd Font Mono; + font-weight: 600; + font-size: 10pt; + padding: 0 1px; +} + +.red { color: $red; } +.maroon { color: $maroon; } +.peach { color: $peach; } +.yellow { color: $yellow; } +.green { color: $green; } +.lavendar { color: $lavendar; } + +.symbol { + color: $lavendar; + font-size: 20px; +} + +.button { + * { + all: unset; + margin: 0 5px; + font-size:14pt; + transition: color 0.2s ease-in-out; + } + &:hover * { + color: $pink; + } +} + +.bluetooth * { + font-size: 10pt; + padding: 0 0.3em; +} + +.padded > *:not(:last-child) { + padding: 0 10px; + border-right: 1px solid $surface; +} + +.background { + border: 1px solid $pink; + background-color: $background; + border-radius: 12px; + opacity: 0.8; +} + +scale trough { + margin: 0 10px; + border: none; + background-color: #FFF; + min-height: 3px; + min-width: 100px; + + & slider { + box-shadow: none; + background-image: none; + border: none; + background-color: $pink; + min-width: 5pt; + min-height: 5pt; + margin: -5pt; + } + + & highlight { + border: none; + background-color: $lavendar; + } +} + +.workspaces * { + padding: 0 8px; + font-size: 14pt; + transition: color 0.2s ease-in-out; + + &:hover * { + color: $pink; + } + + .empty * { + color: $subtext; + } + .current * { + color: $green; + } +} + +.clipboard { + color: $subtext; +} + +.time { + padding-right: 10px; +} diff --git a/home-manager/progs/eww/config/eww.yuck b/home-manager/progs/eww/config/eww.yuck new file mode 100644 index 0000000..3c66bcc --- /dev/null +++ b/home-manager/progs/eww/config/eww.yuck @@ -0,0 +1,117 @@ +(defwindow statusbar + :monitor 0 + :stacking "fg" + :exclusive true + :geometry (geometry + :y "0.5%" + :width "100%" + :height "24px" + :anchor "top center") + (statusbar)) + +(defwidget statusbar [] + (centerbox + + (brightness-ctl) + + ; (window-title) + (time) + (box :space-evenly false :halign 'end' :class 'padded' + (clipboard) + (battery) + (bluetooth) + (wifi)) + ) +) + +(defwidget cmd-slider [?symbol value command max colour] + (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 colour))) + +(defwidget window-title [] + (label + :text windowtitle + :tooltip windowtitle)) + +(defpoll windowtitle :interval "1s" `scripts/currentWindow.fish`) +(defpoll currentworkspace :interval "1s" `scripts/currentWorkspace.fish`) + +(defwidget brightness-ctl [] + (cmd-slider :symbol "σ°ƒ " :value brightness + :command `brightnessctl set {}%` + :max 101 :colour "${ + brightness >= 80 ? "green" : + brightness >= 50 ? "yellow" : + brightness >= 30 ? "peach" : + brightness >= 10 ? "maroon" : "red" + }")) +(defpoll brightness :interval "1s" `brightnessctl -m | awk -F, '{print $4+0}'`) + +(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}" + (label + :text {wifi-strength.icon} + :tooltip "Connected To: ${wifi-name}"))) + +(defpoll wifi-strength :interval "10s" `scripts/wifiInfo.zsh strength`) +(defpoll wifi-name :interval "1m" `scripts/wifiInfo.zsh name`) + +(defwidget bluetooth [] + (eventbox + :class "bluetooth button ${ bluetooth-name != "" ? "green" : "lavendar" }" + :onclick `blueman-manager &` + (label + :text "${bluetooth-name} σ°‚―"))) + +(defpoll bluetooth-name :interval "10s" `bluetoothctl devices Connected | awk '{print $3}'`) + +(defwidget time [] + (box + :space-evenly false + :class "time" + :tooltip {time.long} + (label :class "yellow" :text {time.hour}) + (label :text ":") + (label :class "yellow" :text {time.minute}))) + +(defpoll time :interval "1s" `scripts/dateInfo.fish`) + +; TODO: make this a package or something, not using rust-script +(defpoll powerstats :interval "2s" `~/Documents/power_bat.rs`) + +(defwidget battery [] + (box :space-evenly false + :tooltip powerstats + (label + :text "${EWW_BATTERY.BAT1.status == "Charging" ? "σ°‚„" : + EWW_BATTERY.BAT1.capacity >= 90 ? "󰁹" : + EWW_BATTERY.BAT1.capacity >= 80 ? "σ°‚‚" : + EWW_BATTERY.BAT1.capacity >= 70 ? "󰂁" : + EWW_BATTERY.BAT1.capacity >= 60 ? "σ°‚€" : + EWW_BATTERY.BAT1.capacity >= 50 ? "󰁿" : + EWW_BATTERY.BAT1.capacity >= 40 ? "󰁾" : + EWW_BATTERY.BAT1.capacity >= 30 ? "󰁽" : + EWW_BATTERY.BAT1.capacity >= 20 ? "󰁼" : + EWW_BATTERY.BAT1.capacity >= 10 ? "󰁻" : "󰁺" + } " + :class "${ + EWW_BATTERY.BAT1.capacity >= 80 ? "green" : + EWW_BATTERY.BAT1.capacity >= 50 ? "yellow" : + EWW_BATTERY.BAT1.capacity >= 30 ? "peach" : + EWW_BATTERY.BAT1.capacity >= 10 ? "maroon" : "red" + }") + (label :text "${EWW_BATTERY.BAT1.capacity}%" :class "yellow"))) + diff --git a/home-manager/progs/eww/config/scripts/clipboardInfo.zsh b/home-manager/progs/eww/config/scripts/clipboardInfo.zsh new file mode 100755 index 0000000..e90c08c --- /dev/null +++ b/home-manager/progs/eww/config/scripts/clipboardInfo.zsh @@ -0,0 +1,14 @@ +#!/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 diff --git a/home-manager/progs/eww/config/scripts/currentWindow.fish b/home-manager/progs/eww/config/scripts/currentWindow.fish new file mode 100755 index 0000000..d9159ce --- /dev/null +++ b/home-manager/progs/eww/config/scripts/currentWindow.fish @@ -0,0 +1,2 @@ +#!/usr/bin/env fish +niri msg focused-window | rg Title | sed -E "s/[[:space:]]+Title\: //g" | sed "s/\"//g" diff --git a/home-manager/progs/eww/config/scripts/currentWorkspace.fish b/home-manager/progs/eww/config/scripts/currentWorkspace.fish new file mode 100755 index 0000000..68f2fbf --- /dev/null +++ b/home-manager/progs/eww/config/scripts/currentWorkspace.fish @@ -0,0 +1,3 @@ +#!/usr/bin/env fish + +niri msg workspaces | rg "^ \*" | sed -E 's/[[:space:]]+\* //g' diff --git a/home-manager/progs/eww/config/scripts/dateInfo.fish b/home-manager/progs/eww/config/scripts/dateInfo.fish new file mode 100755 index 0000000..77cf08f --- /dev/null +++ b/home-manager/progs/eww/config/scripts/dateInfo.fish @@ -0,0 +1,2 @@ +#!/usr/bin/env fish +date +'{"long":"%a %b %e %H:%M:%S %Z %Y","hour":"%H","minute":"%M"}' diff --git a/home-manager/progs/eww/config/scripts/wifiInfo.zsh b/home-manager/progs/eww/config/scripts/wifiInfo.zsh new file mode 100755 index 0000000..4fa41e3 --- /dev/null +++ b/home-manager/progs/eww/config/scripts/wifiInfo.zsh @@ -0,0 +1,23 @@ +#!/usr/bin/env zsh +export CHARSET=ASCII +case $1 in + name) + nmcli -f IN-USE,SSID d w | grep '*' | sed 's/[\* ]//g' | cat + exit 0;; + strength) + str=$(nmcli -f ACTIVE,BARS d w | grep 'yes' | tr -d ' yesno') + case ${str: 0:-1} in + '****') + icon="󰀨"; colour="green";; + '***') + icon="σ°€₯"; colour="yellow";; + '**') + icon="σ°€’"; colour="peach";; + '*') + icon="󰀟"; colour="maroon";; + *) + icon="σ°€―"; colour="red";; + esac + echo "{\"icon\":\"$icon\",\"colour\":\"$colour\"}" + exit 0;; +esac diff --git a/home-manager/progs/eww/eww.nix b/home-manager/progs/eww/eww.nix new file mode 100644 index 0000000..407b208 --- /dev/null +++ b/home-manager/progs/eww/eww.nix @@ -0,0 +1,13 @@ +{ pkgs, ... }: +{ + home.packages = with pkgs; [ + zsh + bluez + brightnessctl + ]; + + programs.eww = { + enable = true; + configDir = ./config; + }; +} diff --git a/home-manager/progs/framework-13-easyeffects.nix b/home-manager/progs/framework-13-easyeffects.nix deleted file mode 100644 index 1dca4e1..0000000 --- a/home-manager/progs/framework-13-easyeffects.nix +++ /dev/null @@ -1,121 +0,0 @@ -{ - 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"; - }; -} diff --git a/home-manager/progs/niri.nix b/home-manager/progs/niri.nix index 5c3c8ea..0e8a971 100644 --- a/home-manager/progs/niri.nix +++ b/home-manager/progs/niri.nix @@ -1,7 +1,6 @@ { config, pkgs, - homeDirectory, ... }: { @@ -34,14 +33,23 @@ focus-ring = { enable = true; active = { - color = "pink"; + color = "#bf7778"; }; }; }; spawn-at-startup = [ # waybar (status bar) - { command = [ "${pkgs.waybar}/bin/waybar" ]; } + # { command = [ "${pkgs.waybar}/bin/waybar" ]; } + { + command = [ + "${config.programs.eww.package}/bin/eww" + "-c" + "${config.programs.eww.configDir}" + "open" + "statusbar" + ]; + } # swaybg works on more than just sway (sets a wallpaper) { @@ -52,10 +60,11 @@ ]; } + # Xwayland on niri via xwayland-satellite { command = [ - "${pkgs.xwayland-satellite-unstable}/bin/xwayland-satellite" - (builtins.toString config.programs.niri.settings.environment.DISPLAY) + "${pkgs.xwayland-satellite}/bin/xwayland-satellite" + config.programs.niri.settings.environment.DISPLAY ]; } ]; diff --git a/home-manager/progs/waybar.nix b/home-manager/progs/waybar.nix deleted file mode 100644 index 6e3ee36..0000000 --- a/home-manager/progs/waybar.nix +++ /dev/null @@ -1,294 +0,0 @@ -{ pkgs, ... }: -{ - programs.waybar = { - enable = true; - settings.mainBar = { - layer = "top"; - position = "top"; - # mod = "dock"; - # exclusive = true; - # gtk-layer-shell = true; - margin-bottom = -1; - # passthrough = false; - height = 32; - modules-left = [ - "niri/workspaces" - "niri/window" - ]; - modules-center = [ "clock" ]; - modules-right = [ - "cpu" - "memory" - "tray" - "bluetooth" - "pulseaudio" - "network" - "battery" - ]; - - "niri/workspaces" = { - format = "{icon}"; - format-icons = { - - # Icons by state - active = "ο†’"; - default = "ο„‘"; - }; - }; - - "niri/window" = { - format = "{}"; - }; - - cpu = { - interval = 5; - format = "ο‹› {usage}%"; - max-length = 10; - }; - - memory = { - interval = 10; - format = " {percentage}%"; - max-length = 10; - tooltip = true; - tooltip-format = "RAM - {used:0.1f}GiB used"; - }; - - tray = { - icon-size = 18; - spacing = 3; - }; - - clock = { - format = " {:%R\n %d.%m.%Y}"; - tooltip-format = "{calendar}"; - calendar = { - mode = "year"; - mode-mon-col = 3; - weeks-pos = "right"; - on-scroll = 1; - on-click-right = "mode"; - format = { - months = "{}"; - days = "{}"; - weeks = "W{}"; - weekdays = "{}"; - today = "{}"; - }; - }; - - actions = { - on-click-right = "mode"; - on-click-forward = "tz_up"; - on-click-backward = "tz_down"; - on-scroll-up = "shift_up"; - on-scroll-down = "shift_down"; - }; - }; - - network = { - format-wifi = " {icon}"; - tooltip-format-wifi = "{essid} ({signalStrength}%)"; - format-ethernet = "  "; - format-disconnected = "σ°Œ™ "; - format-icons = [ - "σ°€― " - "󰀟 " - "σ°€’ " - "σ°€’ " - "󰀨 " - ]; - # tooltip = false; - }; - - battery = { - states = { - good = 95; - warning = 30; - critical = 20; - }; - format = " {icon} {capacity}%"; - format-charging = "  {capacity}%"; - format-plugged = "  {capacity}%"; - format-alt = "{time} {icon}"; - format-icons = [ - "σ°‚Ž" - "󰁺" - "󰁻" - "󰁼" - "󰁽" - "󰁾" - "󰁿" - "σ°‚€" - "󰂁" - "σ°‚‚" - "󰁹" - ]; - }; - - # not actually pulseaudio-specific (I use pipewire!) - pulseaudio = { - max-volume = 100; - scroll-step = 10; - format = "{icon}"; - tooltip-format = "{desc} ({volume}%)"; - format-muted = "πŸ”‡"; - format-icons = { - default = [ - " " - " " - " " - ]; - }; - on-click = "${pkgs.pwvucontrol}/bin/pwvucontrol"; - }; - - bluetooth = { - format = "οŠ” ({status}) "; - format-connected = "οŠ” {device_alias}"; - format-connected-battery = "οŠ” {device_alias} {device_battery_percentage}%"; - tooltip-format = "{controller_alias}\t{controller_address}\n\n{num_connections} connected"; - tooltip-format-connected = "{controller_alias}\t{controller_address}\n\n{num_connections} connected\n\n{device_enumerate}"; - tooltip-format-enumerate-connected = "{device_alias}\t{device_address}"; - tooltip-format-enumerate-connected-battery = "{device_alias}\t{device_address}\t{device_battery_percentage}%"; - - on-click = "${pkgs.blueman}/bin/blueman-manager"; - }; - }; - - style = '' - /*base background color*/ - /* color picked from a celeste background bc it looks pretty and matches my background */ - @define-color bg_main rgba(39.6, 51.4, 76.1, 1.0); - - @define-color bg_main_tooltip rgba(0, 0, 0, 0.7); - - /*base background color of selections */ - @define-color bg_hover rgba(200, 200, 200, 0.3); - /*base background color of active elements */ - @define-color bg_active rgba(100, 100, 100, 0.5); - - /*base border color*/ - @define-color border_main rgba(255, 255, 255, 0.2); - - /*text color for entries, views and content in general */ - @define-color content_main white; - /*text color for entries that are unselected */ - @define-color content_inactive rgba(255, 255, 255, 0.25); - - * { - text-shadow: none; - box-shadow: none; - border: none; - border-radius: 0; - font-family: "Segoe UI", "Ubuntu"; - font-weight: 600; - font-size: 12.7px; - } - - window#waybar { - background: @bg_main; - border-top: 0; - color: @content_main; - } - - tooltip { - background: @bg_main_tooltip; - border-radius: 5px; - border-width: 1px; - border-style: solid; - border-color: @border_main; - } - - tooltip label { - color: @content_main; - } - - #taskbar { - } - - #taskbar button { - min-width: 130px; - border-bottom: 3px solid rgba(255, 255, 255, 0.3); - margin-left: 2px; - margin-right: 2px; - padding-left: 8px; - padding-right: 8px; - color: white; - transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); - } - - #taskbar button.active { - border-bottom: 3px solid white; - background: @bg_active; - } - - #taskbar button:hover { - border-bottom: 3px solid white; - background: @bg_hover; - color: @content_main; - } - - #cpu, #memory { - padding:3px; - } - - #window { - border-radius: 10px; - margin-left: 20px; - margin-right: 20px; - } - - #tray { - margin-left: 5px; - margin-right: 5px; - } - - #tray > .passive { - border-bottom: none; - } - - #tray > .active { - border-bottom: 3px solid white; - } - - #tray > .needs-attention { - border-bottom: 3px solid @warning_color; - } - - #tray > widget { - transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); - } - - #tray > widget:hover { - background: @bg_hover; - } - - #pulseaudio { - font-family: "JetBrains Mono Nerd Font"; - padding-left: 3px; - padding-right: 3px; - transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); - } - - #pulseaudio:hover { - background: @bg_hover; - } - - #network { - padding-left: 3px; - padding-right: 3px; - } - - #clock { - padding-right: 5px; - padding-left: 5px; - transition: all 0.25s cubic-bezier(0.165, 0.84, 0.44, 1); - } - - #clock:hover { - background: @bg_hover; - } - ''; - }; -} diff --git a/home-manager/system-mreow.nix b/home-manager/system-mreow.nix index b5e35ff..bcf838a 100644 --- a/home-manager/system-mreow.nix +++ b/home-manager/system-mreow.nix @@ -1,7 +1,6 @@ { config, pkgs, - lib, homeDirectory, ... }: @@ -12,12 +11,11 @@ # niri wayland compositor ./progs/niri.nix - # waybar for status bar - ./progs/waybar.nix + # statusbar + ./progs/eww/eww.nix + # lockscreen ./progs/swaylock.nix - - # ./progs/framework-13-easyeffects.nix ]; home.packages = with pkgs; [ From e2e82937e8d937b85b29c5ad2777e233bbfad23e Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 4 Feb 2025 14:51:37 -0500 Subject: [PATCH 095/724] eww: formatting --- home-manager/progs/eww/config/eww.yuck | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/home-manager/progs/eww/config/eww.yuck b/home-manager/progs/eww/config/eww.yuck index 3c66bcc..f780f97 100644 --- a/home-manager/progs/eww/config/eww.yuck +++ b/home-manager/progs/eww/config/eww.yuck @@ -11,9 +11,7 @@ (defwidget statusbar [] (centerbox - (brightness-ctl) - ; (window-title) (time) (box :space-evenly false :halign 'end' :class 'padded' @@ -37,8 +35,7 @@ (defwidget window-title [] (label - :text windowtitle - :tooltip windowtitle)) + :text windowtitle)) (defpoll windowtitle :interval "1s" `scripts/currentWindow.fish`) (defpoll currentworkspace :interval "1s" `scripts/currentWorkspace.fish`) From 8398c5b452d3bd86243a80401270a0d550debb5c Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 4 Feb 2025 23:51:05 -0500 Subject: [PATCH 096/724] eww: updates --- etcnixos/common.nix | 5 +- etcnixos/flake.lock | 12 +- home-manager/flake.lock | 30 +-- home-manager/progs/eww/config/eww.scss | 53 +++--- home-manager/progs/eww/config/eww.yuck | 173 ++++++++++-------- .../eww/config/scripts/currentWindow.fish | 2 +- .../progs/eww/config/scripts/dateInfo.fish | 2 - 7 files changed, 143 insertions(+), 134 deletions(-) delete mode 100755 home-manager/progs/eww/config/scripts/dateInfo.fish diff --git a/etcnixos/common.nix b/etcnixos/common.nix index 0f0c21e..9524adb 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -48,9 +48,8 @@ # kernel options boot = { - #cachyos-lto currently broken - # kernelPackages = pkgs.linuxPackages_cachyos-lto; - kernelPackages = pkgs.linuxPackages_latest; + kernelPackages = pkgs.linuxPackages_cachyos-lto; + # kernelPackages = pkgs.linuxPackages_latest; kernel.sysctl = { # dmesg shushhhhh diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 691061a..4359537 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -34,11 +34,11 @@ ] }, "locked": { - "lastModified": 1738675414, - "narHash": "sha256-DwKipTgF2DEyNm6+Rj6FXg0DbNNNbt+h4fj9aTO4Q68=", + "lastModified": 1738707394, + "narHash": "sha256-XXrOqNs9a4L6p6/KXxIGotHOxzjPxva1queN3JK0E4c=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "59029b0faeee6d2d5284af29830d85fb2caa30ee", + "rev": "236da2b18bfbddf782f85ee664fdfb9d50606229", "type": "github" }, "original": { @@ -310,11 +310,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1738546358, - "narHash": "sha256-nLivjIygCiqLp5QcL7l56Tca/elVqM9FG1hGd9ZSsrg=", + "lastModified": 1738680400, + "narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c6e957d81b96751a3d5967a0fd73694f303cc914", + "rev": "799ba5bffed04ced7067a91798353d360788b30d", "type": "github" }, "original": { diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 240b2ae..7f7caa1 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1738667255, - "narHash": "sha256-sMMQb9NydZqQ/MvvtPp+Ny0W9P0Jk0moU7SrTBlO5Vo=", + "lastModified": 1738709900, + "narHash": "sha256-8Bo5xFlCH5q72ExvAnH7TzStMlLZldKOSLMClRSfmTc=", "owner": "nix-community", "repo": "home-manager", - "rev": "7abcf59a365430b36f84eaa452a466b11e469e33", + "rev": "f2d32e46fac9d51da6912948ae1156044c71774b", "type": "github" }, "original": { @@ -79,11 +79,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1738659223, - "narHash": "sha256-fr3uPkLEDdmyD3CQwFBcRDl96VmkK0Lgr21BIxqk+gY=", + "lastModified": 1738707843, + "narHash": "sha256-0DMn9YbqU7ODIOBzu15vcrBnSKe72HUDkOtxHcpjK4A=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "297a7208e396ab6e9de88363c538baec8d75ccbb", + "rev": "a81adb09eb7eb2ffad1ac3b91d1e59083c8e5918", "type": "github" }, "original": { @@ -127,11 +127,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1738546358, - "narHash": "sha256-nLivjIygCiqLp5QcL7l56Tca/elVqM9FG1hGd9ZSsrg=", + "lastModified": 1738680400, + "narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c6e957d81b96751a3d5967a0fd73694f303cc914", + "rev": "799ba5bffed04ced7067a91798353d360788b30d", "type": "github" }, "original": { @@ -174,11 +174,11 @@ ] }, "locked": { - "lastModified": 1738635966, - "narHash": "sha256-5MbJhh6nz7tx8FYVOJ0+ixMaEn0ibGzV/hScPMmqVTE=", + "lastModified": 1738722444, + "narHash": "sha256-DHVyKCiIQVDqjYoVU2j7UaLNIlOnpB9sP1cPRNRpqvY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "1ff8663cd75a11e61f8046c62f4dbb05d1907b44", + "rev": "347fb01821c3cd8d54e563d244a599c1e27a393d", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1738682295, - "narHash": "sha256-Jx0SfHYrCFWztBYV6ySVBCcYlEA90NVNOUZLEm9DSu4=", + "lastModified": 1738710976, + "narHash": "sha256-/Zyfku2FxQKMs3LHI90Hy61o8VuXtI16RfvK/d849B0=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "c49f8dcb66ff8cb75fd8de4ca40ea953a97a140a", + "rev": "0622c0eb2ab953e40e3d167eebe885a1f3bbe8f9", "type": "github" }, "original": { diff --git a/home-manager/progs/eww/config/eww.scss b/home-manager/progs/eww/config/eww.scss index 4bee480..5f01ceb 100644 --- a/home-manager/progs/eww/config/eww.scss +++ b/home-manager/progs/eww/config/eww.scss @@ -18,12 +18,29 @@ $surface: #585b70; padding: 0 1px; } -.red { color: $red; } -.maroon { color: $maroon; } -.peach { color: $peach; } -.yellow { color: $yellow; } -.green { color: $green; } -.lavendar { color: $lavendar; } +.red { + color: $red; +} + +.maroon { + color: $maroon; +} + +.peach { + color: $peach; +} + +.yellow { + color: $yellow; +} + +.green { + color: $green; +} + +.lavendar { + color: $lavendar; +} .symbol { color: $lavendar; @@ -34,9 +51,10 @@ $surface: #585b70; * { all: unset; margin: 0 5px; - font-size:14pt; + font-size: 14pt; transition: color 0.2s ease-in-out; } + &:hover * { color: $pink; } @@ -47,7 +65,7 @@ $surface: #585b70; padding: 0 0.3em; } -.padded > *:not(:last-child) { +.padded>*:not(:last-child) { padding: 0 10px; border-right: 1px solid $surface; } @@ -82,27 +100,10 @@ scale trough { } } -.workspaces * { - padding: 0 8px; - font-size: 14pt; - transition: color 0.2s ease-in-out; - - &:hover * { - color: $pink; - } - - .empty * { - color: $subtext; - } - .current * { - color: $green; - } -} - .clipboard { color: $subtext; } .time { padding-right: 10px; -} +} \ No newline at end of file diff --git a/home-manager/progs/eww/config/eww.yuck b/home-manager/progs/eww/config/eww.yuck index f780f97..0470a89 100644 --- a/home-manager/progs/eww/config/eww.yuck +++ b/home-manager/progs/eww/config/eww.yuck @@ -1,114 +1,125 @@ (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 - (brightness-ctl) - ; (window-title) - (time) - (box :space-evenly false :halign 'end' :class 'padded' - (clipboard) - (battery) - (bluetooth) - (wifi)) - ) -) + (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) + (battery) + (bluetooth) + (wifi)))) -(defwidget cmd-slider [?symbol value command max colour] - (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 colour))) +(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))) (defwidget window-title [] - (label + (label :text windowtitle)) (defpoll windowtitle :interval "1s" `scripts/currentWindow.fish`) (defpoll currentworkspace :interval "1s" `scripts/currentWorkspace.fish`) (defwidget brightness-ctl [] - (cmd-slider :symbol "σ°ƒ " :value brightness - :command `brightnessctl set {}%` - :max 101 :colour "${ - brightness >= 80 ? "green" : - brightness >= 50 ? "yellow" : - brightness >= 30 ? "peach" : - brightness >= 10 ? "maroon" : "red" - }")) -(defpoll brightness :interval "1s" `brightnessctl -m | awk -F, '{print $4+0}'`) + (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" + }"))) + + +(defpoll brightness :interval "1s" :run-while brightnessctl-open `brightnessctl -m | awk -F, '{print $4+0}'`) + + +(defvar brightnessctl-open false) +(defwidget brightness-ctl-opener [] + (eventbox :class "button" + (button + :onclick `${EWW_CMD} update brightnessctl-open=${!brightnessctl-open}` + "σ°ƒ "))) (defwidget clipboard [] - (label :text clipboard-short :tooltip clipboard :class "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`) +(defpoll clipboard-short :interval "5s" `scripts/clipboardInfo.zsh head`) (defwidget wifi [] - (eventbox - :class "button ${wifi-strength.colour}" - (label - :text {wifi-strength.icon} - :tooltip "Connected To: ${wifi-name}"))) + (eventbox + :class "button ${wifi-strength.colour}" + (label + :text {wifi-strength.icon} + :tooltip "Connected To: ${wifi-name}"))) (defpoll wifi-strength :interval "10s" `scripts/wifiInfo.zsh strength`) (defpoll wifi-name :interval "1m" `scripts/wifiInfo.zsh name`) (defwidget bluetooth [] - (eventbox - :class "bluetooth button ${ bluetooth-name != "" ? "green" : "lavendar" }" - :onclick `blueman-manager &` - (label - :text "${bluetooth-name} σ°‚―"))) + (eventbox + :class "bluetooth button ${ bluetooth-name != "" ? "green" : "lavendar" }" + :onclick `blueman-manager &` + (label + :text "${bluetooth-name} σ°‚―"))) (defpoll bluetooth-name :interval "10s" `bluetoothctl devices Connected | awk '{print $3}'`) (defwidget time [] - (box - :space-evenly false - :class "time" - :tooltip {time.long} - (label :class "yellow" :text {time.hour}) - (label :text ":") - (label :class "yellow" :text {time.minute}))) + (box + :space-evenly false + :class "time" + :tooltip {time.long} + (label :class "yellow" :text {time.hour}) + (label :text ":") + (label :class "yellow" :text {time.minute}))) -(defpoll time :interval "1s" `scripts/dateInfo.fish`) +(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`) (defwidget battery [] - (box :space-evenly false - :tooltip powerstats - (label - :text "${EWW_BATTERY.BAT1.status == "Charging" ? "σ°‚„" : - EWW_BATTERY.BAT1.capacity >= 90 ? "󰁹" : - EWW_BATTERY.BAT1.capacity >= 80 ? "σ°‚‚" : - EWW_BATTERY.BAT1.capacity >= 70 ? "󰂁" : - EWW_BATTERY.BAT1.capacity >= 60 ? "σ°‚€" : - EWW_BATTERY.BAT1.capacity >= 50 ? "󰁿" : - EWW_BATTERY.BAT1.capacity >= 40 ? "󰁾" : - EWW_BATTERY.BAT1.capacity >= 30 ? "󰁽" : - EWW_BATTERY.BAT1.capacity >= 20 ? "󰁼" : - EWW_BATTERY.BAT1.capacity >= 10 ? "󰁻" : "󰁺" - } " - :class "${ - EWW_BATTERY.BAT1.capacity >= 80 ? "green" : - EWW_BATTERY.BAT1.capacity >= 50 ? "yellow" : - EWW_BATTERY.BAT1.capacity >= 30 ? "peach" : - EWW_BATTERY.BAT1.capacity >= 10 ? "maroon" : "red" - }") - (label :text "${EWW_BATTERY.BAT1.capacity}%" :class "yellow"))) + (box :space-evenly false + :tooltip powerstats + (label + :text "${EWW_BATTERY.BAT1.status == "Charging" ? "σ°‚„" : + EWW_BATTERY.BAT1.capacity >= 90 ? "󰁹" : + EWW_BATTERY.BAT1.capacity >= 80 ? "σ°‚‚" : + EWW_BATTERY.BAT1.capacity >= 70 ? "󰂁" : + EWW_BATTERY.BAT1.capacity >= 60 ? "σ°‚€" : + EWW_BATTERY.BAT1.capacity >= 50 ? "󰁿" : + EWW_BATTERY.BAT1.capacity >= 40 ? "󰁾" : + EWW_BATTERY.BAT1.capacity >= 30 ? "󰁽" : + EWW_BATTERY.BAT1.capacity >= 20 ? "󰁼" : + EWW_BATTERY.BAT1.capacity >= 10 ? "󰁻" : "󰁺" + } " + :class "${ + EWW_BATTERY.BAT1.capacity >= 80 ? "green" : + EWW_BATTERY.BAT1.capacity >= 50 ? "yellow" : + EWW_BATTERY.BAT1.capacity >= 30 ? "peach" : + EWW_BATTERY.BAT1.capacity >= 10 ? "maroon" : "red" + }") + (label :text "${EWW_BATTERY.BAT1.capacity}%" :class "yellow"))) diff --git a/home-manager/progs/eww/config/scripts/currentWindow.fish b/home-manager/progs/eww/config/scripts/currentWindow.fish index d9159ce..e8df299 100755 --- a/home-manager/progs/eww/config/scripts/currentWindow.fish +++ b/home-manager/progs/eww/config/scripts/currentWindow.fish @@ -1,2 +1,2 @@ #!/usr/bin/env fish -niri msg focused-window | rg Title | sed -E "s/[[:space:]]+Title\: //g" | sed "s/\"//g" +niri msg focused-window | rg Title | sed -E "s/[[:space:]]+Title\: //g" | sed "s/\"//g" | head -c 55 diff --git a/home-manager/progs/eww/config/scripts/dateInfo.fish b/home-manager/progs/eww/config/scripts/dateInfo.fish deleted file mode 100755 index 77cf08f..0000000 --- a/home-manager/progs/eww/config/scripts/dateInfo.fish +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env fish -date +'{"long":"%a %b %e %H:%M:%S %Z %Y","hour":"%H","minute":"%M"}' From 9a8f859137614af62482f9d1fb880e7072f09ed5 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 5 Feb 2025 10:35:27 -0500 Subject: [PATCH 097/724] eww stuff --- home-manager/flake.lock | 30 ++-- home-manager/progs/borg.nix | 2 - home-manager/progs/eww/config/dashboard.yuck | 17 +++ home-manager/progs/eww/config/eww.yuck | 127 +--------------- .../progs/eww/config/scripts/sound/getSink.sh | 2 + .../eww/config/scripts/sound/getVolume.sh | 8 + home-manager/progs/eww/config/statusbar.yuck | 140 ++++++++++++++++++ 7 files changed, 184 insertions(+), 142 deletions(-) create mode 100644 home-manager/progs/eww/config/dashboard.yuck create mode 100755 home-manager/progs/eww/config/scripts/sound/getSink.sh create mode 100755 home-manager/progs/eww/config/scripts/sound/getVolume.sh create mode 100644 home-manager/progs/eww/config/statusbar.yuck diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 7f7caa1..4d10a01 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1738709900, - "narHash": "sha256-8Bo5xFlCH5q72ExvAnH7TzStMlLZldKOSLMClRSfmTc=", + "lastModified": 1738753876, + "narHash": "sha256-yXT82kERWL4R81hfun9BuT478Q6ut0dJzdQjAxjRS38=", "owner": "nix-community", "repo": "home-manager", - "rev": "f2d32e46fac9d51da6912948ae1156044c71774b", + "rev": "f20b7a8ab527a2482f13754dc00b2deaddc34599", "type": "github" }, "original": { @@ -79,11 +79,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1738707843, - "narHash": "sha256-0DMn9YbqU7ODIOBzu15vcrBnSKe72HUDkOtxHcpjK4A=", + "lastModified": 1738756893, + "narHash": "sha256-8i0bwUAomkug0nTNkyzpVctC78FYCUWUg3kOtXVeR/c=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "a81adb09eb7eb2ffad1ac3b91d1e59083c8e5918", + "rev": "1b2c644b287066aa161734a727f3f6f5da9b4d5c", "type": "github" }, "original": { @@ -112,11 +112,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1738654964, - "narHash": "sha256-30l3hOfTW1kJXcTRQsJ9f0/wE1aaTTACKb4ch6ZlLNU=", + "lastModified": 1738751713, + "narHash": "sha256-DxucZaCzH72v4SSUC6eK1TNLQVxBwXr1nYMsABoJ6ls=", "owner": "YaLTeR", "repo": "niri", - "rev": "7d24ad23c2bc690b22b1f13ad4598dc8323d128b", + "rev": "900da597e4d3d09ad4c4ddc3ba2abf58c4886ec9", "type": "github" }, "original": { @@ -143,11 +143,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1738574474, - "narHash": "sha256-rvyfF49e/k6vkrRTV4ILrWd92W+nmBDfRYZgctOyolQ=", + "lastModified": 1738702386, + "narHash": "sha256-nJj8f78AYAxl/zqLiFGXn5Im1qjFKU8yBPKoWEeZN5M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fecfeb86328381268e29e998ddd3ebc70bbd7f7c", + "rev": "030ba1976b7c0e1a67d9716b17308ccdab5b381e", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1738710976, - "narHash": "sha256-/Zyfku2FxQKMs3LHI90Hy61o8VuXtI16RfvK/d849B0=", + "lastModified": 1738754044, + "narHash": "sha256-ptZWtXstcE1a3My6N0OrKTA0wQePsYqqKnGpSZZy/bY=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "0622c0eb2ab953e40e3d167eebe885a1f3bbe8f9", + "rev": "e4cef7c609c948a1ebc7f29602554d29fbad500d", "type": "github" }, "original": { diff --git a/home-manager/progs/borg.nix b/home-manager/progs/borg.nix index e0a7caa..ab50ff4 100644 --- a/home-manager/progs/borg.nix +++ b/home-manager/progs/borg.nix @@ -7,9 +7,7 @@ map (f: "${homeDirectory}/${f}") [ ".zen" ".local/share/fish" - ".wallpaper.png" ".ssh" - "Documents" "projects" "Pictures" diff --git a/home-manager/progs/eww/config/dashboard.yuck b/home-manager/progs/eww/config/dashboard.yuck new file mode 100644 index 0000000..8eff67a --- /dev/null +++ b/home-manager/progs/eww/config/dashboard.yuck @@ -0,0 +1,17 @@ +(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")) +) diff --git a/home-manager/progs/eww/config/eww.yuck b/home-manager/progs/eww/config/eww.yuck index 0470a89..8c638bc 100644 --- a/home-manager/progs/eww/config/eww.yuck +++ b/home-manager/progs/eww/config/eww.yuck @@ -1,125 +1,2 @@ -(defwindow 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) - (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))) - -(defwidget window-title [] - (label - :text windowtitle)) - -(defpoll windowtitle :interval "1s" `scripts/currentWindow.fish`) -(defpoll currentworkspace :interval "1s" `scripts/currentWorkspace.fish`) - -(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" - }"))) - - -(defpoll brightness :interval "1s" :run-while brightnessctl-open `brightnessctl -m | awk -F, '{print $4+0}'`) - - -(defvar brightnessctl-open false) -(defwidget brightness-ctl-opener [] - (eventbox :class "button" - (button - :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}" - (label - :text {wifi-strength.icon} - :tooltip "Connected To: ${wifi-name}"))) - -(defpoll wifi-strength :interval "10s" `scripts/wifiInfo.zsh strength`) -(defpoll wifi-name :interval "1m" `scripts/wifiInfo.zsh name`) - -(defwidget bluetooth [] - (eventbox - :class "bluetooth button ${ bluetooth-name != "" ? "green" : "lavendar" }" - :onclick `blueman-manager &` - (label - :text "${bluetooth-name} σ°‚―"))) - -(defpoll bluetooth-name :interval "10s" `bluetoothctl devices Connected | awk '{print $3}'`) - -(defwidget time [] - (box - :space-evenly false - :class "time" - :tooltip {time.long} - (label :class "yellow" :text {time.hour}) - (label :text ":") - (label :class "yellow" :text {time.minute}))) - -(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`) - -(defwidget battery [] - (box :space-evenly false - :tooltip powerstats - (label - :text "${EWW_BATTERY.BAT1.status == "Charging" ? "σ°‚„" : - EWW_BATTERY.BAT1.capacity >= 90 ? "󰁹" : - EWW_BATTERY.BAT1.capacity >= 80 ? "σ°‚‚" : - EWW_BATTERY.BAT1.capacity >= 70 ? "󰂁" : - EWW_BATTERY.BAT1.capacity >= 60 ? "σ°‚€" : - EWW_BATTERY.BAT1.capacity >= 50 ? "󰁿" : - EWW_BATTERY.BAT1.capacity >= 40 ? "󰁾" : - EWW_BATTERY.BAT1.capacity >= 30 ? "󰁽" : - EWW_BATTERY.BAT1.capacity >= 20 ? "󰁼" : - EWW_BATTERY.BAT1.capacity >= 10 ? "󰁻" : "󰁺" - } " - :class "${ - EWW_BATTERY.BAT1.capacity >= 80 ? "green" : - EWW_BATTERY.BAT1.capacity >= 50 ? "yellow" : - EWW_BATTERY.BAT1.capacity >= 30 ? "peach" : - EWW_BATTERY.BAT1.capacity >= 10 ? "maroon" : "red" - }") - (label :text "${EWW_BATTERY.BAT1.capacity}%" :class "yellow"))) - +(include "./statusbar.yuck") +(include "./dashboard.yuck") diff --git a/home-manager/progs/eww/config/scripts/sound/getSink.sh b/home-manager/progs/eww/config/scripts/sound/getSink.sh new file mode 100755 index 0000000..8719a32 --- /dev/null +++ b/home-manager/progs/eww/config/scripts/sound/getSink.sh @@ -0,0 +1,2 @@ +#!/usr/bin/env sh +wpctl inspect @DEFAULT_SINK@ | rg "node.description" | cut -d' ' -f6- diff --git a/home-manager/progs/eww/config/scripts/sound/getVolume.sh b/home-manager/progs/eww/config/scripts/sound/getVolume.sh new file mode 100755 index 0000000..3e741f2 --- /dev/null +++ b/home-manager/progs/eww/config/scripts/sound/getVolume.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env sh +count=$(wpctl get-volume @DEFAULT_SINK@ | sed 's/Volume: //g' | sed 's/0\.[0]//g') +color="green" +if ((count > 75)); then color="yellow"; fi +if ((count > 90)); then color="peach"; fi +if ((count > 100)); then color="maroon"; fi +if ((count > 110)); then color="red"; fi +echo "{\"count\":\"${count}\", \"color\":\"${color}\"}" diff --git a/home-manager/progs/eww/config/statusbar.yuck b/home-manager/progs/eww/config/statusbar.yuck new file mode 100644 index 0000000..f643bf4 --- /dev/null +++ b/home-manager/progs/eww/config/statusbar.yuck @@ -0,0 +1,140 @@ + +(defwindow 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)))) + +(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))) + +(defwidget window-title [] + (label + :text "(${windowtitle})")) + +(defpoll windowtitle :interval "1s" `scripts/currentWindow.fish`) +(defpoll currentworkspace :interval "1s" `scripts/currentWorkspace.fish`) + +(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" + }"))) + + +(defpoll brightness :interval "1s" :run-while brightnessctl-open `brightnessctl -m | awk -F, '{print $4+0}'`) + + +(defvar brightnessctl-open false) +(defwidget brightness-ctl-opener [] + (eventbox :class "button" + (button + :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}" + (label + :text {wifi-strength.icon} + :tooltip "Connected To: ${wifi-name}"))) + +(defpoll wifi-strength :interval "10s" `scripts/wifiInfo.zsh strength`) +(defpoll wifi-name :interval "1m" `scripts/wifiInfo.zsh name`) + +(defwidget bluetooth [] + (eventbox + :class "bluetooth button ${ bluetooth-name != "" ? "green" : "lavendar" }" + :onclick `blueman-manager &` + (label + :text "${bluetooth-name} σ°‚―"))) + +(defpoll bluetooth-name :interval "10s" `bluetoothctl devices Connected | awk '{print $3}'`) + +(defwidget time [] + (box + :space-evenly false + :class "time" + :tooltip {time.long} + (label :class "yellow" :text {time.hour}) + (label :text ":") + (label :class "yellow" :text {time.minute}))) + +(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`) + +(defwidget battery [] + (box :space-evenly false + :tooltip powerstats + (label + :text "${EWW_BATTERY.BAT1.status == "Charging" ? "σ°‚„" : + EWW_BATTERY.BAT1.capacity >= 90 ? "󰁹" : + EWW_BATTERY.BAT1.capacity >= 80 ? "σ°‚‚" : + EWW_BATTERY.BAT1.capacity >= 70 ? "󰂁" : + EWW_BATTERY.BAT1.capacity >= 60 ? "σ°‚€" : + EWW_BATTERY.BAT1.capacity >= 50 ? "󰁿" : + EWW_BATTERY.BAT1.capacity >= 40 ? "󰁾" : + EWW_BATTERY.BAT1.capacity >= 30 ? "󰁽" : + EWW_BATTERY.BAT1.capacity >= 20 ? "󰁼" : + EWW_BATTERY.BAT1.capacity >= 10 ? "󰁻" : "󰁺" + } " + :class "${ + EWW_BATTERY.BAT1.capacity >= 80 ? "green" : + EWW_BATTERY.BAT1.capacity >= 50 ? "yellow" : + EWW_BATTERY.BAT1.capacity >= 30 ? "peach" : + EWW_BATTERY.BAT1.capacity >= 10 ? "maroon" : "red" + }") + (label :text "${EWW_BATTERY.BAT1.capacity}%" :class "yellow"))) + + + + + +(defpoll volumevalue :interval "1s" `scripts/sound/getVolume.sh`) +(defpoll volumesink :interval "1s" `scripts/sound/getSink.sh`) + +(defwidget volume [] + (eventbox :tooltip volumesink + :onclick `pwvucontrol &` + (label :text "${volumevalue.count}%" :class "${volumevalue.color}"))) + + From 438bd06571a95808841725529e0df48ce6fe1ef4 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 5 Feb 2025 13:16:50 -0500 Subject: [PATCH 098/724] desktop changes --- etcnixos/hardware_desktop.nix | 6 +++--- etcnixos/system-yarn.nix | 12 ------------ home-manager/no-gui.nix | 1 + 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/etcnixos/hardware_desktop.nix b/etcnixos/hardware_desktop.nix index 3f45ceb..17e40e4 100644 --- a/etcnixos/hardware_desktop.nix +++ b/etcnixos/hardware_desktop.nix @@ -38,9 +38,9 @@ ]; }; - fileSystems."/media/steam" = { - device = "/dev/disk/by-uuid/df865fc2-6b26-4689-809b-1615f860507e"; - fsType = "btrfs"; + fileSystems."/media/games" = { + device = "/dev/disk/by-uuid/1878136e-765d-4784-b204-3536ab4fdac8"; + fsType = "f2fs"; options = [ "nofail" ]; }; diff --git a/etcnixos/system-yarn.nix b/etcnixos/system-yarn.nix index a0a8d92..bd0426f 100644 --- a/etcnixos/system-yarn.nix +++ b/etcnixos/system-yarn.nix @@ -19,29 +19,17 @@ networking.hostId = "abf570f9"; boot = { - kernelPackages = lib.mkForce pkgs.linuxPackages; - kernelParams = [ # allow overclocking (I actually underclock but lol) "amdgpu.ppfeaturemask=0xFFF7FFFF" - - # 2048MB - "zfs.zfs_arc_max=2048000000" ]; - supportedFilesystems = [ "zfs" ]; - zfs.extraPools = [ "laptop_hdds" ]; - kernelModules = [ # kernel module for case fan control "nct6775" ]; }; - systemd.tmpfiles.rules = [ - "d /laptop_hdds 0755 ${username} users" - ]; - services.xserver.enable = false; services.desktopManager.plasma6.enable = true; services.displayManager = { diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 9efb971..4b85b95 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -146,6 +146,7 @@ # terminal image viewer timg + lsof ]; # home.file.".cargo/config.toml".text = '' From c06516257d20ea44bb596adaf104052f799e6d70 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 5 Feb 2025 13:26:39 -0500 Subject: [PATCH 099/724] better justfile --- justfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/justfile b/justfile index 6f39649..46539ed 100644 --- a/justfile +++ b/justfile @@ -7,13 +7,11 @@ format_system: doas nixfmt /etc/nixos system_update: - doas nix flake update --flake /etc/nixos - nh os boot /etc/nixos -- --impure + nh os boot -u /etc/nixos home_update: - nix flake update --flake ~/.config/home-manager rm -fr ~/.gtkrc-2.0 - nh home switch ~/.config/home-manager -- --impure + nh home switch -u ~/.config/home-manager -- --impure sync_configs: format_home format_system rsync -a --delete /etc/nixos/ ~/projects/configs/dotfiles/etcnixos/ From 010169a3aed46db17dd6919a5d7fa62c2bc231e1 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 5 Feb 2025 14:36:16 -0500 Subject: [PATCH 100/724] fix desktop --- etcnixos/system-yarn.nix | 6 +++++- home-manager/flake.lock | 18 +++++++++--------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/etcnixos/system-yarn.nix b/etcnixos/system-yarn.nix index bd0426f..fe3bfff 100644 --- a/etcnixos/system-yarn.nix +++ b/etcnixos/system-yarn.nix @@ -16,9 +16,13 @@ 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" @@ -74,7 +78,7 @@ config = let select_hwmon = "hwmon/hwmon[[:print:]]*"; - gpu_path = "/sys/devices/pci0000:00/0000:00:03.1/0000:09:00.0/0000:0a:00.0/0000:0b:00.0/${select_hwmon}"; + 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 diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 4d10a01..f1aa960 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -79,11 +79,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1738756893, - "narHash": "sha256-8i0bwUAomkug0nTNkyzpVctC78FYCUWUg3kOtXVeR/c=", + "lastModified": 1738770770, + "narHash": "sha256-nfapp7C4BbdvHTRA1HSRVYjD5Fk2FCKoyxQLzcL5X50=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "1b2c644b287066aa161734a727f3f6f5da9b4d5c", + "rev": "83abbde7c8164ee4b42a8647e4e61015c3f45816", "type": "github" }, "original": { @@ -112,11 +112,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1738751713, - "narHash": "sha256-DxucZaCzH72v4SSUC6eK1TNLQVxBwXr1nYMsABoJ6ls=", + "lastModified": 1738768006, + "narHash": "sha256-56jDYr/vqX4fobMJO2nWLjih03i6UV5bKtxI0nR4ZZA=", "owner": "YaLTeR", "repo": "niri", - "rev": "900da597e4d3d09ad4c4ddc3ba2abf58c4886ec9", + "rev": "690d6355057ebeba03cbd8ce4905145b834c72f8", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1738754044, - "narHash": "sha256-ptZWtXstcE1a3My6N0OrKTA0wQePsYqqKnGpSZZy/bY=", + "lastModified": 1738782903, + "narHash": "sha256-xxclr3MHrE8hjQbHBlwONgCkYY8UHhjoA1jjB6pLvC0=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "e4cef7c609c948a1ebc7f29602554d29fbad500d", + "rev": "876ab3f1dc42bb52c250453d73130a6d07322b51", "type": "github" }, "original": { From 07d33af291223b6309046818758f952f97b6aff0 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 5 Feb 2025 15:54:50 -0500 Subject: [PATCH 101/724] eww: fix volume regex --- home-manager/progs/eww/config/scripts/sound/getVolume.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/progs/eww/config/scripts/sound/getVolume.sh b/home-manager/progs/eww/config/scripts/sound/getVolume.sh index 3e741f2..49cb8e1 100755 --- a/home-manager/progs/eww/config/scripts/sound/getVolume.sh +++ b/home-manager/progs/eww/config/scripts/sound/getVolume.sh @@ -1,5 +1,5 @@ #!/usr/bin/env sh -count=$(wpctl get-volume @DEFAULT_SINK@ | sed 's/Volume: //g' | sed 's/0\.[0]//g') +count=$(wpctl get-volume @DEFAULT_SINK@ | sed 's/Volume: //g' | sed -E 's/0\.0?//g') color="green" if ((count > 75)); then color="yellow"; fi if ((count > 90)); then color="peach"; fi From 11072712a420245f65d1bcda443dae2116991cd0 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 5 Feb 2025 16:00:46 -0500 Subject: [PATCH 102/724] add note about my background --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 3f4d08e..8b82b95 100644 --- a/README.md +++ b/README.md @@ -17,3 +17,6 @@ Shell: [fish](https://fishshell.com/) with the [pure](https://github.com/pure-fi WM: [niri](https://github.com/YaLTeR/niri) (KDE on my desktop) There is more that I'm using, but those are the main ones! Read my configs to get more into the specifics. + +### 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 From e0ad5e41b4b92f45f9f23a830f7083bc6bd677a2 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 5 Feb 2025 17:21:06 -0500 Subject: [PATCH 103/724] fix window-title --- home-manager/progs/eww/config/statusbar.yuck | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/progs/eww/config/statusbar.yuck b/home-manager/progs/eww/config/statusbar.yuck index f643bf4..dbb73d5 100644 --- a/home-manager/progs/eww/config/statusbar.yuck +++ b/home-manager/progs/eww/config/statusbar.yuck @@ -37,7 +37,7 @@ (defwidget window-title [] (label - :text "(${windowtitle})")) + :text "${windowtitle == "" ? "" : "[[${windowtitle}]]"}")) (defpoll windowtitle :interval "1s" `scripts/currentWindow.fish`) (defpoll currentworkspace :interval "1s" `scripts/currentWorkspace.fish`) From 35f1242e0b1a68d73be76cd55440c04117c462e5 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 5 Feb 2025 18:30:58 -0500 Subject: [PATCH 104/724] blur swaylock background --- home-manager/flake.lock | 6 ++--- home-manager/progs/eww/config/statusbar.yuck | 2 +- home-manager/progs/swaylock.nix | 5 ++++ home-manager/util/blur.nix | 26 ++++++++++++++++++++ 4 files changed, 35 insertions(+), 4 deletions(-) create mode 100644 home-manager/util/blur.nix diff --git a/home-manager/flake.lock b/home-manager/flake.lock index f1aa960..c56ad73 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1738753876, - "narHash": "sha256-yXT82kERWL4R81hfun9BuT478Q6ut0dJzdQjAxjRS38=", + "lastModified": 1738789832, + "narHash": "sha256-HdlMPfObPu5y7oDfH/w3vvlU3UTQ/bQjSULChZARm5M=", "owner": "nix-community", "repo": "home-manager", - "rev": "f20b7a8ab527a2482f13754dc00b2deaddc34599", + "rev": "30ea6fed4e4b41693cebc2263373dd810de4de49", "type": "github" }, "original": { diff --git a/home-manager/progs/eww/config/statusbar.yuck b/home-manager/progs/eww/config/statusbar.yuck index dbb73d5..435a8a4 100644 --- a/home-manager/progs/eww/config/statusbar.yuck +++ b/home-manager/progs/eww/config/statusbar.yuck @@ -37,7 +37,7 @@ (defwidget window-title [] (label - :text "${windowtitle == "" ? "" : "[[${windowtitle}]]"}")) + :text "${windowtitle == "" ? "" : "(${windowtitle})"}")) (defpoll windowtitle :interval "1s" `scripts/currentWindow.fish`) (defpoll currentworkspace :interval "1s" `scripts/currentWorkspace.fish`) diff --git a/home-manager/progs/swaylock.nix b/home-manager/progs/swaylock.nix index 15177c8..c3fe2c8 100644 --- a/home-manager/progs/swaylock.nix +++ b/home-manager/progs/swaylock.nix @@ -1,4 +1,7 @@ { pkgs, ... }: +let + blur = pkgs.callPackage ../util/blur.nix; +in { programs.swaylock = { enable = true; @@ -32,6 +35,8 @@ text-caps-lock-color = "f5a97f"; text-ver-color = "8aadf4"; text-wrong-color = "ee99a0"; + # image = builtins.toString ../wallpaper_blurred.png; + image = "${(blur { src = ../wallpaper.png; })}/output.png"; }; }; } diff --git a/home-manager/util/blur.nix b/home-manager/util/blur.nix new file mode 100644 index 0000000..67248af --- /dev/null +++ b/home-manager/util/blur.nix @@ -0,0 +1,26 @@ +{ + stdenv, + imagemagick, + src, +}: +stdenv.mkDerivation { + pname = "blur-image"; + version = "1.0"; + + inherit src; + + buildInputs = [ imagemagick ]; + + # 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 = '' + magick ${src} -filter Gaussian -resize 20% -blur 0x2.5 -resize 500% output.png + ''; + + installPhase = '' + mkdir -p $out + mv output.png $out/ + ''; +} From 4c213e495f0ae84ef338a08dbbd5aad710c0d404 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 5 Feb 2025 19:30:40 -0500 Subject: [PATCH 105/724] make more nixy --- home-manager/progs/eww/config/statusbar.yuck | 3 -- home-manager/progs/swaylock.nix | 36 ++++++++++++-------- home-manager/system-mreow.nix | 2 -- home-manager/util/blur.nix | 3 +- 4 files changed, 23 insertions(+), 21 deletions(-) diff --git a/home-manager/progs/eww/config/statusbar.yuck b/home-manager/progs/eww/config/statusbar.yuck index 435a8a4..ffa7985 100644 --- a/home-manager/progs/eww/config/statusbar.yuck +++ b/home-manager/progs/eww/config/statusbar.yuck @@ -126,9 +126,6 @@ (label :text "${EWW_BATTERY.BAT1.capacity}%" :class "yellow"))) - - - (defpoll volumevalue :interval "1s" `scripts/sound/getVolume.sh`) (defpoll volumesink :interval "1s" `scripts/sound/getSink.sh`) diff --git a/home-manager/progs/swaylock.nix b/home-manager/progs/swaylock.nix index c3fe2c8..d9d11fa 100644 --- a/home-manager/progs/swaylock.nix +++ b/home-manager/progs/swaylock.nix @@ -7,36 +7,44 @@ in enable = true; settings = { color = "24273a"; + ring-color = "b7bdf8"; + bs-hl-color = "f4dbd6"; caps-lock-bs-hl-color = "f4dbd6"; + text-clear-color = "f4dbd6"; + ring-clear-color = "f4dbd6"; + + text-caps-lock-color = "f5a97f"; + ring-caps-lock-color = "f5a97f"; + + ring-ver-color = "8aadf4"; + text-ver-color = "8aadf4"; + + ring-wrong-color = "ee99a0"; + text-wrong-color = "ee99a0"; + + layout-text-color = "cad3f5"; + text-color = "cad3f5"; + caps-lock-key-hl-color = "a6da95"; + key-hl-color = "a6da95"; + inside-color = 0; inside-clear-color = 0; inside-caps-lock-color = 0; inside-ver-color = 0; inside-wrong-color = 0; - key-hl-color = "a6da95"; layout-bg-color = 0; layout-border-color = 0; - layout-text-color = "cad3f5"; line-color = 0; line-clear-color = 0; line-caps-lock-color = 0; line-ver-color = 0; line-wrong-color = 0; - ring-color = "b7bdf8"; - ring-clear-color = "f4dbd6"; - ring-caps-lock-color = "f5a97f"; - ring-ver-color = "8aadf4"; - ring-wrong-color = "ee99a0"; separator-color = 0; - text-color = "cad3f5"; - text-clear-color = "f4dbd6"; - text-caps-lock-color = "f5a97f"; - text-ver-color = "8aadf4"; - text-wrong-color = "ee99a0"; - # image = builtins.toString ../wallpaper_blurred.png; - image = "${(blur { src = ../wallpaper.png; })}/output.png"; + image = builtins.toString (blur { + src = ../wallpaper.png; + }); }; }; } diff --git a/home-manager/system-mreow.nix b/home-manager/system-mreow.nix index bcf838a..a7354c7 100644 --- a/home-manager/system-mreow.nix +++ b/home-manager/system-mreow.nix @@ -26,8 +26,6 @@ # used by /etc/nixos logic to launch niri config.programs.niri.package - - xwayland-satellite-unstable ]; # media controls diff --git a/home-manager/util/blur.nix b/home-manager/util/blur.nix index 67248af..79917d6 100644 --- a/home-manager/util/blur.nix +++ b/home-manager/util/blur.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation { ''; installPhase = '' - mkdir -p $out - mv output.png $out/ + mv output.png $out ''; } From b8bd8336d1be350d3f57c008f3e0dc67dcb3d435 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 5 Feb 2025 21:56:54 -0500 Subject: [PATCH 106/724] gpt4all 3.9.0 and cleanup --- home-manager/flake.nix | 15 +++++++++++++-- home-manager/progs/eww/config/statusbar.yuck | 7 ++++--- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/home-manager/flake.nix b/home-manager/flake.nix index 66e2589..c549a7e 100644 --- a/home-manager/flake.nix +++ b/home-manager/flake.nix @@ -46,8 +46,6 @@ homeDirectory = "/home/${username}"; hostname = nixpkgs.lib.strings.removeSuffix "\n" (builtins.readFile /etc/hostname); - pkgs = import nixpkgs { }; - # stolen from: https://stackoverflow.com/a/42398526 optimizeWithFlags = pkg: flags: @@ -62,6 +60,19 @@ stdenv = pkgs.clang19Stdenv; } ); + + pkgs' = (import nixpkgs { }).applyPatches { + name = "gpt4all 3.9.0"; + src = inputs.nixpkgs; + patches = [ + (builtins.fetchurl { + url = "https://github.com/NixOS/nixpkgs/pull/372723.diff"; + sha256 = "1zzrs058i9p89qy8r22n8i5wff5s0s6w56c7d37nvs6b0jwp5qhm"; + }) + ]; + }; + + pkgs = (import pkgs' { }); in { homeConfigurations.${username} = home-manager.lib.homeManagerConfiguration { diff --git a/home-manager/progs/eww/config/statusbar.yuck b/home-manager/progs/eww/config/statusbar.yuck index ffa7985..82bea8a 100644 --- a/home-manager/progs/eww/config/statusbar.yuck +++ b/home-manager/progs/eww/config/statusbar.yuck @@ -35,13 +35,12 @@ :onchange command) (label :text "${value}%" :class color))) +(defpoll windowtitle :interval "1s" `scripts/currentWindow.fish`) + (defwidget window-title [] (label :text "${windowtitle == "" ? "" : "(${windowtitle})"}")) -(defpoll windowtitle :interval "1s" `scripts/currentWindow.fish`) -(defpoll currentworkspace :interval "1s" `scripts/currentWorkspace.fish`) - (defwidget brightness-ctl [] (box :visible brightnessctl-open (cmd-slider :symbol "σ°ƒ " :value brightness @@ -135,3 +134,5 @@ (label :text "${volumevalue.count}%" :class "${volumevalue.color}"))) +(defpoll currentworkspace :interval "1s" `scripts/currentWorkspace.fish`) + From a89f16194340f907e757fea862c409effba20e74 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 5 Feb 2025 22:11:22 -0500 Subject: [PATCH 107/724] update gpt4all models and config --- home-manager/flake.lock | 12 ++++++------ home-manager/progs/gpt4all/gpt4all.nix | 12 +++++------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/home-manager/flake.lock b/home-manager/flake.lock index c56ad73..cf254d4 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -174,11 +174,11 @@ ] }, "locked": { - "lastModified": 1738722444, - "narHash": "sha256-DHVyKCiIQVDqjYoVU2j7UaLNIlOnpB9sP1cPRNRpqvY=", + "lastModified": 1738808867, + "narHash": "sha256-m5rbY/ck0NAlfSBxo++vl7EZn8fkZ02H3kGGc7q883c=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "347fb01821c3cd8d54e563d244a599c1e27a393d", + "rev": "ae46f37fb727030ddc2ef65a675b751484c90032", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1738782903, - "narHash": "sha256-xxclr3MHrE8hjQbHBlwONgCkYY8UHhjoA1jjB6pLvC0=", + "lastModified": 1738804720, + "narHash": "sha256-3bAR5ALk5AoFt4BlsQRdjSV6VVH6lbgtYdElb0A+qDc=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "876ab3f1dc42bb52c250453d73130a6d07322b51", + "rev": "7868f1c54b7f8e09be194aaa0934791596df1ea1", "type": "github" }, "original": { diff --git a/home-manager/progs/gpt4all/gpt4all.nix b/home-manager/progs/gpt4all/gpt4all.nix index a9a8cdf..edc6a09 100644 --- a/home-manager/progs/gpt4all/gpt4all.nix +++ b/home-manager/progs/gpt4all/gpt4all.nix @@ -7,12 +7,12 @@ let models = [ { - name = "Qwen2.5-14B-Instruct-IQ4_XS.gguf"; + name = "DeepSeek-R1-Distill-Qwen-7B-Q6_K.gguf"; context_length = 32768; gen_length = 8192; source = pkgs.fetchurl { - url = "https://huggingface.co/bartowski/Qwen2.5-14B-Instruct-GGUF/resolve/main/Qwen2.5-14B-Instruct-IQ4_XS.gguf?download=true"; - sha256 = "+AHt49no0qQ48MoNsqGJV4FeJ3Cf2hSZqTMjNUIHaO4="; + url = "https://huggingface.co/bartowski/DeepSeek-R1-Distill-Qwen-7B-GGUF/resolve/main/DeepSeek-R1-Distill-Qwen-7B-Q6_K.gguf?download=true"; + sha256 = "3ffa00e72db05668453687d5ab8e7c9fb19705cfd57292a956db17a3633c93f3"; }; } ]; @@ -72,12 +72,10 @@ in filename=${model.name} maxLength=${builtins.toString model.gen_length} promptBatchSize=256 - promptTemplate=<|im_start|>user\n%1<|im_end|>\n<|im_start|>assistant\n - systemPrompt="<|im_start|>system\n${ + systemMessage="${ # replace newlines with the string "\n" for gpt4all to properly parse builtins.replaceStrings [ "\n" ] [ "\\n" ] system_prompt - }<|im_end|> - \n" + }\n" '') models )) + '' From 73707b55940c7374f68ae371696d9eac5de30679 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 5 Feb 2025 22:57:25 -0500 Subject: [PATCH 108/724] gpt4all stuff --- home-manager/progs/gpt4all/gpt4all.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/home-manager/progs/gpt4all/gpt4all.nix b/home-manager/progs/gpt4all/gpt4all.nix index edc6a09..2d7fe66 100644 --- a/home-manager/progs/gpt4all/gpt4all.nix +++ b/home-manager/progs/gpt4all/gpt4all.nix @@ -7,12 +7,12 @@ let models = [ { - name = "DeepSeek-R1-Distill-Qwen-7B-Q6_K.gguf"; + name = "DeepSeek-R1-Distill-Qwen-14B-Q4_0.gguf"; context_length = 32768; gen_length = 8192; source = pkgs.fetchurl { - url = "https://huggingface.co/bartowski/DeepSeek-R1-Distill-Qwen-7B-GGUF/resolve/main/DeepSeek-R1-Distill-Qwen-7B-Q6_K.gguf?download=true"; - sha256 = "3ffa00e72db05668453687d5ab8e7c9fb19705cfd57292a956db17a3633c93f3"; + url = "https://huggingface.co/bartowski/DeepSeek-R1-Distill-Qwen-14B-GGUF/resolve/main/DeepSeek-R1-Distill-Qwen-14B-Q4_0.gguf?download=true"; + sha256 = "906b3382f2680f4ce845459b4a122e904002b075238080307586bcffcde49eef"; }; } ]; @@ -28,10 +28,8 @@ let # compile flags [ "-O3" - "-ffast-math" "-march=native" "-mtune=native" - "-fno-finite-math-only" # https://github.com/ggerganov/llama.cpp/pull/7154#issuecomment-2143844461 ] ); in @@ -45,7 +43,7 @@ in { ".config/nomic.ai/GPT4All.ini".text = let - system_prompt = "You are an expert LLM who works step-by-step from first principles to derive an answer to the user's prompt. For each step, title the step and begin showing your work, then decide if your work is comprehensive and if you're ready to provide your final answer. Make sure to exhaust ALL POSSIBILITIES before answering. INTERNAL REASONING STEPS ARE NOT SHOWN TO THE USER, ONLY A \"Final Answer\" SECTION WILL BE SHOWN TO THE USER. USE AS MANY REASONING STEPS AS POSSIBLE. EXPLORE ALTERNATE ANSWERS AND CONSIDER THAT YOUR ANSWER OR ANY ASSUMPTIONS MAY BE WRONG. IDENTIFY POSSIBLE ERRORS IN YOUR REASONING AND WHERE SUCH ERRORS MAY BE. FULLY TEST ALL OTHER POSSIBILITIES. YOU CAN BE WRONG. SHOW YOUR WORK WHEN RE-EXAMINING. FULLY COMPLETE THE PROBLEM BEFORE FINALIZING YOUR ANSWER, DO NOT LEAVE PLACEHOLDER INFORMATION IN YOUR ANSWER."; + system_prompt = ""; in '' [General] From c6d5d5b6f099b74da63aa0c9c1021f51b0d7a818 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 5 Feb 2025 23:46:22 -0500 Subject: [PATCH 109/724] cleanup --- etcnixos/flake.lock | 6 ++-- etcnixos/no-rgb.nix | 30 +++++++++++++------- etcnixos/system-mreow.nix | 14 +++------ home-manager/progs/eww/config/statusbar.yuck | 16 +++++------ 4 files changed, 35 insertions(+), 31 deletions(-) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 4359537..756bf62 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -294,11 +294,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1738638143, - "narHash": "sha256-ZYMe4c4OCtIUBn5hx15PEGr0+B1cNEpl2dsaLxwY2W0=", + "lastModified": 1738815599, + "narHash": "sha256-gpDGrlNANp8+Ag7oAHiXtUIJ1kWHqTN/6G686PpkNl0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9bdd53f5908453e4d03f395eb1615c3e9a351f70", + "rev": "d1f201fc627098d764ed00f736864ce673f5975e", "type": "github" }, "original": { diff --git a/etcnixos/no-rgb.nix b/etcnixos/no-rgb.nix index e3368f2..74f627a 100644 --- a/etcnixos/no-rgb.nix +++ b/etcnixos/no-rgb.nix @@ -2,21 +2,32 @@ { systemd.services.no-rgb = let - no-rgb = pkgs.writeScriptBin "no-rgb" '' - #!/bin/sh - set -e + no-rgb = ( + pkgs.writeShellApplication { + name = "no-rgb"; + runtimeInputs = with pkgs; [ + openrgb + coreutils + gnugrep + ]; - NUM_DEVICES=$(${pkgs.openrgb}/bin/openrgb --noautoconnect --list-devices | ${pkgs.gnugrep}/bin/grep -E '^[0-9]+: ' | ${pkgs.coreutils}/bin/wc -l) + text = '' + #!/bin/sh + set -e - for i in $(${pkgs.coreutils}/bin/seq 0 $(($NUM_DEVICES - 1))); do - ${pkgs.openrgb}/bin/openrgb --noautoconnect --device $i --mode direct --color 000000 - done - ''; + NUM_DEVICES=$(openrgb --noautoconnect --list-devices | grep -cE '^[0-9]+: ') + + for i in $(seq 0 $((NUM_DEVICES - 1))); do + openrgb --noautoconnect --device "$i" --mode direct --color 000000 + done + ''; + } + ); in { description = "disable rgb"; serviceConfig = { - ExecStart = "${no-rgb}/bin/no-rgb"; + ExecStart = "${no-rgb}/bin/${no-rgb.name}"; Type = "oneshot"; }; wantedBy = [ "multi-user.target" ]; @@ -29,5 +40,4 @@ environment.systemPackages = with pkgs; [ openrgb-with-all-plugins ]; - } diff --git a/etcnixos/system-mreow.nix b/etcnixos/system-mreow.nix index 7464795..49d1077 100644 --- a/etcnixos/system-mreow.nix +++ b/etcnixos/system-mreow.nix @@ -86,8 +86,8 @@ enable = true; capSysNice = true; }; + programs.steam = { - enable = true; gamescopeSession.enable = true; }; @@ -106,8 +106,8 @@ TTYVTDisallocate = true; }; - #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` + # 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 = { }; system.activationScripts = { @@ -116,17 +116,11 @@ #!/bin/sh rm -fr ${config.boot.lanzaboote.pkiBundle} || true mkdir -p ${config.boot.lanzaboote.pkiBundle} - ${pkgs.gnutar}/bin/tar xf /etc/nixos/secrets/secureboot.tar -C ${config.boot.lanzaboote.pkiBundle} + ${pkgs.gnutar}/bin/tar xf ${./secrets/secureboot.tar} -C ${config.boot.lanzaboote.pkiBundle} ''; }; - # https://github.com/NixOS/nixos-hardware/pull/1253 - # hardware.framework.laptop13.audioEnhancement = { - # enable = true; - # };i - # disable framework kernel module # https://github.com/NixOS/nixos-hardware/issues/1330 - hardware.framework.enableKmod = false; } diff --git a/home-manager/progs/eww/config/statusbar.yuck b/home-manager/progs/eww/config/statusbar.yuck index 82bea8a..97ce264 100644 --- a/home-manager/progs/eww/config/statusbar.yuck +++ b/home-manager/progs/eww/config/statusbar.yuck @@ -39,18 +39,18 @@ (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 "${ + :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}'`) @@ -105,7 +105,7 @@ (box :space-evenly false :tooltip powerstats (label - :text "${EWW_BATTERY.BAT1.status == "Charging" ? "σ°‚„" : + :text {EWW_BATTERY.BAT1.status == "Charging" ? "σ°‚„" : EWW_BATTERY.BAT1.capacity >= 90 ? "󰁹" : EWW_BATTERY.BAT1.capacity >= 80 ? "σ°‚‚" : EWW_BATTERY.BAT1.capacity >= 70 ? "󰂁" : @@ -115,13 +115,13 @@ EWW_BATTERY.BAT1.capacity >= 30 ? "󰁽" : EWW_BATTERY.BAT1.capacity >= 20 ? "󰁼" : EWW_BATTERY.BAT1.capacity >= 10 ? "󰁻" : "󰁺" - } " - :class "${ + } + :class { EWW_BATTERY.BAT1.capacity >= 80 ? "green" : EWW_BATTERY.BAT1.capacity >= 50 ? "yellow" : EWW_BATTERY.BAT1.capacity >= 30 ? "peach" : EWW_BATTERY.BAT1.capacity >= 10 ? "maroon" : "red" - }") + }) (label :text "${EWW_BATTERY.BAT1.capacity}%" :class "yellow"))) @@ -131,7 +131,7 @@ (defwidget volume [] (eventbox :tooltip volumesink :onclick `pwvucontrol &` - (label :text "${volumevalue.count}%" :class "${volumevalue.color}"))) + (label :text "${volumevalue.count}%" :class {volumevalue.color}))) (defpoll currentworkspace :interval "1s" `scripts/currentWorkspace.fish`) From 3fb841e0cbce19a644fbe7a277ec2fc2da46513b Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 6 Feb 2025 11:35:35 -0500 Subject: [PATCH 110/724] a --- etcnixos/flake.lock | 6 +++--- home-manager/flake.lock | 18 +++++++++--------- home-manager/flake.nix | 26 +++++++++++++------------- home-manager/system-mreow.nix | 1 - 4 files changed, 25 insertions(+), 26 deletions(-) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 756bf62..9c0a390 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -294,11 +294,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1738815599, - "narHash": "sha256-gpDGrlNANp8+Ag7oAHiXtUIJ1kWHqTN/6G686PpkNl0=", + "lastModified": 1738816619, + "narHash": "sha256-5yRlg48XmpcX5b5HesdGMOte+YuCy9rzQkJz+imcu6I=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d1f201fc627098d764ed00f736864ce673f5975e", + "rev": "2eccff41bab80839b1d25b303b53d339fbb07087", "type": "github" }, "original": { diff --git a/home-manager/flake.lock b/home-manager/flake.lock index cf254d4..3f7091b 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1738789832, - "narHash": "sha256-HdlMPfObPu5y7oDfH/w3vvlU3UTQ/bQjSULChZARm5M=", + "lastModified": 1738841109, + "narHash": "sha256-sEgE3nifaRU5gfAx33ds0tx/j+qM0/5/bHopv/w6c0c=", "owner": "nix-community", "repo": "home-manager", - "rev": "30ea6fed4e4b41693cebc2263373dd810de4de49", + "rev": "f99c704fe3a4cf8d72b2d568ec80bc38be1a9407", "type": "github" }, "original": { @@ -79,11 +79,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1738770770, - "narHash": "sha256-nfapp7C4BbdvHTRA1HSRVYjD5Fk2FCKoyxQLzcL5X50=", + "lastModified": 1738835520, + "narHash": "sha256-qvaWZ3PDJ0MC7t0wD8MdoGdVnMu0ps/ZWCXGepCFo5s=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "83abbde7c8164ee4b42a8647e4e61015c3f45816", + "rev": "4e72debdb5675b41278ddd492168b6c9c9ed09a0", "type": "github" }, "original": { @@ -112,11 +112,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1738768006, - "narHash": "sha256-56jDYr/vqX4fobMJO2nWLjih03i6UV5bKtxI0nR4ZZA=", + "lastModified": 1738827003, + "narHash": "sha256-s3bBfzPRRWybVSzRYStIwQxSOH5/9kR0Kfqi4IsvG7E=", "owner": "YaLTeR", "repo": "niri", - "rev": "690d6355057ebeba03cbd8ce4905145b834c72f8", + "rev": "b31c0359ebce114ae2f9b4e5df3dc37a93f5115e", "type": "github" }, "original": { diff --git a/home-manager/flake.nix b/home-manager/flake.nix index c549a7e..80b76cc 100644 --- a/home-manager/flake.nix +++ b/home-manager/flake.nix @@ -61,21 +61,21 @@ } ); - pkgs' = (import nixpkgs { }).applyPatches { - name = "gpt4all 3.9.0"; - src = inputs.nixpkgs; - patches = [ - (builtins.fetchurl { - url = "https://github.com/NixOS/nixpkgs/pull/372723.diff"; - sha256 = "1zzrs058i9p89qy8r22n8i5wff5s0s6w56c7d37nvs6b0jwp5qhm"; - }) - ]; - }; - - pkgs = (import pkgs' { }); + pkgs = ( + import ((import nixpkgs { }).applyPatches { + name = "gpt4all 3.9.0"; + src = inputs.nixpkgs; + patches = [ + (builtins.fetchurl { + url = "https://github.com/NixOS/nixpkgs/pull/372723.diff"; + sha256 = "1vq035iwmc8dhi4zfhgivm1vr14yjjv8fgp00dk5wh3j401p6s6k"; + }) + ]; + }) { } + ); in { - homeConfigurations.${username} = home-manager.lib.homeManagerConfiguration { + homeConfigurations."${username}" = home-manager.lib.homeManagerConfiguration { inherit pkgs; extraSpecialArgs = { inherit diff --git a/home-manager/system-mreow.nix b/home-manager/system-mreow.nix index a7354c7..be8dff3 100644 --- a/home-manager/system-mreow.nix +++ b/home-manager/system-mreow.nix @@ -60,5 +60,4 @@ in import ./progs/borg.nix { inherit homeDirectory borgPasswordFile; }; }; - } From ac78998bcaae55e10eb8ce4c1f723a45707e1326 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 6 Feb 2025 12:37:56 -0500 Subject: [PATCH 111/724] gpt4all stuff --- home-manager/progs/gpt4all/gpt4all.nix | 41 +++++++++++++------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/home-manager/progs/gpt4all/gpt4all.nix b/home-manager/progs/gpt4all/gpt4all.nix index 2d7fe66..87ba1e8 100644 --- a/home-manager/progs/gpt4all/gpt4all.nix +++ b/home-manager/progs/gpt4all/gpt4all.nix @@ -6,11 +6,12 @@ }: let models = [ - { - name = "DeepSeek-R1-Distill-Qwen-14B-Q4_0.gguf"; + rec { + name = "DeepSeek-R1-Distill-Qwen-14B-Q4_0"; + filename = builtins.elemAt (lib.splitString "?" src.name) 0; context_length = 32768; gen_length = 8192; - source = pkgs.fetchurl { + src = pkgs.fetchurl { url = "https://huggingface.co/bartowski/DeepSeek-R1-Distill-Qwen-14B-GGUF/resolve/main/DeepSeek-R1-Distill-Qwen-14B-Q4_0.gguf?download=true"; sha256 = "906b3382f2680f4ce845459b4a122e904002b075238080307586bcffcde49eef"; }; @@ -32,6 +33,8 @@ let "-mtune=native" ] ); + + system_prompt = ""; in { home.packages = [ @@ -42,9 +45,6 @@ in lib.recursiveUpdate { ".config/nomic.ai/GPT4All.ini".text = - let - system_prompt = ""; - in '' [General] chatTheme=Dark @@ -63,20 +63,19 @@ in [download] lastVersionStarted=${gpt4all_package.version} '' - + (lib.concatStrings ( - map (model: '' - [model-${model.name}] - contextLength=${builtins.toString model.context_length} - filename=${model.name} - maxLength=${builtins.toString model.gen_length} - promptBatchSize=256 - systemMessage="${ - # replace newlines with the string "\n" for gpt4all to properly parse - builtins.replaceStrings [ "\n" ] [ "\\n" ] system_prompt - }\n" - '') models - )) + + (lib.concatMapStringsSep "\n" (model: '' + [model-${model.name}] + contextLength=${builtins.toString model.context_length} + filename=${model.filename} + maxLength=${builtins.toString model.gen_length} + promptBatchSize=256 + systemMessage="${ + # replace newlines with the string "\n" for gpt4all to properly parse + builtins.replaceStrings [ "\n" ] [ "\\n" ] system_prompt + }" + '') models) + '' + \n [network] isActive=true usageStatsActive=true @@ -85,8 +84,8 @@ in ( builtins.listToAttrs ( map (f: { - name = ".local/share/nomic.ai/GPT4All/${f.name}"; - value.source = f.source; + name = ".local/share/nomic.ai/GPT4All/${f.filename}"; + value.source = f.src; }) models ) ); From 87a83ba99075e6e13001388ec9496ffb6b06a1ff Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 6 Feb 2025 12:41:01 -0500 Subject: [PATCH 112/724] fix gpt4all --- home-manager/progs/gpt4all/gpt4all.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/home-manager/progs/gpt4all/gpt4all.nix b/home-manager/progs/gpt4all/gpt4all.nix index 87ba1e8..114f174 100644 --- a/home-manager/progs/gpt4all/gpt4all.nix +++ b/home-manager/progs/gpt4all/gpt4all.nix @@ -51,7 +51,6 @@ in height=940 suggestionMode=Off threadCount=8 - uniqueId=7096f2d2-448d-4272-a132-d37e77f8a781 userDefaultModel=${ # select the first element of `models` to be the default model (builtins.elemAt models 0).name @@ -75,10 +74,10 @@ in }" '') models) + '' - \n + [network] - isActive=true - usageStatsActive=true + isActive=false + usageStatsActive=false ''; } ( From cc384d98d987d579e6d497962f1bdc4281c592f1 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 6 Feb 2025 21:40:20 -0500 Subject: [PATCH 113/724] things --- home-manager/flake.lock | 12 ++-- home-manager/flake.nix | 4 +- home-manager/gui.nix | 23 +++----- home-manager/no-gui.nix | 2 + home-manager/progs/alacritty.nix | 3 - home-manager/progs/eww/config/statusbar.yuck | 1 - home-manager/progs/gpt4all/gpt4all.nix | 6 +- home-manager/progs/helix.nix | 58 +++++++++++++++----- home-manager/progs/niri.nix | 6 ++ home-manager/system-mreow.nix | 9 ++- 10 files changed, 76 insertions(+), 48 deletions(-) diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 3f7091b..8335f8b 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1738841109, - "narHash": "sha256-sEgE3nifaRU5gfAx33ds0tx/j+qM0/5/bHopv/w6c0c=", + "lastModified": 1738878603, + "narHash": "sha256-fmhq8B3MvQLawLbMO+LWLcdC2ftLMmwSk+P29icJ3tE=", "owner": "nix-community", "repo": "home-manager", - "rev": "f99c704fe3a4cf8d72b2d568ec80bc38be1a9407", + "rev": "433799271274c9f2ab520a49527ebfe2992dcfbd", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1738804720, - "narHash": "sha256-3bAR5ALk5AoFt4BlsQRdjSV6VVH6lbgtYdElb0A+qDc=", + "lastModified": 1738880187, + "narHash": "sha256-1RieTOf8k5WQDMUpk2y24jmCUGS5Z8vyVb1xOaZu6cc=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "7868f1c54b7f8e09be194aaa0934791596df1ea1", + "rev": "6449d5cd3ddd3e21650ed2b80c59acfbb196fb2b", "type": "github" }, "original": { diff --git a/home-manager/flake.nix b/home-manager/flake.nix index 80b76cc..b7b6b1b 100644 --- a/home-manager/flake.nix +++ b/home-manager/flake.nix @@ -63,12 +63,12 @@ pkgs = ( import ((import nixpkgs { }).applyPatches { - name = "gpt4all 3.9.0"; + name = "gpt4all 3.9.0 (PR #372723)"; src = inputs.nixpkgs; patches = [ (builtins.fetchurl { url = "https://github.com/NixOS/nixpkgs/pull/372723.diff"; - sha256 = "1vq035iwmc8dhi4zfhgivm1vr14yjjv8fgp00dk5wh3j401p6s6k"; + sha256 = "039vr6xssic2bdkax440w9xfrvq8jrmm54xhsgpi93mnwj4m8fz1"; }) ]; }) { } diff --git a/home-manager/gui.nix b/home-manager/gui.nix index 7efcd45..6432670 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -115,6 +115,9 @@ wl-screenrec gimp + + # wayland-compatible color picker + hyprpicker ] ++ (builtins.filter lib.isDerivation (builtins.attrValues nerd-fonts)); @@ -140,7 +143,7 @@ # make chromium-based stuff use wayland home.file.".config/chromium-flags.conf".text = "--ozone-platform-hint=auto"; - #dark mode + # dark mode dconf.settings = { "org/gnome/desktop/interface" = { color-scheme = "prefer-dark"; @@ -152,20 +155,10 @@ BROWSER = "zen"; }; - #for trezor stuff - /* - trezor-udev-rules #trezor udev rules - trezord - trezor-suite - monero-gui - monero-cli - trezorctl - */ - - #allow extra fonts to be detected by fontconfig + # allow extra fonts to be detected by fontconfig fonts.fontconfig.enable = true; - #gtk application theming + # gtk application theming gtk = { enable = true; # make gtk3 applications look like libadwaita applications! @@ -179,7 +172,7 @@ }; }; - #qt application theming - BROKEN and on fire + # qt application theming - BROKEN and on fire # qt = { # enable = true; # platformTheme = { @@ -196,7 +189,7 @@ # }; # }; - #macOS cursor! + # macOS cursor! home.pointerCursor = { gtk.enable = true; package = pkgs.apple-cursor; diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 4b85b95..20bfcc5 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -147,6 +147,8 @@ # terminal image viewer timg lsof + + tcpdump ]; # home.file.".cargo/config.toml".text = '' diff --git a/home-manager/progs/alacritty.nix b/home-manager/progs/alacritty.nix index 49de2b1..3b91dcf 100644 --- a/home-manager/progs/alacritty.nix +++ b/home-manager/progs/alacritty.nix @@ -4,9 +4,6 @@ enable = true; package = pkgs.alacritty; settings = { - # use the fish shell - # shell.program = "${pkgs.fish}/bin/fish"; - # some programs can't handle alacritty env.TERM = "xterm-256color"; diff --git a/home-manager/progs/eww/config/statusbar.yuck b/home-manager/progs/eww/config/statusbar.yuck index 97ce264..3e3e440 100644 --- a/home-manager/progs/eww/config/statusbar.yuck +++ b/home-manager/progs/eww/config/statusbar.yuck @@ -1,4 +1,3 @@ - (defwindow statusbar :monitor 0 :stacking "fg" diff --git a/home-manager/progs/gpt4all/gpt4all.nix b/home-manager/progs/gpt4all/gpt4all.nix index 114f174..d496436 100644 --- a/home-manager/progs/gpt4all/gpt4all.nix +++ b/home-manager/progs/gpt4all/gpt4all.nix @@ -7,13 +7,13 @@ let models = [ rec { - name = "DeepSeek-R1-Distill-Qwen-14B-Q4_0"; + name = "DeepSeek-R1-Distill-Qwen-14B-IQ4_XS"; filename = builtins.elemAt (lib.splitString "?" src.name) 0; context_length = 32768; gen_length = 8192; src = pkgs.fetchurl { - url = "https://huggingface.co/bartowski/DeepSeek-R1-Distill-Qwen-14B-GGUF/resolve/main/DeepSeek-R1-Distill-Qwen-14B-Q4_0.gguf?download=true"; - sha256 = "906b3382f2680f4ce845459b4a122e904002b075238080307586bcffcde49eef"; + url = "https://huggingface.co/bartowski/DeepSeek-R1-Distill-Qwen-14B-GGUF/resolve/main/DeepSeek-R1-Distill-Qwen-14B-IQ4_XS.gguf?download=true"; + sha256 = "031b190e7aa81770b5d069de181dcfe4b284bf5d75fa12f82f5e54a3178adcfd"; }; } ]; diff --git a/home-manager/progs/helix.nix b/home-manager/progs/helix.nix index 3f5919e..74202c7 100644 --- a/home-manager/progs/helix.nix +++ b/home-manager/progs/helix.nix @@ -40,6 +40,10 @@ # modified fleet_dark theme my_theme = let + pastel-pink = "#c67C7E"; + + darkish-green = "#6B8D46"; + white = "#ffffff"; gray-120 = "#d1d1d1"; gray-110 = "#c2c2c2"; @@ -110,7 +114,10 @@ "constant.character" = yellow; "constant.character.escape" = cyan; "constant.numeric" = yellow; - "string" = pink; + + # string datatypes, also includes quoted attributes in nix + "string" = pastel-pink; + "string.regexp" = cyan; "string.special" = { fg = yellow; @@ -126,8 +133,13 @@ # "variable.other" = {} # .member "variable.other.member" = violet; "label" = yellow; - "keyword" = cyan; # .operator / .directive / .function + + # `keyword` in language, such as function declaration + "keyword" = darkish-green; + + # function name color when calling the function "function" = yellow; + "function.declaration" = "#EFEFEF"; "function.macro" = lime; "function.builtin" = lime; @@ -181,18 +193,22 @@ "ui.statusline" = { fg = gray-120; bg = gray-20; - }; # .inactive / .normal / .insert / .select + }; + # NOR "ui.statusline.normal" = { fg = gray-120; bg = gray-20; }; + # inactive "ui.statusline.inactive" = { fg = gray-90; }; + # INS "ui.statusline.insert" = { fg = gray-20; bg = blue-90; }; + # SEL "ui.statusline.select" = { fg = gray-20; bg = yellow-60; @@ -200,27 +216,38 @@ "ui.cursor" = { modifiers = [ "reversed" ]; - }; # .insert / .select / .match / .primary + }; + + # .insert / .select / .match / .primary "ui.cursor.match" = { bg = blue-30; - }; # .insert / .select / .match / .primary + }; + # .insert / .select / .match / .primary "ui.selection" = { bg = gray-50; - }; # .primary + }; + + # actual selection of text via visual mode or cursor (or search?) "ui.selection.primary" = { - bg = blue-40; + bg = blue-20; }; "ui.cursorline" = { bg = gray-15; }; - "ui.linenr" = gray-70; - "ui.linenr.selected" = gray-110; + # line numbers + "ui.linenr" = yellow-30; + + # line number of currently selected line + "ui.linenr.selected" = yellow-50; + + # .info # .nor "ui.popup" = { fg = gray-120; bg = gray-20; - }; # .info + }; + "ui.window" = { fg = gray-50; }; @@ -228,20 +255,25 @@ fg = gray-120; bg = gray-20; }; + "ui.menu" = { fg = gray-120; bg = gray-20; - }; # .selected + }; + + #.selected "ui.menu.selected" = { fg = white; bg = blue-40; - }; # .selected + }; + # Calculated as #ffffff with 30% opacity "ui.menu.scroll" = { fg = "#dfdfdf"; }; - "ui.text" = gray-120; # .focus / .info + "ui.text" = gray-120; + # .focus / .info "ui.text.focus" = { fg = white; bg = blue-40; diff --git a/home-manager/progs/niri.nix b/home-manager/progs/niri.nix index 0e8a971..b11b89d 100644 --- a/home-manager/progs/niri.nix +++ b/home-manager/progs/niri.nix @@ -137,6 +137,12 @@ "down" ]; + # color picker and copies to clipboard + "Mod+Ctrl+Alt+C".action = spawn [ + "${pkgs.hyprpicker}/bin/hyprpicker" + "-za" + ]; + # "Framework" key (F12) # "XF86AudioMedia".action = spawn []; diff --git a/home-manager/system-mreow.nix b/home-manager/system-mreow.nix index be8dff3..9b4bcab 100644 --- a/home-manager/system-mreow.nix +++ b/home-manager/system-mreow.nix @@ -54,10 +54,9 @@ programs.borgmatic = { enable = true; package = pkgs.borgmatic; - backups = - let - borgPasswordFile = config.age.secrets.borg-laptop-password.path; - in - import ./progs/borg.nix { inherit homeDirectory borgPasswordFile; }; + backups = import ./progs/borg.nix { + borgPasswordFile = config.age.secrets.borg-laptop-password.path; + inherit homeDirectory; + }; }; } From 0331d258ceb54760314afbd8995e0d8daeeec2bb Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 7 Feb 2025 22:29:57 -0500 Subject: [PATCH 114/724] update --- etcnixos/flake.lock | 36 +++++++++---------- etcnixos/vm.nix | 19 +++++----- home-manager/flake.lock | 36 +++++++++---------- home-manager/flake.nix | 2 +- home-manager/no-gui.nix | 7 ++-- .../eww/config/scripts/sound/getVolume.sh | 4 +-- home-manager/progs/eww/config/statusbar.yuck | 2 +- home-manager/progs/gpt4all/gpt4all.nix | 30 ++++++++++------ home-manager/progs/rss.nix | 5 +++ 9 files changed, 79 insertions(+), 62 deletions(-) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 9c0a390..cd51b4f 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -34,11 +34,11 @@ ] }, "locked": { - "lastModified": 1738707394, - "narHash": "sha256-XXrOqNs9a4L6p6/KXxIGotHOxzjPxva1queN3JK0E4c=", + "lastModified": 1738869872, + "narHash": "sha256-lN1HkC+NXxlO5eGFjVWVkedObBoBCWPhAMucHH0/ck8=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "236da2b18bfbddf782f85ee664fdfb9d50606229", + "rev": "eeb2fd1d5c96ec9755dba4ccd3d22802444cb55f", "type": "github" }, "original": { @@ -94,11 +94,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1738477724, - "narHash": "sha256-S1x0F7q9cJ6EEmZsakse2Ps6Adi7NadxRtGiuWUlwT0=", + "lastModified": 1738823732, + "narHash": "sha256-1NnSYno8qRN5zBF7xhaOn1WmC52qKBh7tEuRaDRFuMs=", "owner": "nix-community", "repo": "fenix", - "rev": "1936bb37b1d8597273e3611873dc09dd61b09818", + "rev": "17bbc481e3d0cb52a605dd9316043c66ceaa17d7", "type": "github" }, "original": { @@ -209,11 +209,11 @@ ] }, "locked": { - "lastModified": 1738448366, - "narHash": "sha256-4ATtQqBlgsGqkHTemta0ydY6f7JBRXz4Hf574NHQpkg=", + "lastModified": 1738841109, + "narHash": "sha256-sEgE3nifaRU5gfAx33ds0tx/j+qM0/5/bHopv/w6c0c=", "owner": "nix-community", "repo": "home-manager", - "rev": "18fa9f323d8adbb0b7b8b98a8488db308210ed93", + "rev": "f99c704fe3a4cf8d72b2d568ec80bc38be1a9407", "type": "github" }, "original": { @@ -231,11 +231,11 @@ ] }, "locked": { - "lastModified": 1738478597, - "narHash": "sha256-it7lc+HRSQiLV+3CcA+c6fkr2355HyT2GGUowHdfa/E=", + "lastModified": 1738656811, + "narHash": "sha256-z7Dzz713ueSQJYSdsWcH+D7o2pbq/sAl7/nBxru5oNA=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "77fb0818cb42ca0db98839d47bbc6a317c286282", + "rev": "cd9caf9afb1c8fe848f140a7831fe462b73df91a", "type": "github" }, "original": { @@ -310,11 +310,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1738680400, - "narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=", + "lastModified": 1738824222, + "narHash": "sha256-U3SNq+waitGIotmgg/Et3J7o4NvUtP2gb2VhME5QXiw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "799ba5bffed04ced7067a91798353d360788b30d", + "rev": "550e11f27ba790351d390d9eca3b80ad0f0254e7", "type": "github" }, "original": { @@ -379,11 +379,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1738433753, - "narHash": "sha256-lyhEsEf5FQzV+KHVkfxIApMOFWHqyls5+llcQ/uhV6Y=", + "lastModified": 1738754241, + "narHash": "sha256-hiw8wVE2tTrLPtIz1xSbJ3eEXCOx729kRq7UpMRTaU0=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "88b901878e684e4f68f104fdbc48749f41bcccd3", + "rev": "ca47cddc31ae76a05e8709ed4aec805c5ef741d3", "type": "github" }, "original": { diff --git a/etcnixos/vm.nix b/etcnixos/vm.nix index 11fa51c..3ed65c6 100644 --- a/etcnixos/vm.nix +++ b/etcnixos/vm.nix @@ -61,14 +61,13 @@ 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="; - # }; - # } - # ]; - + 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="; + }; + } + ]; } diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 8335f8b..4c03aa9 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -79,11 +79,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1738835520, - "narHash": "sha256-qvaWZ3PDJ0MC7t0wD8MdoGdVnMu0ps/ZWCXGepCFo5s=", + "lastModified": 1738958180, + "narHash": "sha256-I1BUQ6qbXg0vZMffrdD/dV/1R+YMBVySgSk3fA9snf8=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "4e72debdb5675b41278ddd492168b6c9c9ed09a0", + "rev": "eaf57f2dbdd448d541bda6049ce99aab070f0db1", "type": "github" }, "original": { @@ -112,11 +112,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1738827003, - "narHash": "sha256-s3bBfzPRRWybVSzRYStIwQxSOH5/9kR0Kfqi4IsvG7E=", + "lastModified": 1738911818, + "narHash": "sha256-7bhr9ldHrNP71qOmKI1Hu80uclx+Tco0RNmO+GKtC1Y=", "owner": "YaLTeR", "repo": "niri", - "rev": "b31c0359ebce114ae2f9b4e5df3dc37a93f5115e", + "rev": "397e704d644d1bfe7736f2fdacbfe5742c7b2f9f", "type": "github" }, "original": { @@ -127,11 +127,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1738680400, - "narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=", + "lastModified": 1738824222, + "narHash": "sha256-U3SNq+waitGIotmgg/Et3J7o4NvUtP2gb2VhME5QXiw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "799ba5bffed04ced7067a91798353d360788b30d", + "rev": "550e11f27ba790351d390d9eca3b80ad0f0254e7", "type": "github" }, "original": { @@ -143,11 +143,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1738702386, - "narHash": "sha256-nJj8f78AYAxl/zqLiFGXn5Im1qjFKU8yBPKoWEeZN5M=", + "lastModified": 1738843498, + "narHash": "sha256-7x+Q4xgFj9UxZZO9aUDCR8h4vyYut4zPUvfj3i+jBHE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "030ba1976b7c0e1a67d9716b17308ccdab5b381e", + "rev": "f5a32fa27df91dfc4b762671a0e0a859a8a0058f", "type": "github" }, "original": { @@ -174,11 +174,11 @@ ] }, "locked": { - "lastModified": 1738808867, - "narHash": "sha256-m5rbY/ck0NAlfSBxo++vl7EZn8fkZ02H3kGGc7q883c=", + "lastModified": 1738981474, + "narHash": "sha256-YIELTXxfATG0g1wXjyaOWA4qrlubds3MG4FvMPCxSGg=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ae46f37fb727030ddc2ef65a675b751484c90032", + "rev": "5c571e5ff246d8fc5f76ba6e38dc8edb6e4002fe", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1738880187, - "narHash": "sha256-1RieTOf8k5WQDMUpk2y24jmCUGS5Z8vyVb1xOaZu6cc=", + "lastModified": 1738951757, + "narHash": "sha256-I0Bmxpjid9m7Gg+z2HVASlpQpKzR7QJq5X8b9wCZFVY=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "6449d5cd3ddd3e21650ed2b80c59acfbb196fb2b", + "rev": "e2f657fb55f62fb57e614a1e22e9e667996f5234", "type": "github" }, "original": { diff --git a/home-manager/flake.nix b/home-manager/flake.nix index b7b6b1b..f67e714 100644 --- a/home-manager/flake.nix +++ b/home-manager/flake.nix @@ -68,7 +68,7 @@ patches = [ (builtins.fetchurl { url = "https://github.com/NixOS/nixpkgs/pull/372723.diff"; - sha256 = "039vr6xssic2bdkax440w9xfrvq8jrmm54xhsgpi93mnwj4m8fz1"; + sha256 = "0kfx5vzsssv40iffr7cfdik9mxa7fcg1489i578vqsgcz230fhaf"; }) ]; }) { } diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 20bfcc5..d6598d9 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -118,7 +118,8 @@ ] )) - binwalk + # dep fails to build + # binwalk smartmontools @@ -131,7 +132,9 @@ # clang-format and clang-tidy clang-tools clang - lldb + + # broken + # lldb fio diff --git a/home-manager/progs/eww/config/scripts/sound/getVolume.sh b/home-manager/progs/eww/config/scripts/sound/getVolume.sh index 49cb8e1..8a9d10a 100755 --- a/home-manager/progs/eww/config/scripts/sound/getVolume.sh +++ b/home-manager/progs/eww/config/scripts/sound/getVolume.sh @@ -1,5 +1,5 @@ -#!/usr/bin/env sh -count=$(wpctl get-volume @DEFAULT_SINK@ | sed 's/Volume: //g' | sed -E 's/0\.0?//g') +#!/usr/bin/env bash +count=$(wpctl get-volume @DEFAULT_SINK@ | cut -d' ' -f2- | sed -E 's/\.//g' | sed 's/^0*//g') color="green" if ((count > 75)); then color="yellow"; fi if ((count > 90)); then color="peach"; fi diff --git a/home-manager/progs/eww/config/statusbar.yuck b/home-manager/progs/eww/config/statusbar.yuck index 3e3e440..6a35df3 100644 --- a/home-manager/progs/eww/config/statusbar.yuck +++ b/home-manager/progs/eww/config/statusbar.yuck @@ -130,7 +130,7 @@ (defwidget volume [] (eventbox :tooltip volumesink :onclick `pwvucontrol &` - (label :text "${volumevalue.count}%" :class {volumevalue.color}))) + (label :text "${volumevalue.count}" :class {volumevalue.color}))) (defpoll currentworkspace :interval "1s" `scripts/currentWorkspace.fish`) diff --git a/home-manager/progs/gpt4all/gpt4all.nix b/home-manager/progs/gpt4all/gpt4all.nix index d496436..36a60b3 100644 --- a/home-manager/progs/gpt4all/gpt4all.nix +++ b/home-manager/progs/gpt4all/gpt4all.nix @@ -8,11 +8,11 @@ let models = [ rec { name = "DeepSeek-R1-Distill-Qwen-14B-IQ4_XS"; - filename = builtins.elemAt (lib.splitString "?" src.name) 0; - context_length = 32768; - gen_length = 8192; + 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?download=true"; + url = "https://huggingface.co/bartowski/DeepSeek-R1-Distill-Qwen-14B-GGUF/resolve/main/DeepSeek-R1-Distill-Qwen-14B-IQ4_XS.gguf"; sha256 = "031b190e7aa81770b5d069de181dcfe4b284bf5d75fa12f82f5e54a3178adcfd"; }; } @@ -34,7 +34,8 @@ let ] ); - system_prompt = ""; + system_prompt = "You are a helpful and harmless assistant. You should think step-by-step."; + chat_name_prompt = "Make a 3 word headline for this conversation"; in { home.packages = [ @@ -48,16 +49,12 @@ in '' [General] chatTheme=Dark - height=940 suggestionMode=Off threadCount=8 userDefaultModel=${ # select the first element of `models` to be the default model (builtins.elemAt models 0).name } - width=1472 - x=0 - y=0 [download] lastVersionStarted=${gpt4all_package.version} @@ -68,8 +65,9 @@ in filename=${model.filename} maxLength=${builtins.toString model.gen_length} promptBatchSize=256 + chatNamePrompt=${chat_name_prompt} systemMessage="${ - # replace newlines with the string "\n" for gpt4all to properly parse + # replace newlines with the string literal "\n" for gpt4all to properly parse builtins.replaceStrings [ "\n" ] [ "\\n" ] system_prompt }" '') models) @@ -78,6 +76,18 @@ in [network] isActive=false usageStatsActive=false + + [localdocs] + fileExtensions=${ + lib.concatStringsSep ", " [ + "docx" + "pdf" + "txt" + "md" + "rst" + "rs" + ] + } ''; } ( diff --git a/home-manager/progs/rss.nix b/home-manager/progs/rss.nix index 8add383..098ed00 100644 --- a/home-manager/progs/rss.nix +++ b/home-manager/progs/rss.nix @@ -73,4 +73,9 @@ title = "lwn"; url = "https://lwn.net/headlines/Features"; } + + { + title = "Jellyfin Blog"; + url = "https://jellyfin.org/posts/rss.xml"; + } ] From 94225a3eed6ca9642fbda69b3aaf6cdb90f11441 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 7 Feb 2025 22:35:51 -0500 Subject: [PATCH 115/724] fix link in README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8b82b95..9259409 100644 --- a/README.md +++ b/README.md @@ -19,4 +19,4 @@ WM: [niri](https://github.com/YaLTeR/niri) (KDE on my desktop) There is more that I'm using, but those are the main ones! Read my configs to get more into the specifics. ### 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 + - 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 From 2faae6236c8abc2c7a5dad6862675122624f6ada Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 10 Feb 2025 20:33:33 -0500 Subject: [PATCH 116/724] tmp --- .gitattributes | 1 + etcnixos/common.nix | 17 ++-- etcnixos/flake.lock | 42 +++++----- etcnixos/flake.nix | 5 ++ etcnixos/hardware_laptop.nix | 79 ++++++++++++++---- etcnixos/secrets/disk-password | Bin 0 -> 71 bytes ...primary-password.age => password-hash.age} | Bin etcnixos/secrets/secrets.nix | 2 +- etcnixos/system-mreow.nix | 28 +++---- etcnixos/vm.nix | 18 ++-- home-manager/flake.lock | 42 +++++----- home-manager/flake.nix | 13 +-- home-manager/gui.nix | 2 - home-manager/no-gui.nix | 15 ++-- .../eww/config/scripts/currentWindow.fish | 10 ++- .../eww/config/scripts/sound/getVolume.sh | 23 ++++- home-manager/progs/niri.nix | 8 +- 17 files changed, 191 insertions(+), 114 deletions(-) create mode 100644 etcnixos/secrets/disk-password rename etcnixos/secrets/{primary-password.age => password-hash.age} (100%) diff --git a/.gitattributes b/.gitattributes index 77298d2..47a3161 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,4 @@ 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 diff --git a/etcnixos/common.nix b/etcnixos/common.nix index 9524adb..d6a41d8 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -17,6 +17,7 @@ inputs.agenix.nixosModules.default inputs.nixos-hardware.nixosModules.common-pc-ssd inputs.chaotic.nixosModules.default + inputs.disko.nixosModules.disko ]; nixpkgs.config.allowUnfreePredicate = @@ -48,8 +49,8 @@ # kernel options boot = { - kernelPackages = pkgs.linuxPackages_cachyos-lto; - # kernelPackages = pkgs.linuxPackages_latest; + # kernelPackages = pkgs.linuxPackages_cachyos-lto; + kernelPackages = pkgs.linuxPackages_latest; kernel.sysctl = { # dmesg shushhhhh @@ -167,9 +168,9 @@ pulse.enable = true; }; - age.secrets.primary-password = { - file = ./secrets/primary-password.age; - path = "/etc/secrets/primary-password"; + age.secrets.password-hash = { + file = ./secrets/password-hash.age; + path = "/tmp/password-hash-secret"; }; # Define my user account (the rest of the configuration if found in `~/.config/home-manager/...`) @@ -182,7 +183,7 @@ "camera" "adbusers" ]; - hashedPasswordFile = config.age.secrets.primary-password.path; + hashedPasswordFile = config.age.secrets.password-hash.path; }; services.gvfs.enable = true; @@ -224,6 +225,9 @@ libmtp man-pages man-pages-posix + + # https://github.com/chaotic-cx/nyx/issues/972 + # config.boot.kernelPackages.perf ]; # wayland with electron/chromium applications @@ -246,5 +250,4 @@ documentation.enable = true; documentation.man.enable = true; documentation.dev.enable = true; - } diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index cd51b4f..732ac57 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -34,11 +34,11 @@ ] }, "locked": { - "lastModified": 1738869872, - "narHash": "sha256-lN1HkC+NXxlO5eGFjVWVkedObBoBCWPhAMucHH0/ck8=", + "lastModified": 1739212779, + "narHash": "sha256-7U7fOAOVy/AaOtw3HflnwEeXZJ9+ldxVU/Mx5tGN9A4=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "eeb2fd1d5c96ec9755dba4ccd3d22802444cb55f", + "rev": "175a7f545d07bd08c14709f0d0849a8cddaaf460", "type": "github" }, "original": { @@ -94,11 +94,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1738823732, - "narHash": "sha256-1NnSYno8qRN5zBF7xhaOn1WmC52qKBh7tEuRaDRFuMs=", + "lastModified": 1739082714, + "narHash": "sha256-cylMa750pId3Hqvzyurd86qJIYyyMWB0M7Gbh7ZB2tY=", "owner": "nix-community", "repo": "fenix", - "rev": "17bbc481e3d0cb52a605dd9316043c66ceaa17d7", + "rev": "e84058a7fe56aa01f2db19373cce190098494698", "type": "github" }, "original": { @@ -209,11 +209,11 @@ ] }, "locked": { - "lastModified": 1738841109, - "narHash": "sha256-sEgE3nifaRU5gfAx33ds0tx/j+qM0/5/bHopv/w6c0c=", + "lastModified": 1739051380, + "narHash": "sha256-p1QSLO8DJnANY+ppK7fjD8GqfCrEIDjso1CSRHsXL7Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "f99c704fe3a4cf8d72b2d568ec80bc38be1a9407", + "rev": "5af1b9a0f193ab6138b89a8e0af8763c21bbf491", "type": "github" }, "original": { @@ -231,11 +231,11 @@ ] }, "locked": { - "lastModified": 1738656811, - "narHash": "sha256-z7Dzz713ueSQJYSdsWcH+D7o2pbq/sAl7/nBxru5oNA=", + "lastModified": 1738875499, + "narHash": "sha256-P3VbO2IkEW+0d0pJU7CuX8e+obSoiDw/YCVL1mnA26w=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "cd9caf9afb1c8fe848f140a7831fe462b73df91a", + "rev": "4642ec1073a7417e6303484d8f2e7d29dc24a50f", "type": "github" }, "original": { @@ -256,11 +256,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1737639419, - "narHash": "sha256-AEEDktApTEZ5PZXNDkry2YV2k6t0dTgLPEmAZbnigXU=", + "lastModified": 1739186342, + "narHash": "sha256-2j+sln9RwQn+g7J4GmdFFgvqXnLkvWBNMaUzONlkzUE=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "a65905a09e2c43ff63be8c0e86a93712361f871e", + "rev": "3bdeebbc484a09391c4f0ec8a37bb77809426660", "type": "github" }, "original": { @@ -310,11 +310,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1738824222, - "narHash": "sha256-U3SNq+waitGIotmgg/Et3J7o4NvUtP2gb2VhME5QXiw=", + "lastModified": 1739020877, + "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "550e11f27ba790351d390d9eca3b80ad0f0254e7", + "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", "type": "github" }, "original": { @@ -379,11 +379,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1738754241, - "narHash": "sha256-hiw8wVE2tTrLPtIz1xSbJ3eEXCOx729kRq7UpMRTaU0=", + "lastModified": 1738997488, + "narHash": "sha256-jeNdFVtEDLypGIbNqBjURovfw9hMkVtlLR7j/5fRh54=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "ca47cddc31ae76a05e8709ed4aec805c5ef741d3", + "rev": "208bc52b5dc177badc081c64eb0584a313c73242", "type": "github" }, "original": { diff --git a/etcnixos/flake.nix b/etcnixos/flake.nix index 3fc0e98..e890630 100644 --- a/etcnixos/flake.nix +++ b/etcnixos/flake.nix @@ -20,6 +20,11 @@ url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; inputs.nixpkgs.follows = "nixpkgs"; }; + + disko = { + url = "github:nix-community/disko/latest"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = diff --git a/etcnixos/hardware_laptop.nix b/etcnixos/hardware_laptop.nix index 0a492ea..15c3b94 100644 --- a/etcnixos/hardware_laptop.nix +++ b/etcnixos/hardware_laptop.nix @@ -15,25 +15,70 @@ boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = { - device = "/dev/disk/by-uuid/acbd96e3-e7c7-442d-82cc-ce2913a9e90c"; - fsType = "btrfs"; - options = [ - "subvol=@" - "compress=zstd" - "autodefrag" - "noatime" - "space_cache=v2" - "discard" - ]; - }; + # fileSystems."/" = { + # device = "/dev/disk/by-uuid/acbd96e3-e7c7-442d-82cc-ce2913a9e90c"; + # fsType = "btrfs"; + # options = [ + # "subvol=@" + # "compress=zstd" + # "autodefrag" + # "noatime" + # "space_cache=v2" + # "discard" + # ]; + # }; - boot.initrd.luks.devices."luks-0f481d5f-528c-4838-bd8a-d2780b4ba234".device = - "/dev/disk/by-uuid/0f481d5f-528c-4838-bd8a-d2780b4ba234"; + # boot.initrd.luks.devices."luks-0f481d5f-528c-4838-bd8a-d2780b4ba234".device = + # "/dev/disk/by-uuid/0f481d5f-528c-4838-bd8a-d2780b4ba234"; + + # fileSystems."/boot" = { + # device = "/dev/disk/by-uuid/4D19-520E"; + # fsType = "vfat"; + # }; + + disko.devices = { + disk = { + main = { + type = "disk"; + device = "/dev/disk/by-path/pci-0000:01:00.0-nvme-1"; + content = { + type = "gpt"; + partitions = { + ESP = { + size = "512M"; + type = "EF00"; + content = { + type = "filesystem"; + format = "vfat"; + mountpoint = "/boot"; + mountOptions = [ "umask=0077" ]; + }; + }; + luks = { + size = "100%"; + content = { + type = "luks"; + name = "crypted"; + passwordFile = "${./secrets/disk-password}"; + content = { + type = "filesystem"; + format = "f2fs"; + mountpoint = "/"; + extraArgs = [ + "-O" + "extra_attr,inode_checksum,sb_checksum,compression" + ]; + mountOptions = [ + "compress_algorithm=zstd:6,compress_chksum,atgc,gc_merge,lazytime,nodiscard" + ]; + }; + }; + }; + }; + }; + }; + }; - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/4D19-520E"; - fsType = "vfat"; }; swapDevices = [ ]; diff --git a/etcnixos/secrets/disk-password b/etcnixos/secrets/disk-password new file mode 100644 index 0000000000000000000000000000000000000000..3ccd08d75bfacbba95fcde96e9476f7a60d948c5 GIT binary patch literal 71 zcmZQ@_Y83kiVO&0V0&PzxPK9&)YOMZ_7pzLoXWoD;PscfiYr3eg6|92{B6Ipzxa}2 e-`myOISyLaf4sY7WBBg>(#s#;lfBK)s0#pr03zoA literal 0 HcmV?d00001 diff --git a/etcnixos/secrets/primary-password.age b/etcnixos/secrets/password-hash.age similarity index 100% rename from etcnixos/secrets/primary-password.age rename to etcnixos/secrets/password-hash.age diff --git a/etcnixos/secrets/secrets.nix b/etcnixos/secrets/secrets.nix index 2aa18e7..a929fec 100644 --- a/etcnixos/secrets/secrets.nix +++ b/etcnixos/secrets/secrets.nix @@ -11,6 +11,6 @@ in ]; }) [ - "primary-password.age" + "password-hash.age" ] )) diff --git a/etcnixos/system-mreow.nix b/etcnixos/system-mreow.nix index 49d1077..eae2370 100644 --- a/etcnixos/system-mreow.nix +++ b/etcnixos/system-mreow.nix @@ -58,10 +58,10 @@ }; boot = { - lanzaboote = { - enable = true; - pkiBundle = "/etc/secureboot"; - }; + # lanzaboote = { + # enable = true; + # pkiBundle = "/etc/secureboot"; + # }; # Bootloader. loader = { @@ -71,7 +71,7 @@ generated at installation time. So we force it to false for now. */ - systemd-boot.enable = lib.mkForce false; + # systemd-boot.enable = lib.mkForce false; }; kernelParams = [ @@ -110,15 +110,15 @@ # if I move to another lock screen program, i will have to replace `swaylock` security.pam.services.swaylock = { }; - system.activationScripts = { - # extract all my secureboot keys - "secureboot-keys".text = '' - #!/bin/sh - rm -fr ${config.boot.lanzaboote.pkiBundle} || true - mkdir -p ${config.boot.lanzaboote.pkiBundle} - ${pkgs.gnutar}/bin/tar xf ${./secrets/secureboot.tar} -C ${config.boot.lanzaboote.pkiBundle} - ''; - }; + # system.activationScripts = { + # # extract all my secureboot keys + # "secureboot-keys".text = '' + # #!/bin/sh + # rm -fr ${config.boot.lanzaboote.pkiBundle} || true + # mkdir -p ${config.boot.lanzaboote.pkiBundle} + # ${pkgs.gnutar}/bin/tar xf ${./secrets/secureboot.tar} -C ${config.boot.lanzaboote.pkiBundle} + # ''; + # }; # disable framework kernel module # https://github.com/NixOS/nixos-hardware/issues/1330 diff --git a/etcnixos/vm.nix b/etcnixos/vm.nix index 3ed65c6..3098081 100644 --- a/etcnixos/vm.nix +++ b/etcnixos/vm.nix @@ -61,13 +61,13 @@ 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="; - }; - } - ]; + # 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="; + # }; + # } + # ]; } diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 4c03aa9..9588717 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1738878603, - "narHash": "sha256-fmhq8B3MvQLawLbMO+LWLcdC2ftLMmwSk+P29icJ3tE=", + "lastModified": 1739226747, + "narHash": "sha256-uO80xwFP2sjL8qWhwplxD6GcadHbbLs5ph2CFPNh8pI=", "owner": "nix-community", "repo": "home-manager", - "rev": "433799271274c9f2ab520a49527ebfe2992dcfbd", + "rev": "a3c9e88177f0dc4a2662b5324572425f59129f11", "type": "github" }, "original": { @@ -79,11 +79,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1738958180, - "narHash": "sha256-I1BUQ6qbXg0vZMffrdD/dV/1R+YMBVySgSk3fA9snf8=", + "lastModified": 1739206396, + "narHash": "sha256-dfU3l47sxFQbqLe5R9um//V5hplv/MhSwsZJR7JzBrg=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "eaf57f2dbdd448d541bda6049ce99aab070f0db1", + "rev": "9f15e7ace2dea798ce3490d2f723095ad4cce0d4", "type": "github" }, "original": { @@ -112,11 +112,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1738911818, - "narHash": "sha256-7bhr9ldHrNP71qOmKI1Hu80uclx+Tco0RNmO+GKtC1Y=", + "lastModified": 1739201373, + "narHash": "sha256-6upEicgdJH3JaS1oXS+wsgLToU14XL8/aOyL2KcS3KY=", "owner": "YaLTeR", "repo": "niri", - "rev": "397e704d644d1bfe7736f2fdacbfe5742c7b2f9f", + "rev": "20769b4c2f843566880f020f117e7bde36edc332", "type": "github" }, "original": { @@ -127,11 +127,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1738824222, - "narHash": "sha256-U3SNq+waitGIotmgg/Et3J7o4NvUtP2gb2VhME5QXiw=", + "lastModified": 1739020877, + "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "550e11f27ba790351d390d9eca3b80ad0f0254e7", + "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", "type": "github" }, "original": { @@ -143,11 +143,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1738843498, - "narHash": "sha256-7x+Q4xgFj9UxZZO9aUDCR8h4vyYut4zPUvfj3i+jBHE=", + "lastModified": 1739055578, + "narHash": "sha256-2MhC2Bgd06uI1A0vkdNUyDYsMD0SLNGKtD8600mZ69A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f5a32fa27df91dfc4b762671a0e0a859a8a0058f", + "rev": "a45fa362d887f4d4a7157d95c28ca9ce2899b70e", "type": "github" }, "original": { @@ -174,11 +174,11 @@ ] }, "locked": { - "lastModified": 1738981474, - "narHash": "sha256-YIELTXxfATG0g1wXjyaOWA4qrlubds3MG4FvMPCxSGg=", + "lastModified": 1739154531, + "narHash": "sha256-QGeN6e0nMJlNLzm3Y2A7P6riXhQXMeCXLZ7yajZYFQM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "5c571e5ff246d8fc5f76ba6e38dc8edb6e4002fe", + "rev": "035dac86ab7ce5c1e8a4d59dfe85e6911a3526ea", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1738951757, - "narHash": "sha256-I0Bmxpjid9m7Gg+z2HVASlpQpKzR7QJq5X8b9wCZFVY=", + "lastModified": 1739161281, + "narHash": "sha256-cMM5E5EzEnfQFdBurCVqCi9mhsmRCeaEJB4iskPsQ1o=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "e2f657fb55f62fb57e614a1e22e9e667996f5234", + "rev": "0e962f036e6e2a9dde28f37d80104c7ea477a801", "type": "github" }, "original": { diff --git a/home-manager/flake.nix b/home-manager/flake.nix index f67e714..d70bbb4 100644 --- a/home-manager/flake.nix +++ b/home-manager/flake.nix @@ -61,18 +61,7 @@ } ); - pkgs = ( - import ((import nixpkgs { }).applyPatches { - name = "gpt4all 3.9.0 (PR #372723)"; - src = inputs.nixpkgs; - patches = [ - (builtins.fetchurl { - url = "https://github.com/NixOS/nixpkgs/pull/372723.diff"; - sha256 = "0kfx5vzsssv40iffr7cfdik9mxa7fcg1489i578vqsgcz230fhaf"; - }) - ]; - }) { } - ); + pkgs = (import nixpkgs { }); in { homeConfigurations."${username}" = home-manager.lib.homeManagerConfiguration { diff --git a/home-manager/gui.nix b/home-manager/gui.nix index 6432670..2c8f9b0 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -92,8 +92,6 @@ # freecad-wayland puddletag - epiphany - mcaselector wireshark diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index d6598d9..55b91ad 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -152,13 +152,18 @@ lsof tcpdump + + cargo-flamegraph + + borgbackup ]; - # home.file.".cargo/config.toml".text = '' - # [target.${lib.strings.removeSuffix "-linux" pkgs.system}-unknown-linux-gnu] - # linker = "${pkgs.clang}/bin/clang" - # rustflags = ["-C", "link-arg=-fuse-ld=${pkgs.mold}/bin/mold"] - # ''; + # https://github.com/flamegraph-rs/flamegraph + home.file.".cargo/config.toml".text = '' + [target.${lib.strings.removeSuffix "-linux" pkgs.system}-unknown-linux-gnu] + linker = "${pkgs.clang}/bin/clang" + rustflags = ["-Clink-arg=-Wl,--no-rosegment"] + ''; # default applications home.sessionVariables = { diff --git a/home-manager/progs/eww/config/scripts/currentWindow.fish b/home-manager/progs/eww/config/scripts/currentWindow.fish index e8df299..4addf02 100755 --- a/home-manager/progs/eww/config/scripts/currentWindow.fish +++ b/home-manager/progs/eww/config/scripts/currentWindow.fish @@ -1,2 +1,10 @@ #!/usr/bin/env fish -niri msg focused-window | rg Title | sed -E "s/[[:space:]]+Title\: //g" | sed "s/\"//g" | head -c 55 +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" diff --git a/home-manager/progs/eww/config/scripts/sound/getVolume.sh b/home-manager/progs/eww/config/scripts/sound/getVolume.sh index 8a9d10a..e5a44ab 100755 --- a/home-manager/progs/eww/config/scripts/sound/getVolume.sh +++ b/home-manager/progs/eww/config/scripts/sound/getVolume.sh @@ -1,8 +1,27 @@ #!/usr/bin/env bash -count=$(wpctl get-volume @DEFAULT_SINK@ | cut -d' ' -f2- | sed -E 's/\.//g' | sed 's/^0*//g') +output=$(wpctl get-volume @DEFAULT_SINK@ | cut -d' ' -f2- | sed -E 's/\.//g' | sed 's/^0*//g') +count=$(echo "$output" | cut -d' ' -f1) +muted=$(echo "$output" | cut -d'[' -f2 | cut -d ']' -f1) + +# if not muted, set to empty string +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 if ((count > 100)); then color="maroon"; fi if ((count > 110)); then color="red"; fi -echo "{\"count\":\"${count}\", \"color\":\"${color}\"}" + +output="${count}%" +if [ "$muted" != "" ]; then + output="${output} [${muted}]" +fi + +echo "{\"count\":\"${output}\", \"color\":\"${color}\"}" diff --git a/home-manager/progs/niri.nix b/home-manager/progs/niri.nix index b11b89d..9748dc5 100644 --- a/home-manager/progs/niri.nix +++ b/home-manager/progs/niri.nix @@ -9,6 +9,12 @@ settings = { prefer-no-csd = true; + input = { + touchpad = { + scroll-factor = 0.4; + }; + }; + environment = { DISPLAY = ":0"; }; @@ -39,8 +45,6 @@ }; spawn-at-startup = [ - # waybar (status bar) - # { command = [ "${pkgs.waybar}/bin/waybar" ]; } { command = [ "${config.programs.eww.package}/bin/eww" From 6cb6f177aa7b03e0a1245fa38d94f93bd607796d Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 10 Feb 2025 21:47:57 -0500 Subject: [PATCH 117/724] done --- .gitattributes | 1 + etcnixos/common.nix | 16 +++++++------- etcnixos/flake.lock | 22 +++++++++++++++++++ etcnixos/hardware_laptop.nix | 22 ------------------- etcnixos/secrets/password-hash | Bin 0 -> 96 bytes etcnixos/secrets/password-hash.age | Bin 544 -> 0 bytes etcnixos/secrets/secrets.nix | 16 -------------- etcnixos/system-mreow.nix | 33 ++++++++++++++++------------- etcnixos/util/untar.nix | 21 ++++++++++++++++++ home-manager/flake.lock | 12 +++++------ 10 files changed, 76 insertions(+), 67 deletions(-) create mode 100644 etcnixos/secrets/password-hash delete mode 100644 etcnixos/secrets/password-hash.age delete mode 100644 etcnixos/secrets/secrets.nix create mode 100644 etcnixos/util/untar.nix diff --git a/.gitattributes b/.gitattributes index 47a3161..94ff4d4 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2,3 +2,4 @@ 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 diff --git a/etcnixos/common.nix b/etcnixos/common.nix index d6a41d8..00e8319 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -126,7 +126,7 @@ ]; }; - age.identityPaths = [ "/home/${username}/.ssh/id_ed25519" ]; + # age.identityPaths = [ "/home/${username}/.ssh/id_ed25519" ]; # networking networking = import ./networking.nix { inherit hostname; }; @@ -168,11 +168,6 @@ pulse.enable = true; }; - age.secrets.password-hash = { - file = ./secrets/password-hash.age; - path = "/tmp/password-hash-secret"; - }; - # Define my user account (the rest of the configuration if found in `~/.config/home-manager/...`) users.users.${username} = { isNormalUser = true; @@ -183,7 +178,7 @@ "camera" "adbusers" ]; - hashedPasswordFile = config.age.secrets.password-hash.path; + hashedPasswordFile = "${./secrets/password-hash}"; }; services.gvfs.enable = true; @@ -216,7 +211,7 @@ dmidecode - (inputs.agenix.packages.${pkgs.system}.default.override { ageBin = "${pkgs.rage}/bin/rage"; }) + # (inputs.agenix.packages.${pkgs.system}.default.override { ageBin = "${pkgs.rage}/bin/rage"; }) doas-sudo-shim @@ -226,6 +221,11 @@ man-pages man-pages-posix + # needed for home-manager + git + + home-manager + # https://github.com/chaotic-cx/nyx/issues/972 # config.boot.kernelPackages.perf ]; diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 732ac57..6498007 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -85,6 +85,27 @@ "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": [ @@ -371,6 +392,7 @@ "inputs": { "agenix": "agenix", "chaotic": "chaotic", + "disko": "disko", "lanzaboote": "lanzaboote", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs" diff --git a/etcnixos/hardware_laptop.nix b/etcnixos/hardware_laptop.nix index 15c3b94..40f9c6d 100644 --- a/etcnixos/hardware_laptop.nix +++ b/etcnixos/hardware_laptop.nix @@ -15,27 +15,6 @@ boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; - # fileSystems."/" = { - # device = "/dev/disk/by-uuid/acbd96e3-e7c7-442d-82cc-ce2913a9e90c"; - # fsType = "btrfs"; - # options = [ - # "subvol=@" - # "compress=zstd" - # "autodefrag" - # "noatime" - # "space_cache=v2" - # "discard" - # ]; - # }; - - # boot.initrd.luks.devices."luks-0f481d5f-528c-4838-bd8a-d2780b4ba234".device = - # "/dev/disk/by-uuid/0f481d5f-528c-4838-bd8a-d2780b4ba234"; - - # fileSystems."/boot" = { - # device = "/dev/disk/by-uuid/4D19-520E"; - # fsType = "vfat"; - # }; - disko.devices = { disk = { main = { @@ -78,7 +57,6 @@ }; }; }; - }; swapDevices = [ ]; diff --git a/etcnixos/secrets/password-hash b/etcnixos/secrets/password-hash new file mode 100644 index 0000000000000000000000000000000000000000..ba58675676f3187f205fe24327d162cb95479437 GIT binary patch literal 96 zcmZQ@_Y83kiVO&0IB}@`@_hHEhbg^sD>)8&{0tVnoAl#Ufy?Yv=KA|i3_9QJkGuWW zTc@`3wExYxDPpB*&oT@JcnfZ<(keXF`$f){)8=K?{_bt*zK4=(9bPHU=i4~x`N6FK DI=?M& literal 0 HcmV?d00001 diff --git a/etcnixos/secrets/password-hash.age b/etcnixos/secrets/password-hash.age deleted file mode 100644 index ca3ac41dc9112abfb2e0b195d029f728beaeedd8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 544 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCUl$_b533{>!NEwJ>} z56MWcD9F#$chB>52?`6(i7fX@OG!#J3Dd7|HBJgn$t;X2_v9)KtI8~o$O;e5@Cgeu zaPc)yu`KrR^Got7^^bHmitupvEzT^-t|&{d$Vay=#lyubJy5~J)6?9&(#**)(yzoc zJGUUhI5EV?wJgc9B*`VqA}z`?)6c*#-7_<*%7UxXr82w3HLyIxH$2HdEvvM`v^Y6Z z+qAGSGt$M|B`hM(&od-4HQyk+I2&Y}uWou#YGQG!LWYGxL|{acLa0@;Teho$fsds& zSFTT#X|khhs<&x!q@PoGW=3XUka1N&P?)K?epOypNRV?{a9*iPWUhySS7kwBa7vJK zSY>&IfsvcJi;0oDA6L0)K#EyNNnmn#R+xX5XOebERYqB)fv2&FkA-%HtD|{wet~m& zg;`cnzN1;HVWM9km#(g^LWy&TWqv?zWpPQ4VNOVKdWLDPnO9&*VMRu|sX>l*M7l{( zXr)(>fw@OEmr(FopUIX?$LlK+94`5FdF{N&*P4~u&!7^?I@SBB7k}pgvGb9iF1^$GetS7e`pz*#M8z;={OLTpR5m)q#VT|9Q@1a3;{8`YTpP1=2gmA(dMg;Z Ua!SKnxmb&~bymkM=vuD>086*N@Bjb+ diff --git a/etcnixos/secrets/secrets.nix b/etcnixos/secrets/secrets.nix deleted file mode 100644 index a929fec..0000000 --- a/etcnixos/secrets/secrets.nix +++ /dev/null @@ -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 - ]; - }) - [ - "password-hash.age" - ] -)) diff --git a/etcnixos/system-mreow.nix b/etcnixos/system-mreow.nix index eae2370..651a37d 100644 --- a/etcnixos/system-mreow.nix +++ b/etcnixos/system-mreow.nix @@ -6,6 +6,10 @@ inputs, ... }: + +let + untar = pkgs.callPackage ./util/untar.nix; +in { imports = [ ./common.nix @@ -58,10 +62,11 @@ }; boot = { - # lanzaboote = { - # enable = true; - # pkiBundle = "/etc/secureboot"; - # }; + lanzaboote = { + enable = true; + # TODO: proper secrets management so this is not stored in nix store + pkiBundle = "${(untar { src = "${./secrets/secureboot.tar}"; })}"; + }; # Bootloader. loader = { @@ -71,7 +76,7 @@ generated at installation time. So we force it to false for now. */ - # systemd-boot.enable = lib.mkForce false; + systemd-boot.enable = lib.mkForce false; }; kernelParams = [ @@ -106,20 +111,18 @@ 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 = { }; - # system.activationScripts = { - # # extract all my secureboot keys - # "secureboot-keys".text = '' - # #!/bin/sh - # rm -fr ${config.boot.lanzaboote.pkiBundle} || true - # mkdir -p ${config.boot.lanzaboote.pkiBundle} - # ${pkgs.gnutar}/bin/tar xf ${./secrets/secureboot.tar} -C ${config.boot.lanzaboote.pkiBundle} - # ''; - # }; - # disable framework kernel module # https://github.com/NixOS/nixos-hardware/issues/1330 hardware.framework.enableKmod = false; diff --git a/etcnixos/util/untar.nix b/etcnixos/util/untar.nix new file mode 100644 index 0000000..f5bb304 --- /dev/null +++ b/etcnixos/util/untar.nix @@ -0,0 +1,21 @@ +{ + 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/ + ''; +} diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 9588717..942db7c 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1739226747, - "narHash": "sha256-uO80xwFP2sjL8qWhwplxD6GcadHbbLs5ph2CFPNh8pI=", + "lastModified": 1739233400, + "narHash": "sha256-fldFwXHP9Ndy/ADMDWNTpfWNsLdhZ8PP4DQyr1Igfo4=", "owner": "nix-community", "repo": "home-manager", - "rev": "a3c9e88177f0dc4a2662b5324572425f59129f11", + "rev": "ba4a1a110204c27805d1a1b5c8b24b3a0da4d063", "type": "github" }, "original": { @@ -174,11 +174,11 @@ ] }, "locked": { - "lastModified": 1739154531, - "narHash": "sha256-QGeN6e0nMJlNLzm3Y2A7P6riXhQXMeCXLZ7yajZYFQM=", + "lastModified": 1739240901, + "narHash": "sha256-YDtl/9w71m5WcZvbEroYoWrjECDhzJZLZ8E68S3BYok=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "035dac86ab7ce5c1e8a4d59dfe85e6911a3526ea", + "rev": "03473e2af8a4b490f4d2cdb2e4d3b75f82c8197c", "type": "github" }, "original": { From f3d8dcdc6e7ff105844450f5c4e74f075f47e41c Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 20 Feb 2025 10:08:10 -0500 Subject: [PATCH 118/724] fixes + dunst config stuff --- etcnixos/common.nix | 4 +-- etcnixos/flake.lock | 42 +++++++++++----------- etcnixos/no-rgb.nix | 4 +-- etcnixos/system-mreow.nix | 10 +++--- home-manager/flake.lock | 48 +++++++++++++------------- home-manager/gui.nix | 3 ++ home-manager/no-gui.nix | 2 +- home-manager/progs/dunst.nix | 30 ++++++++++++++++ home-manager/progs/fish.nix | 16 ++++----- home-manager/progs/gpt4all/gpt4all.nix | 13 ++++++- home-manager/progs/niri.nix | 7 ++-- home-manager/system-mreow.nix | 9 ++--- 12 files changed, 115 insertions(+), 73 deletions(-) create mode 100644 home-manager/progs/dunst.nix diff --git a/etcnixos/common.nix b/etcnixos/common.nix index 00e8319..76d1814 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -49,8 +49,8 @@ # kernel options boot = { - # kernelPackages = pkgs.linuxPackages_cachyos-lto; - kernelPackages = pkgs.linuxPackages_latest; + kernelPackages = pkgs.linuxPackages_cachyos-lto; + # kernelPackages = pkgs.linuxPackages_latest; kernel.sysctl = { # dmesg shushhhhh diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 6498007..35da617 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -34,11 +34,11 @@ ] }, "locked": { - "lastModified": 1739212779, - "narHash": "sha256-7U7fOAOVy/AaOtw3HflnwEeXZJ9+ldxVU/Mx5tGN9A4=", + "lastModified": 1740016447, + "narHash": "sha256-96hBRGwuG+CFI5+inRIDCh0Za4LOt1dlbO3pFOokw6Y=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "175a7f545d07bd08c14709f0d0849a8cddaaf460", + "rev": "ed7900391a1969bb0bde432fd3952a6dda37114c", "type": "github" }, "original": { @@ -115,11 +115,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1739082714, - "narHash": "sha256-cylMa750pId3Hqvzyurd86qJIYyyMWB0M7Gbh7ZB2tY=", + "lastModified": 1739946876, + "narHash": "sha256-ek0u5FT5yjqYKjF/0HQKwDH2ISZzyvYwu+My5hmSwbU=", "owner": "nix-community", "repo": "fenix", - "rev": "e84058a7fe56aa01f2db19373cce190098494698", + "rev": "95c1eab59767a3dbb11d6616d4ff736813ce41d2", "type": "github" }, "original": { @@ -230,11 +230,11 @@ ] }, "locked": { - "lastModified": 1739051380, - "narHash": "sha256-p1QSLO8DJnANY+ppK7fjD8GqfCrEIDjso1CSRHsXL7Y=", + "lastModified": 1739913864, + "narHash": "sha256-WhzgQjadrwnwPJQLLxZUUEIxojxa7UWDkf7raAkB1Lw=", "owner": "nix-community", "repo": "home-manager", - "rev": "5af1b9a0f193ab6138b89a8e0af8763c21bbf491", + "rev": "97ac0801d187b2911e8caa45316399de12f6f199", "type": "github" }, "original": { @@ -252,11 +252,11 @@ ] }, "locked": { - "lastModified": 1738875499, - "narHash": "sha256-P3VbO2IkEW+0d0pJU7CuX8e+obSoiDw/YCVL1mnA26w=", + "lastModified": 1739952453, + "narHash": "sha256-+tyFW6nNj1fJ1VTtLeqe1PMp5F7Fb9zIkT6mUvdQHrM=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "4642ec1073a7417e6303484d8f2e7d29dc24a50f", + "rev": "b2ed82d3ff837960df4518308dfe409dda3ae406", "type": "github" }, "original": { @@ -315,11 +315,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1738816619, - "narHash": "sha256-5yRlg48XmpcX5b5HesdGMOte+YuCy9rzQkJz+imcu6I=", + "lastModified": 1739798439, + "narHash": "sha256-GyipmjbbQEaosel/+wq1xihCKbv0/e1LU00x/8b/fP4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "2eccff41bab80839b1d25b303b53d339fbb07087", + "rev": "3e2ea8a49d4d76276b0f4e2041df8ca5c0771371", "type": "github" }, "original": { @@ -331,11 +331,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739020877, - "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", + "lastModified": 1739866667, + "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", + "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680", "type": "github" }, "original": { @@ -401,11 +401,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1738997488, - "narHash": "sha256-jeNdFVtEDLypGIbNqBjURovfw9hMkVtlLR7j/5fRh54=", + "lastModified": 1739913186, + "narHash": "sha256-7MSzs64dLDgq1wFw2eujZ01qdj9K+TwIlQMyWebotE8=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "208bc52b5dc177badc081c64eb0584a313c73242", + "rev": "3028f844c5898dcf115f6bc67a5ce793989b04a1", "type": "github" }, "original": { diff --git a/etcnixos/no-rgb.nix b/etcnixos/no-rgb.nix index 74f627a..5f876ca 100644 --- a/etcnixos/no-rgb.nix +++ b/etcnixos/no-rgb.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ pkgs, lib, ... }: { systemd.services.no-rgb = let @@ -27,7 +27,7 @@ { description = "disable rgb"; serviceConfig = { - ExecStart = "${no-rgb}/bin/${no-rgb.name}"; + ExecStart = "${lib.getExe no-rgb}"; Type = "oneshot"; }; wantedBy = [ "multi-user.target" ]; diff --git a/etcnixos/system-mreow.nix b/etcnixos/system-mreow.nix index 651a37d..394910d 100644 --- a/etcnixos/system-mreow.nix +++ b/etcnixos/system-mreow.nix @@ -19,12 +19,12 @@ in inputs.lanzaboote.nixosModules.lanzaboote ]; - hardware.framework.laptop13.audioEnhancement = { - enable = true; + # hardware.framework.laptop13.audioEnhancement = { + # enable = true; - # seems audio doesn't work without this - hideRawDevice = false; - }; + # # seems audio doesn't work without this + # hideRawDevice = false; + # }; services.tlp = { enable = true; diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 942db7c..82e4a8c 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1739233400, - "narHash": "sha256-fldFwXHP9Ndy/ADMDWNTpfWNsLdhZ8PP4DQyr1Igfo4=", + "lastModified": 1739992710, + "narHash": "sha256-9kEscmGnXHjSgcqyJR4TzzHhska4yz1inSQs6HuO9qU=", "owner": "nix-community", "repo": "home-manager", - "rev": "ba4a1a110204c27805d1a1b5c8b24b3a0da4d063", + "rev": "1c189f011447810af939a886ba7bee33532bb1f9", "type": "github" }, "original": { @@ -79,11 +79,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1739206396, - "narHash": "sha256-dfU3l47sxFQbqLe5R9um//V5hplv/MhSwsZJR7JzBrg=", + "lastModified": 1740045415, + "narHash": "sha256-dLg4Re8AdmlTYWu6FHR60cem9fErXnWXRJi6/Du5L3M=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "9f15e7ace2dea798ce3490d2f723095ad4cce0d4", + "rev": "a622f76d3f97ce289f2103b6999f80a3732d629b", "type": "github" }, "original": { @@ -112,11 +112,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1739201373, - "narHash": "sha256-6upEicgdJH3JaS1oXS+wsgLToU14XL8/aOyL2KcS3KY=", + "lastModified": 1740042509, + "narHash": "sha256-Yk1DXv4oRdbi2P8v4b7GV6wXJaAa5jOK0femtfxlGAg=", "owner": "YaLTeR", "repo": "niri", - "rev": "20769b4c2f843566880f020f117e7bde36edc332", + "rev": "8885233c7e036a1e279c09e4fd96c1a1669156c3", "type": "github" }, "original": { @@ -127,11 +127,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739020877, - "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", + "lastModified": 1739866667, + "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", + "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680", "type": "github" }, "original": { @@ -143,11 +143,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1739055578, - "narHash": "sha256-2MhC2Bgd06uI1A0vkdNUyDYsMD0SLNGKtD8600mZ69A=", + "lastModified": 1739923778, + "narHash": "sha256-BqUY8tz0AQ4to2Z4+uaKczh81zsGZSYxjgvtw+fvIfM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a45fa362d887f4d4a7157d95c28ca9ce2899b70e", + "rev": "36864ed72f234b9540da4cf7a0c49e351d30d3f1", "type": "github" }, "original": { @@ -174,11 +174,11 @@ ] }, "locked": { - "lastModified": 1739240901, - "narHash": "sha256-YDtl/9w71m5WcZvbEroYoWrjECDhzJZLZ8E68S3BYok=", + "lastModified": 1740018520, + "narHash": "sha256-mU6H0Q1WPn0XuwBO9SLZb/1yeVMfvsifBJcXNlhB+Ts=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "03473e2af8a4b490f4d2cdb2e4d3b75f82c8197c", + "rev": "7f6ecf3b7c5bfcc4730943a767630122efd09dc8", "type": "github" }, "original": { @@ -222,11 +222,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1737837494, - "narHash": "sha256-wIMowP8Juas4ZwMRcpc+58sZ0kKTDu8fm13THPmv/F8=", + "lastModified": 1739246919, + "narHash": "sha256-/hBM43/Gd0/tW+egrhlWgOIISeJxEs2uAOIYVpfDKeU=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "3944c9a0e40e5629f16ad023bbc90dac80d35a0f", + "rev": "44590a416d4a3e8220e19e29e0b6efe64a80315d", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1739161281, - "narHash": "sha256-cMM5E5EzEnfQFdBurCVqCi9mhsmRCeaEJB4iskPsQ1o=", + "lastModified": 1739667343, + "narHash": "sha256-fNEz+Yd0t9jXz27qKRMAEBradTwYBeBLOECx+ydG25s=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "0e962f036e6e2a9dde28f37d80104c7ea477a801", + "rev": "8c7f6ca49f87b4e114f775a4dad956ceb6df4220", "type": "github" }, "original": { diff --git a/home-manager/gui.nix b/home-manager/gui.nix index 2c8f9b0..2840f29 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -113,9 +113,12 @@ wl-screenrec gimp + pinta # wayland-compatible color picker hyprpicker + + blender ] ++ (builtins.filter lib.isDerivation (builtins.attrValues nerd-fonts)); diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 55b91ad..e5da856 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -161,7 +161,7 @@ # https://github.com/flamegraph-rs/flamegraph home.file.".cargo/config.toml".text = '' [target.${lib.strings.removeSuffix "-linux" pkgs.system}-unknown-linux-gnu] - linker = "${pkgs.clang}/bin/clang" + linker = "${lib.getExe pkgs.clang}" rustflags = ["-Clink-arg=-Wl,--no-rosegment"] ''; diff --git a/home-manager/progs/dunst.nix b/home-manager/progs/dunst.nix new file mode 100644 index 0000000..6894bf2 --- /dev/null +++ b/home-manager/progs/dunst.nix @@ -0,0 +1,30 @@ +{ pkgs, config, ... }: +{ + services.dunst = { + enable = true; + package = pkgs.dunst; + + settings = { + global = { + width = 300; + height = 300; + offset = "30x50"; + origin = "top-right"; + + # 0 is the most opaque, 100 is completely transparent + transparency = 40; + + # have consistancy between niri frame color and dunst + frame_color = config.programs.niri.settings.layout.focus-ring.active.color; + + font = "JetBrains Mono Nerd Font 9"; + }; + + urgency_normal = { + # background = "#37474f"; + # foreground = "#eceff1"; + timeout = 10; + }; + }; + }; +} diff --git a/home-manager/progs/fish.nix b/home-manager/progs/fish.nix index 29e64de..3db5927 100644 --- a/home-manager/progs/fish.nix +++ b/home-manager/progs/fish.nix @@ -1,7 +1,7 @@ -{ pkgs, ... }: +{ pkgs, lib, ... }: let - eza = "${pkgs.eza}/bin/eza --color=always --group-directories-first"; - cargo = "${pkgs.cargo}/bin/cargo"; + eza = "${lib.getExe pkgs.eza} --color=always --group-directories-first"; + cargo = "${lib.getExe pkgs.cargo}"; coreutils = "${pkgs.coreutils}/bin"; in { @@ -16,7 +16,7 @@ in export GPG_TTY=(${coreutils}/tty) #pfetch on shell start (disable pkgs because of execution time) - PF_INFO="ascii title os host kernel uptime memory editor wm" ${pkgs.pfetch-rs}/bin/pfetch + PF_INFO="ascii title os host kernel uptime memory editor wm" ${lib.getExe pkgs.pfetch-rs} ''; shellAliases = { @@ -32,9 +32,9 @@ in # gets the largest files in a git repo's history "git-size" = '' - ${pkgs.git}/bin/git rev-list --objects --all | - ${pkgs.git}/bin/git cat-file --batch-check='%(objecttype) %(objectname) %(objectsize) %(rest)' | - ${pkgs.gnused}/bin/sed -n 's/^blob //p' | + ${lib.getExe pkgs.git} rev-list --objects --all | + ${lib.getExe pkgs.git} cat-file --batch-check='%(objecttype) %(objectname) %(objectsize) %(rest)' | + ${lib.getExe pkgs.gnused} -n 's/^blob //p' | ${coreutils}/sort --numeric-sort --key=2 | ${coreutils}/cut -c 1-12,41- | ${coreutils}/numfmt --field=2 --to=iec-i --suffix=B --padding=7 --round=nearest''; @@ -43,7 +43,7 @@ in pbcopy = "${pkgs.wl-clipboard}/bin/wl-copy"; pbpaste = "${pkgs.wl-clipboard}/bin/wl-paste"; - gcc-native = "${pkgs.gcc}/bin/gcc -Q --help=target -mtune=native -march=native | ${pkgs.gnugrep}/bin/grep -E '^\\s+\-(mtune|march)=' | ${coreutils}/tr -d '[:blank:]'"; + 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"; }; diff --git a/home-manager/progs/gpt4all/gpt4all.nix b/home-manager/progs/gpt4all/gpt4all.nix index 36a60b3..1ae2d0a 100644 --- a/home-manager/progs/gpt4all/gpt4all.nix +++ b/home-manager/progs/gpt4all/gpt4all.nix @@ -16,6 +16,17 @@ let 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 = ( @@ -34,7 +45,7 @@ let ] ); - system_prompt = "You are a helpful and harmless assistant. You should think step-by-step."; + 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 { diff --git a/home-manager/progs/niri.nix b/home-manager/progs/niri.nix index 9748dc5..5178238 100644 --- a/home-manager/progs/niri.nix +++ b/home-manager/progs/niri.nix @@ -1,6 +1,7 @@ { config, pkgs, + lib, ... }: { @@ -47,7 +48,7 @@ spawn-at-startup = [ { command = [ - "${config.programs.eww.package}/bin/eww" + "${lib.getExe config.programs.eww.package}" "-c" "${config.programs.eww.configDir}" "open" @@ -58,7 +59,7 @@ # swaybg works on more than just sway (sets a wallpaper) { command = [ - "${pkgs.swaybg}/bin/swaybg" + "${lib.getExe pkgs.swaybg}" "-i" "${../wallpaper.png}" ]; @@ -67,7 +68,7 @@ # Xwayland on niri via xwayland-satellite { command = [ - "${pkgs.xwayland-satellite}/bin/xwayland-satellite" + "${lib.getExe pkgs.xwayland-satellite}" config.programs.niri.settings.environment.DISPLAY ]; } diff --git a/home-manager/system-mreow.nix b/home-manager/system-mreow.nix index 9b4bcab..54a4d22 100644 --- a/home-manager/system-mreow.nix +++ b/home-manager/system-mreow.nix @@ -16,6 +16,9 @@ # lockscreen ./progs/swaylock.nix + + # notification daemon + ./progs/dunst.nix ]; home.packages = with pkgs; [ @@ -39,12 +42,6 @@ Service.ExecStart = "${pkgs.bluez}/bin/mpris-proxy"; }; - # notification daemon - services.dunst = { - enable = true; - package = pkgs.dunst; - }; - age.secrets.borg-laptop-password = { file = ./secrets/borg-laptop-password.age; path = "${homeDirectory}/.secrets/borg_bak_pass"; From e30bb7ae6dbe14a433b606a54461e2122355aa37 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 21 Feb 2025 17:57:48 -0500 Subject: [PATCH 119/724] update --- etcnixos/common.nix | 7 +++++++ etcnixos/flake.lock | 6 +++--- home-manager/flake.lock | 24 ++++++++++++------------ home-manager/progs/dunst.nix | 1 + 4 files changed, 23 insertions(+), 15 deletions(-) diff --git a/etcnixos/common.nix b/etcnixos/common.nix index 76d1814..e5ea323 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -20,6 +20,13 @@ inputs.disko.nixosModules.disko ]; + programs.nix-ld = { + enable = true; + libraries = with pkgs; [ + stdenv.cc.cc + ]; + }; + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 35da617..02fc118 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -315,11 +315,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1739798439, - "narHash": "sha256-GyipmjbbQEaosel/+wq1xihCKbv0/e1LU00x/8b/fP4=", + "lastModified": 1740089251, + "narHash": "sha256-Y78mDBWoO8CLLTjQfPfII+KXFb6lAmF9GrLbyVBsIMM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3e2ea8a49d4d76276b0f4e2041df8ca5c0771371", + "rev": "18e9f9753e9ae261bcc7d3abe15745686991fd30", "type": "github" }, "original": { diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 82e4a8c..06a1e5b 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1739992710, - "narHash": "sha256-9kEscmGnXHjSgcqyJR4TzzHhska4yz1inSQs6HuO9qU=", + "lastModified": 1740161709, + "narHash": "sha256-QInyU5nXiwGzzCc3qxYHJKFY/YWege8Us7aZZOCFW4Q=", "owner": "nix-community", "repo": "home-manager", - "rev": "1c189f011447810af939a886ba7bee33532bb1f9", + "rev": "148a6b55651ac794f5c20bbd76780b4d8fed4334", "type": "github" }, "original": { @@ -79,11 +79,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1740045415, - "narHash": "sha256-dLg4Re8AdmlTYWu6FHR60cem9fErXnWXRJi6/Du5L3M=", + "lastModified": 1740124252, + "narHash": "sha256-s/wpy4RFcfsn5vPLC9LhMgoxdd7ReWRssWdxUgBym8s=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "a622f76d3f97ce289f2103b6999f80a3732d629b", + "rev": "f989ca59d48550c3fd7021917647775969c26d54", "type": "github" }, "original": { @@ -112,11 +112,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1740042509, - "narHash": "sha256-Yk1DXv4oRdbi2P8v4b7GV6wXJaAa5jOK0femtfxlGAg=", + "lastModified": 1740117926, + "narHash": "sha256-mTTHA0RAaQcdYe+9A3Jx77cmmyLFHmRoZdd8RpWa+m8=", "owner": "YaLTeR", "repo": "niri", - "rev": "8885233c7e036a1e279c09e4fd96c1a1669156c3", + "rev": "b94a5db8790339cf9134873d8b490be69e02ac71", "type": "github" }, "original": { @@ -174,11 +174,11 @@ ] }, "locked": { - "lastModified": 1740018520, - "narHash": "sha256-mU6H0Q1WPn0XuwBO9SLZb/1yeVMfvsifBJcXNlhB+Ts=", + "lastModified": 1740104932, + "narHash": "sha256-FaN+HBAhOW1wAjxPI/Ko1DX0ax4ucHCZoMJ0dGMxm8o=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "7f6ecf3b7c5bfcc4730943a767630122efd09dc8", + "rev": "c932b3873a5d56126bc1f1416fb8a58315f86c17", "type": "github" }, "original": { diff --git a/home-manager/progs/dunst.nix b/home-manager/progs/dunst.nix index 6894bf2..72ac881 100644 --- a/home-manager/progs/dunst.nix +++ b/home-manager/progs/dunst.nix @@ -4,6 +4,7 @@ enable = true; package = pkgs.dunst; + # docs: https://dunst-project.org/documentation/ settings = { global = { width = 300; From d5a5581f7733fd78a15bbb73b0c3ac68b91f2e30 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 1 Mar 2025 12:49:33 -0500 Subject: [PATCH 120/724] update --- etcnixos/flake.lock | 48 +++++++++++++++--------------- home-manager/flake.lock | 58 ++++++++++++++++++------------------- home-manager/no-gui.nix | 6 ++++ home-manager/progs/fish.nix | 2 -- 4 files changed, 59 insertions(+), 55 deletions(-) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 02fc118..e713831 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -34,11 +34,11 @@ ] }, "locked": { - "lastModified": 1740016447, - "narHash": "sha256-96hBRGwuG+CFI5+inRIDCh0Za4LOt1dlbO3pFOokw6Y=", + "lastModified": 1740596849, + "narHash": "sha256-8elI7d5XCz9Lv+qovIW6J1/9aGjgNJPjLeJ5OFmtgzY=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "ed7900391a1969bb0bde432fd3952a6dda37114c", + "rev": "b950948f45d8da3da0bb8dcf95dbeb421fd5fc2b", "type": "github" }, "original": { @@ -115,11 +115,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1739946876, - "narHash": "sha256-ek0u5FT5yjqYKjF/0HQKwDH2ISZzyvYwu+My5hmSwbU=", + "lastModified": 1740551776, + "narHash": "sha256-CkcCb2hGSL1owuZpjuNB6UQzlyaXgvuRXmjY6jLqjPc=", "owner": "nix-community", "repo": "fenix", - "rev": "95c1eab59767a3dbb11d6616d4ff736813ce41d2", + "rev": "07a730bc80e8a4106df5b2341aa5602a240ee112", "type": "github" }, "original": { @@ -230,11 +230,11 @@ ] }, "locked": { - "lastModified": 1739913864, - "narHash": "sha256-WhzgQjadrwnwPJQLLxZUUEIxojxa7UWDkf7raAkB1Lw=", + "lastModified": 1740494361, + "narHash": "sha256-Dd/GhJ9qKmUwuhgt/PAROG8J6YdU2ZjtJI9SQX5sVQI=", "owner": "nix-community", "repo": "home-manager", - "rev": "97ac0801d187b2911e8caa45316399de12f6f199", + "rev": "74f0a8546e3f2458c870cf90fc4b38ac1f498b17", "type": "github" }, "original": { @@ -252,11 +252,11 @@ ] }, "locked": { - "lastModified": 1739952453, - "narHash": "sha256-+tyFW6nNj1fJ1VTtLeqe1PMp5F7Fb9zIkT6mUvdQHrM=", + "lastModified": 1740553144, + "narHash": "sha256-ujQ/f3mcYECH1o0vzakMLAQRCMeF/SXd8w4uBFHxYO8=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "b2ed82d3ff837960df4518308dfe409dda3ae406", + "rev": "14a125ea5c440c57310dc1bb3acf7641078d783a", "type": "github" }, "original": { @@ -277,11 +277,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1739186342, - "narHash": "sha256-2j+sln9RwQn+g7J4GmdFFgvqXnLkvWBNMaUzONlkzUE=", + "lastModified": 1740440383, + "narHash": "sha256-w8ixbqOGrVWMQZFFs4uAwZpuwuGMzFoKjocMFxTR5Ts=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "3bdeebbc484a09391c4f0ec8a37bb77809426660", + "rev": "6321bc060d757c137c1fbae2057c7e941483878f", "type": "github" }, "original": { @@ -315,11 +315,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1740089251, - "narHash": "sha256-Y78mDBWoO8CLLTjQfPfII+KXFb6lAmF9GrLbyVBsIMM=", + "lastModified": 1740646007, + "narHash": "sha256-dMReDQobS3kqoiUCQIYI9c0imPXRZnBubX20yX/G5LE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "18e9f9753e9ae261bcc7d3abe15745686991fd30", + "rev": "009b764ac98a3602d41fc68072eeec5d24fc0e49", "type": "github" }, "original": { @@ -331,11 +331,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739866667, - "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=", + "lastModified": 1740560979, + "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680", + "rev": "5135c59491985879812717f4c9fea69604e7f26f", "type": "github" }, "original": { @@ -401,11 +401,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1739913186, - "narHash": "sha256-7MSzs64dLDgq1wFw2eujZ01qdj9K+TwIlQMyWebotE8=", + "lastModified": 1740470570, + "narHash": "sha256-iYjLS4jy/IJScOHZfbQ31vkrS5tl0bjXtzYP4XKA2Pc=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "3028f844c5898dcf115f6bc67a5ce793989b04a1", + "rev": "89255449982473939a4f8ee954512d339225c182", "type": "github" }, "original": { diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 06a1e5b..b3f8518 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1740161709, - "narHash": "sha256-QInyU5nXiwGzzCc3qxYHJKFY/YWege8Us7aZZOCFW4Q=", + "lastModified": 1740624780, + "narHash": "sha256-8TP61AI3QBQsjzVUQFIV8NoB5nbYfJB3iHczhBikDkU=", "owner": "nix-community", "repo": "home-manager", - "rev": "148a6b55651ac794f5c20bbd76780b4d8fed4334", + "rev": "b8869e4ead721bbd4f0d6b927e8395705d4f16e6", "type": "github" }, "original": { @@ -79,11 +79,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1740124252, - "narHash": "sha256-s/wpy4RFcfsn5vPLC9LhMgoxdd7ReWRssWdxUgBym8s=", + "lastModified": 1740655457, + "narHash": "sha256-brpdF7wEdGDZWuV8T5axwzHr5gnGfB7Dua2QVAjSSL4=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "f989ca59d48550c3fd7021917647775969c26d54", + "rev": "2a098dfa179b6d89c962908df0e4840308db04df", "type": "github" }, "original": { @@ -95,16 +95,16 @@ "niri-stable": { "flake": false, "locked": { - "lastModified": 1736614405, - "narHash": "sha256-AJ1rlgNOPb3/+DbS5hkhm21t6Oz8IgqLllwmZt0lyzk=", + "lastModified": 1740117926, + "narHash": "sha256-mTTHA0RAaQcdYe+9A3Jx77cmmyLFHmRoZdd8RpWa+m8=", "owner": "YaLTeR", "repo": "niri", - "rev": "e05bc269e678ecf828b96ae79c991c13b00b38a5", + "rev": "b94a5db8790339cf9134873d8b490be69e02ac71", "type": "github" }, "original": { "owner": "YaLTeR", - "ref": "v25.01", + "ref": "v25.02", "repo": "niri", "type": "github" } @@ -112,11 +112,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1740117926, - "narHash": "sha256-mTTHA0RAaQcdYe+9A3Jx77cmmyLFHmRoZdd8RpWa+m8=", + "lastModified": 1740641916, + "narHash": "sha256-aYAYvdKnmmlkN7t4VbPfPbAtWHHADKHL8bPlNYZ2bZY=", "owner": "YaLTeR", "repo": "niri", - "rev": "b94a5db8790339cf9134873d8b490be69e02ac71", + "rev": "70dcd229cfaa54946163ccf0a1ea0ce595a35cc4", "type": "github" }, "original": { @@ -127,11 +127,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739866667, - "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=", + "lastModified": 1740560979, + "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680", + "rev": "5135c59491985879812717f4c9fea69604e7f26f", "type": "github" }, "original": { @@ -143,11 +143,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1739923778, - "narHash": "sha256-BqUY8tz0AQ4to2Z4+uaKczh81zsGZSYxjgvtw+fvIfM=", + "lastModified": 1740463929, + "narHash": "sha256-4Xhu/3aUdCKeLfdteEHMegx5ooKQvwPHNkOgNCXQrvc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "36864ed72f234b9540da4cf7a0c49e351d30d3f1", + "rev": "5d7db4668d7a0c6cc5fc8cf6ef33b008b2b1ed8b", "type": "github" }, "original": { @@ -174,11 +174,11 @@ ] }, "locked": { - "lastModified": 1740104932, - "narHash": "sha256-FaN+HBAhOW1wAjxPI/Ko1DX0ax4ucHCZoMJ0dGMxm8o=", + "lastModified": 1740623427, + "narHash": "sha256-3SdPQrZoa4odlScFDUHd4CUPQ/R1gtH4Mq9u8CBiK8M=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c932b3873a5d56126bc1f1416fb8a58315f86c17", + "rev": "d342e8b5fd88421ff982f383c853f0fc78a847ab", "type": "github" }, "original": { @@ -205,16 +205,16 @@ "xwayland-satellite-stable": { "flake": false, "locked": { - "lastModified": 1730166465, - "narHash": "sha256-nq7bouXQXaaPPo/E+Jbq+wNHnatD4dY8OxSrRqzvy6s=", + "lastModified": 1739246919, + "narHash": "sha256-/hBM43/Gd0/tW+egrhlWgOIISeJxEs2uAOIYVpfDKeU=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "a713cf46cb7db84a0d1b57c3a397c610cad3cf98", + "rev": "44590a416d4a3e8220e19e29e0b6efe64a80315d", "type": "github" }, "original": { "owner": "Supreeeme", - "ref": "v0.5", + "ref": "v0.5.1", "repo": "xwayland-satellite", "type": "github" } @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1739667343, - "narHash": "sha256-fNEz+Yd0t9jXz27qKRMAEBradTwYBeBLOECx+ydG25s=", + "lastModified": 1740554227, + "narHash": "sha256-xpwZeMw2gGenixGQDyVv+ja+epcR+EJ1BPuGFdgFS18=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "8c7f6ca49f87b4e114f775a4dad956ceb6df4220", + "rev": "7de16ae319e6f6852274fa90b0d41c00049767c9", "type": "github" }, "original": { diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index e5da856..65909b6 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -115,6 +115,8 @@ numpy matplotlib notebook + + pandas ] )) @@ -132,6 +134,7 @@ # clang-format and clang-tidy clang-tools clang + gdb # broken # lldb @@ -154,8 +157,11 @@ tcpdump cargo-flamegraph + linuxKernel.packages.linux_6_11.perf borgbackup + + tinyxxd ]; # https://github.com/flamegraph-rs/flamegraph diff --git a/home-manager/progs/fish.nix b/home-manager/progs/fish.nix index 3db5927..6df7a0b 100644 --- a/home-manager/progs/fish.nix +++ b/home-manager/progs/fish.nix @@ -44,8 +44,6 @@ 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 = '' From b77e70078e0daf117626ebdffc600a1952b2bde1 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 14 Mar 2025 14:04:28 -0400 Subject: [PATCH 121/724] update --- etcnixos/common.nix | 12 ++- etcnixos/flake.lock | 97 ++++++++++--------------- etcnixos/secrets/wifi-passwords.nix | Bin 646 -> 700 bytes etcnixos/system-mreow.nix | 7 -- home-manager/flake.lock | 48 ++++++------ home-manager/gui.nix | 5 ++ home-manager/no-gui.nix | 10 +++ home-manager/progs/gpt4all/gpt4all.nix | 11 --- home-manager/progs/niri.nix | 9 ++- 9 files changed, 97 insertions(+), 102 deletions(-) diff --git a/etcnixos/common.nix b/etcnixos/common.nix index e5ea323..9b8a60f 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -113,7 +113,7 @@ fprintd.enable = false; # Making sure mullvad works on boot - mullvad-vpn.enable = true; + # mullvad-vpn.enable = true; }; # Set your time zone. @@ -211,7 +211,7 @@ # System packages environment.systemPackages = with pkgs; [ - mullvad-vpn + # mullvad-vpn #secureboot ctl sbctl @@ -257,4 +257,12 @@ documentation.enable = true; documentation.man.enable = true; documentation.dev.enable = true; + + swapDevices = [ + { + device = "/var/lib/swapfile"; + size = 64 * 1024; + randomEncryption.enable = true; + } + ]; } diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index e713831..fdc285e 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -34,11 +34,11 @@ ] }, "locked": { - "lastModified": 1740596849, - "narHash": "sha256-8elI7d5XCz9Lv+qovIW6J1/9aGjgNJPjLeJ5OFmtgzY=", + "lastModified": 1741962175, + "narHash": "sha256-ZydxDII0DOv1Ut/QXFL9WtKLs9D+rS/khV8Nu0X+D3I=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "b950948f45d8da3da0bb8dcf95dbeb421fd5fc2b", + "rev": "30d7b193ce1e6d39390d7f6ffb700d33aedeffe6", "type": "github" }, "original": { @@ -50,11 +50,11 @@ }, "crane": { "locked": { - "lastModified": 1731098351, - "narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=", + "lastModified": 1741148495, + "narHash": "sha256-EV8KUaIZ2/CdBXlutXrHoZYbWPeB65p5kKZk71gvDRI=", "owner": "ipetkov", "repo": "crane", - "rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28", + "rev": "75390a36cd0c2cdd5f1aafd8a9f827d7107f2e53", "type": "github" }, "original": { @@ -115,11 +115,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1740551776, - "narHash": "sha256-CkcCb2hGSL1owuZpjuNB6UQzlyaXgvuRXmjY6jLqjPc=", + "lastModified": 1741847799, + "narHash": "sha256-muvsng8/+e9AC+xg5HuHgHwuQ/etKlTevNgr8fw5r9s=", "owner": "nix-community", "repo": "fenix", - "rev": "07a730bc80e8a4106df5b2341aa5602a240ee112", + "rev": "05f331e61277f70f55769060f783457fdacf8da1", "type": "github" }, "original": { @@ -131,11 +131,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -152,11 +152,11 @@ ] }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1740872218, + "narHash": "sha256-ZaMw0pdoUKigLpv9HiNDH2Pjnosg7NBYMJlHTIsHEUo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "3876f6b87db82f33775b1ef5ea343986105db764", "type": "github" }, "original": { @@ -230,11 +230,11 @@ ] }, "locked": { - "lastModified": 1740494361, - "narHash": "sha256-Dd/GhJ9qKmUwuhgt/PAROG8J6YdU2ZjtJI9SQX5sVQI=", + "lastModified": 1741879521, + "narHash": "sha256-GylyCwdUe2Kd69bC8txEX+A3H/DXBZl2a+GcmTcJw/g=", "owner": "nix-community", "repo": "home-manager", - "rev": "74f0a8546e3f2458c870cf90fc4b38ac1f498b17", + "rev": "1b0efe3d335f452595512c7b275e5dddfbfb28a5", "type": "github" }, "original": { @@ -252,11 +252,11 @@ ] }, "locked": { - "lastModified": 1740553144, - "narHash": "sha256-ujQ/f3mcYECH1o0vzakMLAQRCMeF/SXd8w4uBFHxYO8=", + "lastModified": 1741874414, + "narHash": "sha256-gtIrDkG/iap32MYyaSAlWaixshiqMyFB9eKyhcF66eM=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "14a125ea5c440c57310dc1bb3acf7641078d783a", + "rev": "662d117ac0ffc81f3e91b5f0fb800c3effd904a1", "type": "github" }, "original": { @@ -277,11 +277,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1740440383, - "narHash": "sha256-w8ixbqOGrVWMQZFFs4uAwZpuwuGMzFoKjocMFxTR5Ts=", + "lastModified": 1741442524, + "narHash": "sha256-tVcxLDLLho8dWcO81Xj/3/ANLdVs0bGyCPyKjp70JWk=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "6321bc060d757c137c1fbae2057c7e941483878f", + "rev": "d8099586d9a84308ffedac07880e7f07a0180ff4", "type": "github" }, "original": { @@ -315,11 +315,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1740646007, - "narHash": "sha256-dMReDQobS3kqoiUCQIYI9c0imPXRZnBubX20yX/G5LE=", + "lastModified": 1741792691, + "narHash": "sha256-f0BVt1/cvA0DQ/q3rB+HY4g4tKksd03ZkzI4xehC2Ew=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "009b764ac98a3602d41fc68072eeec5d24fc0e49", + "rev": "e1f12151258b12c567f456d8248e4694e9390613", "type": "github" }, "original": { @@ -331,11 +331,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1740560979, - "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=", + "lastModified": 1741851582, + "narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5135c59491985879812717f4c9fea69604e7f26f", + "rev": "6607cf789e541e7873d40d3a8f7815ea92204f32", "type": "github" }, "original": { @@ -345,22 +345,6 @@ "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": [ @@ -371,15 +355,14 @@ "nixpkgs": [ "lanzaboote", "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" + ] }, "locked": { - "lastModified": 1731363552, - "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", + "lastModified": 1740915799, + "narHash": "sha256-JvQvtaphZNmeeV+IpHgNdiNePsIpHD5U/7QN5AeY44A=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", + "rev": "42b1ba089d2034d910566bf6b40830af6b8ec732", "type": "github" }, "original": { @@ -401,11 +384,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1740470570, - "narHash": "sha256-iYjLS4jy/IJScOHZfbQ31vkrS5tl0bjXtzYP4XKA2Pc=", + "lastModified": 1741807049, + "narHash": "sha256-/tH4gSW/0ePa2+0DAzk5xuHAa5qeaB4T8RnmiG3Ex4w=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "89255449982473939a4f8ee954512d339225c182", + "rev": "3fc655b239058deb93f503f9d25cc69a32ca7675", "type": "github" }, "original": { @@ -423,11 +406,11 @@ ] }, "locked": { - "lastModified": 1731897198, - "narHash": "sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE=", + "lastModified": 1741228283, + "narHash": "sha256-VzqI+k/eoijLQ5am6rDFDAtFAbw8nltXfLBC6SIEJAE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "0be641045af6d8666c11c2c40e45ffc9667839b5", + "rev": "38e9826bc4296c9daf18bc1e6aa299f3e932a403", "type": "github" }, "original": { diff --git a/etcnixos/secrets/wifi-passwords.nix b/etcnixos/secrets/wifi-passwords.nix index 88a9fc3afeaabb98b43477159a579d10f40294ed..b7ecd973bec15f825cb066b887eff5a6844acfd3 100644 GIT binary patch literal 700 zcmZQ@_Y83kiVO&0sJbgZzt(>Cj2+f#t&DGKUwSW-nfr0_(<~#S_j676TyXkzvrUtn&lN7@nCv<$U3#&eMnC)Ct&a# zb6(VceN%S#(^}8D*)m$&+#h}I%(6az<+bS1C#%jc+S>O|z*%5*v)vn3o3ss@|CgL) zyYcda{yA2W8J}M+Z@b)MpMB$Q)sE!%l8@&P~sj(lb+yZ7yk zK#psZMWX9H=lEOFE5aMaHC{D+&b5>I#1eCRE4Ms*puEN0Q1j@rjP~-K z3fre$`MdOU@^_Cag}1kRuD(}u>gRs6cym(F&l2LfrT1pR-K#xLU;4#AYwL&YFEZpz!o^uC`X=#fyxdfEd2O_2!Q^LkH`X$& zFjiFCm^(MX*Up~j73bxh%Oh?+y|JY#()Rx0m1kf4E6CV;S3zuJxa!U)%dZ?$>rNNF zwnQ)M`vcx7505ZS|9A9^+o@SR+?Uo1Xz>4hnG)vy)K|xLyAgBn$Ir^F+g|)V>a(W% zy@jWC(b>qe`)Apod0XF?bV%B5weGw}*B6PjMqZBCS={@=^yBSmFL#v&Ev~+$nkjJg zMBz@BA|EyVjQ`yxd!249pXYXAO-yR)d)8h-dhZr_HAd6Se@9QPVPM+wboLK{h&@JyHHy+h-rmJzk~h#d&p0@0EL(o);6Sk$qBb$NZL zp8mf>0X3gn-ZS}q>_}5hxum4j-r;|AacX`_?VTs$rNvRn+tZG3?ezJxpHosyYB9qR z6Vn9l`*AO{L``abNB&Ubdv@mdwPnno>te11ny&8Mu)u5KZvT6)Yy%P)d1Xw@j|eKt z)UKE@S$cE(t#5a=Sbr9t?BB(|{I=+l60HkGTRR-g=3Wr}-nHauUFk#FdlBUe51diX zNl?qIY-n%7& zer(=!sAx;J=5ve1ebx~V9C)jbs=Z!%w|@T9Bl#*%E=wNitdiLzxp&JM(W7&pyQS9J zx9`}={4G1x`)#IP+r!OU9~d2DN}c#4jkoPyhs&~u9#Ymue Date: Sat, 15 Mar 2025 11:29:54 -0400 Subject: [PATCH 122/724] desktop changes --- etcnixos/common.nix | 16 +--------------- etcnixos/steam.nix | 27 +++++++++++++++++++++++++++ home-manager/flake.lock | 18 +++++++++--------- home-manager/gui.nix | 8 ++++++-- 4 files changed, 43 insertions(+), 26 deletions(-) create mode 100644 etcnixos/steam.nix diff --git a/etcnixos/common.nix b/etcnixos/common.nix index 9b8a60f..d445614 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -13,6 +13,7 @@ ./declarative-nm.nix ./distrobox.nix ./vm.nix + ./steam.nix inputs.agenix.nixosModules.default inputs.nixos-hardware.nixosModules.common-pc-ssd @@ -27,15 +28,6 @@ ]; }; - nixpkgs.config.allowUnfreePredicate = - pkg: - builtins.elem (lib.getName pkg) [ - "steam" - "steam-original" - "steam-unwrapped" - "steam-run" - ]; - nix = { # optimize the store optimise.automatic = true; @@ -203,12 +195,6 @@ 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 diff --git a/etcnixos/steam.nix b/etcnixos/steam.nix new file mode 100644 index 0000000..60b7edf --- /dev/null +++ b/etcnixos/steam.nix @@ -0,0 +1,27 @@ +{ + pkgs, + config, + lib, + ... +}: +{ + + nixpkgs.config.allowUnfreePredicate = + pkg: + builtins.elem (lib.getName pkg) [ + "steam" + "steam-original" + "steam-unwrapped" + "steam-run" + ]; + + programs.steam = { + enable = true; + localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers + extraCompatPackages = with pkgs; [ proton-ge-bin ]; + }; + + environment.systemPackages = with pkgs; [ + steamtinkerlaunch + ]; +} diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 56985cb..4db8ad1 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1741914680, - "narHash": "sha256-Vu4DIZvgfWMzhUyxbHUrJaQb5232S5vuwxQ2sBcBVHk=", + "lastModified": 1741955947, + "narHash": "sha256-2lbURKclgKqBNm7hVRtWh0A7NrdsibD0EaWhahUVhhY=", "owner": "nix-community", "repo": "home-manager", - "rev": "30cce6848a5aa41ceb5fb33185b84868cc3e9bef", + "rev": "4e12151c9e014e2449e0beca2c0e9534b96a26b4", "type": "github" }, "original": { @@ -79,11 +79,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1741915514, - "narHash": "sha256-zpXOsXAk1x823REV4KRDetvWQp9ymRt79Avh9GVAQDo=", + "lastModified": 1741945905, + "narHash": "sha256-4rDjlQmeMrcJOZx4Crcnj/8C02dvO9y6AexM2UOZbH8=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "0c97d9ef5031198ed85bd0ce8ec75eaec7527927", + "rev": "caef77a524e2e86ef578b83688a99a373bb9fc2c", "type": "github" }, "original": { @@ -112,11 +112,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1741891147, - "narHash": "sha256-hCD/llnO/I0ARk6divzVG3a82nNgrcG58dIe0yhzNo8=", + "lastModified": 1741941540, + "narHash": "sha256-e3j+pdOUy4ZcjxUmlTNTOwKeQE1e2n1RQNvPA1g5nV0=", "owner": "YaLTeR", "repo": "niri", - "rev": "ee0e2c7f1b4edae42d2f1b05466adbdffe156e61", + "rev": "b4922086ce298bb3d7806437c6dbea4a86f52c38", "type": "github" }, "original": { diff --git a/home-manager/gui.nix b/home-manager/gui.nix index 863b6c3..216ffa0 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -9,7 +9,7 @@ ./no-gui.nix ./progs/alacritty.nix ./progs/gpt4all/gpt4all.nix - ./progs/trezor.nix + # ./progs/trezor.nix # - broken ]; nixpkgs.config.allowUnfreePredicate = @@ -50,7 +50,7 @@ foliate #audio mixer (pavucontrol but for pipewire) - pwvucontrol + # pwvucontrol # - broken #minecraft launcher prismlauncher @@ -121,6 +121,10 @@ blender ghidra-bin + + # for mod organizer 2 + zenity + p7zip ] ++ (builtins.filter lib.isDerivation (builtins.attrValues nerd-fonts)); From 3b196d876b366a0ed956b47be94d85225d19aec6 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 17 Mar 2025 00:15:45 -0400 Subject: [PATCH 123/724] zen browser PiP --- home-manager/progs/niri.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/home-manager/progs/niri.nix b/home-manager/progs/niri.nix index 160e13b..5645524 100644 --- a/home-manager/progs/niri.nix +++ b/home-manager/progs/niri.nix @@ -89,6 +89,22 @@ }; } { clip-to-geometry = true; } + { + matches = [ + { + app-id = "Zen Browser$"; + title = "^Picture-in-Picture$"; + } + ]; + + open-floating = true; + default-column-width = { + fixed = 480; + }; + default-window-height = { + fixed = 270; + }; + } ]; # XF86AudioMedia allow-when-locked=true { spawn "playerctl" "play-pause"; } From ed3f2027c5c99d3804689c708f606c1ce2292878 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 17 Mar 2025 14:14:36 -0400 Subject: [PATCH 124/724] changes --- etcnixos/flake.lock | 18 ++++++------- home-manager/flake.lock | 36 +++++++++++++------------- home-manager/progs/gpt4all/gpt4all.nix | 12 +++++++++ home-manager/progs/niri.nix | 4 +-- 4 files changed, 41 insertions(+), 29 deletions(-) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index fdc285e..3290937 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -34,11 +34,11 @@ ] }, "locked": { - "lastModified": 1741962175, - "narHash": "sha256-ZydxDII0DOv1Ut/QXFL9WtKLs9D+rS/khV8Nu0X+D3I=", + "lastModified": 1742213066, + "narHash": "sha256-zQHn+4moKz4XTf1qvGEi9eVABikPdnwFfOotqk9QMwE=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "30d7b193ce1e6d39390d7f6ffb700d33aedeffe6", + "rev": "be765082e305296cc99dc2f2ed031b1d10133233", "type": "github" }, "original": { @@ -315,11 +315,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1741792691, - "narHash": "sha256-f0BVt1/cvA0DQ/q3rB+HY4g4tKksd03ZkzI4xehC2Ew=", + "lastModified": 1742217307, + "narHash": "sha256-3fwpN7KN226ghLlpO9TR0/WpgQOmOj1e8bieUxpIYSk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e1f12151258b12c567f456d8248e4694e9390613", + "rev": "4f4d97d7b7be387286cc9c988760a7ebaa5be1f1", "type": "github" }, "original": { @@ -331,11 +331,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1741851582, - "narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=", + "lastModified": 1742069588, + "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6607cf789e541e7873d40d3a8f7815ea92204f32", + "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5", "type": "github" }, "original": { diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 4db8ad1..96a1c4e 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -79,11 +79,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1741945905, - "narHash": "sha256-4rDjlQmeMrcJOZx4Crcnj/8C02dvO9y6AexM2UOZbH8=", + "lastModified": 1742220949, + "narHash": "sha256-ZlPrKLM0FWUP36MNCJYGTlN4ZvoXZ4WY/ENKoaGU6yg=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "caef77a524e2e86ef578b83688a99a373bb9fc2c", + "rev": "5d8d116ac90f54e4c95bd5c9de31b8df477b12b9", "type": "github" }, "original": { @@ -112,11 +112,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1741941540, - "narHash": "sha256-e3j+pdOUy4ZcjxUmlTNTOwKeQE1e2n1RQNvPA1g5nV0=", + "lastModified": 1742103165, + "narHash": "sha256-zAzMwvozlS2gmqdhrgeMz0PNp3kRDkwxIEfqWT3Hj6g=", "owner": "YaLTeR", "repo": "niri", - "rev": "b4922086ce298bb3d7806437c6dbea4a86f52c38", + "rev": "287480b541e85b13ff6419d372f82fa8e42c603c", "type": "github" }, "original": { @@ -127,11 +127,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1741851582, - "narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=", + "lastModified": 1742069588, + "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6607cf789e541e7873d40d3a8f7815ea92204f32", + "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5", "type": "github" }, "original": { @@ -174,11 +174,11 @@ ] }, "locked": { - "lastModified": 1741919466, - "narHash": "sha256-xto0Oq+WItjDZvafo6ZVI4TZa6/2oxJHb0tkcSGVUJI=", + "lastModified": 1742178793, + "narHash": "sha256-S2onMdoDS4tIYd3/Jc5oFEZBr2dJOgPrh9KzSO/bfDw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "8b137260b776525542d47d3a4dbac753df478a42", + "rev": "954582a766a50ebef5695a9616c93b5386418c08", "type": "github" }, "original": { @@ -222,11 +222,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1741910413, - "narHash": "sha256-z9bvteu0rf+xmUDj4VifN06XAFJZQGRSOvdN7rn/oDs=", + "lastModified": 1742083780, + "narHash": "sha256-cVLagXvI4jFbCe76tpvAWA2N2WF94Pl0PpgsGp2P6rM=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "0325cb1f48a292d873a6844772cca00251cbf945", + "rev": "f9ec97b007547ad80147404335ed22e880dbd69d", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1741554872, - "narHash": "sha256-A/Iim9o0hHJjDJVynwtLzkox7NquvPc8CsJ/8OB4dDw=", + "lastModified": 1742180312, + "narHash": "sha256-67nyifSJu0TnXReokhA+pQhqswg0ZOp033k+QboSL8s=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "a4408170c5a2168bb79abcf587c5072e2ee5fb90", + "rev": "4dd2f79d89dc0ebbb1b3ebf96776383cc6d6989a", "type": "github" }, "original": { diff --git a/home-manager/progs/gpt4all/gpt4all.nix b/home-manager/progs/gpt4all/gpt4all.nix index 674dadd..106d123 100644 --- a/home-manager/progs/gpt4all/gpt4all.nix +++ b/home-manager/progs/gpt4all/gpt4all.nix @@ -16,6 +16,18 @@ let sha256 = "031b190e7aa81770b5d069de181dcfe4b284bf5d75fa12f82f5e54a3178adcfd"; }; } + + # https://github.com/nomic-ai/gpt4all/issues/3540 + # rec { + # name = "Gemma_3_27b_it"; + # filename = src.name; + # context_length = 131072; + # gen_length = 32768; + # src = pkgs.fetchurl { + # url = "https://huggingface.co/bartowski/google_gemma-3-27b-it-GGUF/resolve/main/google_gemma-3-27b-it-IQ4_XS.gguf"; + # sha256 = "bd2f188c66d8ccb0bffcb0c91e4dbbb72754bb1732e0bca323a2f266a35e01c8"; + # }; + # } ]; gpt4all_package = ( diff --git a/home-manager/progs/niri.nix b/home-manager/progs/niri.nix index 5645524..ecda129 100644 --- a/home-manager/progs/niri.nix +++ b/home-manager/progs/niri.nix @@ -6,7 +6,7 @@ }: { programs.niri = { - package = pkgs.niri-stable; + package = pkgs.niri; settings = { prefer-no-csd = true; @@ -92,7 +92,7 @@ { matches = [ { - app-id = "Zen Browser$"; + app-id = "zen$"; title = "^Picture-in-Picture$"; } ]; From a3b1dea6a3536334d083c578bd18408847c9e07a Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 17 Mar 2025 15:34:54 -0400 Subject: [PATCH 125/724] vr fix --- etcnixos/flake.lock | 6 +++--- etcnixos/vr.nix | 9 ++++++++- home-manager/flake.lock | 12 ++++++------ home-manager/system-yarn.nix | 23 +---------------------- 4 files changed, 18 insertions(+), 32 deletions(-) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 3290937..7e89c9c 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -34,11 +34,11 @@ ] }, "locked": { - "lastModified": 1742213066, - "narHash": "sha256-zQHn+4moKz4XTf1qvGEi9eVABikPdnwFfOotqk9QMwE=", + "lastModified": 1742229917, + "narHash": "sha256-ldvWOI1F90HBTvJBkF/09d8GLgWnIPlKpkNYotmu2wY=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "be765082e305296cc99dc2f2ed031b1d10133233", + "rev": "5104a4c520e33bf59468875ab58d9ad37431a5bb", "type": "github" }, "original": { diff --git a/etcnixos/vr.nix b/etcnixos/vr.nix index fbfd264..e1b28e1 100644 --- a/etcnixos/vr.nix +++ b/etcnixos/vr.nix @@ -5,11 +5,18 @@ ... }: { + services.wivrn = { enable = true; openFirewall = true; - package = pkgs.wivrn; + package = ( + pkgs.wivrn.overrideAttrs (old: { + cmakeFlags = old.cmakeFlags ++ [ + (lib.cmakeFeature "OPENCOMPOSITE_SEARCH_PATH" "${pkgs.opencomposite}/lib/opencomposite") + ]; + }) + ); # Write information to /etc/xdg/openxr/1/active_runtime.json, VR applications # will automatically read this and work with wivrn diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 96a1c4e..8a3acd5 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1741955947, - "narHash": "sha256-2lbURKclgKqBNm7hVRtWh0A7NrdsibD0EaWhahUVhhY=", + "lastModified": 1742238842, + "narHash": "sha256-Z79yUJi+UGSpRC90NbHyuvBjGLkgEtlZaJ8DtzaGkzE=", "owner": "nix-community", "repo": "home-manager", - "rev": "4e12151c9e014e2449e0beca2c0e9534b96a26b4", + "rev": "5a6e5a59a4d332edaa7d5d1604eb58ead27af851", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1742180312, - "narHash": "sha256-67nyifSJu0TnXReokhA+pQhqswg0ZOp033k+QboSL8s=", + "lastModified": 1742239259, + "narHash": "sha256-khFVyLv9bjmWS5wKxgRqR0T/8b+5YUcOKKQc8cSIaZs=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "4dd2f79d89dc0ebbb1b3ebf96776383cc6d6989a", + "rev": "047d2684da0cf2d1a1db02eece61c90ce9dda32b", "type": "github" }, "original": { diff --git a/home-manager/system-yarn.nix b/home-manager/system-yarn.nix index ba456d5..831f6bf 100644 --- a/home-manager/system-yarn.nix +++ b/home-manager/system-yarn.nix @@ -10,7 +10,7 @@ home.packages = with pkgs; [ protontricks - # beatsabermodmanager + beatsabermodmanager ]; programs.alacritty.settings = { @@ -26,25 +26,4 @@ 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 - } - ''; } From 7843500d7c1f47a40e91d17ae0142a9e2aadb945 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 17 Mar 2025 16:45:19 -0400 Subject: [PATCH 126/724] vr: add note about fo4 vr --- etcnixos/vr.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/etcnixos/vr.nix b/etcnixos/vr.nix index e1b28e1..55327b0 100644 --- a/etcnixos/vr.nix +++ b/etcnixos/vr.nix @@ -6,6 +6,10 @@ }: { + # 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; From ce02c11937b5873587efe3969685af78530ad6ce Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 18 Mar 2025 16:10:17 -0400 Subject: [PATCH 127/724] beatsabermodmanager -> bs-manager --- home-manager/system-yarn.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/home-manager/system-yarn.nix b/home-manager/system-yarn.nix index 831f6bf..f9e6629 100644 --- a/home-manager/system-yarn.nix +++ b/home-manager/system-yarn.nix @@ -10,7 +10,9 @@ home.packages = with pkgs; [ protontricks - beatsabermodmanager + + # https://github.com/NixOS/nixpkgs/pull/339370#issuecomment-2731336341 + bs-manager ]; programs.alacritty.settings = { From 9295083f259d42c5bfdb152506d2fe87685b294c Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 20 Mar 2025 02:42:40 -0400 Subject: [PATCH 128/724] niri: move scaling to laptop specific config --- home-manager/progs/niri.nix | 6 ------ home-manager/system-mreow.nix | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/home-manager/progs/niri.nix b/home-manager/progs/niri.nix index ecda129..3c54b7a 100644 --- a/home-manager/progs/niri.nix +++ b/home-manager/progs/niri.nix @@ -23,12 +23,6 @@ # skip the hotkey menu thingy hotkey-overlay.skip-at-startup = true; - outputs = { - "BOE 0x095F Unknown" = { - scale = 1.5; - }; - }; - layout = { gaps = 16; struts = { diff --git a/home-manager/system-mreow.nix b/home-manager/system-mreow.nix index 54a4d22..351100c 100644 --- a/home-manager/system-mreow.nix +++ b/home-manager/system-mreow.nix @@ -56,4 +56,10 @@ inherit homeDirectory; }; }; + + programs.niri.settings.outputs = { + "BOE 0x095F Unknown" = { + scale = 1.5; + }; + }; } From c28b3f717e39ab260ea90107217d55e7c1d4ca54 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 22 Mar 2025 17:39:29 -0400 Subject: [PATCH 129/724] update --- etcnixos/flake.lock | 42 ++++++++++++++++++------------------ home-manager/flake.lock | 48 ++++++++++++++++++++--------------------- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 7e89c9c..a27ed85 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -34,11 +34,11 @@ ] }, "locked": { - "lastModified": 1742229917, - "narHash": "sha256-ldvWOI1F90HBTvJBkF/09d8GLgWnIPlKpkNYotmu2wY=", + "lastModified": 1742647741, + "narHash": "sha256-hli9R2OONaRpyV5teQk+g73oBNQXFbKAZTHVY+AhKDI=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "5104a4c520e33bf59468875ab58d9ad37431a5bb", + "rev": "f44e30fb15f34b57b741124448e959b2cae38eb8", "type": "github" }, "original": { @@ -115,11 +115,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1741847799, - "narHash": "sha256-muvsng8/+e9AC+xg5HuHgHwuQ/etKlTevNgr8fw5r9s=", + "lastModified": 1742452566, + "narHash": "sha256-sVuLDQ2UIWfXUBbctzrZrXM2X05YjX08K7XHMztt36E=", "owner": "nix-community", "repo": "fenix", - "rev": "05f331e61277f70f55769060f783457fdacf8da1", + "rev": "7d9ba794daf5e8cc7ee728859bc688d8e26d5f06", "type": "github" }, "original": { @@ -230,11 +230,11 @@ ] }, "locked": { - "lastModified": 1741879521, - "narHash": "sha256-GylyCwdUe2Kd69bC8txEX+A3H/DXBZl2a+GcmTcJw/g=", + "lastModified": 1742569620, + "narHash": "sha256-igC2cu+cPRB3E4QwKR+vGagyAtoyB+DrmWwDKm8jkaw=", "owner": "nix-community", "repo": "home-manager", - "rev": "1b0efe3d335f452595512c7b275e5dddfbfb28a5", + "rev": "8a68f18e96bcab13e4f97bece61e6602298a3141", "type": "github" }, "original": { @@ -252,11 +252,11 @@ ] }, "locked": { - "lastModified": 1741874414, - "narHash": "sha256-gtIrDkG/iap32MYyaSAlWaixshiqMyFB9eKyhcF66eM=", + "lastModified": 1742465245, + "narHash": "sha256-gpjtkoeq5Ye9J8GoR+rWg3NL4bbEtcLvvF4nN6MtxdU=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "662d117ac0ffc81f3e91b5f0fb800c3effd904a1", + "rev": "a95606cae5c9e1f5b84debe7865ef171d4deb287", "type": "github" }, "original": { @@ -315,11 +315,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1742217307, - "narHash": "sha256-3fwpN7KN226ghLlpO9TR0/WpgQOmOj1e8bieUxpIYSk=", + "lastModified": 1742631601, + "narHash": "sha256-yJ3OOAmsGAxSl0bTmKUp3+cEYtSS+V6hUPK2rYhIPr8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "4f4d97d7b7be387286cc9c988760a7ebaa5be1f1", + "rev": "380ed15bcd6440606c6856db44a99140d422b46f", "type": "github" }, "original": { @@ -331,11 +331,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742069588, - "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=", + "lastModified": 1742422364, + "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5", + "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", "type": "github" }, "original": { @@ -384,11 +384,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1741807049, - "narHash": "sha256-/tH4gSW/0ePa2+0DAzk5xuHAa5qeaB4T8RnmiG3Ex4w=", + "lastModified": 1742296961, + "narHash": "sha256-gCpvEQOrugHWLimD1wTFOJHagnSEP6VYBDspq96Idu0=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "3fc655b239058deb93f503f9d25cc69a32ca7675", + "rev": "15d87419f1a123d8f888d608129c3ce3ff8f13d4", "type": "github" }, "original": { diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 8a3acd5..1e53337 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1742238842, - "narHash": "sha256-Z79yUJi+UGSpRC90NbHyuvBjGLkgEtlZaJ8DtzaGkzE=", + "lastModified": 1742588233, + "narHash": "sha256-Fi5g8H5FXMSRqy+mU6gPG0v+C9pzjYbkkiePtz8+PpA=", "owner": "nix-community", "repo": "home-manager", - "rev": "5a6e5a59a4d332edaa7d5d1604eb58ead27af851", + "rev": "296ddc64627f4a6a4eb447852d7346b9dd16197d", "type": "github" }, "original": { @@ -79,11 +79,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1742220949, - "narHash": "sha256-ZlPrKLM0FWUP36MNCJYGTlN4ZvoXZ4WY/ENKoaGU6yg=", + "lastModified": 1742643921, + "narHash": "sha256-tt6FIFIfOHcgKxi6fBD4RxIk3JoYF2WNpVE9jLWT7eI=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "5d8d116ac90f54e4c95bd5c9de31b8df477b12b9", + "rev": "ecd613c125c16295b52bb52f3687c5538b7d95ff", "type": "github" }, "original": { @@ -112,11 +112,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1742103165, - "narHash": "sha256-zAzMwvozlS2gmqdhrgeMz0PNp3kRDkwxIEfqWT3Hj6g=", + "lastModified": 1742641057, + "narHash": "sha256-+OhtlQPNOKmwK6YtAaXPu42jXe3ufi7hny78N8dqDKA=", "owner": "YaLTeR", "repo": "niri", - "rev": "287480b541e85b13ff6419d372f82fa8e42c603c", + "rev": "ed20822ce947198e4106698d7afffd0a832a7b3c", "type": "github" }, "original": { @@ -127,11 +127,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742069588, - "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=", + "lastModified": 1742422364, + "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5", + "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", "type": "github" }, "original": { @@ -143,11 +143,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1741862977, - "narHash": "sha256-prZ0M8vE/ghRGGZcflvxCu40ObKaB+ikn74/xQoNrGQ=", + "lastModified": 1742512142, + "narHash": "sha256-8XfURTDxOm6+33swQJu/hx6xw1Tznl8vJJN5HwVqckg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cdd2ef009676ac92b715ff26630164bb88fec4e0", + "rev": "7105ae3957700a9646cc4b766f5815b23ed0c682", "type": "github" }, "original": { @@ -174,11 +174,11 @@ ] }, "locked": { - "lastModified": 1742178793, - "narHash": "sha256-S2onMdoDS4tIYd3/Jc5oFEZBr2dJOgPrh9KzSO/bfDw=", + "lastModified": 1742610648, + "narHash": "sha256-9jWi3gw3fEIgEslnFjH/s1I+Iyf1+4t5B1Ed1FOiy8o=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "954582a766a50ebef5695a9616c93b5386418c08", + "rev": "c60d41987df3c853e2a842de2c63ded40400979b", "type": "github" }, "original": { @@ -222,11 +222,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1742083780, - "narHash": "sha256-cVLagXvI4jFbCe76tpvAWA2N2WF94Pl0PpgsGp2P6rM=", + "lastModified": 1742475924, + "narHash": "sha256-xe3tfHp1aisnUVrCbn1axwpeJzcrSOvQNn1bZt6k5DM=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "f9ec97b007547ad80147404335ed22e880dbd69d", + "rev": "1d98ee089c8bad414a346028a7a0f539ad7cfb9d", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1742239259, - "narHash": "sha256-khFVyLv9bjmWS5wKxgRqR0T/8b+5YUcOKKQc8cSIaZs=", + "lastModified": 1742614294, + "narHash": "sha256-bZbYlP/xqGyW2aVle742dFbc0npFnwJBzcEnXNywJgY=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "047d2684da0cf2d1a1db02eece61c90ce9dda32b", + "rev": "7fa9ec4e14d89e568ebaac302049980df7cf0cc9", "type": "github" }, "original": { From dd0313035ee5249d07d35aaff3a58394ad39c55d Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 22 Mar 2025 17:40:48 -0400 Subject: [PATCH 130/724] add formatter --- etcnixos/flake.nix | 1 + home-manager/flake.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/etcnixos/flake.nix b/etcnixos/flake.nix index e890630..fc5b090 100644 --- a/etcnixos/flake.nix +++ b/etcnixos/flake.nix @@ -45,6 +45,7 @@ ]; in { + formatter.${system} = nixpkgs.legacyPackages.${system}.nixfmt-rfc-style; nixosConfigurations = nixpkgs.lib.foldl' ( config: hostname: config diff --git a/home-manager/flake.nix b/home-manager/flake.nix index d70bbb4..7425912 100644 --- a/home-manager/flake.nix +++ b/home-manager/flake.nix @@ -64,6 +64,7 @@ pkgs = (import nixpkgs { }); in { + formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt-rfc-style; homeConfigurations."${username}" = home-manager.lib.homeManagerConfiguration { inherit pkgs; extraSpecialArgs = { From 6a3b7813988d1b55ff85772154d380e6b387714a Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 23 Mar 2025 01:50:48 -0400 Subject: [PATCH 131/724] use gimp 3.0 --- home-manager/flake.lock | 30 +++++++++++++++--------------- home-manager/flake.nix | 20 +++++++++++++++++++- 2 files changed, 34 insertions(+), 16 deletions(-) diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 1e53337..a44f859 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1742588233, - "narHash": "sha256-Fi5g8H5FXMSRqy+mU6gPG0v+C9pzjYbkkiePtz8+PpA=", + "lastModified": 1742701794, + "narHash": "sha256-bJIFFa6/4vBGoNmCwjO5TCIbiveV2BRxVLqHcxk5jXw=", "owner": "nix-community", "repo": "home-manager", - "rev": "296ddc64627f4a6a4eb447852d7346b9dd16197d", + "rev": "9172a6f956f7e0f7810861b9b1146f1c43d9abcb", "type": "github" }, "original": { @@ -79,11 +79,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1742643921, - "narHash": "sha256-tt6FIFIfOHcgKxi6fBD4RxIk3JoYF2WNpVE9jLWT7eI=", + "lastModified": 1742676311, + "narHash": "sha256-EZ+/JXbyE7r/e4tNftecWcWtzjb8YBOGLG75Z+rFgZg=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "ecd613c125c16295b52bb52f3687c5538b7d95ff", + "rev": "d56129adbc7cc099b44eb134d2c25e3e2201ec7f", "type": "github" }, "original": { @@ -174,11 +174,11 @@ ] }, "locked": { - "lastModified": 1742610648, - "narHash": "sha256-9jWi3gw3fEIgEslnFjH/s1I+Iyf1+4t5B1Ed1FOiy8o=", + "lastModified": 1742697269, + "narHash": "sha256-Lpp0XyAtIl1oGJzNmTiTGLhTkcUjwSkEb0gOiNzYFGM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c60d41987df3c853e2a842de2c63ded40400979b", + "rev": "01973c84732f9275c50c5f075dd1f54cc04b3316", "type": "github" }, "original": { @@ -222,11 +222,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1742475924, - "narHash": "sha256-xe3tfHp1aisnUVrCbn1axwpeJzcrSOvQNn1bZt6k5DM=", + "lastModified": 1742671548, + "narHash": "sha256-nJK70IyhyOXth5Dcyv7DKtv95TTZkqcAYHVj4Uq2Blw=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "1d98ee089c8bad414a346028a7a0f539ad7cfb9d", + "rev": "0fa13c6fb43ae26a597103989a42e44a03d2d827", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1742614294, - "narHash": "sha256-bZbYlP/xqGyW2aVle742dFbc0npFnwJBzcEnXNywJgY=", + "lastModified": 1742698959, + "narHash": "sha256-G1nR0xEgcw1Sb3movbxWHHij4Y3mROqxoEyii+o1K0A=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "7fa9ec4e14d89e568ebaac302049980df7cf0cc9", + "rev": "aec05d69a1bfb8c0b4d293d5f7f23452e00eaedc", "type": "github" }, "original": { diff --git a/home-manager/flake.nix b/home-manager/flake.nix index 7425912..c582df2 100644 --- a/home-manager/flake.nix +++ b/home-manager/flake.nix @@ -61,7 +61,25 @@ } ); - pkgs = (import nixpkgs { }); + pkgs' = + (import nixpkgs { + system = "x86_64-linux"; + }).applyPatches + { + name = "nixpkgs"; + src = inputs.nixpkgs; + patches = [ + # https://github.com/NixOS/nixpkgs/pull/67576 + # gimp 3.0 + (builtins.fetchurl { + url = "https://github.com/NixOS/nixpkgs/pull/67576.diff"; + sha256 = "02fk89563m2xfrl7kl9s1hh4bcppwrmd60j542kyl64nd2cvp9ss"; + }) + ]; + }; + pkgs = import pkgs' { + system = "x86_64-linux"; + }; in { formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt-rfc-style; From 18d79ffd8f0f71a2106458e03f5952dfcb2db740 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 23 Mar 2025 20:00:49 -0400 Subject: [PATCH 132/724] update --- etcnixos/flake.lock | 18 +++++++++--------- home-manager/flake.lock | 30 +++++++++++++++--------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index a27ed85..2f5a1b8 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -34,11 +34,11 @@ ] }, "locked": { - "lastModified": 1742647741, - "narHash": "sha256-hli9R2OONaRpyV5teQk+g73oBNQXFbKAZTHVY+AhKDI=", + "lastModified": 1742736978, + "narHash": "sha256-wagSECZiMywU2KcyM/V0cDZAkBJLOFCqL7fGCUzLR+E=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "f44e30fb15f34b57b741124448e959b2cae38eb8", + "rev": "1aea029a74c8f3a683451c882e24dc1218e0d682", "type": "github" }, "original": { @@ -230,11 +230,11 @@ ] }, "locked": { - "lastModified": 1742569620, - "narHash": "sha256-igC2cu+cPRB3E4QwKR+vGagyAtoyB+DrmWwDKm8jkaw=", + "lastModified": 1742701794, + "narHash": "sha256-bJIFFa6/4vBGoNmCwjO5TCIbiveV2BRxVLqHcxk5jXw=", "owner": "nix-community", "repo": "home-manager", - "rev": "8a68f18e96bcab13e4f97bece61e6602298a3141", + "rev": "9172a6f956f7e0f7810861b9b1146f1c43d9abcb", "type": "github" }, "original": { @@ -331,11 +331,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742422364, - "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", + "lastModified": 1742669843, + "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", + "rev": "1e5b653dff12029333a6546c11e108ede13052eb", "type": "github" }, "original": { diff --git a/home-manager/flake.lock b/home-manager/flake.lock index a44f859..50ef814 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1742701794, - "narHash": "sha256-bJIFFa6/4vBGoNmCwjO5TCIbiveV2BRxVLqHcxk5jXw=", + "lastModified": 1742756669, + "narHash": "sha256-55QHo/lETkGO4lUfxhJ6TUs5OLOz5Ks7JDNAKDzpt4I=", "owner": "nix-community", "repo": "home-manager", - "rev": "9172a6f956f7e0f7810861b9b1146f1c43d9abcb", + "rev": "0e75a40458d065d1e5c6a10d0b74b9e35b550ae6", "type": "github" }, "original": { @@ -79,11 +79,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1742676311, - "narHash": "sha256-EZ+/JXbyE7r/e4tNftecWcWtzjb8YBOGLG75Z+rFgZg=", + "lastModified": 1742723611, + "narHash": "sha256-Xy6+LQwqNkukjFUeOBKToNKhAffLnHWtEpx5hO3rdDs=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "d56129adbc7cc099b44eb134d2c25e3e2201ec7f", + "rev": "ea05bfe7a7c67c5e664769e77edd86c677b30acb", "type": "github" }, "original": { @@ -112,11 +112,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1742641057, - "narHash": "sha256-+OhtlQPNOKmwK6YtAaXPu42jXe3ufi7hny78N8dqDKA=", + "lastModified": 1742719554, + "narHash": "sha256-zBB/Niset99u6/b6z9hS2IYfDigDI9huiG0QXvDKDS4=", "owner": "YaLTeR", "repo": "niri", - "rev": "ed20822ce947198e4106698d7afffd0a832a7b3c", + "rev": "c709696237f3e963225b8df248538cc691ccba3d", "type": "github" }, "original": { @@ -127,11 +127,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742422364, - "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", + "lastModified": 1742669843, + "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", + "rev": "1e5b653dff12029333a6546c11e108ede13052eb", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1742698959, - "narHash": "sha256-G1nR0xEgcw1Sb3movbxWHHij4Y3mROqxoEyii+o1K0A=", + "lastModified": 1742736106, + "narHash": "sha256-wzdYoYASPlITYBiw2xDyE56DnOcLNsO6QHRGUDj6kq4=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "aec05d69a1bfb8c0b4d293d5f7f23452e00eaedc", + "rev": "7c3008fcc5a436c885d3faaf6d058afc41ae3762", "type": "github" }, "original": { From 259c4ceb36f2e5c4ac2dd57bb4a8f9bd70f4b87d Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 23 Mar 2025 21:55:47 -0400 Subject: [PATCH 133/724] build system from repo instead --- justfile | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/justfile b/justfile index 46539ed..ad5c97e 100644 --- a/justfile +++ b/justfile @@ -1,19 +1,15 @@ -update_all: system_update home_update sync_configs +update_all: system_update home_update format_home: - nixfmt ~/.config/home-manager + nixfmt ./home-manager format_system: - doas nixfmt /etc/nixos + nixfmt ./etcnixos system_update: - nh os boot -u /etc/nixos + nh os boot -u ./etcnixos 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/ + nh home switch -u ./home-manager -- --impure From 8a84d77cfd9cfdc24841e3b7b0e0a7f5c0d7a822 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 23 Mar 2025 23:26:39 -0400 Subject: [PATCH 134/724] update --- home-manager/flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 50ef814..79d7aec 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1742756669, - "narHash": "sha256-55QHo/lETkGO4lUfxhJ6TUs5OLOz5Ks7JDNAKDzpt4I=", + "lastModified": 1742771635, + "narHash": "sha256-HQHzQPrg+g22tb3/K/4tgJjPzM+/5jbaujCZd8s2Mls=", "owner": "nix-community", "repo": "home-manager", - "rev": "0e75a40458d065d1e5c6a10d0b74b9e35b550ae6", + "rev": "ad0614a1ec9cce3b13169e20ceb7e55dfaf2a818", "type": "github" }, "original": { @@ -174,11 +174,11 @@ ] }, "locked": { - "lastModified": 1742697269, - "narHash": "sha256-Lpp0XyAtIl1oGJzNmTiTGLhTkcUjwSkEb0gOiNzYFGM=", + "lastModified": 1742783666, + "narHash": "sha256-IwdSl51NL6V0f+mYXZR0UTKaGleOsk9zV3l6kt5SUWw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "01973c84732f9275c50c5f075dd1f54cc04b3316", + "rev": "60766d63c227d576510ecfb5edd3a687d56f6bc7", "type": "github" }, "original": { From 44f53877df7baf18e970ae4fe9ace82e9d1400b0 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 24 Mar 2025 13:22:14 -0400 Subject: [PATCH 135/724] add delay to fancontrol and lactd to wait for gpu --- etcnixos/system-yarn.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/etcnixos/system-yarn.nix b/etcnixos/system-yarn.nix index fe3bfff..43dc8d3 100644 --- a/etcnixos/system-yarn.nix +++ b/etcnixos/system-yarn.nix @@ -71,6 +71,8 @@ systemd.packages = with pkgs; [ lact ]; systemd.services.lactd.wantedBy = [ "multi-user.target" ]; + systemd.services.lactd.serviceConfig.ExecStartPre = "${lib.getExe pkgs.bash} -c \"sleep 3s\""; + # control case fans with gpu temperature # I have case fans attached to my gpu for better cooling hardware.fancontrol = { @@ -93,4 +95,6 @@ MAXPWM=${fan_speed}=255 ''; }; + + systemd.services.fancontrol.serviceConfig.ExecStartPre = "${lib.getExe pkgs.bash} -c \"sleep 3s\""; } From 44c8f21f0b850f2adc946ce5e3754a1e8e345772 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 24 Mar 2025 10:02:55 -0400 Subject: [PATCH 136/724] vr: add PR info about OPENCOMPOSITE_SEARCH_PATH --- etcnixos/vr.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/etcnixos/vr.nix b/etcnixos/vr.nix index 55327b0..7a3253f 100644 --- a/etcnixos/vr.nix +++ b/etcnixos/vr.nix @@ -15,6 +15,7 @@ openFirewall = true; package = ( + # https://github.com/NixOS/nixpkgs/pull/391367 pkgs.wivrn.overrideAttrs (old: { cmakeFlags = old.cmakeFlags ++ [ (lib.cmakeFeature "OPENCOMPOSITE_SEARCH_PATH" "${pkgs.opencomposite}/lib/opencomposite") From 02194efcb193d6e14ad6f6f2695f2bf35d4d5f91 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 24 Mar 2025 10:24:56 -0400 Subject: [PATCH 137/724] add mistralrs --- etcnixos/flake.lock | 6 +++--- home-manager/flake.nix | 22 +++++++--------------- home-manager/no-gui.nix | 3 +++ home-manager/progs/gpt4all/gpt4all.nix | 19 ++++++------------- 4 files changed, 19 insertions(+), 31 deletions(-) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 2f5a1b8..f25130c 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -315,11 +315,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1742631601, - "narHash": "sha256-yJ3OOAmsGAxSl0bTmKUp3+cEYtSS+V6hUPK2rYhIPr8=", + "lastModified": 1742806253, + "narHash": "sha256-zvQ4GsCJT6MTOzPKLmlFyM+lxo0JGQ0cSFaZSACmWfY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "380ed15bcd6440606c6856db44a99140d422b46f", + "rev": "ecaa2d911e77c265c2a5bac8b583c40b0f151726", "type": "github" }, "original": { diff --git a/home-manager/flake.nix b/home-manager/flake.nix index c582df2..285639b 100644 --- a/home-manager/flake.nix +++ b/home-manager/flake.nix @@ -46,21 +46,6 @@ 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 { system = "x86_64-linux"; @@ -75,6 +60,13 @@ url = "https://github.com/NixOS/nixpkgs/pull/67576.diff"; sha256 = "02fk89563m2xfrl7kl9s1hh4bcppwrmd60j542kyl64nd2cvp9ss"; }) + + # mistral-rs 0.5.0 + # https://github.com/NixOS/nixpkgs/pull/392645 + (builtins.fetchurl { + url = "https://github.com/NixOS/nixpkgs/pull/392645.diff"; + sha256 = "1sc65jfx5ngsa4zkfnybg6ma65g2wgzd6ac1gajxwqni5470i5rq"; + }) ]; }; pkgs = import pkgs' { diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 900955a..a99a14b 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -172,6 +172,9 @@ # java assembler jasmin + + # rust-written LLM inference + mistral-rs ]; # https://github.com/flamegraph-rs/flamegraph diff --git a/home-manager/progs/gpt4all/gpt4all.nix b/home-manager/progs/gpt4all/gpt4all.nix index 106d123..54ff867 100644 --- a/home-manager/progs/gpt4all/gpt4all.nix +++ b/home-manager/progs/gpt4all/gpt4all.nix @@ -31,19 +31,12 @@ let ]; 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" - ] + pkgs.gpt4all.overrideAttrs (old: { + patches = old.patches ++ [ + ./disable-settings-err.patch + ./disable-version-check.patch + ]; + }) ); 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."; From c71c65d162f71b3900f0fc1bbbc82ae76f3a1f9f Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 24 Mar 2025 15:23:28 -0400 Subject: [PATCH 138/724] justfile: add format target --- justfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/justfile b/justfile index ad5c97e..441528d 100644 --- a/justfile +++ b/justfile @@ -6,6 +6,8 @@ format_home: format_system: nixfmt ./etcnixos +format: format_home format_system + system_update: nh os boot -u ./etcnixos From ec3eb3a30eae54b9330ca28921328c5967d3737d Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 24 Mar 2025 19:58:57 -0400 Subject: [PATCH 139/724] whoops --- home-manager/flake.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home-manager/flake.nix b/home-manager/flake.nix index 285639b..26d5318 100644 --- a/home-manager/flake.nix +++ b/home-manager/flake.nix @@ -82,7 +82,6 @@ inputs username homeDirectory - optimizeWithFlags ; }; From a6568ad389bdd5d5b1bdbd3acb6e294f44ddcf1e Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 25 Mar 2025 11:37:04 -0400 Subject: [PATCH 140/724] flake update --- etcnixos/flake.lock | 6 +++--- home-manager/flake.lock | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index f25130c..ef56975 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -34,11 +34,11 @@ ] }, "locked": { - "lastModified": 1742736978, - "narHash": "sha256-wagSECZiMywU2KcyM/V0cDZAkBJLOFCqL7fGCUzLR+E=", + "lastModified": 1742895049, + "narHash": "sha256-yW6jHx1SxPwCyvjV1oXdXBN15I19TQMfmvhWYa3+igQ=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "1aea029a74c8f3a683451c882e24dc1218e0d682", + "rev": "d64bc1983d0be93e9d6db032698c7519ab99af56", "type": "github" }, "original": { diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 79d7aec..29025cf 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1742771635, - "narHash": "sha256-HQHzQPrg+g22tb3/K/4tgJjPzM+/5jbaujCZd8s2Mls=", + "lastModified": 1742871411, + "narHash": "sha256-F3xBdOs5m0SE6Gq3jz+JxDOPvsLs22vbGfD05uF6xEc=", "owner": "nix-community", "repo": "home-manager", - "rev": "ad0614a1ec9cce3b13169e20ceb7e55dfaf2a818", + "rev": "869f2ec2add75ce2a70a6dbbf585b8399abec625", "type": "github" }, "original": { @@ -79,11 +79,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1742723611, - "narHash": "sha256-Xy6+LQwqNkukjFUeOBKToNKhAffLnHWtEpx5hO3rdDs=", + "lastModified": 1742832363, + "narHash": "sha256-STJUQ7PVfjlWdHSuxXDH/UZNjrUVO1Up/x2AwhtJRio=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "ea05bfe7a7c67c5e664769e77edd86c677b30acb", + "rev": "8720365191e3931cefd3fc9484dccba5e219b73d", "type": "github" }, "original": { @@ -174,11 +174,11 @@ ] }, "locked": { - "lastModified": 1742783666, - "narHash": "sha256-IwdSl51NL6V0f+mYXZR0UTKaGleOsk9zV3l6kt5SUWw=", + "lastModified": 1742870002, + "narHash": "sha256-eQnw8ufyLmrboODU8RKVNh2Mv7SACzdoFrRUV5zdNNE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "60766d63c227d576510ecfb5edd3a687d56f6bc7", + "rev": "b4c18f262dbebecb855136c1ed8047b99a9c75b6", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1742736106, - "narHash": "sha256-wzdYoYASPlITYBiw2xDyE56DnOcLNsO6QHRGUDj6kq4=", + "lastModified": 1742871532, + "narHash": "sha256-ciC3zul202dnIwpAplSaCJTeXOUce7Pl1d+SMFwPQls=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "7c3008fcc5a436c885d3faaf6d058afc41ae3762", + "rev": "bef72020b20475847f24cd27134dca06724d4ba7", "type": "github" }, "original": { From 3e87d8ff7335309016afe4402166789d4cc7e155 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 25 Mar 2025 23:43:03 -0400 Subject: [PATCH 141/724] secureboot keys things --- etcnixos/system-mreow.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/etcnixos/system-mreow.nix b/etcnixos/system-mreow.nix index 5d00398..fecb706 100644 --- a/etcnixos/system-mreow.nix +++ b/etcnixos/system-mreow.nix @@ -65,7 +65,7 @@ in lanzaboote = { enable = true; # TODO: proper secrets management so this is not stored in nix store - pkiBundle = "${(untar { src = "${./secrets/secureboot.tar}"; })}"; + pkiBundle = "/var/lib/sbctl"; }; # Bootloader. @@ -80,6 +80,19 @@ in }; }; + system.activationScripts = { + # extract all my secureboot keys + "secureboot-keys".text = '' + #!/bin/sh + rm -fr ${config.boot.lanzaboote.pkiBundle} || true + mkdir -p ${config.boot.lanzaboote.pkiBundle} + ${pkgs.gnutar}/bin/tar xf ${./secrets/secureboot.tar} -C ${config.boot.lanzaboote.pkiBundle} + chown -R root:wheel ${config.boot.lanzaboote.pkiBundle} + chmod -R 700 ${config.boot.lanzaboote.pkiBundle} + ''; + }; + + programs.gamescope = { enable = true; capSysNice = true; From da8149e141930c8608f431aca886d369f0011736 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 26 Mar 2025 00:53:16 -0400 Subject: [PATCH 142/724] update --- etcnixos/flake.lock | 12 +++++------ etcnixos/system-mreow.nix | 6 +----- etcnixos/util/untar.nix | 21 -------------------- home-manager/flake.lock | 42 +++++++++++++++++++-------------------- 4 files changed, 28 insertions(+), 53 deletions(-) delete mode 100644 etcnixos/util/untar.nix diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index ef56975..d920b4f 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -34,11 +34,11 @@ ] }, "locked": { - "lastModified": 1742895049, - "narHash": "sha256-yW6jHx1SxPwCyvjV1oXdXBN15I19TQMfmvhWYa3+igQ=", + "lastModified": 1742921081, + "narHash": "sha256-c1mq2EwulIoLng2oww3IozEGTarxuCBRJ5w5KIS0Mf4=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "d64bc1983d0be93e9d6db032698c7519ab99af56", + "rev": "ef953b78549dc877d958d002a8661cbb65e87a1f", "type": "github" }, "original": { @@ -230,11 +230,11 @@ ] }, "locked": { - "lastModified": 1742701794, - "narHash": "sha256-bJIFFa6/4vBGoNmCwjO5TCIbiveV2BRxVLqHcxk5jXw=", + "lastModified": 1742871411, + "narHash": "sha256-F3xBdOs5m0SE6Gq3jz+JxDOPvsLs22vbGfD05uF6xEc=", "owner": "nix-community", "repo": "home-manager", - "rev": "9172a6f956f7e0f7810861b9b1146f1c43d9abcb", + "rev": "869f2ec2add75ce2a70a6dbbf585b8399abec625", "type": "github" }, "original": { diff --git a/etcnixos/system-mreow.nix b/etcnixos/system-mreow.nix index fecb706..000abc6 100644 --- a/etcnixos/system-mreow.nix +++ b/etcnixos/system-mreow.nix @@ -6,10 +6,6 @@ inputs, ... }: - -let - untar = pkgs.callPackage ./util/untar.nix; -in { imports = [ ./common.nix @@ -88,7 +84,7 @@ in mkdir -p ${config.boot.lanzaboote.pkiBundle} ${pkgs.gnutar}/bin/tar xf ${./secrets/secureboot.tar} -C ${config.boot.lanzaboote.pkiBundle} chown -R root:wheel ${config.boot.lanzaboote.pkiBundle} - chmod -R 700 ${config.boot.lanzaboote.pkiBundle} + chmod -R 500 ${config.boot.lanzaboote.pkiBundle} ''; }; diff --git a/etcnixos/util/untar.nix b/etcnixos/util/untar.nix deleted file mode 100644 index f5bb304..0000000 --- a/etcnixos/util/untar.nix +++ /dev/null @@ -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/ - ''; -} diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 29025cf..f4180aa 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1742871411, - "narHash": "sha256-F3xBdOs5m0SE6Gq3jz+JxDOPvsLs22vbGfD05uF6xEc=", + "lastModified": 1742957044, + "narHash": "sha256-gwW0tBIA77g6qq45y220drTy0DmThF3fJMwVFUtYV9c=", "owner": "nix-community", "repo": "home-manager", - "rev": "869f2ec2add75ce2a70a6dbbf585b8399abec625", + "rev": "ce287a5cd3ef78203bc78021447f937a988d9f6f", "type": "github" }, "original": { @@ -79,11 +79,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1742832363, - "narHash": "sha256-STJUQ7PVfjlWdHSuxXDH/UZNjrUVO1Up/x2AwhtJRio=", + "lastModified": 1742954683, + "narHash": "sha256-ZJBJzpWQcZYuxiX7YbLCaiZl1aOt8xQphXt0ZO0st+8=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "8720365191e3931cefd3fc9484dccba5e219b73d", + "rev": "41db28938147dfa2a2d528f24b59b6962b96f0c5", "type": "github" }, "original": { @@ -112,11 +112,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1742719554, - "narHash": "sha256-zBB/Niset99u6/b6z9hS2IYfDigDI9huiG0QXvDKDS4=", + "lastModified": 1742877599, + "narHash": "sha256-3Xy1mlAUcYSQSpt0Q/flA+o6Y1ZACDW52vVP2CX52w8=", "owner": "YaLTeR", "repo": "niri", - "rev": "c709696237f3e963225b8df248538cc691ccba3d", + "rev": "4534d3726676a403eb3dd19d28371bd8acd98401", "type": "github" }, "original": { @@ -143,11 +143,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1742512142, - "narHash": "sha256-8XfURTDxOm6+33swQJu/hx6xw1Tznl8vJJN5HwVqckg=", + "lastModified": 1742751704, + "narHash": "sha256-rBfc+H1dDBUQ2mgVITMGBPI1PGuCznf9rcWX/XIULyE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7105ae3957700a9646cc4b766f5815b23ed0c682", + "rev": "f0946fa5f1fb876a9dc2e1850d9d3a4e3f914092", "type": "github" }, "original": { @@ -174,11 +174,11 @@ ] }, "locked": { - "lastModified": 1742870002, - "narHash": "sha256-eQnw8ufyLmrboODU8RKVNh2Mv7SACzdoFrRUV5zdNNE=", + "lastModified": 1742956365, + "narHash": "sha256-Slrqmt6kJ/M7Z/ce4ebQWsz2aeEodrX56CsupOEPoz0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "b4c18f262dbebecb855136c1ed8047b99a9c75b6", + "rev": "a0e3395c63cdbc9c1ec17915f8328c077c79c4a1", "type": "github" }, "original": { @@ -222,11 +222,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1742671548, - "narHash": "sha256-nJK70IyhyOXth5Dcyv7DKtv95TTZkqcAYHVj4Uq2Blw=", + "lastModified": 1742773235, + "narHash": "sha256-YhJex62HHVF6EfdGLIC01uM6jH8XJu5ryZ+LlhG7wMs=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "0fa13c6fb43ae26a597103989a42e44a03d2d827", + "rev": "b2613aec05f9e3f8488ef924203d62cafb712642", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1742871532, - "narHash": "sha256-ciC3zul202dnIwpAplSaCJTeXOUce7Pl1d+SMFwPQls=", + "lastModified": 1742957876, + "narHash": "sha256-gMW/S6xEpzfPkFt/pE6bi3wd4/eVPOYKZGDUz9vVML4=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "bef72020b20475847f24cd27134dca06724d4ba7", + "rev": "1e40a8e9fa79991940c17a2e6d354346c73ad002", "type": "github" }, "original": { From 7bda2802930af9372603b109444ae8cb077c5515 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 26 Mar 2025 01:06:51 -0400 Subject: [PATCH 143/724] home: cleanup pkgs import and patching --- etcnixos/system-mreow.nix | 1 - home-manager/flake.nix | 43 ++++++++++++++++++--------------------- 2 files changed, 20 insertions(+), 24 deletions(-) diff --git a/etcnixos/system-mreow.nix b/etcnixos/system-mreow.nix index 000abc6..56d1902 100644 --- a/etcnixos/system-mreow.nix +++ b/etcnixos/system-mreow.nix @@ -88,7 +88,6 @@ ''; }; - programs.gamescope = { enable = true; capSysNice = true; diff --git a/home-manager/flake.nix b/home-manager/flake.nix index 26d5318..d57d3e0 100644 --- a/home-manager/flake.nix +++ b/home-manager/flake.nix @@ -46,32 +46,29 @@ homeDirectory = "/home/${username}"; hostname = nixpkgs.lib.strings.removeSuffix "\n" (builtins.readFile /etc/hostname); - pkgs' = + pkgs = import ( (import nixpkgs { - system = "x86_64-linux"; }).applyPatches - { - name = "nixpkgs"; - src = inputs.nixpkgs; - patches = [ - # https://github.com/NixOS/nixpkgs/pull/67576 - # gimp 3.0 - (builtins.fetchurl { - url = "https://github.com/NixOS/nixpkgs/pull/67576.diff"; - sha256 = "02fk89563m2xfrl7kl9s1hh4bcppwrmd60j542kyl64nd2cvp9ss"; - }) + { + name = "nixpkgs"; + src = inputs.nixpkgs; + patches = [ + # https://github.com/NixOS/nixpkgs/pull/67576 + # gimp 3.0 + (builtins.fetchurl { + url = "https://github.com/NixOS/nixpkgs/pull/67576.diff"; + sha256 = "02fk89563m2xfrl7kl9s1hh4bcppwrmd60j542kyl64nd2cvp9ss"; + }) - # mistral-rs 0.5.0 - # https://github.com/NixOS/nixpkgs/pull/392645 - (builtins.fetchurl { - url = "https://github.com/NixOS/nixpkgs/pull/392645.diff"; - sha256 = "1sc65jfx5ngsa4zkfnybg6ma65g2wgzd6ac1gajxwqni5470i5rq"; - }) - ]; - }; - pkgs = import pkgs' { - system = "x86_64-linux"; - }; + # mistral-rs 0.5.0 + # https://github.com/NixOS/nixpkgs/pull/392645 + (builtins.fetchurl { + url = "https://github.com/NixOS/nixpkgs/pull/392645.diff"; + sha256 = "1sc65jfx5ngsa4zkfnybg6ma65g2wgzd6ac1gajxwqni5470i5rq"; + }) + ]; + } + ) { }; in { formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt-rfc-style; From ae751ba33afd8ea081b868d19cd96172a5025515 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 26 Mar 2025 01:20:21 -0400 Subject: [PATCH 144/724] home: remove unneeded import --- home-manager/flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/flake.nix b/home-manager/flake.nix index d57d3e0..9626ecc 100644 --- a/home-manager/flake.nix +++ b/home-manager/flake.nix @@ -88,7 +88,7 @@ agenix.homeManagerModules.age ( - { pkgs, ... }: + { ... }: { nixpkgs.overlays = [ rust-overlay.overlays.default From 7dbcd6fa352edb9a200f3fbe3bdfa822ec0a3230 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 26 Mar 2025 10:04:08 -0400 Subject: [PATCH 145/724] update --- etcnixos/flake.lock | 6 +++--- home-manager/flake.lock | 12 ++++++------ home-manager/flake.nix | 7 ------- home-manager/no-gui.nix | 2 +- 4 files changed, 10 insertions(+), 17 deletions(-) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index d920b4f..5efa63d 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -331,11 +331,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742669843, - "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=", + "lastModified": 1742889210, + "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1e5b653dff12029333a6546c11e108ede13052eb", + "rev": "698214a32beb4f4c8e3942372c694f40848b360d", "type": "github" }, "original": { diff --git a/home-manager/flake.lock b/home-manager/flake.lock index f4180aa..0123124 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -127,11 +127,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742669843, - "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=", + "lastModified": 1742889210, + "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1e5b653dff12029333a6546c11e108ede13052eb", + "rev": "698214a32beb4f4c8e3942372c694f40848b360d", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1742957876, - "narHash": "sha256-gMW/S6xEpzfPkFt/pE6bi3wd4/eVPOYKZGDUz9vVML4=", + "lastModified": 1742973471, + "narHash": "sha256-nneE0lIst5IDINF6+dW6Xgp8KNmsC12pb05Ws+wXkVQ=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "1e40a8e9fa79991940c17a2e6d354346c73ad002", + "rev": "bae854c6767fb5c004cd7a4049a77be9da1b16db", "type": "github" }, "original": { diff --git a/home-manager/flake.nix b/home-manager/flake.nix index 9626ecc..1330b53 100644 --- a/home-manager/flake.nix +++ b/home-manager/flake.nix @@ -59,13 +59,6 @@ url = "https://github.com/NixOS/nixpkgs/pull/67576.diff"; sha256 = "02fk89563m2xfrl7kl9s1hh4bcppwrmd60j542kyl64nd2cvp9ss"; }) - - # mistral-rs 0.5.0 - # https://github.com/NixOS/nixpkgs/pull/392645 - (builtins.fetchurl { - url = "https://github.com/NixOS/nixpkgs/pull/392645.diff"; - sha256 = "1sc65jfx5ngsa4zkfnybg6ma65g2wgzd6ac1gajxwqni5470i5rq"; - }) ]; } ) { }; diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index a99a14b..ba7ef27 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -162,7 +162,7 @@ tcpdump cargo-flamegraph - linuxKernel.packages.linux_6_11.perf + linuxKernel.packages.linux_6_14.perf borgbackup From 4efe9da3c57f7b3957251451620562aa64325c5e Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 27 Mar 2025 13:41:41 -0400 Subject: [PATCH 146/724] gimp: update 3.0 patch --- home-manager/flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/flake.nix b/home-manager/flake.nix index 1330b53..e536f85 100644 --- a/home-manager/flake.nix +++ b/home-manager/flake.nix @@ -57,7 +57,7 @@ # gimp 3.0 (builtins.fetchurl { url = "https://github.com/NixOS/nixpkgs/pull/67576.diff"; - sha256 = "02fk89563m2xfrl7kl9s1hh4bcppwrmd60j542kyl64nd2cvp9ss"; + sha256 = "1mkddzzdkl2md1zfkdpbn17kzxa4bs7gfc4h2f4frjjhk0mqaxsn"; }) ]; } From f7825a2b9ea29d0ffcd45834f11e784e46264034 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 27 Mar 2025 13:42:59 -0400 Subject: [PATCH 147/724] lock update --- etcnixos/flake.lock | 6 +++--- home-manager/flake.lock | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 5efa63d..e0d1e23 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -34,11 +34,11 @@ ] }, "locked": { - "lastModified": 1742921081, - "narHash": "sha256-c1mq2EwulIoLng2oww3IozEGTarxuCBRJ5w5KIS0Mf4=", + "lastModified": 1743000413, + "narHash": "sha256-3F9ap1452VmR8xDjUmeCf9h2nnRIODY4Fh5RnCr0d0s=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "ef953b78549dc877d958d002a8661cbb65e87a1f", + "rev": "21c2b03a213775c88eb0738f9ceb2e02b8463981", "type": "github" }, "original": { diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 0123124..9f79347 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1742957044, - "narHash": "sha256-gwW0tBIA77g6qq45y220drTy0DmThF3fJMwVFUtYV9c=", + "lastModified": 1743082807, + "narHash": "sha256-qmrCYHVqE6j0TQApfxGx8aRYNdNsqtOrZuH09A+cjTU=", "owner": "nix-community", "repo": "home-manager", - "rev": "ce287a5cd3ef78203bc78021447f937a988d9f6f", + "rev": "171915bfce41018528fda9960211e81946d999b7", "type": "github" }, "original": { @@ -174,11 +174,11 @@ ] }, "locked": { - "lastModified": 1742956365, - "narHash": "sha256-Slrqmt6kJ/M7Z/ce4ebQWsz2aeEodrX56CsupOEPoz0=", + "lastModified": 1743042789, + "narHash": "sha256-yPlxN0r3pQjUIwyX/qeWSTdpHjWy/AfmM0PK1bYkO18=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a0e3395c63cdbc9c1ec17915f8328c077c79c4a1", + "rev": "b4d2dee9d16e7725b71969f28862ded3a94a7934", "type": "github" }, "original": { From 4da863489c290eb8170349664f57d9fa603186d9 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 27 Mar 2025 23:21:53 -0400 Subject: [PATCH 148/724] gimp: update 3.0 patch --- home-manager/flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/flake.nix b/home-manager/flake.nix index e536f85..f1d98ed 100644 --- a/home-manager/flake.nix +++ b/home-manager/flake.nix @@ -57,7 +57,7 @@ # gimp 3.0 (builtins.fetchurl { url = "https://github.com/NixOS/nixpkgs/pull/67576.diff"; - sha256 = "1mkddzzdkl2md1zfkdpbn17kzxa4bs7gfc4h2f4frjjhk0mqaxsn"; + sha256 = "0zcpzr9yh3yiigm64kfx3a3sx1zjzz5bbgznnlhs5mf4zjssyf59"; }) ]; } From dcdef056d270bc6046f750e8e193d64aa265ec38 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 28 Mar 2025 10:46:30 -0400 Subject: [PATCH 149/724] gimp: update 3.0 patch --- home-manager/flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/flake.nix b/home-manager/flake.nix index f1d98ed..db9561e 100644 --- a/home-manager/flake.nix +++ b/home-manager/flake.nix @@ -57,7 +57,7 @@ # gimp 3.0 (builtins.fetchurl { url = "https://github.com/NixOS/nixpkgs/pull/67576.diff"; - sha256 = "0zcpzr9yh3yiigm64kfx3a3sx1zjzz5bbgznnlhs5mf4zjssyf59"; + sha256 = "13m70acfazxipx9gwgsrqsivamfpb839cznn5hsz8745jl01yq1w"; }) ]; } From 57141ef6e7149f22acd1f3861c556159c025eeeb Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 28 Mar 2025 10:46:42 -0400 Subject: [PATCH 150/724] cargo-edit --- home-manager/no-gui.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index ba7ef27..6b05a7e 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -33,6 +33,7 @@ targets = [ "thumbv7m-none-eabi" ]; })) cargo-expand + cargo-edit # cargo upgrade and stuff cargo-pgo rust-script bolt_19 From 4b46edc98260bb72b9d57ce977e86322af4493a5 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 28 Mar 2025 10:46:51 -0400 Subject: [PATCH 151/724] update --- home-manager/flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 9f79347..94f8aa5 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1743082807, - "narHash": "sha256-qmrCYHVqE6j0TQApfxGx8aRYNdNsqtOrZuH09A+cjTU=", + "lastModified": 1743136572, + "narHash": "sha256-uwaVrKgi6g1TUq56247j6QvvFtYHloCkjCrEpGBvV54=", "owner": "nix-community", "repo": "home-manager", - "rev": "171915bfce41018528fda9960211e81946d999b7", + "rev": "1efd2503172016a6742c87b47b43ca2c8145607d", "type": "github" }, "original": { @@ -79,11 +79,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1742954683, - "narHash": "sha256-ZJBJzpWQcZYuxiX7YbLCaiZl1aOt8xQphXt0ZO0st+8=", + "lastModified": 1743151665, + "narHash": "sha256-Aiy00UNzuu74OHV/bMXtCLLJJA4+e6fvstSaTIPfFjk=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "41db28938147dfa2a2d528f24b59b6962b96f0c5", + "rev": "af777439cd6a35b27831a57bd99d8fe44d22fbd9", "type": "github" }, "original": { @@ -174,11 +174,11 @@ ] }, "locked": { - "lastModified": 1743042789, - "narHash": "sha256-yPlxN0r3pQjUIwyX/qeWSTdpHjWy/AfmM0PK1bYkO18=", + "lastModified": 1743129211, + "narHash": "sha256-gE8t+U9miTwm2NYWS9dFY8H1/QB4ifaFDq1KdV9KEqo=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "b4d2dee9d16e7725b71969f28862ded3a94a7934", + "rev": "f93da1d26ba9963f34f94a6872b67a7939699543", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1742973471, - "narHash": "sha256-nneE0lIst5IDINF6+dW6Xgp8KNmsC12pb05Ws+wXkVQ=", + "lastModified": 1743132999, + "narHash": "sha256-cEqYQFxW8Uua64LckWpGrrqKIbPs/u+j2RnanhX35Js=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "bae854c6767fb5c004cd7a4049a77be9da1b16db", + "rev": "9c81e4bb852d4bcb1ba525fa20d7cd2778453d2d", "type": "github" }, "original": { From bec4faa25eb9a4ea3869fce104df001fe7721472 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 29 Mar 2025 12:24:25 -0400 Subject: [PATCH 152/724] update --- etcnixos/flake.lock | 24 +++++++++++------------ home-manager/flake.lock | 42 ++++++++++++++++++++--------------------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index e0d1e23..4aa7239 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -34,11 +34,11 @@ ] }, "locked": { - "lastModified": 1743000413, - "narHash": "sha256-3F9ap1452VmR8xDjUmeCf9h2nnRIODY4Fh5RnCr0d0s=", + "lastModified": 1743207540, + "narHash": "sha256-p73hfMUXA+lgs1WuXuvVbF4Os+g1wAH9Ki7gh+L/imA=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "21c2b03a213775c88eb0738f9ceb2e02b8463981", + "rev": "eda326ed81aadd18470551ba8e4f680995f82ea3", "type": "github" }, "original": { @@ -230,11 +230,11 @@ ] }, "locked": { - "lastModified": 1742871411, - "narHash": "sha256-F3xBdOs5m0SE6Gq3jz+JxDOPvsLs22vbGfD05uF6xEc=", + "lastModified": 1743097780, + "narHash": "sha256-5tUbaMBKYbfTe/4aXACxmiXG22TgwPBNcfZ8Kg3rt+g=", "owner": "nix-community", "repo": "home-manager", - "rev": "869f2ec2add75ce2a70a6dbbf585b8399abec625", + "rev": "b14a70c40f4fd0b73d095ab04a7c6e31fbc18e52", "type": "github" }, "original": { @@ -315,11 +315,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1742806253, - "narHash": "sha256-zvQ4GsCJT6MTOzPKLmlFyM+lxo0JGQ0cSFaZSACmWfY=", + "lastModified": 1743167577, + "narHash": "sha256-I09SrXIO0UdyBFfh0fxDq5WnCDg8XKmZ1HQbaXzMA1k=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "ecaa2d911e77c265c2a5bac8b583c40b0f151726", + "rev": "0ed819e708af17bfc4bbc63ee080ef308a24aa42", "type": "github" }, "original": { @@ -331,11 +331,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742889210, - "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=", + "lastModified": 1743095683, + "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "698214a32beb4f4c8e3942372c694f40848b360d", + "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6", "type": "github" }, "original": { diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 94f8aa5..c8543c1 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1743136572, - "narHash": "sha256-uwaVrKgi6g1TUq56247j6QvvFtYHloCkjCrEpGBvV54=", + "lastModified": 1743259333, + "narHash": "sha256-2Fi3K++co4IGbeOLGXdRA6VEfbzQzMgcuBaPTyjfj0s=", "owner": "nix-community", "repo": "home-manager", - "rev": "1efd2503172016a6742c87b47b43ca2c8145607d", + "rev": "1f679ed2a2ebe3894bad9f89fb0bd9f141c28a68", "type": "github" }, "original": { @@ -79,11 +79,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1743151665, - "narHash": "sha256-Aiy00UNzuu74OHV/bMXtCLLJJA4+e6fvstSaTIPfFjk=", + "lastModified": 1743186084, + "narHash": "sha256-zEPpazywKQLIRWxeTBFnSnacSnGIqM2Qr1iJ5qB94IQ=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "af777439cd6a35b27831a57bd99d8fe44d22fbd9", + "rev": "111a3afc23fdf64fd76115df48c2e6571fee51b7", "type": "github" }, "original": { @@ -112,11 +112,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1742877599, - "narHash": "sha256-3Xy1mlAUcYSQSpt0Q/flA+o6Y1ZACDW52vVP2CX52w8=", + "lastModified": 1743017820, + "narHash": "sha256-EYq2NfWSSO87O7hLrJLPPt0VbgvSjgPzru+58LQ29WI=", "owner": "YaLTeR", "repo": "niri", - "rev": "4534d3726676a403eb3dd19d28371bd8acd98401", + "rev": "7cfecf4b1b9b8c11c80061fb31926f888228499d", "type": "github" }, "original": { @@ -127,11 +127,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742889210, - "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=", + "lastModified": 1743095683, + "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "698214a32beb4f4c8e3942372c694f40848b360d", + "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6", "type": "github" }, "original": { @@ -143,11 +143,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1742751704, - "narHash": "sha256-rBfc+H1dDBUQ2mgVITMGBPI1PGuCznf9rcWX/XIULyE=", + "lastModified": 1742937945, + "narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f0946fa5f1fb876a9dc2e1850d9d3a4e3f914092", + "rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7", "type": "github" }, "original": { @@ -174,11 +174,11 @@ ] }, "locked": { - "lastModified": 1743129211, - "narHash": "sha256-gE8t+U9miTwm2NYWS9dFY8H1/QB4ifaFDq1KdV9KEqo=", + "lastModified": 1743215516, + "narHash": "sha256-52qbrkG65U1hyrQWltgHTgH4nm0SJL+9TWv2UDCEPNI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "f93da1d26ba9963f34f94a6872b67a7939699543", + "rev": "524463199fdee49338006b049bc376b965a2cfed", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1743132999, - "narHash": "sha256-cEqYQFxW8Uua64LckWpGrrqKIbPs/u+j2RnanhX35Js=", + "lastModified": 1743216975, + "narHash": "sha256-29xgm8F3DCcTNrQZ9V3Pwj6BkjalkKvGyjd+sF9/+3k=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "9c81e4bb852d4bcb1ba525fa20d7cd2778453d2d", + "rev": "165ee672e6b17a8bcc0a3fb51fab3f79715cc1f3", "type": "github" }, "original": { From 358a03d021e81e19e941317b8ba788f0ca68707e Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 31 Mar 2025 00:58:53 -0400 Subject: [PATCH 153/724] update --- etcnixos/flake.lock | 24 +++++++++++------------ home-manager/flake.lock | 42 ++++++++++++++++++++--------------------- home-manager/flake.nix | 2 +- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 4aa7239..91203e3 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -34,11 +34,11 @@ ] }, "locked": { - "lastModified": 1743207540, - "narHash": "sha256-p73hfMUXA+lgs1WuXuvVbF4Os+g1wAH9Ki7gh+L/imA=", + "lastModified": 1743275891, + "narHash": "sha256-0Y1E2pct908JZhVNlv4dprEZ0eB9WPjNn8WPuDnFUSE=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "eda326ed81aadd18470551ba8e4f680995f82ea3", + "rev": "b17f707c484af8a41a9798e1cde7ddb5d2a80119", "type": "github" }, "original": { @@ -230,11 +230,11 @@ ] }, "locked": { - "lastModified": 1743097780, - "narHash": "sha256-5tUbaMBKYbfTe/4aXACxmiXG22TgwPBNcfZ8Kg3rt+g=", + "lastModified": 1743267068, + "narHash": "sha256-G7866vbO5jgqMcYJzgbxej40O6mBGQMGt6gM0himjoA=", "owner": "nix-community", "repo": "home-manager", - "rev": "b14a70c40f4fd0b73d095ab04a7c6e31fbc18e52", + "rev": "b431496538b0e294fbe44a1441b24ae8195c63f0", "type": "github" }, "original": { @@ -252,11 +252,11 @@ ] }, "locked": { - "lastModified": 1742465245, - "narHash": "sha256-gpjtkoeq5Ye9J8GoR+rWg3NL4bbEtcLvvF4nN6MtxdU=", + "lastModified": 1743144043, + "narHash": "sha256-QlEk4Xm5KG0jW5Kus9teY3bhxdf0GUTexxTUCaJM5ms=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "a95606cae5c9e1f5b84debe7865ef171d4deb287", + "rev": "1c17514c8558886af0afc34b6c348c1f2ee9fd24", "type": "github" }, "original": { @@ -331,11 +331,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1743095683, - "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", + "lastModified": 1743315132, + "narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6", + "rev": "52faf482a3889b7619003c0daec593a1912fddc1", "type": "github" }, "original": { diff --git a/home-manager/flake.lock b/home-manager/flake.lock index c8543c1..3821fb3 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1743259333, - "narHash": "sha256-2Fi3K++co4IGbeOLGXdRA6VEfbzQzMgcuBaPTyjfj0s=", + "lastModified": 1743360001, + "narHash": "sha256-HtpS/ZdgWXw0y+aFdORcX5RuBGTyz3WskThspNR70SM=", "owner": "nix-community", "repo": "home-manager", - "rev": "1f679ed2a2ebe3894bad9f89fb0bd9f141c28a68", + "rev": "b6fd653ef8fbeccfd4958650757e91767a65506d", "type": "github" }, "original": { @@ -79,11 +79,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1743186084, - "narHash": "sha256-zEPpazywKQLIRWxeTBFnSnacSnGIqM2Qr1iJ5qB94IQ=", + "lastModified": 1743370893, + "narHash": "sha256-u2PqVBoECxAsnY+1yy9DwWetuYyT7uw1FkSpGgh1mBI=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "111a3afc23fdf64fd76115df48c2e6571fee51b7", + "rev": "22b0f8584e754448911fb50dd028af91ba9f579d", "type": "github" }, "original": { @@ -112,11 +112,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1743017820, - "narHash": "sha256-EYq2NfWSSO87O7hLrJLPPt0VbgvSjgPzru+58LQ29WI=", + "lastModified": 1743260207, + "narHash": "sha256-AtizkeSqu7AeMe/JjN8CjENfTKgMGifDW0U2z+S0ygA=", "owner": "YaLTeR", "repo": "niri", - "rev": "7cfecf4b1b9b8c11c80061fb31926f888228499d", + "rev": "b2c34e7fe94a12a65083ac73759672427ea2ccbf", "type": "github" }, "original": { @@ -127,11 +127,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1743095683, - "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", + "lastModified": 1743315132, + "narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6", + "rev": "52faf482a3889b7619003c0daec593a1912fddc1", "type": "github" }, "original": { @@ -143,11 +143,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1742937945, - "narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=", + "lastModified": 1743231893, + "narHash": "sha256-tpJsHMUPEhEnzySoQxx7+kA+KUtgWqvlcUBqROYNNt0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7", + "rev": "c570c1f5304493cafe133b8d843c7c1c4a10d3a6", "type": "github" }, "original": { @@ -174,11 +174,11 @@ ] }, "locked": { - "lastModified": 1743215516, - "narHash": "sha256-52qbrkG65U1hyrQWltgHTgH4nm0SJL+9TWv2UDCEPNI=", + "lastModified": 1743388531, + "narHash": "sha256-OBcNE+2/TD1AMgq8HKMotSQF8ZPJEFGZdRoBJ7t/HIc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "524463199fdee49338006b049bc376b965a2cfed", + "rev": "011de3c895927300651d9c2cb8e062adf17aa665", "type": "github" }, "original": { @@ -222,11 +222,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1742773235, - "narHash": "sha256-YhJex62HHVF6EfdGLIC01uM6jH8XJu5ryZ+LlhG7wMs=", + "lastModified": 1743346993, + "narHash": "sha256-i7rWd/5BcqLgQEtB5L/6gKN5R5GUJcmm34F+iBivH60=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "b2613aec05f9e3f8488ef924203d62cafb712642", + "rev": "45c055696437a08e3989d9b91d9c617b84cc2bc3", "type": "github" }, "original": { diff --git a/home-manager/flake.nix b/home-manager/flake.nix index db9561e..bf36da7 100644 --- a/home-manager/flake.nix +++ b/home-manager/flake.nix @@ -57,7 +57,7 @@ # gimp 3.0 (builtins.fetchurl { url = "https://github.com/NixOS/nixpkgs/pull/67576.diff"; - sha256 = "13m70acfazxipx9gwgsrqsivamfpb839cznn5hsz8745jl01yq1w"; + sha256 = "0x7jbg4j7cz74h6b1ysxk1d5cbg5shi0r2wlyvbngwfy1gp7ffif"; }) ]; } From 46c0b47b7bf07fb7c6c44c6ee89402a46f44797e Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 31 Mar 2025 02:24:49 -0400 Subject: [PATCH 154/724] home: format packages --- home-manager/no-gui.nix | 276 ++++++++++++++++++++-------------------- 1 file changed, 141 insertions(+), 135 deletions(-) diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 6b05a7e..42109f3 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -6,20 +6,9 @@ config, ... }: -{ - imports = [ - ./progs/fish.nix - ./progs/helix.nix - ]; +let + rust_pkgs = with pkgs; [ - home.stateVersion = "24.11"; - home.enableNixpkgsReleaseCheck = false; - - home.packages = with pkgs; [ - # hex viewer - hexyl - - # rust stuff (rust-bin.stable.latest.default.override ({ extensions = [ "rust-src" @@ -39,144 +28,161 @@ bolt_19 libllvm # llvm-profdata cargo-show-asm + cargo-flamegraph + ]; - # find typos in code - typos - - # python formatter - ruff - - # for website generation - hugo - go - - # java development - google-java-format # formatter - jdk # java - jdt-language-server # lsp server - - # for benchmaking stuff - hyperfine - - # replacements for common posix tools - eza # ls replacement - bat # pretty `cat` clone - delta # viewer for `git` and `diff` output - dust # pretty `du` version - duf # better `df` clone - 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 - - # adds `sensors` command - lm_sensors - - # rssfeed - newsboat + lsps = with pkgs; [ + # java + jdt-language-server # HTML/CSS/JSON/ESLint language servers vscode-langservers-extracted - - 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 - - pandas ] )) - - # 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 - gdb - - # broken - # lldb - - fio - - age - git-crypt - - imagemagick - - nixpkgs-review - - nmap - - # terminal image viewer - timg - lsof - - tcpdump - - cargo-flamegraph - linuxKernel.packages.linux_6_14.perf - - borgbackup - - tinyxxd - - bfc - - # java assembler - jasmin - - # rust-written LLM inference - mistral-rs ]; +in +{ + imports = [ + ./progs/fish.nix + ./progs/helix.nix + ]; + + home.stateVersion = "24.11"; + home.enableNixpkgsReleaseCheck = false; + + home.packages = + with pkgs; + [ + # hex viewer + hexyl + + # find typos in code + typos + + # python formatter + ruff + + # for website generation + hugo + go + + # java development + google-java-format # formatter + jdk # java + + # for benchmaking stuff + hyperfine + + # replacements for common posix tools + eza # ls replacement + bat # pretty `cat` clone + delta # viewer for `git` and `diff` output + dust # pretty `du` version + duf # better `df` clone + 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 + + # adds `sensors` command + lm_sensors + + # rssfeed + newsboat + + 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; [ + mypy # type checking + + pyserial + + numpy + matplotlib + notebook + + pandas + ] + )) + + binwalk + + smartmontools + + # clang-format and clang-tidy + clang-tools + clang + gdb + + fio + + age + git-crypt + + imagemagick + + nixpkgs-review + + nmap + + # terminal image viewer + timg + lsof + + tcpdump + + linuxKernel.packages.linux_6_14.perf + + borgbackup + + tinyxxd + + bfc + + # java assembler + jasmin + ] + ++ rust_pkgs + ++ lsps; # https://github.com/flamegraph-rs/flamegraph home.file.".cargo/config.toml".text = '' From 98102a81a4b65c695ffdfbda7db82e7a5866b68e Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 31 Mar 2025 08:16:44 -0400 Subject: [PATCH 155/724] fix --- etcnixos/flake.lock | 12 ++++++------ home-manager/no-gui.nix | 8 ++------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 91203e3..a4d48c2 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -34,11 +34,11 @@ ] }, "locked": { - "lastModified": 1743275891, - "narHash": "sha256-0Y1E2pct908JZhVNlv4dprEZ0eB9WPjNn8WPuDnFUSE=", + "lastModified": 1743417077, + "narHash": "sha256-i/jKOc/M/0+9nM2B9t8UfFea3p4EgmhaBpLz7UJo5mU=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "b17f707c484af8a41a9798e1cde7ddb5d2a80119", + "rev": "777450284ca128909dbda580dddde6f67cd956c1", "type": "github" }, "original": { @@ -315,11 +315,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1743167577, - "narHash": "sha256-I09SrXIO0UdyBFfh0fxDq5WnCDg8XKmZ1HQbaXzMA1k=", + "lastModified": 1743420942, + "narHash": "sha256-b/exDDQSLmENZZgbAEI3qi9yHkuXAXCPbormD8CSJXo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "0ed819e708af17bfc4bbc63ee080ef308a24aa42", + "rev": "de6fc5551121c59c01e2a3d45b277a6d05077bc4", "type": "github" }, "original": { diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 42109f3..19d620f 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -37,12 +37,6 @@ let # HTML/CSS/JSON/ESLint language servers vscode-langservers-extracted - (python312.withPackages ( - ps: with ps; [ - python-lsp-server # lsp - python-lsp-ruff # ruff integration - ] - )) nil # nix lsp yaml-language-server # yaml lsp marksman # markdown lsp @@ -134,6 +128,8 @@ in ps: with ps; [ mypy # type checking + python-lsp-server # lsp + python-lsp-ruff # ruff integration pyserial numpy From 22dd9183c7e9613da69382957e0b2a717ba2d0f3 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 2 Apr 2025 13:35:53 -0400 Subject: [PATCH 156/724] remove swapfile and lvfs-testing --- etcnixos/common.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/etcnixos/common.nix b/etcnixos/common.nix index d445614..7538a88 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -84,7 +84,6 @@ # fwupd for updating firmware fwupd = { enable = true; - extraRemotes = [ "lvfs-testing" ]; }; # auto detect network printers @@ -243,12 +242,4 @@ documentation.enable = true; documentation.man.enable = true; documentation.dev.enable = true; - - swapDevices = [ - { - device = "/var/lib/swapfile"; - size = 64 * 1024; - randomEncryption.enable = true; - } - ]; } From 5d50e862c0d06696a960fadbb0b632086f3d5027 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 2 Apr 2025 23:20:59 -0400 Subject: [PATCH 157/724] switch to vanilla kernel due to issues --- etcnixos/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etcnixos/common.nix b/etcnixos/common.nix index 7538a88..978aa62 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -48,8 +48,8 @@ # kernel options boot = { - kernelPackages = pkgs.linuxPackages_cachyos-lto; - # kernelPackages = pkgs.linuxPackages_latest; + # kernelPackages = pkgs.linuxPackages_cachyos-lto; + kernelPackages = pkgs.linuxPackages_latest; kernel.sysctl = { # dmesg shushhhhh From 57c7ac10de73e3a25b48adf1a0e2a1d230b3de3f Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 2 Apr 2025 23:21:09 -0400 Subject: [PATCH 158/724] update --- etcnixos/flake.lock | 18 ++++++------ home-manager/flake.lock | 64 +++++++++++++++++++++++++++-------------- 2 files changed, 52 insertions(+), 30 deletions(-) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index a4d48c2..90040c2 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -34,11 +34,11 @@ ] }, "locked": { - "lastModified": 1743417077, - "narHash": "sha256-i/jKOc/M/0+9nM2B9t8UfFea3p4EgmhaBpLz7UJo5mU=", + "lastModified": 1743630992, + "narHash": "sha256-4QKnn7sHskureX2DvKcvxR4tbjauSoCPVQJ+I8PAAUg=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "777450284ca128909dbda580dddde6f67cd956c1", + "rev": "421cce2410fe9f0a71c717e1e28d37eb4ddd0283", "type": "github" }, "original": { @@ -230,11 +230,11 @@ ] }, "locked": { - "lastModified": 1743267068, - "narHash": "sha256-G7866vbO5jgqMcYJzgbxej40O6mBGQMGt6gM0himjoA=", + "lastModified": 1743527271, + "narHash": "sha256-EuanEW1qqXZ2h0zJnq7uz8BoHbsgHgUrqWkCZHwZ9FA=", "owner": "nix-community", "repo": "home-manager", - "rev": "b431496538b0e294fbe44a1441b24ae8195c63f0", + "rev": "f4d9d1e2ad19d544a0a0cf3f8f371c6139c762e9", "type": "github" }, "original": { @@ -331,11 +331,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1743315132, - "narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=", + "lastModified": 1743583204, + "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "52faf482a3889b7619003c0daec593a1912fddc1", + "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", "type": "github" }, "original": { diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 3821fb3..5a747fb 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -54,11 +54,32 @@ ] }, "locked": { - "lastModified": 1743360001, - "narHash": "sha256-HtpS/ZdgWXw0y+aFdORcX5RuBGTyz3WskThspNR70SM=", + "lastModified": 1743639371, + "narHash": "sha256-eywYn8ayhVUzFFvIiAIIHn+00Irmhyjqe2cNdyPCLNE=", "owner": "nix-community", "repo": "home-manager", - "rev": "b6fd653ef8fbeccfd4958650757e91767a65506d", + "rev": "579a71b948533667c6c65e603f18990bdffc8530", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "zen-browser", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1743604125, + "narHash": "sha256-ZD61DNbsBt1mQbinAaaEqKaJk2RFo9R/j+eYWeGMx7A=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "180fd43eea296e62ae68e079fcf56aba268b9a1a", "type": "github" }, "original": { @@ -79,11 +100,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1743370893, - "narHash": "sha256-u2PqVBoECxAsnY+1yy9DwWetuYyT7uw1FkSpGgh1mBI=", + "lastModified": 1743644801, + "narHash": "sha256-z8x/j/RuDBo/5lNt3XYatKRpIMFMHVE2HK7TKVxYn+c=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "22b0f8584e754448911fb50dd028af91ba9f579d", + "rev": "f3fca85fe72c70d58f44f4c6ad2f27a91aa54d0d", "type": "github" }, "original": { @@ -112,11 +133,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1743260207, - "narHash": "sha256-AtizkeSqu7AeMe/JjN8CjENfTKgMGifDW0U2z+S0ygA=", + "lastModified": 1743492917, + "narHash": "sha256-OqLDg0Ody1HX23hgjvjIkfZPNhYKxbkj/ONcDjdD4Ik=", "owner": "YaLTeR", "repo": "niri", - "rev": "b2c34e7fe94a12a65083ac73759672427ea2ccbf", + "rev": "60034a57efd9c8130b05797b37cbc187a8c13145", "type": "github" }, "original": { @@ -127,11 +148,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1743315132, - "narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=", + "lastModified": 1743583204, + "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "52faf482a3889b7619003c0daec593a1912fddc1", + "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", "type": "github" }, "original": { @@ -143,11 +164,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1743231893, - "narHash": "sha256-tpJsHMUPEhEnzySoQxx7+kA+KUtgWqvlcUBqROYNNt0=", + "lastModified": 1743576891, + "narHash": "sha256-vXiKURtntURybE6FMNFAVpRPr8+e8KoLPrYs9TGuAKc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c570c1f5304493cafe133b8d843c7c1c4a10d3a6", + "rev": "44a69ed688786e98a101f02b712c313f1ade37ab", "type": "github" }, "original": { @@ -174,11 +195,11 @@ ] }, "locked": { - "lastModified": 1743388531, - "narHash": "sha256-OBcNE+2/TD1AMgq8HKMotSQF8ZPJEFGZdRoBJ7t/HIc=", + "lastModified": 1743561237, + "narHash": "sha256-dd97LXek202OWmUXvKYFdYWj0jHrn3p+L5Ojh1SEOqs=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "011de3c895927300651d9c2cb8e062adf17aa665", + "rev": "1de27ae43712a971c1da100dcd84386356f03ec7", "type": "github" }, "original": { @@ -237,16 +258,17 @@ }, "zen-browser": { "inputs": { + "home-manager": "home-manager_2", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1743216975, - "narHash": "sha256-29xgm8F3DCcTNrQZ9V3Pwj6BkjalkKvGyjd+sF9/+3k=", + "lastModified": 1743643497, + "narHash": "sha256-+8T42oUfQhUaT/K8UQeCT7ZFlBHKXm+j9fvmR/6MaQQ=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "165ee672e6b17a8bcc0a3fb51fab3f79715cc1f3", + "rev": "e562cb38d2d2466f2d560517e757f7648154852c", "type": "github" }, "original": { From 183963eb687938ee37e56d0ecaba838ba4b41a5a Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 3 Apr 2025 15:00:48 -0400 Subject: [PATCH 159/724] update gimp patch --- home-manager/flake.nix | 2 +- home-manager/gui.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/flake.nix b/home-manager/flake.nix index bf36da7..9950640 100644 --- a/home-manager/flake.nix +++ b/home-manager/flake.nix @@ -57,7 +57,7 @@ # gimp 3.0 (builtins.fetchurl { url = "https://github.com/NixOS/nixpkgs/pull/67576.diff"; - sha256 = "0x7jbg4j7cz74h6b1ysxk1d5cbg5shi0r2wlyvbngwfy1gp7ffif"; + sha256 = "1idkhfirjba6iywkddyhm980x44kfl9lmp51cyfqrpbq7wlzpnia"; }) ]; } diff --git a/home-manager/gui.nix b/home-manager/gui.nix index 216ffa0..60de332 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -112,7 +112,7 @@ # simple screen recording on wayland wl-screenrec - gimp + gimp3 pinta # wayland-compatible color picker From 68648843be25019d64d584585069013ab8c0ae03 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 3 Apr 2025 15:10:19 -0400 Subject: [PATCH 160/724] update --- etcnixos/flake.lock | 18 +++++++++--------- home-manager/flake.lock | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 90040c2..8779783 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -34,11 +34,11 @@ ] }, "locked": { - "lastModified": 1743630992, - "narHash": "sha256-4QKnn7sHskureX2DvKcvxR4tbjauSoCPVQJ+I8PAAUg=", + "lastModified": 1743703189, + "narHash": "sha256-5s1zBM+pmpxvHInRbVScsueETRxVAi4EvDl4V3FzKjI=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "421cce2410fe9f0a71c717e1e28d37eb4ddd0283", + "rev": "d3d2a0d76c2d85a49f30cb50956b0e8d93ee6ec6", "type": "github" }, "original": { @@ -230,11 +230,11 @@ ] }, "locked": { - "lastModified": 1743527271, - "narHash": "sha256-EuanEW1qqXZ2h0zJnq7uz8BoHbsgHgUrqWkCZHwZ9FA=", + "lastModified": 1743648554, + "narHash": "sha256-23JFd+zd2GamTTdnGuFVeIg8x8C3hLpQJRh/PGTORzo=", "owner": "nix-community", "repo": "home-manager", - "rev": "f4d9d1e2ad19d544a0a0cf3f8f371c6139c762e9", + "rev": "107352dde4ff3c01cb5a0b3fe17f5beef37215bc", "type": "github" }, "original": { @@ -252,11 +252,11 @@ ] }, "locked": { - "lastModified": 1743144043, - "narHash": "sha256-QlEk4Xm5KG0jW5Kus9teY3bhxdf0GUTexxTUCaJM5ms=", + "lastModified": 1743660830, + "narHash": "sha256-ezJqPIuB25iMJeugwHKWnB1DjMvrdpkrPxE3TCULjGk=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "1c17514c8558886af0afc34b6c348c1f2ee9fd24", + "rev": "c7ade1c8fe2bdb70d38b3b9a97b874dcaf33b755", "type": "github" }, "original": { diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 5a747fb..1504cbb 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1743639371, - "narHash": "sha256-eywYn8ayhVUzFFvIiAIIHn+00Irmhyjqe2cNdyPCLNE=", + "lastModified": 1743648554, + "narHash": "sha256-23JFd+zd2GamTTdnGuFVeIg8x8C3hLpQJRh/PGTORzo=", "owner": "nix-community", "repo": "home-manager", - "rev": "579a71b948533667c6c65e603f18990bdffc8530", + "rev": "107352dde4ff3c01cb5a0b3fe17f5beef37215bc", "type": "github" }, "original": { @@ -195,11 +195,11 @@ ] }, "locked": { - "lastModified": 1743561237, - "narHash": "sha256-dd97LXek202OWmUXvKYFdYWj0jHrn3p+L5Ojh1SEOqs=", + "lastModified": 1743682350, + "narHash": "sha256-S/MyKOFajCiBm5H5laoE59wB6w0NJ4wJG53iAPfYW3k=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "1de27ae43712a971c1da100dcd84386356f03ec7", + "rev": "c4a8327b0f25d1d81edecbb6105f74d7cf9d7382", "type": "github" }, "original": { @@ -264,11 +264,11 @@ ] }, "locked": { - "lastModified": 1743643497, - "narHash": "sha256-+8T42oUfQhUaT/K8UQeCT7ZFlBHKXm+j9fvmR/6MaQQ=", + "lastModified": 1743704747, + "narHash": "sha256-aaC3O8QFEEn/h450ksMj05fPv5sI9s2bmGjbLtp0YUo=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "e562cb38d2d2466f2d560517e757f7648154852c", + "rev": "fa21b2402e0cea3616121dff915f1be54dd8dca2", "type": "github" }, "original": { From b4c2cb9e1eda972e2103012d6482e1057d440240 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 3 Apr 2025 21:33:19 -0400 Subject: [PATCH 161/724] borg: don't backup justfile --- home-manager/progs/borg.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home-manager/progs/borg.nix b/home-manager/progs/borg.nix index ab50ff4..1d60f67 100644 --- a/home-manager/progs/borg.nix +++ b/home-manager/progs/borg.nix @@ -12,7 +12,6 @@ "projects" "Pictures" "school" - "justfile" ] ++ (map (f: ".config/Signal/${f}") [ "stickers.noindex" From 20a2216db50881814f00570f9ce57397eb776b01 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 5 Apr 2025 13:56:10 -0400 Subject: [PATCH 162/724] update --- home-manager/flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 1504cbb..a627dd8 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1743648554, - "narHash": "sha256-23JFd+zd2GamTTdnGuFVeIg8x8C3hLpQJRh/PGTORzo=", + "lastModified": 1743869639, + "narHash": "sha256-Xhe3whfRW/Ay05z9m1EZ1/AkbV1yo0tm1CbgjtCi4rQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "107352dde4ff3c01cb5a0b3fe17f5beef37215bc", + "rev": "d094c6763c6ddb860580e7d3b4201f8f496a6836", "type": "github" }, "original": { @@ -100,11 +100,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1743644801, - "narHash": "sha256-z8x/j/RuDBo/5lNt3XYatKRpIMFMHVE2HK7TKVxYn+c=", + "lastModified": 1743846670, + "narHash": "sha256-1U6AklLP3yCo/qhmFvhdRv0YFW0d8TXcw013IOxc/20=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "f3fca85fe72c70d58f44f4c6ad2f27a91aa54d0d", + "rev": "f1d37a802c47e22ad4eff4e55d307e9ffb7a440b", "type": "github" }, "original": { @@ -133,11 +133,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1743492917, - "narHash": "sha256-OqLDg0Ody1HX23hgjvjIkfZPNhYKxbkj/ONcDjdD4Ik=", + "lastModified": 1743835358, + "narHash": "sha256-HiDNB5meUAsz8gbQrS551M8axbbVx+nHfJdYZedzivQ=", "owner": "YaLTeR", "repo": "niri", - "rev": "60034a57efd9c8130b05797b37cbc187a8c13145", + "rev": "c359d248257bdb68785597d2822f9c3a5ccbfdfe", "type": "github" }, "original": { @@ -164,11 +164,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1743576891, - "narHash": "sha256-vXiKURtntURybE6FMNFAVpRPr8+e8KoLPrYs9TGuAKc=", + "lastModified": 1743703532, + "narHash": "sha256-s1KLDALEeqy+ttrvqV3jx9mBZEvmthQErTVOAzbjHZs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "44a69ed688786e98a101f02b712c313f1ade37ab", + "rev": "bdb91860de2f719b57eef819b5617762f7120c70", "type": "github" }, "original": { @@ -195,11 +195,11 @@ ] }, "locked": { - "lastModified": 1743682350, - "narHash": "sha256-S/MyKOFajCiBm5H5laoE59wB6w0NJ4wJG53iAPfYW3k=", + "lastModified": 1743820323, + "narHash": "sha256-UXxJogXhPhBFaX4uxmMudcD/x3sEGFtoSc4busTcftY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c4a8327b0f25d1d81edecbb6105f74d7cf9d7382", + "rev": "b4734ce867252f92cdc7d25f8cc3b7cef153e703", "type": "github" }, "original": { @@ -264,11 +264,11 @@ ] }, "locked": { - "lastModified": 1743704747, - "narHash": "sha256-aaC3O8QFEEn/h450ksMj05fPv5sI9s2bmGjbLtp0YUo=", + "lastModified": 1743854692, + "narHash": "sha256-0j18TfmblTLRC/yJhx3uhaJZ1gmq1JDCZgKtJMjHb9s=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "fa21b2402e0cea3616121dff915f1be54dd8dca2", + "rev": "d0b39aeb79744bc47c6cc3b0fde1d5156673d4a6", "type": "github" }, "original": { From 5d518b5c3c19b645fc8d3a204630750f7e027cfd Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 6 Apr 2025 21:49:36 -0400 Subject: [PATCH 163/724] re-enable pwvucontrol --- home-manager/gui.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/gui.nix b/home-manager/gui.nix index 60de332..5e9d00e 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -50,7 +50,7 @@ foliate #audio mixer (pavucontrol but for pipewire) - # pwvucontrol # - broken + pwvucontrol #minecraft launcher prismlauncher From d0e909dfa4a588c7484a034443a3bf85d01baa1d Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 7 Apr 2025 10:31:40 -0400 Subject: [PATCH 164/724] re-add mullvad --- etcnixos/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etcnixos/common.nix b/etcnixos/common.nix index 978aa62..59e783d 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -104,7 +104,7 @@ fprintd.enable = false; # Making sure mullvad works on boot - # mullvad-vpn.enable = true; + mullvad-vpn.enable = true; }; # Set your time zone. @@ -196,7 +196,7 @@ # System packages environment.systemPackages = with pkgs; [ - # mullvad-vpn + mullvad-vpn #secureboot ctl sbctl From b82d1e010b8af4b3e1b9069424996042a94aff21 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 7 Apr 2025 10:32:18 -0400 Subject: [PATCH 165/724] update --- etcnixos/flake.lock | 24 +++++++++++------------ home-manager/flake.lock | 42 ++++++++++++++++++++--------------------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 8779783..5f8e9f1 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -34,11 +34,11 @@ ] }, "locked": { - "lastModified": 1743703189, - "narHash": "sha256-5s1zBM+pmpxvHInRbVScsueETRxVAi4EvDl4V3FzKjI=", + "lastModified": 1743940759, + "narHash": "sha256-ibmY/dAM391sz/5Hv8gbj5L6QFkc+nr71qqcG6SN4Do=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "d3d2a0d76c2d85a49f30cb50956b0e8d93ee6ec6", + "rev": "a9ea7729d13d6e762f4e7bfd3bb28685ca693b66", "type": "github" }, "original": { @@ -230,11 +230,11 @@ ] }, "locked": { - "lastModified": 1743648554, - "narHash": "sha256-23JFd+zd2GamTTdnGuFVeIg8x8C3hLpQJRh/PGTORzo=", + "lastModified": 1743869639, + "narHash": "sha256-Xhe3whfRW/Ay05z9m1EZ1/AkbV1yo0tm1CbgjtCi4rQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "107352dde4ff3c01cb5a0b3fe17f5beef37215bc", + "rev": "d094c6763c6ddb860580e7d3b4201f8f496a6836", "type": "github" }, "original": { @@ -252,11 +252,11 @@ ] }, "locked": { - "lastModified": 1743660830, - "narHash": "sha256-ezJqPIuB25iMJeugwHKWnB1DjMvrdpkrPxE3TCULjGk=", + "lastModified": 1743879910, + "narHash": "sha256-jAr345BODeDluX6DfO3TdY7pB77olVOcYFYjxz6rPxo=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "c7ade1c8fe2bdb70d38b3b9a97b874dcaf33b755", + "rev": "96a7fbb4a892696ff89d3d42fc743ab5d6714222", "type": "github" }, "original": { @@ -331,11 +331,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1743583204, - "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", + "lastModified": 1743827369, + "narHash": "sha256-rpqepOZ8Eo1zg+KJeWoq1HAOgoMCDloqv5r2EAa9TSA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", + "rev": "42a1c966be226125b48c384171c44c651c236c22", "type": "github" }, "original": { diff --git a/home-manager/flake.lock b/home-manager/flake.lock index a627dd8..ed585a2 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1743869639, - "narHash": "sha256-Xhe3whfRW/Ay05z9m1EZ1/AkbV1yo0tm1CbgjtCi4rQ=", + "lastModified": 1744008831, + "narHash": "sha256-g3mHJLB8ShKuMaBBZxiGuoftJ22f7Boegiw5xBUnS8E=", "owner": "nix-community", "repo": "home-manager", - "rev": "d094c6763c6ddb860580e7d3b4201f8f496a6836", + "rev": "f463902a3f03e15af658e48bcc60b39188ddf734", "type": "github" }, "original": { @@ -100,11 +100,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1743846670, - "narHash": "sha256-1U6AklLP3yCo/qhmFvhdRv0YFW0d8TXcw013IOxc/20=", + "lastModified": 1743943715, + "narHash": "sha256-9xCTf79Naq7mxvqtjgbcU9ZlNwubAep0qlwrL3GqZQQ=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "f1d37a802c47e22ad4eff4e55d307e9ffb7a440b", + "rev": "f53eac2ea3c72dd4e9739228660f661eb27359d0", "type": "github" }, "original": { @@ -133,11 +133,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1743835358, - "narHash": "sha256-HiDNB5meUAsz8gbQrS551M8axbbVx+nHfJdYZedzivQ=", + "lastModified": 1743923080, + "narHash": "sha256-Hb3t6FoJycnqIZmu3c6K1bJGndBsrDw8IQtM2ieLbzU=", "owner": "YaLTeR", "repo": "niri", - "rev": "c359d248257bdb68785597d2822f9c3a5ccbfdfe", + "rev": "430b155929a60644ea223012ee0c1389fc5e3755", "type": "github" }, "original": { @@ -148,11 +148,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1743583204, - "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", + "lastModified": 1743827369, + "narHash": "sha256-rpqepOZ8Eo1zg+KJeWoq1HAOgoMCDloqv5r2EAa9TSA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", + "rev": "42a1c966be226125b48c384171c44c651c236c22", "type": "github" }, "original": { @@ -164,11 +164,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1743703532, - "narHash": "sha256-s1KLDALEeqy+ttrvqV3jx9mBZEvmthQErTVOAzbjHZs=", + "lastModified": 1743813633, + "narHash": "sha256-BgkBz4NpV6Kg8XF7cmHDHRVGZYnKbvG0Y4p+jElwxaM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bdb91860de2f719b57eef819b5617762f7120c70", + "rev": "7819a0d29d1dd2bc331bec4b327f0776359b1fa6", "type": "github" }, "original": { @@ -195,11 +195,11 @@ ] }, "locked": { - "lastModified": 1743820323, - "narHash": "sha256-UXxJogXhPhBFaX4uxmMudcD/x3sEGFtoSc4busTcftY=", + "lastModified": 1743993291, + "narHash": "sha256-u8GHvduU1gCtoFXvTS/wGjH1ouv5S/GRGq6MAT+sG/k=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "b4734ce867252f92cdc7d25f8cc3b7cef153e703", + "rev": "0cb3c8979c65dc6a5812dfe67499a8c7b8b4325b", "type": "github" }, "original": { @@ -264,11 +264,11 @@ ] }, "locked": { - "lastModified": 1743854692, - "narHash": "sha256-0j18TfmblTLRC/yJhx3uhaJZ1gmq1JDCZgKtJMjHb9s=", + "lastModified": 1744032540, + "narHash": "sha256-KMshnTCoe11oTzsUp5T3e0+9/dVlLSI/wIA7Nli3LI0=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "d0b39aeb79744bc47c6cc3b0fde1d5156673d4a6", + "rev": "f4edde8a094098c8f16de4efc93e057c2cd3c06b", "type": "github" }, "original": { From 3abf9880ec7423ad3b80d830ce420462dcf76879 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 7 Apr 2025 20:39:50 -0400 Subject: [PATCH 166/724] update --- etcnixos/flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 5f8e9f1..b0f5e99 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -34,11 +34,11 @@ ] }, "locked": { - "lastModified": 1743940759, - "narHash": "sha256-ibmY/dAM391sz/5Hv8gbj5L6QFkc+nr71qqcG6SN4Do=", + "lastModified": 1744070747, + "narHash": "sha256-ds14Cu3aXDwTVtV6IN9q5nVCCz2H6vqQxIQ2KNd5/z0=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "a9ea7729d13d6e762f4e7bfd3bb28685ca693b66", + "rev": "5d40cdae16b48c400b0d024a79644d0bd52eabcc", "type": "github" }, "original": { @@ -331,11 +331,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1743827369, - "narHash": "sha256-rpqepOZ8Eo1zg+KJeWoq1HAOgoMCDloqv5r2EAa9TSA=", + "lastModified": 1743964447, + "narHash": "sha256-nEo1t3Q0F+0jQ36HJfbJtiRU4OI+/0jX/iITURKe3EE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "42a1c966be226125b48c384171c44c651c236c22", + "rev": "063dece00c5a77e4a0ea24e5e5a5bd75232806f8", "type": "github" }, "original": { From 49fbc6620d49f26adb10a8b9b9129b875868e8ea Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 7 Apr 2025 20:50:03 -0400 Subject: [PATCH 167/724] simplify and inline a lot of home-manager stuff --- home-manager/flake.lock | 24 ++++++++++++------------ home-manager/flake.nix | 17 ----------------- home-manager/no-gui.nix | 15 +++++++++++++++ home-manager/progs/niri.nix | 13 +++++++++++++ 4 files changed, 40 insertions(+), 29 deletions(-) diff --git a/home-manager/flake.lock b/home-manager/flake.lock index ed585a2..6166e6f 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1744008831, - "narHash": "sha256-g3mHJLB8ShKuMaBBZxiGuoftJ22f7Boegiw5xBUnS8E=", + "lastModified": 1744038920, + "narHash": "sha256-9a4V1wQXS8hXZtc7mRtz0qINkGW+C99aDrmXY6oYBFg=", "owner": "nix-community", "repo": "home-manager", - "rev": "f463902a3f03e15af658e48bcc60b39188ddf734", + "rev": "a4d8020820a85b47f842eae76ad083b0ec2a886a", "type": "github" }, "original": { @@ -100,11 +100,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1743943715, - "narHash": "sha256-9xCTf79Naq7mxvqtjgbcU9ZlNwubAep0qlwrL3GqZQQ=", + "lastModified": 1744068309, + "narHash": "sha256-4RAoQhztUI+M3XKzINEozxXWom4HOr+rvVfYaHk1Brw=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "f53eac2ea3c72dd4e9739228660f661eb27359d0", + "rev": "b1beb4d118baf1a31c9744ab58402ff9eeb6a333", "type": "github" }, "original": { @@ -148,11 +148,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1743827369, - "narHash": "sha256-rpqepOZ8Eo1zg+KJeWoq1HAOgoMCDloqv5r2EAa9TSA=", + "lastModified": 1743964447, + "narHash": "sha256-nEo1t3Q0F+0jQ36HJfbJtiRU4OI+/0jX/iITURKe3EE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "42a1c966be226125b48c384171c44c651c236c22", + "rev": "063dece00c5a77e4a0ea24e5e5a5bd75232806f8", "type": "github" }, "original": { @@ -164,11 +164,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1743813633, - "narHash": "sha256-BgkBz4NpV6Kg8XF7cmHDHRVGZYnKbvG0Y4p+jElwxaM=", + "lastModified": 1743975612, + "narHash": "sha256-o4FjFOUmjSRMK7dn0TFdAT0RRWUWD+WsspPHa+qEQT8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7819a0d29d1dd2bc331bec4b327f0776359b1fa6", + "rev": "a880f49904d68b5e53338d1e8c7bf80f59903928", "type": "github" }, "original": { diff --git a/home-manager/flake.nix b/home-manager/flake.nix index 9950640..dec65b4 100644 --- a/home-manager/flake.nix +++ b/home-manager/flake.nix @@ -77,23 +77,6 @@ modules = [ ./system-${hostname}.nix - niri.homeModules.config - agenix.homeManagerModules.age - - ( - { ... }: - { - nixpkgs.overlays = [ - rust-overlay.overlays.default - inputs.niri.overlays.niri - ]; - - # home-manager stuff - home = { - inherit username homeDirectory; - }; - } - ) ]; }; }; diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 19d620f..514f7a1 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -4,6 +4,7 @@ lib, homeDirectory, config, + username, ... }: let @@ -48,6 +49,20 @@ in imports = [ ./progs/fish.nix ./progs/helix.nix + inputs.agenix.homeManagerModules.age + ( + { ... }: + { + nixpkgs.overlays = [ + inputs.rust-overlay.overlays.default + ]; + + # home-manager stuff + home = { + inherit username homeDirectory; + }; + } + ) ]; home.stateVersion = "24.11"; diff --git a/home-manager/progs/niri.nix b/home-manager/progs/niri.nix index 3c54b7a..849da57 100644 --- a/home-manager/progs/niri.nix +++ b/home-manager/progs/niri.nix @@ -2,9 +2,22 @@ config, pkgs, lib, + inputs, ... }: { + imports = [ + inputs.niri.homeModules.config + ( + { ... }: + { + nixpkgs.overlays = [ + inputs.niri.overlays.niri + ]; + } + ) + ]; + programs.niri = { package = pkgs.niri; settings = { From b45601e1840315d547f706efab53a44c5993dc11 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 7 Apr 2025 20:52:36 -0400 Subject: [PATCH 168/724] home: move around stuff --- home-manager/flake.nix | 2 -- home-manager/no-gui.nix | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/home-manager/flake.nix b/home-manager/flake.nix index dec65b4..1ccc623 100644 --- a/home-manager/flake.nix +++ b/home-manager/flake.nix @@ -43,7 +43,6 @@ }@inputs: let username = "primary"; - homeDirectory = "/home/${username}"; hostname = nixpkgs.lib.strings.removeSuffix "\n" (builtins.readFile /etc/hostname); pkgs = import ( @@ -71,7 +70,6 @@ inherit inputs username - homeDirectory ; }; diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 514f7a1..d1abe5c 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -59,7 +59,8 @@ in # home-manager stuff home = { - inherit username homeDirectory; + inherit username; + homeDirectory = "/home/${username}"; }; } ) From 25d14e4409ff680fdbe0906af9ae5d69a37edd93 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 7 Apr 2025 21:06:43 -0400 Subject: [PATCH 169/724] work on unifying configs --- etcnixos/flake.nix | 64 ---- etcnixos/flake.lock => flake.lock | 196 +++++++++++- flake.nix | 109 +++++++ home-manager/flake.lock | 283 ------------------ home-manager/flake.nix | 81 ----- .../{system-mreow.nix => home-mreow.nix} | 0 .../{system-yarn.nix => home-yarn.nix} | 0 7 files changed, 294 insertions(+), 439 deletions(-) delete mode 100644 etcnixos/flake.nix rename etcnixos/flake.lock => flake.lock (69%) create mode 100644 flake.nix delete mode 100644 home-manager/flake.lock delete mode 100644 home-manager/flake.nix rename home-manager/{system-mreow.nix => home-mreow.nix} (100%) rename home-manager/{system-yarn.nix => home-yarn.nix} (100%) diff --git a/etcnixos/flake.nix b/etcnixos/flake.nix deleted file mode 100644 index fc5b090..0000000 --- a/etcnixos/flake.nix +++ /dev/null @@ -1,64 +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 - { - formatter.${system} = nixpkgs.legacyPackages.${system}.nixfmt-rfc-style; - nixosConfigurations = nixpkgs.lib.foldl' ( - config: hostname: - config - // { - "${hostname}" = nixpkgs.lib.nixosSystem { - specialArgs = { - inherit inputs username hostname; - }; - modules = [ - ./system-${hostname}.nix - ]; - }; - } - ) { } hostnames; - }; -} diff --git a/etcnixos/flake.lock b/flake.lock similarity index 69% rename from etcnixos/flake.lock rename to flake.lock index b0f5e99..e724e2f 100644 --- a/etcnixos/flake.lock +++ b/flake.lock @@ -3,7 +3,9 @@ "agenix": { "inputs": { "darwin": "darwin", - "home-manager": "home-manager", + "home-manager": [ + "home-manager" + ], "nixpkgs": [ "nixpkgs" ], @@ -27,7 +29,7 @@ "inputs": { "fenix": "fenix", "flake-schemas": "flake-schemas", - "home-manager": "home-manager_2", + "home-manager": "home-manager", "jovian": "jovian", "nixpkgs": [ "nixpkgs" @@ -204,16 +206,16 @@ "home-manager": { "inputs": { "nixpkgs": [ - "agenix", + "chaotic", "nixpkgs" ] }, "locked": { - "lastModified": 1703113217, - "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", + "lastModified": 1743869639, + "narHash": "sha256-Xhe3whfRW/Ay05z9m1EZ1/AkbV1yo0tm1CbgjtCi4rQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", + "rev": "d094c6763c6ddb860580e7d3b4201f8f496a6836", "type": "github" }, "original": { @@ -225,16 +227,36 @@ "home-manager_2": { "inputs": { "nixpkgs": [ - "chaotic", "nixpkgs" ] }, "locked": { - "lastModified": 1743869639, - "narHash": "sha256-Xhe3whfRW/Ay05z9m1EZ1/AkbV1yo0tm1CbgjtCi4rQ=", + "lastModified": 1744038920, + "narHash": "sha256-9a4V1wQXS8hXZtc7mRtz0qINkGW+C99aDrmXY6oYBFg=", "owner": "nix-community", "repo": "home-manager", - "rev": "d094c6763c6ddb860580e7d3b4201f8f496a6836", + "rev": "a4d8020820a85b47f842eae76ad083b0ec2a886a", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_3": { + "inputs": { + "nixpkgs": [ + "zen-browser", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1743604125, + "narHash": "sha256-ZD61DNbsBt1mQbinAaaEqKaJk2RFo9R/j+eYWeGMx7A=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "180fd43eea296e62ae68e079fcf56aba268b9a1a", "type": "github" }, "original": { @@ -290,6 +312,64 @@ "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": 1744068309, + "narHash": "sha256-4RAoQhztUI+M3XKzINEozxXWom4HOr+rvVfYaHk1Brw=", + "owner": "sodiboo", + "repo": "niri-flake", + "rev": "b1beb4d118baf1a31c9744ab58402ff9eeb6a333", + "type": "github" + }, + "original": { + "owner": "sodiboo", + "repo": "niri-flake", + "type": "github" + } + }, + "niri-stable": { + "flake": false, + "locked": { + "lastModified": 1740117926, + "narHash": "sha256-mTTHA0RAaQcdYe+9A3Jx77cmmyLFHmRoZdd8RpWa+m8=", + "owner": "YaLTeR", + "repo": "niri", + "rev": "b94a5db8790339cf9134873d8b490be69e02ac71", + "type": "github" + }, + "original": { + "owner": "YaLTeR", + "ref": "v25.02", + "repo": "niri", + "type": "github" + } + }, + "niri-unstable": { + "flake": false, + "locked": { + "lastModified": 1743923080, + "narHash": "sha256-Hb3t6FoJycnqIZmu3c6K1bJGndBsrDw8IQtM2ieLbzU=", + "owner": "YaLTeR", + "repo": "niri", + "rev": "430b155929a60644ea223012ee0c1389fc5e3755", + "type": "github" + }, + "original": { + "owner": "YaLTeR", + "repo": "niri", + "type": "github" + } + }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -345,6 +425,22 @@ "type": "github" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1743975612, + "narHash": "sha256-o4FjFOUmjSRMK7dn0TFdAT0RRWUWD+WsspPHa+qEQT8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a880f49904d68b5e53338d1e8c7bf80f59903928", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ @@ -376,9 +472,13 @@ "agenix": "agenix", "chaotic": "chaotic", "disko": "disko", + "home-manager": "home-manager_2", "lanzaboote": "lanzaboote", + "niri": "niri", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "rust-overlay": "rust-overlay_2", + "zen-browser": "zen-browser" } }, "rust-analyzer-src": { @@ -419,6 +519,26 @@ "type": "github" } }, + "rust-overlay_2": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1743993291, + "narHash": "sha256-u8GHvduU1gCtoFXvTS/wGjH1ouv5S/GRGq6MAT+sG/k=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "0cb3c8979c65dc6a5812dfe67499a8c7b8b4325b", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -433,6 +553,60 @@ "repo": "default", "type": "github" } + }, + "xwayland-satellite-stable": { + "flake": false, + "locked": { + "lastModified": 1739246919, + "narHash": "sha256-/hBM43/Gd0/tW+egrhlWgOIISeJxEs2uAOIYVpfDKeU=", + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "rev": "44590a416d4a3e8220e19e29e0b6efe64a80315d", + "type": "github" + }, + "original": { + "owner": "Supreeeme", + "ref": "v0.5.1", + "repo": "xwayland-satellite", + "type": "github" + } + }, + "xwayland-satellite-unstable": { + "flake": false, + "locked": { + "lastModified": 1743346993, + "narHash": "sha256-i7rWd/5BcqLgQEtB5L/6gKN5R5GUJcmm34F+iBivH60=", + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "rev": "45c055696437a08e3989d9b91d9c617b84cc2bc3", + "type": "github" + }, + "original": { + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "type": "github" + } + }, + "zen-browser": { + "inputs": { + "home-manager": "home-manager_3", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1744032540, + "narHash": "sha256-KMshnTCoe11oTzsUp5T3e0+9/dVlLSI/wIA7Nli3LI0=", + "owner": "0xc000022070", + "repo": "zen-browser-flake", + "rev": "f4edde8a094098c8f16de4efc93e057c2cd3c06b", + "type": "github" + }, + "original": { + "owner": "0xc000022070", + "repo": "zen-browser-flake", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..f86e2ec --- /dev/null +++ b/flake.nix @@ -0,0 +1,109 @@ +{ + 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"; + inputs.home-manager.follows = "home-manager"; + }; + + home-manager = { + url = "github:nix-community/home-manager"; + 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"; + }; + + rust-overlay = { + url = "github:oxalica/rust-overlay"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + zen-browser = { + url = "github:0xc000022070/zen-browser-flake"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + niri = { + url = "github:sodiboo/niri-flake"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + }; + + outputs = + { + self, + nixpkgs, + lanzaboote, + nixos-hardware, + agenix, + home-manager, + ... + }@inputs: + let + username = "primary"; + system = "x86_64-linux"; + hostnames = [ + "mreow" + "yarn" + ]; + + inputs.nixpkgs = + (import nixpkgs { + }).applyPatches + { + name = "nixpkgs"; + src = inputs.nixpkgs; + patches = [ + # https://github.com/NixOS/nixpkgs/pull/67576 + # gimp 3.0 + (builtins.fetchurl { + url = "https://github.com/NixOS/nixpkgs/pull/67576.diff"; + sha256 = "1idkhfirjba6iywkddyhm980x44kfl9lmp51cyfqrpbq7wlzpnia"; + }) + ]; + }; + in + { + formatter.${system} = nixpkgs.legacyPackages.${system}.nixfmt-rfc-style; + nixosConfigurations = nixpkgs.lib.foldl' ( + config: hostname: + config + // { + "${hostname}" = nixpkgs.lib.nixosSystem { + specialArgs = { + inherit inputs username hostname; + }; + modules = [ + home-manager.nixosModules.home-manager + ( + { ... }: + { + home-manager = import ./home-manager/home-${hostname}.nix { inherit inputs hostname username; }; + } + ) + ./etcnixos/system-${hostname}.nix + ]; + }; + } + ) { } hostnames; + }; +} diff --git a/home-manager/flake.lock b/home-manager/flake.lock deleted file mode 100644 index 6166e6f..0000000 --- a/home-manager/flake.lock +++ /dev/null @@ -1,283 +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": 1744038920, - "narHash": "sha256-9a4V1wQXS8hXZtc7mRtz0qINkGW+C99aDrmXY6oYBFg=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "a4d8020820a85b47f842eae76ad083b0ec2a886a", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "zen-browser", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1743604125, - "narHash": "sha256-ZD61DNbsBt1mQbinAaaEqKaJk2RFo9R/j+eYWeGMx7A=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "180fd43eea296e62ae68e079fcf56aba268b9a1a", - "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": 1744068309, - "narHash": "sha256-4RAoQhztUI+M3XKzINEozxXWom4HOr+rvVfYaHk1Brw=", - "owner": "sodiboo", - "repo": "niri-flake", - "rev": "b1beb4d118baf1a31c9744ab58402ff9eeb6a333", - "type": "github" - }, - "original": { - "owner": "sodiboo", - "repo": "niri-flake", - "type": "github" - } - }, - "niri-stable": { - "flake": false, - "locked": { - "lastModified": 1740117926, - "narHash": "sha256-mTTHA0RAaQcdYe+9A3Jx77cmmyLFHmRoZdd8RpWa+m8=", - "owner": "YaLTeR", - "repo": "niri", - "rev": "b94a5db8790339cf9134873d8b490be69e02ac71", - "type": "github" - }, - "original": { - "owner": "YaLTeR", - "ref": "v25.02", - "repo": "niri", - "type": "github" - } - }, - "niri-unstable": { - "flake": false, - "locked": { - "lastModified": 1743923080, - "narHash": "sha256-Hb3t6FoJycnqIZmu3c6K1bJGndBsrDw8IQtM2ieLbzU=", - "owner": "YaLTeR", - "repo": "niri", - "rev": "430b155929a60644ea223012ee0c1389fc5e3755", - "type": "github" - }, - "original": { - "owner": "YaLTeR", - "repo": "niri", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1743964447, - "narHash": "sha256-nEo1t3Q0F+0jQ36HJfbJtiRU4OI+/0jX/iITURKe3EE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "063dece00c5a77e4a0ea24e5e5a5bd75232806f8", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1743975612, - "narHash": "sha256-o4FjFOUmjSRMK7dn0TFdAT0RRWUWD+WsspPHa+qEQT8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a880f49904d68b5e53338d1e8c7bf80f59903928", - "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": 1743993291, - "narHash": "sha256-u8GHvduU1gCtoFXvTS/wGjH1ouv5S/GRGq6MAT+sG/k=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "0cb3c8979c65dc6a5812dfe67499a8c7b8b4325b", - "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": 1739246919, - "narHash": "sha256-/hBM43/Gd0/tW+egrhlWgOIISeJxEs2uAOIYVpfDKeU=", - "owner": "Supreeeme", - "repo": "xwayland-satellite", - "rev": "44590a416d4a3e8220e19e29e0b6efe64a80315d", - "type": "github" - }, - "original": { - "owner": "Supreeeme", - "ref": "v0.5.1", - "repo": "xwayland-satellite", - "type": "github" - } - }, - "xwayland-satellite-unstable": { - "flake": false, - "locked": { - "lastModified": 1743346993, - "narHash": "sha256-i7rWd/5BcqLgQEtB5L/6gKN5R5GUJcmm34F+iBivH60=", - "owner": "Supreeeme", - "repo": "xwayland-satellite", - "rev": "45c055696437a08e3989d9b91d9c617b84cc2bc3", - "type": "github" - }, - "original": { - "owner": "Supreeeme", - "repo": "xwayland-satellite", - "type": "github" - } - }, - "zen-browser": { - "inputs": { - "home-manager": "home-manager_2", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1744032540, - "narHash": "sha256-KMshnTCoe11oTzsUp5T3e0+9/dVlLSI/wIA7Nli3LI0=", - "owner": "0xc000022070", - "repo": "zen-browser-flake", - "rev": "f4edde8a094098c8f16de4efc93e057c2cd3c06b", - "type": "github" - }, - "original": { - "owner": "0xc000022070", - "repo": "zen-browser-flake", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/home-manager/flake.nix b/home-manager/flake.nix deleted file mode 100644 index 1ccc623..0000000 --- a/home-manager/flake.nix +++ /dev/null @@ -1,81 +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"; - hostname = nixpkgs.lib.strings.removeSuffix "\n" (builtins.readFile /etc/hostname); - - pkgs = import ( - (import nixpkgs { - }).applyPatches - { - name = "nixpkgs"; - src = inputs.nixpkgs; - patches = [ - # https://github.com/NixOS/nixpkgs/pull/67576 - # gimp 3.0 - (builtins.fetchurl { - url = "https://github.com/NixOS/nixpkgs/pull/67576.diff"; - sha256 = "1idkhfirjba6iywkddyhm980x44kfl9lmp51cyfqrpbq7wlzpnia"; - }) - ]; - } - ) { }; - in - { - formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt-rfc-style; - homeConfigurations."${username}" = home-manager.lib.homeManagerConfiguration { - inherit pkgs; - extraSpecialArgs = { - inherit - inputs - username - ; - }; - - modules = [ - ./system-${hostname}.nix - ]; - }; - }; -} diff --git a/home-manager/system-mreow.nix b/home-manager/home-mreow.nix similarity index 100% rename from home-manager/system-mreow.nix rename to home-manager/home-mreow.nix diff --git a/home-manager/system-yarn.nix b/home-manager/home-yarn.nix similarity index 100% rename from home-manager/system-yarn.nix rename to home-manager/home-yarn.nix From 760beab42a25cdfabf0622d25d040b63f10784d3 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 7 Apr 2025 21:34:13 -0400 Subject: [PATCH 170/724] fix unified config --- flake.nix | 38 ++++++++++++++++++++++---------------- home-manager/no-gui.nix | 6 ------ 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/flake.nix b/flake.nix index f86e2ec..7c23d9d 100644 --- a/flake.nix +++ b/flake.nix @@ -66,21 +66,21 @@ "yarn" ]; - inputs.nixpkgs = - (import nixpkgs { - }).applyPatches - { - name = "nixpkgs"; - src = inputs.nixpkgs; - patches = [ - # https://github.com/NixOS/nixpkgs/pull/67576 - # gimp 3.0 - (builtins.fetchurl { - url = "https://github.com/NixOS/nixpkgs/pull/67576.diff"; - sha256 = "1idkhfirjba6iywkddyhm980x44kfl9lmp51cyfqrpbq7wlzpnia"; - }) - ]; - }; + # pkgs = + # (import nixpkgs { + # }).applyPatches + # { + # name = "nixpkgs"; + # src = inputs.nixpkgs; + # patches = [ + # # https://github.com/NixOS/nixpkgs/pull/67576 + # # gimp 3.0 + # (builtins.fetchurl { + # url = "https://github.com/NixOS/nixpkgs/pull/67576.diff"; + # sha256 = "1idkhfirjba6iywkddyhm980x44kfl9lmp51cyfqrpbq7wlzpnia"; + # }) + # ]; + # }; in { formatter.${system} = nixpkgs.legacyPackages.${system}.nixfmt-rfc-style; @@ -97,7 +97,13 @@ ( { ... }: { - home-manager = import ./home-manager/home-${hostname}.nix { inherit inputs hostname username; }; + # home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.extraSpecialArgs = { + inherit inputs hostname username; + homeDirectory = "/home/${username}"; + }; + home-manager.users.${username} = import ./home-manager/home-${hostname}.nix; } ) ./etcnixos/system-${hostname}.nix diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index d1abe5c..3363777 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -56,12 +56,6 @@ in nixpkgs.overlays = [ inputs.rust-overlay.overlays.default ]; - - # home-manager stuff - home = { - inherit username; - homeDirectory = "/home/${username}"; - }; } ) ]; From d71bb8951181c452e0c1462a1f261120661fbee0 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 7 Apr 2025 21:39:19 -0400 Subject: [PATCH 171/724] test --- flake.nix | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/flake.nix b/flake.nix index 7c23d9d..0802f7f 100644 --- a/flake.nix +++ b/flake.nix @@ -66,21 +66,24 @@ "yarn" ]; - # pkgs = - # (import nixpkgs { - # }).applyPatches - # { - # name = "nixpkgs"; - # src = inputs.nixpkgs; - # patches = [ - # # https://github.com/NixOS/nixpkgs/pull/67576 - # # gimp 3.0 - # (builtins.fetchurl { - # url = "https://github.com/NixOS/nixpkgs/pull/67576.diff"; - # sha256 = "1idkhfirjba6iywkddyhm980x44kfl9lmp51cyfqrpbq7wlzpnia"; - # }) - # ]; - # }; + pkgs = import ( + (import nixpkgs { + inherit system; + }).applyPatches + { + name = "nixpkgs"; + src = inputs.nixpkgs; + patches = [ + # https://github.com/NixOS/nixpkgs/pull/67576 + # gimp 3.0 + (builtins.fetchurl { + url = "https://github.com/NixOS/nixpkgs/pull/67576.diff"; + sha256 = "1idkhfirjba6iywkddyhm980x44kfl9lmp51cyfqrpbq7wlzpnia"; + }) + ]; + } + ) { inherit system; }; + in { formatter.${system} = nixpkgs.legacyPackages.${system}.nixfmt-rfc-style; @@ -90,7 +93,12 @@ // { "${hostname}" = nixpkgs.lib.nixosSystem { specialArgs = { - inherit inputs username hostname; + inherit + inputs + username + hostname + pkgs + ; }; modules = [ home-manager.nixosModules.home-manager From 731cae1de47e0730aee63940dca7964ddc63e361 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 7 Apr 2025 22:06:53 -0400 Subject: [PATCH 172/724] no gimp3 --- flake.nix | 20 -------------------- home-manager/gui.nix | 2 +- justfile | 17 ----------------- 3 files changed, 1 insertion(+), 38 deletions(-) delete mode 100644 justfile diff --git a/flake.nix b/flake.nix index 0802f7f..474fbf2 100644 --- a/flake.nix +++ b/flake.nix @@ -65,25 +65,6 @@ "mreow" "yarn" ]; - - pkgs = import ( - (import nixpkgs { - inherit system; - }).applyPatches - { - name = "nixpkgs"; - src = inputs.nixpkgs; - patches = [ - # https://github.com/NixOS/nixpkgs/pull/67576 - # gimp 3.0 - (builtins.fetchurl { - url = "https://github.com/NixOS/nixpkgs/pull/67576.diff"; - sha256 = "1idkhfirjba6iywkddyhm980x44kfl9lmp51cyfqrpbq7wlzpnia"; - }) - ]; - } - ) { inherit system; }; - in { formatter.${system} = nixpkgs.legacyPackages.${system}.nixfmt-rfc-style; @@ -97,7 +78,6 @@ inputs username hostname - pkgs ; }; modules = [ diff --git a/home-manager/gui.nix b/home-manager/gui.nix index 5e9d00e..37f39be 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -112,7 +112,7 @@ # simple screen recording on wayland wl-screenrec - gimp3 + gimp pinta # wayland-compatible color picker diff --git a/justfile b/justfile deleted file mode 100644 index 441528d..0000000 --- a/justfile +++ /dev/null @@ -1,17 +0,0 @@ -update_all: system_update home_update - -format_home: - nixfmt ./home-manager - -format_system: - nixfmt ./etcnixos - -format: format_home format_system - -system_update: - nh os boot -u ./etcnixos - -home_update: - rm -fr ~/.gtkrc-2.0 - nh home switch -u ./home-manager -- --impure - From 8b3e08a6170ec569512ecbbbd4dae9e975917402 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 7 Apr 2025 23:03:12 -0400 Subject: [PATCH 173/724] add deploy.sh --- deploy.sh | 3 +++ 1 file changed, 3 insertions(+) create mode 100755 deploy.sh diff --git a/deploy.sh b/deploy.sh new file mode 100755 index 0000000..0d11751 --- /dev/null +++ b/deploy.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +nixos-rebuild switch --flake . --use-remote-sudo From 39edf8c516bdaa8da5983ee99b051d2283f61ba0 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 8 Apr 2025 09:44:27 -0400 Subject: [PATCH 174/724] update --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index e724e2f..3690140 100644 --- a/flake.lock +++ b/flake.lock @@ -231,11 +231,11 @@ ] }, "locked": { - "lastModified": 1744038920, - "narHash": "sha256-9a4V1wQXS8hXZtc7mRtz0qINkGW+C99aDrmXY6oYBFg=", + "lastModified": 1744119443, + "narHash": "sha256-Bulm+vxvqzx3e/5c0WY40PAikXTda/6VjRtu/OHViAM=", "owner": "nix-community", "repo": "home-manager", - "rev": "a4d8020820a85b47f842eae76ad083b0ec2a886a", + "rev": "bd33ce4000800a44b66e9d5a596d8abe6bf4bb16", "type": "github" }, "original": { @@ -526,11 +526,11 @@ ] }, "locked": { - "lastModified": 1743993291, - "narHash": "sha256-u8GHvduU1gCtoFXvTS/wGjH1ouv5S/GRGq6MAT+sG/k=", + "lastModified": 1744079607, + "narHash": "sha256-5cog6Qd6w/bINdLO5mOysAHOHey8PwFXk4IWo+y+Czg=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "0cb3c8979c65dc6a5812dfe67499a8c7b8b4325b", + "rev": "f6b62cc99c25e79a1c17e9fca91dc6b6faebec6c", "type": "github" }, "original": { @@ -595,11 +595,11 @@ ] }, "locked": { - "lastModified": 1744032540, - "narHash": "sha256-KMshnTCoe11oTzsUp5T3e0+9/dVlLSI/wIA7Nli3LI0=", + "lastModified": 1744117961, + "narHash": "sha256-xtYr/9NIJO+NZXDJwVjqys23Cx3xIeCXZtb47XzLfLU=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "f4edde8a094098c8f16de4efc93e057c2cd3c06b", + "rev": "70fe8d4b27feeb4c8651e5daf2eaf6a4072e820e", "type": "github" }, "original": { From 5dd977fa46d89f0e7e68fce311995e2b8021a1ab Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 13 Apr 2025 14:42:15 -0400 Subject: [PATCH 175/724] update --- flake.lock | 72 ++++++++++++++++++++++---------------------- home-manager/gui.nix | 2 +- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/flake.lock b/flake.lock index 3690140..17eeba5 100644 --- a/flake.lock +++ b/flake.lock @@ -36,11 +36,11 @@ ] }, "locked": { - "lastModified": 1744070747, - "narHash": "sha256-ds14Cu3aXDwTVtV6IN9q5nVCCz2H6vqQxIQ2KNd5/z0=", + "lastModified": 1744455756, + "narHash": "sha256-wPZ1GfwpUsz/4nFrVXk8fmiXn8kHiYSQEQWeAq48ONY=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "5d40cdae16b48c400b0d024a79644d0bd52eabcc", + "rev": "99f9f08455cf22de124c059b18988ee8d452285b", "type": "github" }, "original": { @@ -117,11 +117,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1742452566, - "narHash": "sha256-sVuLDQ2UIWfXUBbctzrZrXM2X05YjX08K7XHMztt36E=", + "lastModified": 1744231114, + "narHash": "sha256-60gLl2rJFt6SRwqWimsTAeHgfsIE1iV0zChdJFOvx8w=", "owner": "nix-community", "repo": "fenix", - "rev": "7d9ba794daf5e8cc7ee728859bc688d8e26d5f06", + "rev": "0ccfe532b1433da8e5a23cd513ff6847e0f6a8c2", "type": "github" }, "original": { @@ -211,11 +211,11 @@ ] }, "locked": { - "lastModified": 1743869639, - "narHash": "sha256-Xhe3whfRW/Ay05z9m1EZ1/AkbV1yo0tm1CbgjtCi4rQ=", + "lastModified": 1744400600, + "narHash": "sha256-qYhUgA98mhq1QK13r9qVY+sG1ri6FBgyp+GApX6wS20=", "owner": "nix-community", "repo": "home-manager", - "rev": "d094c6763c6ddb860580e7d3b4201f8f496a6836", + "rev": "b74b22bb6167e8dff083ec6988c98798bf8954d3", "type": "github" }, "original": { @@ -231,11 +231,11 @@ ] }, "locked": { - "lastModified": 1744119443, - "narHash": "sha256-Bulm+vxvqzx3e/5c0WY40PAikXTda/6VjRtu/OHViAM=", + "lastModified": 1744498625, + "narHash": "sha256-pL52uCt9CUoTTmysGG91c2FeU7XUvpB7Cep6yon2vDk=", "owner": "nix-community", "repo": "home-manager", - "rev": "bd33ce4000800a44b66e9d5a596d8abe6bf4bb16", + "rev": "db56335ca8942d86f2200664acdbd5b9212b26ad", "type": "github" }, "original": { @@ -274,11 +274,11 @@ ] }, "locked": { - "lastModified": 1743879910, - "narHash": "sha256-jAr345BODeDluX6DfO3TdY7pB77olVOcYFYjxz6rPxo=", + "lastModified": 1744270169, + "narHash": "sha256-yV6OhBUj3Ag1l9gdf7eObkAoli35SUxDtFvC8JbsVrk=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "96a7fbb4a892696ff89d3d42fc743ab5d6714222", + "rev": "10d3614023e2fb15e5e7089235e9958b9aa71a6c", "type": "github" }, "original": { @@ -324,11 +324,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1744068309, - "narHash": "sha256-4RAoQhztUI+M3XKzINEozxXWom4HOr+rvVfYaHk1Brw=", + "lastModified": 1744480072, + "narHash": "sha256-h9MGdfc1ddQLaZ5eXdxUOY4SGvRe0IzIuX/03yVRras=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "b1beb4d118baf1a31c9744ab58402ff9eeb6a333", + "rev": "c845f42f0bf9a02350a1e561cb702911c61428a9", "type": "github" }, "original": { @@ -357,11 +357,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1743923080, - "narHash": "sha256-Hb3t6FoJycnqIZmu3c6K1bJGndBsrDw8IQtM2ieLbzU=", + "lastModified": 1744475937, + "narHash": "sha256-vJXhE2BCJO3AxGUGqL7GW7ReeAL+OKy80ErMYDuILjM=", "owner": "YaLTeR", "repo": "niri", - "rev": "430b155929a60644ea223012ee0c1389fc5e3755", + "rev": "95eafba346a17104a9af71021011fcdc9e13776b", "type": "github" }, "original": { @@ -395,11 +395,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1743420942, - "narHash": "sha256-b/exDDQSLmENZZgbAEI3qi9yHkuXAXCPbormD8CSJXo=", + "lastModified": 1744366945, + "narHash": "sha256-OuLhysErPHl53BBifhesrRumJNhrlSgQDfYOTXfgIMg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "de6fc5551121c59c01e2a3d45b277a6d05077bc4", + "rev": "1fe3cc2bc5d2dc9c81cb4e63d2f67c1543340df1", "type": "github" }, "original": { @@ -411,11 +411,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1743964447, - "narHash": "sha256-nEo1t3Q0F+0jQ36HJfbJtiRU4OI+/0jX/iITURKe3EE=", + "lastModified": 1744463964, + "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "063dece00c5a77e4a0ea24e5e5a5bd75232806f8", + "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", "type": "github" }, "original": { @@ -427,11 +427,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1743975612, - "narHash": "sha256-o4FjFOUmjSRMK7dn0TFdAT0RRWUWD+WsspPHa+qEQT8=", + "lastModified": 1744309437, + "narHash": "sha256-QZnNHM823am8apCqKSPdtnzPGTy2ZB4zIXOVoBp5+W0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a880f49904d68b5e53338d1e8c7bf80f59903928", + "rev": "f9ebe33a928b5d529c895202263a5ce46bdf12f7", "type": "github" }, "original": { @@ -526,11 +526,11 @@ ] }, "locked": { - "lastModified": 1744079607, - "narHash": "sha256-5cog6Qd6w/bINdLO5mOysAHOHey8PwFXk4IWo+y+Czg=", + "lastModified": 1744513456, + "narHash": "sha256-NLVluTmK8d01Iz+WyarQhwFcXpHEwU7m5hH3YQQFJS0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "f6b62cc99c25e79a1c17e9fca91dc6b6faebec6c", + "rev": "730fd8e82799219754418483fabe1844262fd1e2", "type": "github" }, "original": { @@ -595,11 +595,11 @@ ] }, "locked": { - "lastModified": 1744117961, - "narHash": "sha256-xtYr/9NIJO+NZXDJwVjqys23Cx3xIeCXZtb47XzLfLU=", + "lastModified": 1744553743, + "narHash": "sha256-0WQc6STwcaRSg/YEruuHS8GCQYdXsoGQwfaEkueQqSE=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "70fe8d4b27feeb4c8651e5daf2eaf6a4072e820e", + "rev": "0c36df83399cf76593e8d30e4a6c0b7bbaa4b314", "type": "github" }, "original": { diff --git a/home-manager/gui.nix b/home-manager/gui.nix index 37f39be..cf05138 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -63,7 +63,7 @@ finamp # music player delfin # jellyfin client - signal-desktop + signal-desktop-source #accounting # gnucash From f08d59b654ee39d2fb17514102d05d3a5bc48d20 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 13 Apr 2025 22:32:38 -0400 Subject: [PATCH 176/724] update --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 17eeba5..c409651 100644 --- a/flake.lock +++ b/flake.lock @@ -231,11 +231,11 @@ ] }, "locked": { - "lastModified": 1744498625, - "narHash": "sha256-pL52uCt9CUoTTmysGG91c2FeU7XUvpB7Cep6yon2vDk=", + "lastModified": 1744584414, + "narHash": "sha256-uk9NgZvkTkHEuTdnZ2GGO/Y4q4sbHdAMzPPoASpIpWo=", "owner": "nix-community", "repo": "home-manager", - "rev": "db56335ca8942d86f2200664acdbd5b9212b26ad", + "rev": "ac3c1f4fa40497b07f1f3ea3c4f644ce5dbcd2a4", "type": "github" }, "original": { @@ -595,11 +595,11 @@ ] }, "locked": { - "lastModified": 1744553743, - "narHash": "sha256-0WQc6STwcaRSg/YEruuHS8GCQYdXsoGQwfaEkueQqSE=", + "lastModified": 1744594629, + "narHash": "sha256-NpTi3oHTbAlIX9d96DApyOlLmN6Rx64Lg24avysQ9nQ=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "0c36df83399cf76593e8d30e4a6c0b7bbaa4b314", + "rev": "2bc982d49d24c52cab81aea143ee386936bfaf79", "type": "github" }, "original": { From 04974457813d83d5b76467513fad83e581599515 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 14 Apr 2025 17:08:42 -0400 Subject: [PATCH 177/724] update --- flake.lock | 127 +++++++++++++++-------------------------------------- flake.nix | 3 ++ 2 files changed, 38 insertions(+), 92 deletions(-) diff --git a/flake.lock b/flake.lock index c409651..9524bb7 100644 --- a/flake.lock +++ b/flake.lock @@ -29,18 +29,20 @@ "inputs": { "fenix": "fenix", "flake-schemas": "flake-schemas", - "home-manager": "home-manager", + "home-manager": [ + "home-manager" + ], "jovian": "jovian", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1744455756, - "narHash": "sha256-wPZ1GfwpUsz/4nFrVXk8fmiXn8kHiYSQEQWeAq48ONY=", + "lastModified": 1744662018, + "narHash": "sha256-xfHUAfPVYp+zD0sOg9KMNEHBj8O06G7xHgDgNQ2Q1lw=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "99f9f08455cf22de124c059b18988ee8d452285b", + "rev": "6318c913eb1b29236050bbb0202d957c6ae97191", "type": "github" }, "original": { @@ -117,11 +119,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1744231114, - "narHash": "sha256-60gLl2rJFt6SRwqWimsTAeHgfsIE1iV0zChdJFOvx8w=", + "lastModified": 1744618085, + "narHash": "sha256-+VdhZsIiIDtyOL88c4U/Os1PsCMLOCyScIeWL4hxJRM=", "owner": "nix-community", "repo": "fenix", - "rev": "0ccfe532b1433da8e5a23cd513ff6847e0f6a8c2", + "rev": "a85d390a5607188dca2dbc39b5b37571651d69ce", "type": "github" }, "original": { @@ -206,57 +208,15 @@ "home-manager": { "inputs": { "nixpkgs": [ - "chaotic", "nixpkgs" ] }, "locked": { - "lastModified": 1744400600, - "narHash": "sha256-qYhUgA98mhq1QK13r9qVY+sG1ri6FBgyp+GApX6wS20=", + "lastModified": 1744663884, + "narHash": "sha256-a6QGaZMDM1miK8VWzAITsEPOdmLk+xTPyJSTjVs3WhI=", "owner": "nix-community", "repo": "home-manager", - "rev": "b74b22bb6167e8dff083ec6988c98798bf8954d3", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1744584414, - "narHash": "sha256-uk9NgZvkTkHEuTdnZ2GGO/Y4q4sbHdAMzPPoASpIpWo=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "ac3c1f4fa40497b07f1f3ea3c4f644ce5dbcd2a4", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_3": { - "inputs": { - "nixpkgs": [ - "zen-browser", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1743604125, - "narHash": "sha256-ZD61DNbsBt1mQbinAaaEqKaJk2RFo9R/j+eYWeGMx7A=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "180fd43eea296e62ae68e079fcf56aba268b9a1a", + "rev": "d5cdf55bd9f19a3debd55b6cb5d38f7831426265", "type": "github" }, "original": { @@ -274,11 +234,11 @@ ] }, "locked": { - "lastModified": 1744270169, - "narHash": "sha256-yV6OhBUj3Ag1l9gdf7eObkAoli35SUxDtFvC8JbsVrk=", + "lastModified": 1744648917, + "narHash": "sha256-xtBc0YMCP/x3+3iqnfdd4d9qEHvxQsGHamhhlegsGFE=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "10d3614023e2fb15e5e7089235e9958b9aa71a6c", + "rev": "66c4c9dccd26330ebb0e91aa6ba89ca8835dfdc5", "type": "github" }, "original": { @@ -296,7 +256,9 @@ "nixpkgs" ], "pre-commit-hooks-nix": "pre-commit-hooks-nix", - "rust-overlay": "rust-overlay" + "rust-overlay": [ + "rust-overlay" + ] }, "locked": { "lastModified": 1741442524, @@ -395,11 +357,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1744366945, - "narHash": "sha256-OuLhysErPHl53BBifhesrRumJNhrlSgQDfYOTXfgIMg=", + "lastModified": 1744633460, + "narHash": "sha256-fbWE4Xpw6eH0Q6in+ymNuDwTkqmFmtxcQEmtRuKDTTk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "1fe3cc2bc5d2dc9c81cb4e63d2f67c1543340df1", + "rev": "9a049b4a421076d27fee3eec664a18b2066824cb", "type": "github" }, "original": { @@ -472,23 +434,23 @@ "agenix": "agenix", "chaotic": "chaotic", "disko": "disko", - "home-manager": "home-manager_2", + "home-manager": "home-manager", "lanzaboote": "lanzaboote", "niri": "niri", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", - "rust-overlay": "rust-overlay_2", + "rust-overlay": "rust-overlay", "zen-browser": "zen-browser" } }, "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1742296961, - "narHash": "sha256-gCpvEQOrugHWLimD1wTFOJHagnSEP6VYBDspq96Idu0=", + "lastModified": 1744539868, + "narHash": "sha256-NPUnfDAwLD69aKetxjC7lV5ysrvs1IKC0Sy4Zai10Mw=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "15d87419f1a123d8f888d608129c3ce3ff8f13d4", + "rev": "8365cf853e791c93fa8bc924f031f11949bb1a3c", "type": "github" }, "original": { @@ -501,36 +463,15 @@ "rust-overlay": { "inputs": { "nixpkgs": [ - "lanzaboote", "nixpkgs" ] }, "locked": { - "lastModified": 1741228283, - "narHash": "sha256-VzqI+k/eoijLQ5am6rDFDAtFAbw8nltXfLBC6SIEJAE=", + "lastModified": 1744599145, + "narHash": "sha256-yzaDPkJwZdUtRj/dzdOeB74yryWzpngYaD7BedqFKk8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "38e9826bc4296c9daf18bc1e6aa299f3e932a403", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_2": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1744513456, - "narHash": "sha256-NLVluTmK8d01Iz+WyarQhwFcXpHEwU7m5hH3YQQFJS0=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "730fd8e82799219754418483fabe1844262fd1e2", + "rev": "fd6795d3d28f956de01a0458b6fa7baae5c793b4", "type": "github" }, "original": { @@ -589,17 +530,19 @@ }, "zen-browser": { "inputs": { - "home-manager": "home-manager_3", + "home-manager": [ + "home-manager" + ], "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1744594629, - "narHash": "sha256-NpTi3oHTbAlIX9d96DApyOlLmN6Rx64Lg24avysQ9nQ=", + "lastModified": 1744657060, + "narHash": "sha256-XOPpnwypaigN7TnRcIkk8PIoWIWg6ZGEWaGYL5e5ShA=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "2bc982d49d24c52cab81aea143ee386936bfaf79", + "rev": "3c15b3d88648349acbbf5a1c0564edd35544e4d9", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 474fbf2..ceeb794 100644 --- a/flake.nix +++ b/flake.nix @@ -7,6 +7,7 @@ lanzaboote = { url = "github:nix-community/lanzaboote"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.rust-overlay.follows = "rust-overlay"; }; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; @@ -25,6 +26,7 @@ chaotic = { url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.home-manager.follows = "home-manager"; }; disko = { @@ -40,6 +42,7 @@ zen-browser = { url = "github:0xc000022070/zen-browser-flake"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.home-manager.follows = "home-manager"; }; niri = { From 2b69c088493628201a875583c4a70791b4468931 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 17 Apr 2025 12:40:06 -0400 Subject: [PATCH 178/724] update --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 9524bb7..83b7a1f 100644 --- a/flake.lock +++ b/flake.lock @@ -212,11 +212,11 @@ ] }, "locked": { - "lastModified": 1744663884, - "narHash": "sha256-a6QGaZMDM1miK8VWzAITsEPOdmLk+xTPyJSTjVs3WhI=", + "lastModified": 1744902080, + "narHash": "sha256-px7OEMQYhS9StY3sTYYeM/jJspk6SXgoPU7OmOSx+1c=", "owner": "nix-community", "repo": "home-manager", - "rev": "d5cdf55bd9f19a3debd55b6cb5d38f7831426265", + "rev": "2c71aae678c03a39c2542e136b87bd040ae1b3cb", "type": "github" }, "original": { @@ -286,11 +286,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1744480072, - "narHash": "sha256-h9MGdfc1ddQLaZ5eXdxUOY4SGvRe0IzIuX/03yVRras=", + "lastModified": 1744883496, + "narHash": "sha256-ZpXGzheNwQiYQSnTLz5CFdvVYrMK+e82ZgFLweuf2Rc=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "c845f42f0bf9a02350a1e561cb702911c61428a9", + "rev": "55624e7a1be5318a3d910e282d86deb2adef7f97", "type": "github" }, "original": { @@ -319,11 +319,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1744475937, - "narHash": "sha256-vJXhE2BCJO3AxGUGqL7GW7ReeAL+OKy80ErMYDuILjM=", + "lastModified": 1744878694, + "narHash": "sha256-e3jPdRQmlgeWwDTC/wnvKgIy4Ga8KZYoxUPQ8PCNktM=", "owner": "YaLTeR", "repo": "niri", - "rev": "95eafba346a17104a9af71021011fcdc9e13776b", + "rev": "7884d3bfea810740fe2ca7021b102af0f049ccae", "type": "github" }, "original": { @@ -389,11 +389,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1744309437, - "narHash": "sha256-QZnNHM823am8apCqKSPdtnzPGTy2ZB4zIXOVoBp5+W0=", + "lastModified": 1744440957, + "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f9ebe33a928b5d529c895202263a5ce46bdf12f7", + "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", "type": "github" }, "original": { @@ -467,11 +467,11 @@ ] }, "locked": { - "lastModified": 1744599145, - "narHash": "sha256-yzaDPkJwZdUtRj/dzdOeB74yryWzpngYaD7BedqFKk8=", + "lastModified": 1744857263, + "narHash": "sha256-M4X/CnquHozzgwDk+CbFb8Sb4rSGJttfNOKcpRwziis=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "fd6795d3d28f956de01a0458b6fa7baae5c793b4", + "rev": "9f3d63d569536cd661a4adcf697e32eb08d61e31", "type": "github" }, "original": { @@ -515,11 +515,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1743346993, - "narHash": "sha256-i7rWd/5BcqLgQEtB5L/6gKN5R5GUJcmm34F+iBivH60=", + "lastModified": 1744860839, + "narHash": "sha256-m/p0wFYey7zqlf5yEJ3g/h+4ZNPkjPsGiMZVJ09aWWw=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "45c055696437a08e3989d9b91d9c617b84cc2bc3", + "rev": "2b5288b4b9ad2481a033e9c3cc1205108323e7d9", "type": "github" }, "original": { @@ -538,11 +538,11 @@ ] }, "locked": { - "lastModified": 1744657060, - "narHash": "sha256-XOPpnwypaigN7TnRcIkk8PIoWIWg6ZGEWaGYL5e5ShA=", + "lastModified": 1744841864, + "narHash": "sha256-KytcQDopqwkBy65UaRdL9Aq/knlaZ7di9Qc1YPMsm58=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "3c15b3d88648349acbbf5a1c0564edd35544e4d9", + "rev": "9ac562b3d3b8dc06d0663e0028eff8c66ff8b390", "type": "github" }, "original": { From 7ca98d44920157938dbaf1f1160b902237c1ea9d Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 17 Apr 2025 14:31:55 -0400 Subject: [PATCH 179/724] update --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 83b7a1f..1cb757d 100644 --- a/flake.lock +++ b/flake.lock @@ -212,11 +212,11 @@ ] }, "locked": { - "lastModified": 1744902080, - "narHash": "sha256-px7OEMQYhS9StY3sTYYeM/jJspk6SXgoPU7OmOSx+1c=", + "lastModified": 1744912998, + "narHash": "sha256-7UkI7aP0tTXoLjVcK8yv5ZbFwM/Z3enw0wElnFYT7O0=", "owner": "nix-community", "repo": "home-manager", - "rev": "2c71aae678c03a39c2542e136b87bd040ae1b3cb", + "rev": "e72178b84e440703e17ff5d393ba060784bed099", "type": "github" }, "original": { @@ -538,11 +538,11 @@ ] }, "locked": { - "lastModified": 1744841864, - "narHash": "sha256-KytcQDopqwkBy65UaRdL9Aq/knlaZ7di9Qc1YPMsm58=", + "lastModified": 1744910227, + "narHash": "sha256-qDAz+M2ZsqMEtar8WCkNkppDnXop83wB2GL66GbL1Lo=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "9ac562b3d3b8dc06d0663e0028eff8c66ff8b390", + "rev": "df60f61389c91f9db119cebc450580ede16d316f", "type": "github" }, "original": { From 3c408fda3a70d55be307069732dbecd744a6b33f Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 18 Apr 2025 17:47:33 -0400 Subject: [PATCH 180/724] update --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 1cb757d..7eee8cd 100644 --- a/flake.lock +++ b/flake.lock @@ -212,11 +212,11 @@ ] }, "locked": { - "lastModified": 1744912998, - "narHash": "sha256-7UkI7aP0tTXoLjVcK8yv5ZbFwM/Z3enw0wElnFYT7O0=", + "lastModified": 1745001336, + "narHash": "sha256-R4HuzrgYtOYBNmB3lfRxcieHEBO4uSfgHNz4MzWkZ5M=", "owner": "nix-community", "repo": "home-manager", - "rev": "e72178b84e440703e17ff5d393ba060784bed099", + "rev": "fc09cb7aaadb70d6c4898654ffc872f0d2415df9", "type": "github" }, "original": { @@ -286,11 +286,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1744883496, - "narHash": "sha256-ZpXGzheNwQiYQSnTLz5CFdvVYrMK+e82ZgFLweuf2Rc=", + "lastModified": 1744991948, + "narHash": "sha256-f4xKjzY64l6e28YExcf/V8aLYzBzDdjNI7ZZJGBBz3Y=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "55624e7a1be5318a3d910e282d86deb2adef7f97", + "rev": "a70acecb35de8941bac791c82d8e214d4be70567", "type": "github" }, "original": { @@ -373,11 +373,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", + "lastModified": 1744932701, + "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", "type": "github" }, "original": { @@ -467,11 +467,11 @@ ] }, "locked": { - "lastModified": 1744857263, - "narHash": "sha256-M4X/CnquHozzgwDk+CbFb8Sb4rSGJttfNOKcpRwziis=", + "lastModified": 1744943606, + "narHash": "sha256-VL4swGy4uBcHvX+UR5pMeNE9uQzXfA7B37lkwet1EmA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "9f3d63d569536cd661a4adcf697e32eb08d61e31", + "rev": "ec22cd63500f4832d1f3432d2425e0b31b0361b1", "type": "github" }, "original": { @@ -538,11 +538,11 @@ ] }, "locked": { - "lastModified": 1744910227, - "narHash": "sha256-qDAz+M2ZsqMEtar8WCkNkppDnXop83wB2GL66GbL1Lo=", + "lastModified": 1745012451, + "narHash": "sha256-whHhTy0G0AlEgfJ6m+dfv3n2Fymg1qZ/cvV/nCWzQns=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "df60f61389c91f9db119cebc450580ede16d316f", + "rev": "8c6b498af3776c49698b99bae05c2ae593bcadf1", "type": "github" }, "original": { From 09f6f8c082e1074cfeb3bee7ce47f422f22f5993 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 18 Apr 2025 20:20:25 -0400 Subject: [PATCH 181/724] update --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 7eee8cd..9b6cf68 100644 --- a/flake.lock +++ b/flake.lock @@ -212,11 +212,11 @@ ] }, "locked": { - "lastModified": 1745001336, - "narHash": "sha256-R4HuzrgYtOYBNmB3lfRxcieHEBO4uSfgHNz4MzWkZ5M=", + "lastModified": 1745016969, + "narHash": "sha256-nDK8Z+LsNWrUsQ1JjnndNB57lvCmvy2QZUoCakoJCcI=", "owner": "nix-community", "repo": "home-manager", - "rev": "fc09cb7aaadb70d6c4898654ffc872f0d2415df9", + "rev": "67f60ebce88a89939fb509f304ac554bcdc5bfa6", "type": "github" }, "original": { From 747ebd4cf6c45e25b82f7def21abedcc4609f01b Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 18 Apr 2025 23:40:05 -0400 Subject: [PATCH 182/724] signal-desktop-source -> signal-desktop --- home-manager/gui.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/gui.nix b/home-manager/gui.nix index cf05138..37f39be 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -63,7 +63,7 @@ finamp # music player delfin # jellyfin client - signal-desktop-source + signal-desktop #accounting # gnucash From e7983ef0cc8dd02fac850500513295e5c8c9526c Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 18 Apr 2025 23:42:55 -0400 Subject: [PATCH 183/724] update --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 9b6cf68..c5c81cd 100644 --- a/flake.lock +++ b/flake.lock @@ -212,11 +212,11 @@ ] }, "locked": { - "lastModified": 1745016969, - "narHash": "sha256-nDK8Z+LsNWrUsQ1JjnndNB57lvCmvy2QZUoCakoJCcI=", + "lastModified": 1745033012, + "narHash": "sha256-KjBMsjCzIOWgDqTZMYIriPFmHiQcCb2RhuDh5JF0VVc=", "owner": "nix-community", "repo": "home-manager", - "rev": "67f60ebce88a89939fb509f304ac554bcdc5bfa6", + "rev": "ae84885d9b6b62dc58ccd300e9ab321a3fd9f9c7", "type": "github" }, "original": { @@ -467,11 +467,11 @@ ] }, "locked": { - "lastModified": 1744943606, - "narHash": "sha256-VL4swGy4uBcHvX+UR5pMeNE9uQzXfA7B37lkwet1EmA=", + "lastModified": 1745029910, + "narHash": "sha256-9CtbfTTQWMoOkXejxc5D+K3z/39wkQQt2YfYJW50tnI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ec22cd63500f4832d1f3432d2425e0b31b0361b1", + "rev": "50fefac8cdfd1587ac6d8678f6181e7d348201d2", "type": "github" }, "original": { @@ -538,11 +538,11 @@ ] }, "locked": { - "lastModified": 1745012451, - "narHash": "sha256-whHhTy0G0AlEgfJ6m+dfv3n2Fymg1qZ/cvV/nCWzQns=", + "lastModified": 1745024827, + "narHash": "sha256-NjYyRsHrWwUVjbd78FV8E/HZC+gH4CYS6Qnjh2O29b4=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "8c6b498af3776c49698b99bae05c2ae593bcadf1", + "rev": "e6893892b832d92f1ceb508fcdae250d41927b38", "type": "github" }, "original": { From 661945dada5ff79274fea70f0f8e087a07bdcb46 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 19 Apr 2025 19:25:15 -0400 Subject: [PATCH 184/724] gimp3 --- flake.lock | 36 ++++++++++++++++++------------------ home-manager/gui.nix | 2 +- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index c5c81cd..1bc8734 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ ] }, "locked": { - "lastModified": 1744662018, - "narHash": "sha256-xfHUAfPVYp+zD0sOg9KMNEHBj8O06G7xHgDgNQ2Q1lw=", + "lastModified": 1745071774, + "narHash": "sha256-k+bmjaO6fcT5Ol5fziSs5wfaa1S75SP9ntJQSgchqms=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "6318c913eb1b29236050bbb0202d957c6ae97191", + "rev": "9282cc026570139b0794874c55ff9df005448429", "type": "github" }, "original": { @@ -119,11 +119,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1744618085, - "narHash": "sha256-+VdhZsIiIDtyOL88c4U/Os1PsCMLOCyScIeWL4hxJRM=", + "lastModified": 1744958318, + "narHash": "sha256-L0a9BKIgHAD9mqum0VoXjBUDwnCV16/Q1AQg3a8cEnw=", "owner": "nix-community", "repo": "fenix", - "rev": "a85d390a5607188dca2dbc39b5b37571651d69ce", + "rev": "4cc256372df88f061c5156b8ca4ed6d5b01fb1a7", "type": "github" }, "original": { @@ -212,11 +212,11 @@ ] }, "locked": { - "lastModified": 1745033012, - "narHash": "sha256-KjBMsjCzIOWgDqTZMYIriPFmHiQcCb2RhuDh5JF0VVc=", + "lastModified": 1745071558, + "narHash": "sha256-bvcatss0xodcdxXm0LUSLPd2jjrhqO3yFSu3stOfQXg=", "owner": "nix-community", "repo": "home-manager", - "rev": "ae84885d9b6b62dc58ccd300e9ab321a3fd9f9c7", + "rev": "9676e8a52a177d80c8a42f66566362a6d74ecf78", "type": "github" }, "original": { @@ -234,11 +234,11 @@ ] }, "locked": { - "lastModified": 1744648917, - "narHash": "sha256-xtBc0YMCP/x3+3iqnfdd4d9qEHvxQsGHamhhlegsGFE=", + "lastModified": 1744866383, + "narHash": "sha256-SOBI89WTS8qqrjysrE0+VsePe5JoOxtbnmFroJbHiAo=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "66c4c9dccd26330ebb0e91aa6ba89ca8835dfdc5", + "rev": "36186806e1dc4c0e370d0080f9b838ff8b1d20a2", "type": "github" }, "original": { @@ -446,11 +446,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1744539868, - "narHash": "sha256-NPUnfDAwLD69aKetxjC7lV5ysrvs1IKC0Sy4Zai10Mw=", + "lastModified": 1744878314, + "narHash": "sha256-iPHZkar3ebiF0rT6VLorSXIQCG7kAOmAsfuTahCzgS8=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "8365cf853e791c93fa8bc924f031f11949bb1a3c", + "rev": "ed737b545e8db5d9c78fcaba73baed0f34e5b3f8", "type": "github" }, "original": { @@ -538,11 +538,11 @@ ] }, "locked": { - "lastModified": 1745024827, - "narHash": "sha256-NjYyRsHrWwUVjbd78FV8E/HZC+gH4CYS6Qnjh2O29b4=", + "lastModified": 1745079747, + "narHash": "sha256-Xg1C41ynxxljEyGqGDyFJ5c3i6p6GTSKMuAZQB/W2rA=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "e6893892b832d92f1ceb508fcdae250d41927b38", + "rev": "55681a87d6e094fa93d260993e8c154208e70a69", "type": "github" }, "original": { diff --git a/home-manager/gui.nix b/home-manager/gui.nix index 37f39be..5e9d00e 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -112,7 +112,7 @@ # simple screen recording on wayland wl-screenrec - gimp + gimp3 pinta # wayland-compatible color picker From be0b3019dea964063604992a6aa77c309c3099d9 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 21 Apr 2025 16:16:19 -0400 Subject: [PATCH 185/724] disable trim + cachyos kernel --- etcnixos/common.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/etcnixos/common.nix b/etcnixos/common.nix index 59e783d..4020b40 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -21,6 +21,8 @@ inputs.disko.nixosModules.disko ]; + services.fstrim.enable = false; + programs.nix-ld = { enable = true; libraries = with pkgs; [ @@ -48,8 +50,8 @@ # kernel options boot = { - # kernelPackages = pkgs.linuxPackages_cachyos-lto; - kernelPackages = pkgs.linuxPackages_latest; + kernelPackages = pkgs.linuxPackages_cachyos-lto; + # kernelPackages = pkgs.linuxPackages_latest; kernel.sysctl = { # dmesg shushhhhh From 4af5a3b42268577258c0b14098387e169f2a6cf4 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 21 Apr 2025 16:16:27 -0400 Subject: [PATCH 186/724] update --- flake.lock | 66 +++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index 1bc8734..af046dc 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ ] }, "locked": { - "lastModified": 1745071774, - "narHash": "sha256-k+bmjaO6fcT5Ol5fziSs5wfaa1S75SP9ntJQSgchqms=", + "lastModified": 1745232749, + "narHash": "sha256-EpM4MNPV0tPqsSrQq1B5EaE0+91MrVXgGS+ct+q/I90=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "9282cc026570139b0794874c55ff9df005448429", + "rev": "9117798d3fac3e83568d4d050278fdfb8842879d", "type": "github" }, "original": { @@ -54,11 +54,11 @@ }, "crane": { "locked": { - "lastModified": 1741148495, - "narHash": "sha256-EV8KUaIZ2/CdBXlutXrHoZYbWPeB65p5kKZk71gvDRI=", + "lastModified": 1741481578, + "narHash": "sha256-JBTSyJFQdO3V8cgcL08VaBUByEU6P5kXbTJN6R0PFQo=", "owner": "ipetkov", "repo": "crane", - "rev": "75390a36cd0c2cdd5f1aafd8a9f827d7107f2e53", + "rev": "bb1c9567c43e4434f54e9481eb4b8e8e0d50f0b5", "type": "github" }, "original": { @@ -119,11 +119,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1744958318, - "narHash": "sha256-L0a9BKIgHAD9mqum0VoXjBUDwnCV16/Q1AQg3a8cEnw=", + "lastModified": 1745044353, + "narHash": "sha256-OoGR5ppBq2nlbGDkCrg4slQ4gU5joYbc9GnQz4R6EOQ=", "owner": "nix-community", "repo": "fenix", - "rev": "4cc256372df88f061c5156b8ca4ed6d5b01fb1a7", + "rev": "936f22bba519112ec47aa17a9b3304c8a3dabe54", "type": "github" }, "original": { @@ -156,11 +156,11 @@ ] }, "locked": { - "lastModified": 1740872218, - "narHash": "sha256-ZaMw0pdoUKigLpv9HiNDH2Pjnosg7NBYMJlHTIsHEUo=", + "lastModified": 1741352980, + "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3876f6b87db82f33775b1ef5ea343986105db764", + "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", "type": "github" }, "original": { @@ -212,11 +212,11 @@ ] }, "locked": { - "lastModified": 1745071558, - "narHash": "sha256-bvcatss0xodcdxXm0LUSLPd2jjrhqO3yFSu3stOfQXg=", + "lastModified": 1745256380, + "narHash": "sha256-hJH1S5Xy0K2J6eT22AMDIcQ07E8XYC1t7DnXUr2llEM=", "owner": "nix-community", "repo": "home-manager", - "rev": "9676e8a52a177d80c8a42f66566362a6d74ecf78", + "rev": "22b326b42bf42973d5e4fe1044591fb459e6aeac", "type": "github" }, "original": { @@ -234,11 +234,11 @@ ] }, "locked": { - "lastModified": 1744866383, - "narHash": "sha256-SOBI89WTS8qqrjysrE0+VsePe5JoOxtbnmFroJbHiAo=", + "lastModified": 1745044299, + "narHash": "sha256-/A/xjRjJY9CGcgOHQ5kTxV7VIJxac86i6NQ5CejMzZc=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "36186806e1dc4c0e370d0080f9b838ff8b1d20a2", + "rev": "c7ff1a4578eb11ef84288941aa23e385b6fde635", "type": "github" }, "original": { @@ -261,11 +261,11 @@ ] }, "locked": { - "lastModified": 1741442524, - "narHash": "sha256-tVcxLDLLho8dWcO81Xj/3/ANLdVs0bGyCPyKjp70JWk=", + "lastModified": 1745217777, + "narHash": "sha256-lnsoesuG+r15kV3Um4hHpYXIjsi6EOPBtIlV8by/7i0=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "d8099586d9a84308ffedac07880e7f07a0180ff4", + "rev": "e4cf2086105f47a22f92985358db295a20746abb", "type": "github" }, "original": { @@ -416,11 +416,11 @@ ] }, "locked": { - "lastModified": 1740915799, - "narHash": "sha256-JvQvtaphZNmeeV+IpHgNdiNePsIpHD5U/7QN5AeY44A=", + "lastModified": 1741379162, + "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "42b1ba089d2034d910566bf6b40830af6b8ec732", + "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc", "type": "github" }, "original": { @@ -446,11 +446,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1744878314, - "narHash": "sha256-iPHZkar3ebiF0rT6VLorSXIQCG7kAOmAsfuTahCzgS8=", + "lastModified": 1745002274, + "narHash": "sha256-W2Na1BK8Kq8eO8mlUmp+NGq7H5CPDpgzaGMpmyBMkas=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "ed737b545e8db5d9c78fcaba73baed0f34e5b3f8", + "rev": "a09a5502c3713e4287354b19973ea805d31ebcbc", "type": "github" }, "original": { @@ -467,11 +467,11 @@ ] }, "locked": { - "lastModified": 1745029910, - "narHash": "sha256-9CtbfTTQWMoOkXejxc5D+K3z/39wkQQt2YfYJW50tnI=", + "lastModified": 1745207416, + "narHash": "sha256-2g2TnXgJEvSvpk7ujY69pSplmM3oShhoOidZf1iHTHU=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "50fefac8cdfd1587ac6d8678f6181e7d348201d2", + "rev": "68a0ff1a43d08aa1ec3730e7e7d06f6da0ba630a", "type": "github" }, "original": { @@ -538,11 +538,11 @@ ] }, "locked": { - "lastModified": 1745079747, - "narHash": "sha256-Xg1C41ynxxljEyGqGDyFJ5c3i6p6GTSKMuAZQB/W2rA=", + "lastModified": 1745111733, + "narHash": "sha256-FVsS0LcSYwt4qiw1inlI8F9dc7PZaRaWAr4vqvvnekg=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "55681a87d6e094fa93d260993e8c154208e70a69", + "rev": "67df3e64a216db8ac3c8bc669143af090bf4e6ad", "type": "github" }, "original": { From c1ac8f51d76347e5cc6b38e1aebb997c902f2774 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 21 Apr 2025 23:34:13 -0400 Subject: [PATCH 187/724] fixes of things --- etcnixos/common.nix | 5 ++--- etcnixos/networking.nix | 26 +++++++++++++++----------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/etcnixos/common.nix b/etcnixos/common.nix index 4020b40..c45e4c6 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -14,6 +14,7 @@ ./distrobox.nix ./vm.nix ./steam.nix + ./networking.nix inputs.agenix.nixosModules.default inputs.nixos-hardware.nixosModules.common-pc-ssd @@ -21,6 +22,7 @@ inputs.disko.nixosModules.disko ]; + # I think this was causing the weird kworker freezing issue?? services.fstrim.enable = false; programs.nix-ld = { @@ -128,9 +130,6 @@ # age.identityPaths = [ "/home/${username}/.ssh/id_ed25519" ]; - # networking - networking = import ./networking.nix { inherit hostname; }; - # Select internationalisation properties. i18n.defaultLocale = "en_US.UTF-8"; diff --git a/etcnixos/networking.nix b/etcnixos/networking.nix index 4d52c15..0042b92 100644 --- a/etcnixos/networking.nix +++ b/etcnixos/networking.nix @@ -1,19 +1,23 @@ { hostname, ... }: { - hostName = hostname; + systemd.services.NetworkManager-wait-online.enable = false; - networkmanager = { - enable = true; + networking = { + hostName = hostname; - insertNameservers = [ - "1.1.1.1" - "9.9.9.9" - ]; + networkmanager = { + enable = true; - wifi = { - scanRandMacAddress = true; + insertNameservers = [ + "1.1.1.1" + "9.9.9.9" + ]; + + wifi = { + scanRandMacAddress = true; + }; }; - }; - wireless.networks = import ./secrets/wifi-passwords.nix; + wireless.networks = import ./secrets/wifi-passwords.nix; + }; } From 029c89c41f2bb6e9fb8fb1135a2262ff55c5a4a4 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 21 Apr 2025 23:34:26 -0400 Subject: [PATCH 188/724] update --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index af046dc..814c32e 100644 --- a/flake.lock +++ b/flake.lock @@ -212,11 +212,11 @@ ] }, "locked": { - "lastModified": 1745256380, - "narHash": "sha256-hJH1S5Xy0K2J6eT22AMDIcQ07E8XYC1t7DnXUr2llEM=", + "lastModified": 1745272532, + "narHash": "sha256-+sFbKw1vFkulKYxsAbz84N0V/goSg808IgFh8iWe/As=", "owner": "nix-community", "repo": "home-manager", - "rev": "22b326b42bf42973d5e4fe1044591fb459e6aeac", + "rev": "81541ea36d1fead4be7797e826ee325d4c19308b", "type": "github" }, "original": { @@ -261,11 +261,11 @@ ] }, "locked": { - "lastModified": 1745217777, - "narHash": "sha256-lnsoesuG+r15kV3Um4hHpYXIjsi6EOPBtIlV8by/7i0=", + "lastModified": 1745271491, + "narHash": "sha256-4GAHjus6JRpYHVROMIhFIz/sgLDF/klBM3UHulbSK9s=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "e4cf2086105f47a22f92985358db295a20746abb", + "rev": "995637eb3ab78eac33f8ee6b45cc2ecd5ede12ba", "type": "github" }, "original": { @@ -467,11 +467,11 @@ ] }, "locked": { - "lastModified": 1745207416, - "narHash": "sha256-2g2TnXgJEvSvpk7ujY69pSplmM3oShhoOidZf1iHTHU=", + "lastModified": 1745289264, + "narHash": "sha256-7nt+UJ7qaIUe2J7BdnEEph9n2eKEwxUwKS/QIr091uA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "68a0ff1a43d08aa1ec3730e7e7d06f6da0ba630a", + "rev": "3b7171858c20d5293360042936058fb0c4cb93a9", "type": "github" }, "original": { From 7a1d5752ddf24d88e1e3a632ae64c19099126970 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 21 Apr 2025 23:36:07 -0400 Subject: [PATCH 189/724] add comment --- etcnixos/networking.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/etcnixos/networking.nix b/etcnixos/networking.nix index 0042b92..963e53a 100644 --- a/etcnixos/networking.nix +++ b/etcnixos/networking.nix @@ -1,5 +1,6 @@ { hostname, ... }: { + # speed up boot times (by about three seconds) systemd.services.NetworkManager-wait-online.enable = false; networking = { From 89ed7c69bc9b29b84ef9420e987b7998dc0ea2c3 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 22 Apr 2025 10:19:35 -0400 Subject: [PATCH 190/724] remove nh --- etcnixos/common.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/etcnixos/common.nix b/etcnixos/common.nix index c45e4c6..c32b201 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -43,13 +43,6 @@ ]; }; - # 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; From 45bd41175c9ca5782d6f60e265acd57d75714f9d Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 22 Apr 2025 13:23:40 -0400 Subject: [PATCH 191/724] zen: twilight --- flake.lock | 24 ++++++++++++------------ home-manager/gui.nix | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index 814c32e..1c66ee6 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ ] }, "locked": { - "lastModified": 1745232749, - "narHash": "sha256-EpM4MNPV0tPqsSrQq1B5EaE0+91MrVXgGS+ct+q/I90=", + "lastModified": 1745331218, + "narHash": "sha256-dA3K2EFeol9khPgrzLnkXL/LULqjQPNfUCQYELhnFFE=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "9117798d3fac3e83568d4d050278fdfb8842879d", + "rev": "a8ecbd631f095169413bf74e6f728a8910440567", "type": "github" }, "original": { @@ -119,11 +119,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1745044353, - "narHash": "sha256-OoGR5ppBq2nlbGDkCrg4slQ4gU5joYbc9GnQz4R6EOQ=", + "lastModified": 1745217425, + "narHash": "sha256-iZj8J+KzoeyBGQhtWVjeD84cAKxalF2LFHoi5+HstoI=", "owner": "nix-community", "repo": "fenix", - "rev": "936f22bba519112ec47aa17a9b3304c8a3dabe54", + "rev": "4a599e8652a6ca89f79c42f6e05806813f5abd0b", "type": "github" }, "original": { @@ -212,11 +212,11 @@ ] }, "locked": { - "lastModified": 1745272532, - "narHash": "sha256-+sFbKw1vFkulKYxsAbz84N0V/goSg808IgFh8iWe/As=", + "lastModified": 1745340124, + "narHash": "sha256-zQTOl/JPGjiAQoU1yraCGfPBg7yr4nlHNdbZy8Ebrl4=", "owner": "nix-community", "repo": "home-manager", - "rev": "81541ea36d1fead4be7797e826ee325d4c19308b", + "rev": "c9433ae62fbb4bd09609e242569edc3b551e21a9", "type": "github" }, "original": { @@ -446,11 +446,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1745002274, - "narHash": "sha256-W2Na1BK8Kq8eO8mlUmp+NGq7H5CPDpgzaGMpmyBMkas=", + "lastModified": 1745178985, + "narHash": "sha256-Gw627dJW6/IJydIUCQnI8c2oilpMxhZIwHb7ppGX7hk=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "a09a5502c3713e4287354b19973ea805d31ebcbc", + "rev": "723121e5958cf282db3fdb06970776724a7326d5", "type": "github" }, "original": { diff --git a/home-manager/gui.nix b/home-manager/gui.nix index 5e9d00e..ed5ef55 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -87,7 +87,7 @@ # music lyric fetcher lrcget - inputs.zen-browser.packages."${system}".default + inputs.zen-browser.packages."${system}".twilight # freecad-wayland puddletag From d0396e6909cd3c7cda6ebba9e7456d87c6f92a03 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 28 Apr 2025 18:30:33 -0400 Subject: [PATCH 192/724] update --- flake.lock | 90 +++++++++++++++++++++++++++--------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/flake.lock b/flake.lock index 1c66ee6..53ee6ea 100644 --- a/flake.lock +++ b/flake.lock @@ -12,11 +12,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1736955230, - "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=", + "lastModified": 1745630506, + "narHash": "sha256-bHCFgGeu8XjWlVuaWzi3QONjDW3coZDqSHvnd4l7xus=", "owner": "ryantm", "repo": "agenix", - "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c", + "rev": "96e078c646b711aee04b82ba01aefbff87004ded", "type": "github" }, "original": { @@ -38,11 +38,11 @@ ] }, "locked": { - "lastModified": 1745331218, - "narHash": "sha256-dA3K2EFeol9khPgrzLnkXL/LULqjQPNfUCQYELhnFFE=", + "lastModified": 1745852554, + "narHash": "sha256-LCVb3nSAaq+mTc9dUVwReuj+oFpvtVU+F7voASYdAkE=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "a8ecbd631f095169413bf74e6f728a8910440567", + "rev": "67acaa3f4a3d51cb8f5d00c7f1e7b385bc9a1ea0", "type": "github" }, "original": { @@ -75,11 +75,11 @@ ] }, "locked": { - "lastModified": 1700795494, - "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", + "lastModified": 1744478979, + "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", + "rev": "43975d782b418ebf4969e9ccba82466728c2851b", "type": "github" }, "original": { @@ -119,11 +119,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1745217425, - "narHash": "sha256-iZj8J+KzoeyBGQhtWVjeD84cAKxalF2LFHoi5+HstoI=", + "lastModified": 1745735608, + "narHash": "sha256-L0jzm815XBFfF2wCFmR+M1CF+beIEFj6SxlqVKF59Ec=", "owner": "nix-community", "repo": "fenix", - "rev": "4a599e8652a6ca89f79c42f6e05806813f5abd0b", + "rev": "c39a78eba6ed2a022cc3218db90d485077101496", "type": "github" }, "original": { @@ -212,11 +212,11 @@ ] }, "locked": { - "lastModified": 1745340124, - "narHash": "sha256-zQTOl/JPGjiAQoU1yraCGfPBg7yr4nlHNdbZy8Ebrl4=", + "lastModified": 1745858959, + "narHash": "sha256-B1FQwPCFLL3cbHc2nxT3/UI1uprHp2h1EA6M2JVe0oQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "c9433ae62fbb4bd09609e242569edc3b551e21a9", + "rev": "d0d9d0a1454d5a0200693570618084d80a8b336c", "type": "github" }, "original": { @@ -234,11 +234,11 @@ ] }, "locked": { - "lastModified": 1745044299, - "narHash": "sha256-/A/xjRjJY9CGcgOHQ5kTxV7VIJxac86i6NQ5CejMzZc=", + "lastModified": 1745487384, + "narHash": "sha256-WvQ4XXi0vMtEpPqhfo8ztxjeaeHkbW5tfR4O5+w8r5U=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "c7ff1a4578eb11ef84288941aa23e385b6fde635", + "rev": "0168e4a65c9d43c22ac38ff27f5fa31c7d535148", "type": "github" }, "original": { @@ -286,11 +286,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1744991948, - "narHash": "sha256-f4xKjzY64l6e28YExcf/V8aLYzBzDdjNI7ZZJGBBz3Y=", + "lastModified": 1745839399, + "narHash": "sha256-Yy0FPjHnUtONu3cGHcgbeK9oM2jTFkndOdHQ/UfbL+s=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "a70acecb35de8941bac791c82d8e214d4be70567", + "rev": "174c64db62ff28dbe1d8299f2d11e69f42e7fecd", "type": "github" }, "original": { @@ -319,11 +319,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1744878694, - "narHash": "sha256-e3jPdRQmlgeWwDTC/wnvKgIy4Ga8KZYoxUPQ8PCNktM=", + "lastModified": 1745831155, + "narHash": "sha256-HFsUns8w56Ew7xZBtm2RJ2pS7LL95/xbfNqQRDCT/uI=", "owner": "YaLTeR", "repo": "niri", - "rev": "7884d3bfea810740fe2ca7021b102af0f049ccae", + "rev": "9bb292ec82682c901b29e1da8e3dd0c19c5b75bb", "type": "github" }, "original": { @@ -357,11 +357,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1744633460, - "narHash": "sha256-fbWE4Xpw6eH0Q6in+ymNuDwTkqmFmtxcQEmtRuKDTTk=", + "lastModified": 1745503349, + "narHash": "sha256-bUGjvaPVsOfQeTz9/rLTNLDyqbzhl0CQtJJlhFPhIYw=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9a049b4a421076d27fee3eec664a18b2066824cb", + "rev": "f7bee55a5e551bd8e7b5b82c9bc559bc50d868d1", "type": "github" }, "original": { @@ -373,11 +373,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1744932701, - "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", + "lastModified": 1745526057, + "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", + "rev": "f771eb401a46846c1aebd20552521b233dd7e18b", "type": "github" }, "original": { @@ -389,11 +389,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1744440957, - "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", + "lastModified": 1745742390, + "narHash": "sha256-1rqa/XPSJqJg21BKWjzJZC7yU0l/YTVtjRi0RJmipus=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", + "rev": "26245db0cb552047418cfcef9a25da91b222d6c7", "type": "github" }, "original": { @@ -446,11 +446,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1745178985, - "narHash": "sha256-Gw627dJW6/IJydIUCQnI8c2oilpMxhZIwHb7ppGX7hk=", + "lastModified": 1745694049, + "narHash": "sha256-fxvRYH/tS7hGQeg9zCVh5RBcSWT+JGJet7RA8Ss+rC0=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "723121e5958cf282db3fdb06970776724a7326d5", + "rev": "d8887c0758bbd2d5f752d5bd405d4491e90e7ed6", "type": "github" }, "original": { @@ -467,11 +467,11 @@ ] }, "locked": { - "lastModified": 1745289264, - "narHash": "sha256-7nt+UJ7qaIUe2J7BdnEEph9n2eKEwxUwKS/QIr091uA=", + "lastModified": 1745807802, + "narHash": "sha256-Aary9kzSx9QFgfK1CDu3ZqxhuoyHvf0F71j64gXZebA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "3b7171858c20d5293360042936058fb0c4cb93a9", + "rev": "9a6045615437787dfb9c1a3242fd75c6b6976b6b", "type": "github" }, "original": { @@ -515,11 +515,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1744860839, - "narHash": "sha256-m/p0wFYey7zqlf5yEJ3g/h+4ZNPkjPsGiMZVJ09aWWw=", + "lastModified": 1745730655, + "narHash": "sha256-Tdsw5lD/XM8i1GnQr7ombqnEaCpt/voPs2AbjuYBbjI=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "2b5288b4b9ad2481a033e9c3cc1205108323e7d9", + "rev": "56a681bfecc5831f41f8eb0ec8c7e96c6b277153", "type": "github" }, "original": { @@ -538,11 +538,11 @@ ] }, "locked": { - "lastModified": 1745111733, - "narHash": "sha256-FVsS0LcSYwt4qiw1inlI8F9dc7PZaRaWAr4vqvvnekg=", + "lastModified": 1745850086, + "narHash": "sha256-YPrRUg4OPy7CHvGcgKUzSmmy/hDk60uJXgh/zjjZyoI=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "67df3e64a216db8ac3c8bc669143af090bf4e6ad", + "rev": "f4971fd8294569a6da1707363f115392148a1e33", "type": "github" }, "original": { From a6eb6fe45f496ff1b06bf274d339ae65f6db59eb Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 29 Apr 2025 13:45:30 -0400 Subject: [PATCH 193/724] update --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 53ee6ea..baca42d 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ ] }, "locked": { - "lastModified": 1745852554, - "narHash": "sha256-LCVb3nSAaq+mTc9dUVwReuj+oFpvtVU+F7voASYdAkE=", + "lastModified": 1745934400, + "narHash": "sha256-u4NbExC2gjfHl36NwIHGbW/5/FdQk5f96jfF3X0i5Sk=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "67acaa3f4a3d51cb8f5d00c7f1e7b385bc9a1ea0", + "rev": "a0bdb7c547e9b3a1589fa8e8ae422433404ebaeb", "type": "github" }, "original": { @@ -212,11 +212,11 @@ ] }, "locked": { - "lastModified": 1745858959, - "narHash": "sha256-B1FQwPCFLL3cbHc2nxT3/UI1uprHp2h1EA6M2JVe0oQ=", + "lastModified": 1745894335, + "narHash": "sha256-m47zhftaod/oHOwoVT25jstdcVLhkrVGyvEHKjbnFHI=", "owner": "nix-community", "repo": "home-manager", - "rev": "d0d9d0a1454d5a0200693570618084d80a8b336c", + "rev": "1ad123239957d40e11ef66c203d0a7e272eb48aa", "type": "github" }, "original": { @@ -286,11 +286,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1745839399, - "narHash": "sha256-Yy0FPjHnUtONu3cGHcgbeK9oM2jTFkndOdHQ/UfbL+s=", + "lastModified": 1745930532, + "narHash": "sha256-EX5+jM58PfHFZE16N76RuG/P6alr6aiEzsp502QmWZE=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "174c64db62ff28dbe1d8299f2d11e69f42e7fecd", + "rev": "02f863b4795ec1f792ae15a97559b1160db34781", "type": "github" }, "original": { @@ -319,11 +319,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1745831155, - "narHash": "sha256-HFsUns8w56Ew7xZBtm2RJ2pS7LL95/xbfNqQRDCT/uI=", + "lastModified": 1745913113, + "narHash": "sha256-/Iph65fWHox7tVyfzw0+AGyCqL2FGuHSt+xjFUsxbOk=", "owner": "YaLTeR", "repo": "niri", - "rev": "9bb292ec82682c901b29e1da8e3dd0c19c5b75bb", + "rev": "5f117c61dc4dd91564e02b32836e98dd0e648246", "type": "github" }, "original": { @@ -357,11 +357,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1745503349, - "narHash": "sha256-bUGjvaPVsOfQeTz9/rLTNLDyqbzhl0CQtJJlhFPhIYw=", + "lastModified": 1745907084, + "narHash": "sha256-Q8SpDbTI95vtKXgNcVl1VdSUhhDOORE8R77wWS2rmg8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f7bee55a5e551bd8e7b5b82c9bc559bc50d868d1", + "rev": "f1e52a018166e1a324f832de913e12c0e55792d0", "type": "github" }, "original": { @@ -373,11 +373,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1745526057, - "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=", + "lastModified": 1745794561, + "narHash": "sha256-T36rUZHUART00h3dW4sV5tv4MrXKT7aWjNfHiZz7OHg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f771eb401a46846c1aebd20552521b233dd7e18b", + "rev": "5461b7fa65f3ca74cef60be837fd559a8918eaa0", "type": "github" }, "original": { @@ -389,11 +389,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1745742390, - "narHash": "sha256-1rqa/XPSJqJg21BKWjzJZC7yU0l/YTVtjRi0RJmipus=", + "lastModified": 1745868005, + "narHash": "sha256-hZScOyQphT4RUmSEJX+2OxjIlGgLwSd8iW1LNtAWIOs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "26245db0cb552047418cfcef9a25da91b222d6c7", + "rev": "330d0a4167924b43f31cc9406df363f71b768a02", "type": "github" }, "original": { @@ -467,11 +467,11 @@ ] }, "locked": { - "lastModified": 1745807802, - "narHash": "sha256-Aary9kzSx9QFgfK1CDu3ZqxhuoyHvf0F71j64gXZebA=", + "lastModified": 1745894113, + "narHash": "sha256-dxO3caQZMv/pMtcuXdi+SnAtyki6HFbSf1IpgQPXZYc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "9a6045615437787dfb9c1a3242fd75c6b6976b6b", + "rev": "e552fe1b16ffafd678ebe061c22b117e050769ed", "type": "github" }, "original": { @@ -538,11 +538,11 @@ ] }, "locked": { - "lastModified": 1745850086, - "narHash": "sha256-YPrRUg4OPy7CHvGcgKUzSmmy/hDk60uJXgh/zjjZyoI=", + "lastModified": 1745943904, + "narHash": "sha256-AJ4AFfiIAW9N/qztn9DxeY+/PJqFZIbpRGk21keSC0Y=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "f4971fd8294569a6da1707363f115392148a1e33", + "rev": "64670840168a8ac7cc3a60f5e405a64c7bcd4b45", "type": "github" }, "original": { From 0d7a87d76de9874f65c45445376f369813ffcdc0 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 30 Apr 2025 00:46:34 -0400 Subject: [PATCH 194/724] update --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index baca42d..a09a68b 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ ] }, "locked": { - "lastModified": 1745934400, - "narHash": "sha256-u4NbExC2gjfHl36NwIHGbW/5/FdQk5f96jfF3X0i5Sk=", + "lastModified": 1745968547, + "narHash": "sha256-2DAPh3ViE0UtHf2CtoLsxsBEiZQvTLbERsVsu5nvpZ8=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "a0bdb7c547e9b3a1589fa8e8ae422433404ebaeb", + "rev": "543b8dd04fffda1c5240dfa59bca4f8116928133", "type": "github" }, "original": { @@ -212,11 +212,11 @@ ] }, "locked": { - "lastModified": 1745894335, - "narHash": "sha256-m47zhftaod/oHOwoVT25jstdcVLhkrVGyvEHKjbnFHI=", + "lastModified": 1745987135, + "narHash": "sha256-8Up4QPuMZEJBU0eefAY+nUe7DYKQQzvaHnMpNdwRgKA=", "owner": "nix-community", "repo": "home-manager", - "rev": "1ad123239957d40e11ef66c203d0a7e272eb48aa", + "rev": "d2b3e6c83d457aa0e7f9344c61c3fed32bad0f7e", "type": "github" }, "original": { @@ -286,11 +286,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1745930532, - "narHash": "sha256-EX5+jM58PfHFZE16N76RuG/P6alr6aiEzsp502QmWZE=", + "lastModified": 1745965399, + "narHash": "sha256-RxoK/Eo9cWGtGMl3enYu/LH/SAcFGR2PWuAifQm4dUc=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "02f863b4795ec1f792ae15a97559b1160db34781", + "rev": "bc29338ba733e4c1b94c3ed134baabfea587627e", "type": "github" }, "original": { @@ -357,11 +357,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1745907084, - "narHash": "sha256-Q8SpDbTI95vtKXgNcVl1VdSUhhDOORE8R77wWS2rmg8=", + "lastModified": 1745955289, + "narHash": "sha256-mmV2oPhQN+YF2wmnJzXX8tqgYmUYXUj3uUUBSTmYN5o=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f1e52a018166e1a324f832de913e12c0e55792d0", + "rev": "72081c9fbbef63765ae82bff9727ea79cc86bd5b", "type": "github" }, "original": { @@ -373,11 +373,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1745794561, - "narHash": "sha256-T36rUZHUART00h3dW4sV5tv4MrXKT7aWjNfHiZz7OHg=", + "lastModified": 1745930157, + "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5461b7fa65f3ca74cef60be837fd559a8918eaa0", + "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae", "type": "github" }, "original": { @@ -467,11 +467,11 @@ ] }, "locked": { - "lastModified": 1745894113, - "narHash": "sha256-dxO3caQZMv/pMtcuXdi+SnAtyki6HFbSf1IpgQPXZYc=", + "lastModified": 1745980514, + "narHash": "sha256-CITAeiuXGjDvT5iZBXr6vKVWQwsUQLJUMFO91bfJFC4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "e552fe1b16ffafd678ebe061c22b117e050769ed", + "rev": "7fbdae44b0f40ea432e46fd152ad8be0f8f41ad6", "type": "github" }, "original": { @@ -538,11 +538,11 @@ ] }, "locked": { - "lastModified": 1745943904, - "narHash": "sha256-AJ4AFfiIAW9N/qztn9DxeY+/PJqFZIbpRGk21keSC0Y=", + "lastModified": 1745968669, + "narHash": "sha256-0g0/eM/w48VX3uocJflbaTnHEIxZJ/SHW4dqDYI8E3E=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "64670840168a8ac7cc3a60f5e405a64c7bcd4b45", + "rev": "e957cee0b859929b0ac9a7fdb69e8f4e3297ad25", "type": "github" }, "original": { From 86ba065f23d44f327b454bfbe535069960b3589b Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 30 Apr 2025 13:00:27 -0400 Subject: [PATCH 195/724] update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index a09a68b..5d09128 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ ] }, "locked": { - "lastModified": 1745968547, - "narHash": "sha256-2DAPh3ViE0UtHf2CtoLsxsBEiZQvTLbERsVsu5nvpZ8=", + "lastModified": 1746029351, + "narHash": "sha256-PG/OGF7G+/3fbXfakaFJ/jJX2WyYcnhQvqWriRgfRfU=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "543b8dd04fffda1c5240dfa59bca4f8116928133", + "rev": "98595cc6a1ef82a96fafb02d29b65940e402c3e6", "type": "github" }, "original": { @@ -119,11 +119,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1745735608, - "narHash": "sha256-L0jzm815XBFfF2wCFmR+M1CF+beIEFj6SxlqVKF59Ec=", + "lastModified": 1745995211, + "narHash": "sha256-hf6Xu3KS06WyE/3dqV96iLGx3jIYQq9e68iCEFHrt04=", "owner": "nix-community", "repo": "fenix", - "rev": "c39a78eba6ed2a022cc3218db90d485077101496", + "rev": "0db04339c4e4c0fd42dbbaebe3590a67cbd12aa3", "type": "github" }, "original": { @@ -286,11 +286,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1745965399, - "narHash": "sha256-RxoK/Eo9cWGtGMl3enYu/LH/SAcFGR2PWuAifQm4dUc=", + "lastModified": 1746006802, + "narHash": "sha256-Ws+sD8RAEg4fdg6zXcww0f3k9GOOGrF4EtXScT8ex94=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "bc29338ba733e4c1b94c3ed134baabfea587627e", + "rev": "a8897eb53c63fe5a40286ab9b7bbc805dd7e70ef", "type": "github" }, "original": { @@ -319,11 +319,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1745913113, - "narHash": "sha256-/Iph65fWHox7tVyfzw0+AGyCqL2FGuHSt+xjFUsxbOk=", + "lastModified": 1746002765, + "narHash": "sha256-ry703LYPMmThzPSr8CiEVKv0iCBxbEYV+Qy5qVi3Riw=", "owner": "YaLTeR", "repo": "niri", - "rev": "5f117c61dc4dd91564e02b32836e98dd0e648246", + "rev": "af080a03cda3bd960a0817920f9814086ae9ad36", "type": "github" }, "original": { @@ -389,11 +389,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1745868005, - "narHash": "sha256-hZScOyQphT4RUmSEJX+2OxjIlGgLwSd8iW1LNtAWIOs=", + "lastModified": 1745921652, + "narHash": "sha256-hEAvEN+y/OQ7wA7+u3bFJwXSe8yoSf2QaOMH3hyTJTQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "330d0a4167924b43f31cc9406df363f71b768a02", + "rev": "b000159bba69b0106a42f65e52dbf27f77aca9d3", "type": "github" }, "original": { @@ -446,11 +446,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1745694049, - "narHash": "sha256-fxvRYH/tS7hGQeg9zCVh5RBcSWT+JGJet7RA8Ss+rC0=", + "lastModified": 1745949276, + "narHash": "sha256-9ZK31t2HUiGdLLnDafrRnSrrO12JwqcAFbrJ9nRwh0Y=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "d8887c0758bbd2d5f752d5bd405d4491e90e7ed6", + "rev": "78a488dd5e7e4f17162001519665795e6e68b6f8", "type": "github" }, "original": { From f21daf0a54ea987959fbba8a7047e1ca5f962a56 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 1 May 2025 16:05:15 -0400 Subject: [PATCH 196/724] switch to lts kernel --- etcnixos/common.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/etcnixos/common.nix b/etcnixos/common.nix index c32b201..5b339f9 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -45,8 +45,9 @@ # kernel options boot = { - kernelPackages = pkgs.linuxPackages_cachyos-lto; + # kernelPackages = pkgs.linuxPackages_cachyos-lto; # kernelPackages = pkgs.linuxPackages_latest; + kernelPackages = pkgs.linuxPackages; kernel.sysctl = { # dmesg shushhhhh From dbc261028d363378f45eda0c06a82a0eb80cbaa7 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 4 May 2025 18:33:08 -0400 Subject: [PATCH 197/724] update --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 5d09128..e27acf4 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ ] }, "locked": { - "lastModified": 1746029351, - "narHash": "sha256-PG/OGF7G+/3fbXfakaFJ/jJX2WyYcnhQvqWriRgfRfU=", + "lastModified": 1746393392, + "narHash": "sha256-pXPlbcEBRX5X3VodtXQlqHjmnTDbWFpfpZBeoDQibE4=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "98595cc6a1ef82a96fafb02d29b65940e402c3e6", + "rev": "00ad833cbada57424d273a4791a0435fd490b09e", "type": "github" }, "original": { @@ -212,11 +212,11 @@ ] }, "locked": { - "lastModified": 1745987135, - "narHash": "sha256-8Up4QPuMZEJBU0eefAY+nUe7DYKQQzvaHnMpNdwRgKA=", + "lastModified": 1746369725, + "narHash": "sha256-m3ai7LLFYsymMK0uVywCceWfUhP0k3CALyFOfcJACqE=", "owner": "nix-community", "repo": "home-manager", - "rev": "d2b3e6c83d457aa0e7f9344c61c3fed32bad0f7e", + "rev": "1a1793f6d940d22c6e49753548c5b6cb7dc5545d", "type": "github" }, "original": { @@ -286,11 +286,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1746006802, - "narHash": "sha256-Ws+sD8RAEg4fdg6zXcww0f3k9GOOGrF4EtXScT8ex94=", + "lastModified": 1746142190, + "narHash": "sha256-t36K3TWLMRWoGyjYyo+H8bBquDcp4orZqNZVagWNjwY=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "a8897eb53c63fe5a40286ab9b7bbc805dd7e70ef", + "rev": "af701c1c16c289b1b14f333d844b4f756308d244", "type": "github" }, "original": { @@ -319,11 +319,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1746002765, - "narHash": "sha256-ry703LYPMmThzPSr8CiEVKv0iCBxbEYV+Qy5qVi3Riw=", + "lastModified": 1746124654, + "narHash": "sha256-LmhkAt2KLvf8lp+kEUQuTFmmv7iXO8IkwwSaPasfXJw=", "owner": "YaLTeR", "repo": "niri", - "rev": "af080a03cda3bd960a0817920f9814086ae9ad36", + "rev": "6c9705dd4b2eaba25f024d1a3efd7943fd393632", "type": "github" }, "original": { @@ -357,11 +357,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1745955289, - "narHash": "sha256-mmV2oPhQN+YF2wmnJzXX8tqgYmUYXUj3uUUBSTmYN5o=", + "lastModified": 1746341346, + "narHash": "sha256-WjupK5Xpc+viJlJWiyPHp/dF4aJItp1BPuFsEdv2/fI=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "72081c9fbbef63765ae82bff9727ea79cc86bd5b", + "rev": "0833dc8bbc4ffa9cf9b0cbfccf1c5ec8632fc66e", "type": "github" }, "original": { @@ -373,11 +373,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1745930157, - "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=", + "lastModified": 1746328495, + "narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae", + "rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e", "type": "github" }, "original": { @@ -389,11 +389,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1745921652, - "narHash": "sha256-hEAvEN+y/OQ7wA7+u3bFJwXSe8yoSf2QaOMH3hyTJTQ=", + "lastModified": 1746055187, + "narHash": "sha256-3dqArYSMP9hM7Qpy5YWhnSjiqniSaT2uc5h2Po7tmg0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b000159bba69b0106a42f65e52dbf27f77aca9d3", + "rev": "3e362ce63e16b9572d8c2297c04f7c19ab6725a5", "type": "github" }, "original": { @@ -467,11 +467,11 @@ ] }, "locked": { - "lastModified": 1745980514, - "narHash": "sha256-CITAeiuXGjDvT5iZBXr6vKVWQwsUQLJUMFO91bfJFC4=", + "lastModified": 1746326315, + "narHash": "sha256-IDqSls/r6yBfdOBRSMQ/noTUoigmsKnTQ7TqpsBtN4Y=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "7fbdae44b0f40ea432e46fd152ad8be0f8f41ad6", + "rev": "dd280c436961ec5adccf0135efe5b66a23d84497", "type": "github" }, "original": { @@ -538,11 +538,11 @@ ] }, "locked": { - "lastModified": 1745968669, - "narHash": "sha256-0g0/eM/w48VX3uocJflbaTnHEIxZJ/SHW4dqDYI8E3E=", + "lastModified": 1746383085, + "narHash": "sha256-nM5FN+zFPsBq6hOu2cdx4dV33JWNPTca7OIXdWJV9V4=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "e957cee0b859929b0ac9a7fdb69e8f4e3297ad25", + "rev": "b60de43b72d74928c7c7f7f278398932d2fed077", "type": "github" }, "original": { From 88b444e2b56371a40b4ef92fd82cf8e6839fbdf7 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 4 May 2025 18:36:08 -0400 Subject: [PATCH 198/724] disable gpt4all --- home-manager/gui.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/gui.nix b/home-manager/gui.nix index ed5ef55..557ecdd 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -8,7 +8,7 @@ imports = [ ./no-gui.nix ./progs/alacritty.nix - ./progs/gpt4all/gpt4all.nix + # ./progs/gpt4all/gpt4all.nix # ./progs/trezor.nix # - broken ]; From 9b23a9817c9ceb1fe65d7fbda41440ce8ef8bb24 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 4 May 2025 18:37:20 -0400 Subject: [PATCH 199/724] add localsend --- home-manager/gui.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home-manager/gui.nix b/home-manager/gui.nix index 557ecdd..5d03c3d 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -125,6 +125,9 @@ # for mod organizer 2 zenity p7zip + + # for sending files between devices + localsend ] ++ (builtins.filter lib.isDerivation (builtins.attrValues nerd-fonts)); From 27ff198e212782f621b690c3e009046c15e20e77 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 5 May 2025 15:16:09 -0400 Subject: [PATCH 200/724] add mysql-workbench && remove localsend --- home-manager/gui.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/gui.nix b/home-manager/gui.nix index 5d03c3d..5fbca4d 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -126,8 +126,8 @@ zenity p7zip - # for sending files between devices - localsend + # for database class + mysql-workbench ] ++ (builtins.filter lib.isDerivation (builtins.attrValues nerd-fonts)); From 46b04f07bba094a6a1c2596ffe57e5ddab2ae110 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 5 May 2025 15:16:24 -0400 Subject: [PATCH 201/724] update --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index e27acf4..b9052ca 100644 --- a/flake.lock +++ b/flake.lock @@ -212,11 +212,11 @@ ] }, "locked": { - "lastModified": 1746369725, - "narHash": "sha256-m3ai7LLFYsymMK0uVywCceWfUhP0k3CALyFOfcJACqE=", + "lastModified": 1746413188, + "narHash": "sha256-i6BoiQP0PasExESQHszC0reQHfO6D4aI2GzOwZMOI20=", "owner": "nix-community", "repo": "home-manager", - "rev": "1a1793f6d940d22c6e49753548c5b6cb7dc5545d", + "rev": "8a318641ac13d3bc0a53651feaee9560f9b2d89a", "type": "github" }, "original": { @@ -357,11 +357,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1746341346, - "narHash": "sha256-WjupK5Xpc+viJlJWiyPHp/dF4aJItp1BPuFsEdv2/fI=", + "lastModified": 1746468201, + "narHash": "sha256-hSOSlrvMJwGr8hX/gc0mnhUf5UIClMDUAadfXlSXzfc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "0833dc8bbc4ffa9cf9b0cbfccf1c5ec8632fc66e", + "rev": "6aabf68429c0a414221d1790945babfb6a0bd068", "type": "github" }, "original": { @@ -467,11 +467,11 @@ ] }, "locked": { - "lastModified": 1746326315, - "narHash": "sha256-IDqSls/r6yBfdOBRSMQ/noTUoigmsKnTQ7TqpsBtN4Y=", + "lastModified": 1746412651, + "narHash": "sha256-wwyhceL2urIUIhHtTS8QmRtxAigPBBnTWalxYf5h1uI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "dd280c436961ec5adccf0135efe5b66a23d84497", + "rev": "ce79bb52eb023f71a03e88cb36c66f35c6668a95", "type": "github" }, "original": { @@ -538,11 +538,11 @@ ] }, "locked": { - "lastModified": 1746383085, - "narHash": "sha256-nM5FN+zFPsBq6hOu2cdx4dV33JWNPTca7OIXdWJV9V4=", + "lastModified": 1746462331, + "narHash": "sha256-5vYuiOmaK78HBKIH6Bn3No6FQ2MrjkEYa2s0swLXtMo=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "b60de43b72d74928c7c7f7f278398932d2fed077", + "rev": "5866c62d3aba150251f244fafebd47c7a384fb47", "type": "github" }, "original": { From d59d919e4b82858f4c2e66b6df0eae55a65107af Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 5 May 2025 15:18:40 -0400 Subject: [PATCH 202/724] laptop: we no longer use btrfs --- etcnixos/system-mreow.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/etcnixos/system-mreow.nix b/etcnixos/system-mreow.nix index 56d1902..42e127e 100644 --- a/etcnixos/system-mreow.nix +++ b/etcnixos/system-mreow.nix @@ -38,15 +38,6 @@ }; }; - services = { - #using btrfs, so lets scrub! - btrfs.autoScrub = { - enable = true; - interval = "weekly"; - fileSystems = [ "/" ]; - }; - }; - services.greetd = { enable = true; settings = { From e8ff19e860db08db42374ff73385899bd4df3836 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 5 May 2025 16:17:20 -0400 Subject: [PATCH 203/724] yarn: disable fancontrol --- etcnixos/system-yarn.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etcnixos/system-yarn.nix b/etcnixos/system-yarn.nix index 43dc8d3..27f7788 100644 --- a/etcnixos/system-yarn.nix +++ b/etcnixos/system-yarn.nix @@ -76,7 +76,7 @@ # control case fans with gpu temperature # I have case fans attached to my gpu for better cooling hardware.fancontrol = { - enable = true; + enable = false; config = let select_hwmon = "hwmon/hwmon[[:print:]]*"; From 7ef7bc8883a7bf573706e139f2a3ccaeeeed0ed7 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 7 May 2025 12:38:23 -0400 Subject: [PATCH 204/724] add mysql/mariadb --- etcnixos/system-mreow.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/etcnixos/system-mreow.nix b/etcnixos/system-mreow.nix index 42e127e..53ae6af 100644 --- a/etcnixos/system-mreow.nix +++ b/etcnixos/system-mreow.nix @@ -118,4 +118,10 @@ # disable framework kernel module # https://github.com/NixOS/nixos-hardware/issues/1330 hardware.framework.enableKmod = false; + + # for database class + services.mysql = { + enable = true; + package = pkgs.mariadb; + }; } From 9dc9283f54f7ade070d72dd2143bc31c7188505d Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 7 May 2025 12:52:20 -0400 Subject: [PATCH 205/724] add keepassxc --- home-manager/gui.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home-manager/gui.nix b/home-manager/gui.nix index 5fbca4d..888c5b5 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -126,6 +126,9 @@ zenity p7zip + # password manager + keepassxc + # for database class mysql-workbench ] From 015e8c0072c579895d7cfbc15bae3133aea611bf Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 7 May 2025 13:10:11 -0400 Subject: [PATCH 206/724] mysql: ensureUsers --- etcnixos/system-mreow.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/etcnixos/system-mreow.nix b/etcnixos/system-mreow.nix index 53ae6af..1822cd0 100644 --- a/etcnixos/system-mreow.nix +++ b/etcnixos/system-mreow.nix @@ -123,5 +123,19 @@ services.mysql = { enable = true; package = pkgs.mariadb; + ensureUsers = [ + { + name = "root"; + ensurePermissions = { + "*.*" = "ALL PRIVILEGES"; + }; + } + { + name = "${username}"; + ensurePermissions = { + "*.*" = "ALL PRIVILEGES"; + }; + } + ]; }; } From 28f774efbb5934d8b40c607afdeab0b044728c7e Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 7 May 2025 13:26:30 -0400 Subject: [PATCH 207/724] use dbeaver --- home-manager/gui.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/gui.nix b/home-manager/gui.nix index 888c5b5..2c947ca 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -130,7 +130,7 @@ keepassxc # for database class - mysql-workbench + dbeaver-bin ] ++ (builtins.filter lib.isDerivation (builtins.attrValues nerd-fonts)); From 3324d03c563ce6999a057eb75fd480e9aa818a7c Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 7 May 2025 15:03:50 -0400 Subject: [PATCH 208/724] update --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index b9052ca..9c7b35f 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ ] }, "locked": { - "lastModified": 1746393392, - "narHash": "sha256-pXPlbcEBRX5X3VodtXQlqHjmnTDbWFpfpZBeoDQibE4=", + "lastModified": 1746612364, + "narHash": "sha256-1AeO8YEtm//G60nzRlgBac1tYFw8GqCv7hCl7UbHYCY=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "00ad833cbada57424d273a4791a0435fd490b09e", + "rev": "c5cd8c766122463250c914ff323b61f11276c933", "type": "github" }, "original": { @@ -119,11 +119,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1745995211, - "narHash": "sha256-hf6Xu3KS06WyE/3dqV96iLGx3jIYQq9e68iCEFHrt04=", + "lastModified": 1746427067, + "narHash": "sha256-MlBKT0A2nK8LHDkeg3jrG2wo80C1bSGyT2tmKrc6pM0=", "owner": "nix-community", "repo": "fenix", - "rev": "0db04339c4e4c0fd42dbbaebe3590a67cbd12aa3", + "rev": "9e7d648c1f8fdf7beb9b0b1abb3a41d0d8b5fb05", "type": "github" }, "original": { @@ -212,11 +212,11 @@ ] }, "locked": { - "lastModified": 1746413188, - "narHash": "sha256-i6BoiQP0PasExESQHszC0reQHfO6D4aI2GzOwZMOI20=", + "lastModified": 1746632058, + "narHash": "sha256-Mp5Bbvb+YlFEZ76C/0wFS6C1lRfH3D60u465wFNlnS0=", "owner": "nix-community", "repo": "home-manager", - "rev": "8a318641ac13d3bc0a53651feaee9560f9b2d89a", + "rev": "708074ae6db9e0468e4f48477f856e8c2d059795", "type": "github" }, "original": { @@ -234,11 +234,11 @@ ] }, "locked": { - "lastModified": 1745487384, - "narHash": "sha256-WvQ4XXi0vMtEpPqhfo8ztxjeaeHkbW5tfR4O5+w8r5U=", + "lastModified": 1746158343, + "narHash": "sha256-i/1os9oEq0m/Da4FTdSqKUdI4+wzrvoDTuk1/dHSVDc=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "0168e4a65c9d43c22ac38ff27f5fa31c7d535148", + "rev": "8b45a8efb2829adf2996b51965ada1e4620631ac", "type": "github" }, "original": { @@ -357,11 +357,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1746468201, - "narHash": "sha256-hSOSlrvMJwGr8hX/gc0mnhUf5UIClMDUAadfXlSXzfc=", + "lastModified": 1746621361, + "narHash": "sha256-T9vOxEqI1j1RYugV0b9dgy0AreiZ9yBDKZJYyclF0og=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "6aabf68429c0a414221d1790945babfb6a0bd068", + "rev": "2ea3ad8a1f26a76f8a8e23fc4f7757c46ef30ee5", "type": "github" }, "original": { @@ -373,11 +373,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1746328495, - "narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=", + "lastModified": 1746461020, + "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e", + "rev": "3730d8a308f94996a9ba7c7138ede69c1b9ac4ae", "type": "github" }, "original": { @@ -446,11 +446,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1745949276, - "narHash": "sha256-9ZK31t2HUiGdLLnDafrRnSrrO12JwqcAFbrJ9nRwh0Y=", + "lastModified": 1746332785, + "narHash": "sha256-d4/WBcspAR38AMsZysrQsenF1NmZ0/9GhjD4hxvPygo=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "78a488dd5e7e4f17162001519665795e6e68b6f8", + "rev": "3b57c001518aeb42511e177221f98ecf42104016", "type": "github" }, "original": { @@ -467,11 +467,11 @@ ] }, "locked": { - "lastModified": 1746412651, - "narHash": "sha256-wwyhceL2urIUIhHtTS8QmRtxAigPBBnTWalxYf5h1uI=", + "lastModified": 1746585402, + "narHash": "sha256-Pf+ufu6bYNA1+KQKHnGMNEfTwpD9ZIcAeLoE2yPWIP0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ce79bb52eb023f71a03e88cb36c66f35c6668a95", + "rev": "72dd969389583664f87aa348b3458f2813693617", "type": "github" }, "original": { @@ -538,11 +538,11 @@ ] }, "locked": { - "lastModified": 1746462331, - "narHash": "sha256-5vYuiOmaK78HBKIH6Bn3No6FQ2MrjkEYa2s0swLXtMo=", + "lastModified": 1746609688, + "narHash": "sha256-OPHKS3C40J8GXN7o/PhLTp5wPsrZKnMPpzq/H4Zu8V8=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "5866c62d3aba150251f244fafebd47c7a384fb47", + "rev": "dd9f476d5732c27673dc67cdb03e05065cc6d644", "type": "github" }, "original": { From 9ba7830b2270bfa7bbfccc51d4c7073d2acef626 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 8 May 2025 14:58:01 -0400 Subject: [PATCH 209/724] update --- flake.lock | 72 +++++++++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/flake.lock b/flake.lock index 9c7b35f..fdc0121 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ ] }, "locked": { - "lastModified": 1746612364, - "narHash": "sha256-1AeO8YEtm//G60nzRlgBac1tYFw8GqCv7hCl7UbHYCY=", + "lastModified": 1746698158, + "narHash": "sha256-R3XpZAQdH1Z7RggT4yttsCrug62cpnc4AV3nSM8zzT8=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "c5cd8c766122463250c914ff323b61f11276c933", + "rev": "b6e45fa12c18801ad1f46fad54a6eba99a8a71c2", "type": "github" }, "original": { @@ -54,11 +54,11 @@ }, "crane": { "locked": { - "lastModified": 1741481578, - "narHash": "sha256-JBTSyJFQdO3V8cgcL08VaBUByEU6P5kXbTJN6R0PFQo=", + "lastModified": 1746291859, + "narHash": "sha256-DdWJLA+D5tcmrRSg5Y7tp/qWaD05ATI4Z7h22gd1h7Q=", "owner": "ipetkov", "repo": "crane", - "rev": "bb1c9567c43e4434f54e9481eb4b8e8e0d50f0b5", + "rev": "dfd9a8dfd09db9aad544c4d3b6c47b12562544a5", "type": "github" }, "original": { @@ -96,11 +96,11 @@ ] }, "locked": { - "lastModified": 1736864502, - "narHash": "sha256-ItkIZyebGvNH2dK9jVGzJHGPtb6BSWLN8Gmef16NeY0=", + "lastModified": 1746728054, + "narHash": "sha256-eDoSOhxGEm2PykZFa/x9QG5eTH0MJdiJ9aR00VAofXE=", "owner": "nix-community", "repo": "disko", - "rev": "0141aabed359f063de7413f80d906e1d98c0c123", + "rev": "ff442f5d1425feb86344c028298548024f21256d", "type": "github" }, "original": { @@ -119,11 +119,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1746427067, - "narHash": "sha256-MlBKT0A2nK8LHDkeg3jrG2wo80C1bSGyT2tmKrc6pM0=", + "lastModified": 1746599904, + "narHash": "sha256-bykoJKLSbNANMY5nedzVYa2Z3GF8poQsNTHAnc19alM=", "owner": "nix-community", "repo": "fenix", - "rev": "9e7d648c1f8fdf7beb9b0b1abb3a41d0d8b5fb05", + "rev": "589e863010225278a042480fed5b6feacb364a65", "type": "github" }, "original": { @@ -156,11 +156,11 @@ ] }, "locked": { - "lastModified": 1741352980, - "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { @@ -212,11 +212,11 @@ ] }, "locked": { - "lastModified": 1746632058, - "narHash": "sha256-Mp5Bbvb+YlFEZ76C/0wFS6C1lRfH3D60u465wFNlnS0=", + "lastModified": 1746727295, + "narHash": "sha256-0364XVBdfEA8rWfqEPvsgBqGFfq5r9LAo9CS9tvT7tg=", "owner": "nix-community", "repo": "home-manager", - "rev": "708074ae6db9e0468e4f48477f856e8c2d059795", + "rev": "a51598236f23c89e59ee77eb8e0614358b0e896c", "type": "github" }, "original": { @@ -234,11 +234,11 @@ ] }, "locked": { - "lastModified": 1746158343, - "narHash": "sha256-i/1os9oEq0m/Da4FTdSqKUdI4+wzrvoDTuk1/dHSVDc=", + "lastModified": 1746656950, + "narHash": "sha256-tnbPgz/TYBsxuidwFwVYgz/aZLVUy1EkIemTDDOh1XY=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "8b45a8efb2829adf2996b51965ada1e4620631ac", + "rev": "87911a856356a11c7864c0a66c4c000f178e19b0", "type": "github" }, "original": { @@ -261,11 +261,11 @@ ] }, "locked": { - "lastModified": 1745271491, - "narHash": "sha256-4GAHjus6JRpYHVROMIhFIz/sgLDF/klBM3UHulbSK9s=", + "lastModified": 1746717538, + "narHash": "sha256-mBPMdT19oLO6zRxTiuoKIKPQ4smlD8om3CZC3F34ZNo=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "995637eb3ab78eac33f8ee6b45cc2ecd5ede12ba", + "rev": "fa81496ad7359f62deec2f52882479250b237fc7", "type": "github" }, "original": { @@ -416,11 +416,11 @@ ] }, "locked": { - "lastModified": 1741379162, - "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=", + "lastModified": 1746537231, + "narHash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc", + "rev": "fa466640195d38ec97cf0493d6d6882bc4d14969", "type": "github" }, "original": { @@ -446,11 +446,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1746332785, - "narHash": "sha256-d4/WBcspAR38AMsZysrQsenF1NmZ0/9GhjD4hxvPygo=", + "lastModified": 1746522319, + "narHash": "sha256-q+Qo00BFgXN6xKrsrQI1P7Z3K1s2zKT0GNl0h8DwBH4=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "3b57c001518aeb42511e177221f98ecf42104016", + "rev": "debaef80be92d957f52d6e89c86286556075ea47", "type": "github" }, "original": { @@ -467,11 +467,11 @@ ] }, "locked": { - "lastModified": 1746585402, - "narHash": "sha256-Pf+ufu6bYNA1+KQKHnGMNEfTwpD9ZIcAeLoE2yPWIP0=", + "lastModified": 1746671794, + "narHash": "sha256-V+mpk2frYIEm85iYf+KPDmCGG3zBRAEhbv0E3lHdG2U=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "72dd969389583664f87aa348b3458f2813693617", + "rev": "ceec434b8741c66bb8df5db70d7e629a9d9c598f", "type": "github" }, "original": { @@ -538,11 +538,11 @@ ] }, "locked": { - "lastModified": 1746609688, - "narHash": "sha256-OPHKS3C40J8GXN7o/PhLTp5wPsrZKnMPpzq/H4Zu8V8=", + "lastModified": 1746725877, + "narHash": "sha256-0YQx51XJyV43yjdv2+RHoO+C8wgI5V9L1DGVGr1+8hY=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "dd9f476d5732c27673dc67cdb03e05065cc6d644", + "rev": "1965b827dc7f89e48744ec52e41dce920485ea85", "type": "github" }, "original": { From 8b561f49e97201776ba67c6f6e4d83d9060fc7a8 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 8 May 2025 21:57:30 -0400 Subject: [PATCH 210/724] update --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index fdc0121..be00a4f 100644 --- a/flake.lock +++ b/flake.lock @@ -373,11 +373,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1746461020, - "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=", + "lastModified": 1746663147, + "narHash": "sha256-Ua0drDHawlzNqJnclTJGf87dBmaO/tn7iZ+TCkTRpRc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3730d8a308f94996a9ba7c7138ede69c1b9ac4ae", + "rev": "dda3dcd3fe03e991015e9a74b22d35950f264a54", "type": "github" }, "original": { @@ -538,11 +538,11 @@ ] }, "locked": { - "lastModified": 1746725877, - "narHash": "sha256-0YQx51XJyV43yjdv2+RHoO+C8wgI5V9L1DGVGr1+8hY=", + "lastModified": 1746740338, + "narHash": "sha256-LtDqXFrusHAVPeb+A5o2tjHfDDhluZ1IRK5LzyuAgpA=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "1965b827dc7f89e48744ec52e41dce920485ea85", + "rev": "55f12a3e6128017211370a6a882269ef39346e16", "type": "github" }, "original": { From c3eeb9b7140528a7c5635a7228fe753212afc1cb Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 9 May 2025 19:16:08 -0400 Subject: [PATCH 211/724] remove db stuff --- etcnixos/system-mreow.nix | 20 -------------------- home-manager/gui.nix | 3 --- 2 files changed, 23 deletions(-) diff --git a/etcnixos/system-mreow.nix b/etcnixos/system-mreow.nix index 1822cd0..42e127e 100644 --- a/etcnixos/system-mreow.nix +++ b/etcnixos/system-mreow.nix @@ -118,24 +118,4 @@ # disable framework kernel module # https://github.com/NixOS/nixos-hardware/issues/1330 hardware.framework.enableKmod = false; - - # for database class - services.mysql = { - enable = true; - package = pkgs.mariadb; - ensureUsers = [ - { - name = "root"; - ensurePermissions = { - "*.*" = "ALL PRIVILEGES"; - }; - } - { - name = "${username}"; - ensurePermissions = { - "*.*" = "ALL PRIVILEGES"; - }; - } - ]; - }; } diff --git a/home-manager/gui.nix b/home-manager/gui.nix index 2c947ca..5620f61 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -128,9 +128,6 @@ # password manager keepassxc - - # for database class - dbeaver-bin ] ++ (builtins.filter lib.isDerivation (builtins.attrValues nerd-fonts)); From 95d451e75887ff5873b46fde67489343bafbb551 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 9 May 2025 19:16:16 -0400 Subject: [PATCH 212/724] update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index be00a4f..17651ae 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ ] }, "locked": { - "lastModified": 1746698158, - "narHash": "sha256-R3XpZAQdH1Z7RggT4yttsCrug62cpnc4AV3nSM8zzT8=", + "lastModified": 1746787516, + "narHash": "sha256-CEaMMkWFO5dSnKheGrT4yPnx6gv+qlCNdtd4tolZL6g=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "b6e45fa12c18801ad1f46fad54a6eba99a8a71c2", + "rev": "a22be7029506f1bf53a24c22fbc7f746680dc733", "type": "github" }, "original": { @@ -212,11 +212,11 @@ ] }, "locked": { - "lastModified": 1746727295, - "narHash": "sha256-0364XVBdfEA8rWfqEPvsgBqGFfq5r9LAo9CS9tvT7tg=", + "lastModified": 1746798521, + "narHash": "sha256-axfz/jBEH9XHpS7YSumstV7b2PrPf7L8bhWUtLBv3nA=", "owner": "nix-community", "repo": "home-manager", - "rev": "a51598236f23c89e59ee77eb8e0614358b0e896c", + "rev": "e95a7c5b6fa93304cd2fd78cf676c4f6d23c422c", "type": "github" }, "original": { @@ -261,11 +261,11 @@ ] }, "locked": { - "lastModified": 1746717538, - "narHash": "sha256-mBPMdT19oLO6zRxTiuoKIKPQ4smlD8om3CZC3F34ZNo=", + "lastModified": 1746809399, + "narHash": "sha256-rMYfYaUpKuyMpDnodIfgFOnj6Wn0duItZvG4kQODcZo=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "fa81496ad7359f62deec2f52882479250b237fc7", + "rev": "8f27abb5e623d83db4988ee3e864df48181e7c30", "type": "github" }, "original": { @@ -357,11 +357,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1746621361, - "narHash": "sha256-T9vOxEqI1j1RYugV0b9dgy0AreiZ9yBDKZJYyclF0og=", + "lastModified": 1746814339, + "narHash": "sha256-hf2lICJzwACWuzHCmZn5NI6LUAOgGdR1yh8ip+duyhk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "2ea3ad8a1f26a76f8a8e23fc4f7757c46ef30ee5", + "rev": "3c5e12673265dfb0de3d9121420c0c2153bf21e0", "type": "github" }, "original": { @@ -467,11 +467,11 @@ ] }, "locked": { - "lastModified": 1746671794, - "narHash": "sha256-V+mpk2frYIEm85iYf+KPDmCGG3zBRAEhbv0E3lHdG2U=", + "lastModified": 1746830719, + "narHash": "sha256-RjKU+PrZ226X9aIfdQikb3AfyZ1hgdN89nFQDEPntGs=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ceec434b8741c66bb8df5db70d7e629a9d9c598f", + "rev": "caa2fef17111f0e6d114e6b9b8e68b4a040f8c33", "type": "github" }, "original": { @@ -538,11 +538,11 @@ ] }, "locked": { - "lastModified": 1746740338, - "narHash": "sha256-LtDqXFrusHAVPeb+A5o2tjHfDDhluZ1IRK5LzyuAgpA=", + "lastModified": 1746825459, + "narHash": "sha256-d5Pbf8fn+fvkl3XQRmojybbCTCAUpq7WWfkaBg8mXKc=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "55f12a3e6128017211370a6a882269ef39346e16", + "rev": "697676ff0c4f6377659db7972e8db845d65181f9", "type": "github" }, "original": { From d84601bc6d5680514c14b4fa29ee5b12ec0845b5 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 10 May 2025 19:12:54 -0400 Subject: [PATCH 213/724] add wifi password --- etcnixos/secrets/wifi-passwords.nix | Bin 700 -> 820 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/etcnixos/secrets/wifi-passwords.nix b/etcnixos/secrets/wifi-passwords.nix index b7ecd973bec15f825cb066b887eff5a6844acfd3..d0b7e1146f56917ec965e59048231054a2b1daf2 100644 GIT binary patch literal 820 zcmZQ@_Y83kiVO&0xFlP@psvS5)t_DKajpDf`&+9g$tIZp*xY_O^<>79>rPoO7ltfv zb5F=-oy;xOyup9#q(=TjH(i6%V`AjQBj24r#T|Q_PjgxhdqYc7^7{0oWh=!dyx*{& zbNTU>W6fsSTO+McXtNoqp8J$z^?ie`zNP-9d(REm=UDB1ZZ^}{qTrd-aziCCGv`$T z5=tGl0(sw$J^9A-Cg|VZqyr0YMMkkV#vP2lTx}q6X#PJJ3AIB#Z{MVD-y3;J!OO5a z_3y^oqA#8Bd%x3Ax{&QE}rnSsqnQnv+<*9!DUx8XWjbVTPAA} zB_8}cNik@_p|VoZ6_Q*`9Dzz*vx`?gz1U`bW5&t{l13^9pV$92S6OANJSAlHH$w$S zhFv!%_czH_aX*uCYdgm>L6K?e6x$LpkvGYu^S?UDB(P_?Esb0J&Dy0eK5zka&4CeB3zPNO|4~NZr z0nL?5PHjJ}(>PDQ!t4JINyDoTRi|W%i&rtUee~Qh>6q*ucVD)ftkbs3qXPD#Qo;g< zd!OhECo#@CIoH_e!?JD%Lm6fjO)0sr&U0d(vpF0oyggC>?8Lelx5nHF);D%5M9!H# zGkr_Q=BZ_+vlr^mwdCFWKuGt9xXbfdbI&h~x%M(jXx_S%+g3Z%^4_l6vdQ)L&slf2 zEBIba{1BM%FU__5-~6o^YmQEo6w_MWFX%q)T(sMB$WOtaNy`YyihRqZmS-Ra!l{o^L4=_}s+DK_!$=HP%& zJFhJN5yH-XWwjlzcJ2+Q$MSUzwO=*|GFL`@IybxN+>(f`;dW7HHqTSm{O5Xv_4O-m nCj2+f#t&DGKUwSW-nfr0_(<~#S_j676TyXkzvrUtn&lN7@nCv<$U3#&eMnC)Ct&a# zb6(VceN%S#(^}8D*)m$&+#h}I%(6az<+bS1C#%jc+S>O|z*%5*v)vn3o3ss@|CgL) zyYcda{yA2W8J}M+Z@b)MpMB$Q)sE!%l8@&P~sj(lb+yZ7yk zK#psZMWX9H=lEOFE5aMaHC{D+&b5>I#1eCRE4Ms*puEN0Q1j@rjP~-K z3fre$`MdOU@^_Cag}1kRuD(}u>gRs6cym(F&l2LfrT1pR-K#xLU;4#AYwL&YFEZpz!o^uC`X=#fyxdfEd2O_2!Q^LkH`X$& zFjiFCm^(MX*Up~j73bxh%Oh?+y|JY#()Rx0m1kf4E6CV;S3zuJxa!U)%dZ?$>rNNF zwnQ)M`vcx7505ZS|9A9^+o@SR+?Uo1Xz>4hnG)vy)K|xLyAgBn$Ir^F+g|)V>a(W% zy@jWC(b>qe`)Apod0XF?bV%B5weGw}*B6PjMqZBCS={@=^yBSmFL#v&Ev~+$nkjJg zMBz@BA|EyVjQ`yxd!249pXYXAO-yR)d)8h-dhZr_HAd6Se@9QPVPM+wboLK{h&@Jy Date: Sat, 10 May 2025 20:20:29 -0400 Subject: [PATCH 214/724] update --- flake.lock | 60 +++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index 17651ae..7ac56d0 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ ] }, "locked": { - "lastModified": 1746787516, - "narHash": "sha256-CEaMMkWFO5dSnKheGrT4yPnx6gv+qlCNdtd4tolZL6g=", + "lastModified": 1746917236, + "narHash": "sha256-7X/1vI1/0i6/wAh5cupqsB4BQjgYE/ALyX28B1dRnWk=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "a22be7029506f1bf53a24c22fbc7f746680dc733", + "rev": "bcd932555d28dd2527c24ee0bb8d91c076c81d7a", "type": "github" }, "original": { @@ -119,11 +119,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1746599904, - "narHash": "sha256-bykoJKLSbNANMY5nedzVYa2Z3GF8poQsNTHAnc19alM=", + "lastModified": 1746772806, + "narHash": "sha256-5/Nq62wjkZrOhUULTFjgi4Dsc7T8kIluUPkoLsyAeUA=", "owner": "nix-community", "repo": "fenix", - "rev": "589e863010225278a042480fed5b6feacb364a65", + "rev": "505bf684711e964c8f84d4c804e38f62b24accec", "type": "github" }, "original": { @@ -212,11 +212,11 @@ ] }, "locked": { - "lastModified": 1746798521, - "narHash": "sha256-axfz/jBEH9XHpS7YSumstV7b2PrPf7L8bhWUtLBv3nA=", + "lastModified": 1746912617, + "narHash": "sha256-SSw/98B3Htw7iJWCyq08fAEL5w+a/Vj+YbQq0msVFTA=", "owner": "nix-community", "repo": "home-manager", - "rev": "e95a7c5b6fa93304cd2fd78cf676c4f6d23c422c", + "rev": "9ef92f1c6b77944198fd368ec805ced842352a1d", "type": "github" }, "original": { @@ -234,11 +234,11 @@ ] }, "locked": { - "lastModified": 1746656950, - "narHash": "sha256-tnbPgz/TYBsxuidwFwVYgz/aZLVUy1EkIemTDDOh1XY=", + "lastModified": 1746681524, + "narHash": "sha256-c5kDVFh+vVfQSEXdVIudFRzPH3LO8j2ImgsBeo8v+Eo=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "87911a856356a11c7864c0a66c4c000f178e19b0", + "rev": "14eb8f7d2b0cca74691db620292037bdb813ceb7", "type": "github" }, "original": { @@ -286,11 +286,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1746142190, - "narHash": "sha256-t36K3TWLMRWoGyjYyo+H8bBquDcp4orZqNZVagWNjwY=", + "lastModified": 1746913753, + "narHash": "sha256-uHf9arBEG29z5D5R/Uck38fmkmkZzvZVH2hXlcKHdFI=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "af701c1c16c289b1b14f333d844b4f756308d244", + "rev": "95968e3e2cf2f8c94a7cea947e9f59b7467bcb9a", "type": "github" }, "original": { @@ -319,11 +319,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1746124654, - "narHash": "sha256-LmhkAt2KLvf8lp+kEUQuTFmmv7iXO8IkwwSaPasfXJw=", + "lastModified": 1746909780, + "narHash": "sha256-VmqNFS9aqNv012y/GDbuXYUGW23Eq2ORC1wYH9YTClI=", "owner": "YaLTeR", "repo": "niri", - "rev": "6c9705dd4b2eaba25f024d1a3efd7943fd393632", + "rev": "89b7423ee56da9b7c08b012c9491407e34b1c9f6", "type": "github" }, "original": { @@ -389,11 +389,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1746055187, - "narHash": "sha256-3dqArYSMP9hM7Qpy5YWhnSjiqniSaT2uc5h2Po7tmg0=", + "lastModified": 1746557022, + "narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e362ce63e16b9572d8c2297c04f7c19ab6725a5", + "rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860", "type": "github" }, "original": { @@ -446,11 +446,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1746522319, - "narHash": "sha256-q+Qo00BFgXN6xKrsrQI1P7Z3K1s2zKT0GNl0h8DwBH4=", + "lastModified": 1746722075, + "narHash": "sha256-t4ZntWiW4C3lE621lV3XyK3KltC5/SW1V9G+CSz70rQ=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "debaef80be92d957f52d6e89c86286556075ea47", + "rev": "8b624868e4ce2cb5b39559175f0978bee86bdeea", "type": "github" }, "original": { @@ -467,11 +467,11 @@ ] }, "locked": { - "lastModified": 1746830719, - "narHash": "sha256-RjKU+PrZ226X9aIfdQikb3AfyZ1hgdN89nFQDEPntGs=", + "lastModified": 1746844454, + "narHash": "sha256-GcUWDQUDRYrD34ol90KGUpjbVcOfUNbv0s955jPecko=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "caa2fef17111f0e6d114e6b9b8e68b4a040f8c33", + "rev": "be092436d4c0c303b654e4007453b69c0e33009e", "type": "github" }, "original": { @@ -538,11 +538,11 @@ ] }, "locked": { - "lastModified": 1746825459, - "narHash": "sha256-d5Pbf8fn+fvkl3XQRmojybbCTCAUpq7WWfkaBg8mXKc=", + "lastModified": 1746915423, + "narHash": "sha256-6SH9pS5q6Q0oWIfD3UJcfGbQBUMdBbRGbhUJ1skYnTI=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "697676ff0c4f6377659db7972e8db845d65181f9", + "rev": "2f982bed9845cccffebd0cf267c7e1d3dd98117e", "type": "github" }, "original": { From 1851a5f2751801446f6de17502ffd7e7143a789e Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 11 May 2025 01:27:37 -0400 Subject: [PATCH 215/724] laptop: PST time zone --- etcnixos/system-mreow.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/etcnixos/system-mreow.nix b/etcnixos/system-mreow.nix index 42e127e..2592a9d 100644 --- a/etcnixos/system-mreow.nix +++ b/etcnixos/system-mreow.nix @@ -21,6 +21,10 @@ # # seems audio doesn't work without this # hideRawDevice = false; # }; + # + + # PST + time.timeZone = lib.mkForce "America/Los_Angeles"; services.tlp = { enable = true; From b405c748bf0930c1e1ed616d00262d6c65a8c32a Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 11 May 2025 18:46:31 -0700 Subject: [PATCH 216/724] update --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 7ac56d0..4ce5942 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ ] }, "locked": { - "lastModified": 1746917236, - "narHash": "sha256-7X/1vI1/0i6/wAh5cupqsB4BQjgYE/ALyX28B1dRnWk=", + "lastModified": 1746962430, + "narHash": "sha256-3drfZBiNschNC/YVVU/gxz61H6pUnIJwFGrbad1hrPs=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "bcd932555d28dd2527c24ee0bb8d91c076c81d7a", + "rev": "f67e4e4ae622695a6ff875e89178d392115fe28d", "type": "github" }, "original": { @@ -119,11 +119,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1746772806, - "narHash": "sha256-5/Nq62wjkZrOhUULTFjgi4Dsc7T8kIluUPkoLsyAeUA=", + "lastModified": 1746858783, + "narHash": "sha256-oLrH70QIWB/KpaI+nztyP1hG4zAEEpMiNk6sA8QLQ/8=", "owner": "nix-community", "repo": "fenix", - "rev": "505bf684711e964c8f84d4c804e38f62b24accec", + "rev": "4e3cd098060cca21f2a213ce8c086948df946940", "type": "github" }, "original": { @@ -212,11 +212,11 @@ ] }, "locked": { - "lastModified": 1746912617, - "narHash": "sha256-SSw/98B3Htw7iJWCyq08fAEL5w+a/Vj+YbQq0msVFTA=", + "lastModified": 1747009742, + "narHash": "sha256-TNhbM7R45fpq2cdWzvFj+H5ZTcE//I5XSe78GFh0cDY=", "owner": "nix-community", "repo": "home-manager", - "rev": "9ef92f1c6b77944198fd368ec805ced842352a1d", + "rev": "c74665abd6e4e37d3140e68885bc49a994ffa53c", "type": "github" }, "original": { @@ -286,11 +286,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1746913753, - "narHash": "sha256-uHf9arBEG29z5D5R/Uck38fmkmkZzvZVH2hXlcKHdFI=", + "lastModified": 1747013313, + "narHash": "sha256-2+XVVaFnyHuTSp+VMTMtCWdn0edxOxC6yhyw8PipA+0=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "95968e3e2cf2f8c94a7cea947e9f59b7467bcb9a", + "rev": "98e69a05a58f0cfcadfedcf97888104b0bb4a914", "type": "github" }, "original": { @@ -373,11 +373,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1746663147, - "narHash": "sha256-Ua0drDHawlzNqJnclTJGf87dBmaO/tn7iZ+TCkTRpRc=", + "lastModified": 1746904237, + "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dda3dcd3fe03e991015e9a74b22d35950f264a54", + "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", "type": "github" }, "original": { @@ -389,11 +389,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1746557022, - "narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=", + "lastModified": 1746810718, + "narHash": "sha256-VljtYzyttmvkWUKTVJVW93qAsJsrBbgAzy7DdnJaQfI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860", + "rev": "0c0bf9c057382d5f6f63d54fd61f1abd5e1c2f63", "type": "github" }, "original": { @@ -467,11 +467,11 @@ ] }, "locked": { - "lastModified": 1746844454, - "narHash": "sha256-GcUWDQUDRYrD34ol90KGUpjbVcOfUNbv0s955jPecko=", + "lastModified": 1746931022, + "narHash": "sha256-cXn1RsYZjS23n0+YP3TiH7XBlEvy8FA2mG54MdAL6x0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "be092436d4c0c303b654e4007453b69c0e33009e", + "rev": "c46d2764319f962b20ce9c03ce6644dd0de87bc9", "type": "github" }, "original": { @@ -515,11 +515,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1745730655, - "narHash": "sha256-Tdsw5lD/XM8i1GnQr7ombqnEaCpt/voPs2AbjuYBbjI=", + "lastModified": 1746978389, + "narHash": "sha256-X2iAGQm5pheZ4VRnGCik4laxB6hyJh1i5cexGyis3oo=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "56a681bfecc5831f41f8eb0ec8c7e96c6b277153", + "rev": "51300780f84cb61d04a3c469099c758461b2a816", "type": "github" }, "original": { @@ -538,11 +538,11 @@ ] }, "locked": { - "lastModified": 1746915423, - "narHash": "sha256-6SH9pS5q6Q0oWIfD3UJcfGbQBUMdBbRGbhUJ1skYnTI=", + "lastModified": 1746998207, + "narHash": "sha256-q+3L52wIBNoUPPWGw55O2+WstZCgBVRGdKpYRxt60Rw=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "2f982bed9845cccffebd0cf267c7e1d3dd98117e", + "rev": "37077d385abbf4358621948df86b37f618c5b338", "type": "github" }, "original": { From 91fe60de8a395c9b03bd8e9ce4a591c37dd9d8ec Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 13 May 2025 17:12:51 -0700 Subject: [PATCH 217/724] update --- flake.lock | 78 +++++++++++++++++++++++++++--------------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/flake.lock b/flake.lock index 4ce5942..55337fb 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ ] }, "locked": { - "lastModified": 1746962430, - "narHash": "sha256-3drfZBiNschNC/YVVU/gxz61H6pUnIJwFGrbad1hrPs=", + "lastModified": 1747157759, + "narHash": "sha256-8qQqCX80Xumu/x0fbOkzmveNAJXOAelf/K3hOSBpOh0=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "f67e4e4ae622695a6ff875e89178d392115fe28d", + "rev": "ba96c160ca011c9407c554237a2451fe623cf3fc", "type": "github" }, "original": { @@ -119,11 +119,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1746858783, - "narHash": "sha256-oLrH70QIWB/KpaI+nztyP1hG4zAEEpMiNk6sA8QLQ/8=", + "lastModified": 1747118403, + "narHash": "sha256-6LDKrSTxPmh9c1f79ixqIwg6mlXE2FKwi11x9GNPKhA=", "owner": "nix-community", "repo": "fenix", - "rev": "4e3cd098060cca21f2a213ce8c086948df946940", + "rev": "01daa5be6a29caab8b6831b0e936750ea66d463d", "type": "github" }, "original": { @@ -212,11 +212,11 @@ ] }, "locked": { - "lastModified": 1747009742, - "narHash": "sha256-TNhbM7R45fpq2cdWzvFj+H5ZTcE//I5XSe78GFh0cDY=", + "lastModified": 1747181178, + "narHash": "sha256-Svvx3mlfGRyta0yMQmqW6FyAKtCH7KQxlcRnJPh/k6Q=", "owner": "nix-community", "repo": "home-manager", - "rev": "c74665abd6e4e37d3140e68885bc49a994ffa53c", + "rev": "b44c39cf4618ccf58df2b68827ca95a3fecf0655", "type": "github" }, "original": { @@ -234,11 +234,11 @@ ] }, "locked": { - "lastModified": 1746681524, - "narHash": "sha256-c5kDVFh+vVfQSEXdVIudFRzPH3LO8j2ImgsBeo8v+Eo=", + "lastModified": 1747109298, + "narHash": "sha256-v6P2Lm2ucRhFpVdY2feQKxJIGfaud3CVHV5GWoCNji8=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "14eb8f7d2b0cca74691db620292037bdb813ceb7", + "rev": "7ceb01d01e02fa55699db1ecb99df1295b47b499", "type": "github" }, "original": { @@ -261,11 +261,11 @@ ] }, "locked": { - "lastModified": 1746809399, - "narHash": "sha256-rMYfYaUpKuyMpDnodIfgFOnj6Wn0duItZvG4kQODcZo=", + "lastModified": 1747056319, + "narHash": "sha256-qSKcBaISBozadtPq6BomnD+wIYTZIkiua3UuHLaD52c=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "8f27abb5e623d83db4988ee3e864df48181e7c30", + "rev": "2e425f3da6ce7f5b34fa6eaf7a2a7f78dbabcc85", "type": "github" }, "original": { @@ -286,11 +286,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1747013313, - "narHash": "sha256-2+XVVaFnyHuTSp+VMTMtCWdn0edxOxC6yhyw8PipA+0=", + "lastModified": 1747152040, + "narHash": "sha256-C6xbCOgSAi+a/1Bk1GPdWd5l791neY5YRWxVM/0cYNg=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "98e69a05a58f0cfcadfedcf97888104b0bb4a914", + "rev": "fa50b6e56aaf6c9b32aadc44f7a2e47187e9b6ac", "type": "github" }, "original": { @@ -319,11 +319,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1746909780, - "narHash": "sha256-VmqNFS9aqNv012y/GDbuXYUGW23Eq2ORC1wYH9YTClI=", + "lastModified": 1747145615, + "narHash": "sha256-U6MhqL4QXLojCOKH5yc8GbfOF7Fas36e1nqcPQx6/zQ=", "owner": "YaLTeR", "repo": "niri", - "rev": "89b7423ee56da9b7c08b012c9491407e34b1c9f6", + "rev": "0d6843ea67da91aea37b655be5de92dfeea081b5", "type": "github" }, "original": { @@ -357,11 +357,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1746814339, - "narHash": "sha256-hf2lICJzwACWuzHCmZn5NI6LUAOgGdR1yh8ip+duyhk=", + "lastModified": 1747129300, + "narHash": "sha256-L3clA5YGeYCF47ghsI7Tcex+DnaaN/BbQ4dR2wzoiKg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3c5e12673265dfb0de3d9121420c0c2153bf21e0", + "rev": "e81fd167b33121269149c57806599045fd33eeed", "type": "github" }, "original": { @@ -389,11 +389,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1746810718, - "narHash": "sha256-VljtYzyttmvkWUKTVJVW93qAsJsrBbgAzy7DdnJaQfI=", + "lastModified": 1746957726, + "narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0c0bf9c057382d5f6f63d54fd61f1abd5e1c2f63", + "rev": "a39ed32a651fdee6842ec930761e31d1f242cb94", "type": "github" }, "original": { @@ -446,11 +446,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1746722075, - "narHash": "sha256-t4ZntWiW4C3lE621lV3XyK3KltC5/SW1V9G+CSz70rQ=", + "lastModified": 1746889290, + "narHash": "sha256-h3LQYZgyv2l3U7r+mcsrEOGRldaK0zJFwAAva4hV/6g=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "8b624868e4ce2cb5b39559175f0978bee86bdeea", + "rev": "2bafe9d96c6734aacfd49e115f6cf61e7adc68bc", "type": "github" }, "original": { @@ -467,11 +467,11 @@ ] }, "locked": { - "lastModified": 1746931022, - "narHash": "sha256-cXn1RsYZjS23n0+YP3TiH7XBlEvy8FA2mG54MdAL6x0=", + "lastModified": 1747103809, + "narHash": "sha256-a3Yk+CoFmNw7V8J/si/AM8WuI/qTxQhiJpuQ7HFl774=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c46d2764319f962b20ce9c03ce6644dd0de87bc9", + "rev": "fe36c63649875f391949e8b2ec33949d0cd8aa95", "type": "github" }, "original": { @@ -515,11 +515,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1746978389, - "narHash": "sha256-X2iAGQm5pheZ4VRnGCik4laxB6hyJh1i5cexGyis3oo=", + "lastModified": 1747111562, + "narHash": "sha256-GAqhWoxaBIk0tgoecZPa8gTHDHxNc0JtlwWHZN2iOOo=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "51300780f84cb61d04a3c469099c758461b2a816", + "rev": "ec9ff64c1e0cbec42710b580b7c0f759b1694e72", "type": "github" }, "original": { @@ -538,11 +538,11 @@ ] }, "locked": { - "lastModified": 1746998207, - "narHash": "sha256-q+3L52wIBNoUPPWGw55O2+WstZCgBVRGdKpYRxt60Rw=", + "lastModified": 1747174741, + "narHash": "sha256-lkEze2sP1HPkKzE0Tj8quNoDLXsqBbPyC2bFMlwzDHw=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "37077d385abbf4358621948df86b37f618c5b338", + "rev": "da65ee08fdda4a4d4977a308b1d502c3037cf16e", "type": "github" }, "original": { From 96a5482f47dba53e1b85070742b19a89b54a8870 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 14 May 2025 00:37:28 -0700 Subject: [PATCH 218/724] update --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 55337fb..fd83048 100644 --- a/flake.lock +++ b/flake.lock @@ -212,11 +212,11 @@ ] }, "locked": { - "lastModified": 1747181178, - "narHash": "sha256-Svvx3mlfGRyta0yMQmqW6FyAKtCH7KQxlcRnJPh/k6Q=", + "lastModified": 1747184352, + "narHash": "sha256-GBZulv50wztp5cgc405t1uOkxQYhSkMqeKLI+iSrlpk=", "owner": "nix-community", "repo": "home-manager", - "rev": "b44c39cf4618ccf58df2b68827ca95a3fecf0655", + "rev": "7c1cefb98369cc85440642fdccc1c1394ca6dd2c", "type": "github" }, "original": { @@ -467,11 +467,11 @@ ] }, "locked": { - "lastModified": 1747103809, - "narHash": "sha256-a3Yk+CoFmNw7V8J/si/AM8WuI/qTxQhiJpuQ7HFl774=", + "lastModified": 1747190175, + "narHash": "sha256-s33mQ2s5L/2nyllhRTywgECNZyCqyF4MJeM3vG/GaRo=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "fe36c63649875f391949e8b2ec33949d0cd8aa95", + "rev": "58160be7abad81f6f8cb53120d5b88c16e01c06d", "type": "github" }, "original": { @@ -538,11 +538,11 @@ ] }, "locked": { - "lastModified": 1747174741, - "narHash": "sha256-lkEze2sP1HPkKzE0Tj8quNoDLXsqBbPyC2bFMlwzDHw=", + "lastModified": 1747192203, + "narHash": "sha256-nwfzLUFupXp4+X3JN8fvobp92s9TeeX6ajSoYaiX9Jc=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "da65ee08fdda4a4d4977a308b1d502c3037cf16e", + "rev": "c2f45958e7d552e4e55d269ef023a9c2fce8f183", "type": "github" }, "original": { From 84a4ccbc855a69d58ae0004c3569de869f2881d2 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 15 May 2025 21:41:58 -0700 Subject: [PATCH 219/724] some changes --- etcnixos/common.nix | 5 ++-- etcnixos/system-mreow.nix | 4 ++- flake.lock | 60 +++++++++++++++++++-------------------- 3 files changed, 36 insertions(+), 33 deletions(-) diff --git a/etcnixos/common.nix b/etcnixos/common.nix index 5b339f9..a2cf585 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -46,8 +46,8 @@ # kernel options boot = { # kernelPackages = pkgs.linuxPackages_cachyos-lto; - # kernelPackages = pkgs.linuxPackages_latest; - kernelPackages = pkgs.linuxPackages; + kernelPackages = pkgs.linuxPackages_latest; + # kernelPackages = pkgs.linuxPackages; kernel.sysctl = { # dmesg shushhhhh @@ -82,6 +82,7 @@ # fwupd for updating firmware fwupd = { enable = true; + extraRemotes = [ "lvfs-testing" ]; }; # auto detect network printers diff --git a/etcnixos/system-mreow.nix b/etcnixos/system-mreow.nix index 2592a9d..87da6e4 100644 --- a/etcnixos/system-mreow.nix +++ b/etcnixos/system-mreow.nix @@ -27,7 +27,7 @@ time.timeZone = lib.mkForce "America/Los_Angeles"; services.tlp = { - enable = true; + enable = false; settings = { CPU_SCALING_GOVERNOR_ON_AC = "powersave"; CPU_SCALING_GOVERNOR_ON_BAT = "powersave"; @@ -42,6 +42,8 @@ }; }; + services.power-profiles-daemon.enable = true; + services.greetd = { enable = true; settings = { diff --git a/flake.lock b/flake.lock index fd83048..bd945a4 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ ] }, "locked": { - "lastModified": 1747157759, - "narHash": "sha256-8qQqCX80Xumu/x0fbOkzmveNAJXOAelf/K3hOSBpOh0=", + "lastModified": 1747346690, + "narHash": "sha256-SM3Evig1kxAKHKkEdenVBDqJUO6b2TgVQYJobzHw6eA=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "ba96c160ca011c9407c554237a2451fe623cf3fc", + "rev": "c5d9188602d439be9256eca86a4960753d8038fe", "type": "github" }, "original": { @@ -119,11 +119,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1747118403, - "narHash": "sha256-6LDKrSTxPmh9c1f79ixqIwg6mlXE2FKwi11x9GNPKhA=", + "lastModified": 1747291057, + "narHash": "sha256-9Wir6aLJAeJKqdoQUiwfKdBn7SyNXTJGRSscRyVOo2Y=", "owner": "nix-community", "repo": "fenix", - "rev": "01daa5be6a29caab8b6831b0e936750ea66d463d", + "rev": "76ffc1b7b3ec8078fe01794628b6abff35cbda8f", "type": "github" }, "original": { @@ -212,11 +212,11 @@ ] }, "locked": { - "lastModified": 1747184352, - "narHash": "sha256-GBZulv50wztp5cgc405t1uOkxQYhSkMqeKLI+iSrlpk=", + "lastModified": 1747367409, + "narHash": "sha256-JUcfcXCsoerQNQDhujj6LNBI/9LOkjUrLNR0tjcU0Gc=", "owner": "nix-community", "repo": "home-manager", - "rev": "7c1cefb98369cc85440642fdccc1c1394ca6dd2c", + "rev": "a1a72d18ee75ce4559b5f59296a7b2d37f608c1c", "type": "github" }, "original": { @@ -234,11 +234,11 @@ ] }, "locked": { - "lastModified": 1747109298, - "narHash": "sha256-v6P2Lm2ucRhFpVdY2feQKxJIGfaud3CVHV5GWoCNji8=", + "lastModified": 1747338546, + "narHash": "sha256-e/5WjXvWzI/1QsSOK4CdPh84x6ycTdYe+iRXKyUOPjQ=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "7ceb01d01e02fa55699db1ecb99df1295b47b499", + "rev": "3cee1424f023a147a1b011d950813f922b1e392b", "type": "github" }, "original": { @@ -286,11 +286,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1747152040, - "narHash": "sha256-C6xbCOgSAi+a/1Bk1GPdWd5l791neY5YRWxVM/0cYNg=", + "lastModified": 1747304844, + "narHash": "sha256-aLS9HqdtAtioT2JJSWQ7cgWKozBmCtxzYWIEZb1RzkA=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "fa50b6e56aaf6c9b32aadc44f7a2e47187e9b6ac", + "rev": "b8326b5bfb204d7b57802a218de1ebbb743bf8dc", "type": "github" }, "original": { @@ -319,11 +319,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1747145615, - "narHash": "sha256-U6MhqL4QXLojCOKH5yc8GbfOF7Fas36e1nqcPQx6/zQ=", + "lastModified": 1747289333, + "narHash": "sha256-S2xNTAo0e87rK+sNDQCxOsBKtQEBAAVwgkzdpnWoQC0=", "owner": "YaLTeR", "repo": "niri", - "rev": "0d6843ea67da91aea37b655be5de92dfeea081b5", + "rev": "46a8f81160708d05e9609c318cce64e3e5ac2538", "type": "github" }, "original": { @@ -373,11 +373,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1746904237, - "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", + "lastModified": 1747179050, + "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", + "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e", "type": "github" }, "original": { @@ -389,11 +389,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1746957726, - "narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=", + "lastModified": 1747209494, + "narHash": "sha256-fLise+ys+bpyjuUUkbwqo5W/UyIELvRz9lPBPoB0fbM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a39ed32a651fdee6842ec930761e31d1f242cb94", + "rev": "5d736263df906c5da72ab0f372427814de2f52f8", "type": "github" }, "original": { @@ -467,11 +467,11 @@ ] }, "locked": { - "lastModified": 1747190175, - "narHash": "sha256-s33mQ2s5L/2nyllhRTywgECNZyCqyF4MJeM3vG/GaRo=", + "lastModified": 1747363019, + "narHash": "sha256-N4dwkRBmpOosa4gfFkFf/LTD8oOcNkAyvZ07JvRDEf0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "58160be7abad81f6f8cb53120d5b88c16e01c06d", + "rev": "0e624f2b1972a34be1a9b35290ed18ea4b419b6f", "type": "github" }, "original": { @@ -538,11 +538,11 @@ ] }, "locked": { - "lastModified": 1747192203, - "narHash": "sha256-nwfzLUFupXp4+X3JN8fvobp92s9TeeX6ajSoYaiX9Jc=", + "lastModified": 1747365155, + "narHash": "sha256-4yjNzN+p3H3+6emM9rv5ggcY/Usu0UZ188F+98z0huE=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "c2f45958e7d552e4e55d269ef023a9c2fce8f183", + "rev": "ea7eae1b022b9af4b2f7c8681f570e2862249298", "type": "github" }, "original": { From 82f400e597e82d0ecdf4718f8776e2a5422caf26 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 15 May 2025 22:20:46 -0700 Subject: [PATCH 220/724] niri: override nixpkgs-stable --- flake.lock | 20 +++----------------- flake.nix | 1 + 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index bd945a4..f76a911 100644 --- a/flake.lock +++ b/flake.lock @@ -281,7 +281,9 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable", + "nixpkgs-stable": [ + "nixpkgs" + ], "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, @@ -387,22 +389,6 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1747209494, - "narHash": "sha256-fLise+ys+bpyjuUUkbwqo5W/UyIELvRz9lPBPoB0fbM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5d736263df906c5da72ab0f372427814de2f52f8", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ diff --git a/flake.nix b/flake.nix index ceeb794..5f9457c 100644 --- a/flake.nix +++ b/flake.nix @@ -48,6 +48,7 @@ niri = { url = "github:sodiboo/niri-flake"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs-stable.follows = "nixpkgs"; }; }; From a62e5a9c6d0fd63d4b18cfe12e16be381adb88d2 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 15 May 2025 23:15:48 -0700 Subject: [PATCH 221/724] dunst: theme changes --- home-manager/progs/dunst.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/home-manager/progs/dunst.nix b/home-manager/progs/dunst.nix index 72ac881..d0b7d27 100644 --- a/home-manager/progs/dunst.nix +++ b/home-manager/progs/dunst.nix @@ -13,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 = { From cdc3fe05cc15596e560a2fc4d395174907770ea3 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 15 May 2025 23:16:17 -0700 Subject: [PATCH 222/724] format wifi passwords file --- etcnixos/secrets/wifi-passwords.nix | Bin 820 -> 819 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/etcnixos/secrets/wifi-passwords.nix b/etcnixos/secrets/wifi-passwords.nix index d0b7e1146f56917ec965e59048231054a2b1daf2..e4cb3a8cc82664d6eb3b7d2c188ede6c3bd85618 100644 GIT binary patch literal 819 zcmZQ@_Y83kiVO&0=s0a?EBBznF5dT!lGc~)QIdD^OqYBWx^kjx-5u5v$B!Sxq^2oo z=-s#+8fRu8q1tD0s&8u4{*TvUzl66Xe*SiCuGzAD$AZ75HP2@$d^OWw_EmZEr)S^) zx3(O4xA4d{_1%xOjTS8{xXQ;o(e44uuHUz|SZkll(d<~2r#~%p_uJnydnMU;GmcL2 z=BPZf>#g+q2j%-}gJ%dI|6IIGQna}4?d-lln>APe-J4Sx@N*Nt9Cy=At;g=F2JhGD z@^1NWz;pFMSbOcqilVLwaZEzH8Y++7n-(W}bT9Y4ZyAN%F-Pva_g$J7HQSsgUi#ju zMmb5NUzho8Z<}$7t`)Fc7$V7OzP=G)qhFPL=IYft>-(YEVI__x?*$Bzjfr;i?a zdntAm%j?+b@?Um^E6+I|Y4d7wMHu_UGm#cY4!eHd?KoGA&uYO}hW=JD_WVZsrsVQi z{+Y)z_@}SkYF=GGU#BOZHTmfysrXHCG21NeN3E-jbq>h6y0>x51LxF`9Gjx@rSG&B z<#c+KuG}4(@OP@*fq6@&DNOOzQVM%5b7gPGr8qacS)REJyVA<#TqANs+-z@0UST|T zf4e>NbFLXwY}jZgPpf( zgYReE+Ed~Drt$+{@j1c0XL!4(dHV*ef1q_z_2l-u%(GwoUT~3N;z@(7$93}U%rhIm zpSHaG(y?kwQ5wgg;sUwqBC1QL`&^{?tZFbd--YpM_X&I ln#pSspi79>rPoO7ltfv zb5F=-oy;xOyup9#q(=TjH(i6%V`AjQBj24r#T|Q_PjgxhdqYc7^7{0oWh=!dyx*{& zbNTU>W6fsSTO+McXtNoqp8J$z^?ie`zNP-9d(REm=UDB1ZZ^}{qTrd-aziCCGv`$T z5=tGl0(sw$J^9A-Cg|VZqyr0YMMkkV#vP2lTx}q6X#PJJ3AIB#Z{MVD-y3;J!OO5a z_3y^oqA#8Bd%x3Ax{&QE}rnSsqnQnv+<*9!DUx8XWjbVTPAA} zB_8}cNik@_p|VoZ6_Q*`9Dzz*vx`?gz1U`bW5&t{l13^9pV$92S6OANJSAlHH$w$S zhFv!%_czH_aX*uCYdgm>L6K?e6x$LpkvGYu^S?UDB(P_?Esb0J&Dy0eK5zka&4CeB3zPNO|4~NZr z0nL?5PHjJ}(>PDQ!t4JINyDoTRi|W%i&rtUee~Qh>6q*ucVD)ftkbs3qXPD#Qo;g< zd!OhECo#@CIoH_e!?JD%Lm6fjO)0sr&U0d(vpF0oyggC>?8Lelx5nHF);D%5M9!H# zGkr_Q=BZ_+vlr^mwdCFWKuGt9xXbfdbI&h~x%M(jXx_S%+g3Z%^4_l6vdQ)L&slf2 zEBIba{1BM%FU__5-~6o^YmQEo6w_MWFX%q)T(sMB$WOtaNy`YyihRqZmS-Ra!l{o^L4=_}s+DK_!$=HP%& zJFhJN5yH-XWwjlzcJ2+Q$MSUzwO=*|GFL`@IybxN+>(f`;dW7HHqTSm{O5Xv_4O-m n Date: Thu, 15 May 2025 23:18:42 -0700 Subject: [PATCH 223/724] cachyos kernel again --- etcnixos/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etcnixos/common.nix b/etcnixos/common.nix index a2cf585..244006e 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -45,8 +45,8 @@ # kernel options boot = { - # kernelPackages = pkgs.linuxPackages_cachyos-lto; - kernelPackages = pkgs.linuxPackages_latest; + kernelPackages = pkgs.linuxPackages_cachyos-lto; + # kernelPackages = pkgs.linuxPackages_latest; # kernelPackages = pkgs.linuxPackages; kernel.sysctl = { From 44fe2e7274e3a5b730bc3b1c72c6b217e9a39eb7 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 21 May 2025 20:51:58 -0700 Subject: [PATCH 224/724] update --- flake.lock | 72 +++++++++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/flake.lock b/flake.lock index f76a911..7bd6013 100644 --- a/flake.lock +++ b/flake.lock @@ -12,11 +12,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1745630506, - "narHash": "sha256-bHCFgGeu8XjWlVuaWzi3QONjDW3coZDqSHvnd4l7xus=", + "lastModified": 1747575206, + "narHash": "sha256-NwmAFuDUO/PFcgaGGr4j3ozG9Pe5hZ/ogitWhY+D81k=", "owner": "ryantm", "repo": "agenix", - "rev": "96e078c646b711aee04b82ba01aefbff87004ded", + "rev": "4835b1dc898959d8547a871ef484930675cb47f1", "type": "github" }, "original": { @@ -38,11 +38,11 @@ ] }, "locked": { - "lastModified": 1747346690, - "narHash": "sha256-SM3Evig1kxAKHKkEdenVBDqJUO6b2TgVQYJobzHw6eA=", + "lastModified": 1747823570, + "narHash": "sha256-aYDO6La5fuG5xzVYBFfoheWukwggcyh3LlfI0p+RnHw=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "c5d9188602d439be9256eca86a4960753d8038fe", + "rev": "2ab29fd77896a69a77bb98fd792fb6102f44b449", "type": "github" }, "original": { @@ -119,11 +119,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1747291057, - "narHash": "sha256-9Wir6aLJAeJKqdoQUiwfKdBn7SyNXTJGRSscRyVOo2Y=", + "lastModified": 1747392669, + "narHash": "sha256-zky3+lndxKRu98PAwVK8kXPdg+Q1NVAhaI7YGrboKYA=", "owner": "nix-community", "repo": "fenix", - "rev": "76ffc1b7b3ec8078fe01794628b6abff35cbda8f", + "rev": "c3c27e603b0d9b5aac8a16236586696338856fbb", "type": "github" }, "original": { @@ -212,11 +212,11 @@ ] }, "locked": { - "lastModified": 1747367409, - "narHash": "sha256-JUcfcXCsoerQNQDhujj6LNBI/9LOkjUrLNR0tjcU0Gc=", + "lastModified": 1747875884, + "narHash": "sha256-tdVx4kghhdy62LKuTnwE2RytOe8o88tah/yhpyuL0D4=", "owner": "nix-community", "repo": "home-manager", - "rev": "a1a72d18ee75ce4559b5f59296a7b2d37f608c1c", + "rev": "f9186c64fcc6ee5f0114547acf9e814c806a640b", "type": "github" }, "original": { @@ -234,11 +234,11 @@ ] }, "locked": { - "lastModified": 1747338546, - "narHash": "sha256-e/5WjXvWzI/1QsSOK4CdPh84x6ycTdYe+iRXKyUOPjQ=", + "lastModified": 1747466853, + "narHash": "sha256-/evYltwuF8Kz1odgocWnguh/8VQV1i76VB4yMTU9m7k=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "3cee1424f023a147a1b011d950813f922b1e392b", + "rev": "0ba1a34fa6d995fe433109f0ad66de8d5613d46e", "type": "github" }, "original": { @@ -288,11 +288,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1747304844, - "narHash": "sha256-aLS9HqdtAtioT2JJSWQ7cgWKozBmCtxzYWIEZb1RzkA=", + "lastModified": 1747854332, + "narHash": "sha256-Y2PTi+lKJ+2ttaHzC7frOSWvhgz/uqGmpvbJ9vNCrtQ=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "b8326b5bfb204d7b57802a218de1ebbb743bf8dc", + "rev": "a7ca3444190a6cac3d92168a111349b59003bd6c", "type": "github" }, "original": { @@ -321,11 +321,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1747289333, - "narHash": "sha256-S2xNTAo0e87rK+sNDQCxOsBKtQEBAAVwgkzdpnWoQC0=", + "lastModified": 1747846213, + "narHash": "sha256-uepcnOQyj7VgiEAgr+Q8uDdpoLSuiSD4MQ5L8zyjJfg=", "owner": "YaLTeR", "repo": "niri", - "rev": "46a8f81160708d05e9609c318cce64e3e5ac2538", + "rev": "71251a700308fbdb719e697b633f5a0483cd3f12", "type": "github" }, "original": { @@ -359,11 +359,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1747129300, - "narHash": "sha256-L3clA5YGeYCF47ghsI7Tcex+DnaaN/BbQ4dR2wzoiKg=", + "lastModified": 1747860404, + "narHash": "sha256-9IMwxC4g1AyhOHTx8iTimoKnyzl9Rk2OJZiDtFoF3pA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e81fd167b33121269149c57806599045fd33eeed", + "rev": "2b9118883d29290a1b16ae3a12aedc478dae2546", "type": "github" }, "original": { @@ -375,11 +375,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1747179050, - "narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=", + "lastModified": 1747744144, + "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e", + "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", "type": "github" }, "original": { @@ -432,11 +432,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1746889290, - "narHash": "sha256-h3LQYZgyv2l3U7r+mcsrEOGRldaK0zJFwAAva4hV/6g=", + "lastModified": 1747323949, + "narHash": "sha256-G4NwzhODScKnXqt2mEQtDFOnI0wU3L1WxsiHX3cID/0=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "2bafe9d96c6734aacfd49e115f6cf61e7adc68bc", + "rev": "f8e784353bde7cbf9a9046285c1caf41ac484ebe", "type": "github" }, "original": { @@ -453,11 +453,11 @@ ] }, "locked": { - "lastModified": 1747363019, - "narHash": "sha256-N4dwkRBmpOosa4gfFkFf/LTD8oOcNkAyvZ07JvRDEf0=", + "lastModified": 1747881408, + "narHash": "sha256-LmpQ28JNi5OPqRamih6+QvVQE1DurLOgKUlyM4fRiRU=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "0e624f2b1972a34be1a9b35290ed18ea4b419b6f", + "rev": "6e322a70e8a6c15bab8a5e3cf690fd65414b9d81", "type": "github" }, "original": { @@ -524,11 +524,11 @@ ] }, "locked": { - "lastModified": 1747365155, - "narHash": "sha256-4yjNzN+p3H3+6emM9rv5ggcY/Usu0UZ188F+98z0huE=", + "lastModified": 1747883522, + "narHash": "sha256-KjLdfypzVAI6H6lIxL7TDkPetehbwtbryDV1QuCOOXU=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "ea7eae1b022b9af4b2f7c8681f570e2862249298", + "rev": "0121a703fb9405c4005d0c05268dfe31a313edae", "type": "github" }, "original": { From 9add1f8abce21be821b19d1c6941af7df6c15ae3 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 22 May 2025 19:35:06 -0700 Subject: [PATCH 225/724] update --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 7bd6013..ae464e7 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ ] }, "locked": { - "lastModified": 1747823570, - "narHash": "sha256-aYDO6La5fuG5xzVYBFfoheWukwggcyh3LlfI0p+RnHw=", + "lastModified": 1747957807, + "narHash": "sha256-hL6qjHmYuo1gfRSonQYpRPw8qKLvykM8XYC/CfNEyF8=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "2ab29fd77896a69a77bb98fd792fb6102f44b449", + "rev": "325a18890851c52c63b529463d22cf550f4791f9", "type": "github" }, "original": { @@ -212,11 +212,11 @@ ] }, "locked": { - "lastModified": 1747875884, - "narHash": "sha256-tdVx4kghhdy62LKuTnwE2RytOe8o88tah/yhpyuL0D4=", + "lastModified": 1747955385, + "narHash": "sha256-AKoBFaEGN02tGvBlkwVIDOGXouHvrTTfOUcvBDGxkxQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "f9186c64fcc6ee5f0114547acf9e814c806a640b", + "rev": "a868570581f0dbdef7e33c8c9bb34b735dfcbacf", "type": "github" }, "original": { @@ -234,11 +234,11 @@ ] }, "locked": { - "lastModified": 1747466853, - "narHash": "sha256-/evYltwuF8Kz1odgocWnguh/8VQV1i76VB4yMTU9m7k=", + "lastModified": 1747893327, + "narHash": "sha256-9MVhGXDVDG3+eqzNsxK4n2uriPGVvjOvlxUKEEnGiAs=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "0ba1a34fa6d995fe433109f0ad66de8d5613d46e", + "rev": "953023adda652e7ff9c64dacaa9f44da7c120191", "type": "github" }, "original": { @@ -288,11 +288,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1747854332, - "narHash": "sha256-Y2PTi+lKJ+2ttaHzC7frOSWvhgz/uqGmpvbJ9vNCrtQ=", + "lastModified": 1747929338, + "narHash": "sha256-qGMrtBvWWKPElGpQ4ZPZVGN8HLC+laJHkwcsJB7wwGs=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "a7ca3444190a6cac3d92168a111349b59003bd6c", + "rev": "5b5c0cc698a19c5a10ef1aee487cae238a4aac1e", "type": "github" }, "original": { @@ -321,11 +321,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1747846213, - "narHash": "sha256-uepcnOQyj7VgiEAgr+Q8uDdpoLSuiSD4MQ5L8zyjJfg=", + "lastModified": 1747926317, + "narHash": "sha256-EBGfaeZ53SNBtsB8dnvBWfjwp+dRDCEkfYyRfwTdbls=", "owner": "YaLTeR", "repo": "niri", - "rev": "71251a700308fbdb719e697b633f5a0483cd3f12", + "rev": "8347cc20dc87049b398ab655565d468c5c4427a0", "type": "github" }, "original": { @@ -359,11 +359,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1747860404, - "narHash": "sha256-9IMwxC4g1AyhOHTx8iTimoKnyzl9Rk2OJZiDtFoF3pA=", + "lastModified": 1747900541, + "narHash": "sha256-dn64Pg9xLETjblwZs9Euu/SsjW80pd6lr5qSiyLY1pg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "2b9118883d29290a1b16ae3a12aedc478dae2546", + "rev": "11f2d9ea49c3e964315215d6baa73a8d42672f06", "type": "github" }, "original": { @@ -524,11 +524,11 @@ ] }, "locked": { - "lastModified": 1747883522, - "narHash": "sha256-KjLdfypzVAI6H6lIxL7TDkPetehbwtbryDV1QuCOOXU=", + "lastModified": 1747952334, + "narHash": "sha256-3vviUKy/BmqdVtvPHsVXDxmeb7zI3AL41MFx8yqk4+s=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "0121a703fb9405c4005d0c05268dfe31a313edae", + "rev": "d621ed2616531c072f7b29ea93ef39cbc46bc79c", "type": "github" }, "original": { From 5078a7780b322df74bbe771e99baec7cf77a6164 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 23 May 2025 00:49:13 -0700 Subject: [PATCH 226/724] niri: Mod+O - overview --- home-manager/progs/niri.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home-manager/progs/niri.nix b/home-manager/progs/niri.nix index 849da57..b5cffd3 100644 --- a/home-manager/progs/niri.nix +++ b/home-manager/progs/niri.nix @@ -130,6 +130,9 @@ "${pkgs.fuzzel}/bin/fuzzel" ]; + + "Mod+O".action = toggle-overview; + # open a terminal "Mod+T".action = spawn "${pkgs.alacritty}/bin/alacritty"; From bccbd33b39ded9b5ee7815808e7ed4162dee8800 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 23 May 2025 21:43:47 -0700 Subject: [PATCH 227/724] update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index ae464e7..d1a6d90 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ ] }, "locked": { - "lastModified": 1747957807, - "narHash": "sha256-hL6qjHmYuo1gfRSonQYpRPw8qKLvykM8XYC/CfNEyF8=", + "lastModified": 1748012392, + "narHash": "sha256-ySnLv8+Z91PxcYA0royImfqDNyN/oijxE94ftUCR/vc=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "325a18890851c52c63b529463d22cf550f4791f9", + "rev": "cfddf4d048eb19f03009c626e5ef3f1913cd063d", "type": "github" }, "original": { @@ -212,11 +212,11 @@ ] }, "locked": { - "lastModified": 1747955385, - "narHash": "sha256-AKoBFaEGN02tGvBlkwVIDOGXouHvrTTfOUcvBDGxkxQ=", + "lastModified": 1747978958, + "narHash": "sha256-pQQnbxWpY3IiZqgelXHIe/OAE/Yv4NSQq7fch7M6nXQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "a868570581f0dbdef7e33c8c9bb34b735dfcbacf", + "rev": "7419250703fd5eb50e99bdfb07a86671939103ea", "type": "github" }, "original": { @@ -288,11 +288,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1747929338, - "narHash": "sha256-qGMrtBvWWKPElGpQ4ZPZVGN8HLC+laJHkwcsJB7wwGs=", + "lastModified": 1748033637, + "narHash": "sha256-TetDbakvubacirX9JTzrZ8FePtT8taVv53sbqY61t38=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "5b5c0cc698a19c5a10ef1aee487cae238a4aac1e", + "rev": "262837d8190629c4af723e35a7f2a3f49d1afb26", "type": "github" }, "original": { @@ -321,11 +321,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1747926317, - "narHash": "sha256-EBGfaeZ53SNBtsB8dnvBWfjwp+dRDCEkfYyRfwTdbls=", + "lastModified": 1748030931, + "narHash": "sha256-34Y9mI/IN9eWZm6v1wQS+TUw1BK9Ed5XBWe8lrVu6RE=", "owner": "YaLTeR", "repo": "niri", - "rev": "8347cc20dc87049b398ab655565d468c5c4427a0", + "rev": "a605a3f016769ba2fd7e2147fe05c9ac3707f973", "type": "github" }, "original": { @@ -453,11 +453,11 @@ ] }, "locked": { - "lastModified": 1747881408, - "narHash": "sha256-LmpQ28JNi5OPqRamih6+QvVQE1DurLOgKUlyM4fRiRU=", + "lastModified": 1748054080, + "narHash": "sha256-rwFiLLNCwkj9bqePtH1sMqzs1xmohE0Ojq249piMzF4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "6e322a70e8a6c15bab8a5e3cf690fd65414b9d81", + "rev": "2221d8d53c128beb69346fa3ab36da3f19bb1691", "type": "github" }, "original": { @@ -524,11 +524,11 @@ ] }, "locked": { - "lastModified": 1747952334, - "narHash": "sha256-3vviUKy/BmqdVtvPHsVXDxmeb7zI3AL41MFx8yqk4+s=", + "lastModified": 1748060564, + "narHash": "sha256-KTceiwnQm5MFAjtQtSp2/lkodwSd2jub/wCYfVGIFKI=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "d621ed2616531c072f7b29ea93ef39cbc46bc79c", + "rev": "1963b92737b62652fa85e1dfc57d5f4c6d28aea4", "type": "github" }, "original": { From 17e32d78392a3f53c243aa5b4015a346195e97ef Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 23 May 2025 21:56:45 -0700 Subject: [PATCH 228/724] nixos-rebuild boot --- deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy.sh b/deploy.sh index 0d11751..42c1fbf 100755 --- a/deploy.sh +++ b/deploy.sh @@ -1,3 +1,3 @@ #!/bin/sh -nixos-rebuild switch --flake . --use-remote-sudo +nixos-rebuild boot --flake . --use-remote-sudo From 51c5c4e7ab0c77442a25a50009202f07c0abddeb Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 24 May 2025 09:23:57 -0700 Subject: [PATCH 229/724] update --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index d1a6d90..54c804a 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ ] }, "locked": { - "lastModified": 1748012392, - "narHash": "sha256-ySnLv8+Z91PxcYA0royImfqDNyN/oijxE94ftUCR/vc=", + "lastModified": 1748031405, + "narHash": "sha256-UuvEZzmfOjbekzo7rkiJr4TRdm+5o3eWRkJt5HJrE7o=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "cfddf4d048eb19f03009c626e5ef3f1913cd063d", + "rev": "9a8b6b53524f6d876c7bf287915cf79e23a591fd", "type": "github" }, "original": { @@ -524,11 +524,11 @@ ] }, "locked": { - "lastModified": 1748060564, - "narHash": "sha256-KTceiwnQm5MFAjtQtSp2/lkodwSd2jub/wCYfVGIFKI=", + "lastModified": 1748090150, + "narHash": "sha256-WrcGLv4Q94B2eG+jj5EckQfItR4zTAz/8uX2to4bU4g=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "1963b92737b62652fa85e1dfc57d5f4c6d28aea4", + "rev": "d25f7e7fc5a2ebcb4c41924b4755eec642e6f18d", "type": "github" }, "original": { From 77cd534f6e18ea3c02485a80cf8756a965a85fc3 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 25 May 2025 12:37:20 -0700 Subject: [PATCH 230/724] update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 54c804a..5abc26a 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ ] }, "locked": { - "lastModified": 1748031405, - "narHash": "sha256-UuvEZzmfOjbekzo7rkiJr4TRdm+5o3eWRkJt5HJrE7o=", + "lastModified": 1748116304, + "narHash": "sha256-gpO/jh/T/Ygx8ewq0y4LQDKEqvZJ3WiRg3ur8K9KfFg=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "9a8b6b53524f6d876c7bf287915cf79e23a591fd", + "rev": "54741d5ed1e944d68ff94fb09ce967269156f65e", "type": "github" }, "original": { @@ -212,11 +212,11 @@ ] }, "locked": { - "lastModified": 1747978958, - "narHash": "sha256-pQQnbxWpY3IiZqgelXHIe/OAE/Yv4NSQq7fch7M6nXQ=", + "lastModified": 1748182899, + "narHash": "sha256-r6MHSalDFydlUmjorVTSsyhLjIt8VWNtGc5+mffXvFQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "7419250703fd5eb50e99bdfb07a86671939103ea", + "rev": "901f8fef7f349cf8a8e97b3230b22fd592df9160", "type": "github" }, "original": { @@ -234,11 +234,11 @@ ] }, "locked": { - "lastModified": 1747893327, - "narHash": "sha256-9MVhGXDVDG3+eqzNsxK4n2uriPGVvjOvlxUKEEnGiAs=", + "lastModified": 1747990026, + "narHash": "sha256-sG5VbID+x5+xUC+jjgHibnzg8IllVcH+K2TLmYHLPME=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "953023adda652e7ff9c64dacaa9f44da7c120191", + "rev": "e2f4ced874406541a7957f7e2b8f05a0d59a0f00", "type": "github" }, "original": { @@ -375,11 +375,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1747744144, - "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", + "lastModified": 1748026106, + "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", + "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", "type": "github" }, "original": { @@ -453,11 +453,11 @@ ] }, "locked": { - "lastModified": 1748054080, - "narHash": "sha256-rwFiLLNCwkj9bqePtH1sMqzs1xmohE0Ojq249piMzF4=", + "lastModified": 1748140821, + "narHash": "sha256-GZcjWLQtDifSYMd1ueLDmuVTcQQdD5mONIBTqABooOk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "2221d8d53c128beb69346fa3ab36da3f19bb1691", + "rev": "476b2ba7dc99ddbf70b1f45357dbbdbdbdfb4422", "type": "github" }, "original": { @@ -524,11 +524,11 @@ ] }, "locked": { - "lastModified": 1748090150, - "narHash": "sha256-WrcGLv4Q94B2eG+jj5EckQfItR4zTAz/8uX2to4bU4g=", + "lastModified": 1748143192, + "narHash": "sha256-KvP468pbSw0c6fXQmd4Q2tp/ywxvxrz5ijRT3odniaw=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "d25f7e7fc5a2ebcb4c41924b4755eec642e6f18d", + "rev": "04d982716fb6c1fc64e0de6e55103b15c892ceda", "type": "github" }, "original": { From 8246b5b88360ef439bcc1d1f47833c4e0efd68f4 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 26 May 2025 18:01:10 -0700 Subject: [PATCH 231/724] update --- flake.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 5abc26a..d5ec906 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ ] }, "locked": { - "lastModified": 1748116304, - "narHash": "sha256-gpO/jh/T/Ygx8ewq0y4LQDKEqvZJ3WiRg3ur8K9KfFg=", + "lastModified": 1748304776, + "narHash": "sha256-Eb+kBcm7ECpJ1HKjMgvZPo9TpGG0CpzfGRUc0FCZKP0=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "54741d5ed1e944d68ff94fb09ce967269156f65e", + "rev": "5278f55d2c2c568db38ed03370606b5e009e34df", "type": "github" }, "original": { @@ -212,11 +212,11 @@ ] }, "locked": { - "lastModified": 1748182899, - "narHash": "sha256-r6MHSalDFydlUmjorVTSsyhLjIt8VWNtGc5+mffXvFQ=", + "lastModified": 1748227609, + "narHash": "sha256-SaSdslyo6UGDpPUlmrPA4dWOEuxCy2ihRN9K6BnqYsA=", "owner": "nix-community", "repo": "home-manager", - "rev": "901f8fef7f349cf8a8e97b3230b22fd592df9160", + "rev": "d23d20f55d49d8818ac1f1b2783671e8a6725022", "type": "github" }, "original": { @@ -288,11 +288,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1748033637, - "narHash": "sha256-TetDbakvubacirX9JTzrZ8FePtT8taVv53sbqY61t38=", + "lastModified": 1748286492, + "narHash": "sha256-14bRczJErvDIyeHlOrdMcqGwW2VPUnyZCbuTFu8L/wE=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "262837d8190629c4af723e35a7f2a3f49d1afb26", + "rev": "88f4c38ccaf73691e738c758f149009d3266d0bd", "type": "github" }, "original": { @@ -321,11 +321,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1748030931, - "narHash": "sha256-34Y9mI/IN9eWZm6v1wQS+TUw1BK9Ed5XBWe8lrVu6RE=", + "lastModified": 1748151941, + "narHash": "sha256-z4viQZLgC2bIJ3VrzQnR+q2F3gAOEQpU1H5xHtX/2fs=", "owner": "YaLTeR", "repo": "niri", - "rev": "a605a3f016769ba2fd7e2147fe05c9ac3707f973", + "rev": "8ba57fcf25d2fc9565131684a839d58703f1dae7", "type": "github" }, "original": { @@ -375,11 +375,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748026106, - "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", + "lastModified": 1748190013, + "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", + "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", "type": "github" }, "original": { @@ -453,11 +453,11 @@ ] }, "locked": { - "lastModified": 1748140821, - "narHash": "sha256-GZcjWLQtDifSYMd1ueLDmuVTcQQdD5mONIBTqABooOk=", + "lastModified": 1748227081, + "narHash": "sha256-RLnN7LBxhEdCJ6+rIL9sbhjBVDaR6jG377M/CLP/fmE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "476b2ba7dc99ddbf70b1f45357dbbdbdbdfb4422", + "rev": "1cbe817fd8c64a9f77ba4d7861a4839b0b15983e", "type": "github" }, "original": { @@ -501,11 +501,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1747111562, - "narHash": "sha256-GAqhWoxaBIk0tgoecZPa8gTHDHxNc0JtlwWHZN2iOOo=", + "lastModified": 1748057133, + "narHash": "sha256-t9XPqehcZYDh4YVDq6w/c/L+MhoE/9MIQSYTQOwMwp8=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "ec9ff64c1e0cbec42710b580b7c0f759b1694e72", + "rev": "572fa4a2bfe920daacdefc7e564b49115413306a", "type": "github" }, "original": { @@ -524,11 +524,11 @@ ] }, "locked": { - "lastModified": 1748143192, - "narHash": "sha256-KvP468pbSw0c6fXQmd4Q2tp/ywxvxrz5ijRT3odniaw=", + "lastModified": 1748229380, + "narHash": "sha256-ulYljT6A8/v9QsMWnTsDYxa1/bG/22Ufy+KfrN4jA74=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "04d982716fb6c1fc64e0de6e55103b15c892ceda", + "rev": "14207b0fc7caba6b6a9c7a9aecf7f901435daa93", "type": "github" }, "original": { From 4c867b3c2e90c8e573782541cbfd7cd1171db64a Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 28 May 2025 19:28:41 -0700 Subject: [PATCH 232/724] update --- flake.lock | 60 +++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index d5ec906..da0d66d 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ ] }, "locked": { - "lastModified": 1748304776, - "narHash": "sha256-Eb+kBcm7ECpJ1HKjMgvZPo9TpGG0CpzfGRUc0FCZKP0=", + "lastModified": 1748469364, + "narHash": "sha256-wdeoMsqFBeemX7yrS9Qhq2Xer3t/90jk3NG6RcSFaNc=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "5278f55d2c2c568db38ed03370606b5e009e34df", + "rev": "fa03e7c19946862f31af67daedfaad359eeb47cf", "type": "github" }, "original": { @@ -119,11 +119,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1747392669, - "narHash": "sha256-zky3+lndxKRu98PAwVK8kXPdg+Q1NVAhaI7YGrboKYA=", + "lastModified": 1748414334, + "narHash": "sha256-pWLq78fWssxiRAvLQZnxKupUogR25u+28XS4lfxMMoE=", "owner": "nix-community", "repo": "fenix", - "rev": "c3c27e603b0d9b5aac8a16236586696338856fbb", + "rev": "1c050d9008ff9e934f8bb5298c902259ea2cb3f7", "type": "github" }, "original": { @@ -212,11 +212,11 @@ ] }, "locked": { - "lastModified": 1748227609, - "narHash": "sha256-SaSdslyo6UGDpPUlmrPA4dWOEuxCy2ihRN9K6BnqYsA=", + "lastModified": 1748455938, + "narHash": "sha256-mQ/iNzPra2WtDQ+x2r5IadcWNr0m3uHvLMzJkXKAG/8=", "owner": "nix-community", "repo": "home-manager", - "rev": "d23d20f55d49d8818ac1f1b2783671e8a6725022", + "rev": "02077149e2921014511dac2729ae6dadb4ec50e2", "type": "github" }, "original": { @@ -234,11 +234,11 @@ ] }, "locked": { - "lastModified": 1747990026, - "narHash": "sha256-sG5VbID+x5+xUC+jjgHibnzg8IllVcH+K2TLmYHLPME=", + "lastModified": 1748411314, + "narHash": "sha256-fvtRp+oHGDLiSQico9+LTAr6Z8CU1AIldLYLQ9mHqjo=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "e2f4ced874406541a7957f7e2b8f05a0d59a0f00", + "rev": "9d69aed9023082af370b71bffdfcd414b6b61593", "type": "github" }, "original": { @@ -288,11 +288,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1748286492, - "narHash": "sha256-14bRczJErvDIyeHlOrdMcqGwW2VPUnyZCbuTFu8L/wE=", + "lastModified": 1748450232, + "narHash": "sha256-6w7klfyLkEaQ9PlE6z3vYPRJWsguL9JsUdU1Bkv6fbs=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "88f4c38ccaf73691e738c758f149009d3266d0bd", + "rev": "8319d7cc74becbce927ab6c1e5b0027d22855c9f", "type": "github" }, "original": { @@ -375,11 +375,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748190013, - "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", + "lastModified": 1748370509, + "narHash": "sha256-QlL8slIgc16W5UaI3w7xHQEP+Qmv/6vSNTpoZrrSlbk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", + "rev": "4faa5f5321320e49a78ae7848582f684d64783e9", "type": "github" }, "original": { @@ -432,11 +432,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1747323949, - "narHash": "sha256-G4NwzhODScKnXqt2mEQtDFOnI0wU3L1WxsiHX3cID/0=", + "lastModified": 1748389118, + "narHash": "sha256-5QJCzMtA2lBFNGou2dbFrGgWXxfL2O92oJoUnqeoNjI=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "f8e784353bde7cbf9a9046285c1caf41ac484ebe", + "rev": "4f7af13637a77ce1dc21e58fcd3f635efbfb43a7", "type": "github" }, "original": { @@ -453,11 +453,11 @@ ] }, "locked": { - "lastModified": 1748227081, - "narHash": "sha256-RLnN7LBxhEdCJ6+rIL9sbhjBVDaR6jG377M/CLP/fmE=", + "lastModified": 1748399823, + "narHash": "sha256-kahD8D5hOXOsGbNdoLLnqCL887cjHkx98Izc37nDjlA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "1cbe817fd8c64a9f77ba4d7861a4839b0b15983e", + "rev": "d68a69dc71bc19beb3479800392112c2f6218159", "type": "github" }, "original": { @@ -501,11 +501,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1748057133, - "narHash": "sha256-t9XPqehcZYDh4YVDq6w/c/L+MhoE/9MIQSYTQOwMwp8=", + "lastModified": 1748396840, + "narHash": "sha256-NPSbIK8dsayXj4RbEwm+fMbnAKrTRRB/qFoWxfkRLDo=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "572fa4a2bfe920daacdefc7e564b49115413306a", + "rev": "76ace3c656c6680e58e53f95baac0ae0fa1178b5", "type": "github" }, "original": { @@ -524,11 +524,11 @@ ] }, "locked": { - "lastModified": 1748229380, - "narHash": "sha256-ulYljT6A8/v9QsMWnTsDYxa1/bG/22Ufy+KfrN4jA74=", + "lastModified": 1748467104, + "narHash": "sha256-EgYaWbzbtYFLZH1/Eni1ZdLgTwYhe8g9m10UPdBMCmY=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "14207b0fc7caba6b6a9c7a9aecf7f901435daa93", + "rev": "68d2b647f845f6679db96468336aba5dfae901fa", "type": "github" }, "original": { From b3af7e9d29d30dffe12afb27a3641788ab53d38a Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 31 May 2025 18:26:33 -0700 Subject: [PATCH 233/724] add wifi password --- etcnixos/secrets/wifi-passwords.nix | Bin 819 -> 887 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/etcnixos/secrets/wifi-passwords.nix b/etcnixos/secrets/wifi-passwords.nix index e4cb3a8cc82664d6eb3b7d2c188ede6c3bd85618..1eab5f41796240d2bfbf029fdfbdec5c1ca50723 100644 GIT binary patch literal 887 zcmZQ@_Y83kiVO&0h}m?!P9@WYM`~79?yJUYKffeJiTKDp7X2K2yMwDHXY+?wt?Rkv z7|hu+Wz4D(3oCibWc$uArwP09^BYvo^w~e>`gDKpoDHF_QmKpOQzO6Y`y1-V9F7!= zzLgZSUm#<{)@^_H264;~JKv}Cf6;@#j!{omazUZTFee_f9^(?T{(rS#QCkFQ3oU zTl<&Gi9hPWf8XE?weQOW<&XbUZgXpzx8C#e*;@}~s^?tt*E$F`OY)=X6PkDnKH-bx<&lQ?x}V1NPF^$ z|4lpadh^-CUN5)IDmcnvBYJ$bP?>ll_mAv=0OL!0!a8f8^vmvFoaAbM#;1cJ<|9*x z`<;0*Pj~x?tyy^X^p@_opAKby3|_)K+w;SlQ!Qt0%X#J15w{cE990tE{KV-Vs}I{8B>2DcRCnbsu``Ub&TpF)y%W6PwN% za7ge|{F+nq%(tt#)ONjFBg3Wp`qXiY`b#O+0r4L#`VO|psm$sQ2`w&-&CpCX>oZ|K z_m*Az=&g#UYhH<7Rn}xV9KmtI`&D-)Q}6kCOP;9ZHf*dr%@X%$fzWw{oqwdAcITaG z;Yedw-LtTc-Jg41k<6o?-bK*APJ3sO*spP|W^Q`()g0$1Tm}2s3!i=XZJ%f?_a%)jTir5!EB95VUcWm`IXNDE E0OO>woB#j- literal 819 zcmZQ@_Y83kiVO&0=s0a?EBBznF5dT!lGc~)QIdD^OqYBWx^kjx-5u5v$B!Sxq^2oo z=-s#+8fRu8q1tD0s&8u4{*TvUzl66Xe*SiCuGzAD$AZ75HP2@$d^OWw_EmZEr)S^) zx3(O4xA4d{_1%xOjTS8{xXQ;o(e44uuHUz|SZkll(d<~2r#~%p_uJnydnMU;GmcL2 z=BPZf>#g+q2j%-}gJ%dI|6IIGQna}4?d-lln>APe-J4Sx@N*Nt9Cy=At;g=F2JhGD z@^1NWz;pFMSbOcqilVLwaZEzH8Y++7n-(W}bT9Y4ZyAN%F-Pva_g$J7HQSsgUi#ju zMmb5NUzho8Z<}$7t`)Fc7$V7OzP=G)qhFPL=IYft>-(YEVI__x?*$Bzjfr;i?a zdntAm%j?+b@?Um^E6+I|Y4d7wMHu_UGm#cY4!eHd?KoGA&uYO}hW=JD_WVZsrsVQi z{+Y)z_@}SkYF=GGU#BOZHTmfysrXHCG21NeN3E-jbq>h6y0>x51LxF`9Gjx@rSG&B z<#c+KuG}4(@OP@*fq6@&DNOOzQVM%5b7gPGr8qacS)REJyVA<#TqANs+-z@0UST|T zf4e>NbFLXwY}jZgPpf( zgYReE+Ed~Drt$+{@j1c0XL!4(dHV*ef1q_z_2l-u%(GwoUT~3N;z@(7$93}U%rhIm zpSHaG(y?kwQ5wgg;sUwqBC1QL`&^{?tZFbd--YpM_X&I ln#pSspi Date: Sat, 31 May 2025 18:26:41 -0700 Subject: [PATCH 234/724] update --- flake.lock | 66 +++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index da0d66d..0291a9b 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ ] }, "locked": { - "lastModified": 1748469364, - "narHash": "sha256-wdeoMsqFBeemX7yrS9Qhq2Xer3t/90jk3NG6RcSFaNc=", + "lastModified": 1748736235, + "narHash": "sha256-/mt3riHxKDWkTXxE65pCkJpJ3DUtwRvSpwBu9yriu4o=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "fa03e7c19946862f31af67daedfaad359eeb47cf", + "rev": "8b8409130d8ca28aa8303f8a5d2286e9bfee118d", "type": "github" }, "original": { @@ -119,11 +119,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1748414334, - "narHash": "sha256-pWLq78fWssxiRAvLQZnxKupUogR25u+28XS4lfxMMoE=", + "lastModified": 1748673500, + "narHash": "sha256-gILKNw2g7eGXt1aVJM0pUdeJQX0z6kXZNoiAJPjXHTo=", "owner": "nix-community", "repo": "fenix", - "rev": "1c050d9008ff9e934f8bb5298c902259ea2cb3f7", + "rev": "4064670e8aeab5353001612efd17b19c7af7fde4", "type": "github" }, "original": { @@ -212,11 +212,11 @@ ] }, "locked": { - "lastModified": 1748455938, - "narHash": "sha256-mQ/iNzPra2WtDQ+x2r5IadcWNr0m3uHvLMzJkXKAG/8=", + "lastModified": 1748737919, + "narHash": "sha256-5kvBbLYdp+n7Ftanjcs6Nv+UO6sBhelp6MIGJ9nWmjQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "02077149e2921014511dac2729ae6dadb4ec50e2", + "rev": "5675a9686851d9626560052a032c4e14e533c1fa", "type": "github" }, "original": { @@ -234,11 +234,11 @@ ] }, "locked": { - "lastModified": 1748411314, - "narHash": "sha256-fvtRp+oHGDLiSQico9+LTAr6Z8CU1AIldLYLQ9mHqjo=", + "lastModified": 1748683484, + "narHash": "sha256-RXiY6t9E9oLEtfdGChHk/OIPqxYg1tu8XLvbPnJlfi4=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "9d69aed9023082af370b71bffdfcd414b6b61593", + "rev": "6f6bd4a27fb01c9dd623a157d769f34561407f47", "type": "github" }, "original": { @@ -288,11 +288,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1748450232, - "narHash": "sha256-6w7klfyLkEaQ9PlE6z3vYPRJWsguL9JsUdU1Bkv6fbs=", + "lastModified": 1748609405, + "narHash": "sha256-tuhbZf+oQ6lvBRN7iySy9ZeY9sMVtlAzQvDBBrvwEsk=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "8319d7cc74becbce927ab6c1e5b0027d22855c9f", + "rev": "73bcebf1ac79a9a31e29ffd08bcd982c7301d8fc", "type": "github" }, "original": { @@ -359,11 +359,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1747900541, - "narHash": "sha256-dn64Pg9xLETjblwZs9Euu/SsjW80pd6lr5qSiyLY1pg=", + "lastModified": 1748634340, + "narHash": "sha256-pZH4bqbOd8S+si6UcfjHovWDiWKiIGRNRMpmRWaDIms=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "11f2d9ea49c3e964315215d6baa73a8d42672f06", + "rev": "daa628a725ab4948e0e2b795e8fb6f4c3e289a7a", "type": "github" }, "original": { @@ -375,11 +375,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748370509, - "narHash": "sha256-QlL8slIgc16W5UaI3w7xHQEP+Qmv/6vSNTpoZrrSlbk=", + "lastModified": 1748460289, + "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4faa5f5321320e49a78ae7848582f684d64783e9", + "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", "type": "github" }, "original": { @@ -432,11 +432,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1748389118, - "narHash": "sha256-5QJCzMtA2lBFNGou2dbFrGgWXxfL2O92oJoUnqeoNjI=", + "lastModified": 1748636115, + "narHash": "sha256-SUkOBIqQmdZK2/CHxkVf/v36JDBlFQl2uckz9gbCLVo=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "4f7af13637a77ce1dc21e58fcd3f635efbfb43a7", + "rev": "987cd076e211a02542d5d82264474bb3325e8e7e", "type": "github" }, "original": { @@ -453,11 +453,11 @@ ] }, "locked": { - "lastModified": 1748399823, - "narHash": "sha256-kahD8D5hOXOsGbNdoLLnqCL887cjHkx98Izc37nDjlA=", + "lastModified": 1748658947, + "narHash": "sha256-F+nGITu6D7RswJlm8qCuU1PCuOSgDeAqaDKWW1n1jmQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "d68a69dc71bc19beb3479800392112c2f6218159", + "rev": "fc82ce758cc5df6a6d5d24e75710321cdbdc787a", "type": "github" }, "original": { @@ -501,11 +501,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1748396840, - "narHash": "sha256-NPSbIK8dsayXj4RbEwm+fMbnAKrTRRB/qFoWxfkRLDo=", + "lastModified": 1748488455, + "narHash": "sha256-IiLr1alzKFIy5tGGpDlabQbe6LV1c9ABvkH6T5WmyRI=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "76ace3c656c6680e58e53f95baac0ae0fa1178b5", + "rev": "3ba30b149f9eb2bbf42cf4758d2158ca8cceef73", "type": "github" }, "original": { @@ -524,11 +524,11 @@ ] }, "locked": { - "lastModified": 1748467104, - "narHash": "sha256-EgYaWbzbtYFLZH1/Eni1ZdLgTwYhe8g9m10UPdBMCmY=", + "lastModified": 1748675871, + "narHash": "sha256-t8kG9ZluGH3DNHtG5M196LdPgJdM2Qb8kgWi0iBKtQ0=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "68d2b647f845f6679db96468336aba5dfae901fa", + "rev": "6205ec7c9c5e1fe8eac7b1af251c97a7cbef7c4e", "type": "github" }, "original": { From daf34cc3540a188be1a6aefcba68a95eda5455e0 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 1 Jun 2025 14:47:52 -0700 Subject: [PATCH 235/724] update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 0291a9b..c3bd689 100644 --- a/flake.lock +++ b/flake.lock @@ -212,11 +212,11 @@ ] }, "locked": { - "lastModified": 1748737919, - "narHash": "sha256-5kvBbLYdp+n7Ftanjcs6Nv+UO6sBhelp6MIGJ9nWmjQ=", + "lastModified": 1748811839, + "narHash": "sha256-MDl6vpEK18ZfPHfoeOa9dGRdwVWNfmCCGazt72nHw+U=", "owner": "nix-community", "repo": "home-manager", - "rev": "5675a9686851d9626560052a032c4e14e533c1fa", + "rev": "6abf27943bbb09a0f9d443df45ec70b07a6cbe20", "type": "github" }, "original": { @@ -288,11 +288,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1748609405, - "narHash": "sha256-tuhbZf+oQ6lvBRN7iySy9ZeY9sMVtlAzQvDBBrvwEsk=", + "lastModified": 1748797644, + "narHash": "sha256-zLkSMDE/4kEK+1q0Ep0fmSO7PJ/3ZxovvYNIA5TuN4I=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "73bcebf1ac79a9a31e29ffd08bcd982c7301d8fc", + "rev": "2036ef9e1bfac9d50d96c0771a412226b6998ba5", "type": "github" }, "original": { @@ -321,11 +321,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1748151941, - "narHash": "sha256-z4viQZLgC2bIJ3VrzQnR+q2F3gAOEQpU1H5xHtX/2fs=", + "lastModified": 1748794937, + "narHash": "sha256-LQfI1BlFm+JeZGjg0MPKdsmyupETu/9HzGmxVd0G4fw=", "owner": "YaLTeR", "repo": "niri", - "rev": "8ba57fcf25d2fc9565131684a839d58703f1dae7", + "rev": "1911cf3f55ac3d9d24c8692434a93214dcbde9ba", "type": "github" }, "original": { @@ -375,11 +375,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748460289, - "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", + "lastModified": 1748693115, + "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", + "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", "type": "github" }, "original": { @@ -453,11 +453,11 @@ ] }, "locked": { - "lastModified": 1748658947, - "narHash": "sha256-F+nGITu6D7RswJlm8qCuU1PCuOSgDeAqaDKWW1n1jmQ=", + "lastModified": 1748746145, + "narHash": "sha256-bwkCAK9pOyI2Ww4Q4oO1Ynv7O9aZPrsIAMMASmhVGp4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "fc82ce758cc5df6a6d5d24e75710321cdbdc787a", + "rev": "12a0d94a2f2b06714f747ab97b2fa546f46b460c", "type": "github" }, "original": { @@ -524,11 +524,11 @@ ] }, "locked": { - "lastModified": 1748675871, - "narHash": "sha256-t8kG9ZluGH3DNHtG5M196LdPgJdM2Qb8kgWi0iBKtQ0=", + "lastModified": 1748809245, + "narHash": "sha256-2e6otgBmkNZdDsump0gIR7Q3efHdHlhi8mOR+J3OUQI=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "6205ec7c9c5e1fe8eac7b1af251c97a7cbef7c4e", + "rev": "9bb61a99d7d7d4e4e1bd75b281f91873b38fb7d7", "type": "github" }, "original": { From cd44c3e71ca66f6cd060b83d6f0d56a924d6334a Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 3 Jun 2025 23:29:10 -0700 Subject: [PATCH 236/724] disable secureboot --- etcnixos/system-mreow.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/etcnixos/system-mreow.nix b/etcnixos/system-mreow.nix index 87da6e4..d839fa7 100644 --- a/etcnixos/system-mreow.nix +++ b/etcnixos/system-mreow.nix @@ -56,7 +56,7 @@ boot = { lanzaboote = { - enable = true; + enable = false; # TODO: proper secrets management so this is not stored in nix store pkiBundle = "/var/lib/sbctl"; }; @@ -69,7 +69,8 @@ generated at installation time. So we force it to false for now. */ - systemd-boot.enable = lib.mkForce false; + # systemd-boot.enable = lib.mkForce false; + systemd-boot.enable = true; }; }; From dd35088f68ec14ed9aadbf6fdc36b72fdd4c7e3b Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 4 Jun 2025 21:07:39 -0700 Subject: [PATCH 237/724] update --- flake.lock | 90 +++++++++++++++++++++++++++--------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/flake.lock b/flake.lock index c3bd689..1955245 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ ] }, "locked": { - "lastModified": 1748736235, - "narHash": "sha256-/mt3riHxKDWkTXxE65pCkJpJ3DUtwRvSpwBu9yriu4o=", + "lastModified": 1749037647, + "narHash": "sha256-eCYFdO4sr+SXfHHFzDqcjpQTcWudsMmq0Lg5iBKA2Ec=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "8b8409130d8ca28aa8303f8a5d2286e9bfee118d", + "rev": "dcc72d01c5a8a4ea2768b13b2f57794ced9d2525", "type": "github" }, "original": { @@ -54,11 +54,11 @@ }, "crane": { "locked": { - "lastModified": 1746291859, - "narHash": "sha256-DdWJLA+D5tcmrRSg5Y7tp/qWaD05ATI4Z7h22gd1h7Q=", + "lastModified": 1748047550, + "narHash": "sha256-t0qLLqb4C1rdtiY8IFRH5KIapTY/n3Lqt57AmxEv9mk=", "owner": "ipetkov", "repo": "crane", - "rev": "dfd9a8dfd09db9aad544c4d3b6c47b12562544a5", + "rev": "b718a78696060df6280196a6f992d04c87a16aef", "type": "github" }, "original": { @@ -119,11 +119,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1748673500, - "narHash": "sha256-gILKNw2g7eGXt1aVJM0pUdeJQX0z6kXZNoiAJPjXHTo=", + "lastModified": 1748932954, + "narHash": "sha256-1HiKieYFvFi5Hw3x2/mptbbvAuL0QwlZQC9UIGNNb1w=", "owner": "nix-community", "repo": "fenix", - "rev": "4064670e8aeab5353001612efd17b19c7af7fde4", + "rev": "2da33335e40ca932b4c5ea632816eed573736fba", "type": "github" }, "original": { @@ -135,11 +135,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -212,11 +212,11 @@ ] }, "locked": { - "lastModified": 1748811839, - "narHash": "sha256-MDl6vpEK18ZfPHfoeOa9dGRdwVWNfmCCGazt72nHw+U=", + "lastModified": 1749062139, + "narHash": "sha256-gGGLujmeWU+ZjFzfMvFMI0hp9xONsSbm88187wJr82Q=", "owner": "nix-community", "repo": "home-manager", - "rev": "6abf27943bbb09a0f9d443df45ec70b07a6cbe20", + "rev": "86b95fc1ed2b9b04a451a08ccf13d78fb421859c", "type": "github" }, "original": { @@ -234,11 +234,11 @@ ] }, "locked": { - "lastModified": 1748683484, - "narHash": "sha256-RXiY6t9E9oLEtfdGChHk/OIPqxYg1tu8XLvbPnJlfi4=", + "lastModified": 1748977211, + "narHash": "sha256-VtL9IxQKMsGMD0jDoMMVeZLTxrPFt36MW43nkeXf1RM=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "6f6bd4a27fb01c9dd623a157d769f34561407f47", + "rev": "4989543da0defdedce08b14945ec5d2f6e22abb8", "type": "github" }, "original": { @@ -261,11 +261,11 @@ ] }, "locked": { - "lastModified": 1747056319, - "narHash": "sha256-qSKcBaISBozadtPq6BomnD+wIYTZIkiua3UuHLaD52c=", + "lastModified": 1748959397, + "narHash": "sha256-hq+njWbMLAfQIFEP+8G/7xLz1ZELWC+780332FdpnW0=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "2e425f3da6ce7f5b34fa6eaf7a2a7f78dbabcc85", + "rev": "20721e48123f1f900b323a76349130080a2f8343", "type": "github" }, "original": { @@ -288,11 +288,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1748797644, - "narHash": "sha256-zLkSMDE/4kEK+1q0Ep0fmSO7PJ/3ZxovvYNIA5TuN4I=", + "lastModified": 1749055061, + "narHash": "sha256-4v/hKWTe35MZKgd/VusNlQjja9rIYDbp5rjfmeIT29c=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "2036ef9e1bfac9d50d96c0771a412226b6998ba5", + "rev": "e051966486be79c5843af95defd70813ae5c97a6", "type": "github" }, "original": { @@ -321,11 +321,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1748794937, - "narHash": "sha256-LQfI1BlFm+JeZGjg0MPKdsmyupETu/9HzGmxVd0G4fw=", + "lastModified": 1749019222, + "narHash": "sha256-Zz2QkGVkK75iAaOBTT5+ILCg/l2HhrxzPJMd7Jr/O28=", "owner": "YaLTeR", "repo": "niri", - "rev": "1911cf3f55ac3d9d24c8692434a93214dcbde9ba", + "rev": "9858599ac12ab9592c08e062b2301e7c24429c81", "type": "github" }, "original": { @@ -359,11 +359,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1748634340, - "narHash": "sha256-pZH4bqbOd8S+si6UcfjHovWDiWKiIGRNRMpmRWaDIms=", + "lastModified": 1749056381, + "narHash": "sha256-QITcurR19KZlrCngBoCjsFF2BdYsiCG4UqmlrVcLb8Q=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "daa628a725ab4948e0e2b795e8fb6f4c3e289a7a", + "rev": "029bd66faa180e11262dd1bc2732254c33415f52", "type": "github" }, "original": { @@ -375,11 +375,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748693115, - "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", + "lastModified": 1748929857, + "narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", + "rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4", "type": "github" }, "original": { @@ -402,11 +402,11 @@ ] }, "locked": { - "lastModified": 1746537231, - "narHash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=", + "lastModified": 1747372754, + "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "fa466640195d38ec97cf0493d6d6882bc4d14969", + "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", "type": "github" }, "original": { @@ -432,11 +432,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1748636115, - "narHash": "sha256-SUkOBIqQmdZK2/CHxkVf/v36JDBlFQl2uckz9gbCLVo=", + "lastModified": 1748871544, + "narHash": "sha256-7V/sV6JiEp8LFmGIG3OqFDU2YNHgmodg1qNKGYXZKIY=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "987cd076e211a02542d5d82264474bb3325e8e7e", + "rev": "25808c1ba14627876c9a031a67f404ac1927887d", "type": "github" }, "original": { @@ -453,11 +453,11 @@ ] }, "locked": { - "lastModified": 1748746145, - "narHash": "sha256-bwkCAK9pOyI2Ww4Q4oO1Ynv7O9aZPrsIAMMASmhVGp4=", + "lastModified": 1749091064, + "narHash": "sha256-TGtYjzRX0sueFhwYsnNNFF5TTKnpnloznpIghLzxeXo=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "12a0d94a2f2b06714f747ab97b2fa546f46b460c", + "rev": "12419593ce78f2e8e1e89a373c6515885e218acb", "type": "github" }, "original": { @@ -524,11 +524,11 @@ ] }, "locked": { - "lastModified": 1748809245, - "narHash": "sha256-2e6otgBmkNZdDsump0gIR7Q3efHdHlhi8mOR+J3OUQI=", + "lastModified": 1749093358, + "narHash": "sha256-Clx1BzHsSSzIXbnCW9KM3m5gW3SFgemcW9/4XH4epeM=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "9bb61a99d7d7d4e4e1bd75b281f91873b38fb7d7", + "rev": "d4cf0ac2e860be17036a376ae99b233a115826bc", "type": "github" }, "original": { From 61e44e3ddb9cb078564a33efb6d078b8efe84d5f Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 4 Jun 2025 21:08:01 -0700 Subject: [PATCH 238/724] Revert "disable secureboot" This reverts commit c017cfb33dc70e564fd805958dafd4730aa1ad78. --- etcnixos/system-mreow.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/etcnixos/system-mreow.nix b/etcnixos/system-mreow.nix index d839fa7..87da6e4 100644 --- a/etcnixos/system-mreow.nix +++ b/etcnixos/system-mreow.nix @@ -56,7 +56,7 @@ boot = { lanzaboote = { - enable = false; + enable = true; # TODO: proper secrets management so this is not stored in nix store pkiBundle = "/var/lib/sbctl"; }; @@ -69,8 +69,7 @@ generated at installation time. So we force it to false for now. */ - # systemd-boot.enable = lib.mkForce false; - systemd-boot.enable = true; + systemd-boot.enable = lib.mkForce false; }; }; From 64d29a2416213d2adb0a917484e54d273edc8b42 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 5 Jun 2025 19:15:05 -0700 Subject: [PATCH 239/724] make deploy script better --- deploy.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/deploy.sh b/deploy.sh index 42c1fbf..c90a1c3 100755 --- a/deploy.sh +++ b/deploy.sh @@ -1,3 +1,8 @@ #!/bin/sh -nixos-rebuild boot --flake . --use-remote-sudo +ARG="$@" +if [ "$ARG" == "" ]; then + ARG="boot" +fi + +nixos-rebuild $ARG --flake . --use-remote-sudo From da60b54839e7bed6007ac89be6af2b7c45f9b1de Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 5 Jun 2025 19:22:39 -0700 Subject: [PATCH 240/724] beginning of emacs --- flake.lock | 24 ++++++++++++++++++++++++ flake.nix | 6 ++++++ home-manager/no-gui.nix | 23 ++++++++++++++++++++--- home-manager/progs/fish.nix | 1 + 4 files changed, 51 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 1955245..c2097c8 100644 --- a/flake.lock +++ b/flake.lock @@ -110,6 +110,29 @@ "type": "github" } }, + "emacs-overlay": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-stable": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1749173328, + "narHash": "sha256-f7rMoP369fUDu9WlI1v+Q3SivvXmL2IcNPdn+g9yaTc=", + "owner": "nix-community", + "repo": "emacs-overlay", + "rev": "4057e1fcd998c653be0db421a3fb268e28d17d8f", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "emacs-overlay", + "type": "github" + } + }, "fenix": { "inputs": { "nixpkgs": [ @@ -420,6 +443,7 @@ "agenix": "agenix", "chaotic": "chaotic", "disko": "disko", + "emacs-overlay": "emacs-overlay", "home-manager": "home-manager", "lanzaboote": "lanzaboote", "niri": "niri", diff --git a/flake.nix b/flake.nix index 5f9457c..1324c5a 100644 --- a/flake.nix +++ b/flake.nix @@ -50,6 +50,12 @@ 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"; + }; }; outputs = diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 3363777..1cd0697 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -44,6 +44,18 @@ let typescript-language-server # typescript lsp cmake-language-server # cmake lsp ]; + + + # Praise be to the church of emacs + emacs_stuff = with pkgs; [ + emacs-unstable + + # shell check things + shellcheck + + # for search + fd + ]; in { imports = [ @@ -55,13 +67,13 @@ in { nixpkgs.overlays = [ inputs.rust-overlay.overlays.default + inputs.emacs-overlay.overlays.default ]; } ) ]; - home.stateVersion = "24.11"; - home.enableNixpkgsReleaseCheck = false; + home.stateVersion = "25.11"; home.packages = with pkgs; @@ -97,6 +109,10 @@ in ripgrep # grep, but written in rust, respects .gitignore, and very very fast, command is `rg` lurk # better strace + + # alternative to `find` + fd + # adds `sensors` command lm_sensors @@ -188,7 +204,8 @@ in jasmin ] ++ rust_pkgs - ++ lsps; + ++ lsps + ++ emacs_stuff; # https://github.com/flamegraph-rs/flamegraph home.file.".cargo/config.toml".text = '' diff --git a/home-manager/progs/fish.nix b/home-manager/progs/fish.nix index 6df7a0b..bd3ad1c 100644 --- a/home-manager/progs/fish.nix +++ b/home-manager/progs/fish.nix @@ -49,6 +49,7 @@ in 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 From 9e0adad2fc43fc7b4f7787334ba3dd3a78d1d349 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 5 Jun 2025 21:27:41 -0700 Subject: [PATCH 241/724] improve deploy script --- deploy.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deploy.sh b/deploy.sh index c90a1c3..76a0e9a 100755 --- a/deploy.sh +++ b/deploy.sh @@ -1,8 +1,8 @@ #!/bin/sh -ARG="$@" -if [ "$ARG" == "" ]; then +ARG="$*" +if [ "$ARG" = "" ]; then ARG="boot" fi -nixos-rebuild $ARG --flake . --use-remote-sudo +nixos-rebuild "$ARG" --flake . --use-remote-sudo From 24f174c30ddcb546eff1f4036bb97db5d474f3cc Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 5 Jun 2025 21:27:52 -0700 Subject: [PATCH 242/724] fix emacs --- home-manager/no-gui.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 1cd0697..8f8c4f0 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -48,7 +48,7 @@ let # Praise be to the church of emacs emacs_stuff = with pkgs; [ - emacs-unstable + emacs-unstable-pgtk # shell check things shellcheck From 9d9cf7df6e8b4bf4568b9bdbabde12919123e1cd Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 7 Jun 2025 21:13:02 -0700 Subject: [PATCH 243/724] update --- flake.lock | 78 +++++++++++++++++++++++++++--------------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/flake.lock b/flake.lock index c2097c8..1e315a3 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ ] }, "locked": { - "lastModified": 1749037647, - "narHash": "sha256-eCYFdO4sr+SXfHHFzDqcjpQTcWudsMmq0Lg5iBKA2Ec=", + "lastModified": 1749319758, + "narHash": "sha256-vjB3/Sk1+gH7E4fjmYLo5+KZFvFeR2X/13mZwvwp2ds=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "dcc72d01c5a8a4ea2768b13b2f57794ced9d2525", + "rev": "11addac79e748c4517b6508c09038d82e2df04a5", "type": "github" }, "original": { @@ -120,11 +120,11 @@ ] }, "locked": { - "lastModified": 1749173328, - "narHash": "sha256-f7rMoP369fUDu9WlI1v+Q3SivvXmL2IcNPdn+g9yaTc=", + "lastModified": 1749350261, + "narHash": "sha256-0klpZdOcXEDgTD1y4ipXLOrGfiBGEeKbjrKh0h1KmXc=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "4057e1fcd998c653be0db421a3fb268e28d17d8f", + "rev": "d084c3caceadedc53585bc24897fd2360bd85405", "type": "github" }, "original": { @@ -142,11 +142,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1748932954, - "narHash": "sha256-1HiKieYFvFi5Hw3x2/mptbbvAuL0QwlZQC9UIGNNb1w=", + "lastModified": 1749278330, + "narHash": "sha256-8NKf1rHaKg+7MRoj7hhPlS048upmpwSXsUx2+6phePI=", "owner": "nix-community", "repo": "fenix", - "rev": "2da33335e40ca932b4c5ea632816eed573736fba", + "rev": "68e191fa1f76ab42d3eb7195844eab261e412e2e", "type": "github" }, "original": { @@ -235,11 +235,11 @@ ] }, "locked": { - "lastModified": 1749062139, - "narHash": "sha256-gGGLujmeWU+ZjFzfMvFMI0hp9xONsSbm88187wJr82Q=", + "lastModified": 1749243446, + "narHash": "sha256-P1gumhZN5N9q+39ndePHYrtwOwY1cGx+VoXGl+vTm7A=", "owner": "nix-community", "repo": "home-manager", - "rev": "86b95fc1ed2b9b04a451a08ccf13d78fb421859c", + "rev": "2d7d65f65b61fdfce23278e59ca266ddd0ef0a36", "type": "github" }, "original": { @@ -257,11 +257,11 @@ ] }, "locked": { - "lastModified": 1748977211, - "narHash": "sha256-VtL9IxQKMsGMD0jDoMMVeZLTxrPFt36MW43nkeXf1RM=", + "lastModified": 1749312278, + "narHash": "sha256-iafbTiQGNlylMR/ivKRlDudHiu5891rVmRj/WjFcRKE=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "4989543da0defdedce08b14945ec5d2f6e22abb8", + "rev": "8b0b76f13c875f1f31632fd5fbaee8a093421455", "type": "github" }, "original": { @@ -311,11 +311,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1749055061, - "narHash": "sha256-4v/hKWTe35MZKgd/VusNlQjja9rIYDbp5rjfmeIT29c=", + "lastModified": 1749330287, + "narHash": "sha256-5ThmjfgLhJRohYijQdl4kPVNdpxX7Ap5WE265Z6ESYI=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "e051966486be79c5843af95defd70813ae5c97a6", + "rev": "a9cb688b4b4ec9b1e22f02eaabcaa41eb27eedbf", "type": "github" }, "original": { @@ -344,11 +344,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1749019222, - "narHash": "sha256-Zz2QkGVkK75iAaOBTT5+ILCg/l2HhrxzPJMd7Jr/O28=", + "lastModified": 1749327170, + "narHash": "sha256-mBrxeWd7L8oAIh6G2PgKuZAzqyZMyjBpHEAcSSTbhJg=", "owner": "YaLTeR", "repo": "niri", - "rev": "9858599ac12ab9592c08e062b2301e7c24429c81", + "rev": "f918eabe6a144e78c62c3fc0cfa7fe32e4623e5a", "type": "github" }, "original": { @@ -382,11 +382,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1749056381, - "narHash": "sha256-QITcurR19KZlrCngBoCjsFF2BdYsiCG4UqmlrVcLb8Q=", + "lastModified": 1749195551, + "narHash": "sha256-W5GKQHgunda/OP9sbKENBZhMBDNu2QahoIPwnsF6CeM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "029bd66faa180e11262dd1bc2732254c33415f52", + "rev": "4602f7e1d3f197b3cb540d5accf5669121629628", "type": "github" }, "original": { @@ -398,11 +398,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748929857, - "narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=", + "lastModified": 1749143949, + "narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4", + "rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d", "type": "github" }, "original": { @@ -456,11 +456,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1748871544, - "narHash": "sha256-7V/sV6JiEp8LFmGIG3OqFDU2YNHgmodg1qNKGYXZKIY=", + "lastModified": 1749194353, + "narHash": "sha256-i6nNh8It11J9afo8QAR1Vwk4qKz/byIc5yq0rU3SW7M=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "25808c1ba14627876c9a031a67f404ac1927887d", + "rev": "6acff6c1f8306a0a1d29be8fd1ffa63cff1ad598", "type": "github" }, "original": { @@ -477,11 +477,11 @@ ] }, "locked": { - "lastModified": 1749091064, - "narHash": "sha256-TGtYjzRX0sueFhwYsnNNFF5TTKnpnloznpIghLzxeXo=", + "lastModified": 1749350575, + "narHash": "sha256-ltLegOYrp69v/7BXlNfSwUPrt2DvF7N668pV4a6rWRA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "12419593ce78f2e8e1e89a373c6515885e218acb", + "rev": "24d5806474b0779d373f381f00d75ad51fd45099", "type": "github" }, "original": { @@ -525,11 +525,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1748488455, - "narHash": "sha256-IiLr1alzKFIy5tGGpDlabQbe6LV1c9ABvkH6T5WmyRI=", + "lastModified": 1749315541, + "narHash": "sha256-bEik1BfVOFnWvtOrcOHluos/edJ8f+G2y1QySbt/0Ak=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "3ba30b149f9eb2bbf42cf4758d2158ca8cceef73", + "rev": "da2ecb5be816de35e2efe23a408a1c49fe8b11ba", "type": "github" }, "original": { @@ -548,11 +548,11 @@ ] }, "locked": { - "lastModified": 1749093358, - "narHash": "sha256-Clx1BzHsSSzIXbnCW9KM3m5gW3SFgemcW9/4XH4epeM=", + "lastModified": 1749352110, + "narHash": "sha256-bO0PBvDRANi/sUU4CF1IUsQoj/X/CHHwxrwQiTnqdX4=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "d4cf0ac2e860be17036a376ae99b233a115826bc", + "rev": "439ac110a99980bc858c9145e7d69d98e270db81", "type": "github" }, "original": { From 88dc3077b7f4655e5c3891231de6532f3bfb52bb Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 8 Jun 2025 11:25:35 -0700 Subject: [PATCH 244/724] update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 1e315a3..aa24a56 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ ] }, "locked": { - "lastModified": 1749319758, - "narHash": "sha256-vjB3/Sk1+gH7E4fjmYLo5+KZFvFeR2X/13mZwvwp2ds=", + "lastModified": 1749396613, + "narHash": "sha256-6lo0IA5ogP9gzNPmsPgOpQNZviMWpwWXyCUYr0j1eFg=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "11addac79e748c4517b6508c09038d82e2df04a5", + "rev": "d2ce0d88a83c583aaf8c25adffd6bdb22389ca4d", "type": "github" }, "original": { @@ -120,11 +120,11 @@ ] }, "locked": { - "lastModified": 1749350261, - "narHash": "sha256-0klpZdOcXEDgTD1y4ipXLOrGfiBGEeKbjrKh0h1KmXc=", + "lastModified": 1749403155, + "narHash": "sha256-NDtAmu/670yRr1z0kXIi2WHe32uEGlMoP5rhFLnBzXE=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "d084c3caceadedc53585bc24897fd2360bd85405", + "rev": "f9a3bc6f0b0a8416df4602e7583aecca8d8cca57", "type": "github" }, "original": { @@ -235,11 +235,11 @@ ] }, "locked": { - "lastModified": 1749243446, - "narHash": "sha256-P1gumhZN5N9q+39ndePHYrtwOwY1cGx+VoXGl+vTm7A=", + "lastModified": 1749400020, + "narHash": "sha256-0nTmHO8AYgRYk5v6zw5oZ3x9nh+feb+Isn7WNe318M0=", "owner": "nix-community", "repo": "home-manager", - "rev": "2d7d65f65b61fdfce23278e59ca266ddd0ef0a36", + "rev": "2835e8ba0ad99ba86d4a5e497a962ec9fa35e48f", "type": "github" }, "original": { @@ -311,11 +311,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1749330287, - "narHash": "sha256-5ThmjfgLhJRohYijQdl4kPVNdpxX7Ap5WE265Z6ESYI=", + "lastModified": 1749396815, + "narHash": "sha256-vwr2vLETE4CSi4c6SFoQyP+uBUnvwPPQmn+1D1207ts=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "a9cb688b4b4ec9b1e22f02eaabcaa41eb27eedbf", + "rev": "e6db401ff0aa3b03507b4819f9a44deab3cfcf2f", "type": "github" }, "original": { @@ -398,11 +398,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1749143949, - "narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=", + "lastModified": 1749285348, + "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d", + "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f", "type": "github" }, "original": { @@ -548,11 +548,11 @@ ] }, "locked": { - "lastModified": 1749352110, - "narHash": "sha256-bO0PBvDRANi/sUU4CF1IUsQoj/X/CHHwxrwQiTnqdX4=", + "lastModified": 1749401856, + "narHash": "sha256-z7MJ2+kkfhYhunjhojMiayHBlwy50eAcUskVWcRd45U=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "439ac110a99980bc858c9145e7d69d98e270db81", + "rev": "b0ce6a736d2102ab8ad2ff1b8344fb0d9b031e0b", "type": "github" }, "original": { From 2c8714b003385c4d18109821d09547d5aaf94245 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 8 Jun 2025 11:32:33 -0700 Subject: [PATCH 245/724] disable vm stuff --- etcnixos/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etcnixos/common.nix b/etcnixos/common.nix index 244006e..78258cc 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -12,7 +12,7 @@ imports = [ ./declarative-nm.nix ./distrobox.nix - ./vm.nix + # ./vm.nix ./steam.nix ./networking.nix From 0f9f39bd89b4f4b0c8b9fdfc0b1415f2395388b2 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 9 Jun 2025 18:43:50 -0700 Subject: [PATCH 246/724] update --- flake.lock | 60 +++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index aa24a56..e029713 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ ] }, "locked": { - "lastModified": 1749396613, - "narHash": "sha256-6lo0IA5ogP9gzNPmsPgOpQNZviMWpwWXyCUYr0j1eFg=", + "lastModified": 1749412641, + "narHash": "sha256-1ftxNhm7bmqv3TDVYmn+DQIBHNJmDBgIHqIqCaPBcpk=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "d2ce0d88a83c583aaf8c25adffd6bdb22389ca4d", + "rev": "aa46f16e8aafe8903d59fcd71e9c0786d31de861", "type": "github" }, "original": { @@ -54,11 +54,11 @@ }, "crane": { "locked": { - "lastModified": 1748047550, - "narHash": "sha256-t0qLLqb4C1rdtiY8IFRH5KIapTY/n3Lqt57AmxEv9mk=", + "lastModified": 1748970125, + "narHash": "sha256-UDyigbDGv8fvs9aS95yzFfOKkEjx1LO3PL3DsKopohA=", "owner": "ipetkov", "repo": "crane", - "rev": "b718a78696060df6280196a6f992d04c87a16aef", + "rev": "323b5746d89e04b22554b061522dfce9e4c49b18", "type": "github" }, "original": { @@ -120,11 +120,11 @@ ] }, "locked": { - "lastModified": 1749403155, - "narHash": "sha256-NDtAmu/670yRr1z0kXIi2WHe32uEGlMoP5rhFLnBzXE=", + "lastModified": 1749519002, + "narHash": "sha256-zsGhU9yWpjvrBrIUD02cbY8gHUtEGZTV3zLF4LCS+zg=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "f9a3bc6f0b0a8416df4602e7583aecca8d8cca57", + "rev": "5d2ccbcaf1b8109665e7b990dc176e73ad174720", "type": "github" }, "original": { @@ -179,11 +179,11 @@ ] }, "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", + "lastModified": 1749398372, + "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", + "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", "type": "github" }, "original": { @@ -235,11 +235,11 @@ ] }, "locked": { - "lastModified": 1749400020, - "narHash": "sha256-0nTmHO8AYgRYk5v6zw5oZ3x9nh+feb+Isn7WNe318M0=", + "lastModified": 1749499854, + "narHash": "sha256-V1BgwiX8NjbRreU6LC2EzmuqFSQAHhoSeNlYJyZ40NE=", "owner": "nix-community", "repo": "home-manager", - "rev": "2835e8ba0ad99ba86d4a5e497a962ec9fa35e48f", + "rev": "1df816c407d3a5090c8496c9b00170af7891f021", "type": "github" }, "original": { @@ -284,11 +284,11 @@ ] }, "locked": { - "lastModified": 1748959397, - "narHash": "sha256-hq+njWbMLAfQIFEP+8G/7xLz1ZELWC+780332FdpnW0=", + "lastModified": 1749471908, + "narHash": "sha256-uGfPqd43KTomeIVWUzHu3hGLWFsqYibhWLt2OaRic28=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "20721e48123f1f900b323a76349130080a2f8343", + "rev": "00292388ad3b497763b81568d6ee5e1c4a2bcf85", "type": "github" }, "original": { @@ -311,11 +311,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1749396815, - "narHash": "sha256-vwr2vLETE4CSi4c6SFoQyP+uBUnvwPPQmn+1D1207ts=", + "lastModified": 1749478554, + "narHash": "sha256-ep6DBG85rkHjsn383gtyVS0PS2fgJI2j08VhuJPF56k=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "e6db401ff0aa3b03507b4819f9a44deab3cfcf2f", + "rev": "f0ac1f6b77f845e2a23a686b4db1264e1e903e9a", "type": "github" }, "original": { @@ -344,11 +344,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1749327170, - "narHash": "sha256-mBrxeWd7L8oAIh6G2PgKuZAzqyZMyjBpHEAcSSTbhJg=", + "lastModified": 1749474820, + "narHash": "sha256-hf5eCZ0bbqwOKPvPKn8Rutwj+xs3GhAfB0AjGa8tIEM=", "owner": "YaLTeR", "repo": "niri", - "rev": "f918eabe6a144e78c62c3fc0cfa7fe32e4623e5a", + "rev": "a18d24fc24d8b17242e336ccf39fcbe91e8161fd", "type": "github" }, "original": { @@ -477,11 +477,11 @@ ] }, "locked": { - "lastModified": 1749350575, - "narHash": "sha256-ltLegOYrp69v/7BXlNfSwUPrt2DvF7N668pV4a6rWRA=", + "lastModified": 1749436897, + "narHash": "sha256-OkDtaCGQQVwVFz5HWfbmrMJR99sFIMXHCHEYXzUJEJY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "24d5806474b0779d373f381f00d75ad51fd45099", + "rev": "e7876c387e35dc834838aff254d8e74cf5bd4f19", "type": "github" }, "original": { @@ -548,11 +548,11 @@ ] }, "locked": { - "lastModified": 1749401856, - "narHash": "sha256-z7MJ2+kkfhYhunjhojMiayHBlwy50eAcUskVWcRd45U=", + "lastModified": 1749511163, + "narHash": "sha256-0NpDb30Wf1wBeMHQP4N6mUVIq+tNujNX9hplZSvXWKE=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "b0ce6a736d2102ab8ad2ff1b8344fb0d9b031e0b", + "rev": "4cbc88072f1597e1757ec82fefaacc02f49c6c98", "type": "github" }, "original": { From a65dba07914632b146bd8895e29e9f5629e14103 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 9 Jun 2025 20:32:28 -0700 Subject: [PATCH 247/724] update --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index e029713..44d5ca7 100644 --- a/flake.lock +++ b/flake.lock @@ -120,11 +120,11 @@ ] }, "locked": { - "lastModified": 1749519002, - "narHash": "sha256-zsGhU9yWpjvrBrIUD02cbY8gHUtEGZTV3zLF4LCS+zg=", + "lastModified": 1749521434, + "narHash": "sha256-iYuO2A6EeCk3yt7i+u5BbKpYUKBWZrWwEvyMzx7JL8o=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "5d2ccbcaf1b8109665e7b990dc176e73ad174720", + "rev": "a1fc4a1252cf8f730d39a6570d36b9b95b478cd5", "type": "github" }, "original": { @@ -235,11 +235,11 @@ ] }, "locked": { - "lastModified": 1749499854, - "narHash": "sha256-V1BgwiX8NjbRreU6LC2EzmuqFSQAHhoSeNlYJyZ40NE=", + "lastModified": 1749526227, + "narHash": "sha256-djUEgLQNnOA2SEClYFvBr9tJfMcQajuaU186tpPIYU4=", "owner": "nix-community", "repo": "home-manager", - "rev": "1df816c407d3a5090c8496c9b00170af7891f021", + "rev": "e9763eb195c1e3d508892993cf112bd75d6fd712", "type": "github" }, "original": { @@ -311,11 +311,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1749478554, - "narHash": "sha256-ep6DBG85rkHjsn383gtyVS0PS2fgJI2j08VhuJPF56k=", + "lastModified": 1749525718, + "narHash": "sha256-n4qouY1cHRvXxsYVPgoULEnUfCemuxjl37grfNsImII=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "f0ac1f6b77f845e2a23a686b4db1264e1e903e9a", + "rev": "9c6c994cad6c5d5079d0affa570beeab22648f03", "type": "github" }, "original": { @@ -477,11 +477,11 @@ ] }, "locked": { - "lastModified": 1749436897, - "narHash": "sha256-OkDtaCGQQVwVFz5HWfbmrMJR99sFIMXHCHEYXzUJEJY=", + "lastModified": 1749523120, + "narHash": "sha256-lEhEK8qE8xto2Wnj4f7R+VRSg7M6tgTTkJVTZ2QxXOI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "e7876c387e35dc834838aff254d8e74cf5bd4f19", + "rev": "d0727dbab79c5a28289f3c03e4fac7d5b95bafb3", "type": "github" }, "original": { From 822412355a22a25d595dbb57409e8ab79b2a5e4e Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 11 Jun 2025 15:26:04 -0700 Subject: [PATCH 248/724] update --- flake.lock | 60 ++++++++++++++++++------------------ home-manager/gui.nix | 1 + home-manager/no-gui.nix | 15 +-------- home-manager/progs/emacs.nix | 16 ++++++++++ home-manager/progs/niri.nix | 1 - 5 files changed, 48 insertions(+), 45 deletions(-) create mode 100644 home-manager/progs/emacs.nix diff --git a/flake.lock b/flake.lock index 44d5ca7..ec6caf2 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ ] }, "locked": { - "lastModified": 1749412641, - "narHash": "sha256-1ftxNhm7bmqv3TDVYmn+DQIBHNJmDBgIHqIqCaPBcpk=", + "lastModified": 1749650702, + "narHash": "sha256-4ip/dnDf8vofZoW0Pi2MwwwWTNG4d8IMvTj/BV6H740=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "aa46f16e8aafe8903d59fcd71e9c0786d31de861", + "rev": "cfe6d82c1c57685d12792a752dd7d28450b300c5", "type": "github" }, "original": { @@ -120,11 +120,11 @@ ] }, "locked": { - "lastModified": 1749521434, - "narHash": "sha256-iYuO2A6EeCk3yt7i+u5BbKpYUKBWZrWwEvyMzx7JL8o=", + "lastModified": 1749662391, + "narHash": "sha256-Adk/3i35uhGcr8XipH5synkXjtj+RDDy3RBZqjq+gvQ=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "a1fc4a1252cf8f730d39a6570d36b9b95b478cd5", + "rev": "f2bb2b16cb85b5e54bfa62a92daa674c7b906ca7", "type": "github" }, "original": { @@ -142,11 +142,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1749278330, - "narHash": "sha256-8NKf1rHaKg+7MRoj7hhPlS048upmpwSXsUx2+6phePI=", + "lastModified": 1749451322, + "narHash": "sha256-t53R3kSDl4Jie+Ooxi/aQFN2ODRp1tXQSJBevOt3IkQ=", "owner": "nix-community", "repo": "fenix", - "rev": "68e191fa1f76ab42d3eb7195844eab261e412e2e", + "rev": "77de5067629e201436c76f14f96614a19368c4ae", "type": "github" }, "original": { @@ -235,11 +235,11 @@ ] }, "locked": { - "lastModified": 1749526227, - "narHash": "sha256-djUEgLQNnOA2SEClYFvBr9tJfMcQajuaU186tpPIYU4=", + "lastModified": 1749657191, + "narHash": "sha256-QLilaHuhGxiwhgceDWESj9gFcKIdEp7+9lRqNGpN8S4=", "owner": "nix-community", "repo": "home-manager", - "rev": "e9763eb195c1e3d508892993cf112bd75d6fd712", + "rev": "faeab32528a9360e9577ff4082de2d35c6bbe1ce", "type": "github" }, "original": { @@ -257,11 +257,11 @@ ] }, "locked": { - "lastModified": 1749312278, - "narHash": "sha256-iafbTiQGNlylMR/ivKRlDudHiu5891rVmRj/WjFcRKE=", + "lastModified": 1749495634, + "narHash": "sha256-NPifVq2XZGRCsLBoUt6M5YUTiIh23+ubq57w7mSODt8=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "8b0b76f13c875f1f31632fd5fbaee8a093421455", + "rev": "c40d2f31f92571bf341497884174a132829ef0fc", "type": "github" }, "original": { @@ -311,11 +311,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1749525718, - "narHash": "sha256-n4qouY1cHRvXxsYVPgoULEnUfCemuxjl37grfNsImII=", + "lastModified": 1749639406, + "narHash": "sha256-uRWykdzOlpdXfAZAJLPdBD3y25Gnk9qxAlpGaTfcZLA=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "9c6c994cad6c5d5079d0affa570beeab22648f03", + "rev": "a38e8adc092396b2f5e288d91573086da4fd0cfc", "type": "github" }, "original": { @@ -344,11 +344,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1749474820, - "narHash": "sha256-hf5eCZ0bbqwOKPvPKn8Rutwj+xs3GhAfB0AjGa8tIEM=", + "lastModified": 1749634836, + "narHash": "sha256-V2QM8Gz2rtqn13+1eKGDl4PugfIbvlWt/9ln3Mzkbv0=", "owner": "YaLTeR", "repo": "niri", - "rev": "a18d24fc24d8b17242e336ccf39fcbe91e8161fd", + "rev": "07080a0431d86d64efed6fa557c2a02cb9041e93", "type": "github" }, "original": { @@ -456,11 +456,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1749194353, - "narHash": "sha256-i6nNh8It11J9afo8QAR1Vwk4qKz/byIc5yq0rU3SW7M=", + "lastModified": 1749419176, + "narHash": "sha256-Hs0vidgwvBiBuqNjR5oCQMMGUfUYwwnyxLShg3yzhWU=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "6acff6c1f8306a0a1d29be8fd1ffa63cff1ad598", + "rev": "9fc1b9076cf49c7f54497df9cfa4485a63f14d3e", "type": "github" }, "original": { @@ -477,11 +477,11 @@ ] }, "locked": { - "lastModified": 1749523120, - "narHash": "sha256-lEhEK8qE8xto2Wnj4f7R+VRSg7M6tgTTkJVTZ2QxXOI=", + "lastModified": 1749609482, + "narHash": "sha256-R+Y3tXIUAMosrgo/ynhIUPEONZ+cM0ScbgN7KA8OkoE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "d0727dbab79c5a28289f3c03e4fac7d5b95bafb3", + "rev": "a17da8deb943e7c8b4151914abbfe33d5a4e5b0d", "type": "github" }, "original": { @@ -548,11 +548,11 @@ ] }, "locked": { - "lastModified": 1749511163, - "narHash": "sha256-0NpDb30Wf1wBeMHQP4N6mUVIq+tNujNX9hplZSvXWKE=", + "lastModified": 1749673264, + "narHash": "sha256-4V1RTD5UZieXllOq0U4OCmdHNFyTquFKc6BoSBvnTGI=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "4cbc88072f1597e1757ec82fefaacc02f49c6c98", + "rev": "114ff3933cd2ae3b1e123971ae02a80f0070e540", "type": "github" }, "original": { diff --git a/home-manager/gui.nix b/home-manager/gui.nix index 5620f61..b476db6 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -8,6 +8,7 @@ imports = [ ./no-gui.nix ./progs/alacritty.nix + ./progs/emacs.nix # ./progs/gpt4all/gpt4all.nix # ./progs/trezor.nix # - broken ]; diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 8f8c4f0..d8ff6a2 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -45,17 +45,6 @@ let cmake-language-server # cmake lsp ]; - - # Praise be to the church of emacs - emacs_stuff = with pkgs; [ - emacs-unstable-pgtk - - # shell check things - shellcheck - - # for search - fd - ]; in { imports = [ @@ -109,7 +98,6 @@ in ripgrep # grep, but written in rust, respects .gitignore, and very very fast, command is `rg` lurk # better strace - # alternative to `find` fd @@ -204,8 +192,7 @@ in jasmin ] ++ rust_pkgs - ++ lsps - ++ emacs_stuff; + ++ lsps; # https://github.com/flamegraph-rs/flamegraph home.file.".cargo/config.toml".text = '' diff --git a/home-manager/progs/emacs.nix b/home-manager/progs/emacs.nix new file mode 100644 index 0000000..50e86d7 --- /dev/null +++ b/home-manager/progs/emacs.nix @@ -0,0 +1,16 @@ +{ pkgs, config, ... }: +{ + programs.emacs = { + enable = true; + package = pkgs.emacs-unstable-pgtk; + extraPackages = epkgs: [ + epkgs.dracula-theme + + pkgs.shellcheck + + # for file search + pkgs.fd + ]; + extraConfig = ""; + }; +} diff --git a/home-manager/progs/niri.nix b/home-manager/progs/niri.nix index b5cffd3..5fffe85 100644 --- a/home-manager/progs/niri.nix +++ b/home-manager/progs/niri.nix @@ -130,7 +130,6 @@ "${pkgs.fuzzel}/bin/fuzzel" ]; - "Mod+O".action = toggle-overview; # open a terminal From 7831392556f4c76f3cf664301d8da8194f09bcf4 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 12 Jun 2025 16:24:14 -0700 Subject: [PATCH 249/724] update --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index ec6caf2..57a8038 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ ] }, "locked": { - "lastModified": 1749650702, - "narHash": "sha256-4ip/dnDf8vofZoW0Pi2MwwwWTNG4d8IMvTj/BV6H740=", + "lastModified": 1749757487, + "narHash": "sha256-yPxNQ2wo4Iiv/QiacFcL4gPC/uansnY6FmPvW53fUhg=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "cfe6d82c1c57685d12792a752dd7d28450b300c5", + "rev": "12314126ea2c78758055c1f413182fbea617801c", "type": "github" }, "original": { @@ -120,11 +120,11 @@ ] }, "locked": { - "lastModified": 1749662391, - "narHash": "sha256-Adk/3i35uhGcr8XipH5synkXjtj+RDDy3RBZqjq+gvQ=", + "lastModified": 1749748793, + "narHash": "sha256-5s2bJKCgQ/YcVUr47Zj+NQVh04tRVT+wl6r0KHvL45I=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "f2bb2b16cb85b5e54bfa62a92daa674c7b906ca7", + "rev": "da3121947d9e055bd9c8360f628052f122654df4", "type": "github" }, "original": { @@ -142,11 +142,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1749451322, - "narHash": "sha256-t53R3kSDl4Jie+Ooxi/aQFN2ODRp1tXQSJBevOt3IkQ=", + "lastModified": 1749623906, + "narHash": "sha256-QD7e5WNVj4aWS5mlJZZnLJ6Lg0h5RSyyEFo2I6xBUEQ=", "owner": "nix-community", "repo": "fenix", - "rev": "77de5067629e201436c76f14f96614a19368c4ae", + "rev": "873cccc628f5e39407e319e6711f3b7d6d1f15cc", "type": "github" }, "original": { @@ -257,11 +257,11 @@ ] }, "locked": { - "lastModified": 1749495634, - "narHash": "sha256-NPifVq2XZGRCsLBoUt6M5YUTiIh23+ubq57w7mSODt8=", + "lastModified": 1749627191, + "narHash": "sha256-bUv8CDE6Uyxak4UkOvRjx5xj6+msEHSpYGeAjkuTnTs=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "c40d2f31f92571bf341497884174a132829ef0fc", + "rev": "f31df4cb6b2eeef6cf0113edb687297be72a69df", "type": "github" }, "original": { @@ -311,11 +311,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1749639406, - "narHash": "sha256-uRWykdzOlpdXfAZAJLPdBD3y25Gnk9qxAlpGaTfcZLA=", + "lastModified": 1749754824, + "narHash": "sha256-4np99yTzIyosbx8hUvkOaaMoLuQpWIwNmkcYR2F8uXM=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "a38e8adc092396b2f5e288d91573086da4fd0cfc", + "rev": "3308d82c470d2614530536b8a69169ebc61eb1b5", "type": "github" }, "original": { @@ -344,11 +344,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1749634836, - "narHash": "sha256-V2QM8Gz2rtqn13+1eKGDl4PugfIbvlWt/9ln3Mzkbv0=", + "lastModified": 1749752245, + "narHash": "sha256-AOiLFwSsLC86GFPUZQJwW1ZsWKKtbR/G85SbmtkEuuk=", "owner": "YaLTeR", "repo": "niri", - "rev": "07080a0431d86d64efed6fa557c2a02cb9041e93", + "rev": "97dfd2b1a00bcb9b765a8fa92ce39d2e0c79abc2", "type": "github" }, "original": { @@ -456,11 +456,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1749419176, - "narHash": "sha256-Hs0vidgwvBiBuqNjR5oCQMMGUfUYwwnyxLShg3yzhWU=", + "lastModified": 1749558764, + "narHash": "sha256-R9vQiqez6Gm0ARJKgbsAeLyX493vwIaexOUAz0vDhak=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "9fc1b9076cf49c7f54497df9cfa4485a63f14d3e", + "rev": "9c3476d225ccc90c081280c2a20e9f7d8a200325", "type": "github" }, "original": { @@ -477,11 +477,11 @@ ] }, "locked": { - "lastModified": 1749609482, - "narHash": "sha256-R+Y3tXIUAMosrgo/ynhIUPEONZ+cM0ScbgN7KA8OkoE=", + "lastModified": 1749695868, + "narHash": "sha256-debjTLOyqqsYOUuUGQsAHskFXH5+Kx2t3dOo/FCoNRA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a17da8deb943e7c8b4151914abbfe33d5a4e5b0d", + "rev": "55f914d5228b5c8120e9e0f9698ed5b7214d09cd", "type": "github" }, "original": { @@ -548,11 +548,11 @@ ] }, "locked": { - "lastModified": 1749673264, - "narHash": "sha256-4V1RTD5UZieXllOq0U4OCmdHNFyTquFKc6BoSBvnTGI=", + "lastModified": 1749745531, + "narHash": "sha256-+nnmuYVhQPbELuW2lZCWpTAJo955Qng/SCcLVO/RP6c=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "114ff3933cd2ae3b1e123971ae02a80f0070e540", + "rev": "50ec60bcf3528db062700673f61f86d82ca6cda0", "type": "github" }, "original": { From fb3b289554ccfb653a7da3188aa90d937d20640c Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 13 Jun 2025 17:43:21 -0700 Subject: [PATCH 250/724] update --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 57a8038..e67c7de 100644 --- a/flake.lock +++ b/flake.lock @@ -120,11 +120,11 @@ ] }, "locked": { - "lastModified": 1749748793, - "narHash": "sha256-5s2bJKCgQ/YcVUr47Zj+NQVh04tRVT+wl6r0KHvL45I=", + "lastModified": 1749834408, + "narHash": "sha256-pJRH+MqfUZD/o8X/LvSrvalJksmeVhW2A5zfg0zzWfQ=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "da3121947d9e055bd9c8360f628052f122654df4", + "rev": "e19ac914a186163a00640b5f9c7e1c776fe029c7", "type": "github" }, "original": { @@ -235,11 +235,11 @@ ] }, "locked": { - "lastModified": 1749657191, - "narHash": "sha256-QLilaHuhGxiwhgceDWESj9gFcKIdEp7+9lRqNGpN8S4=", + "lastModified": 1749821119, + "narHash": "sha256-X3WAS322EsebI4ohJcXhKpiyG1v+7wE4VOiXy1pxM/c=", "owner": "nix-community", "repo": "home-manager", - "rev": "faeab32528a9360e9577ff4082de2d35c6bbe1ce", + "rev": "79dfd9aa295e53773aad45480b44c131da29f35b", "type": "github" }, "original": { @@ -311,11 +311,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1749754824, - "narHash": "sha256-4np99yTzIyosbx8hUvkOaaMoLuQpWIwNmkcYR2F8uXM=", + "lastModified": 1749801447, + "narHash": "sha256-cfrRFN9j340Wlgwe3k2oWB/0LI63JyUZab7apN72xd8=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "3308d82c470d2614530536b8a69169ebc61eb1b5", + "rev": "fba861e81d6fe8c0a8ba9fb2ed8d5e6df4a6ad78", "type": "github" }, "original": { @@ -344,11 +344,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1749752245, - "narHash": "sha256-AOiLFwSsLC86GFPUZQJwW1ZsWKKtbR/G85SbmtkEuuk=", + "lastModified": 1749797708, + "narHash": "sha256-P5x0U6AW5Zn20bARv4D83d8XlNaWK1st9QwBfSe+Vfg=", "owner": "YaLTeR", "repo": "niri", - "rev": "97dfd2b1a00bcb9b765a8fa92ce39d2e0c79abc2", + "rev": "f3f6e79eeca8924ff9cfea4b30006e5b782bc93e", "type": "github" }, "original": { @@ -382,11 +382,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1749195551, - "narHash": "sha256-W5GKQHgunda/OP9sbKENBZhMBDNu2QahoIPwnsF6CeM=", + "lastModified": 1749832440, + "narHash": "sha256-lfxhuxAaHlYFGr8yOrAXZqdMt8PrFLzjVqH9v3lQaoY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "4602f7e1d3f197b3cb540d5accf5669121629628", + "rev": "db030f62a449568345372bd62ed8c5be4824fa49", "type": "github" }, "original": { @@ -477,11 +477,11 @@ ] }, "locked": { - "lastModified": 1749695868, - "narHash": "sha256-debjTLOyqqsYOUuUGQsAHskFXH5+Kx2t3dOo/FCoNRA=", + "lastModified": 1749782305, + "narHash": "sha256-h6jWS89SZyI5ACe/Ac2Yn7Qf+Uhb1yawbtpEqgV1h8E=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "55f914d5228b5c8120e9e0f9698ed5b7214d09cd", + "rev": "dc62b7639a9dcab4ab1246876fd0df8412a4a824", "type": "github" }, "original": { @@ -548,11 +548,11 @@ ] }, "locked": { - "lastModified": 1749745531, - "narHash": "sha256-+nnmuYVhQPbELuW2lZCWpTAJo955Qng/SCcLVO/RP6c=", + "lastModified": 1749849546, + "narHash": "sha256-iB3Xff4rJ6eoCZ/iranuW08EU7PQul1Ww3Mf0pZKBdo=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "50ec60bcf3528db062700673f61f86d82ca6cda0", + "rev": "48f6dc52b5f85f6a48a734a8347be9f41cbdc171", "type": "github" }, "original": { From 1fabab62a23fc941eb489aa57d264b1a282ca152 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 14 Jun 2025 13:11:25 -0700 Subject: [PATCH 251/724] update --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index e67c7de..88e5b1c 100644 --- a/flake.lock +++ b/flake.lock @@ -120,11 +120,11 @@ ] }, "locked": { - "lastModified": 1749834408, - "narHash": "sha256-pJRH+MqfUZD/o8X/LvSrvalJksmeVhW2A5zfg0zzWfQ=", + "lastModified": 1749921358, + "narHash": "sha256-mhVXykmXD59JAwcYmnW3lJoavq23ysfSbPQC9gRdzm8=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "e19ac914a186163a00640b5f9c7e1c776fe029c7", + "rev": "5479bde495cf43766d53b3789a316e83ef7f8905", "type": "github" }, "original": { @@ -311,11 +311,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1749801447, - "narHash": "sha256-cfrRFN9j340Wlgwe3k2oWB/0LI63JyUZab7apN72xd8=", + "lastModified": 1749890123, + "narHash": "sha256-pRkyWFytGAMaHlrOJIYYEur8NRDe0kTfMIhRdTeasRQ=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "fba861e81d6fe8c0a8ba9fb2ed8d5e6df4a6ad78", + "rev": "8f39eb82488525728eda222b34e79b1ecf6d3f96", "type": "github" }, "original": { @@ -398,11 +398,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1749285348, - "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=", + "lastModified": 1749794982, + "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f", + "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", "type": "github" }, "original": { @@ -477,11 +477,11 @@ ] }, "locked": { - "lastModified": 1749782305, - "narHash": "sha256-h6jWS89SZyI5ACe/Ac2Yn7Qf+Uhb1yawbtpEqgV1h8E=", + "lastModified": 1749868581, + "narHash": "sha256-oWO5KAIjhclLwYJp7kJiNbNqCcZo8ZLuKQEJd9WL6r4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "dc62b7639a9dcab4ab1246876fd0df8412a4a824", + "rev": "2ff6d56a67d75559f7b5d9edf9aa1fcf8e15f461", "type": "github" }, "original": { @@ -548,11 +548,11 @@ ] }, "locked": { - "lastModified": 1749849546, - "narHash": "sha256-iB3Xff4rJ6eoCZ/iranuW08EU7PQul1Ww3Mf0pZKBdo=", + "lastModified": 1749925521, + "narHash": "sha256-cbTj62MYbyZFYYTeA5zviOF/tr6ZzRKaJh1BEFsoE6c=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "48f6dc52b5f85f6a48a734a8347be9f41cbdc171", + "rev": "bb4ab4a99523e3b4ef1f6ba1fc49d21f41e4921b", "type": "github" }, "original": { From 670c67e4784731e1dec373e9fd5958e38a54e7b4 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 16 Jun 2025 19:56:12 -0700 Subject: [PATCH 252/724] update --- flake.lock | 60 +++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index 88e5b1c..612584f 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ ] }, "locked": { - "lastModified": 1749757487, - "narHash": "sha256-yPxNQ2wo4Iiv/QiacFcL4gPC/uansnY6FmPvW53fUhg=", + "lastModified": 1750098200, + "narHash": "sha256-BtCFs/Ixxn6mEE2zGA/wIH+tR+psjobxs8SXVUyEiiI=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "12314126ea2c78758055c1f413182fbea617801c", + "rev": "0d0115e6b3e2dce6d2260c7bb3fe894b1cc6b9a6", "type": "github" }, "original": { @@ -120,11 +120,11 @@ ] }, "locked": { - "lastModified": 1749921358, - "narHash": "sha256-mhVXykmXD59JAwcYmnW3lJoavq23ysfSbPQC9gRdzm8=", + "lastModified": 1750126963, + "narHash": "sha256-0D22xrXkDM872W4ZMnUiJHsjq/uYSBsA6XumYgAkxyM=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "5479bde495cf43766d53b3789a316e83ef7f8905", + "rev": "81f55880689625e1e8cd184cb499c3fac8753790", "type": "github" }, "original": { @@ -142,11 +142,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1749623906, - "narHash": "sha256-QD7e5WNVj4aWS5mlJZZnLJ6Lg0h5RSyyEFo2I6xBUEQ=", + "lastModified": 1750056063, + "narHash": "sha256-PGQjkjaj8XUa19tGZi0GHbnCzol4YHurA4pyifmhrs0=", "owner": "nix-community", "repo": "fenix", - "rev": "873cccc628f5e39407e319e6711f3b7d6d1f15cc", + "rev": "879b4b73522a78529778ce2eb6f3374d1016cf8f", "type": "github" }, "original": { @@ -235,11 +235,11 @@ ] }, "locked": { - "lastModified": 1749821119, - "narHash": "sha256-X3WAS322EsebI4ohJcXhKpiyG1v+7wE4VOiXy1pxM/c=", + "lastModified": 1750127463, + "narHash": "sha256-K2xFtlD3PcKAZriOE3LaBLYmVfGQu+rIF4Jr1RFYR0Q=", "owner": "nix-community", "repo": "home-manager", - "rev": "79dfd9aa295e53773aad45480b44c131da29f35b", + "rev": "28eef8722d1af18ca13e687dbf485e1c653a0402", "type": "github" }, "original": { @@ -311,11 +311,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1749890123, - "narHash": "sha256-pRkyWFytGAMaHlrOJIYYEur8NRDe0kTfMIhRdTeasRQ=", + "lastModified": 1750084476, + "narHash": "sha256-KfkA0uftsNhhIZAwnqzH6Z0TEn3wKKXhI5lYJCaL8x4=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "8f39eb82488525728eda222b34e79b1ecf6d3f96", + "rev": "94ff8b2da333c42cad4a1429d897b99bd5b27e57", "type": "github" }, "original": { @@ -344,11 +344,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1749797708, - "narHash": "sha256-P5x0U6AW5Zn20bARv4D83d8XlNaWK1st9QwBfSe+Vfg=", + "lastModified": 1750075148, + "narHash": "sha256-7n5dzueAsq5jEZBWZ4TSM+ydzKjPlcP0txBaevoGuqc=", "owner": "YaLTeR", "repo": "niri", - "rev": "f3f6e79eeca8924ff9cfea4b30006e5b782bc93e", + "rev": "da3dc913a60062343a5a76b8745e55173a150751", "type": "github" }, "original": { @@ -382,11 +382,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1749832440, - "narHash": "sha256-lfxhuxAaHlYFGr8yOrAXZqdMt8PrFLzjVqH9v3lQaoY=", + "lastModified": 1750083401, + "narHash": "sha256-ynqbgIYrg7P1fAKYqe8I/PMiLABBcNDYG9YaAP/d/C4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "db030f62a449568345372bd62ed8c5be4824fa49", + "rev": "61837d2a33ccc1582c5fabb7bf9130d39fee59ad", "type": "github" }, "original": { @@ -456,11 +456,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1749558764, - "narHash": "sha256-R9vQiqez6Gm0ARJKgbsAeLyX493vwIaexOUAz0vDhak=", + "lastModified": 1750005282, + "narHash": "sha256-VXLDkb1iOw7wWhgOgBMP9hTcpW6Eo399YbBif5hlxS8=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "9c3476d225ccc90c081280c2a20e9f7d8a200325", + "rev": "a207299344bf7797e4253c3f6130313e33c2ba6f", "type": "github" }, "original": { @@ -477,11 +477,11 @@ ] }, "locked": { - "lastModified": 1749868581, - "narHash": "sha256-oWO5KAIjhclLwYJp7kJiNbNqCcZo8ZLuKQEJd9WL6r4=", + "lastModified": 1750127910, + "narHash": "sha256-FIgEIS0RAlOyXGqoj/OufTfcKItYq668yPYL4SXdU0M=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "2ff6d56a67d75559f7b5d9edf9aa1fcf8e15f461", + "rev": "45418795a73b77b7726c62ce265d68cf541ffb49", "type": "github" }, "original": { @@ -548,11 +548,11 @@ ] }, "locked": { - "lastModified": 1749925521, - "narHash": "sha256-cbTj62MYbyZFYYTeA5zviOF/tr6ZzRKaJh1BEFsoE6c=", + "lastModified": 1750091187, + "narHash": "sha256-mjAol6qR+onnZwLUdYjmuBr/tnyozUBXz75tSePVU00=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "bb4ab4a99523e3b4ef1f6ba1fc49d21f41e4921b", + "rev": "cfdf98dac59a42e1642c533a5dbfb5bb242903b3", "type": "github" }, "original": { From 37f4af1d3c42f56ddc5adca5825bc909ec712bea Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 17 Jun 2025 20:12:24 -0700 Subject: [PATCH 253/724] update --- flake.lock | 142 +++++++++++++++++++++++------------------------------ 1 file changed, 62 insertions(+), 80 deletions(-) diff --git a/flake.lock b/flake.lock index 612584f..448953a 100644 --- a/flake.lock +++ b/flake.lock @@ -12,11 +12,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1747575206, - "narHash": "sha256-NwmAFuDUO/PFcgaGGr4j3ozG9Pe5hZ/ogitWhY+D81k=", + "lastModified": 1750173260, + "narHash": "sha256-9P1FziAwl5+3edkfFcr5HeGtQUtrSdk/MksX39GieoA=", "owner": "ryantm", "repo": "agenix", - "rev": "4835b1dc898959d8547a871ef484930675cb47f1", + "rev": "531beac616433bac6f9e2a19feb8e99a22a66baf", "type": "github" }, "original": { @@ -27,7 +27,6 @@ }, "chaotic": { "inputs": { - "fenix": "fenix", "flake-schemas": "flake-schemas", "home-manager": [ "home-manager" @@ -35,14 +34,15 @@ "jovian": "jovian", "nixpkgs": [ "nixpkgs" - ] + ], + "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1750098200, - "narHash": "sha256-BtCFs/Ixxn6mEE2zGA/wIH+tR+psjobxs8SXVUyEiiI=", + "lastModified": 1750195929, + "narHash": "sha256-5gaf/9wuxtfKqAFnNlX74Vz2VMURa/UzyfuEyYv4tZw=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "0d0115e6b3e2dce6d2260c7bb3fe894b1cc6b9a6", + "rev": "419a1cfaf34100008ff5fa97ce9ef3b194472f71", "type": "github" }, "original": { @@ -120,11 +120,11 @@ ] }, "locked": { - "lastModified": 1750126963, - "narHash": "sha256-0D22xrXkDM872W4ZMnUiJHsjq/uYSBsA6XumYgAkxyM=", + "lastModified": 1750212636, + "narHash": "sha256-CujXEkwwtFio512OiaNMCrdKPk1czPnIIc4Wyu9vThs=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "81f55880689625e1e8cd184cb499c3fac8753790", + "rev": "78302713c2e102690ca9b531ed36c2c38d2794c9", "type": "github" }, "original": { @@ -133,28 +133,6 @@ "type": "github" } }, - "fenix": { - "inputs": { - "nixpkgs": [ - "chaotic", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1750056063, - "narHash": "sha256-PGQjkjaj8XUa19tGZi0GHbnCzol4YHurA4pyifmhrs0=", - "owner": "nix-community", - "repo": "fenix", - "rev": "879b4b73522a78529778ce2eb6f3374d1016cf8f", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -257,11 +235,11 @@ ] }, "locked": { - "lastModified": 1749627191, - "narHash": "sha256-bUv8CDE6Uyxak4UkOvRjx5xj6+msEHSpYGeAjkuTnTs=", + "lastModified": 1750172631, + "narHash": "sha256-XwqAqM1UmKahdCwzp2UQHTpjnY0b82/VTfA8VpZIR6g=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "f31df4cb6b2eeef6cf0113edb687297be72a69df", + "rev": "7de24ceed8c7693191b74a7bda6d89c91f94c8f5", "type": "github" }, "original": { @@ -284,11 +262,11 @@ ] }, "locked": { - "lastModified": 1749471908, - "narHash": "sha256-uGfPqd43KTomeIVWUzHu3hGLWFsqYibhWLt2OaRic28=", + "lastModified": 1750168384, + "narHash": "sha256-PBfJ7dGsR02im/RYN8wXII8yNPFhKxiPdq+JDfbvD2k=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "00292388ad3b497763b81568d6ee5e1c4a2bcf85", + "rev": "38c2addd2e0cedcb03708de6e6c21fb1be86d410", "type": "github" }, "original": { @@ -311,11 +289,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1750084476, - "narHash": "sha256-KfkA0uftsNhhIZAwnqzH6Z0TEn3wKKXhI5lYJCaL8x4=", + "lastModified": 1750195569, + "narHash": "sha256-9x+a8uvRBcOVbs1TRDSo8zOUdmv/kJZzS4n/uqooTyo=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "94ff8b2da333c42cad4a1429d897b99bd5b27e57", + "rev": "f7ce79d983af69c030e8f06f31e35a5058d1bf9e", "type": "github" }, "original": { @@ -327,16 +305,16 @@ "niri-stable": { "flake": false, "locked": { - "lastModified": 1740117926, - "narHash": "sha256-mTTHA0RAaQcdYe+9A3Jx77cmmyLFHmRoZdd8RpWa+m8=", + "lastModified": 1748151941, + "narHash": "sha256-z4viQZLgC2bIJ3VrzQnR+q2F3gAOEQpU1H5xHtX/2fs=", "owner": "YaLTeR", "repo": "niri", - "rev": "b94a5db8790339cf9134873d8b490be69e02ac71", + "rev": "8ba57fcf25d2fc9565131684a839d58703f1dae7", "type": "github" }, "original": { "owner": "YaLTeR", - "ref": "v25.02", + "ref": "v25.05.1", "repo": "niri", "type": "github" } @@ -344,11 +322,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1750075148, - "narHash": "sha256-7n5dzueAsq5jEZBWZ4TSM+ydzKjPlcP0txBaevoGuqc=", + "lastModified": 1750142220, + "narHash": "sha256-5gUJXh0/mm1YIsLhWgaGitUtGsQvrYRsT4zmGmRHn9M=", "owner": "YaLTeR", "repo": "niri", - "rev": "da3dc913a60062343a5a76b8745e55173a150751", + "rev": "e53f8527b0517cf965961ae729b7dd631ed76db5", "type": "github" }, "original": { @@ -398,11 +376,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1749794982, - "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", + "lastModified": 1750134718, + "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", + "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", "type": "github" }, "original": { @@ -425,11 +403,11 @@ ] }, "locked": { - "lastModified": 1747372754, - "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", + "lastModified": 1749636823, + "narHash": "sha256-WUaIlOlPLyPgz9be7fqWJA5iG6rHcGRtLERSCfUDne4=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", + "rev": "623c56286de5a3193aa38891a6991b28f9bab056", "type": "github" }, "original": { @@ -449,30 +427,14 @@ "niri": "niri", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", - "rust-overlay": "rust-overlay", + "rust-overlay": "rust-overlay_2", "zen-browser": "zen-browser" } }, - "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1750005282, - "narHash": "sha256-VXLDkb1iOw7wWhgOgBMP9hTcpW6Eo399YbBif5hlxS8=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "a207299344bf7797e4253c3f6130313e33c2ba6f", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, "rust-overlay": { "inputs": { "nixpkgs": [ + "chaotic", "nixpkgs" ] }, @@ -490,6 +452,26 @@ "type": "github" } }, + "rust-overlay_2": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1750214276, + "narHash": "sha256-1kniuhH70q4TAC/xIvjFYH46aHiLrbIlcr6fdrRwO1A=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "f9b2b2b1327ff6beab4662b8ea41689e0a57b8d4", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -508,16 +490,16 @@ "xwayland-satellite-stable": { "flake": false, "locked": { - "lastModified": 1739246919, - "narHash": "sha256-/hBM43/Gd0/tW+egrhlWgOIISeJxEs2uAOIYVpfDKeU=", + "lastModified": 1748488455, + "narHash": "sha256-IiLr1alzKFIy5tGGpDlabQbe6LV1c9ABvkH6T5WmyRI=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "44590a416d4a3e8220e19e29e0b6efe64a80315d", + "rev": "3ba30b149f9eb2bbf42cf4758d2158ca8cceef73", "type": "github" }, "original": { "owner": "Supreeeme", - "ref": "v0.5.1", + "ref": "v0.6", "repo": "xwayland-satellite", "type": "github" } @@ -548,11 +530,11 @@ ] }, "locked": { - "lastModified": 1750091187, - "narHash": "sha256-mjAol6qR+onnZwLUdYjmuBr/tnyozUBXz75tSePVU00=", + "lastModified": 1750152169, + "narHash": "sha256-XN5OBCCXKmPBL+UXyyScI5HGgs4U8OFGQTnKuxurBFI=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "cfdf98dac59a42e1642c533a5dbfb5bb242903b3", + "rev": "ed811ab0d0b407b59cda1023820e9986fd28c8c3", "type": "github" }, "original": { From 6e9c8009be979282b485fb0a110dc4c1ed6a10f9 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 18 Jun 2025 20:56:13 -0700 Subject: [PATCH 254/724] add deploy-rs command --- home-manager/no-gui.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index d8ff6a2..fb11efe 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -190,6 +190,10 @@ in # java assembler jasmin + + # used to deploy nix system to server + # (and in the future, desktop) + deploy-rs ] ++ rust_pkgs ++ lsps; From 42d6267f79747b5f02c23ac0d0b57449b051d80a Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 18 Jun 2025 20:56:37 -0700 Subject: [PATCH 255/724] update --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 448953a..840bbb1 100644 --- a/flake.lock +++ b/flake.lock @@ -120,11 +120,11 @@ ] }, "locked": { - "lastModified": 1750212636, - "narHash": "sha256-CujXEkwwtFio512OiaNMCrdKPk1czPnIIc4Wyu9vThs=", + "lastModified": 1750301575, + "narHash": "sha256-gNHJ34A0oK2jRD5fFkVX/Zb3iaiJ32VssnpzGaP4hPc=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "78302713c2e102690ca9b531ed36c2c38d2794c9", + "rev": "2fab8c74721be21e8e06a95ab35f4e940c93a15e", "type": "github" }, "original": { @@ -213,11 +213,11 @@ ] }, "locked": { - "lastModified": 1750127463, - "narHash": "sha256-K2xFtlD3PcKAZriOE3LaBLYmVfGQu+rIF4Jr1RFYR0Q=", + "lastModified": 1750304462, + "narHash": "sha256-Mj5t4yX05/rXnRqJkpoLZTWqgStB88Mr/fegTRqyiWc=", "owner": "nix-community", "repo": "home-manager", - "rev": "28eef8722d1af18ca13e687dbf485e1c653a0402", + "rev": "863842639722dd12ae9e37ca83bcb61a63b36f6c", "type": "github" }, "original": { @@ -289,11 +289,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1750195569, - "narHash": "sha256-9x+a8uvRBcOVbs1TRDSo8zOUdmv/kJZzS4n/uqooTyo=", + "lastModified": 1750270605, + "narHash": "sha256-JfuuBGrM36I7KB9UID5urRvjHWWjFW//gMxQ5g9PrSo=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "f7ce79d983af69c030e8f06f31e35a5058d1bf9e", + "rev": "da32eedd0d2c980fc90fe2b5cdd9080cc8c9f51f", "type": "github" }, "original": { @@ -322,11 +322,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1750142220, - "narHash": "sha256-5gUJXh0/mm1YIsLhWgaGitUtGsQvrYRsT4zmGmRHn9M=", + "lastModified": 1750225787, + "narHash": "sha256-7O/8CChaOhSBSu94McHE0vyH0o+J5R4exq2DDq4zHAg=", "owner": "YaLTeR", "repo": "niri", - "rev": "e53f8527b0517cf965961ae729b7dd631ed76db5", + "rev": "ed14e8da8476d5fde27b14d1dde03256a2f6e11b", "type": "github" }, "original": { @@ -459,11 +459,11 @@ ] }, "locked": { - "lastModified": 1750214276, - "narHash": "sha256-1kniuhH70q4TAC/xIvjFYH46aHiLrbIlcr6fdrRwO1A=", + "lastModified": 1750300711, + "narHash": "sha256-4XHPocwP+66PhxyyObPXfI+Rql4PoGe/xBK791N8I78=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "f9b2b2b1327ff6beab4662b8ea41689e0a57b8d4", + "rev": "4178888556c15e0a1c57850d2f103ac300a6e9e2", "type": "github" }, "original": { From 38f02336bf37b05cc49e542edbed8eda2ade6ac6 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 18 Jun 2025 22:55:12 -0700 Subject: [PATCH 256/724] use-remote-sudo is deprecated, use --sudo instead --- deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy.sh b/deploy.sh index 76a0e9a..c7fa778 100755 --- a/deploy.sh +++ b/deploy.sh @@ -5,4 +5,4 @@ if [ "$ARG" = "" ]; then ARG="boot" fi -nixos-rebuild "$ARG" --flake . --use-remote-sudo +nixos-rebuild "$ARG" --flake . --sudo From 3d690d0f2958cd2e30e045ee60e1a97d0f1c3e10 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 18 Jun 2025 22:55:31 -0700 Subject: [PATCH 257/724] change default terminal emulator to ghostty --- home-manager/gui.nix | 4 ++-- home-manager/progs/alacritty.nix | 4 ++++ home-manager/progs/ghostty.nix | 16 ++++++++++++++++ home-manager/progs/niri.nix | 2 +- 4 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 home-manager/progs/ghostty.nix diff --git a/home-manager/gui.nix b/home-manager/gui.nix index b476db6..6bd9943 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -7,7 +7,8 @@ { imports = [ ./no-gui.nix - ./progs/alacritty.nix + # ./progs/alacritty.nix + ./progs/ghostty.nix ./progs/emacs.nix # ./progs/gpt4all/gpt4all.nix # ./progs/trezor.nix # - broken @@ -162,7 +163,6 @@ }; home.sessionVariables = { - TERMINAL = "alacritty"; BROWSER = "zen"; LD_LIBRARY_PATH = "${pkgs.lib.makeLibraryPath [ pkgs.stdenv.cc.cc diff --git a/home-manager/progs/alacritty.nix b/home-manager/progs/alacritty.nix index 3b91dcf..63484a2 100644 --- a/home-manager/progs/alacritty.nix +++ b/home-manager/progs/alacritty.nix @@ -1,5 +1,9 @@ { pkgs, ... }: { + home.sessionVariables = { + TERMINAL = "alacritty"; + }; + programs.alacritty = { enable = true; package = pkgs.alacritty; diff --git a/home-manager/progs/ghostty.nix b/home-manager/progs/ghostty.nix new file mode 100644 index 0000000..2f9b68f --- /dev/null +++ b/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"; + }; +} diff --git a/home-manager/progs/niri.nix b/home-manager/progs/niri.nix index 5fffe85..2e99dac 100644 --- a/home-manager/progs/niri.nix +++ b/home-manager/progs/niri.nix @@ -133,7 +133,7 @@ "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"; From e585e3ad1c4e5e5d978920b669093d7ccb680ec0 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 19 Jun 2025 18:07:07 -0700 Subject: [PATCH 258/724] wifi: add network --- etcnixos/secrets/wifi-passwords.nix | Bin 887 -> 948 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/etcnixos/secrets/wifi-passwords.nix b/etcnixos/secrets/wifi-passwords.nix index 1eab5f41796240d2bfbf029fdfbdec5c1ca50723..2eb6961c370ca80b896d077915588165eab183a0 100644 GIT binary patch literal 948 zcmZQ@_Y83kiVO&0@UT0uIqOM=)yylNMNT|=n$M>QF9@946K$LFMbD%4N5QX4k5azR zer%e4sVn^2q^za>+s{3!zH?q6o@G*8?Y~Pk9toReuEr*=T;g=}>!Ym`}4konkk=(sp%lfc1$Z`kzr zavX`WXe{{q{)pMSCn;yowSG(0zo;8=Xws^_lb09qZkZOdnrnXi@%ZVcmX&*>U;SCa zcgXqe%Hl6lyxU{<{eLXjEtWGo>{!r@DUaKw@847T)D<3alE=_cjOm+kGkall$l9q9 zdZ%vh33GI*Sn;%fUL5o39bY~yR(6@A*!x81hMt(hCRg628q2LMD!Mg9oJ=d6oR7F( zc+H{4Rb{-aai4bHrLO^P+!wc}Nk*_{KG&S>LwyqK4@Xv57F>3_boxj+ z3-_VRGapEyL zLvm8X{WKNpE4H3}<_`0ga=vx)y(-u9Z@H-XtsLo3N)JEiu(!z1PW7p>64UV8*THZ* zYSZB|rSk1AA;L0QHq0p(dmG+Jh!y_kQ@)v>Z);xvMkTFj^OY?Zi!$d-<-c=7v7Y6M z|C{@kRt(`wr-gY=?KyK#{954e+kxAgcZjHOy~v_{zgOKWh5;WgWuJq+8yy$o%KaTQ1#!2pMT4f*JU+H>E}ew z{9UWtGeJCIU$gI;E>0mq$pt^6mb~0|U=@?I_d1Eg-@}r$Ow5beUSCg2+VObd6oZF* zo_+~Ex69_jhg{Y@Y|KXLXQ%C!>h4##x=cc9XO@M^jq6P>l>Myz&I=kgN$ukaIsTK+ z_8HTcvs&GbItSbJQ}(QUETA_>SorN089&+n$CjoBmg=iQf5-Dn__zMf~DIK4dTeU`QRB}xUmgNbb QQXw>L&C$8$4|m!D0HEv0{{R30 literal 887 zcmZQ@_Y83kiVO&0h}m?!P9@WYM`~79?yJUYKffeJiTKDp7X2K2yMwDHXY+?wt?Rkv z7|hu+Wz4D(3oCibWc$uArwP09^BYvo^w~e>`gDKpoDHF_QmKpOQzO6Y`y1-V9F7!= zzLgZSUm#<{)@^_H264;~JKv}Cf6;@#j!{omazUZTFee_f9^(?T{(rS#QCkFQ3oU zTl<&Gi9hPWf8XE?weQOW<&XbUZgXpzx8C#e*;@}~s^?tt*E$F`OY)=X6PkDnKH-bx<&lQ?x}V1NPF^$ z|4lpadh^-CUN5)IDmcnvBYJ$bP?>ll_mAv=0OL!0!a8f8^vmvFoaAbM#;1cJ<|9*x z`<;0*Pj~x?tyy^X^p@_opAKby3|_)K+w;SlQ!Qt0%X#J15w{cE990tE{KV-Vs}I{8B>2DcRCnbsu``Ub&TpF)y%W6PwN% za7ge|{F+nq%(tt#)ONjFBg3Wp`qXiY`b#O+0r4L#`VO|psm$sQ2`w&-&CpCX>oZ|K z_m*Az=&g#UYhH<7Rn}xV9KmtI`&D-)Q}6kCOP;9ZHf*dr%@X%$fzWw{oqwdAcITaG z;Yedw-LtTc-Jg41k<6o?-bK*APJ3sO*spP|W^Q`()g0$1Tm}2s3!i=XZJ%f?_a%)jTir5!EB95VUcWm`IXNDE E0OO>woB#j- From 0de6fc7f8487747239a6a36848f1e822327d6393 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 19 Jun 2025 18:07:31 -0700 Subject: [PATCH 259/724] update --- flake.lock | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/flake.lock b/flake.lock index 840bbb1..710b647 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1750195929, - "narHash": "sha256-5gaf/9wuxtfKqAFnNlX74Vz2VMURa/UzyfuEyYv4tZw=", + "lastModified": 1750327187, + "narHash": "sha256-16+LlTyw9wmINhxXB8BxGnSvngwm4nfrQ7GDKi7Cbdw=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "419a1cfaf34100008ff5fa97ce9ef3b194472f71", + "rev": "1055783472d16df6bc14819cbcfe78f7c9829ffa", "type": "github" }, "original": { @@ -120,11 +120,11 @@ ] }, "locked": { - "lastModified": 1750301575, - "narHash": "sha256-gNHJ34A0oK2jRD5fFkVX/Zb3iaiJ32VssnpzGaP4hPc=", + "lastModified": 1750352807, + "narHash": "sha256-jCYMcMdMqozqVcEUeSYApmgfMNgZ9+Sxh9vFYoT6SQo=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "2fab8c74721be21e8e06a95ab35f4e940c93a15e", + "rev": "6224529f64715f5bfcac0b57bce245c6ecbdb716", "type": "github" }, "original": { @@ -235,11 +235,11 @@ ] }, "locked": { - "lastModified": 1750172631, - "narHash": "sha256-XwqAqM1UmKahdCwzp2UQHTpjnY0b82/VTfA8VpZIR6g=", + "lastModified": 1750230721, + "narHash": "sha256-rg/lnazeno/f4VNSv+t2Zwio/OyCYKx5zV9/8hfhfgA=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "7de24ceed8c7693191b74a7bda6d89c91f94c8f5", + "rev": "6c88df8c85ad3f80a5832edc50534a5add255b47", "type": "github" }, "original": { @@ -289,11 +289,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1750270605, - "narHash": "sha256-JfuuBGrM36I7KB9UID5urRvjHWWjFW//gMxQ5g9PrSo=", + "lastModified": 1750368611, + "narHash": "sha256-jp3+o3gG6PrVk9ij8Ks/g89YLlHwJwCrKKok9Mfw1iw=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "da32eedd0d2c980fc90fe2b5cdd9080cc8c9f51f", + "rev": "0dda2e7df2ee90a7d4bee9651dd13f94fb5082b8", "type": "github" }, "original": { @@ -322,11 +322,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1750225787, - "narHash": "sha256-7O/8CChaOhSBSu94McHE0vyH0o+J5R4exq2DDq4zHAg=", + "lastModified": 1750334747, + "narHash": "sha256-nsD1Z6vVP2Hhdgrd0uYHacre2+NhaH/53TFRXn6pRcs=", "owner": "YaLTeR", "repo": "niri", - "rev": "ed14e8da8476d5fde27b14d1dde03256a2f6e11b", + "rev": "e0b0b04b445f7044f383e50104f861e632e1c905", "type": "github" }, "original": { @@ -439,11 +439,11 @@ ] }, "locked": { - "lastModified": 1750127910, - "narHash": "sha256-FIgEIS0RAlOyXGqoj/OufTfcKItYq668yPYL4SXdU0M=", + "lastModified": 1750214276, + "narHash": "sha256-1kniuhH70q4TAC/xIvjFYH46aHiLrbIlcr6fdrRwO1A=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "45418795a73b77b7726c62ce265d68cf541ffb49", + "rev": "f9b2b2b1327ff6beab4662b8ea41689e0a57b8d4", "type": "github" }, "original": { @@ -507,11 +507,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1749315541, - "narHash": "sha256-bEik1BfVOFnWvtOrcOHluos/edJ8f+G2y1QySbt/0Ak=", + "lastModified": 1750366962, + "narHash": "sha256-y/B78R5BKXxS623X8+X0nPao9wl5vXR6D6CPw3HJUIg=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "da2ecb5be816de35e2efe23a408a1c49fe8b11ba", + "rev": "b98fa84524e52a2051382b3ea2cbbaeea287b0e3", "type": "github" }, "original": { @@ -530,11 +530,11 @@ ] }, "locked": { - "lastModified": 1750152169, + "lastModified": 1750379318, "narHash": "sha256-XN5OBCCXKmPBL+UXyyScI5HGgs4U8OFGQTnKuxurBFI=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "ed811ab0d0b407b59cda1023820e9986fd28c8c3", + "rev": "0dbc4bcd91002962885f05d18263b0b51a053112", "type": "github" }, "original": { From a2ee9f2561f0b464aa4825e59eb9612d1e157695 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 22 Jun 2025 02:11:47 -0700 Subject: [PATCH 260/724] update --- flake.lock | 60 +++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index 710b647..c82000b 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1750327187, - "narHash": "sha256-16+LlTyw9wmINhxXB8BxGnSvngwm4nfrQ7GDKi7Cbdw=", + "lastModified": 1750560898, + "narHash": "sha256-WFORxQihjGEF4qoyDDLEHdWdxIdNYSKHhsPurWg3PN4=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "1055783472d16df6bc14819cbcfe78f7c9829ffa", + "rev": "52178339c97acdf02336555cf4f0736c9d2e554b", "type": "github" }, "original": { @@ -120,11 +120,11 @@ ] }, "locked": { - "lastModified": 1750352807, - "narHash": "sha256-jCYMcMdMqozqVcEUeSYApmgfMNgZ9+Sxh9vFYoT6SQo=", + "lastModified": 1750580687, + "narHash": "sha256-W/MkTnW4WPIFQLm1sEf9qnAWu98F32tCjUEhyu+9GeU=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "6224529f64715f5bfcac0b57bce245c6ecbdb716", + "rev": "eb94726c3ee0a32c931669a506536ee1367a0ae1", "type": "github" }, "original": { @@ -235,11 +235,11 @@ ] }, "locked": { - "lastModified": 1750230721, - "narHash": "sha256-rg/lnazeno/f4VNSv+t2Zwio/OyCYKx5zV9/8hfhfgA=", + "lastModified": 1750403547, + "narHash": "sha256-XDDINMbHTtKQeSRpX5mwq20z23Wg/I/G4JUinA3V8Xg=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "6c88df8c85ad3f80a5832edc50534a5add255b47", + "rev": "52b86b86d925ec00c836ecc6d36f9c947bb15736", "type": "github" }, "original": { @@ -289,11 +289,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1750368611, - "narHash": "sha256-jp3+o3gG6PrVk9ij8Ks/g89YLlHwJwCrKKok9Mfw1iw=", + "lastModified": 1750471128, + "narHash": "sha256-oR2yjhAPXZDmfFb4UwBeVQcJBtrUNFwufovzN8sTBVc=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "0dda2e7df2ee90a7d4bee9651dd13f94fb5082b8", + "rev": "13e7a34df7aa4e7d8ec4dd9df9d5a01973f28f49", "type": "github" }, "original": { @@ -360,11 +360,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1750083401, - "narHash": "sha256-ynqbgIYrg7P1fAKYqe8I/PMiLABBcNDYG9YaAP/d/C4=", + "lastModified": 1750431636, + "narHash": "sha256-vnzzBDbCGvInmfn2ijC4HsIY/3W1CWbwS/YQoFgdgPg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "61837d2a33ccc1582c5fabb7bf9130d39fee59ad", + "rev": "1552a9f4513f3f0ceedcf90320e48d3d47165712", "type": "github" }, "original": { @@ -376,11 +376,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1750134718, - "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=", + "lastModified": 1750365781, + "narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", + "rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54", "type": "github" }, "original": { @@ -439,11 +439,11 @@ ] }, "locked": { - "lastModified": 1750214276, - "narHash": "sha256-1kniuhH70q4TAC/xIvjFYH46aHiLrbIlcr6fdrRwO1A=", + "lastModified": 1750473400, + "narHash": "sha256-wiW2j63MyGQyyijRF25hf7Ab7vx4G8pCiGjUe3OGV4c=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "f9b2b2b1327ff6beab4662b8ea41689e0a57b8d4", + "rev": "3d7d4c4e284f26d6dc4840491c66884912be0062", "type": "github" }, "original": { @@ -459,11 +459,11 @@ ] }, "locked": { - "lastModified": 1750300711, - "narHash": "sha256-4XHPocwP+66PhxyyObPXfI+Rql4PoGe/xBK791N8I78=", + "lastModified": 1750560265, + "narHash": "sha256-jQCojKl1/TzqE6ANOu6rP2qqxOcGK2xs6hpxZ77wrR8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "4178888556c15e0a1c57850d2f103ac300a6e9e2", + "rev": "076fdb0d45a9de3f379a626f51a62c78afe7efb1", "type": "github" }, "original": { @@ -507,11 +507,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1750366962, - "narHash": "sha256-y/B78R5BKXxS623X8+X0nPao9wl5vXR6D6CPw3HJUIg=", + "lastModified": 1750388715, + "narHash": "sha256-6WMpcn3Ga/L71NiX9SdWw7ZELpNfrFnWJ0Gt2uAHjJg=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "b98fa84524e52a2051382b3ea2cbbaeea287b0e3", + "rev": "03cbb2ee3a9da931bb9a39eb917674297a0b9318", "type": "github" }, "original": { @@ -530,11 +530,11 @@ ] }, "locked": { - "lastModified": 1750379318, - "narHash": "sha256-XN5OBCCXKmPBL+UXyyScI5HGgs4U8OFGQTnKuxurBFI=", + "lastModified": 1750557004, + "narHash": "sha256-P3H0y4eYALvie8iFcT1LqmR+cB5UgT/qFoUWY/CX5O4=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "0dbc4bcd91002962885f05d18263b0b51a053112", + "rev": "5bebd80f8684a7298013fcf9bf846369d3a6542a", "type": "github" }, "original": { From 8fda02e192ff9011d7ac560e76250b6da6b5dc3b Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 23 Jun 2025 08:28:28 -0700 Subject: [PATCH 261/724] update --- flake.lock | 60 +++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index c82000b..2a0e781 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1750560898, - "narHash": "sha256-WFORxQihjGEF4qoyDDLEHdWdxIdNYSKHhsPurWg3PN4=", + "lastModified": 1750642025, + "narHash": "sha256-ZixZpSMtrf2MFw7Ztg6JUbMRkoxxvDDipQCPqnlCDgE=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "52178339c97acdf02336555cf4f0736c9d2e554b", + "rev": "2b666bb8aca306397ef6abb68dec67e78680882b", "type": "github" }, "original": { @@ -120,11 +120,11 @@ ] }, "locked": { - "lastModified": 1750580687, - "narHash": "sha256-W/MkTnW4WPIFQLm1sEf9qnAWu98F32tCjUEhyu+9GeU=", + "lastModified": 1750671239, + "narHash": "sha256-eCO6mRAj2k3l1DfgiQO2u6rzs/vDNSykgIHPwRh093w=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "eb94726c3ee0a32c931669a506536ee1367a0ae1", + "rev": "3b85ea2f827634d8d582bdc92e1c1a7eb90794ca", "type": "github" }, "original": { @@ -213,11 +213,11 @@ ] }, "locked": { - "lastModified": 1750304462, - "narHash": "sha256-Mj5t4yX05/rXnRqJkpoLZTWqgStB88Mr/fegTRqyiWc=", + "lastModified": 1750690749, + "narHash": "sha256-x6fRPeqdgDKVTCyvbp4J8Q5UQ3DV3oWYSoyM444N8cY=", "owner": "nix-community", "repo": "home-manager", - "rev": "863842639722dd12ae9e37ca83bcb61a63b36f6c", + "rev": "05b8c9506452349d8be854ac46e5a7630fa7917d", "type": "github" }, "original": { @@ -289,11 +289,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1750471128, - "narHash": "sha256-oR2yjhAPXZDmfFb4UwBeVQcJBtrUNFwufovzN8sTBVc=", + "lastModified": 1750689145, + "narHash": "sha256-vlJ0oQsrA68R7UNl+ZujH/LwzNJz6198tBQaXmtkvrc=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "13e7a34df7aa4e7d8ec4dd9df9d5a01973f28f49", + "rev": "03153ce955a8ad754b0f2bb4fa25cbbcb9832f25", "type": "github" }, "original": { @@ -322,11 +322,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1750334747, - "narHash": "sha256-nsD1Z6vVP2Hhdgrd0uYHacre2+NhaH/53TFRXn6pRcs=", + "lastModified": 1750684365, + "narHash": "sha256-BqtoSRCgmutJXnQFZs+KFMNvp3LuX6POIHjXIxWdlTE=", "owner": "YaLTeR", "repo": "niri", - "rev": "e0b0b04b445f7044f383e50104f861e632e1c905", + "rev": "4c02f3bba451747c3f337f4c131b0c7f9ef41bb7", "type": "github" }, "original": { @@ -376,11 +376,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1750365781, - "narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=", + "lastModified": 1750506804, + "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54", + "rev": "4206c4cb56751df534751b058295ea61357bbbaa", "type": "github" }, "original": { @@ -439,11 +439,11 @@ ] }, "locked": { - "lastModified": 1750473400, - "narHash": "sha256-wiW2j63MyGQyyijRF25hf7Ab7vx4G8pCiGjUe3OGV4c=", + "lastModified": 1750560265, + "narHash": "sha256-jQCojKl1/TzqE6ANOu6rP2qqxOcGK2xs6hpxZ77wrR8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "3d7d4c4e284f26d6dc4840491c66884912be0062", + "rev": "076fdb0d45a9de3f379a626f51a62c78afe7efb1", "type": "github" }, "original": { @@ -459,11 +459,11 @@ ] }, "locked": { - "lastModified": 1750560265, - "narHash": "sha256-jQCojKl1/TzqE6ANOu6rP2qqxOcGK2xs6hpxZ77wrR8=", + "lastModified": 1750646674, + "narHash": "sha256-gHg6QUjMi1ObrocQUAoEhhbIfop14UNae4QDSHoKsRU=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "076fdb0d45a9de3f379a626f51a62c78afe7efb1", + "rev": "65162ae665154e0eddb395166bd4956358981dd0", "type": "github" }, "original": { @@ -507,11 +507,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1750388715, - "narHash": "sha256-6WMpcn3Ga/L71NiX9SdWw7ZELpNfrFnWJ0Gt2uAHjJg=", + "lastModified": 1750686869, + "narHash": "sha256-FS/rYXd96VBtKNJRTV2xTpTk8CgrYP+lFsFj0+VKgoY=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "03cbb2ee3a9da931bb9a39eb917674297a0b9318", + "rev": "117af56a83e2d1d25016fbd504a2a040babe586a", "type": "github" }, "original": { @@ -530,11 +530,11 @@ ] }, "locked": { - "lastModified": 1750557004, - "narHash": "sha256-P3H0y4eYALvie8iFcT1LqmR+cB5UgT/qFoUWY/CX5O4=", + "lastModified": 1750649182, + "narHash": "sha256-beNAQ63SY8HxBsFdMGv/fdLzjQMYgifMh1DcmaIzMjo=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "5bebd80f8684a7298013fcf9bf846369d3a6542a", + "rev": "c0785a69fe3988b4ef44c74575f4a2f698f91f32", "type": "github" }, "original": { From b37f68be1151097ae5fafa5d710a96f9d70d7c88 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 23 Jun 2025 18:31:01 -0700 Subject: [PATCH 262/724] laptop: amd ai 300 --- etcnixos/hardware_laptop.nix | 2 +- etcnixos/system-mreow.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/etcnixos/hardware_laptop.nix b/etcnixos/hardware_laptop.nix index 40f9c6d..16bcaa3 100644 --- a/etcnixos/hardware_laptop.nix +++ b/etcnixos/hardware_laptop.nix @@ -12,7 +12,7 @@ "nvme" ]; boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; + boot.kernelModules = [ ]; boot.extraModulePackages = [ ]; disko.devices = { diff --git a/etcnixos/system-mreow.nix b/etcnixos/system-mreow.nix index 87da6e4..5a90133 100644 --- a/etcnixos/system-mreow.nix +++ b/etcnixos/system-mreow.nix @@ -11,7 +11,7 @@ ./common.nix ./hardware_laptop.nix - inputs.nixos-hardware.nixosModules.framework-12th-gen-intel + inputs.nixos-hardware.nixosModules.framework-amd-ai-300-series inputs.lanzaboote.nixosModules.lanzaboote ]; From b41f395ec2513a222bb3358dc9f4f5d44b4e81c7 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 23 Jun 2025 18:32:16 -0700 Subject: [PATCH 263/724] add powerstat --- home-manager/no-gui.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index fb11efe..2aac66c 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -194,6 +194,9 @@ in # used to deploy nix system to server # (and in the future, desktop) deploy-rs + + # power stuff + powerstat ] ++ rust_pkgs ++ lsps; From cd659e4f8b522c70c0cabb11ff89b4e73f9167fe Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 23 Jun 2025 20:36:35 -0700 Subject: [PATCH 264/724] amd changes --- etcnixos/hardware_laptop.nix | 4 ++-- etcnixos/vm.nix | 32 ++++++++++---------------------- home-manager/home-mreow.nix | 2 -- 3 files changed, 12 insertions(+), 26 deletions(-) diff --git a/etcnixos/hardware_laptop.nix b/etcnixos/hardware_laptop.nix index 16bcaa3..bc83470 100644 --- a/etcnixos/hardware_laptop.nix +++ b/etcnixos/hardware_laptop.nix @@ -12,7 +12,7 @@ "nvme" ]; boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; disko.devices = { @@ -71,5 +71,5 @@ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.enableRedistributableFirmware = true; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/etcnixos/vm.nix b/etcnixos/vm.nix index 3098081..9f87c3b 100644 --- a/etcnixos/vm.nix +++ b/etcnixos/vm.nix @@ -5,20 +5,6 @@ ... }: { - - 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 ]; @@ -33,16 +19,18 @@ 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="; - # }) + (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="; - }) + /* + (pkgs.fetchpatch { + url = "https://github.com/Scrut1ny/Hypervisor-Phantom/raw/d09d66813570704e2b05440f290d6f9bdf2d26c7/Hypervisor-Phantom/patches/QEMU/intel-qemu-9.2.0.patch"; + sha256 = "kXY6R/0Tsotf0mGUIevDLlLWHEznnF1dt0K2ayX7XAg="; + }) + */ ]; }) ); diff --git a/home-manager/home-mreow.nix b/home-manager/home-mreow.nix index 351100c..234d746 100644 --- a/home-manager/home-mreow.nix +++ b/home-manager/home-mreow.nix @@ -23,8 +23,6 @@ home.packages = with pkgs; [ wdisplays - intel-gpu-tools - blueman # used by /etc/nixos logic to launch niri From 15e8777434e5e54144eaca7412f4cde1a2144769 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 23 Jun 2025 20:37:14 -0700 Subject: [PATCH 265/724] remove gpt4all --- home-manager/gui.nix | 1 - .../progs/gpt4all/disable-settings-err.patch | 19 ---- .../progs/gpt4all/disable-version-check.patch | 17 --- home-manager/progs/gpt4all/gpt4all.nix | 106 ------------------ 4 files changed, 143 deletions(-) delete mode 100644 home-manager/progs/gpt4all/disable-settings-err.patch delete mode 100644 home-manager/progs/gpt4all/disable-version-check.patch delete mode 100644 home-manager/progs/gpt4all/gpt4all.nix diff --git a/home-manager/gui.nix b/home-manager/gui.nix index 6bd9943..844b7da 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -10,7 +10,6 @@ # ./progs/alacritty.nix ./progs/ghostty.nix ./progs/emacs.nix - # ./progs/gpt4all/gpt4all.nix # ./progs/trezor.nix # - broken ]; diff --git a/home-manager/progs/gpt4all/disable-settings-err.patch b/home-manager/progs/gpt4all/disable-settings-err.patch deleted file mode 100644 index a6911ab..0000000 --- a/home-manager/progs/gpt4all/disable-settings-err.patch +++ /dev/null @@ -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) { diff --git a/home-manager/progs/gpt4all/disable-version-check.patch b/home-manager/progs/gpt4all/disable-version-check.patch deleted file mode 100644 index d235f73..0000000 --- a/home-manager/progs/gpt4all/disable-version-check.patch +++ /dev/null @@ -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 { diff --git a/home-manager/progs/gpt4all/gpt4all.nix b/home-manager/progs/gpt4all/gpt4all.nix deleted file mode 100644 index 54ff867..0000000 --- a/home-manager/progs/gpt4all/gpt4all.nix +++ /dev/null @@ -1,106 +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"; - }; - } - - # https://github.com/nomic-ai/gpt4all/issues/3540 - # rec { - # name = "Gemma_3_27b_it"; - # filename = src.name; - # context_length = 131072; - # gen_length = 32768; - # src = pkgs.fetchurl { - # url = "https://huggingface.co/bartowski/google_gemma-3-27b-it-GGUF/resolve/main/google_gemma-3-27b-it-IQ4_XS.gguf"; - # sha256 = "bd2f188c66d8ccb0bffcb0c91e4dbbb72754bb1732e0bca323a2f266a35e01c8"; - # }; - # } - ]; - - gpt4all_package = ( - pkgs.gpt4all.overrideAttrs (old: { - patches = old.patches ++ [ - ./disable-settings-err.patch - ./disable-version-check.patch - ]; - }) - ); - - 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 - ) - ); -} From 92f7cff75d2cde3edbb4cea8601b231368b2d78f Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 23 Jun 2025 20:39:36 -0700 Subject: [PATCH 266/724] cleanup + remove rss reader --- home-manager/no-gui.nix | 13 ------ home-manager/progs/rss.nix | 81 -------------------------------------- 2 files changed, 94 deletions(-) delete mode 100644 home-manager/progs/rss.nix diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 2aac66c..90e2156 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -9,7 +9,6 @@ }: let rust_pkgs = with pkgs; [ - (rust-bin.stable.latest.default.override ({ extensions = [ "rust-src" @@ -104,9 +103,6 @@ in # adds `sensors` command lm_sensors - # rssfeed - newsboat - just pfetch-rs @@ -180,8 +176,6 @@ in tcpdump - linuxKernel.packages.linux_6_14.perf - borgbackup tinyxxd @@ -213,13 +207,6 @@ in 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; diff --git a/home-manager/progs/rss.nix b/home-manager/progs/rss.nix deleted file mode 100644 index 098ed00..0000000 --- a/home-manager/progs/rss.nix +++ /dev/null @@ -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"; - } -] From 0f5133c2df85606cfed17f67ded85ca2cba8296d Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 23 Jun 2025 22:01:47 -0700 Subject: [PATCH 267/724] cleanup --- etcnixos/common.nix | 20 ++------------------ etcnixos/system-mreow.nix | 33 +++++++++------------------------ 2 files changed, 11 insertions(+), 42 deletions(-) diff --git a/etcnixos/common.nix b/etcnixos/common.nix index 78258cc..15017e2 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -22,16 +22,6 @@ inputs.disko.nixosModules.disko ]; - # I think this was causing the weird kworker freezing issue?? - services.fstrim.enable = false; - - programs.nix-ld = { - enable = true; - libraries = with pkgs; [ - stdenv.cc.cc - ]; - }; - nix = { # optimize the store optimise.automatic = true; @@ -95,11 +85,10 @@ # 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 @@ -211,11 +200,6 @@ # needed for home-manager git - - home-manager - - # https://github.com/chaotic-cx/nyx/issues/972 - # config.boot.kernelPackages.perf ]; # wayland with electron/chromium applications diff --git a/etcnixos/system-mreow.nix b/etcnixos/system-mreow.nix index 5a90133..231fc96 100644 --- a/etcnixos/system-mreow.nix +++ b/etcnixos/system-mreow.nix @@ -15,35 +15,19 @@ inputs.lanzaboote.nixosModules.lanzaboote ]; - # hardware.framework.laptop13.audioEnhancement = { - # enable = true; + # completely and utterly broken + /* + hardware.framework.laptop13.audioEnhancement = { + enable = true; - # # seems audio doesn't work without this - # hideRawDevice = false; - # }; - # + # seems audio doesn't work without this + hideRawDevice = false; + }; + */ # PST time.timeZone = lib.mkForce "America/Los_Angeles"; - services.tlp = { - enable = false; - 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.power-profiles-daemon.enable = true; - services.greetd = { enable = true; settings = { @@ -75,6 +59,7 @@ system.activationScripts = { # extract all my secureboot keys + # TODO! proper secrets management "secureboot-keys".text = '' #!/bin/sh rm -fr ${config.boot.lanzaboote.pkiBundle} || true From 66fad79b2c90ebc8ffc2095c8d44222a09a28349 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 23 Jun 2025 22:59:06 -0700 Subject: [PATCH 268/724] cleanup --- README.md | 8 +- etcnixos/common.nix | 57 ++++++++++---- etcnixos/hardware_desktop.nix | 30 ------- etcnixos/hardware_laptop.nix | 22 ------ etcnixos/system-mreow.nix | 48 ----------- etcnixos/system-yarn.nix | 3 - home-manager/gui.nix | 1 - home-manager/home-yarn.nix | 9 +-- home-manager/progs/alacritty.nix | 131 ------------------------------- 9 files changed, 45 insertions(+), 264 deletions(-) delete mode 100644 home-manager/progs/alacritty.nix diff --git a/README.md b/README.md index 9259409..933dc87 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,12 @@ # 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) +Terminal: [ghostty](https://github.com/ghostty-org/ghostty) Shell: [fish](https://fishshell.com/) with the [pure](https://github.com/pure-fish/pure) prompt diff --git a/etcnixos/common.nix b/etcnixos/common.nix index 15017e2..f5d9526 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -20,8 +20,14 @@ inputs.nixos-hardware.nixosModules.common-pc-ssd inputs.chaotic.nixosModules.default inputs.disko.nixosModules.disko + inputs.lanzaboote.nixosModules.lanzaboote ]; + hardware.enableRedistributableFirmware = true; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + + swapDevices = [ ]; + nix = { # optimize the store optimise.automatic = true; @@ -33,30 +39,58 @@ ]; }; + system.activationScripts = { + # extract all my secureboot keys + # TODO! proper secrets management + "secureboot-keys".text = '' + #!/bin/sh + rm -fr ${config.boot.lanzaboote.pkiBundle} || true + mkdir -p ${config.boot.lanzaboote.pkiBundle} + ${pkgs.gnutar}/bin/tar xf ${./secrets/secureboot.tar} -C ${config.boot.lanzaboote.pkiBundle} + chown -R root:wheel ${config.boot.lanzaboote.pkiBundle} + chmod -R 500 ${config.boot.lanzaboote.pkiBundle} + ''; + }; + # kernel options boot = { kernelPackages = pkgs.linuxPackages_cachyos-lto; # 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; + }; initrd = { compressor = "zstd"; + availableKernelModules = [ + "xhci_pci" + "thunderbolt" + "nvme" + "usbhid" + ]; }; kernelModules = [ + "kvm-amd" "ip_tables" "iptable_nat" "msr" @@ -95,7 +129,7 @@ mullvad-vpn.enable = true; }; - # Set your time zone. + # EST time.timeZone = "America/New_York"; security = { @@ -117,18 +151,6 @@ # 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; @@ -218,6 +240,7 @@ }; system.stateVersion = "24.11"; + nixpkgs.hostPlatform = "x86_64-linux"; documentation.enable = true; documentation.man.enable = true; diff --git a/etcnixos/hardware_desktop.nix b/etcnixos/hardware_desktop.nix index 17e40e4..c1e2481 100644 --- a/etcnixos/hardware_desktop.nix +++ b/etcnixos/hardware_desktop.nix @@ -1,6 +1,3 @@ -# 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, @@ -8,22 +5,7 @@ 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"; @@ -44,16 +26,4 @@ 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..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; } diff --git a/etcnixos/hardware_laptop.nix b/etcnixos/hardware_laptop.nix index bc83470..625a17a 100644 --- a/etcnixos/hardware_laptop.nix +++ b/etcnixos/hardware_laptop.nix @@ -6,15 +6,6 @@ ... }: { - boot.initrd.availableKernelModules = [ - "xhci_pci" - "thunderbolt" - "nvme" - ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - 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..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.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/etcnixos/system-mreow.nix b/etcnixos/system-mreow.nix index 231fc96..ca69172 100644 --- a/etcnixos/system-mreow.nix +++ b/etcnixos/system-mreow.nix @@ -12,7 +12,6 @@ ./hardware_laptop.nix inputs.nixos-hardware.nixosModules.framework-amd-ai-300-series - inputs.lanzaboote.nixosModules.lanzaboote ]; # completely and utterly broken @@ -38,38 +37,6 @@ }; }; - boot = { - lanzaboote = { - enable = true; - # TODO: proper secrets management so this is not stored in nix store - pkiBundle = "/var/lib/sbctl"; - }; - - # 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; - }; - }; - - system.activationScripts = { - # extract all my secureboot keys - # TODO! proper secrets management - "secureboot-keys".text = '' - #!/bin/sh - rm -fr ${config.boot.lanzaboote.pkiBundle} || true - mkdir -p ${config.boot.lanzaboote.pkiBundle} - ${pkgs.gnutar}/bin/tar xf ${./secrets/secureboot.tar} -C ${config.boot.lanzaboote.pkiBundle} - chown -R root:wheel ${config.boot.lanzaboote.pkiBundle} - chmod -R 500 ${config.boot.lanzaboote.pkiBundle} - ''; - }; - programs.gamescope = { enable = true; capSysNice = true; @@ -79,21 +46,6 @@ 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 = '' diff --git a/etcnixos/system-yarn.nix b/etcnixos/system-yarn.nix index 27f7788..7f4cd03 100644 --- a/etcnixos/system-yarn.nix +++ b/etcnixos/system-yarn.nix @@ -20,9 +20,6 @@ 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" diff --git a/home-manager/gui.nix b/home-manager/gui.nix index 844b7da..5b4d321 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -7,7 +7,6 @@ { imports = [ ./no-gui.nix - # ./progs/alacritty.nix ./progs/ghostty.nix ./progs/emacs.nix # ./progs/trezor.nix # - broken diff --git a/home-manager/home-yarn.nix b/home-manager/home-yarn.nix index f9e6629..67b1b26 100644 --- a/home-manager/home-yarn.nix +++ b/home-manager/home-yarn.nix @@ -6,7 +6,9 @@ ... }: { - imports = [ ./gui.nix ]; + imports = [ + ./gui.nix + ]; home.packages = with pkgs; [ protontricks @@ -15,11 +17,6 @@ bs-manager ]; - 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; [ diff --git a/home-manager/progs/alacritty.nix b/home-manager/progs/alacritty.nix deleted file mode 100644 index 63484a2..0000000 --- a/home-manager/progs/alacritty.nix +++ /dev/null @@ -1,131 +0,0 @@ -{ pkgs, ... }: -{ - home.sessionVariables = { - TERMINAL = "alacritty"; - }; - - programs.alacritty = { - enable = true; - package = pkgs.alacritty; - settings = { - # some programs can't handle alacritty - env.TERM = "xterm-256color"; - - window = { - # using a window manager, no decorations needed - decorations = "none"; - - # semi-transparent - opacity = 0.90; - - # padding between the content of the terminal and the edge - padding = { - x = 10; - y = 10; - }; - - dimensions = { - columns = 80; - lines = 40; - }; - }; - - scrolling = { - history = 1000; - multiplier = 3; - }; - - font = - let - baseFont = { - family = "JetBrains Mono Nerd Font"; - style = "Regular"; - }; - in - { - size = 12; - - normal = baseFont; - - bold = baseFont // { - style = "Bold"; - }; - - italic = baseFont // { - style = "Italic"; - }; - - offset.y = 0; - glyph_offset.y = 0; - }; - - # color scheme - colors = - let - normal = { - black = "0x1b1e28"; - red = "0xd0679d"; - green = "0x5de4c7"; - yellow = "0xfffac2"; - blue = "#435c89"; - magenta = "0xfcc5e9"; - cyan = "0xadd7ff"; - white = "0xffffff"; - }; - - bright = { - black = "0xa6accd"; - red = normal.red; - green = normal.green; - yellow = normal.yellow; - blue = normal.cyan; - magenta = "0xfae4fc"; - cyan = "0x89ddff"; - white = normal.white; - }; - in - { - inherit normal bright; - primary = { - background = "0x131621"; - foreground = bright.black; - }; - - cursor = { - text = "CellBackground"; - cursor = "CellForeground"; - }; - - search = - let - foreground = normal.black; - background = normal.cyan; - in - { - matches = { - inherit foreground background; - }; - - focused_match = { - inherit foreground background; - }; - }; - - selection = { - text = "CellForeground"; - background = "0x303340"; - }; - - vi_mode_cursor = { - text = "CellBackground"; - cursor = "CellForeground"; - }; - }; - - cursor = { - style = "Underline"; - vi_mode_style = "Underline"; - }; - }; - }; -} From 20d34e8920106aac11e338d35c120d2439ac044c Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 24 Jun 2025 20:36:07 -0700 Subject: [PATCH 269/724] organize --- home-manager/no-gui.nix | 108 +++++++++++++++++------------------ home-manager/progs/helix.nix | 3 + 2 files changed, 57 insertions(+), 54 deletions(-) diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 90e2156..bac01d1 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -44,6 +44,57 @@ let cmake-language-server # cmake lsp ]; + java_tools = with pkgs; [ + # java development + google-java-format # formatter + jdk # java + + # java assembler + jasmin + ]; + + common_tools = with pkgs; [ + # hex viewer + hexyl + + # find typos in code + typos + + # replacements for common posix tools + eza # ls replacement + bat # pretty `cat` clone + delta # viewer for `git` and `diff` output + dust # pretty `du` version + duf # better `df` clone + 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` + 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 + ]; + in { imports = [ @@ -66,12 +117,6 @@ in home.packages = with pkgs; [ - # hex viewer - hexyl - - # find typos in code - typos - # python formatter ruff @@ -79,40 +124,13 @@ in hugo go - # java development - google-java-format # formatter - jdk # java - # for benchmaking stuff hyperfine - # replacements for common posix tools - eza # ls replacement - bat # pretty `cat` clone - delta # viewer for `git` and `diff` output - dust # pretty `du` version - duf # better `df` clone - 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 - - # alternative to `find` - fd - - # adds `sensors` command - lm_sensors - just pfetch-rs waypipe - htop - bottom - wget - unzip - compsize - killall sshfs @@ -125,10 +143,6 @@ in # "~~matt's~~ my trace route" mtr - file - - b3sum - ffmpeg-full # microcontroller tooling @@ -152,15 +166,11 @@ in binwalk - smartmontools - # clang-format and clang-tidy clang-tools clang gdb - fio - age git-crypt @@ -178,13 +188,6 @@ in borgbackup - tinyxxd - - bfc - - # java assembler - jasmin - # used to deploy nix system to server # (and in the future, desktop) deploy-rs @@ -193,7 +196,9 @@ in powerstat ] ++ rust_pkgs - ++ lsps; + ++ lsps + ++ java_tools + ++ common_tools; # https://github.com/flamegraph-rs/flamegraph home.file.".cargo/config.toml".text = '' @@ -202,11 +207,6 @@ in rustflags = ["-Clink-arg=-Wl,--no-rosegment"] ''; - # default applications - home.sessionVariables = { - EDITOR = "hx"; - }; - # git (self explanatory) programs.git = { enable = true; diff --git a/home-manager/progs/helix.nix b/home-manager/progs/helix.nix index 74202c7..ccf53e2 100644 --- a/home-manager/progs/helix.nix +++ b/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; From b33f7be214181bce8c813523452d6bfa8173806b Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 24 Jun 2025 20:38:23 -0700 Subject: [PATCH 270/724] declarative-nm: remove `with lib;` --- etcnixos/declarative-nm.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/etcnixos/declarative-nm.nix b/etcnixos/declarative-nm.nix index 7fea1a0..c011896 100644 --- a/etcnixos/declarative-nm.nix +++ b/etcnixos/declarative-nm.nix @@ -4,12 +4,11 @@ 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); + getFileName = lib.stringAsChars (x: if x == " " then "-" else x); createWifi = ssid: opt: { name = "NetworkManager/system-connections/${getFileName ssid}.nmconnection"; @@ -24,21 +23,21 @@ let ssid=${ssid} [wifi-security] - ${optionalString (opt.psk != null) '' + ${lib.optionalString (opt.psk != null) '' key-mgmt=wpa-psk psk=${opt.psk}''} ''; }; }; - keyFiles = mapAttrs' createWifi config.networking.wireless.networks; + keyFiles = lib.mapAttrs' createWifi config.networking.wireless.networks; in { - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { environment.etc = keyFiles; systemd.services.NetworkManager-predefined-connections = { - restartTriggers = mapAttrsToList (name: value: value.source) keyFiles; + restartTriggers = lib.mapAttrsToList (name: value: value.source) keyFiles; serviceConfig = { Type = "oneshot"; RemainAfterExit = true; From 47888df45a7c258c70fe2163bbdbfccca810aae0 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 24 Jun 2025 21:41:57 -0700 Subject: [PATCH 271/724] remove factorio.nix from secrets --- .gitattributes | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 94ff4d4..ca3cf03 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,3 @@ -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 From 797eb0c9b4e6e15d1ef07ac5df0aec384a71fe0b Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 24 Jun 2025 23:09:34 -0700 Subject: [PATCH 272/724] remove agenix --- etcnixos/common.nix | 3 - flake.lock | 63 ------------- flake.nix | 7 -- home-manager/home-mreow.nix | 17 +--- home-manager/no-gui.nix | 2 - home-manager/progs/borg.nix | 88 ++++++++++--------- home-manager/secrets/borg-laptop-password.age | 10 --- home-manager/secrets/secrets.nix | 16 ---- 8 files changed, 47 insertions(+), 159 deletions(-) delete mode 100644 home-manager/secrets/borg-laptop-password.age delete mode 100644 home-manager/secrets/secrets.nix diff --git a/etcnixos/common.nix b/etcnixos/common.nix index f5d9526..68c6176 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -16,7 +16,6 @@ ./steam.nix ./networking.nix - inputs.agenix.nixosModules.default inputs.nixos-hardware.nixosModules.common-pc-ssd inputs.chaotic.nixosModules.default inputs.disko.nixosModules.disko @@ -210,8 +209,6 @@ dmidecode - # (inputs.agenix.packages.${pkgs.system}.default.override { ageBin = "${pkgs.rage}/bin/rage"; }) - doas-sudo-shim glib diff --git a/flake.lock b/flake.lock index 2a0e781..8005e5e 100644 --- a/flake.lock +++ b/flake.lock @@ -1,30 +1,5 @@ { "nodes": { - "agenix": { - "inputs": { - "darwin": "darwin", - "home-manager": [ - "home-manager" - ], - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems" - }, - "locked": { - "lastModified": 1750173260, - "narHash": "sha256-9P1FziAwl5+3edkfFcr5HeGtQUtrSdk/MksX39GieoA=", - "owner": "ryantm", - "repo": "agenix", - "rev": "531beac616433bac6f9e2a19feb8e99a22a66baf", - "type": "github" - }, - "original": { - "owner": "ryantm", - "repo": "agenix", - "type": "github" - } - }, "chaotic": { "inputs": { "flake-schemas": "flake-schemas", @@ -67,28 +42,6 @@ "type": "github" } }, - "darwin": { - "inputs": { - "nixpkgs": [ - "agenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1744478979, - "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "43975d782b418ebf4969e9ccba82466728c2851b", - "type": "github" - }, - "original": { - "owner": "lnl7", - "ref": "master", - "repo": "nix-darwin", - "type": "github" - } - }, "disko": { "inputs": { "nixpkgs": [ @@ -418,7 +371,6 @@ }, "root": { "inputs": { - "agenix": "agenix", "chaotic": "chaotic", "disko": "disko", "emacs-overlay": "emacs-overlay", @@ -472,21 +424,6 @@ "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": { diff --git a/flake.nix b/flake.nix index 1324c5a..5fbaf1f 100644 --- a/flake.nix +++ b/flake.nix @@ -12,12 +12,6 @@ nixos-hardware.url = "github:NixOS/nixos-hardware/master"; - agenix = { - url = "github:ryantm/agenix"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.home-manager.follows = "home-manager"; - }; - home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; @@ -64,7 +58,6 @@ nixpkgs, lanzaboote, nixos-hardware, - agenix, home-manager, ... }@inputs: diff --git a/home-manager/home-mreow.nix b/home-manager/home-mreow.nix index 234d746..67a7a0b 100644 --- a/home-manager/home-mreow.nix +++ b/home-manager/home-mreow.nix @@ -19,6 +19,8 @@ # notification daemon ./progs/dunst.nix + + ./progs/borg.nix ]; home.packages = with pkgs; [ @@ -40,21 +42,6 @@ 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; - }; - }; - programs.niri.settings.outputs = { "BOE 0x095F Unknown" = { scale = 1.5; diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index bac01d1..7b9418e 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -100,7 +100,6 @@ in imports = [ ./progs/fish.nix ./progs/helix.nix - inputs.agenix.homeManagerModules.age ( { ... }: { @@ -171,7 +170,6 @@ in clang gdb - age git-crypt imagemagick diff --git a/home-manager/progs/borg.nix b/home-manager/progs/borg.nix index 1d60f67..36291c1 100644 --- a/home-manager/progs/borg.nix +++ b/home-manager/progs/borg.nix @@ -1,51 +1,53 @@ -{ 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" - "ephemeral.json" - "Preferences" - ]) - ); + 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" + "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 = 48; + keepDaily = 30; + keepWeekly = 26; + keepMonthly = 24; + keepYearly = 10; + }; }; }; - - retention = { - keepHourly = 48; - keepDaily = 30; - keepWeekly = 26; - keepMonthly = 24; - keepYearly = 10; - }; - - storage = { - encryptionPasscommand = "cat ${borgPasswordFile}"; - }; }; } diff --git a/home-manager/secrets/borg-laptop-password.age b/home-manager/secrets/borg-laptop-password.age deleted file mode 100644 index abca559..0000000 --- a/home-manager/secrets/borg-laptop-password.age +++ /dev/null @@ -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«Xs1γn.΅ο$Χo \ No newline at end of file diff --git a/home-manager/secrets/secrets.nix b/home-manager/secrets/secrets.nix deleted file mode 100644 index 4bcb160..0000000 --- a/home-manager/secrets/secrets.nix +++ /dev/null @@ -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" - ] -)) From ba77662e84779107d151f6b52228f0d136841a7d Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 24 Jun 2025 23:28:25 -0700 Subject: [PATCH 273/724] simplify some home-manager things --- flake.nix | 3 ++- home-manager/no-gui.nix | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 5fbaf1f..ebde352 100644 --- a/flake.nix +++ b/flake.nix @@ -86,13 +86,14 @@ modules = [ home-manager.nixosModules.home-manager ( - { ... }: + { config, ... }: { # home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.extraSpecialArgs = { inherit inputs hostname username; homeDirectory = "/home/${username}"; + stateVersion = config.system.stateVersion; }; home-manager.users.${username} = import ./home-manager/home-${hostname}.nix; } diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 7b9418e..7807c52 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -5,6 +5,7 @@ homeDirectory, config, username, + stateVersion, ... }: let @@ -111,7 +112,7 @@ in ) ]; - home.stateVersion = "25.11"; + home.stateVersion = stateVersion; home.packages = with pkgs; @@ -231,6 +232,4 @@ in signByDefault = true; }; }; - - programs.home-manager.enable = true; } From a56b27f51b10501d5e3cc7e4341fc24d59907114 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 25 Jun 2025 19:18:22 -0700 Subject: [PATCH 274/724] cleanup --- etcnixos/common.nix | 14 ++++++-------- etcnixos/distrobox.nix | 11 ----------- etcnixos/steam.nix | 2 -- etcnixos/system-mreow.nix | 11 +---------- etcnixos/system-yarn.nix | 3 ++- home-manager/no-gui.nix | 3 --- 6 files changed, 9 insertions(+), 35 deletions(-) delete mode 100644 etcnixos/distrobox.nix diff --git a/etcnixos/common.nix b/etcnixos/common.nix index 68c6176..96c17cf 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -11,7 +11,6 @@ { imports = [ ./declarative-nm.nix - ./distrobox.nix # ./vm.nix ./steam.nix ./networking.nix @@ -23,7 +22,7 @@ ]; hardware.enableRedistributableFirmware = true; - hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.cpu.amd.updateMicrocode = true; swapDevices = [ ]; @@ -42,10 +41,10 @@ # extract all my secureboot keys # TODO! proper secrets management "secureboot-keys".text = '' - #!/bin/sh + #!/usr/bin/env sh rm -fr ${config.boot.lanzaboote.pkiBundle} || true mkdir -p ${config.boot.lanzaboote.pkiBundle} - ${pkgs.gnutar}/bin/tar xf ${./secrets/secureboot.tar} -C ${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} ''; @@ -85,6 +84,7 @@ "thunderbolt" "nvme" "usbhid" + "amdgpu" ]; }; @@ -145,8 +145,6 @@ ]; }; - # age.identityPaths = [ "/home/${username}/.ssh/id_ed25519" ]; - # Select internationalisation properties. i18n.defaultLocale = "en_US.UTF-8"; @@ -231,12 +229,12 @@ 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"; + system.stateVersion = "25.11"; nixpkgs.hostPlatform = "x86_64-linux"; documentation.enable = true; diff --git a/etcnixos/distrobox.nix b/etcnixos/distrobox.nix deleted file mode 100644 index cd1a5b8..0000000 --- a/etcnixos/distrobox.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ pkgs, ... }: -{ - virtualisation.podman = { - enable = true; - }; - - environment.systemPackages = [ - pkgs.distrobox - pkgs.podman-compose - ]; -} diff --git a/etcnixos/steam.nix b/etcnixos/steam.nix index 60b7edf..94fd12f 100644 --- a/etcnixos/steam.nix +++ b/etcnixos/steam.nix @@ -5,7 +5,6 @@ ... }: { - nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ @@ -17,7 +16,6 @@ programs.steam = { enable = true; - localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers extraCompatPackages = with pkgs; [ proton-ge-bin ]; }; diff --git a/etcnixos/system-mreow.nix b/etcnixos/system-mreow.nix index ca69172..317c00c 100644 --- a/etcnixos/system-mreow.nix +++ b/etcnixos/system-mreow.nix @@ -31,21 +31,12 @@ enable = true; settings = { default_session = { - command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd niri-session"; + command = "${lib.getExe pkgs.greetd.tuigreet} --time --cmd niri-session"; user = username; }; }; }; - programs.gamescope = { - enable = true; - capSysNice = true; - }; - - programs.steam = { - gamescopeSession.enable = true; - }; - system.activationScripts = { # FIX: https://github.com/NixOS/nix/issues/2982 "profile-channel-dummy".text = '' diff --git a/etcnixos/system-yarn.nix b/etcnixos/system-yarn.nix index 7f4cd03..db0bfb6 100644 --- a/etcnixos/system-yarn.nix +++ b/etcnixos/system-yarn.nix @@ -58,7 +58,8 @@ # }; programs.steam = { - remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play + remotePlay.openFirewall = true; + localNetworkGameTransfers.openFirewall = true; }; # LACT (Linux AMDGPU Configuration Tool): https://github.com/ilya-zlobintsev/LACT diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 7807c52..553df0a 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -127,8 +127,6 @@ in # for benchmaking stuff hyperfine - just - pfetch-rs waypipe @@ -181,7 +179,6 @@ in # terminal image viewer timg - lsof tcpdump From f179ce7869a18f9fbbb68b0d2ede9905a8fb46cd Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 25 Jun 2025 19:22:16 -0700 Subject: [PATCH 275/724] 25.05 --- deploy.sh | 2 +- etcnixos/common.nix | 6 +-- flake.lock | 125 ++++--------------------------------------- flake.nix | 10 +--- home-manager/gui.nix | 2 +- 5 files changed, 15 insertions(+), 130 deletions(-) diff --git a/deploy.sh b/deploy.sh index c7fa778..76a0e9a 100755 --- a/deploy.sh +++ b/deploy.sh @@ -5,4 +5,4 @@ if [ "$ARG" = "" ]; then ARG="boot" fi -nixos-rebuild "$ARG" --flake . --sudo +nixos-rebuild "$ARG" --flake . --use-remote-sudo diff --git a/etcnixos/common.nix b/etcnixos/common.nix index 96c17cf..511cd92 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -16,7 +16,6 @@ ./networking.nix inputs.nixos-hardware.nixosModules.common-pc-ssd - inputs.chaotic.nixosModules.default inputs.disko.nixosModules.disko inputs.lanzaboote.nixosModules.lanzaboote ]; @@ -52,8 +51,7 @@ # kernel options boot = { - kernelPackages = pkgs.linuxPackages_cachyos-lto; - # kernelPackages = pkgs.linuxPackages_latest; + kernelPackages = pkgs.linuxPackages_latest; # kernelPackages = pkgs.linuxPackages; lanzaboote = { @@ -234,7 +232,7 @@ ''; }; - system.stateVersion = "25.11"; + system.stateVersion = "25.05"; nixpkgs.hostPlatform = "x86_64-linux"; documentation.enable = true; diff --git a/flake.lock b/flake.lock index 8005e5e..d1a3614 100644 --- a/flake.lock +++ b/flake.lock @@ -1,32 +1,5 @@ { "nodes": { - "chaotic": { - "inputs": { - "flake-schemas": "flake-schemas", - "home-manager": [ - "home-manager" - ], - "jovian": "jovian", - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1750642025, - "narHash": "sha256-ZixZpSMtrf2MFw7Ztg6JUbMRkoxxvDDipQCPqnlCDgE=", - "owner": "chaotic-cx", - "repo": "nyx", - "rev": "2b666bb8aca306397ef6abb68dec67e78680882b", - "type": "github" - }, - "original": { - "owner": "chaotic-cx", - "ref": "nyxpkgs-unstable", - "repo": "nyx", - "type": "github" - } - }, "crane": { "locked": { "lastModified": 1748970125, @@ -123,20 +96,6 @@ "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": [ @@ -166,41 +125,20 @@ ] }, "locked": { - "lastModified": 1750690749, - "narHash": "sha256-x6fRPeqdgDKVTCyvbp4J8Q5UQ3DV3oWYSoyM444N8cY=", + "lastModified": 1750792728, + "narHash": "sha256-Lh3dopA8DdY+ZoaAJPrtkZOZaFEJGSYjOdAYYgOPgE4=", "owner": "nix-community", "repo": "home-manager", - "rev": "05b8c9506452349d8be854ac46e5a7630fa7917d", + "rev": "366f00797b1efb70f2882d3da485e3c10fd3d557", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } }, - "jovian": { - "inputs": { - "nix-github-actions": "nix-github-actions", - "nixpkgs": [ - "chaotic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1750403547, - "narHash": "sha256-XDDINMbHTtKQeSRpX5mwq20z23Wg/I/G4JUinA3V8Xg=", - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", - "rev": "52b86b86d925ec00c836ecc6d36f9c947bb15736", - "type": "github" - }, - "original": { - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", - "type": "github" - } - }, "lanzaboote": { "inputs": { "crane": "crane", @@ -288,29 +226,6 @@ "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": 1750431636, @@ -329,16 +244,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1750506804, - "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=", + "lastModified": 1750622754, + "narHash": "sha256-kMhs+YzV4vPGfuTpD3mwzibWUE6jotw5Al2wczI0Pv8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4206c4cb56751df534751b058295ea61357bbbaa", + "rev": "c7ab75210cb8cb16ddd8f290755d9558edde7ee1", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } @@ -371,7 +286,6 @@ }, "root": { "inputs": { - "chaotic": "chaotic", "disko": "disko", "emacs-overlay": "emacs-overlay", "home-manager": "home-manager", @@ -379,32 +293,11 @@ "niri": "niri", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", - "rust-overlay": "rust-overlay_2", + "rust-overlay": "rust-overlay", "zen-browser": "zen-browser" } }, "rust-overlay": { - "inputs": { - "nixpkgs": [ - "chaotic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1750560265, - "narHash": "sha256-jQCojKl1/TzqE6ANOu6rP2qqxOcGK2xs6hpxZ77wrR8=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "076fdb0d45a9de3f379a626f51a62c78afe7efb1", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_2": { "inputs": { "nixpkgs": [ "nixpkgs" diff --git a/flake.nix b/flake.nix index ebde352..3396c36 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "System nixOS flake"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; lanzaboote = { url = "github:nix-community/lanzaboote"; @@ -13,16 +13,10 @@ nixos-hardware.url = "github:NixOS/nixos-hardware/master"; home-manager = { - url = "github:nix-community/home-manager"; + url = "github:nix-community/home-manager/release-25.05"; inputs.nixpkgs.follows = "nixpkgs"; }; - chaotic = { - url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.home-manager.follows = "home-manager"; - }; - disko = { url = "github:nix-community/disko/latest"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home-manager/gui.nix b/home-manager/gui.nix index 5b4d321..cfac791 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -63,7 +63,7 @@ finamp # music player delfin # jellyfin client - signal-desktop + signal-desktop-bin #accounting # gnucash From e371f53452373dde49d1ac48532584ad4329bc55 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 25 Jun 2025 23:20:32 -0700 Subject: [PATCH 276/724] move imports around regarding emacs stuff --- home-manager/no-gui.nix | 1 - home-manager/progs/emacs.nix | 18 +++++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 553df0a..68d5984 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -106,7 +106,6 @@ in { nixpkgs.overlays = [ inputs.rust-overlay.overlays.default - inputs.emacs-overlay.overlays.default ]; } ) diff --git a/home-manager/progs/emacs.nix b/home-manager/progs/emacs.nix index 50e86d7..49a1821 100644 --- a/home-manager/progs/emacs.nix +++ b/home-manager/progs/emacs.nix @@ -1,5 +1,21 @@ -{ pkgs, config, ... }: { + pkgs, + config, + inputs, + ... +}: +{ + imports = [ + ( + { ... }: + { + nixpkgs.overlays = [ + inputs.emacs-overlay.overlays.default + ]; + } + ) + ]; + programs.emacs = { enable = true; package = pkgs.emacs-unstable-pgtk; From 9818f61967af05b1cd1be67b37b6bc424fb253e9 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 26 Jun 2025 09:40:56 -0700 Subject: [PATCH 277/724] update --- flake.lock | 60 +++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index d1a3614..e61d120 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "crane": { "locked": { - "lastModified": 1748970125, - "narHash": "sha256-UDyigbDGv8fvs9aS95yzFfOKkEjx1LO3PL3DsKopohA=", + "lastModified": 1750266157, + "narHash": "sha256-tL42YoNg9y30u7zAqtoGDNdTyXTi8EALDeCB13FtbQA=", "owner": "ipetkov", "repo": "crane", - "rev": "323b5746d89e04b22554b061522dfce9e4c49b18", + "rev": "e37c943371b73ed87faf33f7583860f81f1d5a48", "type": "github" }, "original": { @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1750671239, - "narHash": "sha256-eCO6mRAj2k3l1DfgiQO2u6rzs/vDNSykgIHPwRh093w=", + "lastModified": 1750955233, + "narHash": "sha256-24fz4lFYIk0dbyHOliDpswxFR1/5pw0Ch7C2I/SCKP4=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "3b85ea2f827634d8d582bdc92e1c1a7eb90794ca", + "rev": "08ff3efae64b5e8b0e7748b655d811731cf72ea6", "type": "github" }, "original": { @@ -153,11 +153,11 @@ ] }, "locked": { - "lastModified": 1750168384, - "narHash": "sha256-PBfJ7dGsR02im/RYN8wXII8yNPFhKxiPdq+JDfbvD2k=", + "lastModified": 1750866260, + "narHash": "sha256-fo5NvfutMEw9OV+5rGYuCKjlNNjcnD3cKMbOfzusO/E=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "38c2addd2e0cedcb03708de6e6c21fb1be86d410", + "rev": "f40a3401f86d117affeeb8ca6f0ce5cd1ca3cc24", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1750689145, - "narHash": "sha256-vlJ0oQsrA68R7UNl+ZujH/LwzNJz6198tBQaXmtkvrc=", + "lastModified": 1750920099, + "narHash": "sha256-Nt906asgI25vQ+/FFHpZ2VeS8N3EMxRBlt9o7F2+Ib8=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "03153ce955a8ad754b0f2bb4fa25cbbcb9832f25", + "rev": "151cff5b067b51384cf88d5bd5a4ec74b5984c7c", "type": "github" }, "original": { @@ -213,11 +213,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1750684365, - "narHash": "sha256-BqtoSRCgmutJXnQFZs+KFMNvp3LuX6POIHjXIxWdlTE=", + "lastModified": 1750791124, + "narHash": "sha256-F5iVU/hjoSHSSe0gllxm0PcAaseEtGNanYK5Ha3k2Tg=", "owner": "YaLTeR", "repo": "niri", - "rev": "4c02f3bba451747c3f337f4c131b0c7f9ef41bb7", + "rev": "37458d94b288945f6cfbd3c5c233f634d59f246c", "type": "github" }, "original": { @@ -228,11 +228,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1750431636, - "narHash": "sha256-vnzzBDbCGvInmfn2ijC4HsIY/3W1CWbwS/YQoFgdgPg=", + "lastModified": 1750837715, + "narHash": "sha256-2m1ceZjbmgrJCZ2PuQZaK4in3gcg3o6rZ7WK6dr5vAA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "1552a9f4513f3f0ceedcf90320e48d3d47165712", + "rev": "98236410ea0fe204d0447149537a924fb71a6d4f", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1750622754, - "narHash": "sha256-kMhs+YzV4vPGfuTpD3mwzibWUE6jotw5Al2wczI0Pv8=", + "lastModified": 1750838302, + "narHash": "sha256-aVkL3/yu50oQzi2YuKo0ceiCypVZpZXYd2P2p1FMJM4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c7ab75210cb8cb16ddd8f290755d9558edde7ee1", + "rev": "7284e2decc982b81a296ab35aa46e804baaa1cfe", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1750646674, - "narHash": "sha256-gHg6QUjMi1ObrocQUAoEhhbIfop14UNae4QDSHoKsRU=", + "lastModified": 1750905536, + "narHash": "sha256-Mo7yXM5IvMGNvJPiNkFsVT2UERmnvjsKgnY6UyDdySQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "65162ae665154e0eddb395166bd4956358981dd0", + "rev": "2fa7c0aabd15fa0ccc1dc7e675a4fcf0272ad9a1", "type": "github" }, "original": { @@ -337,11 +337,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1750686869, - "narHash": "sha256-FS/rYXd96VBtKNJRTV2xTpTk8CgrYP+lFsFj0+VKgoY=", + "lastModified": 1750821680, + "narHash": "sha256-Bu5unTxnqok2RoU5P394Gh0vRaoyI/5xlOOJDF6akrc=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "117af56a83e2d1d25016fbd504a2a040babe586a", + "rev": "2e7c318ac2bbf699b6ab92ef91e661e16415dfac", "type": "github" }, "original": { @@ -360,11 +360,11 @@ ] }, "locked": { - "lastModified": 1750649182, - "narHash": "sha256-beNAQ63SY8HxBsFdMGv/fdLzjQMYgifMh1DcmaIzMjo=", + "lastModified": 1750907909, + "narHash": "sha256-2WzRZLFUlu13iRGsP+tsaJhCOUESmL8gKtT7zY14TzE=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "c0785a69fe3988b4ef44c74575f4a2f698f91f32", + "rev": "ac0fcd7e963dce814b69cbedc4d510a95094cc15", "type": "github" }, "original": { From dd31ecc11efe28915e7b81b4b2115600f1872027 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 28 Jun 2025 11:01:31 -0700 Subject: [PATCH 278/724] signal-desktop-bin -> signal-desktop --- home-manager/gui.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/gui.nix b/home-manager/gui.nix index cfac791..5b4d321 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -63,7 +63,7 @@ finamp # music player delfin # jellyfin client - signal-desktop-bin + signal-desktop #accounting # gnucash From d0ff1ffdfc16a000f42ffb3afef4cbe7567bb808 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 28 Jun 2025 23:45:30 -0700 Subject: [PATCH 279/724] update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index e61d120..1ec72f3 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1750955233, - "narHash": "sha256-24fz4lFYIk0dbyHOliDpswxFR1/5pw0Ch7C2I/SCKP4=", + "lastModified": 1751164253, + "narHash": "sha256-hJmYTh/cS3TWI+JF1AniGpw/HXycruk4HV4xIZjMipo=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "08ff3efae64b5e8b0e7748b655d811731cf72ea6", + "rev": "10f086fb8668f0e3d08cd2a01180abccc43f6552", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1750920099, - "narHash": "sha256-Nt906asgI25vQ+/FFHpZ2VeS8N3EMxRBlt9o7F2+Ib8=", + "lastModified": 1751179061, + "narHash": "sha256-E3SA2IZf72CR3wklJM+cF1ZOVjy6r8ZqbsOPXodNjWo=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "151cff5b067b51384cf88d5bd5a4ec74b5984c7c", + "rev": "cc5722e779f3b32bdd918e473777c39da67ab1b6", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1750838302, - "narHash": "sha256-aVkL3/yu50oQzi2YuKo0ceiCypVZpZXYd2P2p1FMJM4=", + "lastModified": 1750969886, + "narHash": "sha256-zW/OFnotiz/ndPFdebpo3X0CrbVNf22n4DjN2vxlb58=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7284e2decc982b81a296ab35aa46e804baaa1cfe", + "rev": "a676066377a2fe7457369dd37c31fd2263b662f4", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1750905536, - "narHash": "sha256-Mo7yXM5IvMGNvJPiNkFsVT2UERmnvjsKgnY6UyDdySQ=", + "lastModified": 1751165203, + "narHash": "sha256-3QhlpAk2yn+ExwvRLtaixWsVW1q3OX3KXXe0l8VMLl4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "2fa7c0aabd15fa0ccc1dc7e675a4fcf0272ad9a1", + "rev": "90f547b90e73d3c6025e66c5b742d6db51c418c3", "type": "github" }, "original": { @@ -337,11 +337,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1750821680, - "narHash": "sha256-Bu5unTxnqok2RoU5P394Gh0vRaoyI/5xlOOJDF6akrc=", + "lastModified": 1751176151, + "narHash": "sha256-7bK5eoK0ySlct/cbehTrkGcTcSMOLXSnh+RJiswVzEU=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "2e7c318ac2bbf699b6ab92ef91e661e16415dfac", + "rev": "91d463851e24c190cc912471861b5414ac8fe65c", "type": "github" }, "original": { @@ -360,11 +360,11 @@ ] }, "locked": { - "lastModified": 1750907909, - "narHash": "sha256-2WzRZLFUlu13iRGsP+tsaJhCOUESmL8gKtT7zY14TzE=", + "lastModified": 1751161919, + "narHash": "sha256-t08tIneq3fcA2eRZVMR6Kt1MCJHpPwc+5pDHGVOJUbA=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "ac0fcd7e963dce814b69cbedc4d510a95094cc15", + "rev": "0210fe94de8d6825ceb15249bf03840c8ca44e2b", "type": "github" }, "original": { From f0bd751b893c660e3b2948e49b7272f5c47b3e48 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 30 Jun 2025 19:53:24 -0700 Subject: [PATCH 280/724] update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 1ec72f3..26b8917 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1751164253, - "narHash": "sha256-hJmYTh/cS3TWI+JF1AniGpw/HXycruk4HV4xIZjMipo=", + "lastModified": 1751337127, + "narHash": "sha256-mP8SC6SWFZiji6DH65PObaKUphLLCN8FoiXmVztdR5o=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "10f086fb8668f0e3d08cd2a01180abccc43f6552", + "rev": "3e2b295e2dcad08449f48669a2d1ef2596b2e5d3", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1751179061, - "narHash": "sha256-E3SA2IZf72CR3wklJM+cF1ZOVjy6r8ZqbsOPXodNjWo=", + "lastModified": 1751335430, + "narHash": "sha256-OVP1yknJHvRK+eIy56UZsf9kUXSmwlwitPa9dZ0/HWo=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "cc5722e779f3b32bdd918e473777c39da67ab1b6", + "rev": "fab3c874b28d95696225b4e575c3b6dc5d6058fe", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1750969886, - "narHash": "sha256-zW/OFnotiz/ndPFdebpo3X0CrbVNf22n4DjN2vxlb58=", + "lastModified": 1751211869, + "narHash": "sha256-1Cu92i1KSPbhPCKxoiVG5qnoRiKTgR5CcGSRyLpOd7Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a676066377a2fe7457369dd37c31fd2263b662f4", + "rev": "b43c397f6c213918d6cfe6e3550abfe79b5d1c51", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1751165203, - "narHash": "sha256-3QhlpAk2yn+ExwvRLtaixWsVW1q3OX3KXXe0l8VMLl4=", + "lastModified": 1751338093, + "narHash": "sha256-/yd9nPcTfUZPFtwjRbdB5yGLdt3LTPqz6Ja63Joiahs=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "90f547b90e73d3c6025e66c5b742d6db51c418c3", + "rev": "6cfb7821732dac2d3e2dea857a5613d3b856c20c", "type": "github" }, "original": { @@ -337,11 +337,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1751176151, - "narHash": "sha256-7bK5eoK0ySlct/cbehTrkGcTcSMOLXSnh+RJiswVzEU=", + "lastModified": 1751228685, + "narHash": "sha256-MENtauGBhJ+kDeFaawvWGXaFG3Il6qQzjaP0RmtfM0k=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "91d463851e24c190cc912471861b5414ac8fe65c", + "rev": "557ebeb616e03d5e4a8049862bbbd1f02c6f020b", "type": "github" }, "original": { @@ -360,11 +360,11 @@ ] }, "locked": { - "lastModified": 1751161919, - "narHash": "sha256-t08tIneq3fcA2eRZVMR6Kt1MCJHpPwc+5pDHGVOJUbA=", + "lastModified": 1751321974, + "narHash": "sha256-0NtaKDtjY8Gmj++e8ZzpFkKFp6+7AcBW+Qefj4LihAk=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "0210fe94de8d6825ceb15249bf03840c8ca44e2b", + "rev": "03b5b1e1540b03e77e22a66379c3cddc3a7197f5", "type": "github" }, "original": { From 002a42bd7150b70bce3878ebdf32a87782db3aa7 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 30 Jun 2025 20:12:09 -0700 Subject: [PATCH 281/724] systemd-boot: configurationLimit --- etcnixos/common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/etcnixos/common.nix b/etcnixos/common.nix index 511cd92..cd8a456 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -72,6 +72,7 @@ for now. */ systemd-boot.enable = lib.mkForce false; + systemd-boot.configurationLimit = 10; }; From ee807c7e0f4310adab9fccad73edeba49700a048 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 30 Jun 2025 20:17:31 -0700 Subject: [PATCH 282/724] Revert "update" This reverts commit 2cc9f73f48ea74522d05803936ae2bfb7df09105. --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 26b8917..1ec72f3 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1751337127, - "narHash": "sha256-mP8SC6SWFZiji6DH65PObaKUphLLCN8FoiXmVztdR5o=", + "lastModified": 1751164253, + "narHash": "sha256-hJmYTh/cS3TWI+JF1AniGpw/HXycruk4HV4xIZjMipo=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "3e2b295e2dcad08449f48669a2d1ef2596b2e5d3", + "rev": "10f086fb8668f0e3d08cd2a01180abccc43f6552", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1751335430, - "narHash": "sha256-OVP1yknJHvRK+eIy56UZsf9kUXSmwlwitPa9dZ0/HWo=", + "lastModified": 1751179061, + "narHash": "sha256-E3SA2IZf72CR3wklJM+cF1ZOVjy6r8ZqbsOPXodNjWo=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "fab3c874b28d95696225b4e575c3b6dc5d6058fe", + "rev": "cc5722e779f3b32bdd918e473777c39da67ab1b6", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1751211869, - "narHash": "sha256-1Cu92i1KSPbhPCKxoiVG5qnoRiKTgR5CcGSRyLpOd7Y=", + "lastModified": 1750969886, + "narHash": "sha256-zW/OFnotiz/ndPFdebpo3X0CrbVNf22n4DjN2vxlb58=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b43c397f6c213918d6cfe6e3550abfe79b5d1c51", + "rev": "a676066377a2fe7457369dd37c31fd2263b662f4", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1751338093, - "narHash": "sha256-/yd9nPcTfUZPFtwjRbdB5yGLdt3LTPqz6Ja63Joiahs=", + "lastModified": 1751165203, + "narHash": "sha256-3QhlpAk2yn+ExwvRLtaixWsVW1q3OX3KXXe0l8VMLl4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "6cfb7821732dac2d3e2dea857a5613d3b856c20c", + "rev": "90f547b90e73d3c6025e66c5b742d6db51c418c3", "type": "github" }, "original": { @@ -337,11 +337,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1751228685, - "narHash": "sha256-MENtauGBhJ+kDeFaawvWGXaFG3Il6qQzjaP0RmtfM0k=", + "lastModified": 1751176151, + "narHash": "sha256-7bK5eoK0ySlct/cbehTrkGcTcSMOLXSnh+RJiswVzEU=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "557ebeb616e03d5e4a8049862bbbd1f02c6f020b", + "rev": "91d463851e24c190cc912471861b5414ac8fe65c", "type": "github" }, "original": { @@ -360,11 +360,11 @@ ] }, "locked": { - "lastModified": 1751321974, - "narHash": "sha256-0NtaKDtjY8Gmj++e8ZzpFkKFp6+7AcBW+Qefj4LihAk=", + "lastModified": 1751161919, + "narHash": "sha256-t08tIneq3fcA2eRZVMR6Kt1MCJHpPwc+5pDHGVOJUbA=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "03b5b1e1540b03e77e22a66379c3cddc3a7197f5", + "rev": "0210fe94de8d6825ceb15249bf03840c8ca44e2b", "type": "github" }, "original": { From c4b4598a5f2ad4a602834e9aba66375513b63eef Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 7 Jul 2025 03:43:58 -0700 Subject: [PATCH 283/724] update --- flake.lock | 60 +++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index 1ec72f3..ecdc9d5 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1751164253, - "narHash": "sha256-hJmYTh/cS3TWI+JF1AniGpw/HXycruk4HV4xIZjMipo=", + "lastModified": 1751879680, + "narHash": "sha256-Ds+BCEUMgMBLaZRURHh8uVLVb0J6EVBxU5jtvXOldGM=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "10f086fb8668f0e3d08cd2a01180abccc43f6552", + "rev": "7117741b454cf1aa6c6d47f1a8d213e62ab0bb84", "type": "github" }, "original": { @@ -125,11 +125,11 @@ ] }, "locked": { - "lastModified": 1750792728, - "narHash": "sha256-Lh3dopA8DdY+ZoaAJPrtkZOZaFEJGSYjOdAYYgOPgE4=", + "lastModified": 1751810233, + "narHash": "sha256-kllkNbIqQi3VplgTMeGzuh1t8Gk8TauvkTRt93Km+tQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "366f00797b1efb70f2882d3da485e3c10fd3d557", + "rev": "9b0873b46c9f9e4b7aa01eb634952c206af53068", "type": "github" }, "original": { @@ -153,11 +153,11 @@ ] }, "locked": { - "lastModified": 1750866260, - "narHash": "sha256-fo5NvfutMEw9OV+5rGYuCKjlNNjcnD3cKMbOfzusO/E=", + "lastModified": 1751381593, + "narHash": "sha256-js1XwtJpYhvQrrTaVzViybpztkHJVZ63aXOlFAcTENM=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "f40a3401f86d117affeeb8ca6f0ce5cd1ca3cc24", + "rev": "f4eb75540307c2b33521322c04b7fea74e48a66f", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1751179061, - "narHash": "sha256-E3SA2IZf72CR3wklJM+cF1ZOVjy6r8ZqbsOPXodNjWo=", + "lastModified": 1751866241, + "narHash": "sha256-9UJmOYKYXx/hrXTAtFCJtlrIRQmuRLQ+IKj9eTeFIXc=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "cc5722e779f3b32bdd918e473777c39da67ab1b6", + "rev": "59e74c8ac38b131d664a667e046861bd72f5b651", "type": "github" }, "original": { @@ -228,11 +228,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1750837715, - "narHash": "sha256-2m1ceZjbmgrJCZ2PuQZaK4in3gcg3o6rZ7WK6dr5vAA=", + "lastModified": 1751432711, + "narHash": "sha256-136MeWtckSHTN9Z2WRNRdZ8oRP3vyx3L8UxeBYE+J9w=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "98236410ea0fe204d0447149537a924fb71a6d4f", + "rev": "497ae1357f1ac97f1aea31a4cb74ad0d534ef41f", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1750969886, - "narHash": "sha256-zW/OFnotiz/ndPFdebpo3X0CrbVNf22n4DjN2vxlb58=", + "lastModified": 1751741127, + "narHash": "sha256-t75Shs76NgxjZSgvvZZ9qOmz5zuBE8buUaYD28BMTxg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a676066377a2fe7457369dd37c31fd2263b662f4", + "rev": "29e290002bfff26af1db6f64d070698019460302", "type": "github" }, "original": { @@ -271,11 +271,11 @@ ] }, "locked": { - "lastModified": 1749636823, - "narHash": "sha256-WUaIlOlPLyPgz9be7fqWJA5iG6rHcGRtLERSCfUDne4=", + "lastModified": 1750779888, + "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "623c56286de5a3193aa38891a6991b28f9bab056", + "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1751165203, - "narHash": "sha256-3QhlpAk2yn+ExwvRLtaixWsVW1q3OX3KXXe0l8VMLl4=", + "lastModified": 1751856221, + "narHash": "sha256-/QE1eV0ckFvgRMcKjZqgdJDoXFNwSMepwRoBjaw2MCk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "90f547b90e73d3c6025e66c5b742d6db51c418c3", + "rev": "34cae4b56929c5b340e1c5b10d9a98a425b2a51e", "type": "github" }, "original": { @@ -337,11 +337,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1751176151, - "narHash": "sha256-7bK5eoK0ySlct/cbehTrkGcTcSMOLXSnh+RJiswVzEU=", + "lastModified": 1751228685, + "narHash": "sha256-MENtauGBhJ+kDeFaawvWGXaFG3Il6qQzjaP0RmtfM0k=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "91d463851e24c190cc912471861b5414ac8fe65c", + "rev": "557ebeb616e03d5e4a8049862bbbd1f02c6f020b", "type": "github" }, "original": { @@ -360,11 +360,11 @@ ] }, "locked": { - "lastModified": 1751161919, - "narHash": "sha256-t08tIneq3fcA2eRZVMR6Kt1MCJHpPwc+5pDHGVOJUbA=", + "lastModified": 1751858709, + "narHash": "sha256-xghd1GDPRSa6aD6tEk2JCuQDZWdHITlCA/stwSVoZJQ=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "0210fe94de8d6825ceb15249bf03840c8ca44e2b", + "rev": "216dd333fa41aa013bf8aab9322d7c1a2aee5b4a", "type": "github" }, "original": { From 16066018d0342e59b79cf0dab5ad355c9bffdd50 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 7 Jul 2025 04:15:28 -0700 Subject: [PATCH 284/724] switch back to alacritty --- README.md | 2 +- home-manager/gui.nix | 3 +- home-manager/progs/alacritty.nix | 131 +++++++++++++++++++++++++++++++ 3 files changed, 134 insertions(+), 2 deletions(-) create mode 100644 home-manager/progs/alacritty.nix diff --git a/README.md b/README.md index 933dc87..64cc642 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Browser: Firefox 🦊 (actually [Zen Browser](https://github.com/zen-browser/des Text Editor: [Doom Emacs](https://github.com/doomemacs/doomemacs) -Terminal: [ghostty](https://github.com/ghostty-org/ghostty) +Terminal: [alacritty](https://github.com/alacritty/alacritty) Shell: [fish](https://fishshell.com/) with the [pure](https://github.com/pure-fish/pure) prompt diff --git a/home-manager/gui.nix b/home-manager/gui.nix index 5b4d321..0dce8d1 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -7,7 +7,8 @@ { imports = [ ./no-gui.nix - ./progs/ghostty.nix + # ./progs/ghostty.nix + ./progs/alacritty.nix ./progs/emacs.nix # ./progs/trezor.nix # - broken ]; diff --git a/home-manager/progs/alacritty.nix b/home-manager/progs/alacritty.nix new file mode 100644 index 0000000..63484a2 --- /dev/null +++ b/home-manager/progs/alacritty.nix @@ -0,0 +1,131 @@ +{ pkgs, ... }: +{ + home.sessionVariables = { + TERMINAL = "alacritty"; + }; + + programs.alacritty = { + enable = true; + package = pkgs.alacritty; + settings = { + # some programs can't handle alacritty + env.TERM = "xterm-256color"; + + window = { + # using a window manager, no decorations needed + decorations = "none"; + + # semi-transparent + opacity = 0.90; + + # padding between the content of the terminal and the edge + padding = { + x = 10; + y = 10; + }; + + dimensions = { + columns = 80; + lines = 40; + }; + }; + + scrolling = { + history = 1000; + multiplier = 3; + }; + + font = + let + baseFont = { + family = "JetBrains Mono Nerd Font"; + style = "Regular"; + }; + in + { + size = 12; + + normal = baseFont; + + bold = baseFont // { + style = "Bold"; + }; + + italic = baseFont // { + style = "Italic"; + }; + + offset.y = 0; + glyph_offset.y = 0; + }; + + # color scheme + colors = + let + normal = { + black = "0x1b1e28"; + red = "0xd0679d"; + green = "0x5de4c7"; + yellow = "0xfffac2"; + blue = "#435c89"; + magenta = "0xfcc5e9"; + cyan = "0xadd7ff"; + white = "0xffffff"; + }; + + bright = { + black = "0xa6accd"; + red = normal.red; + green = normal.green; + yellow = normal.yellow; + blue = normal.cyan; + magenta = "0xfae4fc"; + cyan = "0x89ddff"; + white = normal.white; + }; + in + { + inherit normal bright; + primary = { + background = "0x131621"; + foreground = bright.black; + }; + + cursor = { + text = "CellBackground"; + cursor = "CellForeground"; + }; + + search = + let + foreground = normal.black; + background = normal.cyan; + in + { + matches = { + inherit foreground background; + }; + + focused_match = { + inherit foreground background; + }; + }; + + selection = { + text = "CellForeground"; + background = "0x303340"; + }; + + vi_mode_cursor = { + text = "CellBackground"; + cursor = "CellForeground"; + }; + }; + + cursor = { + style = "Underline"; + vi_mode_style = "Underline"; + }; + }; + }; +} From 6471ec21aa33835f5596260224521a3387e6f99a Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 8 Jul 2025 10:33:39 -0700 Subject: [PATCH 285/724] add back easyeffects --- home-manager/home-mreow.nix | 2 + .../progs/framework-13-easyeffects.nix | 121 ++++++++++++++++++ 2 files changed, 123 insertions(+) create mode 100644 home-manager/progs/framework-13-easyeffects.nix diff --git a/home-manager/home-mreow.nix b/home-manager/home-mreow.nix index 67a7a0b..a2068cb 100644 --- a/home-manager/home-mreow.nix +++ b/home-manager/home-mreow.nix @@ -21,6 +21,8 @@ ./progs/dunst.nix ./progs/borg.nix + + ./progs/framework-13-easyeffects.nix ]; home.packages = with pkgs; [ diff --git a/home-manager/progs/framework-13-easyeffects.nix b/home-manager/progs/framework-13-easyeffects.nix new file mode 100644 index 0000000..1dca4e1 --- /dev/null +++ b/home-manager/progs/framework-13-easyeffects.nix @@ -0,0 +1,121 @@ +{ + 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"; + }; +} From d09459684aad699768db5cf98221a37b333bbaf9 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 9 Jul 2025 18:43:36 -0700 Subject: [PATCH 286/724] update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index ecdc9d5..91bdba8 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1751879680, - "narHash": "sha256-Ds+BCEUMgMBLaZRURHh8uVLVb0J6EVBxU5jtvXOldGM=", + "lastModified": 1752111590, + "narHash": "sha256-ofDzLg2T64oLfBJrDUV5EvT55KaIgbHjZC5W+3chdc4=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "7117741b454cf1aa6c6d47f1a8d213e62ab0bb84", + "rev": "5c75507a03c0ee10985b9124a344fd457a219c63", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1751866241, - "narHash": "sha256-9UJmOYKYXx/hrXTAtFCJtlrIRQmuRLQ+IKj9eTeFIXc=", + "lastModified": 1752078530, + "narHash": "sha256-TrRmlYdhWcadWvBpDjB9Xlry4uT4ZUIO46d+o5tjtCQ=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "59e74c8ac38b131d664a667e046861bd72f5b651", + "rev": "d231d92313192d4d0c78d6ef04167fed9dee87cf", "type": "github" }, "original": { @@ -228,11 +228,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1751432711, - "narHash": "sha256-136MeWtckSHTN9Z2WRNRdZ8oRP3vyx3L8UxeBYE+J9w=", + "lastModified": 1752048960, + "narHash": "sha256-gATnkOe37eeVwKKYCsL+OnS2gU4MmLuZFzzWCtaKLI8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "497ae1357f1ac97f1aea31a4cb74ad0d534ef41f", + "rev": "7ced9122cff2163c6a0212b8d1ec8c33a1660806", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1751741127, - "narHash": "sha256-t75Shs76NgxjZSgvvZZ9qOmz5zuBE8buUaYD28BMTxg=", + "lastModified": 1751943650, + "narHash": "sha256-7orTnNqkGGru8Je6Un6mq1T8YVVU/O5kyW4+f9C1mZQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "29e290002bfff26af1db6f64d070698019460302", + "rev": "88983d4b665fb491861005137ce2b11a9f89f203", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1751856221, - "narHash": "sha256-/QE1eV0ckFvgRMcKjZqgdJDoXFNwSMepwRoBjaw2MCk=", + "lastModified": 1752028888, + "narHash": "sha256-LRj3/PUpII6taWOrX1w/OeI6f1ncND02PP/kEHvPCqU=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "34cae4b56929c5b340e1c5b10d9a98a425b2a51e", + "rev": "a0f1c656e053463b47639234b151a05e4441bb19", "type": "github" }, "original": { @@ -360,11 +360,11 @@ ] }, "locked": { - "lastModified": 1751858709, - "narHash": "sha256-xghd1GDPRSa6aD6tEk2JCuQDZWdHITlCA/stwSVoZJQ=", + "lastModified": 1752092563, + "narHash": "sha256-BaMI8wRzisEARstVTRdRD5X+Lui1Td/FIaAwFOp+JVo=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "216dd333fa41aa013bf8aab9322d7c1a2aee5b4a", + "rev": "75b7d67318f7e5cc1c8f3ceff961c379da7efe8e", "type": "github" }, "original": { From 49f4c86fa72659621a1f0ea72ce5e2aeb88c3ef9 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 10 Jul 2025 00:05:48 -0700 Subject: [PATCH 287/724] add pciutils --- home-manager/no-gui.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 68d5984..2954445 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -94,6 +94,9 @@ let # adds `sensors` command lm_sensors + + # lspci + pciutils ]; in From ac411da1cf48095ab400ac03cdfe5d77f1cd9a3a Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 11 Jul 2025 20:45:38 -0700 Subject: [PATCH 288/724] update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 91bdba8..6b58851 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1752111590, - "narHash": "sha256-ofDzLg2T64oLfBJrDUV5EvT55KaIgbHjZC5W+3chdc4=", + "lastModified": 1752284554, + "narHash": "sha256-RYLdS0ZNbmUwvJncCQ3QwSzwxXdGtsBeWozHZXmgb9o=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "5c75507a03c0ee10985b9124a344fd457a219c63", + "rev": "561dcd2c7a0f8cb2f869d51a16cda65d3612dce7", "type": "github" }, "original": { @@ -125,11 +125,11 @@ ] }, "locked": { - "lastModified": 1751810233, - "narHash": "sha256-kllkNbIqQi3VplgTMeGzuh1t8Gk8TauvkTRt93Km+tQ=", + "lastModified": 1752208517, + "narHash": "sha256-aRY1cYOdVdXdNjcL/Twpa27CknO7pVHxooPsBizDraE=", "owner": "nix-community", "repo": "home-manager", - "rev": "9b0873b46c9f9e4b7aa01eb634952c206af53068", + "rev": "c6a01e54af81b381695db796a43360bf6db5702f", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1752078530, - "narHash": "sha256-TrRmlYdhWcadWvBpDjB9Xlry4uT4ZUIO46d+o5tjtCQ=", + "lastModified": 1752291616, + "narHash": "sha256-zpPFo4cgr5tOy8DCLIoD++idsKjnzgVPnBeZLmazYc4=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "d231d92313192d4d0c78d6ef04167fed9dee87cf", + "rev": "30962469e2e8fb93c3672ee605316b89b8e9a198", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1751943650, - "narHash": "sha256-7orTnNqkGGru8Je6Un6mq1T8YVVU/O5kyW4+f9C1mZQ=", + "lastModified": 1752162966, + "narHash": "sha256-3MxxkU8ZXMHXcbFz7UE4M6qnIPTYGcE/7EMqlZNnVDE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "88983d4b665fb491861005137ce2b11a9f89f203", + "rev": "10e687235226880ed5e9f33f1ffa71fe60f2638a", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1752028888, - "narHash": "sha256-LRj3/PUpII6taWOrX1w/OeI6f1ncND02PP/kEHvPCqU=", + "lastModified": 1752288212, + "narHash": "sha256-f2PMqtf61mWAM11QoIfGv3hjD2AsJrij4FCzftepuaE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a0f1c656e053463b47639234b151a05e4441bb19", + "rev": "678296525a4cce249c608749b171d0b2ceb8b2ff", "type": "github" }, "original": { @@ -360,11 +360,11 @@ ] }, "locked": { - "lastModified": 1752092563, - "narHash": "sha256-BaMI8wRzisEARstVTRdRD5X+Lui1Td/FIaAwFOp+JVo=", + "lastModified": 1752290750, + "narHash": "sha256-jeczd1xqNM96arEztdunzTDpGaccsMqnqSJrFzqwYLc=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "75b7d67318f7e5cc1c8f3ceff961c379da7efe8e", + "rev": "849fe18ae4e41673f9e4de919bdcad71238c6ad2", "type": "github" }, "original": { From ff205c4bf6f564ddd51421ba346bdf5fac5c4245 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 14 Jul 2025 10:23:56 -0700 Subject: [PATCH 289/724] update --- flake.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 6b58851..febfcae 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1752284554, - "narHash": "sha256-RYLdS0ZNbmUwvJncCQ3QwSzwxXdGtsBeWozHZXmgb9o=", + "lastModified": 1752513173, + "narHash": "sha256-sqyKxh/s9eQse5vhThpXqF/b5YHNEXxUxzc1VqQ5dfY=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "561dcd2c7a0f8cb2f869d51a16cda65d3612dce7", + "rev": "23f01b932e0f2f8c7a3f877da0add697cedda30c", "type": "github" }, "original": { @@ -125,11 +125,11 @@ ] }, "locked": { - "lastModified": 1752208517, - "narHash": "sha256-aRY1cYOdVdXdNjcL/Twpa27CknO7pVHxooPsBizDraE=", + "lastModified": 1752391422, + "narHash": "sha256-ReX0NG6nIAEtQQjLqeu1vUU2jjZuMlpymNtb4VQYeus=", "owner": "nix-community", "repo": "home-manager", - "rev": "c6a01e54af81b381695db796a43360bf6db5702f", + "rev": "c26266790678863cce8e7460fdbf0d80991b1906", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1752291616, - "narHash": "sha256-zpPFo4cgr5tOy8DCLIoD++idsKjnzgVPnBeZLmazYc4=", + "lastModified": 1752499009, + "narHash": "sha256-GODcHAfq7IWgD+kLPwV2QU6H+iowUJcwijHKvNrSx/g=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "30962469e2e8fb93c3672ee605316b89b8e9a198", + "rev": "61a97d3ee496bd5e29ec4c93eaf70a1bfc1fb326", "type": "github" }, "original": { @@ -213,11 +213,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1750791124, - "narHash": "sha256-F5iVU/hjoSHSSe0gllxm0PcAaseEtGNanYK5Ha3k2Tg=", + "lastModified": 1752494307, + "narHash": "sha256-XLMw4kxrnuvz9BUfPE7DjAlcxS0FKHRnGPAwH5R/9Uw=", "owner": "YaLTeR", "repo": "niri", - "rev": "37458d94b288945f6cfbd3c5c233f634d59f246c", + "rev": "56901eed5dbb51d9d669e8ea5a53868896ddeba4", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1752162966, - "narHash": "sha256-3MxxkU8ZXMHXcbFz7UE4M6qnIPTYGcE/7EMqlZNnVDE=", + "lastModified": 1752308619, + "narHash": "sha256-pzrVLKRQNPrii06Rm09Q0i0dq3wt2t2pciT/GNq5EZQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "10e687235226880ed5e9f33f1ffa71fe60f2638a", + "rev": "650e572363c091045cdbc5b36b0f4c1f614d3058", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1752288212, - "narHash": "sha256-f2PMqtf61mWAM11QoIfGv3hjD2AsJrij4FCzftepuaE=", + "lastModified": 1752461263, + "narHash": "sha256-f4XVgqkWF1vSzPbOG5xvi4aAd/n1GwSNsji3mLMFwYQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "678296525a4cce249c608749b171d0b2ceb8b2ff", + "rev": "9cc51d100d24fb7ea13a0bee1480ee84fa12a0ad", "type": "github" }, "original": { @@ -337,11 +337,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1751228685, - "narHash": "sha256-MENtauGBhJ+kDeFaawvWGXaFG3Il6qQzjaP0RmtfM0k=", + "lastModified": 1752338000, + "narHash": "sha256-Fxlp/yKtynug0jyuauAmvZU2SzHCfwlwWf85j+IvQ0U=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "557ebeb616e03d5e4a8049862bbbd1f02c6f020b", + "rev": "ba78881a68182ce338041846164cbfed0d70935c", "type": "github" }, "original": { @@ -360,11 +360,11 @@ ] }, "locked": { - "lastModified": 1752290750, - "narHash": "sha256-jeczd1xqNM96arEztdunzTDpGaccsMqnqSJrFzqwYLc=", + "lastModified": 1752488611, + "narHash": "sha256-z10DN88OItOH58fDuC7LsChdwRU6Ut/01fU6/IQt1sg=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "849fe18ae4e41673f9e4de919bdcad71238c6ad2", + "rev": "0af030205dcbc89c7de5ebc7fc4a10cbf1134c62", "type": "github" }, "original": { From 0a75b59a46cbde1bfcc0465c068bb33253c0161c Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 15 Jul 2025 18:02:12 -0700 Subject: [PATCH 290/724] update --- flake.lock | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/flake.lock b/flake.lock index febfcae..3278148 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1752513173, - "narHash": "sha256-sqyKxh/s9eQse5vhThpXqF/b5YHNEXxUxzc1VqQ5dfY=", + "lastModified": 1752599451, + "narHash": "sha256-ab+fuXVq18iZ2D4uVoo3UtHX6OvPESN1LecSrSbSrtM=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "23f01b932e0f2f8c7a3f877da0add697cedda30c", + "rev": "b8c1269741faa8b59cb4635569e16e12bf47e664", "type": "github" }, "original": { @@ -125,11 +125,11 @@ ] }, "locked": { - "lastModified": 1752391422, + "lastModified": 1752544374, "narHash": "sha256-ReX0NG6nIAEtQQjLqeu1vUU2jjZuMlpymNtb4VQYeus=", "owner": "nix-community", "repo": "home-manager", - "rev": "c26266790678863cce8e7460fdbf0d80991b1906", + "rev": "2e00ed310c218127e02ffcf28ddd4e0f669fde3e", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1752499009, - "narHash": "sha256-GODcHAfq7IWgD+kLPwV2QU6H+iowUJcwijHKvNrSx/g=", + "lastModified": 1752598742, + "narHash": "sha256-ctPyMEltvbWAX7HJSZNCgo+4qN8BBLub57yvIpUFcw4=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "61a97d3ee496bd5e29ec4c93eaf70a1bfc1fb326", + "rev": "a031dc0c82bfc07c1427616fcdaf9ce09a13f5ce", "type": "github" }, "original": { @@ -213,11 +213,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1752494307, - "narHash": "sha256-XLMw4kxrnuvz9BUfPE7DjAlcxS0FKHRnGPAwH5R/9Uw=", + "lastModified": 1752593880, + "narHash": "sha256-jBde8XmIjibBTf8GLD/7gGYNHwxsK3G5zMrOGW6ZZuk=", "owner": "YaLTeR", "repo": "niri", - "rev": "56901eed5dbb51d9d669e8ea5a53868896ddeba4", + "rev": "5ac440a7604ce6765ce802cb1fd53c906d8d18ec", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1752308619, - "narHash": "sha256-pzrVLKRQNPrii06Rm09Q0i0dq3wt2t2pciT/GNq5EZQ=", + "lastModified": 1752436162, + "narHash": "sha256-Kt1UIPi7kZqkSc5HVj6UY5YLHHEzPBkgpNUByuyxtlw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "650e572363c091045cdbc5b36b0f4c1f614d3058", + "rev": "dfcd5b901dbab46c9c6e80b265648481aafb01f8", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1752461263, - "narHash": "sha256-f4XVgqkWF1vSzPbOG5xvi4aAd/n1GwSNsji3mLMFwYQ=", + "lastModified": 1752547600, + "narHash": "sha256-0vUE42ji4mcCvQO8CI0Oy8LmC6u2G4qpYldZbZ26MLc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "9cc51d100d24fb7ea13a0bee1480ee84fa12a0ad", + "rev": "9127ca1f5a785b23a2fc1c74551a27d3e8b9a28b", "type": "github" }, "original": { @@ -360,11 +360,11 @@ ] }, "locked": { - "lastModified": 1752488611, - "narHash": "sha256-z10DN88OItOH58fDuC7LsChdwRU6Ut/01fU6/IQt1sg=", + "lastModified": 1752584655, + "narHash": "sha256-nPHrsq0vSh0+BqV2xAAVsfoVqzP9KYG7Zicc6oA0nfk=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "0af030205dcbc89c7de5ebc7fc4a10cbf1134c62", + "rev": "759a7860416dfd8c86f383d4ea4009bb034d869c", "type": "github" }, "original": { From ceca252e82e393e47b074379afb7fb79be668a9c Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 17 Jul 2025 08:45:22 -0700 Subject: [PATCH 291/724] update --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 3278148..822c121 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "crane": { "locked": { - "lastModified": 1750266157, - "narHash": "sha256-tL42YoNg9y30u7zAqtoGDNdTyXTi8EALDeCB13FtbQA=", + "lastModified": 1751562746, + "narHash": "sha256-smpugNIkmDeicNz301Ll1bD7nFOty97T79m4GUMUczA=", "owner": "ipetkov", "repo": "crane", - "rev": "e37c943371b73ed87faf33f7583860f81f1d5a48", + "rev": "aed2020fd3dc26e1e857d4107a5a67a33ab6c1fd", "type": "github" }, "original": { @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1752599451, - "narHash": "sha256-ab+fuXVq18iZ2D4uVoo3UtHX6OvPESN1LecSrSbSrtM=", + "lastModified": 1752743547, + "narHash": "sha256-1qbqooYYHLGs4Hrs+xftJ85b6xgzWgqH9gghKunfnzQ=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "b8c1269741faa8b59cb4635569e16e12bf47e664", + "rev": "bdb0c5ba7a493bf064de0d065a55ea4d0300ef67", "type": "github" }, "original": { @@ -83,11 +83,11 @@ ] }, "locked": { - "lastModified": 1749398372, - "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "lastModified": 1751413152, + "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", "type": "github" }, "original": { @@ -153,11 +153,11 @@ ] }, "locked": { - "lastModified": 1751381593, - "narHash": "sha256-js1XwtJpYhvQrrTaVzViybpztkHJVZ63aXOlFAcTENM=", + "lastModified": 1752673703, + "narHash": "sha256-9Cc0YqL9ZUpaybJsrRJfXex91QlPmQNqpTLgw/KvJGA=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "f4eb75540307c2b33521322c04b7fea74e48a66f", + "rev": "5a776450d904b7ccd377c2a759703152b2553e98", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1752598742, - "narHash": "sha256-ctPyMEltvbWAX7HJSZNCgo+4qN8BBLub57yvIpUFcw4=", + "lastModified": 1752693947, + "narHash": "sha256-8QSAGLBnHlOUJp1Tt22FDCCmaeqZtvYr5Vz3uMQniL4=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "a031dc0c82bfc07c1427616fcdaf9ce09a13f5ce", + "rev": "ac9bcd788fca507d17e3c7a03de3d869bf44f52e", "type": "github" }, "original": { @@ -213,11 +213,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1752593880, - "narHash": "sha256-jBde8XmIjibBTf8GLD/7gGYNHwxsK3G5zMrOGW6ZZuk=", + "lastModified": 1752656275, + "narHash": "sha256-tTRMyGxqHF5IkYcnvHbwCgRBRUBhvRapxtuUfrN/8Ic=", "owner": "YaLTeR", "repo": "niri", - "rev": "5ac440a7604ce6765ce802cb1fd53c906d8d18ec", + "rev": "7b065f8618f63b7cf761ebe05a2cebd556113a6c", "type": "github" }, "original": { @@ -228,11 +228,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1752048960, - "narHash": "sha256-gATnkOe37eeVwKKYCsL+OnS2gU4MmLuZFzzWCtaKLI8=", + "lastModified": 1752666637, + "narHash": "sha256-P8J72psdc/rWliIvp8jUpoQ6qRDlVzgSDDlgkaXQ0Fw=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "7ced9122cff2163c6a0212b8d1ec8c33a1660806", + "rev": "d1bfa8f6ccfb5c383e1eba609c1eb67ca24ed153", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1752436162, - "narHash": "sha256-Kt1UIPi7kZqkSc5HVj6UY5YLHHEzPBkgpNUByuyxtlw=", + "lastModified": 1752620740, + "narHash": "sha256-f3pO+9lg66mV7IMmmIqG4PL3223TYMlnlw+pnpelbss=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dfcd5b901dbab46c9c6e80b265648481aafb01f8", + "rev": "32a4e87942101f1c9f9865e04dc3ddb175f5f32e", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1752547600, - "narHash": "sha256-0vUE42ji4mcCvQO8CI0Oy8LmC6u2G4qpYldZbZ26MLc=", + "lastModified": 1752720268, + "narHash": "sha256-XCiJdtXIN09Iv0i1gs5ajJ9CVHk537Gy1iG/4nIdpVI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "9127ca1f5a785b23a2fc1c74551a27d3e8b9a28b", + "rev": "dc221f842e9ddc8c0416beae8d77f2ea356b91ae", "type": "github" }, "original": { From 33ddd17d66fd9d2896416f6eccd909657d43248e Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 18 Jul 2025 00:04:03 -0700 Subject: [PATCH 292/724] fix easyeffects hanging shutdown --- home-manager/progs/framework-13-easyeffects.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home-manager/progs/framework-13-easyeffects.nix b/home-manager/progs/framework-13-easyeffects.nix index 1dca4e1..e7d7eb4 100644 --- a/home-manager/progs/framework-13-easyeffects.nix +++ b/home-manager/progs/framework-13-easyeffects.nix @@ -118,4 +118,6 @@ package = pkgs.easyeffects; preset = "framework"; }; + + systemd.user.services.easyeffects.Service.TimeoutStopSec = 1; } From 7cf5938bb32f2699b16327ddfab75cda444955f5 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 18 Jul 2025 00:05:33 -0700 Subject: [PATCH 293/724] update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 822c121..573a229 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1752743547, - "narHash": "sha256-1qbqooYYHLGs4Hrs+xftJ85b6xgzWgqH9gghKunfnzQ=", + "lastModified": 1752805646, + "narHash": "sha256-oa6HW3J/1Wil7BQGSL6qL08WNbKMnZk/1lTAo/klwwo=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "bdb0c5ba7a493bf064de0d065a55ea4d0300ef67", + "rev": "9d41880e6f1d613e4074ba4b39bdafbf0b5c7e09", "type": "github" }, "original": { @@ -125,11 +125,11 @@ ] }, "locked": { - "lastModified": 1752544374, - "narHash": "sha256-ReX0NG6nIAEtQQjLqeu1vUU2jjZuMlpymNtb4VQYeus=", + "lastModified": 1752780124, + "narHash": "sha256-5dn97vIYxn6VozKePOQSDxVCsrl38nDdMJXx86KIJH0=", "owner": "nix-community", "repo": "home-manager", - "rev": "2e00ed310c218127e02ffcf28ddd4e0f669fde3e", + "rev": "c718918222bdb104397762dea67e6b397a7927fe", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1752693947, - "narHash": "sha256-8QSAGLBnHlOUJp1Tt22FDCCmaeqZtvYr5Vz3uMQniL4=", + "lastModified": 1752785740, + "narHash": "sha256-FIMMlkwCHl9BN3RMrMfF/ceGAebEkbvzIoJUVEGX9lY=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "ac9bcd788fca507d17e3c7a03de3d869bf44f52e", + "rev": "47fd69b6ed109f7a80fe70b84b3122d49c08dc05", "type": "github" }, "original": { @@ -213,11 +213,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1752656275, - "narHash": "sha256-tTRMyGxqHF5IkYcnvHbwCgRBRUBhvRapxtuUfrN/8Ic=", + "lastModified": 1752782736, + "narHash": "sha256-4gvHMrsjUMtu1ieTT9+cf3F4DhiLj4fh4c5BxAVw0xA=", "owner": "YaLTeR", "repo": "niri", - "rev": "7b065f8618f63b7cf761ebe05a2cebd556113a6c", + "rev": "9c09bc730f37d1d449cc756044ad275010907e4c", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1752720268, - "narHash": "sha256-XCiJdtXIN09Iv0i1gs5ajJ9CVHk537Gy1iG/4nIdpVI=", + "lastModified": 1752806774, + "narHash": "sha256-4cHeoR2roN7d/3J6gT+l6o7J2hTrBIUiCwVdDNMeXzE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "dc221f842e9ddc8c0416beae8d77f2ea356b91ae", + "rev": "3c90219b3ba1c9790c45a078eae121de48a39c55", "type": "github" }, "original": { @@ -360,11 +360,11 @@ ] }, "locked": { - "lastModified": 1752584655, - "narHash": "sha256-nPHrsq0vSh0+BqV2xAAVsfoVqzP9KYG7Zicc6oA0nfk=", + "lastModified": 1752809889, + "narHash": "sha256-oTIVrw7Cy2McAVqE7GCot5Fb8Wh4JBsUDKMX8u3DFlU=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "759a7860416dfd8c86f383d4ea4009bb034d869c", + "rev": "f19d2b6b18d4a2e8bf2d6a9f69c934d6726360c4", "type": "github" }, "original": { From f1f2da24b40c0a534c5d6de23251ed360f97a1ac Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 18 Jul 2025 17:52:22 -0700 Subject: [PATCH 294/724] add freecad-wayland --- home-manager/gui.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home-manager/gui.nix b/home-manager/gui.nix index 0dce8d1..995dd3c 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -129,6 +129,8 @@ # password manager keepassxc + + freecad-wayland ] ++ (builtins.filter lib.isDerivation (builtins.attrValues nerd-fonts)); From fce38edac266fbcda645ed0e07f28180a88181f7 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 18 Jul 2025 22:12:03 -0700 Subject: [PATCH 295/724] remove mcaselector --- home-manager/gui.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/home-manager/gui.nix b/home-manager/gui.nix index 995dd3c..01e1237 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -93,8 +93,6 @@ # freecad-wayland puddletag - mcaselector - wireshark darktable From fad2464eeb4abad5fe77928934c891619868806c Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 19 Jul 2025 14:28:36 -0700 Subject: [PATCH 296/724] update --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 573a229..d1c61c2 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1752805646, - "narHash": "sha256-oa6HW3J/1Wil7BQGSL6qL08WNbKMnZk/1lTAo/klwwo=", + "lastModified": 1752945058, + "narHash": "sha256-NhHTWgqqqGAssDSST1Pr4FONejLUyBCWd1sKseim4eY=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "9d41880e6f1d613e4074ba4b39bdafbf0b5c7e09", + "rev": "19efa4ef6b8505bdd15a42a03ec6b02612163693", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1752785740, - "narHash": "sha256-FIMMlkwCHl9BN3RMrMfF/ceGAebEkbvzIoJUVEGX9lY=", + "lastModified": 1752878399, + "narHash": "sha256-Kc4+stiqZP5+CUVVJNca8Xyye76hmRAVPK3cza1BXuk=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "47fd69b6ed109f7a80fe70b84b3122d49c08dc05", + "rev": "1663b8f450988a64d9777f377efbd2fd8f3f243b", "type": "github" }, "original": { @@ -213,11 +213,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1752782736, - "narHash": "sha256-4gvHMrsjUMtu1ieTT9+cf3F4DhiLj4fh4c5BxAVw0xA=", + "lastModified": 1752870529, + "narHash": "sha256-23DJk5EfEDCq7Xy1QELcayG0VxbbWpdQ6t7jbhae1Ok=", "owner": "YaLTeR", "repo": "niri", - "rev": "9c09bc730f37d1d449cc756044ad275010907e4c", + "rev": "fefc0bc0a71556eb75352e2b611e50eb5d3bf9c2", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1752806774, - "narHash": "sha256-4cHeoR2roN7d/3J6gT+l6o7J2hTrBIUiCwVdDNMeXzE=", + "lastModified": 1752892850, + "narHash": "sha256-LLvDqLiK2+dr7bQqKTnZIZ8F1H67DLt3FUyVrGolGVw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "3c90219b3ba1c9790c45a078eae121de48a39c55", + "rev": "742248f12aed0183a124637e8b27a238a47f46a2", "type": "github" }, "original": { From d48da3490a8d5fcc490a8c358b5d60fa707a8171 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 19 Jul 2025 14:29:05 -0700 Subject: [PATCH 297/724] remove comment --- home-manager/gui.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home-manager/gui.nix b/home-manager/gui.nix index 01e1237..4a3dbfa 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -90,7 +90,6 @@ inputs.zen-browser.packages."${system}".twilight - # freecad-wayland puddletag wireshark From 61cbc437c85ebabe276b9b682a82fdc8d2a9c1d8 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 19 Jul 2025 23:33:26 -0700 Subject: [PATCH 298/724] update --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index d1c61c2..2188bc0 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1752945058, - "narHash": "sha256-NhHTWgqqqGAssDSST1Pr4FONejLUyBCWd1sKseim4eY=", + "lastModified": 1752978872, + "narHash": "sha256-PqO6F5l9Zd7LQ9zhvmiK6oqypnYF4EQhegVQACgBIXo=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "19efa4ef6b8505bdd15a42a03ec6b02612163693", + "rev": "397bf9fdd15b35cbf16d1b10f2148185eba3b0c1", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1752878399, - "narHash": "sha256-Kc4+stiqZP5+CUVVJNca8Xyye76hmRAVPK3cza1BXuk=", + "lastModified": 1752989871, + "narHash": "sha256-FbkQ9hZcfDU/j839hhOYPjx7yHoBpwhjnRZj9M2bIMk=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "1663b8f450988a64d9777f377efbd2fd8f3f243b", + "rev": "e84276a7f2d13c147c889a119b9a227e14113621", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1752620740, - "narHash": "sha256-f3pO+9lg66mV7IMmmIqG4PL3223TYMlnlw+pnpelbss=", + "lastModified": 1752866191, + "narHash": "sha256-NV4S2Lf2hYmZQ3Qf4t/YyyBaJNuxLPyjzvDma0zPp/M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "32a4e87942101f1c9f9865e04dc3ddb175f5f32e", + "rev": "f01fe91b0108a7aff99c99f2e9abbc45db0adc2a", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1752892850, - "narHash": "sha256-LLvDqLiK2+dr7bQqKTnZIZ8F1H67DLt3FUyVrGolGVw=", + "lastModified": 1752979888, + "narHash": "sha256-qRRP3QavbwW0o+LOh31QNEfCgPlzK5SKlWALUJL6T7E=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "742248f12aed0183a124637e8b27a238a47f46a2", + "rev": "95719de18aefa63a624bf75a1ff98744b089ec12", "type": "github" }, "original": { @@ -360,11 +360,11 @@ ] }, "locked": { - "lastModified": 1752809889, - "narHash": "sha256-oTIVrw7Cy2McAVqE7GCot5Fb8Wh4JBsUDKMX8u3DFlU=", + "lastModified": 1752986546, + "narHash": "sha256-vHuALOq4OJZhdh+T/Btei4WtydWf5CD+dJnsyUWRJYw=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "f19d2b6b18d4a2e8bf2d6a9f69c934d6726360c4", + "rev": "755e04275f33a883e21eb2446a52b50db21a62e7", "type": "github" }, "original": { From 3eb6565a6928fc53e4c265af39c3bd2a110b958b Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 23 Jul 2025 00:23:25 -0700 Subject: [PATCH 299/724] update --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 2188bc0..f160d6f 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1752978872, - "narHash": "sha256-PqO6F5l9Zd7LQ9zhvmiK6oqypnYF4EQhegVQACgBIXo=", + "lastModified": 1753237660, + "narHash": "sha256-6nGlaZeOHm/OKB1UU1A2LW6KwCOQISJZVialH+bUd2c=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "397bf9fdd15b35cbf16d1b10f2148185eba3b0c1", + "rev": "384b67a33ab7185cfa277193774840d8f7d88c83", "type": "github" }, "original": { @@ -125,11 +125,11 @@ ] }, "locked": { - "lastModified": 1752780124, - "narHash": "sha256-5dn97vIYxn6VozKePOQSDxVCsrl38nDdMJXx86KIJH0=", + "lastModified": 1753198507, + "narHash": "sha256-NCG6izg+B3zsCwcT6+ssiWT3Y202jhOqGL/zh6fofa4=", "owner": "nix-community", "repo": "home-manager", - "rev": "c718918222bdb104397762dea67e6b397a7927fe", + "rev": "fce051eaf881220843401df545a1444ab676520c", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1752989871, - "narHash": "sha256-FbkQ9hZcfDU/j839hhOYPjx7yHoBpwhjnRZj9M2bIMk=", + "lastModified": 1753180174, + "narHash": "sha256-YeCLUjYOjTN2c29ch5ELoYGRW/BMmyv+a0Q16FhmlnQ=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "e84276a7f2d13c147c889a119b9a227e14113621", + "rev": "fdeb0c5367f6e183f19ee1521644cb0440582bde", "type": "github" }, "original": { @@ -228,11 +228,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1752666637, - "narHash": "sha256-P8J72psdc/rWliIvp8jUpoQ6qRDlVzgSDDlgkaXQ0Fw=", + "lastModified": 1753122741, + "narHash": "sha256-nFxE8lk9JvGelxClCmwuJYftbHqwnc01dRN4DVLUroM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d1bfa8f6ccfb5c383e1eba609c1eb67ca24ed153", + "rev": "cc66fddc6cb04ab479a1bb062f4d4da27c936a22", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1752866191, - "narHash": "sha256-NV4S2Lf2hYmZQ3Qf4t/YyyBaJNuxLPyjzvDma0zPp/M=", + "lastModified": 1753115646, + "narHash": "sha256-yLuz5cz5Z+sn8DRAfNkrd2Z1cV6DaYO9JMrEz4KZo/c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f01fe91b0108a7aff99c99f2e9abbc45db0adc2a", + "rev": "92c2e04a475523e723c67ef872d8037379073681", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1752979888, - "narHash": "sha256-qRRP3QavbwW0o+LOh31QNEfCgPlzK5SKlWALUJL6T7E=", + "lastModified": 1753238793, + "narHash": "sha256-jmQeEpgX+++MEgrcikcwoSiI7vDZWLP0gci7XiWb9uQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "95719de18aefa63a624bf75a1ff98744b089ec12", + "rev": "0ad7ab4ca8e83febf147197e65c006dff60623ab", "type": "github" }, "original": { @@ -360,11 +360,11 @@ ] }, "locked": { - "lastModified": 1752986546, - "narHash": "sha256-vHuALOq4OJZhdh+T/Btei4WtydWf5CD+dJnsyUWRJYw=", + "lastModified": 1753069499, + "narHash": "sha256-YtgY0ueqKNrBma4Euu8WH23BhUkBujirJDMDE1KujnU=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "755e04275f33a883e21eb2446a52b50db21a62e7", + "rev": "c64b94235ae24e3b9e01a08f0331d8bb0e5b037a", "type": "github" }, "original": { From 533565ec51818187e1f840ae85fdadf1276679fd Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 24 Jul 2025 20:44:32 -0700 Subject: [PATCH 300/724] update --- flake.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index f160d6f..995e1a3 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "crane": { "locked": { - "lastModified": 1751562746, - "narHash": "sha256-smpugNIkmDeicNz301Ll1bD7nFOty97T79m4GUMUczA=", + "lastModified": 1752946753, + "narHash": "sha256-g5uP3jIj+STUcfTJDKYopxnSijs2agRg13H0SGL5iE4=", "owner": "ipetkov", "repo": "crane", - "rev": "aed2020fd3dc26e1e857d4107a5a67a33ab6c1fd", + "rev": "544d09fecc8c2338542c57f3f742f1a0c8c71e13", "type": "github" }, "original": { @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1753237660, - "narHash": "sha256-6nGlaZeOHm/OKB1UU1A2LW6KwCOQISJZVialH+bUd2c=", + "lastModified": 1753410343, + "narHash": "sha256-chcs8JU2LWVK0Mb/+SgUTUSM0LVr00wR5eWoAsfw7BU=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "384b67a33ab7185cfa277193774840d8f7d88c83", + "rev": "f95d76f855a08eada6da509bc53e6227d8e4803f", "type": "github" }, "original": { @@ -125,11 +125,11 @@ ] }, "locked": { - "lastModified": 1753198507, - "narHash": "sha256-NCG6izg+B3zsCwcT6+ssiWT3Y202jhOqGL/zh6fofa4=", + "lastModified": 1753288231, + "narHash": "sha256-WcMW9yUDfER8kz4NdCaaI/ep0Ef91L+Nf7MetNzHZc4=", "owner": "nix-community", "repo": "home-manager", - "rev": "fce051eaf881220843401df545a1444ab676520c", + "rev": "7b5a978e00273b8676c530c03d315f5b75fae564", "type": "github" }, "original": { @@ -153,11 +153,11 @@ ] }, "locked": { - "lastModified": 1752673703, - "narHash": "sha256-9Cc0YqL9ZUpaybJsrRJfXex91QlPmQNqpTLgw/KvJGA=", + "lastModified": 1753349211, + "narHash": "sha256-wGfVht5kOLc9t3GZxEr4IIq5QgHV6nB3w9qqhcVKloo=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "5a776450d904b7ccd377c2a759703152b2553e98", + "rev": "4775927ef576f6493b79b1d205e42493d6878d47", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1753180174, - "narHash": "sha256-YeCLUjYOjTN2c29ch5ELoYGRW/BMmyv+a0Q16FhmlnQ=", + "lastModified": 1753374784, + "narHash": "sha256-R6vHaUJiehdXSnzZqCOxmtmAnHA4GBOpS/UKydzAI38=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "fdeb0c5367f6e183f19ee1521644cb0440582bde", + "rev": "da95771a65821bc98118cf3478eb2fc6fbfe035a", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1753115646, - "narHash": "sha256-yLuz5cz5Z+sn8DRAfNkrd2Z1cV6DaYO9JMrEz4KZo/c=", + "lastModified": 1753345091, + "narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "92c2e04a475523e723c67ef872d8037379073681", + "rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1753238793, - "narHash": "sha256-jmQeEpgX+++MEgrcikcwoSiI7vDZWLP0gci7XiWb9uQ=", + "lastModified": 1753411536, + "narHash": "sha256-lm88KTYlhsh5usJLGlWQbG4HWWr2FdO26TSssCw6Wdg=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "0ad7ab4ca8e83febf147197e65c006dff60623ab", + "rev": "7ae12d14d6bb74acfadf31e17a204d928eaf77b8", "type": "github" }, "original": { @@ -360,11 +360,11 @@ ] }, "locked": { - "lastModified": 1753069499, - "narHash": "sha256-YtgY0ueqKNrBma4Euu8WH23BhUkBujirJDMDE1KujnU=", + "lastModified": 1753408122, + "narHash": "sha256-7yrLNXESxGpNblirHedzNXYsL/pM9mKNXwMcWhNqV5Q=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "c64b94235ae24e3b9e01a08f0331d8bb0e5b037a", + "rev": "8d8a00c1ff85cc4c32a359c77cba8124e36dd3a8", "type": "github" }, "original": { From fb9ad983e0a95422b92242252cf5247bd91e995f Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 24 Jul 2025 21:50:05 -0700 Subject: [PATCH 301/724] borg: reduce retention --- home-manager/progs/borg.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/home-manager/progs/borg.nix b/home-manager/progs/borg.nix index 36291c1..da21489 100644 --- a/home-manager/progs/borg.nix +++ b/home-manager/progs/borg.nix @@ -41,11 +41,11 @@ }; retention = { - keepHourly = 48; + keepHourly = 10; keepDaily = 30; - keepWeekly = 26; - keepMonthly = 24; - keepYearly = 10; + keepWeekly = 8; + keepMonthly = 2; + keepYearly = 0; }; }; }; From db9f14682fd11e8236dfae0f02f5869a9b09b443 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 28 Jul 2025 19:45:04 -0700 Subject: [PATCH 302/724] update --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 995e1a3..15ddbf6 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "crane": { "locked": { - "lastModified": 1752946753, - "narHash": "sha256-g5uP3jIj+STUcfTJDKYopxnSijs2agRg13H0SGL5iE4=", + "lastModified": 1753316655, + "narHash": "sha256-tzWa2kmTEN69OEMhxFy+J2oWSvZP5QhEgXp3TROOzl0=", "owner": "ipetkov", "repo": "crane", - "rev": "544d09fecc8c2338542c57f3f742f1a0c8c71e13", + "rev": "f35a3372d070c9e9ccb63ba7ce347f0634ddf3d2", "type": "github" }, "original": { @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1753410343, - "narHash": "sha256-chcs8JU2LWVK0Mb/+SgUTUSM0LVr00wR5eWoAsfw7BU=", + "lastModified": 1753756741, + "narHash": "sha256-YuaPaCJtc3AERzeG8p65UAjTS7MGwsoaAx3TQHPi81Y=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "f95d76f855a08eada6da509bc53e6227d8e4803f", + "rev": "e99297e5463abbaeb02451be0fe119da6477dd46", "type": "github" }, "original": { @@ -83,11 +83,11 @@ ] }, "locked": { - "lastModified": 1751413152, - "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", + "lastModified": 1753121425, + "narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", + "rev": "644e0fc48951a860279da645ba77fe4a6e814c5e", "type": "github" }, "original": { @@ -125,11 +125,11 @@ ] }, "locked": { - "lastModified": 1753288231, - "narHash": "sha256-WcMW9yUDfER8kz4NdCaaI/ep0Ef91L+Nf7MetNzHZc4=", + "lastModified": 1753592768, + "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=", "owner": "nix-community", "repo": "home-manager", - "rev": "7b5a978e00273b8676c530c03d315f5b75fae564", + "rev": "fc3add429f21450359369af74c2375cb34a2d204", "type": "github" }, "original": { @@ -153,11 +153,11 @@ ] }, "locked": { - "lastModified": 1753349211, - "narHash": "sha256-wGfVht5kOLc9t3GZxEr4IIq5QgHV6nB3w9qqhcVKloo=", + "lastModified": 1753693791, + "narHash": "sha256-pZQyCkqIFwGA77np+vqVQZgg2P0qPAI6x6kC3w6+PjE=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "4775927ef576f6493b79b1d205e42493d6878d47", + "rev": "785a5701b22259b85735301b1aad19c2bee15498", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1753374784, - "narHash": "sha256-R6vHaUJiehdXSnzZqCOxmtmAnHA4GBOpS/UKydzAI38=", + "lastModified": 1753695258, + "narHash": "sha256-a+0PXuJ3YfpdL0Y+uX/GNOx5cSZSpNW0UglU/E1YdHw=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "da95771a65821bc98118cf3478eb2fc6fbfe035a", + "rev": "76d7de1a046d589b75967a597895f8e5efdc8e16", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1753345091, - "narHash": "sha256-CdX2Rtvp5I8HGu9swBmYuq+ILwRxpXdJwlpg8jvN4tU=", + "lastModified": 1753489912, + "narHash": "sha256-uDCFHeXdRIgJpYmtcUxGEsZ+hYlLPBhR83fdU+vbC1s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3ff0e34b1383648053bba8ed03f201d3466f90c9", + "rev": "13e8d35b7d6028b7198f8186bc0347c6abaa2701", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1753411536, - "narHash": "sha256-lm88KTYlhsh5usJLGlWQbG4HWWr2FdO26TSssCw6Wdg=", + "lastModified": 1753671061, + "narHash": "sha256-IU4eBWfe9h2QejJYST+EAlhg8a1H6mh9gbcmWgZ2/mQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "7ae12d14d6bb74acfadf31e17a204d928eaf77b8", + "rev": "40065d17ee4dbec3ded8ca61236132aede843fab", "type": "github" }, "original": { @@ -360,11 +360,11 @@ ] }, "locked": { - "lastModified": 1753408122, - "narHash": "sha256-7yrLNXESxGpNblirHedzNXYsL/pM9mKNXwMcWhNqV5Q=", + "lastModified": 1753674409, + "narHash": "sha256-jhBdIc802upDu3S/Nu0rgVlIJ39E8KWugQwm/a74MBY=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "8d8a00c1ff85cc4c32a359c77cba8124e36dd3a8", + "rev": "e1bf71a0eb5ff9fdcfe83f6e4676ce19dd87f468", "type": "github" }, "original": { From b0741097d92badb6a7e93a18993f46e8679baab6 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 29 Jul 2025 21:00:22 -0700 Subject: [PATCH 303/724] update --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 15ddbf6..6b3ebde 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1753756741, - "narHash": "sha256-YuaPaCJtc3AERzeG8p65UAjTS7MGwsoaAx3TQHPi81Y=", + "lastModified": 1753842517, + "narHash": "sha256-QGmNrJmOs3i8+ZvVKh4gp8OA/KPDunXWQRwGKx9DUmo=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "e99297e5463abbaeb02451be0fe119da6477dd46", + "rev": "7f59ede0d13c9ec991db28a42ce3812227f7b675", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1753695258, - "narHash": "sha256-a+0PXuJ3YfpdL0Y+uX/GNOx5cSZSpNW0UglU/E1YdHw=", + "lastModified": 1753839324, + "narHash": "sha256-ipcsHV+XE7gaItRhqLsjLCYKIk57IAP1s9BHajQRotA=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "76d7de1a046d589b75967a597895f8e5efdc8e16", + "rev": "0108605855b3222c8965fa23fc05d713b77d0564", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1753489912, - "narHash": "sha256-uDCFHeXdRIgJpYmtcUxGEsZ+hYlLPBhR83fdU+vbC1s=", + "lastModified": 1753749649, + "narHash": "sha256-+jkEZxs7bfOKfBIk430K+tK9IvXlwzqQQnppC2ZKFj4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "13e8d35b7d6028b7198f8186bc0347c6abaa2701", + "rev": "1f08a4df998e21f4e8be8fb6fbf61d11a1a5076a", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1753671061, - "narHash": "sha256-IU4eBWfe9h2QejJYST+EAlhg8a1H6mh9gbcmWgZ2/mQ=", + "lastModified": 1753843724, + "narHash": "sha256-a0Aab7Zst68GqvNAMh9Ejwnp8gawGnruOMtEWZ0HHjM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "40065d17ee4dbec3ded8ca61236132aede843fab", + "rev": "01ac47d86311fb030023f1dfc5f6bc368b9c6cee", "type": "github" }, "original": { @@ -360,11 +360,11 @@ ] }, "locked": { - "lastModified": 1753674409, - "narHash": "sha256-jhBdIc802upDu3S/Nu0rgVlIJ39E8KWugQwm/a74MBY=", + "lastModified": 1753816848, + "narHash": "sha256-viWnh927R7OJ0EPglBBadDwJz+laQIyj+Qc+4rTPTPg=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "e1bf71a0eb5ff9fdcfe83f6e4676ce19dd87f468", + "rev": "a4fc17704e177b0d0982b642c012cc89d53ab74b", "type": "github" }, "original": { From ad4d64bbd0cf7981890af1563b3038a2d1a28d5c Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 31 Jul 2025 19:46:38 -0700 Subject: [PATCH 304/724] add localsend --- etcnixos/common.nix | 4 ++++ home-manager/gui.nix | 2 ++ 2 files changed, 6 insertions(+) diff --git a/etcnixos/common.nix b/etcnixos/common.nix index cd8a456..045712a 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -233,6 +233,10 @@ ''; }; + # port 53317 for localsend + networking.firewall.allowedUDPPorts = [ 53317 ]; + networking.firewall.allowedTCPPorts = [ 53317 ]; + system.stateVersion = "25.05"; nixpkgs.hostPlatform = "x86_64-linux"; diff --git a/home-manager/gui.nix b/home-manager/gui.nix index 4a3dbfa..228a4c2 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -128,6 +128,8 @@ keepassxc freecad-wayland + + localsend ] ++ (builtins.filter lib.isDerivation (builtins.attrValues nerd-fonts)); From ec46b7aab85eb2c0ad028104c983916cba689dcb Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 31 Jul 2025 19:48:45 -0700 Subject: [PATCH 305/724] add units command --- home-manager/no-gui.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 2954445..9d9fcae 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -97,6 +97,9 @@ let # lspci pciutils + + # convert between various units + units ]; in From 2922c0bc6ab0502ca83be17ce0713650f6f02991 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 31 Jul 2025 19:50:59 -0700 Subject: [PATCH 306/724] borg: exclude ephemeral.json from signal backup --- home-manager/progs/borg.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home-manager/progs/borg.nix b/home-manager/progs/borg.nix index da21489..c7e869b 100644 --- a/home-manager/progs/borg.nix +++ b/home-manager/progs/borg.nix @@ -27,7 +27,6 @@ "Local Storage" "SharedStorage" "config.json" - "ephemeral.json" "Preferences" ]) ); From 74f0c9df601cc2405bd859e77955d947b8c62d71 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 31 Jul 2025 19:51:48 -0700 Subject: [PATCH 307/724] borg: format --- home-manager/progs/borg.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home-manager/progs/borg.nix b/home-manager/progs/borg.nix index c7e869b..83cc8b3 100644 --- a/home-manager/progs/borg.nix +++ b/home-manager/progs/borg.nix @@ -4,7 +4,6 @@ enable = true; package = pkgs.borgmatic; backups = { - home = { location = { sourceDirectories = ( From 6ce819e0a007369ec1b69ca2cfee0f195f71a35b Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 31 Jul 2025 19:52:14 -0700 Subject: [PATCH 308/724] update --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 6b3ebde..6e72d0f 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1753842517, - "narHash": "sha256-QGmNrJmOs3i8+ZvVKh4gp8OA/KPDunXWQRwGKx9DUmo=", + "lastModified": 1754015942, + "narHash": "sha256-a1rKs50GWP8RUI8bFXuhXPxeUgOvYiNxsk4Jf7cdzCw=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "7f59ede0d13c9ec991db28a42ce3812227f7b675", + "rev": "b7b0edd24abbdd05fde75c80d59001c9fd9b5598", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1753839324, - "narHash": "sha256-ipcsHV+XE7gaItRhqLsjLCYKIk57IAP1s9BHajQRotA=", + "lastModified": 1753988617, + "narHash": "sha256-86ffo9yJpQ9HalS1XgZXq9Sg0AMPLuIfskIU67RJwm0=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "0108605855b3222c8965fa23fc05d713b77d0564", + "rev": "c6feaa63d1f36a2c0d7e725666d332c35be4e373", "type": "github" }, "original": { @@ -213,11 +213,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1752870529, - "narHash": "sha256-23DJk5EfEDCq7Xy1QELcayG0VxbbWpdQ6t7jbhae1Ok=", + "lastModified": 1753983552, + "narHash": "sha256-xnPPjASWt4/u+GmRdrHADBKKSCtIhTFY53CSKM+Xtfk=", "owner": "YaLTeR", "repo": "niri", - "rev": "fefc0bc0a71556eb75352e2b611e50eb5d3bf9c2", + "rev": "91b6a111cf228fadaabba706d8f4d155efc63b3a", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1753843724, - "narHash": "sha256-a0Aab7Zst68GqvNAMh9Ejwnp8gawGnruOMtEWZ0HHjM=", + "lastModified": 1753930086, + "narHash": "sha256-Os6Ta5zamfAllmQNlvkbGZLHn06zJy3hVXRk+Dy2yMo=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "01ac47d86311fb030023f1dfc5f6bc368b9c6cee", + "rev": "17b672c10c1798696a516cb879edbc2ebd0f58a4", "type": "github" }, "original": { @@ -360,11 +360,11 @@ ] }, "locked": { - "lastModified": 1753816848, - "narHash": "sha256-viWnh927R7OJ0EPglBBadDwJz+laQIyj+Qc+4rTPTPg=", + "lastModified": 1753933355, + "narHash": "sha256-4QxMcKS6oc+cG8efwwAin4M+YOokBak1dVS8u5P3b5M=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "a4fc17704e177b0d0982b642c012cc89d53ab74b", + "rev": "fa795a139a8c92b140bc21f11f61da1c97ad5b1d", "type": "github" }, "original": { From ded3448c714d88650d082209b7f1f69f075bbc65 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 1 Aug 2025 20:46:24 -0700 Subject: [PATCH 309/724] update --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 6e72d0f..93ddd4b 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1754015942, - "narHash": "sha256-a1rKs50GWP8RUI8bFXuhXPxeUgOvYiNxsk4Jf7cdzCw=", + "lastModified": 1754101441, + "narHash": "sha256-Nz7Dkyyws/gBzyDCmbrMSt5lR7hDO2knRep4saqlipI=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "b7b0edd24abbdd05fde75c80d59001c9fd9b5598", + "rev": "eb9539b615cfe3d5871baf6d78303033e3f31b86", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1753988617, - "narHash": "sha256-86ffo9yJpQ9HalS1XgZXq9Sg0AMPLuIfskIU67RJwm0=", + "lastModified": 1754098183, + "narHash": "sha256-xiDTiBJlApXRiuTmOrdGaiJzs33lIdQepyCI8r9hy5w=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "c6feaa63d1f36a2c0d7e725666d332c35be4e373", + "rev": "f2a7b326dc420360a66a542f2262081763f0f9ab", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1753749649, - "narHash": "sha256-+jkEZxs7bfOKfBIk430K+tK9IvXlwzqQQnppC2ZKFj4=", + "lastModified": 1754028485, + "narHash": "sha256-IiiXB3BDTi6UqzAZcf2S797hWEPCRZOwyNThJIYhUfk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1f08a4df998e21f4e8be8fb6fbf61d11a1a5076a", + "rev": "59e69648d345d6e8fef86158c555730fa12af9de", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1753930086, - "narHash": "sha256-Os6Ta5zamfAllmQNlvkbGZLHn06zJy3hVXRk+Dy2yMo=", + "lastModified": 1754102567, + "narHash": "sha256-d6nZ+1e4VDqW6VAwfx9EAUDJdPxSwqwGiuli32FEgoE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "17b672c10c1798696a516cb879edbc2ebd0f58a4", + "rev": "08ff39bf869cadca3102b39824f4c7025186b7dc", "type": "github" }, "original": { From 586f033037b29f459f7ea03efd5d60b12be548c4 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 1 Aug 2025 22:59:18 -0700 Subject: [PATCH 310/724] format --- etcnixos/common.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/etcnixos/common.nix b/etcnixos/common.nix index 045712a..3ae8801 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -73,7 +73,6 @@ */ systemd-boot.enable = lib.mkForce false; systemd-boot.configurationLimit = 10; - }; initrd = { From aca3c058ea04fabea9242eafd98c12764e84ad3a Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 4 Aug 2025 23:44:15 -0700 Subject: [PATCH 311/724] wifi: disable powersave (fixes suspend issue) --- etcnixos/networking.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/etcnixos/networking.nix b/etcnixos/networking.nix index 963e53a..976aaa9 100644 --- a/etcnixos/networking.nix +++ b/etcnixos/networking.nix @@ -16,6 +16,8 @@ wifi = { scanRandMacAddress = true; + # fix suspend issue + powersave = false; }; }; From 100700875067048bcb3b384438feb7f0f8467b25 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 4 Aug 2025 23:50:32 -0700 Subject: [PATCH 312/724] update --- flake.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 93ddd4b..883d816 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "crane": { "locked": { - "lastModified": 1753316655, - "narHash": "sha256-tzWa2kmTEN69OEMhxFy+J2oWSvZP5QhEgXp3TROOzl0=", + "lastModified": 1754269165, + "narHash": "sha256-0tcS8FHd4QjbCVoxN9jI+PjHgA4vc/IjkUSp+N3zy0U=", "owner": "ipetkov", "repo": "crane", - "rev": "f35a3372d070c9e9ccb63ba7ce347f0634ddf3d2", + "rev": "444e81206df3f7d92780680e45858e31d2f07a08", "type": "github" }, "original": { @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1754101441, - "narHash": "sha256-Nz7Dkyyws/gBzyDCmbrMSt5lR7hDO2knRep4saqlipI=", + "lastModified": 1754361940, + "narHash": "sha256-2KROQdENN8Ix5kiBZRM8FQP1KiJDikKPTiaaExYdVAY=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "eb9539b615cfe3d5871baf6d78303033e3f31b86", + "rev": "a9a667084c0cf89081842d3002aef7b4829980aa", "type": "github" }, "original": { @@ -83,11 +83,11 @@ ] }, "locked": { - "lastModified": 1753121425, - "narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=", + "lastModified": 1754091436, + "narHash": "sha256-XKqDMN1/Qj1DKivQvscI4vmHfDfvYR2pfuFOJiCeewM=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "644e0fc48951a860279da645ba77fe4a6e814c5e", + "rev": "67df8c627c2c39c41dbec76a1f201929929ab0bd", "type": "github" }, "original": { @@ -153,11 +153,11 @@ ] }, "locked": { - "lastModified": 1753693791, - "narHash": "sha256-pZQyCkqIFwGA77np+vqVQZgg2P0qPAI6x6kC3w6+PjE=", + "lastModified": 1754297745, + "narHash": "sha256-aD6/scLN3L4ZszmNbhhd3JQ9Pzv1ScYFphz14wHinfs=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "785a5701b22259b85735301b1aad19c2bee15498", + "rev": "892cbdca865d6b42f9c0d222fe309f7720259855", "type": "github" }, "original": { @@ -228,11 +228,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1753122741, - "narHash": "sha256-nFxE8lk9JvGelxClCmwuJYftbHqwnc01dRN4DVLUroM=", + "lastModified": 1754316476, + "narHash": "sha256-Ry1gd1BQrNVJJfT11cpVP0FY8XFMx4DJV2IDp01CH9w=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "cc66fddc6cb04ab479a1bb062f4d4da27c936a22", + "rev": "9368056b73efb46eb14fd4667b99e0f81b805f28", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1754028485, - "narHash": "sha256-IiiXB3BDTi6UqzAZcf2S797hWEPCRZOwyNThJIYhUfk=", + "lastModified": 1754292888, + "narHash": "sha256-1ziydHSiDuSnaiPzCQh1mRFBsM2d2yRX9I+5OPGEmIE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "59e69648d345d6e8fef86158c555730fa12af9de", + "rev": "ce01daebf8489ba97bd1609d185ea276efdeb121", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1754102567, - "narHash": "sha256-d6nZ+1e4VDqW6VAwfx9EAUDJdPxSwqwGiuli32FEgoE=", + "lastModified": 1754276100, + "narHash": "sha256-VmYP9Jo0U234xtGTGtihqNHfGy1JZ1h9WaaJlIuzgCk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "08ff39bf869cadca3102b39824f4c7025186b7dc", + "rev": "dc2d2489572fa8a3b86c15ff9fd01f99b90cb90d", "type": "github" }, "original": { @@ -360,11 +360,11 @@ ] }, "locked": { - "lastModified": 1753933355, - "narHash": "sha256-4QxMcKS6oc+cG8efwwAin4M+YOokBak1dVS8u5P3b5M=", + "lastModified": 1754193284, + "narHash": "sha256-ZGLXnpXy7vcTDLC1yLQSJOclsilvK+RNFVVEeO0ei/0=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "fa795a139a8c92b140bc21f11f61da1c97ad5b1d", + "rev": "ac2b25e76f5bfe1e30ae39409dfa450c5c1bc945", "type": "github" }, "original": { From adf08336c298c17928dc20d482596593a013f7d1 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 6 Aug 2025 22:35:07 -0700 Subject: [PATCH 313/724] use amd.overdrive.ppfeaturemask instead of kernel param --- etcnixos/system-yarn.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/etcnixos/system-yarn.nix b/etcnixos/system-yarn.nix index db0bfb6..331ca55 100644 --- a/etcnixos/system-yarn.nix +++ b/etcnixos/system-yarn.nix @@ -18,13 +18,11 @@ ]; nixpkgs.config.allowUnfree = true; + # allow overclocking (I actually underclock but lol) + hardware.amdgpu.overdrive.ppfeaturemask = "0xFFF7FFFF"; + networking.hostId = "abf570f9"; boot = { - kernelParams = [ - # allow overclocking (I actually underclock but lol) - "amdgpu.ppfeaturemask=0xFFF7FFFF" - ]; - kernelModules = [ # kernel module for case fan control "nct6775" From 892047b0e23f93f09571c2d0406e68c0a3f7e5f7 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 7 Aug 2025 17:41:18 -0700 Subject: [PATCH 314/724] unify desktop and laptop configs --- etcnixos/common.nix | 23 +++++++++++++++++++++++ etcnixos/system-yarn.nix | 19 ------------------- home-manager/desktop.nix | 30 ++++++++++++++++++++++++++++++ home-manager/home-mreow.nix | 22 +--------------------- home-manager/home-yarn.nix | 1 + 5 files changed, 55 insertions(+), 40 deletions(-) create mode 100644 home-manager/desktop.nix diff --git a/etcnixos/common.nix b/etcnixos/common.nix index 3ae8801..d4d9cc7 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -20,9 +20,32 @@ inputs.lanzaboote.nixosModules.lanzaboote ]; + nixpkgs.config.allowUnfree = true; + + # allow overclocking (I actually underclock but lol) + hardware.amdgpu.overdrive.ppfeaturemask = "0xFFF7FFFF"; + hardware.enableRedistributableFirmware = true; hardware.cpu.amd.updateMicrocode = true; + services.greetd = { + enable = true; + settings = { + default_session = { + command = "${lib.getExe pkgs.greetd.tuigreet} --time --cmd niri-session"; + user = username; + }; + }; + }; + + 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 + ''; + }; + swapDevices = [ ]; nix = { diff --git a/etcnixos/system-yarn.nix b/etcnixos/system-yarn.nix index 331ca55..d15f976 100644 --- a/etcnixos/system-yarn.nix +++ b/etcnixos/system-yarn.nix @@ -16,11 +16,6 @@ inputs.nixos-hardware.nixosModules.common-cpu-amd-pstate inputs.nixos-hardware.nixosModules.common-cpu-amd-zenpower ]; - nixpkgs.config.allowUnfree = true; - - # allow overclocking (I actually underclock but lol) - hardware.amdgpu.overdrive.ppfeaturemask = "0xFFF7FFFF"; - networking.hostId = "abf570f9"; boot = { kernelModules = [ @@ -29,20 +24,6 @@ ]; }; - 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 ]; diff --git a/home-manager/desktop.nix b/home-manager/desktop.nix new file mode 100644 index 0000000..8ac8cc9 --- /dev/null +++ b/home-manager/desktop.nix @@ -0,0 +1,30 @@ +{ + config, + lib, + pkgs, + ... +}: +{ + imports = [ + # 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 + blueman + + # used by /etc/nixos logic to launch niri + config.programs.niri.package + ]; + +} diff --git a/home-manager/home-mreow.nix b/home-manager/home-mreow.nix index a2068cb..d162804 100644 --- a/home-manager/home-mreow.nix +++ b/home-manager/home-mreow.nix @@ -7,32 +7,12 @@ { imports = [ ./gui.nix - - # niri wayland compositor - ./progs/niri.nix - - # statusbar - ./progs/eww/eww.nix - - # lockscreen - ./progs/swaylock.nix - - # notification daemon - ./progs/dunst.nix - + ./desktop.nix ./progs/borg.nix ./progs/framework-13-easyeffects.nix ]; - home.packages = with pkgs; [ - wdisplays - blueman - - # used by /etc/nixos logic to launch niri - config.programs.niri.package - ]; - # media controls systemd.user.services.mpris-proxy = { Unit.Description = "Mpris proxy"; diff --git a/home-manager/home-yarn.nix b/home-manager/home-yarn.nix index 67b1b26..d6f4614 100644 --- a/home-manager/home-yarn.nix +++ b/home-manager/home-yarn.nix @@ -8,6 +8,7 @@ { imports = [ ./gui.nix + ./desktop.nix ]; home.packages = with pkgs; [ From dbf9015011675ab340d61f32337f05362905aa56 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 8 Aug 2025 20:11:47 -0700 Subject: [PATCH 315/724] add nodePackages_latest.nodejs --- home-manager/no-gui.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 9d9fcae..45ad582 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -195,6 +195,8 @@ in # power stuff powerstat + + nodePackages_latest.nodejs ] ++ rust_pkgs ++ lsps From 140d38dc99c0ac6988d93d7e422ddf8e82e1c2f9 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 8 Aug 2025 20:20:10 -0700 Subject: [PATCH 316/724] add TODO to readme --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 64cc642..e747f5c 100644 --- a/README.md +++ b/README.md @@ -16,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) From c3b1ef43cd5f93bca2fe3a7c415cd88c992a96bb Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 9 Aug 2025 13:32:05 -0700 Subject: [PATCH 317/724] update --- flake.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 883d816..53c3c5c 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1754361940, - "narHash": "sha256-2KROQdENN8Ix5kiBZRM8FQP1KiJDikKPTiaaExYdVAY=", + "lastModified": 1754759269, + "narHash": "sha256-pBinP8BzBYkEZ7+c1ZHgJIvZre4uvga0edme9QN4pBU=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "a9a667084c0cf89081842d3002aef7b4829980aa", + "rev": "d23079069762b731ba233d5ab2f72ab1bfa179e3", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1754098183, - "narHash": "sha256-xiDTiBJlApXRiuTmOrdGaiJzs33lIdQepyCI8r9hy5w=", + "lastModified": 1754744872, + "narHash": "sha256-rcMHMs+dFWaDXev092gfxTfxHEWcUY/6SRV+cseNevQ=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "f2a7b326dc420360a66a542f2262081763f0f9ab", + "rev": "346fc31bcc4d2dbcc3e8ce8dbb622e4255ff54b7", "type": "github" }, "original": { @@ -213,11 +213,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1753983552, - "narHash": "sha256-xnPPjASWt4/u+GmRdrHADBKKSCtIhTFY53CSKM+Xtfk=", + "lastModified": 1754742008, + "narHash": "sha256-Tp0FG7VpLudVEC622d91z2hbdfPLCXxw0Nv43iNN4O0=", "owner": "YaLTeR", "repo": "niri", - "rev": "91b6a111cf228fadaabba706d8f4d155efc63b3a", + "rev": "67361f88fd01974ebee4cf80f0e29c87d805cc39", "type": "github" }, "original": { @@ -228,11 +228,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1754316476, - "narHash": "sha256-Ry1gd1BQrNVJJfT11cpVP0FY8XFMx4DJV2IDp01CH9w=", + "lastModified": 1754564048, + "narHash": "sha256-dz303vGuzWjzOPOaYkS9xSW+B93PSAJxvBd6CambXVA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9368056b73efb46eb14fd4667b99e0f81b805f28", + "rev": "26ed7a0d4b8741fe1ef1ee6fa64453ca056ce113", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1754292888, - "narHash": "sha256-1ziydHSiDuSnaiPzCQh1mRFBsM2d2yRX9I+5OPGEmIE=", + "lastModified": 1754689972, + "narHash": "sha256-eogqv6FqZXHgqrbZzHnq43GalnRbLTkbBbFtEfm1RSc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ce01daebf8489ba97bd1609d185ea276efdeb121", + "rev": "fc756aa6f5d3e2e5666efcf865d190701fef150a", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1754276100, - "narHash": "sha256-VmYP9Jo0U234xtGTGtihqNHfGy1JZ1h9WaaJlIuzgCk=", + "lastModified": 1754707163, + "narHash": "sha256-wgVgOsyJUDn2ZRpzu2gELKALoJXlBSoZJSln+Tlg5Pw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "dc2d2489572fa8a3b86c15ff9fd01f99b90cb90d", + "rev": "ac39ab4c8ed7cefe48d5ae5750f864422df58f01", "type": "github" }, "original": { @@ -337,11 +337,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1752338000, - "narHash": "sha256-Fxlp/yKtynug0jyuauAmvZU2SzHCfwlwWf85j+IvQ0U=", + "lastModified": 1754533920, + "narHash": "sha256-fCZ68Yud1sUCq6UNXj0SDyiBgVA8gJUE+14ZFGsFJG8=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "ba78881a68182ce338041846164cbfed0d70935c", + "rev": "e0d1dad25a158551ab58547b2ece4b7d5a19929c", "type": "github" }, "original": { @@ -360,11 +360,11 @@ ] }, "locked": { - "lastModified": 1754193284, - "narHash": "sha256-ZGLXnpXy7vcTDLC1yLQSJOclsilvK+RNFVVEeO0ei/0=", + "lastModified": 1754739276, + "narHash": "sha256-HQotJt480NsHIEgkt2ZiuvjGa50sc7cRhhsZXqZIWpU=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "ac2b25e76f5bfe1e30ae39409dfa450c5c1bc945", + "rev": "b5b7136bb6ed82504c3613a7e0cbe6f69b72e7f1", "type": "github" }, "original": { From 055de7f1ffdfb69cad2b6bd4b249a22e5e0e0755 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 10 Aug 2025 23:05:10 -0700 Subject: [PATCH 318/724] add yt-dlp --- home-manager/no-gui.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 45ad582..ffe2bac 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -197,6 +197,8 @@ in powerstat nodePackages_latest.nodejs + + yt-dlp ] ++ rust_pkgs ++ lsps From ec3b8db7f4a3ab5335e0800797e832f555da25a0 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 11 Aug 2025 12:41:59 -0700 Subject: [PATCH 319/724] add jq --- home-manager/no-gui.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index ffe2bac..a01c71a 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -100,6 +100,8 @@ let # convert between various units units + + jq ]; in From 77aa98d91a5b2a4b249ac4a114e51c8e6d5dcf8d Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 12 Aug 2025 01:14:28 -0700 Subject: [PATCH 320/724] update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 53c3c5c..8d81130 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1754759269, - "narHash": "sha256-pBinP8BzBYkEZ7+c1ZHgJIvZre4uvga0edme9QN4pBU=", + "lastModified": 1754964749, + "narHash": "sha256-zrF376CPh/rkB1xPXFN5WbbEqsd7ClOXxGx3sLMqgng=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "d23079069762b731ba233d5ab2f72ab1bfa179e3", + "rev": "8916044b55506a9b05b7c681ac864b302d867b34", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1754744872, - "narHash": "sha256-rcMHMs+dFWaDXev092gfxTfxHEWcUY/6SRV+cseNevQ=", + "lastModified": 1754901323, + "narHash": "sha256-G4/LiwFvBAKy6E0GqcegyCjmaJNjdl+9rFRxrOOjH30=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "346fc31bcc4d2dbcc3e8ce8dbb622e4255ff54b7", + "rev": "ed0fcb158e2ecf597a95dcc51facaf68557011a0", "type": "github" }, "original": { @@ -213,11 +213,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1754742008, - "narHash": "sha256-Tp0FG7VpLudVEC622d91z2hbdfPLCXxw0Nv43iNN4O0=", + "lastModified": 1754894368, + "narHash": "sha256-I7uSAOosX79BLVTWRHWHvT9z3Lv8rDYY3RogV/0Gne0=", "owner": "YaLTeR", "repo": "niri", - "rev": "67361f88fd01974ebee4cf80f0e29c87d805cc39", + "rev": "0044578681cee50fd7ad49fcb8d1e2ea53d85fe4", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1754689972, - "narHash": "sha256-eogqv6FqZXHgqrbZzHnq43GalnRbLTkbBbFtEfm1RSc=", + "lastModified": 1754767907, + "narHash": "sha256-8OnUzRQZkqtUol9vuUuQC30hzpMreKptNyET2T9lB6g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fc756aa6f5d3e2e5666efcf865d190701fef150a", + "rev": "c5f08b62ed75415439d48152c2a784e36909b1bc", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1754707163, - "narHash": "sha256-wgVgOsyJUDn2ZRpzu2gELKALoJXlBSoZJSln+Tlg5Pw=", + "lastModified": 1754966322, + "narHash": "sha256-7f/LH60DnjjQVKbXAsHIniGaU7ixVM7eWU3hyjT24YI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ac39ab4c8ed7cefe48d5ae5750f864422df58f01", + "rev": "7c13cec2e3828d964b9980d0ffd680bd8d4dce90", "type": "github" }, "original": { @@ -360,11 +360,11 @@ ] }, "locked": { - "lastModified": 1754739276, - "narHash": "sha256-HQotJt480NsHIEgkt2ZiuvjGa50sc7cRhhsZXqZIWpU=", + "lastModified": 1754972926, + "narHash": "sha256-2CEQSI3o7XWMc/DOdeNf6gTKjgGf8hHS0TB0HYPmSmA=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "b5b7136bb6ed82504c3613a7e0cbe6f69b72e7f1", + "rev": "508a7c0c5c993d237773be89f5ca91ff8c997b44", "type": "github" }, "original": { From cc4ad2aa60f9433afa567fb936355c9a0a30d33f Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 12 Aug 2025 01:57:55 -0700 Subject: [PATCH 321/724] use lib.concatLists --- home-manager/gui.nix | 165 ++++++++++++++++++++-------------------- home-manager/no-gui.nix | 116 ++++++++++++++-------------- 2 files changed, 141 insertions(+), 140 deletions(-) diff --git a/home-manager/gui.nix b/home-manager/gui.nix index 228a4c2..5860226 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -21,117 +21,116 @@ 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 + ] - #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-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}".twilight + nautilus + nufraw-thumbnailer + gdk-pixbuf - puddletag + enblend-enfuse - wireshark + # simple screen recording on wayland + wl-screenrec - darktable - rawtherapee - hugin + # wayland-compatible color picker + hyprpicker - # nufraw - nufraw-thumbnailer - gdk-pixbuf - nautilus + blender - enblend-enfuse + ghidra-bin - savvycan + # for mod organizer 2 + zenity + p7zip - # simple screen recording on wayland - wl-screenrec + # password manager + keepassxc - gimp3 - pinta + freecad-wayland - # wayland-compatible color picker - hyprpicker - - blender - - ghidra-bin - - # for mod organizer 2 - zenity - p7zip - - # password manager - keepassxc - - freecad-wayland - - localsend - ] - ++ (builtins.filter lib.isDerivation (builtins.attrValues nerd-fonts)); + localsend + ] + # all the fonts + (builtins.filter lib.isDerivation (builtins.attrValues nerd-fonts)) + ]; # programs.zed-editor = { # enable = true; diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index a01c71a..7b24d04 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -123,89 +123,91 @@ in home.packages = with pkgs; - [ - # python formatter - ruff + lib.concatLists [ + [ + # python formatter + ruff - # for website generation - hugo - go + # for website generation + hugo + go - # for benchmaking stuff - hyperfine + # for benchmaking stuff + hyperfine - pfetch-rs - waypipe + pfetch-rs + waypipe - sshfs + sshfs - # nix formatter - nixfmt-rfc-style + # nix formatter + nixfmt-rfc-style - # serial viewer - minicom + # serial viewer + minicom - # "~~matt's~~ my trace route" - mtr + # "~~matt's~~ my trace route" + mtr - ffmpeg-full + ffmpeg-full - # microcontroller tooling - probe-rs + # microcontroller tooling + probe-rs - (python312.withPackages ( - ps: with ps; [ - mypy # type checking + (python312.withPackages ( + ps: with ps; [ + mypy # type checking - python-lsp-server # lsp - python-lsp-ruff # ruff integration - pyserial + python-lsp-server # lsp + python-lsp-ruff # ruff integration + pyserial - numpy - matplotlib - notebook + numpy + matplotlib + notebook - pandas - ] - )) + pandas + ] + )) - binwalk + binwalk - # clang-format and clang-tidy - clang-tools - clang - gdb + # clang-format and clang-tidy + clang-tools + clang + gdb - git-crypt + git-crypt - imagemagick + imagemagick - nixpkgs-review + nixpkgs-review - nmap + nmap - # terminal image viewer - timg + # terminal image viewer + timg - tcpdump + tcpdump - borgbackup + borgbackup - # used to deploy nix system to server - # (and in the future, desktop) - deploy-rs + # used to deploy nix system to server + # (and in the future, desktop) + deploy-rs - # power stuff - powerstat + # power stuff + powerstat - nodePackages_latest.nodejs + nodePackages_latest.nodejs - yt-dlp - ] - ++ rust_pkgs - ++ lsps - ++ java_tools - ++ common_tools; + yt-dlp + ] + rust_pkgs + lsps + java_tools + common_tools + ]; # https://github.com/flamegraph-rs/flamegraph home.file.".cargo/config.toml".text = '' From 4eb583ea2d46f86359d522fc4638bcf25c7b1edc Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 13 Aug 2025 11:53:23 -0700 Subject: [PATCH 322/724] update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 8d81130..440a253 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1754964749, - "narHash": "sha256-zrF376CPh/rkB1xPXFN5WbbEqsd7ClOXxGx3sLMqgng=", + "lastModified": 1755104723, + "narHash": "sha256-YRGZYZPOQ6N7NEyFgVZt3oqGnFDdAJmLFuo8iDtiCps=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "8916044b55506a9b05b7c681ac864b302d867b34", + "rev": "f6151862155f7bb5e21b7682bc89905a8f188da2", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1754901323, - "narHash": "sha256-G4/LiwFvBAKy6E0GqcegyCjmaJNjdl+9rFRxrOOjH30=", + "lastModified": 1755104498, + "narHash": "sha256-kMosXLeEB43OtUKvhvzikKfFLpv7H7JzObCQO0j4X34=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "ed0fcb158e2ecf597a95dcc51facaf68557011a0", + "rev": "22a24ab05a9f4b3a94fba0aa0d8d850e6269241a", "type": "github" }, "original": { @@ -213,11 +213,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1754894368, - "narHash": "sha256-I7uSAOosX79BLVTWRHWHvT9z3Lv8rDYY3RogV/0Gne0=", + "lastModified": 1755074352, + "narHash": "sha256-I+kpboTzfMwRVK76OoTmHStrGuzJPcmvZKxmlmL9q+A=", "owner": "YaLTeR", "repo": "niri", - "rev": "0044578681cee50fd7ad49fcb8d1e2ea53d85fe4", + "rev": "af9ce533100b49e8bc879b557ab830f5d3a18805", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1754767907, - "narHash": "sha256-8OnUzRQZkqtUol9vuUuQC30hzpMreKptNyET2T9lB6g=", + "lastModified": 1754937576, + "narHash": "sha256-3sWA5WJybUE16kIMZ3+uxcxKZY/JRR4DFBqLdSLBo7w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c5f08b62ed75415439d48152c2a784e36909b1bc", + "rev": "ddae11e58c0c345bf66efbddbf2192ed0e58f896", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1754966322, - "narHash": "sha256-7f/LH60DnjjQVKbXAsHIniGaU7ixVM7eWU3hyjT24YI=", + "lastModified": 1755052812, + "narHash": "sha256-Tjw2YP7Hz8+ibE8wJ+Ps65vh1lzAe5ozmoo9sdQ7rGg=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "7c13cec2e3828d964b9980d0ffd680bd8d4dce90", + "rev": "433023cba5f4fa66b8b0fdbb8f91d420c9cc2527", "type": "github" }, "original": { @@ -360,11 +360,11 @@ ] }, "locked": { - "lastModified": 1754972926, - "narHash": "sha256-2CEQSI3o7XWMc/DOdeNf6gTKjgGf8hHS0TB0HYPmSmA=", + "lastModified": 1755055213, + "narHash": "sha256-smOMNJ6ZM4mKvYB2z1Dbfkttr9fnjqeLT9bqRwn/L1U=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "508a7c0c5c993d237773be89f5ca91ff8c997b44", + "rev": "6391f8217d75b9f72b8c77572246937323ed90bc", "type": "github" }, "original": { From 921d34af1bb94f6614c1984f2874268a2595352a Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 15 Aug 2025 01:45:54 -0700 Subject: [PATCH 323/724] update --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 440a253..b474f54 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1755104723, - "narHash": "sha256-YRGZYZPOQ6N7NEyFgVZt3oqGnFDdAJmLFuo8iDtiCps=", + "lastModified": 1755224130, + "narHash": "sha256-1FlP85b5RAnqjlRn7YeXKhDPkoByxcCyQD8NiY72RCE=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "f6151862155f7bb5e21b7682bc89905a8f188da2", + "rev": "d94f174b22b302c90f25e572fb187f4e2b877a17", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1754937576, - "narHash": "sha256-3sWA5WJybUE16kIMZ3+uxcxKZY/JRR4DFBqLdSLBo7w=", + "lastModified": 1755078291, + "narHash": "sha256-Hu/gTDoi4uy6TAKISPHQusSMy8U6xUbLSDjKBYdhDIY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ddae11e58c0c345bf66efbddbf2192ed0e58f896", + "rev": "3385ca0cd7e14c1a1eb80401fe011705ff012323", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1755052812, - "narHash": "sha256-Tjw2YP7Hz8+ibE8wJ+Ps65vh1lzAe5ozmoo9sdQ7rGg=", + "lastModified": 1755225702, + "narHash": "sha256-i7Rgs943NqX0RgQW0/l1coi8eWBj3XhxVggMpjjzTsk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "433023cba5f4fa66b8b0fdbb8f91d420c9cc2527", + "rev": "4abaeba6b176979be0da0195b9e4ce86bc501ae4", "type": "github" }, "original": { @@ -360,11 +360,11 @@ ] }, "locked": { - "lastModified": 1755055213, - "narHash": "sha256-smOMNJ6ZM4mKvYB2z1Dbfkttr9fnjqeLT9bqRwn/L1U=", + "lastModified": 1755199018, + "narHash": "sha256-y7dM6ihF4feDgbssaeFxKXjsJb6Rzjz1brc17kSkcoQ=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "6391f8217d75b9f72b8c77572246937323ed90bc", + "rev": "8bf64e38baa26429c31d0623c3f16812b794b436", "type": "github" }, "original": { From 9ca11af010260a65217f2235d0082f4985de7dff Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 15 Aug 2025 22:12:32 -0700 Subject: [PATCH 324/724] timezone: PST -> EST --- etcnixos/system-mreow.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etcnixos/system-mreow.nix b/etcnixos/system-mreow.nix index 317c00c..f78f65b 100644 --- a/etcnixos/system-mreow.nix +++ b/etcnixos/system-mreow.nix @@ -25,7 +25,7 @@ */ # PST - time.timeZone = lib.mkForce "America/Los_Angeles"; + # time.timeZone = lib.mkForce "America/Los_Angeles"; services.greetd = { enable = true; From 086e69df14e8378b2538beeedd52cc22c3c23307 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 16 Aug 2025 01:39:52 -0400 Subject: [PATCH 325/724] update --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index b474f54..4deeb37 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1755224130, - "narHash": "sha256-1FlP85b5RAnqjlRn7YeXKhDPkoByxcCyQD8NiY72RCE=", + "lastModified": 1755310197, + "narHash": "sha256-I4NCMkwegADxgW5PfviBpSic00uL6o+8Fl1PXI9QmHg=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "d94f174b22b302c90f25e572fb187f4e2b877a17", + "rev": "49c623d71fbbace5ee943e60168fbc2e0b998966", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1755104498, - "narHash": "sha256-kMosXLeEB43OtUKvhvzikKfFLpv7H7JzObCQO0j4X34=", + "lastModified": 1755314615, + "narHash": "sha256-38QRGUQfK7pskxDi0Ho/a5ogrC4eoZ+Uj8CBUIIHf/4=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "22a24ab05a9f4b3a94fba0aa0d8d850e6269241a", + "rev": "93da331d791fa401fa88213ef129111b491a602d", "type": "github" }, "original": { @@ -213,11 +213,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1755074352, - "narHash": "sha256-I+kpboTzfMwRVK76OoTmHStrGuzJPcmvZKxmlmL9q+A=", + "lastModified": 1755234565, + "narHash": "sha256-wOZx5fvSFVmQhWrm41RO3MjoQHJWYCr4N66oA7jfOjw=", "owner": "YaLTeR", "repo": "niri", - "rev": "af9ce533100b49e8bc879b557ab830f5d3a18805", + "rev": "6d0505e684c9b93e03a8b4cc5a313c4dea365e54", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1755078291, - "narHash": "sha256-Hu/gTDoi4uy6TAKISPHQusSMy8U6xUbLSDjKBYdhDIY=", + "lastModified": 1755274400, + "narHash": "sha256-rTInmnp/xYrfcMZyFMH3kc8oko5zYfxsowaLv1LVobY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3385ca0cd7e14c1a1eb80401fe011705ff012323", + "rev": "ad7196ae55c295f53a7d1ec39e4a06d922f3b899", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1755225702, - "narHash": "sha256-i7Rgs943NqX0RgQW0/l1coi8eWBj3XhxVggMpjjzTsk=", + "lastModified": 1755311859, + "narHash": "sha256-NspGtm0ZpihxlFD628pvh5ZEhL/Q6/Z9XBpe3n6ZtEw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "4abaeba6b176979be0da0195b9e4ce86bc501ae4", + "rev": "07619500e5937cc4669f24fec355d18a8fec0165", "type": "github" }, "original": { @@ -337,11 +337,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1754533920, - "narHash": "sha256-fCZ68Yud1sUCq6UNXj0SDyiBgVA8gJUE+14ZFGsFJG8=", + "lastModified": 1755219541, + "narHash": "sha256-yKV6xHaPbEbh5RPxAJnb9yTs1wypr7do86hFFGQm1w8=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "e0d1dad25a158551ab58547b2ece4b7d5a19929c", + "rev": "5a184d435927c3423f0ad189ea2b490578450fb7", "type": "github" }, "original": { @@ -360,11 +360,11 @@ ] }, "locked": { - "lastModified": 1755199018, - "narHash": "sha256-y7dM6ihF4feDgbssaeFxKXjsJb6Rzjz1brc17kSkcoQ=", + "lastModified": 1755321573, + "narHash": "sha256-U2eUEfy7leG/UJiyHKcAMBSxWZEtY5lKj8hQ4wuB2Wo=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "8bf64e38baa26429c31d0623c3f16812b794b436", + "rev": "0772a02b9b2ade8c4017a0213e60ce34381cef5a", "type": "github" }, "original": { From 9f75885be34837741d150eb8b747236d6a50582a Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 17 Aug 2025 23:36:18 -0400 Subject: [PATCH 326/724] merge system.activationScripts sections --- etcnixos/common.nix | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/etcnixos/common.nix b/etcnixos/common.nix index d4d9cc7..3afb2da 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -44,6 +44,17 @@ #!/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 = [ ]; @@ -59,19 +70,6 @@ ]; }; - system.activationScripts = { - # 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} - ''; - }; - # kernel options boot = { kernelPackages = pkgs.linuxPackages_latest; From 0b302105b1d6029666b62fe92fffaa550c1395e6 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 17 Aug 2025 23:37:46 -0400 Subject: [PATCH 327/724] add upower --- etcnixos/common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/etcnixos/common.nix b/etcnixos/common.nix index 3afb2da..66f81cd 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -145,6 +145,9 @@ # Making sure mullvad works on boot mullvad-vpn.enable = true; + + # power statistics + upower.enable = true; }; # EST From 738327b9fca8c87b23e6fd15807f2bf593843878 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 17 Aug 2025 23:37:53 -0400 Subject: [PATCH 328/724] add comment regarding password-hash --- etcnixos/common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/etcnixos/common.nix b/etcnixos/common.nix index 66f81cd..5a43016 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -202,6 +202,7 @@ "camera" "adbusers" ]; + # TODO! this is really bad :( I should really figure out how to do proper secrets management hashedPasswordFile = "${./secrets/password-hash}"; }; From 8860fe45c47664dba7ce344030fa52a932d71ac9 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 18 Aug 2025 00:01:33 -0400 Subject: [PATCH 329/724] update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 4deeb37..b0f1815 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1755310197, - "narHash": "sha256-I4NCMkwegADxgW5PfviBpSic00uL6o+8Fl1PXI9QmHg=", + "lastModified": 1755484104, + "narHash": "sha256-ucWQQks9BroTbeFGH8sZYTd98lryz4HgPyxJlKO9H1E=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "49c623d71fbbace5ee943e60168fbc2e0b998966", + "rev": "f57fabeeef73658eaac452697d95ff00bd1f4694", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1755314615, - "narHash": "sha256-38QRGUQfK7pskxDi0Ho/a5ogrC4eoZ+Uj8CBUIIHf/4=", + "lastModified": 1755424351, + "narHash": "sha256-xcorYLNdtLpb0wH5CPlUcpmYQUxeK95j1X855xQw+DY=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "93da331d791fa401fa88213ef129111b491a602d", + "rev": "9aa137af01f05386e5bb5050e983750017007a66", "type": "github" }, "original": { @@ -213,11 +213,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1755234565, - "narHash": "sha256-wOZx5fvSFVmQhWrm41RO3MjoQHJWYCr4N66oA7jfOjw=", + "lastModified": 1755419373, + "narHash": "sha256-EFH3zbpyLYjEboNV2Lmkxf9joEuFCmeYX+MMLRPStpg=", "owner": "YaLTeR", "repo": "niri", - "rev": "6d0505e684c9b93e03a8b4cc5a313c4dea365e54", + "rev": "a6febb86aa5af0df7bf2792ca027ef95a503d599", "type": "github" }, "original": { @@ -228,11 +228,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1754564048, - "narHash": "sha256-dz303vGuzWjzOPOaYkS9xSW+B93PSAJxvBd6CambXVA=", + "lastModified": 1755330281, + "narHash": "sha256-aJHFJWP9AuI8jUGzI77LYcSlkA9wJnOIg4ZqftwNGXA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "26ed7a0d4b8741fe1ef1ee6fa64453ca056ce113", + "rev": "3dac8a872557e0ca8c083cdcfc2f218d18e113b0", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1755311859, - "narHash": "sha256-NspGtm0ZpihxlFD628pvh5ZEhL/Q6/Z9XBpe3n6ZtEw=", + "lastModified": 1755485198, + "narHash": "sha256-C3042ST2lUg0nh734gmuP4lRRIBitA6Maegg2/jYRM4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "07619500e5937cc4669f24fec355d18a8fec0165", + "rev": "aa45e63d431b28802ca4490cfc796b9e31731df7", "type": "github" }, "original": { @@ -360,11 +360,11 @@ ] }, "locked": { - "lastModified": 1755321573, - "narHash": "sha256-U2eUEfy7leG/UJiyHKcAMBSxWZEtY5lKj8hQ4wuB2Wo=", + "lastModified": 1755484558, + "narHash": "sha256-1dlhluaqrePy1L8ShBCkiF/KF9ci5tSZzdUI60NjzOI=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "0772a02b9b2ade8c4017a0213e60ce34381cef5a", + "rev": "d169f16140842d7ba3183c0321f984368bdd2ee3", "type": "github" }, "original": { From 9ee551c1ed8249e0bf7f5d7456a9446190b368c8 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 18 Aug 2025 10:27:34 -0400 Subject: [PATCH 330/724] update --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index b0f1815..2340005 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1755484104, - "narHash": "sha256-ucWQQks9BroTbeFGH8sZYTd98lryz4HgPyxJlKO9H1E=", + "lastModified": 1755508444, + "narHash": "sha256-/XK2GVy6at/UEAgaw3jdDs7/ueLEaDuK2B5z++zFyNo=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "f57fabeeef73658eaac452697d95ff00bd1f4694", + "rev": "b7e25dfc00eeaff5a7c6f2c4fd2213f9b42428ef", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1755274400, - "narHash": "sha256-rTInmnp/xYrfcMZyFMH3kc8oko5zYfxsowaLv1LVobY=", + "lastModified": 1755471983, + "narHash": "sha256-axUoWcm4cNQ36jOlnkD9D40LTfSQgk8ExfHSRm3rTtg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ad7196ae55c295f53a7d1ec39e4a06d922f3b899", + "rev": "48f4c982de68d966421d2b6f1ddbeb6227cc5ceb", "type": "github" }, "original": { From 70010cda53e385ae72391facf0825d2a2fb74a87 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 19 Aug 2025 23:50:03 -0400 Subject: [PATCH 331/724] update --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 2340005..6d715e3 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1755508444, - "narHash": "sha256-/XK2GVy6at/UEAgaw3jdDs7/ueLEaDuK2B5z++zFyNo=", + "lastModified": 1755653084, + "narHash": "sha256-66803vCedzgsvHbSmnBHQcvvQAJdJuGTSBFGt01uCCg=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "b7e25dfc00eeaff5a7c6f2c4fd2213f9b42428ef", + "rev": "d4c63b61672ced2efa7af225f36bb0453fb7b558", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1755471983, - "narHash": "sha256-axUoWcm4cNQ36jOlnkD9D40LTfSQgk8ExfHSRm3rTtg=", + "lastModified": 1755593991, + "narHash": "sha256-BA9MuPjBDx/WnpTJ0EGhStyfE7hug8g85Y3Ju9oTsM4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "48f4c982de68d966421d2b6f1ddbeb6227cc5ceb", + "rev": "a58390ab6f1aa810eb8e0f0fc74230e7cc06de03", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1755485198, - "narHash": "sha256-C3042ST2lUg0nh734gmuP4lRRIBitA6Maegg2/jYRM4=", + "lastModified": 1755657401, + "narHash": "sha256-rPHuWPAcwW63wH1SUtDCqAnf2+60pi/pGMCIhVobzXc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "aa45e63d431b28802ca4490cfc796b9e31731df7", + "rev": "292ca754b0f679b842fbfc4734f017c351f0e9eb", "type": "github" }, "original": { @@ -360,11 +360,11 @@ ] }, "locked": { - "lastModified": 1755484558, - "narHash": "sha256-1dlhluaqrePy1L8ShBCkiF/KF9ci5tSZzdUI60NjzOI=", + "lastModified": 1755577394, + "narHash": "sha256-DsU5qMTdQvlq85cmPd08M57y3JgJRmgKoOEcvBc6Ikk=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "d169f16140842d7ba3183c0321f984368bdd2ee3", + "rev": "fed34c3fe29a694f62b23bcc63dd5ad284ab19fb", "type": "github" }, "original": { From a2a4eaa102227a8480b94614444c5f354b247c10 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 21 Aug 2025 18:24:40 -0400 Subject: [PATCH 332/724] update --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 6d715e3..99df28b 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1755653084, - "narHash": "sha256-66803vCedzgsvHbSmnBHQcvvQAJdJuGTSBFGt01uCCg=", + "lastModified": 1755739440, + "narHash": "sha256-EyuB5HtD04iOIdQ4D4WqFVV7RUbJCL9E004HnaYdOWc=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "d4c63b61672ced2efa7af225f36bb0453fb7b558", + "rev": "f4a59c089b953ec3f5e8983df6bb946317a36ad9", "type": "github" }, "original": { @@ -125,11 +125,11 @@ ] }, "locked": { - "lastModified": 1753592768, - "narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=", + "lastModified": 1755776884, + "narHash": "sha256-CPM7zm6csUx7vSfKvzMDIjepEJv1u/usmaT7zydzbuI=", "owner": "nix-community", "repo": "home-manager", - "rev": "fc3add429f21450359369af74c2375cb34a2d204", + "rev": "4fb695d10890e9fc6a19deadf85ff79ffb78da86", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1755593991, - "narHash": "sha256-BA9MuPjBDx/WnpTJ0EGhStyfE7hug8g85Y3Ju9oTsM4=", + "lastModified": 1755704039, + "narHash": "sha256-gKlP0LbyJ3qX0KObfIWcp5nbuHSb5EHwIvU6UcNBg2A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a58390ab6f1aa810eb8e0f0fc74230e7cc06de03", + "rev": "9cb344e96d5b6918e94e1bca2d9f3ea1e9615545", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1755657401, - "narHash": "sha256-rPHuWPAcwW63wH1SUtDCqAnf2+60pi/pGMCIhVobzXc=", + "lastModified": 1755743804, + "narHash": "sha256-M6qT02voARH5e9eTXQBzpYIE/hAp6jPgBCyxLmw5uBM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "292ca754b0f679b842fbfc4734f017c351f0e9eb", + "rev": "80322e975e27d834451d6b66e63f8abae9d74bf2", "type": "github" }, "original": { @@ -360,11 +360,11 @@ ] }, "locked": { - "lastModified": 1755577394, - "narHash": "sha256-DsU5qMTdQvlq85cmPd08M57y3JgJRmgKoOEcvBc6Ikk=", + "lastModified": 1755745641, + "narHash": "sha256-dk5XmelXuuIPr7twSyVlxcORlRKr7ch68wXd1Bz+T4c=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "fed34c3fe29a694f62b23bcc63dd5ad284ab19fb", + "rev": "e00337af97e646e0ecb94097983f33bda767fb41", "type": "github" }, "original": { From dd02e9e68b88f5ac26db93b7906575e240024dac Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 24 Aug 2025 23:12:52 -0400 Subject: [PATCH 333/724] update --- flake.lock | 56 +++++++++++++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/flake.lock b/flake.lock index 99df28b..70061f2 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1755739440, - "narHash": "sha256-EyuB5HtD04iOIdQ4D4WqFVV7RUbJCL9E004HnaYdOWc=", + "lastModified": 1756087945, + "narHash": "sha256-+abiBhtddmBlNrxko1r4Z6oKSKszBkzemrt2k//NXGk=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "f4a59c089b953ec3f5e8983df6bb946317a36ad9", + "rev": "9e3a5b9a0c79e66b4a1e2490be606a058a6712fe", "type": "github" }, "original": { @@ -125,11 +125,11 @@ ] }, "locked": { - "lastModified": 1755776884, - "narHash": "sha256-CPM7zm6csUx7vSfKvzMDIjepEJv1u/usmaT7zydzbuI=", + "lastModified": 1755928099, + "narHash": "sha256-OILVkfhRCm8u18IZ2DKR8gz8CVZM2ZcJmQBXmjFLIfk=", "owner": "nix-community", "repo": "home-manager", - "rev": "4fb695d10890e9fc6a19deadf85ff79ffb78da86", + "rev": "4a44fb9f7555da362af9d499817084f4288a957f", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1755424351, - "narHash": "sha256-xcorYLNdtLpb0wH5CPlUcpmYQUxeK95j1X855xQw+DY=", + "lastModified": 1756044152, + "narHash": "sha256-S1xSW+BV+atXVLdrMK4eHAH5iqcyMpbbaWyCfSczZ7E=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "9aa137af01f05386e5bb5050e983750017007a66", + "rev": "4cebf431b12e705d6040e210322a2f086c5fe35a", "type": "github" }, "original": { @@ -213,11 +213,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1755419373, - "narHash": "sha256-EFH3zbpyLYjEboNV2Lmkxf9joEuFCmeYX+MMLRPStpg=", + "lastModified": 1756040766, + "narHash": "sha256-rL1ipwogRz1EjvEw3YdF6isEUGFqWlLXkB57zs4sYOg=", "owner": "YaLTeR", "repo": "niri", - "rev": "a6febb86aa5af0df7bf2792ca027ef95a503d599", + "rev": "8b73910a11473ca9d06b204ccb7377360ced00db", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1755704039, - "narHash": "sha256-gKlP0LbyJ3qX0KObfIWcp5nbuHSb5EHwIvU6UcNBg2A=", + "lastModified": 1755922037, + "narHash": "sha256-wY1+2JPH0ZZC4BQefoZw/k+3+DowFyfOxv17CN/idKs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9cb344e96d5b6918e94e1bca2d9f3ea1e9615545", + "rev": "b1b3291469652d5a2edb0becc4ef0246fff97a7c", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1755743804, - "narHash": "sha256-M6qT02voARH5e9eTXQBzpYIE/hAp6jPgBCyxLmw5uBM=", + "lastModified": 1756089517, + "narHash": "sha256-KGinVKturJFPrRebgvyUB1BUNqf1y9FN+tSJaTPlnFE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "80322e975e27d834451d6b66e63f8abae9d74bf2", + "rev": "44774c8c83cd392c50914f86e1ff75ef8619f1cd", "type": "github" }, "original": { @@ -320,16 +320,16 @@ "xwayland-satellite-stable": { "flake": false, "locked": { - "lastModified": 1748488455, - "narHash": "sha256-IiLr1alzKFIy5tGGpDlabQbe6LV1c9ABvkH6T5WmyRI=", + "lastModified": 1755491097, + "narHash": "sha256-m+9tUfsmBeF2Gn4HWa6vSITZ4Gz1eA1F5Kh62B0N4oE=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "3ba30b149f9eb2bbf42cf4758d2158ca8cceef73", + "rev": "388d291e82ffbc73be18169d39470f340707edaa", "type": "github" }, "original": { "owner": "Supreeeme", - "ref": "v0.6", + "ref": "v0.7", "repo": "xwayland-satellite", "type": "github" } @@ -337,11 +337,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1755219541, - "narHash": "sha256-yKV6xHaPbEbh5RPxAJnb9yTs1wypr7do86hFFGQm1w8=", + "lastModified": 1755963545, + "narHash": "sha256-hGXzVhlk+gelqagKAgOHbilNYasM+jM3T8JPshDl2/M=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "5a184d435927c3423f0ad189ea2b490578450fb7", + "rev": "d759c64681bab7cd34f48122037d7420d42f3024", "type": "github" }, "original": { @@ -360,11 +360,11 @@ ] }, "locked": { - "lastModified": 1755745641, - "narHash": "sha256-dk5XmelXuuIPr7twSyVlxcORlRKr7ch68wXd1Bz+T4c=", + "lastModified": 1756073902, + "narHash": "sha256-c+nkNP2iK4BtNL9fkSgjO/ZQstfJKE0G6hanuTtGtf8=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "e00337af97e646e0ecb94097983f33bda767fb41", + "rev": "7c096513336dbff12d5e11e352148a676d042820", "type": "github" }, "original": { From e779b0114e01dc5ed1347e2a67b6d6e2548720ea Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 25 Aug 2025 10:39:56 -0400 Subject: [PATCH 334/724] use tuned instead of tlp or ppd --- etcnixos/common.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/etcnixos/common.nix b/etcnixos/common.nix index 5a43016..100a219 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -20,6 +20,11 @@ inputs.lanzaboote.nixosModules.lanzaboote ]; + # use tuned instead of tlp or ppd + services.power-profiles-daemon.enable = false; + services.tlp.enable = false; + services.tuned.enable = true; + nixpkgs.config.allowUnfree = true; # allow overclocking (I actually underclock but lol) From 509deff49db0228fd06284e15a1eb1f2340007c9 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 26 Aug 2025 16:25:05 -0400 Subject: [PATCH 335/724] update --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 70061f2..f7079f4 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1756087945, - "narHash": "sha256-+abiBhtddmBlNrxko1r4Z6oKSKszBkzemrt2k//NXGk=", + "lastModified": 1756228147, + "narHash": "sha256-m1KHG3F0QFLb7vcD99yXpcxfhBTaGdgZyTZnazxCxNI=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "9e3a5b9a0c79e66b4a1e2490be606a058a6712fe", + "rev": "3b3e842cce376e332b0a4606ca18a846fbc49430", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1756044152, - "narHash": "sha256-S1xSW+BV+atXVLdrMK4eHAH5iqcyMpbbaWyCfSczZ7E=", + "lastModified": 1756238138, + "narHash": "sha256-QOSNN2WCZXaDG9fTFEF2qoQY1DGlHC1knzi+gDrHOKI=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "4cebf431b12e705d6040e210322a2f086c5fe35a", + "rev": "6cc1e06575f1c5a8395e6f3323bc0960b0ccb559", "type": "github" }, "original": { @@ -213,11 +213,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1756040766, - "narHash": "sha256-rL1ipwogRz1EjvEw3YdF6isEUGFqWlLXkB57zs4sYOg=", + "lastModified": 1756235398, + "narHash": "sha256-xdfc8/smxWFqpVHeofzxSldwNkPMuOJeY/dvPw38HWw=", "owner": "YaLTeR", "repo": "niri", - "rev": "8b73910a11473ca9d06b204ccb7377360ced00db", + "rev": "39e5f637eff823d95153216ac55b11ca01fbc593", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1756089517, - "narHash": "sha256-KGinVKturJFPrRebgvyUB1BUNqf1y9FN+tSJaTPlnFE=", + "lastModified": 1756197489, + "narHash": "sha256-S16rPaBH1TnMbDyL5NlGSJcYd7wPlOEWTStdBDL7BHw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "44774c8c83cd392c50914f86e1ff75ef8619f1cd", + "rev": "8ec04f46f1edeeed3f870da62191745b93975da7", "type": "github" }, "original": { @@ -360,11 +360,11 @@ ] }, "locked": { - "lastModified": 1756073902, - "narHash": "sha256-c+nkNP2iK4BtNL9fkSgjO/ZQstfJKE0G6hanuTtGtf8=", + "lastModified": 1756235741, + "narHash": "sha256-7S8s+/365OgcqiSFfPKFJOrn+qq8grDzkOZkhmY4qYQ=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "7c096513336dbff12d5e11e352148a676d042820", + "rev": "c021315cb6c6320292fd4822e93b407f75689a6b", "type": "github" }, "original": { From 24e82099f5f207a5295ae841c1d6a56f3f7106d5 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 29 Aug 2025 00:09:43 -0400 Subject: [PATCH 336/724] update --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index f7079f4..9d32cfd 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1756228147, - "narHash": "sha256-m1KHG3F0QFLb7vcD99yXpcxfhBTaGdgZyTZnazxCxNI=", + "lastModified": 1756433238, + "narHash": "sha256-90TzmsvvqAihUcJKEG3cwp8pvGLP3P1oc3gAGU4EzOU=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "3b3e842cce376e332b0a4606ca18a846fbc49430", + "rev": "792b33fe5e6914c3ed0a59c5c543dfa4f63a55d6", "type": "github" }, "original": { @@ -125,11 +125,11 @@ ] }, "locked": { - "lastModified": 1755928099, - "narHash": "sha256-OILVkfhRCm8u18IZ2DKR8gz8CVZM2ZcJmQBXmjFLIfk=", + "lastModified": 1756245065, + "narHash": "sha256-aAZNbGcWrVRZgWgkQbkabSGcDVRDMgON4BipMy69gvI=", "owner": "nix-community", "repo": "home-manager", - "rev": "4a44fb9f7555da362af9d499817084f4288a957f", + "rev": "54b2879ce622d44415e727905925e21b8f833a98", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1756238138, - "narHash": "sha256-QOSNN2WCZXaDG9fTFEF2qoQY1DGlHC1knzi+gDrHOKI=", + "lastModified": 1756337322, + "narHash": "sha256-FiUw6z+ytxopB8dYc0/LVtc/8F8wnsdUvpzSHNeojb8=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "6cc1e06575f1c5a8395e6f3323bc0960b0ccb559", + "rev": "a0a748911825656657dcffbe16eb58c9d4039a77", "type": "github" }, "original": { @@ -213,11 +213,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1756235398, - "narHash": "sha256-xdfc8/smxWFqpVHeofzxSldwNkPMuOJeY/dvPw38HWw=", + "lastModified": 1756304824, + "narHash": "sha256-XOR+SyrASQQ2DnQvK2pcPx67sPyGdG3wwmZGlgpoJu8=", "owner": "YaLTeR", "repo": "niri", - "rev": "39e5f637eff823d95153216ac55b11ca01fbc593", + "rev": "d9833fc1c3de306f500662471ae001094813dbd5", "type": "github" }, "original": { @@ -228,11 +228,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1755330281, - "narHash": "sha256-aJHFJWP9AuI8jUGzI77LYcSlkA9wJnOIg4ZqftwNGXA=", + "lastModified": 1756245047, + "narHash": "sha256-9bHzrVbjAudbO8q4vYFBWlEkDam31fsz0J7GB8k4AsI=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3dac8a872557e0ca8c083cdcfc2f218d18e113b0", + "rev": "a65b650d6981e23edd1afa1f01eb942f19cdcbb7", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1755922037, - "narHash": "sha256-wY1+2JPH0ZZC4BQefoZw/k+3+DowFyfOxv17CN/idKs=", + "lastModified": 1756217674, + "narHash": "sha256-TH1SfSP523QI7kcPiNtMAEuwZR3Jdz0MCDXPs7TS8uo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b1b3291469652d5a2edb0becc4ef0246fff97a7c", + "rev": "4e7667a90c167f7a81d906e5a75cba4ad8bee620", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1756197489, - "narHash": "sha256-S16rPaBH1TnMbDyL5NlGSJcYd7wPlOEWTStdBDL7BHw=", + "lastModified": 1756434910, + "narHash": "sha256-5UJRyxZ8QCm+pgh5pNHXFJMmopMqHVraUhRA1g2AmA0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "8ec04f46f1edeeed3f870da62191745b93975da7", + "rev": "86e5140961c91a9ee1dde1c17d18a787d44ceef8", "type": "github" }, "original": { @@ -337,11 +337,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1755963545, - "narHash": "sha256-hGXzVhlk+gelqagKAgOHbilNYasM+jM3T8JPshDl2/M=", + "lastModified": 1756260173, + "narHash": "sha256-wcf04fl5ncbOqAK7OCWIgILERIbMfL/eeM3UThqgErI=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "d759c64681bab7cd34f48122037d7420d42f3024", + "rev": "af33f7eb124b51ff6d9cdf9b428643e2246c8cbb", "type": "github" }, "original": { @@ -360,11 +360,11 @@ ] }, "locked": { - "lastModified": 1756235741, - "narHash": "sha256-7S8s+/365OgcqiSFfPKFJOrn+qq8grDzkOZkhmY4qYQ=", + "lastModified": 1756417617, + "narHash": "sha256-3xiEX9TvXfkEePL6rY1n6WpEEY0tBCxCTy3Evv6Oe+8=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "c021315cb6c6320292fd4822e93b407f75689a6b", + "rev": "fa97a393b3b7444d5d84f4cdd788d7c49d5dc60d", "type": "github" }, "original": { From 851004a781702490207c9e2431cb650cd208b1aa Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 29 Aug 2025 13:12:57 -0400 Subject: [PATCH 337/724] add josm --- home-manager/gui.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home-manager/gui.nix b/home-manager/gui.nix index 5860226..d00f22a 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -127,6 +127,9 @@ freecad-wayland localsend + + # openstreetmap + josm ] # all the fonts (builtins.filter lib.isDerivation (builtins.attrValues nerd-fonts)) From 8f2aff34fe69961418194d88fd920e7e00d633f3 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 30 Aug 2025 02:13:22 -0400 Subject: [PATCH 338/724] update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 9d32cfd..76aa447 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1756433238, - "narHash": "sha256-90TzmsvvqAihUcJKEG3cwp8pvGLP3P1oc3gAGU4EzOU=", + "lastModified": 1756519376, + "narHash": "sha256-ssyp3oGb9oCSTGT667+vdzEMZtH+qF9N8zKpQPdAkl8=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "792b33fe5e6914c3ed0a59c5c543dfa4f63a55d6", + "rev": "9ea70e7ea6d66396f414fc661b1f02ebc27bef8d", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1756337322, - "narHash": "sha256-FiUw6z+ytxopB8dYc0/LVtc/8F8wnsdUvpzSHNeojb8=", + "lastModified": 1756451209, + "narHash": "sha256-zrFKbXArvNjUKYYd1I48cnvlgB6cGA/mFoRvgp/wRHc=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "a0a748911825656657dcffbe16eb58c9d4039a77", + "rev": "cdfffe0b009582f5161dcd030a5549236287767b", "type": "github" }, "original": { @@ -213,11 +213,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1756304824, - "narHash": "sha256-XOR+SyrASQQ2DnQvK2pcPx67sPyGdG3wwmZGlgpoJu8=", + "lastModified": 1756448032, + "narHash": "sha256-ZIRj8dt8FmJdQeJjNvyK1RirYBmun+e/K3TMG8Qdodc=", "owner": "YaLTeR", "repo": "niri", - "rev": "d9833fc1c3de306f500662471ae001094813dbd5", + "rev": "dfe463ed7dcf36cc706f5540c5d0804775b5c86b", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1756217674, - "narHash": "sha256-TH1SfSP523QI7kcPiNtMAEuwZR3Jdz0MCDXPs7TS8uo=", + "lastModified": 1756346337, + "narHash": "sha256-al0UcN5mXrO/p5lcH0MuQaj+t97s3brzCii8GfCBMuA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4e7667a90c167f7a81d906e5a75cba4ad8bee620", + "rev": "84c26d62ce9e15489c63b83fc44e6eb62705d2c9", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1756434910, - "narHash": "sha256-5UJRyxZ8QCm+pgh5pNHXFJMmopMqHVraUhRA1g2AmA0=", + "lastModified": 1756521112, + "narHash": "sha256-/YW9DI+vZ2lbTvYAek6BsudUXdpWr0FybTDod4P42L4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "86e5140961c91a9ee1dde1c17d18a787d44ceef8", + "rev": "2243e3f251ea18486f83133cf8e325d2b9b71e89", "type": "github" }, "original": { @@ -360,11 +360,11 @@ ] }, "locked": { - "lastModified": 1756417617, - "narHash": "sha256-3xiEX9TvXfkEePL6rY1n6WpEEY0tBCxCTy3Evv6Oe+8=", + "lastModified": 1756524600, + "narHash": "sha256-uORxiu9IMsTcapawMwXs7fXrk5rNnY4MNlRL0tgLMuI=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "fa97a393b3b7444d5d84f4cdd788d7c49d5dc60d", + "rev": "79ce4212f93e81e0e37572645b419c0a954c5486", "type": "github" }, "original": { From 6e87526fd003dddc730635e8d9dfa05d6555f09b Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 31 Aug 2025 13:09:18 -0400 Subject: [PATCH 339/724] update --- flake.lock | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/flake.lock b/flake.lock index 76aa447..f262c62 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1756519376, - "narHash": "sha256-ssyp3oGb9oCSTGT667+vdzEMZtH+qF9N8zKpQPdAkl8=", + "lastModified": 1756657328, + "narHash": "sha256-8mkj3NvMYGRrUVmUEzO6Sh+ZAQEbbBDFHRmD5LcRSks=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "9ea70e7ea6d66396f414fc661b1f02ebc27bef8d", + "rev": "226b43dd8907c28899c02527e27ca5961f96a064", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1756451209, - "narHash": "sha256-zrFKbXArvNjUKYYd1I48cnvlgB6cGA/mFoRvgp/wRHc=", + "lastModified": 1756630712, + "narHash": "sha256-Rzr++5ZpaGWTaXwYLcksUtclSH703XLpquLoLRoFdlI=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "cdfffe0b009582f5161dcd030a5549236287767b", + "rev": "dd88a1da72300083ff6ee4ad15fe30e7b2c7ad30", "type": "github" }, "original": { @@ -196,16 +196,16 @@ "niri-stable": { "flake": false, "locked": { - "lastModified": 1748151941, - "narHash": "sha256-z4viQZLgC2bIJ3VrzQnR+q2F3gAOEQpU1H5xHtX/2fs=", + "lastModified": 1756556321, + "narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=", "owner": "YaLTeR", "repo": "niri", - "rev": "8ba57fcf25d2fc9565131684a839d58703f1dae7", + "rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294", "type": "github" }, "original": { "owner": "YaLTeR", - "ref": "v25.05.1", + "ref": "v25.08", "repo": "niri", "type": "github" } @@ -213,11 +213,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1756448032, - "narHash": "sha256-ZIRj8dt8FmJdQeJjNvyK1RirYBmun+e/K3TMG8Qdodc=", + "lastModified": 1756628420, + "narHash": "sha256-GWuU2XP+/72ybXSMXDugP3/qNbgyQWSFE9ZG5euk8cc=", "owner": "YaLTeR", "repo": "niri", - "rev": "dfe463ed7dcf36cc706f5540c5d0804775b5c86b", + "rev": "db419b4fc7dbfb32a5c954502839c2331bcb4ecc", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1756346337, - "narHash": "sha256-al0UcN5mXrO/p5lcH0MuQaj+t97s3brzCii8GfCBMuA=", + "lastModified": 1756469547, + "narHash": "sha256-YvtD2E7MYsQ3r7K9K2G7nCslCKMPShoSEAtbjHLtH0k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "84c26d62ce9e15489c63b83fc44e6eb62705d2c9", + "rev": "41d292bfc37309790f70f4c120b79280ce40af16", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1756521112, - "narHash": "sha256-/YW9DI+vZ2lbTvYAek6BsudUXdpWr0FybTDod4P42L4=", + "lastModified": 1756607787, + "narHash": "sha256-ciwAdgtlAN1PCaidWK6RuWsTBL8DVuyDCGM+X3ein5Q=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "2243e3f251ea18486f83133cf8e325d2b9b71e89", + "rev": "f46d294b87ebb9f7124f1ce13aa2a5f5acc0f3eb", "type": "github" }, "original": { @@ -337,11 +337,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1756260173, - "narHash": "sha256-wcf04fl5ncbOqAK7OCWIgILERIbMfL/eeM3UThqgErI=", + "lastModified": 1756570086, + "narHash": "sha256-vnbIvAqSt+hSd6blDc9IMvZKxAcHpqLhy25tDvosrug=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "af33f7eb124b51ff6d9cdf9b428643e2246c8cbb", + "rev": "1d156aa8d30b124ff770488e5e34289a08ff4207", "type": "github" }, "original": { @@ -360,11 +360,11 @@ ] }, "locked": { - "lastModified": 1756524600, - "narHash": "sha256-uORxiu9IMsTcapawMwXs7fXrk5rNnY4MNlRL0tgLMuI=", + "lastModified": 1756614150, + "narHash": "sha256-ZT+IHU78RzOiO7RhZ64VQyG8HgYz3/sUmUGll/8j8XA=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "79ce4212f93e81e0e37572645b419c0a954c5486", + "rev": "8c898b127c9989453ebda9c0d1e77c968ef4f0ec", "type": "github" }, "original": { From 38b8e7af235081e0b62641cf1cbe9143b328f977 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 2 Sep 2025 14:33:57 -0400 Subject: [PATCH 340/724] niri: disable middle click paste --- home-manager/progs/niri.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home-manager/progs/niri.nix b/home-manager/progs/niri.nix index 2e99dac..39b38e1 100644 --- a/home-manager/progs/niri.nix +++ b/home-manager/progs/niri.nix @@ -29,6 +29,10 @@ }; }; + clipboard = { + disable-primary = true; + }; + environment = { DISPLAY = ":0"; }; From cc3db5bab1778da7a43efa12030b283d4dee5523 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 2 Sep 2025 23:51:37 -0400 Subject: [PATCH 341/724] update --- flake.lock | 60 +++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index f262c62..84a541c 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1756657328, - "narHash": "sha256-8mkj3NvMYGRrUVmUEzO6Sh+ZAQEbbBDFHRmD5LcRSks=", + "lastModified": 1756864982, + "narHash": "sha256-NPpRPaIVGRSh4nrq+37ufZBECWCLP+YQP3BZgL5UOmY=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "226b43dd8907c28899c02527e27ca5961f96a064", + "rev": "e99543717040244141e250186828604e4a1f6567", "type": "github" }, "original": { @@ -125,11 +125,11 @@ ] }, "locked": { - "lastModified": 1756245065, - "narHash": "sha256-aAZNbGcWrVRZgWgkQbkabSGcDVRDMgON4BipMy69gvI=", + "lastModified": 1756679287, + "narHash": "sha256-Xd1vOeY9ccDf5VtVK12yM0FS6qqvfUop8UQlxEB+gTQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "54b2879ce622d44415e727905925e21b8f833a98", + "rev": "07fc025fe10487dd80f2ec694f1cd790e752d0e8", "type": "github" }, "original": { @@ -153,11 +153,11 @@ ] }, "locked": { - "lastModified": 1754297745, - "narHash": "sha256-aD6/scLN3L4ZszmNbhhd3JQ9Pzv1ScYFphz14wHinfs=", + "lastModified": 1756744479, + "narHash": "sha256-EyZXusK/wRD3V9vDh00W2Re3Eg8UQ+LjVBQrrH9dq1U=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "892cbdca865d6b42f9c0d222fe309f7720259855", + "rev": "747b7912f49e2885090c83364d88cf853a020ac1", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1756630712, - "narHash": "sha256-Rzr++5ZpaGWTaXwYLcksUtclSH703XLpquLoLRoFdlI=", + "lastModified": 1756862600, + "narHash": "sha256-o2rWBro9T+N0leUFwBg2IZ+2twUnvkWUG5zbYHz0IOg=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "dd88a1da72300083ff6ee4ad15fe30e7b2c7ad30", + "rev": "960eb177447f5c40f3c510211f12956251ed2f00", "type": "github" }, "original": { @@ -213,11 +213,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1756628420, - "narHash": "sha256-GWuU2XP+/72ybXSMXDugP3/qNbgyQWSFE9ZG5euk8cc=", + "lastModified": 1756728273, + "narHash": "sha256-7tYNlNO/qVRA6shdWxNuBMYOE+pGgxqE0f54S4Wr9PE=", "owner": "YaLTeR", "repo": "niri", - "rev": "db419b4fc7dbfb32a5c954502839c2331bcb4ecc", + "rev": "77465e11fe36fdd9bc0a304b96bb2558116568af", "type": "github" }, "original": { @@ -228,11 +228,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1756245047, - "narHash": "sha256-9bHzrVbjAudbO8q4vYFBWlEkDam31fsz0J7GB8k4AsI=", + "lastModified": 1756750488, + "narHash": "sha256-e4ZAu2sjOtGpvbdS5zo+Va5FUUkAnizl4wb0/JlIL2I=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a65b650d6981e23edd1afa1f01eb942f19cdcbb7", + "rev": "47eb4856cfd01eaeaa7bb5944a0f27db8fb9b94a", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1756469547, - "narHash": "sha256-YvtD2E7MYsQ3r7K9K2G7nCslCKMPShoSEAtbjHLtH0k=", + "lastModified": 1756754095, + "narHash": "sha256-9Rsn9XEWINExosFkKEqdp8EI6Mujr1gmQiyrEcts2ls=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "41d292bfc37309790f70f4c120b79280ce40af16", + "rev": "7c815e513adbf03c9098b2bd230c1e0525c8a7f9", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1756607787, - "narHash": "sha256-ciwAdgtlAN1PCaidWK6RuWsTBL8DVuyDCGM+X3ein5Q=", + "lastModified": 1756866691, + "narHash": "sha256-YWJsM0HfdFLcaoP5OeyzjX6MjGnJ0Acm+bg1QN8MKjo=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "f46d294b87ebb9f7124f1ce13aa2a5f5acc0f3eb", + "rev": "fb6dab6f320291a8edd31c1d67f078c6f7384a02", "type": "github" }, "original": { @@ -337,11 +337,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1756570086, - "narHash": "sha256-vnbIvAqSt+hSd6blDc9IMvZKxAcHpqLhy25tDvosrug=", + "lastModified": 1756859881, + "narHash": "sha256-zaRUdYrV01Q9LFeGoNWlvoPcM7UGj06dA3EVEvmdXvQ=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "1d156aa8d30b124ff770488e5e34289a08ff4207", + "rev": "0fd0dd75e918cf848220c7e5bed1718570162200", "type": "github" }, "original": { @@ -360,11 +360,11 @@ ] }, "locked": { - "lastModified": 1756614150, - "narHash": "sha256-ZT+IHU78RzOiO7RhZ64VQyG8HgYz3/sUmUGll/8j8XA=", + "lastModified": 1756840469, + "narHash": "sha256-TtOazKYiRtYEEKnLmeBihr/E+PN1xdT/to1NPNsoxQQ=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "8c898b127c9989453ebda9c0d1e77c968ef4f0ec", + "rev": "0532bd5938efddca7d9462778ba7989b3734f965", "type": "github" }, "original": { From 4ab9b2166adc6899a0ff2391ddac3f7ea3a7d8e2 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 7 Sep 2025 00:27:58 -0400 Subject: [PATCH 342/724] update --- flake.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 84a541c..05caaff 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1756864982, - "narHash": "sha256-NPpRPaIVGRSh4nrq+37ufZBECWCLP+YQP3BZgL5UOmY=", + "lastModified": 1757211048, + "narHash": "sha256-YZc7C9HUVsUmrvlw+EU1boMqxQnobOJxQiEAChJwLOU=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "e99543717040244141e250186828604e4a1f6567", + "rev": "e86c84e6027624768ea2bef9e704d8c050d16f1b", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1756862600, - "narHash": "sha256-o2rWBro9T+N0leUFwBg2IZ+2twUnvkWUG5zbYHz0IOg=", + "lastModified": 1757215047, + "narHash": "sha256-WV0+7nvxnUDaLqDO3UpUQcpz7najlwMin7otgDnB+EI=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "960eb177447f5c40f3c510211f12956251ed2f00", + "rev": "298efb7f882c6e4496f6c770a8fe45dc68b5970c", "type": "github" }, "original": { @@ -213,11 +213,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1756728273, - "narHash": "sha256-7tYNlNO/qVRA6shdWxNuBMYOE+pGgxqE0f54S4Wr9PE=", + "lastModified": 1756926064, + "narHash": "sha256-5/1vyFRLvJWxhBgpPaV2orC0pjSgIny6JM6+joLyZok=", "owner": "YaLTeR", "repo": "niri", - "rev": "77465e11fe36fdd9bc0a304b96bb2558116568af", + "rev": "c69464c1288789020d9a086f86c970a7dc49b8c7", "type": "github" }, "original": { @@ -228,11 +228,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1756750488, - "narHash": "sha256-e4ZAu2sjOtGpvbdS5zo+Va5FUUkAnizl4wb0/JlIL2I=", + "lastModified": 1757103352, + "narHash": "sha256-PtT7ix43ss8PONJ1VJw3f6t2yAoGH+q462Sn8lrmWmk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "47eb4856cfd01eaeaa7bb5944a0f27db8fb9b94a", + "rev": "11b2a10c7be726321bb854403fdeec391e798bf0", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1756754095, - "narHash": "sha256-9Rsn9XEWINExosFkKEqdp8EI6Mujr1gmQiyrEcts2ls=", + "lastModified": 1757020766, + "narHash": "sha256-PLoSjHRa2bUbi1x9HoXgTx2AiuzNXs54c8omhadyvp0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7c815e513adbf03c9098b2bd230c1e0525c8a7f9", + "rev": "fe83bbdde2ccdc2cb9573aa846abe8363f79a97a", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1756866691, - "narHash": "sha256-YWJsM0HfdFLcaoP5OeyzjX6MjGnJ0Acm+bg1QN8MKjo=", + "lastModified": 1757212513, + "narHash": "sha256-ZTHwY7u8BQF1JUazhGk+ftCjsS57Ht6KSnnkxQoUBA8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "fb6dab6f320291a8edd31c1d67f078c6f7384a02", + "rev": "a8c2f9348abb14647d8a4899d1b3acd0155ce2cd", "type": "github" }, "original": { @@ -337,11 +337,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1756859881, - "narHash": "sha256-zaRUdYrV01Q9LFeGoNWlvoPcM7UGj06dA3EVEvmdXvQ=", + "lastModified": 1757179758, + "narHash": "sha256-TIvyWzRt1miQj6Cf5Wy8Qz43XIZX7c4vTVwRLAT5S4Y=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "0fd0dd75e918cf848220c7e5bed1718570162200", + "rev": "970728d0d9d1eada342bb8860af214b601139e58", "type": "github" }, "original": { @@ -360,11 +360,11 @@ ] }, "locked": { - "lastModified": 1756840469, - "narHash": "sha256-TtOazKYiRtYEEKnLmeBihr/E+PN1xdT/to1NPNsoxQQ=", + "lastModified": 1757218898, + "narHash": "sha256-mB3z1ssPry/wHgLd8gFOaltwQ9kIRTqrzikkcnxG720=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "0532bd5938efddca7d9462778ba7989b3734f965", + "rev": "2255b29eece0757827b9911ef685c963996542b6", "type": "github" }, "original": { From ce2c9e21369191562f2033164d391eb9cac9ccf2 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 8 Sep 2025 10:19:34 -0400 Subject: [PATCH 343/724] update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 05caaff..a6c96d5 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1757211048, - "narHash": "sha256-YZc7C9HUVsUmrvlw+EU1boMqxQnobOJxQiEAChJwLOU=", + "lastModified": 1757322698, + "narHash": "sha256-eUOyjGer4C+hMbOOb9pXa/bpq89+3vfxJox9N/ColQs=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "e86c84e6027624768ea2bef9e704d8c050d16f1b", + "rev": "1ce287ba4398f442fbaa6a8aaf17f159a029e824", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1757215047, - "narHash": "sha256-WV0+7nvxnUDaLqDO3UpUQcpz7najlwMin7otgDnB+EI=", + "lastModified": 1757324011, + "narHash": "sha256-iGAWGz2uG8GsGw9114FZnTcaAn0uiLXDPmYzzuM69w8=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "298efb7f882c6e4496f6c770a8fe45dc68b5970c", + "rev": "a0ec3abc11e90afa47150dd2d3607920a63c056c", "type": "github" }, "original": { @@ -213,11 +213,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1756926064, - "narHash": "sha256-5/1vyFRLvJWxhBgpPaV2orC0pjSgIny6JM6+joLyZok=", + "lastModified": 1757242823, + "narHash": "sha256-EqZPBr+fPs7uoFCDLxRa8kRcrUgn0kZTVTky/7I81aI=", "owner": "YaLTeR", "repo": "niri", - "rev": "c69464c1288789020d9a086f86c970a7dc49b8c7", + "rev": "22f629c24b9f81a2fcaaf3a79d75128484c6ed78", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1757020766, - "narHash": "sha256-PLoSjHRa2bUbi1x9HoXgTx2AiuzNXs54c8omhadyvp0=", + "lastModified": 1757244434, + "narHash": "sha256-AeqTqY0Y95K1Fgs6wuT1LafBNcmKxcOkWnm4alD9pqM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fe83bbdde2ccdc2cb9573aa846abe8363f79a97a", + "rev": "092c565d333be1e17b4779ac22104338941d913f", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1757212513, - "narHash": "sha256-ZTHwY7u8BQF1JUazhGk+ftCjsS57Ht6KSnnkxQoUBA8=", + "lastModified": 1757298987, + "narHash": "sha256-yuFSw6fpfjPtVMmym51ozHYpJQ7SzVOTkk7tUv2JA0U=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a8c2f9348abb14647d8a4899d1b3acd0155ce2cd", + "rev": "cfd63776bde44438ff2936f0c9194c79dd407a5f", "type": "github" }, "original": { @@ -360,11 +360,11 @@ ] }, "locked": { - "lastModified": 1757218898, - "narHash": "sha256-mB3z1ssPry/wHgLd8gFOaltwQ9kIRTqrzikkcnxG720=", + "lastModified": 1757308755, + "narHash": "sha256-daEx9piqNWMVsfJx91O2lKtSTPUXnanS755M1oo5zLU=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "2255b29eece0757827b9911ef685c963996542b6", + "rev": "36f0082103e6a4f3ec51e5c48a4c79426c8c6853", "type": "github" }, "original": { From 1839daa39c1207ae7a51b74323f3daee671a23ef Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 8 Sep 2025 22:39:11 -0400 Subject: [PATCH 344/724] update --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index a6c96d5..cd335be 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1757322698, - "narHash": "sha256-eUOyjGer4C+hMbOOb9pXa/bpq89+3vfxJox9N/ColQs=", + "lastModified": 1757383564, + "narHash": "sha256-8d9TGk7VlaFyuUYpmW7uerxmlJ2UhOlZMxdfVRFxJVU=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "1ce287ba4398f442fbaa6a8aaf17f159a029e824", + "rev": "91d631ed20ac3d71771f64e3c1a91dffde1944ca", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1757324011, - "narHash": "sha256-iGAWGz2uG8GsGw9114FZnTcaAn0uiLXDPmYzzuM69w8=", + "lastModified": 1757363972, + "narHash": "sha256-b5OwbYpkjpMTfTSNoHbfLmPUodNq49OlkD/cL4hW5kU=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "a0ec3abc11e90afa47150dd2d3607920a63c056c", + "rev": "bd1d13d781896562409b57c26744c27342614e21", "type": "github" }, "original": { @@ -213,11 +213,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1757242823, - "narHash": "sha256-EqZPBr+fPs7uoFCDLxRa8kRcrUgn0kZTVTky/7I81aI=", + "lastModified": 1757358784, + "narHash": "sha256-UNeUJW3c10z0aMJ87QKS85C/JgK9ng6pdRS0EwY6OLg=", "owner": "YaLTeR", "repo": "niri", - "rev": "22f629c24b9f81a2fcaaf3a79d75128484c6ed78", + "rev": "bdee1a657699a77bc4cdb050f7355f37f64c45a6", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1757244434, - "narHash": "sha256-AeqTqY0Y95K1Fgs6wuT1LafBNcmKxcOkWnm4alD9pqM=", + "lastModified": 1757341549, + "narHash": "sha256-fRnT+bwP1sB6ne7BLw4aXkVYjr+QCZZ+e4MhbokHyd4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "092c565d333be1e17b4779ac22104338941d913f", + "rev": "9d1fa9fa266631335618373f8faad570df6f9ede", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1757298987, - "narHash": "sha256-yuFSw6fpfjPtVMmym51ozHYpJQ7SzVOTkk7tUv2JA0U=", + "lastModified": 1757385309, + "narHash": "sha256-5n5t+xxZRIqMsOScSE2GuUuKOUzoSasB/ggPztLzehg=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "cfd63776bde44438ff2936f0c9194c79dd407a5f", + "rev": "d4b1e1764eb2d63898d8fb2bbba9529adf5b1fb2", "type": "github" }, "original": { From abde93470edbfb4aa8f3d6a15ec2d3b12057a6bf Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 9 Sep 2025 15:42:19 -0400 Subject: [PATCH 345/724] update --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index cd335be..1854136 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1757383564, - "narHash": "sha256-8d9TGk7VlaFyuUYpmW7uerxmlJ2UhOlZMxdfVRFxJVU=", + "lastModified": 1757437755, + "narHash": "sha256-t1lP1hU5NwQLQDtsdIpVQn80/ygEiOKVVJ/LJ8oPTcI=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "91d631ed20ac3d71771f64e3c1a91dffde1944ca", + "rev": "62c78d24987666748e67c99d9ea6359ce26c930e", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1757363972, - "narHash": "sha256-b5OwbYpkjpMTfTSNoHbfLmPUodNq49OlkD/cL4hW5kU=", + "lastModified": 1757437545, + "narHash": "sha256-7ssbrFnmSrqtCtOySiu5ncyOBxPrR6p2nhNHrg6D+fo=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "bd1d13d781896562409b57c26744c27342614e21", + "rev": "ef694b996daeeb8684c0adfaa9b7067a6e709054", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1757341549, - "narHash": "sha256-fRnT+bwP1sB6ne7BLw4aXkVYjr+QCZZ+e4MhbokHyd4=", + "lastModified": 1757408970, + "narHash": "sha256-aSgK4BLNFFGvDTNKPeB28lVXYqVn8RdyXDNAvgGq+k0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9d1fa9fa266631335618373f8faad570df6f9ede", + "rev": "d179d77c139e0a3f5c416477f7747e9d6b7ec315", "type": "github" }, "original": { @@ -360,11 +360,11 @@ ] }, "locked": { - "lastModified": 1757308755, - "narHash": "sha256-daEx9piqNWMVsfJx91O2lKtSTPUXnanS755M1oo5zLU=", + "lastModified": 1757395105, + "narHash": "sha256-kwctEcCrHXZg80POmuOfqRqxSjy8bXhdBuNcRWaEpFA=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "36f0082103e6a4f3ec51e5c48a4c79426c8c6853", + "rev": "d7b87e67233fdb42e655600f3de4c2e8a13bc6a7", "type": "github" }, "original": { From 81c9e27fd65ef55909241d627b48f7d4252aaccc Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 12 Sep 2025 01:48:40 -0400 Subject: [PATCH 346/724] update --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 1854136..d109cde 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1757437755, - "narHash": "sha256-t1lP1hU5NwQLQDtsdIpVQn80/ygEiOKVVJ/LJ8oPTcI=", + "lastModified": 1757642614, + "narHash": "sha256-bt4pch2hhyMf4Qtwt3XF+4UFaYsrCSW82aQxUtrDDqg=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "62c78d24987666748e67c99d9ea6359ce26c930e", + "rev": "bd648ab202cb87c76919fa180d80b46d02ac5634", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1757437545, - "narHash": "sha256-7ssbrFnmSrqtCtOySiu5ncyOBxPrR6p2nhNHrg6D+fo=", + "lastModified": 1757622886, + "narHash": "sha256-TfA395JLtF8cZkGFUOIeKLxsW3cTZuIdWSCx2lRPQrI=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "ef694b996daeeb8684c0adfaa9b7067a6e709054", + "rev": "3b206f829194f7e19b2ff1cf4193c6404e2692f7", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1757408970, - "narHash": "sha256-aSgK4BLNFFGvDTNKPeB28lVXYqVn8RdyXDNAvgGq+k0=", + "lastModified": 1757545623, + "narHash": "sha256-mCxPABZ6jRjUQx3bPP4vjA68ETbPLNz9V2pk9tO7pRQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d179d77c139e0a3f5c416477f7747e9d6b7ec315", + "rev": "8cd5ce828d5d1d16feff37340171a98fc3bf6526", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1757385309, - "narHash": "sha256-5n5t+xxZRIqMsOScSE2GuUuKOUzoSasB/ggPztLzehg=", + "lastModified": 1757644300, + "narHash": "sha256-bVIDYz31bCdZId441sqgkImnA7aYr2UQzQlyl+O2DWc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "d4b1e1764eb2d63898d8fb2bbba9529adf5b1fb2", + "rev": "591c5ae84f066bdfc9797b217df392d58eafd088", "type": "github" }, "original": { @@ -360,11 +360,11 @@ ] }, "locked": { - "lastModified": 1757395105, - "narHash": "sha256-kwctEcCrHXZg80POmuOfqRqxSjy8bXhdBuNcRWaEpFA=", + "lastModified": 1757654247, + "narHash": "sha256-Nz0EWw4N05bFZITsBOvQHk2rQ3n+IdPeqIg4R2jQuGM=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "d7b87e67233fdb42e655600f3de4c2e8a13bc6a7", + "rev": "f2e90503e6b847b7b0bd2628d1d15fac1113fb9a", "type": "github" }, "original": { From 59a6a8bb1db1cbb698045ec0983ffe4c9bb67b8c Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 15 Sep 2025 05:27:22 -0400 Subject: [PATCH 347/724] update --- flake.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index d109cde..0e13113 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1757642614, - "narHash": "sha256-bt4pch2hhyMf4Qtwt3XF+4UFaYsrCSW82aQxUtrDDqg=", + "lastModified": 1757927471, + "narHash": "sha256-odfHgmioy0yGxiAFTnAq7SMYTLUv1JApKES5i2KfS4c=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "bd648ab202cb87c76919fa180d80b46d02ac5634", + "rev": "6302a8a5904203bc18532e71b3d61f4b324d20fb", "type": "github" }, "original": { @@ -125,11 +125,11 @@ ] }, "locked": { - "lastModified": 1756679287, - "narHash": "sha256-Xd1vOeY9ccDf5VtVK12yM0FS6qqvfUop8UQlxEB+gTQ=", + "lastModified": 1757808926, + "narHash": "sha256-K6PEI5PYY94TVMH0mX3MbZNYFme7oNRKml/85BpRRAo=", "owner": "nix-community", "repo": "home-manager", - "rev": "07fc025fe10487dd80f2ec694f1cd790e752d0e8", + "rev": "f21d9167782c086a33ad53e2311854a8f13c281e", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1757622886, - "narHash": "sha256-TfA395JLtF8cZkGFUOIeKLxsW3cTZuIdWSCx2lRPQrI=", + "lastModified": 1757870947, + "narHash": "sha256-0N8w6SB6a68kWioFmlr+KfwfG44KVjPjJIBSQKNdNhE=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "3b206f829194f7e19b2ff1cf4193c6404e2692f7", + "rev": "8e9b1a571399104e42d8fa5de6c28c63bff0c16a", "type": "github" }, "original": { @@ -213,11 +213,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1757358784, - "narHash": "sha256-UNeUJW3c10z0aMJ87QKS85C/JgK9ng6pdRS0EwY6OLg=", + "lastModified": 1757832020, + "narHash": "sha256-SCdus7r4IS8l3jzF8mcMFMlDvACTdmDCcsPnGUEqll0=", "owner": "YaLTeR", "repo": "niri", - "rev": "bdee1a657699a77bc4cdb050f7355f37f64c45a6", + "rev": "e6a8ad38479eb179dc7301755316f993e3e872ea", "type": "github" }, "original": { @@ -228,11 +228,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1757103352, - "narHash": "sha256-PtT7ix43ss8PONJ1VJw3f6t2yAoGH+q462Sn8lrmWmk=", + "lastModified": 1757891025, + "narHash": "sha256-NfiTk59huy/YK9H4W4wVwRYyiP2u86QqROM5KK4f5F4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "11b2a10c7be726321bb854403fdeec391e798bf0", + "rev": "4c38a024fa32e61db2be8573e5282b15d9733a79", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1757545623, - "narHash": "sha256-mCxPABZ6jRjUQx3bPP4vjA68ETbPLNz9V2pk9tO7pRQ=", + "lastModified": 1757810152, + "narHash": "sha256-Vp9K5ol6h0J90jG7Rm4RWZsCB3x7v5VPx588TQ1dkfs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8cd5ce828d5d1d16feff37340171a98fc3bf6526", + "rev": "9a094440e02a699be5c57453a092a8baf569bdad", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1757644300, - "narHash": "sha256-bVIDYz31bCdZId441sqgkImnA7aYr2UQzQlyl+O2DWc=", + "lastModified": 1757903816, + "narHash": "sha256-bVi6V/HZtUedmLPM5OP/tYhwi6G7FIyFH6+/EFb7qGo=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "591c5ae84f066bdfc9797b217df392d58eafd088", + "rev": "11a559c0baf1019bde7bbf0363a22db978be4363", "type": "github" }, "original": { @@ -360,11 +360,11 @@ ] }, "locked": { - "lastModified": 1757654247, - "narHash": "sha256-Nz0EWw4N05bFZITsBOvQHk2rQ3n+IdPeqIg4R2jQuGM=", + "lastModified": 1757900278, + "narHash": "sha256-Cnx4ZB6CNYnCkTE49z/IWNbaR2l42n9aITIaMzHmunk=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "f2e90503e6b847b7b0bd2628d1d15fac1113fb9a", + "rev": "a6fd725c7c9ceab921aa3e88963391b4c9336a0c", "type": "github" }, "original": { From ab3d6b35b17452f6e1e348e95c15f18865965ce8 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 15 Sep 2025 14:48:48 -0400 Subject: [PATCH 348/724] niri: simplify spawn calls --- home-manager/progs/niri.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/home-manager/progs/niri.nix b/home-manager/progs/niri.nix index 39b38e1..9bd01e5 100644 --- a/home-manager/progs/niri.nix +++ b/home-manager/progs/niri.nix @@ -59,7 +59,7 @@ spawn-at-startup = [ { command = [ - "${lib.getExe config.programs.eww.package}" + (lib.getExe config.programs.eww.package) "-c" "${config.programs.eww.configDir}" "open" @@ -70,7 +70,7 @@ # swaybg works on more than just sway (sets a wallpaper) { command = [ - "${lib.getExe pkgs.swaybg}" + (lib.getExe pkgs.swaybg) "-i" "${../wallpaper.png}" ]; @@ -79,7 +79,7 @@ # Xwayland on niri via xwayland-satellite { command = [ - "${lib.getExe pkgs.xwayland-satellite}" + (lib.getExe pkgs.xwayland-satellite) config.programs.niri.settings.environment.DISPLAY ]; } @@ -125,14 +125,12 @@ # 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); "Mod+O".action = toggle-overview; @@ -140,7 +138,7 @@ "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; @@ -180,7 +178,7 @@ # color picker and copies to clipboard "Mod+Ctrl+Alt+C".action = spawn [ - "${pkgs.hyprpicker}/bin/hyprpicker" + (lib.getExe pkgs.hyprpicker) "-za" ]; From e1b9e50e554fe6707ebf4b821b159fa0060283de Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 15 Sep 2025 14:59:23 -0400 Subject: [PATCH 349/724] niri: make focus ring the inverse of the average of the background color --- home-manager/progs/niri.nix | 7 ++++++- home-manager/util/inverse_color.nix | 26 ++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 home-manager/util/inverse_color.nix diff --git a/home-manager/progs/niri.nix b/home-manager/progs/niri.nix index 9bd01e5..38d3651 100644 --- a/home-manager/progs/niri.nix +++ b/home-manager/progs/niri.nix @@ -5,6 +5,9 @@ inputs, ... }: +let + invert_image_avg = pkgs.callPackage ../util/inverse_color.nix; +in { imports = [ inputs.niri.homeModules.config @@ -51,7 +54,9 @@ focus-ring = { enable = true; active = { - color = "#bf7778"; + color = builtins.readFile (invert_image_avg { + src = ../wallpaper.png; + }); }; }; }; diff --git a/home-manager/util/inverse_color.nix b/home-manager/util/inverse_color.nix new file mode 100644 index 0000000..709bf9b --- /dev/null +++ b/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 + ''; +} From 29178eba6a520ce3f9be491db4a5cc690ab7b900 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 15 Sep 2025 15:06:06 -0400 Subject: [PATCH 350/724] eww: limit size of bluetooth name --- home-manager/progs/eww/config/statusbar.yuck | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/home-manager/progs/eww/config/statusbar.yuck b/home-manager/progs/eww/config/statusbar.yuck index 6a35df3..181e514 100644 --- a/home-manager/progs/eww/config/statusbar.yuck +++ b/home-manager/progs/eww/config/statusbar.yuck @@ -84,7 +84,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 'FNR == 1 {print $3}' | head -c 30`) (defwidget time [] (box From 03d1476aef8b2319928a714a56a283ffd85da6d4 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 17 Sep 2025 10:02:04 -0400 Subject: [PATCH 351/724] update --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 0e13113..89ca078 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1757927471, - "narHash": "sha256-odfHgmioy0yGxiAFTnAq7SMYTLUv1JApKES5i2KfS4c=", + "lastModified": 1758100191, + "narHash": "sha256-oW2+S1Qg4kIOi2aHfvflyJpJdGPdlA5xqTZmPqrI1xc=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "6302a8a5904203bc18532e71b3d61f4b324d20fb", + "rev": "043c6499bd66428e65792254000608da164348a6", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1757870947, - "narHash": "sha256-0N8w6SB6a68kWioFmlr+KfwfG44KVjPjJIBSQKNdNhE=", + "lastModified": 1758113295, + "narHash": "sha256-5O83S7Df8XJ0x08VLZFdSBP+vhHa9vrLMVM3tWdNVj8=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "8e9b1a571399104e42d8fa5de6c28c63bff0c16a", + "rev": "75513eba0b3b8185241654d835d2a9a3d174e90d", "type": "github" }, "original": { @@ -213,11 +213,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1757832020, - "narHash": "sha256-SCdus7r4IS8l3jzF8mcMFMlDvACTdmDCcsPnGUEqll0=", + "lastModified": 1758035401, + "narHash": "sha256-yDFq5/uwQV9NetcKduw0A/3XmGN/Z3ovMCTZkUv0B6Y=", "owner": "YaLTeR", "repo": "niri", - "rev": "e6a8ad38479eb179dc7301755316f993e3e872ea", + "rev": "08f5c6fecb3c5c81d63a0bf7248c85ae3299a4a5", "type": "github" }, "original": { @@ -228,11 +228,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1757891025, - "narHash": "sha256-NfiTk59huy/YK9H4W4wVwRYyiP2u86QqROM5KK4f5F4=", + "lastModified": 1757943327, + "narHash": "sha256-w6cDExPBqbq7fTLo4dZ1ozDGeq3yV6dSN4n/sAaS6OM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "4c38a024fa32e61db2be8573e5282b15d9733a79", + "rev": "67a709cfe5d0643dafd798b0b613ed579de8be05", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1757810152, - "narHash": "sha256-Vp9K5ol6h0J90jG7Rm4RWZsCB3x7v5VPx588TQ1dkfs=", + "lastModified": 1757941119, + "narHash": "sha256-TssJZFzMRYdWgpHySzKv4YQg6DUv5SDENiWbVgNTo0M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9a094440e02a699be5c57453a092a8baf569bdad", + "rev": "7ff837017c3b82bd3671932599a119d7bc672ff0", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1757903816, - "narHash": "sha256-bVi6V/HZtUedmLPM5OP/tYhwi6G7FIyFH6+/EFb7qGo=", + "lastModified": 1758076341, + "narHash": "sha256-ZKi6pyRDw2/3xU7qxd+2+lneQXUOe92TiF+10DflolM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "11a559c0baf1019bde7bbf0363a22db978be4363", + "rev": "562fb6f14678eb9b8a36829140f6a4d0737776d2", "type": "github" }, "original": { @@ -360,11 +360,11 @@ ] }, "locked": { - "lastModified": 1757900278, - "narHash": "sha256-Cnx4ZB6CNYnCkTE49z/IWNbaR2l42n9aITIaMzHmunk=", + "lastModified": 1758082958, + "narHash": "sha256-DGpwK0Z8Yl70U8whJC9kQbenhmIANqQX7i40wG8KB2w=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "a6fd725c7c9ceab921aa3e88963391b4c9336a0c", + "rev": "5edc5f5117da500890821f5684bf12f040f34ec5", "type": "github" }, "original": { From cd91b010d0e2654633feca3d70413efc16b8d72c Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 17 Sep 2025 12:15:36 -0400 Subject: [PATCH 352/724] eww: format --- home-manager/progs/eww/config/dashboard.yuck | 22 +++--- home-manager/progs/eww/config/statusbar.yuck | 76 ++++++++++---------- 2 files changed, 49 insertions(+), 49 deletions(-) diff --git a/home-manager/progs/eww/config/dashboard.yuck b/home-manager/progs/eww/config/dashboard.yuck index 8eff67a..177891f 100644 --- a/home-manager/progs/eww/config/dashboard.yuck +++ b/home-manager/progs/eww/config/dashboard.yuck @@ -1,17 +1,17 @@ (defwindow dashboard - :monitor 0 - :stacking "bg" - :exclusive false - :geometry (geometry - :y "50%" - :x "50%" - :width "20%" - :height "20%" + :monitor 0 + :stacking "bg" + :exclusive false + :geometry (geometry + :y "50%" + :x "50%" + :width "20%" + :height "20%" - )(dashboard)) + )(dashboard)) (defwidget dashboard [] (box - (label :text "hi")) -) + (label :text "hi")) + ) diff --git a/home-manager/progs/eww/config/statusbar.yuck b/home-manager/progs/eww/config/statusbar.yuck index 181e514..b642953 100644 --- a/home-manager/progs/eww/config/statusbar.yuck +++ b/home-manager/progs/eww/config/statusbar.yuck @@ -1,55 +1,55 @@ (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) + ; (clipboard) + (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`) (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}'`) From 5751220d3e7cc358605cdf2927be2fd275e6908c Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 17 Sep 2025 12:16:33 -0400 Subject: [PATCH 353/724] eww: delete dashboard --- home-manager/progs/eww/config/dashboard.yuck | 17 ----------------- home-manager/progs/eww/config/eww.yuck | 1 - 2 files changed, 18 deletions(-) delete mode 100644 home-manager/progs/eww/config/dashboard.yuck diff --git a/home-manager/progs/eww/config/dashboard.yuck b/home-manager/progs/eww/config/dashboard.yuck deleted file mode 100644 index 177891f..0000000 --- a/home-manager/progs/eww/config/dashboard.yuck +++ /dev/null @@ -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")) - ) diff --git a/home-manager/progs/eww/config/eww.yuck b/home-manager/progs/eww/config/eww.yuck index 8c638bc..6ba5e8b 100644 --- a/home-manager/progs/eww/config/eww.yuck +++ b/home-manager/progs/eww/config/eww.yuck @@ -1,2 +1 @@ (include "./statusbar.yuck") -(include "./dashboard.yuck") From 7e6f285c9f9d7f65c30ad8d2cfbb1c2e22db03df Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 17 Sep 2025 12:43:04 -0400 Subject: [PATCH 354/724] eww: fix currentWindow logic --- .../progs/eww/config/scripts/currentWindow.fish | 10 ---------- .../progs/eww/config/scripts/currentWindow.sh | 17 +++++++++++++++++ home-manager/progs/eww/config/statusbar.yuck | 2 +- 3 files changed, 18 insertions(+), 11 deletions(-) delete mode 100755 home-manager/progs/eww/config/scripts/currentWindow.fish create mode 100755 home-manager/progs/eww/config/scripts/currentWindow.sh diff --git a/home-manager/progs/eww/config/scripts/currentWindow.fish b/home-manager/progs/eww/config/scripts/currentWindow.fish deleted file mode 100755 index 4addf02..0000000 --- a/home-manager/progs/eww/config/scripts/currentWindow.fish +++ /dev/null @@ -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" diff --git a/home-manager/progs/eww/config/scripts/currentWindow.sh b/home-manager/progs/eww/config/scripts/currentWindow.sh new file mode 100755 index 0000000..c57e8f0 --- /dev/null +++ b/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" diff --git a/home-manager/progs/eww/config/statusbar.yuck b/home-manager/progs/eww/config/statusbar.yuck index b642953..1c3bbd6 100644 --- a/home-manager/progs/eww/config/statusbar.yuck +++ b/home-manager/progs/eww/config/statusbar.yuck @@ -34,7 +34,7 @@ :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 From 21bd161e71c74f0c603a612647239d22a3a65276 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 17 Sep 2025 13:00:32 -0400 Subject: [PATCH 355/724] eww: remove clipboard --- .../progs/eww/config/scripts/clipboardInfo.zsh | 14 -------------- home-manager/progs/eww/config/statusbar.yuck | 6 ------ 2 files changed, 20 deletions(-) delete mode 100755 home-manager/progs/eww/config/scripts/clipboardInfo.zsh diff --git a/home-manager/progs/eww/config/scripts/clipboardInfo.zsh b/home-manager/progs/eww/config/scripts/clipboardInfo.zsh deleted file mode 100755 index e90c08c..0000000 --- a/home-manager/progs/eww/config/scripts/clipboardInfo.zsh +++ /dev/null @@ -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 diff --git a/home-manager/progs/eww/config/statusbar.yuck b/home-manager/progs/eww/config/statusbar.yuck index 1c3bbd6..96b90e6 100644 --- a/home-manager/progs/eww/config/statusbar.yuck +++ b/home-manager/progs/eww/config/statusbar.yuck @@ -17,7 +17,6 @@ (box :space-evenly false :halign 'end' :class 'padded' (brightness-ctl) (brightness-ctl-opener) - ; (clipboard) (volume) (battery) (bluetooth) @@ -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}" From 44526d04d2989b87b61f611130d678c6d87f2e03 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 17 Sep 2025 13:05:06 -0400 Subject: [PATCH 356/724] update currentWorkspace --- home-manager/progs/eww/config/scripts/currentWorkspace.fish | 3 --- home-manager/progs/eww/config/scripts/currentWorkspace.sh | 3 +++ home-manager/progs/eww/config/statusbar.yuck | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) delete mode 100755 home-manager/progs/eww/config/scripts/currentWorkspace.fish create mode 100755 home-manager/progs/eww/config/scripts/currentWorkspace.sh diff --git a/home-manager/progs/eww/config/scripts/currentWorkspace.fish b/home-manager/progs/eww/config/scripts/currentWorkspace.fish deleted file mode 100755 index 68f2fbf..0000000 --- a/home-manager/progs/eww/config/scripts/currentWorkspace.fish +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env fish - -niri msg workspaces | rg "^ \*" | sed -E 's/[[:space:]]+\* //g' diff --git a/home-manager/progs/eww/config/scripts/currentWorkspace.sh b/home-manager/progs/eww/config/scripts/currentWorkspace.sh new file mode 100755 index 0000000..2ceab6c --- /dev/null +++ b/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"]' diff --git a/home-manager/progs/eww/config/statusbar.yuck b/home-manager/progs/eww/config/statusbar.yuck index 96b90e6..dd8eb7b 100644 --- a/home-manager/progs/eww/config/statusbar.yuck +++ b/home-manager/progs/eww/config/statusbar.yuck @@ -128,5 +128,4 @@ (label :text "${volumevalue.count}" :class {volumevalue.color}))) -(defpoll currentworkspace :interval "1s" `scripts/currentWorkspace.fish`) - +(defpoll currentworkspace :interval "1s" `scripts/currentWorkspace.sh`) From e0b24dc859fec0e6141ecfa5613d604279bceb6e Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 17 Sep 2025 13:09:28 -0400 Subject: [PATCH 357/724] eww: improve getSink.sh --- home-manager/progs/eww/config/scripts/sound/getSink.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/progs/eww/config/scripts/sound/getSink.sh b/home-manager/progs/eww/config/scripts/sound/getSink.sh index 8719a32..b27a089 100755 --- a/home-manager/progs/eww/config/scripts/sound/getSink.sh +++ b/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 '"' From d627a05e5faa1053a4f3ab3ef00fff27153693a9 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 19 Sep 2025 13:52:45 -0400 Subject: [PATCH 358/724] update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 89ca078..7aa5f57 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1758100191, - "narHash": "sha256-oW2+S1Qg4kIOi2aHfvflyJpJdGPdlA5xqTZmPqrI1xc=", + "lastModified": 1758302022, + "narHash": "sha256-thyojVcFSlXINDyishBZdfjlc1uR+HoA4wW0RTJDu6E=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "043c6499bd66428e65792254000608da164348a6", + "rev": "f8ffe04b8e762a68fb945aaa7619739e42fd0180", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1758113295, - "narHash": "sha256-5O83S7Df8XJ0x08VLZFdSBP+vhHa9vrLMVM3tWdNVj8=", + "lastModified": 1758291032, + "narHash": "sha256-8hydReYHdZ+WtMivCP4A3hSx27JJGozHPNZjaA4of1E=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "75513eba0b3b8185241654d835d2a9a3d174e90d", + "rev": "4c695faeb785e9b735bf35ed8039580c36e722d0", "type": "github" }, "original": { @@ -213,11 +213,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1758035401, - "narHash": "sha256-yDFq5/uwQV9NetcKduw0A/3XmGN/Z3ovMCTZkUv0B6Y=", + "lastModified": 1758286087, + "narHash": "sha256-VFOGkBKA03fIXf/BaXsN6CZqkwUTq1gPvTIGrEMmlTQ=", "owner": "YaLTeR", "repo": "niri", - "rev": "08f5c6fecb3c5c81d63a0bf7248c85ae3299a4a5", + "rev": "86edeb3b0b3d1a08d4d4f59705cbc99a732f5e95", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1757941119, - "narHash": "sha256-TssJZFzMRYdWgpHySzKv4YQg6DUv5SDENiWbVgNTo0M=", + "lastModified": 1758216857, + "narHash": "sha256-h1BW2y7CY4LI9w61R02wPaOYfmYo82FyRqHIwukQ6SY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7ff837017c3b82bd3671932599a119d7bc672ff0", + "rev": "d2ed99647a4b195f0bcc440f76edfa10aeb3b743", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1758076341, - "narHash": "sha256-ZKi6pyRDw2/3xU7qxd+2+lneQXUOe92TiF+10DflolM=", + "lastModified": 1758249250, + "narHash": "sha256-bg228atm49IZ8koNOlT3bsrFKE9sFjq6vn6Tx8eVgpc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "562fb6f14678eb9b8a36829140f6a4d0737776d2", + "rev": "e26a009e7edab102bd569dc041459deb6c0009f4", "type": "github" }, "original": { @@ -360,11 +360,11 @@ ] }, "locked": { - "lastModified": 1758082958, - "narHash": "sha256-DGpwK0Z8Yl70U8whJC9kQbenhmIANqQX7i40wG8KB2w=", + "lastModified": 1758255782, + "narHash": "sha256-uBjTUcpb+P1nMoj0jDfIavNPJ3zkGmatvvxU2TTHSXQ=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "5edc5f5117da500890821f5684bf12f040f34ec5", + "rev": "ef8fb5704a9aa2845d95ef36b5250a57fb6d5bd6", "type": "github" }, "original": { From 1f1497510f2933df2634793f6fd6569f33f58bf5 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 20 Sep 2025 00:23:35 -0400 Subject: [PATCH 359/724] eww: use awk for getVolume zero padding --- home-manager/progs/eww/config/scripts/sound/getVolume.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/home-manager/progs/eww/config/scripts/sound/getVolume.sh b/home-manager/progs/eww/config/scripts/sound/getVolume.sh index e5a44ab..13c42de 100755 --- a/home-manager/progs/eww/config/scripts/sound/getVolume.sh +++ b/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 From 0d029fe86fdd5c354316319fbcecf5db939a36a6 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 20 Sep 2025 00:25:28 -0400 Subject: [PATCH 360/724] eww: use awk instead of head -c --- home-manager/progs/eww/config/statusbar.yuck | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/progs/eww/config/statusbar.yuck b/home-manager/progs/eww/config/statusbar.yuck index dd8eb7b..866155d 100644 --- a/home-manager/progs/eww/config/statusbar.yuck +++ b/home-manager/progs/eww/config/statusbar.yuck @@ -79,7 +79,7 @@ :text "${bluetooth-name} σ°‚―"))) ; `FNR == 1 + head -c 30` so the name doesn't explode the screen -(defpoll bluetooth-name :interval "10s" `bluetoothctl devices Connected | awk 'FNR == 1 {print $3}' | head -c 30`) +(defpoll bluetooth-name :interval "10s" `bluetoothctl devices Connected | awk 'FNR == 1 {print substr($0,1,30)}'`) (defwidget time [] (box From 2b075204f4e71c5205d44ac512002212c613534e Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 21 Sep 2025 01:12:24 -0400 Subject: [PATCH 361/724] update --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 7aa5f57..7501a01 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1758302022, - "narHash": "sha256-thyojVcFSlXINDyishBZdfjlc1uR+HoA4wW0RTJDu6E=", + "lastModified": 1758420825, + "narHash": "sha256-ADGgTjVUgJfsIxD99WVF05oBrcfyHd6aIkae0JWWS4A=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "f8ffe04b8e762a68fb945aaa7619739e42fd0180", + "rev": "ecdeee43fa4e1047496367bfcafff020e1d69d33", "type": "github" }, "original": { @@ -125,11 +125,11 @@ ] }, "locked": { - "lastModified": 1757808926, - "narHash": "sha256-K6PEI5PYY94TVMH0mX3MbZNYFme7oNRKml/85BpRRAo=", + "lastModified": 1758313341, + "narHash": "sha256-SsI6INUzWwPcRKRaxvi50RttnD9rcC4EjV+67TOEfrQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "f21d9167782c086a33ad53e2311854a8f13c281e", + "rev": "6f656618ebc71ca82d93d306a8aecb2c5f6f2ab2", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1758291032, - "narHash": "sha256-8hydReYHdZ+WtMivCP4A3hSx27JJGozHPNZjaA4of1E=", + "lastModified": 1758375815, + "narHash": "sha256-IAr+n58c+nfxGXmX4NRjfVfV8i5baHnB8LCWlB7XYHo=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "4c695faeb785e9b735bf35ed8039580c36e722d0", + "rev": "a6b5a4263b1d6b5d1e07babd59bc66e91f492190", "type": "github" }, "original": { @@ -213,11 +213,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1758286087, - "narHash": "sha256-VFOGkBKA03fIXf/BaXsN6CZqkwUTq1gPvTIGrEMmlTQ=", + "lastModified": 1758370089, + "narHash": "sha256-0C7695SLx4hU9m3VW4fCrZdvyIY+3kFQTWELHA4hxRQ=", "owner": "YaLTeR", "repo": "niri", - "rev": "86edeb3b0b3d1a08d4d4f59705cbc99a732f5e95", + "rev": "a1dccedbb72da372d2a8a84022f37ccaa4d4a6e6", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1758216857, - "narHash": "sha256-h1BW2y7CY4LI9w61R02wPaOYfmYo82FyRqHIwukQ6SY=", + "lastModified": 1758346548, + "narHash": "sha256-afXE7AJ7MY6wY1pg/Y6UPHNYPy5GtUKeBkrZZ/gC71E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d2ed99647a4b195f0bcc440f76edfa10aeb3b743", + "rev": "b2a3852bd078e68dd2b3dfa8c00c67af1f0a7d20", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1758249250, - "narHash": "sha256-bg228atm49IZ8koNOlT3bsrFKE9sFjq6vn6Tx8eVgpc=", + "lastModified": 1758422215, + "narHash": "sha256-JvF5SXhp1wBHbfEVAWgJCDVSO8iknfDqXfqMch5YWg0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "e26a009e7edab102bd569dc041459deb6c0009f4", + "rev": "6f3988eb5885f1e2efa874a480d91de09a7f9f0b", "type": "github" }, "original": { @@ -360,11 +360,11 @@ ] }, "locked": { - "lastModified": 1758255782, - "narHash": "sha256-uBjTUcpb+P1nMoj0jDfIavNPJ3zkGmatvvxU2TTHSXQ=", + "lastModified": 1758428547, + "narHash": "sha256-4xIo6I+XDmLFh7ydADO5bZLh9J4/YXUrWjXQEQRnGl0=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "ef8fb5704a9aa2845d95ef36b5250a57fb6d5bd6", + "rev": "c043b46b7a35397127153beecf0088bba14ac31c", "type": "github" }, "original": { From b589bb82a16c78af3ea346731f633b09a2968ce5 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 23 Sep 2025 20:02:00 -0400 Subject: [PATCH 362/724] update --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 7501a01..7560843 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1758420825, - "narHash": "sha256-ADGgTjVUgJfsIxD99WVF05oBrcfyHd6aIkae0JWWS4A=", + "lastModified": 1758647395, + "narHash": "sha256-ISZRXgQZ5BA3T1RyZnbfrtRINV2TFgzNlMaCjSu7doM=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "ecdeee43fa4e1047496367bfcafff020e1d69d33", + "rev": "5c63591b945d6481ee22c2bd97a1a91b7623be5b", "type": "github" }, "original": { @@ -125,11 +125,11 @@ ] }, "locked": { - "lastModified": 1758313341, - "narHash": "sha256-SsI6INUzWwPcRKRaxvi50RttnD9rcC4EjV+67TOEfrQ=", + "lastModified": 1758463745, + "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", "owner": "nix-community", "repo": "home-manager", - "rev": "6f656618ebc71ca82d93d306a8aecb2c5f6f2ab2", + "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1758375815, - "narHash": "sha256-IAr+n58c+nfxGXmX4NRjfVfV8i5baHnB8LCWlB7XYHo=", + "lastModified": 1758660031, + "narHash": "sha256-/f1k6oL2UqpDxe0MasJyLpXJj80Az/TxBbEf4hinmgI=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "a6b5a4263b1d6b5d1e07babd59bc66e91f492190", + "rev": "6e26dd2cece5430571b45ffe3d97213431b3e86f", "type": "github" }, "original": { @@ -213,11 +213,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1758370089, - "narHash": "sha256-0C7695SLx4hU9m3VW4fCrZdvyIY+3kFQTWELHA4hxRQ=", + "lastModified": 1758631239, + "narHash": "sha256-EQecFZ5VZtNjN/yzDA/RV13fK3EdLPblcf9p5wVNACo=", "owner": "YaLTeR", "repo": "niri", - "rev": "a1dccedbb72da372d2a8a84022f37ccaa4d4a6e6", + "rev": "3850739e445b95a73c2466a718ccaf3a9a406c06", "type": "github" }, "original": { @@ -228,11 +228,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1757943327, - "narHash": "sha256-w6cDExPBqbq7fTLo4dZ1ozDGeq3yV6dSN4n/sAaS6OM=", + "lastModified": 1758663926, + "narHash": "sha256-6CFdj7Xs616t1W4jLDH7IohAAvl5Dyib3qEv/Uqw1rk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "67a709cfe5d0643dafd798b0b613ed579de8be05", + "rev": "170ff93c860b2a9868ed1e1102d4e52cb3d934e1", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1758346548, - "narHash": "sha256-afXE7AJ7MY6wY1pg/Y6UPHNYPy5GtUKeBkrZZ/gC71E=", + "lastModified": 1758589230, + "narHash": "sha256-zMTCFGe8aVGTEr2RqUi/QzC1nOIQ0N1HRsbqB4f646k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b2a3852bd078e68dd2b3dfa8c00c67af1f0a7d20", + "rev": "d1d883129b193f0b495d75c148c2c3a7d95789a0", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1758422215, - "narHash": "sha256-JvF5SXhp1wBHbfEVAWgJCDVSO8iknfDqXfqMch5YWg0=", + "lastModified": 1758594771, + "narHash": "sha256-loYxdliGF/ytyAorc36Tt/PwBpc2rAfMSJycNxc2oeg=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "6f3988eb5885f1e2efa874a480d91de09a7f9f0b", + "rev": "96722b8da34a7d796668b9a1cbcb7e799cc524b5", "type": "github" }, "original": { @@ -337,11 +337,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1757179758, - "narHash": "sha256-TIvyWzRt1miQj6Cf5Wy8Qz43XIZX7c4vTVwRLAT5S4Y=", + "lastModified": 1758577423, + "narHash": "sha256-sB2GAOjhjoWnjU6A/uHNJiY6O3UeztV5pJAN2g1FkXU=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "970728d0d9d1eada342bb8860af214b601139e58", + "rev": "03368548ba745e17a85bd631613a59cb2d8469a4", "type": "github" }, "original": { @@ -360,11 +360,11 @@ ] }, "locked": { - "lastModified": 1758428547, - "narHash": "sha256-4xIo6I+XDmLFh7ydADO5bZLh9J4/YXUrWjXQEQRnGl0=", + "lastModified": 1758601360, + "narHash": "sha256-pvkHU7dAKt4kFXWsIz9PyJiZCJkiO3wR2xPRccPwsfc=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "c043b46b7a35397127153beecf0088bba14ac31c", + "rev": "a3a511b4d7a2f1d729a10e97fd7cb038a41adbd4", "type": "github" }, "original": { From 2294a2a17968e21a431472fb5c6271a0269eeb44 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 24 Sep 2025 01:07:54 -0400 Subject: [PATCH 363/724] python: add types stub for requests --- home-manager/no-gui.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 7b24d04..546d4fb 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -157,6 +157,7 @@ in (python312.withPackages ( ps: with ps; [ mypy # type checking + types-requests # add types for requests methods python-lsp-server # lsp python-lsp-ruff # ruff integration From eea105712425db49f2fcf73f9dde5383e1e29541 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 25 Sep 2025 15:31:52 -0400 Subject: [PATCH 364/724] update wifi password --- etcnixos/secrets/wifi-passwords.nix | Bin 948 -> 947 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/etcnixos/secrets/wifi-passwords.nix b/etcnixos/secrets/wifi-passwords.nix index 2eb6961c370ca80b896d077915588165eab183a0..42d15a52b24a027788a0de7c027940b3731b2300 100644 GIT binary patch literal 947 zcmZQ@_Y83kiVO&0xLDpOd+4&JyY1Qrjk<6R+0!qWh1Ao+?wvX6epT%5?O(5!FXCRN z<-42vM#QGP^J20$&bI3$L>0)3{F#z;GjAu`KL@QP4=bjw)o|`{lUiJ5AlMSSj(;1s z&c91XdR|m#ywb{%{;9=zS28+!_0QnjhjiB;H+aJGT&pndtj{mykJ-o5dJ2BEEL!m9 z|A~J8ly`!Q%MY80?pV%zbH^IlZI}MfblPZj;*)Dp{@>gdq0PLFyB56DS;4xLIem`N z%QqbwT+3G9F6S3Iq$P8gU&*IIu34$)M9rUf<_G=%f82HJ*rwn91s|FVD%yCRDobqbTh)E>{;rN;l7$+Y9ZvPJ$28u-h)z>$TV^iszyE~bFYUEoO;jb% zt(#*y!=dNR|7Vp_yX?GqKFCaFa;VGk(rhnaHK z`dX%UXO!}NI)6cP^VYY1x=Zi;_J1SkqtWpBy{p^Cf0JY07(f5x(kvQt_ML{&(?`$c z)e{OOT&^?87BA*gN#>tt;`@6>#u-id__W4c%gK!YW3viQZH@Zzb^Vd3jogvN$?KoI zKd{VThs4{d77@CCYdP{e{`-`@)8n!{a=Tn%HzSjkj-&UAh4Lock0RsjT<-1t_cUpJ z)?QF9@946K$LFMbD%4N5QX4k5azR zer%e4sVn^2q^za>+s{3!zH?q6o@G*8?Y~Pk9toReuEr*=T;g=}>!Ym`}4konkk=(sp%lfc1$Z`kzr zavX`WXe{{q{)pMSCn;yowSG(0zo;8=Xws^_lb09qZkZOdnrnXi@%ZVcmX&*>U;SCa zcgXqe%Hl6lyxU{<{eLXjEtWGo>{!r@DUaKw@847T)D<3alE=_cjOm+kGkall$l9q9 zdZ%vh33GI*Sn;%fUL5o39bY~yR(6@A*!x81hMt(hCRg628q2LMD!Mg9oJ=d6oR7F( zc+H{4Rb{-aai4bHrLO^P+!wc}Nk*_{KG&S>LwyqK4@Xv57F>3_boxj+ z3-_VRGapEyL zLvm8X{WKNpE4H3}<_`0ga=vx)y(-u9Z@H-XtsLo3N)JEiu(!z1PW7p>64UV8*THZ* zYSZB|rSk1AA;L0QHq0p(dmG+Jh!y_kQ@)v>Z);xvMkTFj^OY?Zi!$d-<-c=7v7Y6M z|C{@kRt(`wr-gY=?KyK#{954e+kxAgcZjHOy~v_{zgOKWh5;WgWuJq+8yy$o%KaTQ1#!2pMT4f*JU+H>E}ew z{9UWtGeJCIU$gI;E>0mq$pt^6mb~0|U=@?I_d1Eg-@}r$Ow5beUSCg2+VObd6oZF* zo_+~Ex69_jhg{Y@Y|KXLXQ%C!>h4##x=cc9XO@M^jq6P>l>Myz&I=kgN$ukaIsTK+ z_8HTcvs&GbItSbJQ}(QUETA_>SorN089&+n$CjoBmg=iQf5-Dn__zMf~DIK4dTeU`QRB}xUmgNbb QQXw>L&C$8$4|m!D0HEv0{{R30 From c397d16ed8b7da83298a16f16a023e9f09be5747 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 26 Sep 2025 23:47:56 -0400 Subject: [PATCH 365/724] update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 7560843..0471302 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1758647395, - "narHash": "sha256-ISZRXgQZ5BA3T1RyZnbfrtRINV2TFgzNlMaCjSu7doM=", + "lastModified": 1758938530, + "narHash": "sha256-9mKIivvljlh3WhYPjhJxoKpoJ1+bAh773BeZt1KGYIY=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "5c63591b945d6481ee22c2bd97a1a91b7623be5b", + "rev": "0b082e40b028bff0ab5f587105ace1c990fb2129", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1758660031, - "narHash": "sha256-/f1k6oL2UqpDxe0MasJyLpXJj80Az/TxBbEf4hinmgI=", + "lastModified": 1758901074, + "narHash": "sha256-R7XQL6ixYywDsGkorX05KnTlsIeQr9DzQ3geD9Ba6kU=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "6e26dd2cece5430571b45ffe3d97213431b3e86f", + "rev": "397234705a9fa05464107c58286a8308be0c50c2", "type": "github" }, "original": { @@ -213,11 +213,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1758631239, - "narHash": "sha256-EQecFZ5VZtNjN/yzDA/RV13fK3EdLPblcf9p5wVNACo=", + "lastModified": 1758691861, + "narHash": "sha256-CYgoGrY/Fx+hjzp8graTxJw1M7mn1f2jBkK26M04T0s=", "owner": "YaLTeR", "repo": "niri", - "rev": "3850739e445b95a73c2466a718ccaf3a9a406c06", + "rev": "e837e39623457dc5ad29c34a5ce4d4616e5fbf1e", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1758589230, - "narHash": "sha256-zMTCFGe8aVGTEr2RqUi/QzC1nOIQ0N1HRsbqB4f646k=", + "lastModified": 1758791193, + "narHash": "sha256-F8WmEwFoHsnix7rt290R0rFXNJiMbClMZyIC/e+HYf0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d1d883129b193f0b495d75c148c2c3a7d95789a0", + "rev": "25e53aa156d47bad5082ff7618f5feb1f5e02d01", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1758594771, - "narHash": "sha256-loYxdliGF/ytyAorc36Tt/PwBpc2rAfMSJycNxc2oeg=", + "lastModified": 1758940228, + "narHash": "sha256-sTS04L9LKqzP1oiVXYDwcMzfFSF0DnSJQFzZBpEgLFE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "96722b8da34a7d796668b9a1cbcb7e799cc524b5", + "rev": "5bfedf3fbbf5caf8e39f7fcd62238f54d82aa1e2", "type": "github" }, "original": { @@ -360,11 +360,11 @@ ] }, "locked": { - "lastModified": 1758601360, - "narHash": "sha256-pvkHU7dAKt4kFXWsIz9PyJiZCJkiO3wR2xPRccPwsfc=", + "lastModified": 1758860615, + "narHash": "sha256-ZNzHF498lMfv1N/tlfD/Oaanu+REnIhJdreo2rSzU1w=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "a3a511b4d7a2f1d729a10e97fd7cb038a41adbd4", + "rev": "a5f59feaf757aecb12e2fa2490e8a7c1eed12173", "type": "github" }, "original": { From ed803a667cc6c910e6f264cc907212a06c5d337c Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 30 Sep 2025 12:23:06 -0400 Subject: [PATCH 366/724] update --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 0471302..786cae2 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1758938530, - "narHash": "sha256-9mKIivvljlh3WhYPjhJxoKpoJ1+bAh773BeZt1KGYIY=", + "lastModified": 1759223523, + "narHash": "sha256-jgLnRmT6pEBpKjcn+oK6aYAE00hTIQApelCX9y+LgDA=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "0b082e40b028bff0ab5f587105ace1c990fb2129", + "rev": "cfbc2529bc343fd8bb2c7d69e29f2fe440ce8461", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1758901074, - "narHash": "sha256-R7XQL6ixYywDsGkorX05KnTlsIeQr9DzQ3geD9Ba6kU=", + "lastModified": 1759207481, + "narHash": "sha256-xhUr1oMQwL/8h8xnPi5QxUHRFDHoCofhw8Jy7qTD4BY=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "397234705a9fa05464107c58286a8308be0c50c2", + "rev": "d425163158a96a26924597574316a627d2e982aa", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1758791193, - "narHash": "sha256-F8WmEwFoHsnix7rt290R0rFXNJiMbClMZyIC/e+HYf0=", + "lastModified": 1759143472, + "narHash": "sha256-TvODmeR2W7yX/JmOCmP+lAFNkTT7hAxYcF3Kz8SZV3w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "25e53aa156d47bad5082ff7618f5feb1f5e02d01", + "rev": "5ed4e25ab58fd4c028b59d5611e14ea64de51d23", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1758940228, - "narHash": "sha256-sTS04L9LKqzP1oiVXYDwcMzfFSF0DnSJQFzZBpEgLFE=", + "lastModified": 1759199574, + "narHash": "sha256-w24RYly3VSVKp98rVfCI1nFYfQ0VoWmShtKPCbXgK6A=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "5bfedf3fbbf5caf8e39f7fcd62238f54d82aa1e2", + "rev": "381776b12d0d125edd7c1930c2041a1471e586c0", "type": "github" }, "original": { @@ -360,11 +360,11 @@ ] }, "locked": { - "lastModified": 1758860615, - "narHash": "sha256-ZNzHF498lMfv1N/tlfD/Oaanu+REnIhJdreo2rSzU1w=", + "lastModified": 1759203282, + "narHash": "sha256-lsKz9cA0VpHsSbOXZcg8V2fGmUSvC183Fmmn++WAG5o=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "a5f59feaf757aecb12e2fa2490e8a7c1eed12173", + "rev": "7c14e901ac9d2d5b994bad90a11dfbf25500c6cb", "type": "github" }, "original": { From d79842f75548b9c19c7694e0954b6ea2e3fc9d2e Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 1 Oct 2025 23:45:58 -0400 Subject: [PATCH 367/724] update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 786cae2..55b8ae7 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1759223523, - "narHash": "sha256-jgLnRmT6pEBpKjcn+oK6aYAE00hTIQApelCX9y+LgDA=", + "lastModified": 1759370635, + "narHash": "sha256-qX5Ot+d1Hh7wvpDnt41dwJC3VqzpG+Yue4d3fM/Xlmk=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "cfbc2529bc343fd8bb2c7d69e29f2fe440ce8461", + "rev": "e8a15f25bcbd4e29cd7a36e1fbc3df525cca9acb", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1759207481, - "narHash": "sha256-xhUr1oMQwL/8h8xnPi5QxUHRFDHoCofhw8Jy7qTD4BY=", + "lastModified": 1759368439, + "narHash": "sha256-bnSC8cERE0zJDCY7yr+ds6YR1ndVIzZDSRXs5X5ybKI=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "d425163158a96a26924597574316a627d2e982aa", + "rev": "f7b8c9ff119c1a190df9260aa8871d52663ea9b7", "type": "github" }, "original": { @@ -228,11 +228,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1758663926, - "narHash": "sha256-6CFdj7Xs616t1W4jLDH7IohAAvl5Dyib3qEv/Uqw1rk=", + "lastModified": 1759261527, + "narHash": "sha256-wPd5oGvBBpUEzMF0kWnXge0WITNsITx/aGI9qLHgJ4g=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "170ff93c860b2a9868ed1e1102d4e52cb3d934e1", + "rev": "e087756cf4abbe1a34f3544c480fc1034d68742f", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1759143472, - "narHash": "sha256-TvODmeR2W7yX/JmOCmP+lAFNkTT7hAxYcF3Kz8SZV3w=", + "lastModified": 1759281824, + "narHash": "sha256-FIBE1qXv9TKvSNwst6FumyHwCRH3BlWDpfsnqRDCll0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5ed4e25ab58fd4c028b59d5611e14ea64de51d23", + "rev": "5b5be50345d4113d04ba58c444348849f5585b4a", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1759199574, - "narHash": "sha256-w24RYly3VSVKp98rVfCI1nFYfQ0VoWmShtKPCbXgK6A=", + "lastModified": 1759372351, + "narHash": "sha256-kULiC2oMMuyaO92gPiu+6XBfeXuFcXaauwo0tXAwXdQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "381776b12d0d125edd7c1930c2041a1471e586c0", + "rev": "7ef14552303de7128662666f9a71342099ffc725", "type": "github" }, "original": { @@ -360,11 +360,11 @@ ] }, "locked": { - "lastModified": 1759203282, - "narHash": "sha256-lsKz9cA0VpHsSbOXZcg8V2fGmUSvC183Fmmn++WAG5o=", + "lastModified": 1759353433, + "narHash": "sha256-g3+737nvjYu3WrxLOiW6Wwtu4Ncdsy1KW9AGSTfzGOM=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "7c14e901ac9d2d5b994bad90a11dfbf25500c6cb", + "rev": "480746c469a2e14551c73940bd096aa9a9cc7cbd", "type": "github" }, "original": { From 2b048c39d1d39f9cc7db48e0b46ecdb83a3d11a5 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 3 Oct 2025 13:30:47 -0400 Subject: [PATCH 368/724] niri: edit floating window settings --- home-manager/progs/niri.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/home-manager/progs/niri.nix b/home-manager/progs/niri.nix index 38d3651..5bc9c34 100644 --- a/home-manager/progs/niri.nix +++ b/home-manager/progs/niri.nix @@ -108,9 +108,12 @@ in { matches = [ { - app-id = "zen$"; + app-id = "^zen"; title = "^Picture-in-Picture$"; } + { + app-id = "Mullvad VPN"; + } ]; open-floating = true; From 8abc9fff0d3a8d746d2edc313da66675784ca026 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 4 Oct 2025 18:05:36 -0400 Subject: [PATCH 369/724] update --- flake.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 55b8ae7..85f4d36 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1759370635, - "narHash": "sha256-qX5Ot+d1Hh7wvpDnt41dwJC3VqzpG+Yue4d3fM/Xlmk=", + "lastModified": 1759597627, + "narHash": "sha256-X/WpzfBNLiscm8bvZ4pSyBm8BTHA7C+OtJAceAyUmuc=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "e8a15f25bcbd4e29cd7a36e1fbc3df525cca9acb", + "rev": "2eb98bc8bb9ceba2db02c70653c219ed17e90928", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1759368439, - "narHash": "sha256-bnSC8cERE0zJDCY7yr+ds6YR1ndVIzZDSRXs5X5ybKI=", + "lastModified": 1759570525, + "narHash": "sha256-wQbq5QgzlG10u3TzZDEMjyQdOs8tVyMjKsdks+WKmZQ=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "f7b8c9ff119c1a190df9260aa8871d52663ea9b7", + "rev": "069c3908df7e6caf4eae0eaeba9c1a70ec32ca27", "type": "github" }, "original": { @@ -213,11 +213,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1758691861, - "narHash": "sha256-CYgoGrY/Fx+hjzp8graTxJw1M7mn1f2jBkK26M04T0s=", + "lastModified": 1759395653, + "narHash": "sha256-sv9J1z6CrTPf9lRJLyCN90fZVdQz7LFeX7pIlInH8BQ=", "owner": "YaLTeR", "repo": "niri", - "rev": "e837e39623457dc5ad29c34a5ce4d4616e5fbf1e", + "rev": "ba6e5e082a79901dc89b0d49c5da1b769d652aec", "type": "github" }, "original": { @@ -228,11 +228,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1759261527, - "narHash": "sha256-wPd5oGvBBpUEzMF0kWnXge0WITNsITx/aGI9qLHgJ4g=", + "lastModified": 1759582739, + "narHash": "sha256-spZegilADH0q5OngM86u6NmXxduCNv5eX9vCiUPhOYc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e087756cf4abbe1a34f3544c480fc1034d68742f", + "rev": "3441b5242af7577230a78ffb03542add264179ab", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1759281824, - "narHash": "sha256-FIBE1qXv9TKvSNwst6FumyHwCRH3BlWDpfsnqRDCll0=", + "lastModified": 1759439645, + "narHash": "sha256-oiAyQaRilPk525Z5aTtTNWNzSrcdJ7IXM0/PL3CGlbI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5b5be50345d4113d04ba58c444348849f5585b4a", + "rev": "879bd460b3d3e8571354ce172128fbcbac1ed633", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1759372351, - "narHash": "sha256-kULiC2oMMuyaO92gPiu+6XBfeXuFcXaauwo0tXAwXdQ=", + "lastModified": 1759544920, + "narHash": "sha256-yQwP0JOHi3Icq09GG5ufGuGrq2zIijglVFj3kkF2MHA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "7ef14552303de7128662666f9a71342099ffc725", + "rev": "bd3a63bbff2c4cb3cd48e9d49f54c2ccad457f70", "type": "github" }, "original": { @@ -337,11 +337,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1758577423, - "narHash": "sha256-sB2GAOjhjoWnjU6A/uHNJiY6O3UeztV5pJAN2g1FkXU=", + "lastModified": 1759449168, + "narHash": "sha256-Ka18wfIaNvTN9sr+PBie6P83959Om4j5P62M4RwNeoY=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "03368548ba745e17a85bd631613a59cb2d8469a4", + "rev": "da6693c88ab5edac2ec3c81730f112be67abe278", "type": "github" }, "original": { @@ -360,11 +360,11 @@ ] }, "locked": { - "lastModified": 1759353433, - "narHash": "sha256-g3+737nvjYu3WrxLOiW6Wwtu4Ncdsy1KW9AGSTfzGOM=", + "lastModified": 1759584043, + "narHash": "sha256-YCuCmg9nRLrtTz7Zex94C8kYzh8hoSzPOA72kMLpuxM=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "480746c469a2e14551c73940bd096aa9a9cc7cbd", + "rev": "176555a4128ce90461354142ab85c7f536bfd267", "type": "github" }, "original": { From bd8cc1833ebe90ec7d5459f304d31e1b3ed83d58 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 5 Oct 2025 16:11:16 -0400 Subject: [PATCH 370/724] update --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 85f4d36..583c7dd 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1759597627, - "narHash": "sha256-X/WpzfBNLiscm8bvZ4pSyBm8BTHA7C+OtJAceAyUmuc=", + "lastModified": 1759655261, + "narHash": "sha256-VqbnVGL7+eb0px3tx9szi38BC+J8ONBi4QAkKPXiokw=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "2eb98bc8bb9ceba2db02c70653c219ed17e90928", + "rev": "85a72536d0224341ffdfb9fbb724f5ef15476dd6", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1759570525, - "narHash": "sha256-wQbq5QgzlG10u3TzZDEMjyQdOs8tVyMjKsdks+WKmZQ=", + "lastModified": 1759635394, + "narHash": "sha256-rRf/DW3U9sGx4Gi6UpcKZs0t5C3brJEu7Y7pRAMTgqI=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "069c3908df7e6caf4eae0eaeba9c1a70ec32ca27", + "rev": "3c44a443d159d6a11280225c2b752ae9a27131ec", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1759439645, - "narHash": "sha256-oiAyQaRilPk525Z5aTtTNWNzSrcdJ7IXM0/PL3CGlbI=", + "lastModified": 1759580034, + "narHash": "sha256-YWo57PL7mGZU7D4WeKFMiW4ex/O6ZolUS6UNBHTZfkI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "879bd460b3d3e8571354ce172128fbcbac1ed633", + "rev": "3bcc93c5f7a4b30335d31f21e2f1281cba68c318", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1759544920, - "narHash": "sha256-yQwP0JOHi3Icq09GG5ufGuGrq2zIijglVFj3kkF2MHA=", + "lastModified": 1759631821, + "narHash": "sha256-V8A1L0FaU/aSXZ1QNJScxC12uP4hANeRBgI4YdhHeRM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "bd3a63bbff2c4cb3cd48e9d49f54c2ccad457f70", + "rev": "1d7cbdaad90f8a5255a89a6eddd8af24dc89cafe", "type": "github" }, "original": { @@ -360,11 +360,11 @@ ] }, "locked": { - "lastModified": 1759584043, - "narHash": "sha256-YCuCmg9nRLrtTz7Zex94C8kYzh8hoSzPOA72kMLpuxM=", + "lastModified": 1759638087, + "narHash": "sha256-z4d+Ajps4cf8Y9wMUDuTjtKtx8ZBXbWhBzJj2n3yCfg=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "176555a4128ce90461354142ab85c7f536bfd267", + "rev": "e37ff6cdda4ee4db3ba24447322b8604612510c9", "type": "github" }, "original": { From aaed97eb7806583a5c2d72b51b3dfdf54389f31c Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 6 Oct 2025 01:43:51 -0400 Subject: [PATCH 371/724] update --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 583c7dd..02984a3 100644 --- a/flake.lock +++ b/flake.lock @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1759635394, - "narHash": "sha256-rRf/DW3U9sGx4Gi6UpcKZs0t5C3brJEu7Y7pRAMTgqI=", + "lastModified": 1759711756, + "narHash": "sha256-gdX1IM8MT3vTqLSXLDc9HNg30EcHkAgUXeNh4UpcyYU=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "3c44a443d159d6a11280225c2b752ae9a27131ec", + "rev": "372ecde34b3af73ae523d4b055f5bcdab00b5ee6", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1759631821, - "narHash": "sha256-V8A1L0FaU/aSXZ1QNJScxC12uP4hANeRBgI4YdhHeRM=", + "lastModified": 1759718104, + "narHash": "sha256-TbkLsgdnXHUXR4gOQBmhxkEE9ne+eHmX1chZHWRogy0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "1d7cbdaad90f8a5255a89a6eddd8af24dc89cafe", + "rev": "edea9f33f9a03f615ad3609a40fbcefe0ec835ca", "type": "github" }, "original": { @@ -337,11 +337,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1759449168, - "narHash": "sha256-Ka18wfIaNvTN9sr+PBie6P83959Om4j5P62M4RwNeoY=", + "lastModified": 1759707084, + "narHash": "sha256-0pkftKs6/LReNvxw7DVTN2AJEheZVgyeK0Aarbagi70=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "da6693c88ab5edac2ec3c81730f112be67abe278", + "rev": "a9188e70bd748118b4d56a529871b9de5adb9988", "type": "github" }, "original": { @@ -360,11 +360,11 @@ ] }, "locked": { - "lastModified": 1759638087, - "narHash": "sha256-z4d+Ajps4cf8Y9wMUDuTjtKtx8ZBXbWhBzJj2n3yCfg=", + "lastModified": 1759724568, + "narHash": "sha256-i/+YcMMMFXeUKWbR683eoxyz+4Jcb01MHVCjj6OHl0Y=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "e37ff6cdda4ee4db3ba24447322b8604612510c9", + "rev": "b63e1644c96baaaccb78f8d3101f39fbfee733cb", "type": "github" }, "original": { From 98135e375b4bd42548baf0e6d8d7bed856ab5668 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 6 Oct 2025 22:55:08 -0400 Subject: [PATCH 372/724] flatpak --- flake.lock | 16 ++++++++++++++++ flake.nix | 2 ++ home-manager/gui.nix | 1 + home-manager/progs/flatpak.nix | 23 +++++++++++++++++++++++ 4 files changed, 42 insertions(+) create mode 100644 home-manager/progs/flatpak.nix diff --git a/flake.lock b/flake.lock index 02984a3..f7afc28 100644 --- a/flake.lock +++ b/flake.lock @@ -226,6 +226,21 @@ "type": "github" } }, + "nix-flatpak": { + "locked": { + "lastModified": 1754777568, + "narHash": "sha256-0bBqT+3XncgF8F03RFAamw9vdf0VmaDoIJLTGkjfQZs=", + "owner": "gmodena", + "repo": "nix-flatpak", + "rev": "62f636b87ef6050760a8cb325cadb90674d1e23e", + "type": "github" + }, + "original": { + "owner": "gmodena", + "repo": "nix-flatpak", + "type": "github" + } + }, "nixos-hardware": { "locked": { "lastModified": 1759582739, @@ -291,6 +306,7 @@ "home-manager": "home-manager", "lanzaboote": "lanzaboote", "niri": "niri", + "nix-flatpak": "nix-flatpak", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "rust-overlay": "rust-overlay", diff --git a/flake.nix b/flake.nix index 3396c36..9a5f7aa 100644 --- a/flake.nix +++ b/flake.nix @@ -44,6 +44,8 @@ inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs-stable.follows = "nixpkgs"; }; + + nix-flatpak.url = "github:gmodena/nix-flatpak/"; }; outputs = diff --git a/home-manager/gui.nix b/home-manager/gui.nix index d00f22a..40b484c 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -11,6 +11,7 @@ ./progs/alacritty.nix ./progs/emacs.nix # ./progs/trezor.nix # - broken + ./progs/flatpak.nix ]; nixpkgs.config.allowUnfreePredicate = diff --git a/home-manager/progs/flatpak.nix b/home-manager/progs/flatpak.nix new file mode 100644 index 0000000..d0593df --- /dev/null +++ b/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" + ]; + }; +} From e32cf43862e182fd4ea2013a1149de0ee0add860 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 7 Oct 2025 22:26:04 -0400 Subject: [PATCH 373/724] update --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index f7afc28..c3315fe 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1759655261, - "narHash": "sha256-VqbnVGL7+eb0px3tx9szi38BC+J8ONBi4QAkKPXiokw=", + "lastModified": 1759889117, + "narHash": "sha256-ml9BaclaS5boSrz3XFXsr3+llTJ81p3q+o041AgZ13g=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "85a72536d0224341ffdfb9fbb724f5ef15476dd6", + "rev": "96f3adf9a34ed8828c004c4b11b8a14bab2e5eed", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1759711756, - "narHash": "sha256-gdX1IM8MT3vTqLSXLDc9HNg30EcHkAgUXeNh4UpcyYU=", + "lastModified": 1759820832, + "narHash": "sha256-KEzV85mFhHfXSlMpP8f1cPLHPuyx8P8hZPOXme+2mn4=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "372ecde34b3af73ae523d4b055f5bcdab00b5ee6", + "rev": "69338e0c19d81b3ce6f793934d1a5c0671aff821", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1759580034, - "narHash": "sha256-YWo57PL7mGZU7D4WeKFMiW4ex/O6ZolUS6UNBHTZfkI=", + "lastModified": 1759735786, + "narHash": "sha256-a0+h02lyP2KwSNrZz4wLJTu9ikujNsTWIC874Bv7IJ0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3bcc93c5f7a4b30335d31f21e2f1281cba68c318", + "rev": "20c4598c84a671783f741e02bf05cbfaf4907cff", "type": "github" }, "original": { @@ -320,11 +320,11 @@ ] }, "locked": { - "lastModified": 1759718104, - "narHash": "sha256-TbkLsgdnXHUXR4gOQBmhxkEE9ne+eHmX1chZHWRogy0=", + "lastModified": 1759804383, + "narHash": "sha256-jPz0K8xsT2eNSratkw8bfPwSlTuOXGeUvz+bd9wq/vY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "edea9f33f9a03f615ad3609a40fbcefe0ec835ca", + "rev": "dec08d5dfeca099b0058f0cc61264b04f33db42c", "type": "github" }, "original": { @@ -376,11 +376,11 @@ ] }, "locked": { - "lastModified": 1759724568, - "narHash": "sha256-i/+YcMMMFXeUKWbR683eoxyz+4Jcb01MHVCjj6OHl0Y=", + "lastModified": 1759810989, + "narHash": "sha256-QZGjGBps8DLx56+60m1nAaJihNZZXoggtB76nCE7nks=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "b63e1644c96baaaccb78f8d3101f39fbfee733cb", + "rev": "a36d0113a80d1b70511192bbefdfa30303f05fab", "type": "github" }, "original": { From 2c4422729da7b33d82b301fdc14f3ef8a5f65802 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 10 Oct 2025 23:21:45 -0400 Subject: [PATCH 374/724] update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index c3315fe..aa3aa61 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1759889117, - "narHash": "sha256-ml9BaclaS5boSrz3XFXsr3+llTJ81p3q+o041AgZ13g=", + "lastModified": 1760148156, + "narHash": "sha256-esyF/JqpQGcq2neJwpfuoZXgg55DehNTxdGRMuHqCL4=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "96f3adf9a34ed8828c004c4b11b8a14bab2e5eed", + "rev": "487c16bfab1b4ff24496f18d2d5b60ca79a8bc59", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1759820832, - "narHash": "sha256-KEzV85mFhHfXSlMpP8f1cPLHPuyx8P8hZPOXme+2mn4=", + "lastModified": 1760121522, + "narHash": "sha256-8SGgpcZsMZIqFU+J/1OwebC/px8sgx5YYHNw1XkBM98=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "69338e0c19d81b3ce6f793934d1a5c0671aff821", + "rev": "17dbedb88a21142c41d120f139e2870bc56bb5f4", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1759582739, - "narHash": "sha256-spZegilADH0q5OngM86u6NmXxduCNv5eX9vCiUPhOYc=", + "lastModified": 1760106635, + "narHash": "sha256-2GoxVaKWTHBxRoeUYSjv0AfSOx4qw5CWSFz2b+VolKU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3441b5242af7577230a78ffb03542add264179ab", + "rev": "9ed85f8afebf2b7478f25db0a98d0e782c0ed903", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1759735786, - "narHash": "sha256-a0+h02lyP2KwSNrZz4wLJTu9ikujNsTWIC874Bv7IJ0=", + "lastModified": 1759994382, + "narHash": "sha256-wSK+3UkalDZRVHGCRikZ//CyZUJWDJkBDTQX1+G77Ow=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "20c4598c84a671783f741e02bf05cbfaf4907cff", + "rev": "5da4a26309e796daa7ffca72df93dbe53b8164c7", "type": "github" }, "original": { @@ -320,11 +320,11 @@ ] }, "locked": { - "lastModified": 1759804383, - "narHash": "sha256-jPz0K8xsT2eNSratkw8bfPwSlTuOXGeUvz+bd9wq/vY=", + "lastModified": 1760149850, + "narHash": "sha256-FVVS5YgOFQHa8waL9EoUuw29iaDIF0qRkVlXIaU1j+c=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "dec08d5dfeca099b0058f0cc61264b04f33db42c", + "rev": "a8143c74e5ed8cdbca3c96d4362b6392577481ff", "type": "github" }, "original": { @@ -376,11 +376,11 @@ ] }, "locked": { - "lastModified": 1759810989, - "narHash": "sha256-QZGjGBps8DLx56+60m1nAaJihNZZXoggtB76nCE7nks=", + "lastModified": 1759965431, + "narHash": "sha256-HvXr+rOkSZeseOYCruuMKMAUedcDkHOuYpFbnlIPs8Y=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "a36d0113a80d1b70511192bbefdfa30303f05fab", + "rev": "391a133511ad7e09651b9c3939d8cf8d379766b1", "type": "github" }, "original": { From af52817d98d3684164437821f5a9b02a4a577e0f Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 12 Oct 2025 18:24:59 -0400 Subject: [PATCH 375/724] update --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index aa3aa61..d1e2845 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1760148156, - "narHash": "sha256-esyF/JqpQGcq2neJwpfuoZXgg55DehNTxdGRMuHqCL4=", + "lastModified": 1760289806, + "narHash": "sha256-G9K6sJUZ4ejWJGwtvMAb+Lia2SArA4Muv+HKBlFAB5Y=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "487c16bfab1b4ff24496f18d2d5b60ca79a8bc59", + "rev": "11d1564ac8a9135e6abfea64a915f855bb3754da", "type": "github" }, "original": { @@ -320,11 +320,11 @@ ] }, "locked": { - "lastModified": 1760149850, - "narHash": "sha256-FVVS5YgOFQHa8waL9EoUuw29iaDIF0qRkVlXIaU1j+c=", + "lastModified": 1760236527, + "narHash": "sha256-h9+WEQtUIZaZMvA1pnbZbMM+5X39OFnW92Q8hNoToD0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a8143c74e5ed8cdbca3c96d4362b6392577481ff", + "rev": "a38dd7f462825c75ce8567816ae38c2e7d826bfa", "type": "github" }, "original": { @@ -376,11 +376,11 @@ ] }, "locked": { - "lastModified": 1759965431, - "narHash": "sha256-HvXr+rOkSZeseOYCruuMKMAUedcDkHOuYpFbnlIPs8Y=", + "lastModified": 1760293464, + "narHash": "sha256-ZzEtJKudu4ElfYM2+hX9EIk43wX30wE2v5pjClibFq4=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "391a133511ad7e09651b9c3939d8cf8d379766b1", + "rev": "a6ed465e39c76713f2d17918101193012e387e15", "type": "github" }, "original": { From ecfe9e8dd2c884fb33d0e3e8238019f6b92145d1 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 13 Oct 2025 01:24:30 -0400 Subject: [PATCH 376/724] update --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index d1e2845..2fac45b 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1760289806, - "narHash": "sha256-G9K6sJUZ4ejWJGwtvMAb+Lia2SArA4Muv+HKBlFAB5Y=", + "lastModified": 1760321448, + "narHash": "sha256-E4Bnk+5/Ecbx1dBGQknUfXWmHByqYigysH1RPd8ths8=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "11d1564ac8a9135e6abfea64a915f855bb3754da", + "rev": "de1dc1e2cf1f351d09cac6b64c2d09441e074d11", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1760121522, - "narHash": "sha256-8SGgpcZsMZIqFU+J/1OwebC/px8sgx5YYHNw1XkBM98=", + "lastModified": 1760328462, + "narHash": "sha256-LAmGgkv25DFSmYyIbcAMGGqKb8ZpFIpsoD5HqtpFPFo=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "17dbedb88a21142c41d120f139e2870bc56bb5f4", + "rev": "d8ed6b75d4ff881bf04c805964fd6362c2282ecb", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1759994382, - "narHash": "sha256-wSK+3UkalDZRVHGCRikZ//CyZUJWDJkBDTQX1+G77Ow=", + "lastModified": 1760139962, + "narHash": "sha256-4xggC56Rub3WInz5eD7EZWXuLXpNvJiUPahGtMkwtuc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5da4a26309e796daa7ffca72df93dbe53b8164c7", + "rev": "7e297ddff44a3cc93673bb38d0374df8d0ad73e4", "type": "github" }, "original": { @@ -320,11 +320,11 @@ ] }, "locked": { - "lastModified": 1760236527, - "narHash": "sha256-h9+WEQtUIZaZMvA1pnbZbMM+5X39OFnW92Q8hNoToD0=", + "lastModified": 1760323082, + "narHash": "sha256-SKhC9tyt+gVgQHnZGMVPSdptlDYNqApT56JF5t8RwBY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a38dd7f462825c75ce8567816ae38c2e7d826bfa", + "rev": "c73e6874fe8dce0bab82c0387b510875f1eff9f8", "type": "github" }, "original": { @@ -376,11 +376,11 @@ ] }, "locked": { - "lastModified": 1760293464, - "narHash": "sha256-ZzEtJKudu4ElfYM2+hX9EIk43wX30wE2v5pjClibFq4=", + "lastModified": 1760329437, + "narHash": "sha256-TbTTbn2pr0urylodXUi0r9sUB/AjvaZuLclG4b0wLp8=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "a6ed465e39c76713f2d17918101193012e387e15", + "rev": "df8f0729adfcb72b1e6bb2751f92dec0f54283c3", "type": "github" }, "original": { From f856320a196f7ceaf1e8a7cdc8dcad7b24c77d76 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 14 Oct 2025 02:43:21 -0400 Subject: [PATCH 377/724] update --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 2fac45b..2401388 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1760321448, - "narHash": "sha256-E4Bnk+5/Ecbx1dBGQknUfXWmHByqYigysH1RPd8ths8=", + "lastModified": 1760408563, + "narHash": "sha256-EuPr1tn/XWP6Ncfx/SklqIpxD9Wyq7DvC4K+bjqzLNY=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "de1dc1e2cf1f351d09cac6b64c2d09441e074d11", + "rev": "30e279ec3c96040116852e8cbcfb8ffdc7ad0223", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1760328462, - "narHash": "sha256-LAmGgkv25DFSmYyIbcAMGGqKb8ZpFIpsoD5HqtpFPFo=", + "lastModified": 1760376620, + "narHash": "sha256-wx2gkuQcEm4VAVn4YHLMHinyzbSKj669zk60gEuIEHc=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "d8ed6b75d4ff881bf04c805964fd6362c2282ecb", + "rev": "d704fb90b155dcd19311fc42e21b9d1739b17a09", "type": "github" }, "original": { @@ -320,11 +320,11 @@ ] }, "locked": { - "lastModified": 1760323082, - "narHash": "sha256-SKhC9tyt+gVgQHnZGMVPSdptlDYNqApT56JF5t8RwBY=", + "lastModified": 1760409263, + "narHash": "sha256-GvcdHmY3nZnU6GnUkEG1a7pDZPgFcuN+zGv3OgvfPH0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c73e6874fe8dce0bab82c0387b510875f1eff9f8", + "rev": "5694018463c2134e2369996b38deed41b1b9afc1", "type": "github" }, "original": { @@ -376,11 +376,11 @@ ] }, "locked": { - "lastModified": 1760329437, - "narHash": "sha256-TbTTbn2pr0urylodXUi0r9sUB/AjvaZuLclG4b0wLp8=", + "lastModified": 1760380505, + "narHash": "sha256-qSDhqXzeGcgidKdT3HCxEbuo4/VFI46lcXODRZtwCxg=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "df8f0729adfcb72b1e6bb2751f92dec0f54283c3", + "rev": "21d967b539f2c599786356c2cae17b1273aaa6ad", "type": "github" }, "original": { From 7f6690ffbdf7c1ba7fef4f09d48214c8af0dfac0 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 14 Oct 2025 02:44:20 -0400 Subject: [PATCH 378/724] niri: use unstable --- home-manager/progs/niri.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/progs/niri.nix b/home-manager/progs/niri.nix index 5bc9c34..367b1a4 100644 --- a/home-manager/progs/niri.nix +++ b/home-manager/progs/niri.nix @@ -22,7 +22,7 @@ in ]; programs.niri = { - package = pkgs.niri; + package = pkgs.niri-unstable; settings = { prefer-no-csd = true; From cae3f4d2a997a2594d8fe269b9968deda6de048e Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 15 Oct 2025 10:04:50 -0400 Subject: [PATCH 379/724] update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 2401388..f7240ee 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1760408563, - "narHash": "sha256-EuPr1tn/XWP6Ncfx/SklqIpxD9Wyq7DvC4K+bjqzLNY=", + "lastModified": 1760519558, + "narHash": "sha256-BNUghToLW/CS+P0W9C4FTUrvH3t450VgFJxFy6z/aUU=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "30e279ec3c96040116852e8cbcfb8ffdc7ad0223", + "rev": "04cf435756383e46051466944ab0b2b437bb6ec4", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1760376620, - "narHash": "sha256-wx2gkuQcEm4VAVn4YHLMHinyzbSKj669zk60gEuIEHc=", + "lastModified": 1760529168, + "narHash": "sha256-ZYtMroQXu6VBQkLb5UyuxxtvqUCttPrbfzMy+XLERFU=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "d704fb90b155dcd19311fc42e21b9d1739b17a09", + "rev": "645aadf4f84988c9f1aa0d49b30702e52d00b656", "type": "github" }, "original": { @@ -213,11 +213,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1759395653, - "narHash": "sha256-sv9J1z6CrTPf9lRJLyCN90fZVdQz7LFeX7pIlInH8BQ=", + "lastModified": 1760524031, + "narHash": "sha256-hcyRViwdsrNUjHTcY0VGygcAawcyU4zYEq7ZZObFwkw=", "owner": "YaLTeR", "repo": "niri", - "rev": "ba6e5e082a79901dc89b0d49c5da1b769d652aec", + "rev": "2776005c5fc4fbb85636672213b8b84a319dfb01", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1760139962, - "narHash": "sha256-4xggC56Rub3WInz5eD7EZWXuLXpNvJiUPahGtMkwtuc=", + "lastModified": 1760423683, + "narHash": "sha256-Tb+NYuJhWZieDZUxN6PgglB16yuqBYQeMJyYBGCXlt8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7e297ddff44a3cc93673bb38d0374df8d0ad73e4", + "rev": "a493e93b4a259cd9fea8073f89a7ed9b1c5a1da2", "type": "github" }, "original": { @@ -320,11 +320,11 @@ ] }, "locked": { - "lastModified": 1760409263, - "narHash": "sha256-GvcdHmY3nZnU6GnUkEG1a7pDZPgFcuN+zGv3OgvfPH0=", + "lastModified": 1760495781, + "narHash": "sha256-3OGPAQNJswy6L4VJyX3U9/z7fwgPFvK6zQtB2NHBV0Y=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "5694018463c2134e2369996b38deed41b1b9afc1", + "rev": "11e0852a2aa3a65955db5824262d76933750e299", "type": "github" }, "original": { @@ -376,11 +376,11 @@ ] }, "locked": { - "lastModified": 1760380505, - "narHash": "sha256-qSDhqXzeGcgidKdT3HCxEbuo4/VFI46lcXODRZtwCxg=", + "lastModified": 1760466542, + "narHash": "sha256-q2QZhrrjHbvW4eFzoEGkj/wUHNU6bVGPyflurx5ka6U=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "21d967b539f2c599786356c2cae17b1273aaa6ad", + "rev": "3446bcbf5f46ecb18e82244888730c4983c30b22", "type": "github" }, "original": { From 728c7c36cc1196ab8f8e6e62f012e5cf7829376f Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 15 Oct 2025 10:22:28 -0400 Subject: [PATCH 380/724] nix: disable auto optimise store --- etcnixos/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etcnixos/common.nix b/etcnixos/common.nix index 100a219..d8f0104 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -66,7 +66,7 @@ nix = { # optimize the store - optimise.automatic = true; + optimise.automatic = false; # enable flakes! settings.experimental-features = [ From 9f8f4bad74df991cc421577fdb296a2bdadbeb3e Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 15 Oct 2025 10:23:39 -0400 Subject: [PATCH 381/724] easyeffects: TimeoutStopSec 1 -> 0 --- home-manager/progs/framework-13-easyeffects.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/progs/framework-13-easyeffects.nix b/home-manager/progs/framework-13-easyeffects.nix index e7d7eb4..5f083b4 100644 --- a/home-manager/progs/framework-13-easyeffects.nix +++ b/home-manager/progs/framework-13-easyeffects.nix @@ -119,5 +119,5 @@ preset = "framework"; }; - systemd.user.services.easyeffects.Service.TimeoutStopSec = 1; + systemd.user.services.easyeffects.Service.TimeoutStopSec = 0; } From a4b59296105257d1b0ea2176d9ee5e4d47b9d756 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 15 Oct 2025 10:28:15 -0400 Subject: [PATCH 382/724] easyeffects: add timeout comment --- home-manager/progs/framework-13-easyeffects.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home-manager/progs/framework-13-easyeffects.nix b/home-manager/progs/framework-13-easyeffects.nix index 5f083b4..f551340 100644 --- a/home-manager/progs/framework-13-easyeffects.nix +++ b/home-manager/progs/framework-13-easyeffects.nix @@ -119,5 +119,7 @@ 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; } From dfeffde9d51d78c7924a1b1e6ca6c2690fdf6f28 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 16 Oct 2025 18:31:55 -0400 Subject: [PATCH 383/724] easyeffects: disable --- home-manager/home-mreow.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/home-manager/home-mreow.nix b/home-manager/home-mreow.nix index d162804..27df1a1 100644 --- a/home-manager/home-mreow.nix +++ b/home-manager/home-mreow.nix @@ -10,7 +10,8 @@ ./desktop.nix ./progs/borg.nix - ./progs/framework-13-easyeffects.nix + # effects headphones too + # ./progs/framework-13-easyeffects.nix ]; # media controls From 88341e5bdb70fd363cde0cf2ea507f50b2215321 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 17 Oct 2025 00:31:55 -0400 Subject: [PATCH 384/724] update --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index f7240ee..97e1136 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1760519558, - "narHash": "sha256-BNUghToLW/CS+P0W9C4FTUrvH3t450VgFJxFy6z/aUU=", + "lastModified": 1760666828, + "narHash": "sha256-wQ43JXlK0rd9D1IjqfpzIJZwqj7YtRt/WvWSKebXQS8=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "04cf435756383e46051466944ab0b2b437bb6ec4", + "rev": "97346a378089a06acf6431304ee14a665a26a984", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1760529168, - "narHash": "sha256-ZYtMroQXu6VBQkLb5UyuxxtvqUCttPrbfzMy+XLERFU=", + "lastModified": 1760575912, + "narHash": "sha256-8VNgyBHMJ2paTzWX5EAemGBNB0pCiA6NKJFPZHuzjhY=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "645aadf4f84988c9f1aa0d49b30702e52d00b656", + "rev": "55d6c441e21c9cd8396d4db03c696c1259d0f62e", "type": "github" }, "original": { @@ -320,11 +320,11 @@ ] }, "locked": { - "lastModified": 1760495781, - "narHash": "sha256-3OGPAQNJswy6L4VJyX3U9/z7fwgPFvK6zQtB2NHBV0Y=", + "lastModified": 1760668505, + "narHash": "sha256-Ed0cGwPZtLRiSvMx4KgPx8bhLYzn5jiJ7s5o5vj4oG0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "11e0852a2aa3a65955db5824262d76933750e299", + "rev": "18234d2c11b10eaec9ccc3a1089a5ea872ec8858", "type": "github" }, "original": { @@ -376,11 +376,11 @@ ] }, "locked": { - "lastModified": 1760466542, - "narHash": "sha256-q2QZhrrjHbvW4eFzoEGkj/wUHNU6bVGPyflurx5ka6U=", + "lastModified": 1760646099, + "narHash": "sha256-hFoiRU9tM0ilgZS4gSO00nbnsuTQoYGQBb8+5Vma3Og=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "3446bcbf5f46ecb18e82244888730c4983c30b22", + "rev": "f3fd50667a6ab075b1e7c406ff30c54684cefa16", "type": "github" }, "original": { From facdcc5c0a0cb499c2416c70a48e39ddc78516cd Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 17 Oct 2025 10:59:55 -0400 Subject: [PATCH 385/724] update --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 97e1136..05ee722 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1760666828, - "narHash": "sha256-wQ43JXlK0rd9D1IjqfpzIJZwqj7YtRt/WvWSKebXQS8=", + "lastModified": 1760692286, + "narHash": "sha256-7+AJBwNz+NqCjV8FIptdrA8R8svFt5IkGNobXyp6Jr0=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "97346a378089a06acf6431304ee14a665a26a984", + "rev": "2c85c16c9bd6aa251db9f9191868d44a2319876f", "type": "github" }, "original": { @@ -180,11 +180,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1760575912, - "narHash": "sha256-8VNgyBHMJ2paTzWX5EAemGBNB0pCiA6NKJFPZHuzjhY=", + "lastModified": 1760700290, + "narHash": "sha256-thtIzWn8YB/zXfXR0Cv7pQ0ID8YTc05d9eedk1lu+zI=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "55d6c441e21c9cd8396d4db03c696c1259d0f62e", + "rev": "b80575644cb2bf9eb0050974dcd988e781ffd340", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1760423683, - "narHash": "sha256-Tb+NYuJhWZieDZUxN6PgglB16yuqBYQeMJyYBGCXlt8=", + "lastModified": 1760580664, + "narHash": "sha256-/YdfibIrnqXAL8p5kqCU345mzpHoOtuVIkMiI2pF4Dc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a493e93b4a259cd9fea8073f89a7ed9b1c5a1da2", + "rev": "98ff3f9af2684f6136c24beef08f5e2033fc5389", "type": "github" }, "original": { @@ -376,11 +376,11 @@ ] }, "locked": { - "lastModified": 1760646099, - "narHash": "sha256-hFoiRU9tM0ilgZS4gSO00nbnsuTQoYGQBb8+5Vma3Og=", + "lastModified": 1760675007, + "narHash": "sha256-uzFK9GgP/6TiPyXmSXeNQld3pG1zeWsPfi+ut/vrkrI=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "f3fd50667a6ab075b1e7c406ff30c54684cefa16", + "rev": "11308e8294b68cda466145d5982996c489c126bc", "type": "github" }, "original": { From ba77b115023a356870212d2c8dd73ecd958096f3 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 17 Oct 2025 13:24:24 -0400 Subject: [PATCH 386/724] Use Doom Emacs unstraightened Have to disable java lsp because of build issue: https://github.com/marienz/nix-doom-emacs-unstraightened/issues/96 Need to test it more. --- flake.lock | 63 ++++++++- flake.nix | 6 + home-manager/progs/doom.d/config.el | 86 ++++++++++++ home-manager/progs/doom.d/init.el | 195 ++++++++++++++++++++++++++ home-manager/progs/doom.d/packages.el | 52 +++++++ home-manager/progs/emacs.nix | 11 +- 6 files changed, 407 insertions(+), 6 deletions(-) create mode 100644 home-manager/progs/doom.d/config.el create mode 100644 home-manager/progs/doom.d/init.el create mode 100644 home-manager/progs/doom.d/packages.el diff --git a/flake.lock b/flake.lock index 05ee722..92fa29b 100644 --- a/flake.lock +++ b/flake.lock @@ -36,6 +36,22 @@ "type": "github" } }, + "doomemacs": { + "flake": false, + "locked": { + "lastModified": 1760602791, + "narHash": "sha256-voIvrHMgs2zFNtYDxVnyBpmSCE3NFZAhhcZsUneDMLw=", + "owner": "doomemacs", + "repo": "doomemacs", + "rev": "f9664ae058d67b8d97cb8a9c40744fefc3e5479f", + "type": "github" + }, + "original": { + "owner": "doomemacs", + "repo": "doomemacs", + "type": "github" + } + }, "emacs-overlay": { "inputs": { "nixpkgs": [ @@ -46,11 +62,11 @@ ] }, "locked": { - "lastModified": 1760692286, - "narHash": "sha256-7+AJBwNz+NqCjV8FIptdrA8R8svFt5IkGNobXyp6Jr0=", + "lastModified": 1760721928, + "narHash": "sha256-Bg2sdZZL3zJH61CZ8/84E7xscvBeP1wsae4K2kp75wY=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "2c85c16c9bd6aa251db9f9191868d44a2319876f", + "rev": "2be53643710f2cd0ea0f980b582ec1d7a29fe75d", "type": "github" }, "original": { @@ -226,6 +242,31 @@ "type": "github" } }, + "nix-doom-emacs-unstraightened": { + "inputs": { + "doomemacs": "doomemacs", + "emacs-overlay": [ + "emacs-overlay" + ], + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems" + }, + "locked": { + "lastModified": 1760690526, + "narHash": "sha256-EKZSnsbDshv4N7iqgEBJCmzcKA6K+j6IEzlovRaw7q8=", + "owner": "marienz", + "repo": "nix-doom-emacs-unstraightened", + "rev": "6e51c071d78c0b088f53f8a42c581d96b8cc2310", + "type": "github" + }, + "original": { + "owner": "marienz", + "repo": "nix-doom-emacs-unstraightened", + "type": "github" + } + }, "nix-flatpak": { "locked": { "lastModified": 1754777568, @@ -306,6 +347,7 @@ "home-manager": "home-manager", "lanzaboote": "lanzaboote", "niri": "niri", + "nix-doom-emacs-unstraightened": "nix-doom-emacs-unstraightened", "nix-flatpak": "nix-flatpak", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", @@ -333,6 +375,21 @@ "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": { diff --git a/flake.nix b/flake.nix index 9a5f7aa..646e224 100644 --- a/flake.nix +++ b/flake.nix @@ -46,6 +46,12 @@ }; 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"; + }; }; outputs = diff --git a/home-manager/progs/doom.d/config.el b/home-manager/progs/doom.d/config.el new file mode 100644 index 0000000..dc99994 --- /dev/null +++ b/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) diff --git a/home-manager/progs/doom.d/init.el b/home-manager/progs/doom.d/init.el new file mode 100644 index 0000000..426e305 --- /dev/null +++ b/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 ; 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)) diff --git a/home-manager/progs/doom.d/packages.el b/home-manager/progs/doom.d/packages.el new file mode 100644 index 0000000..9ef6fce --- /dev/null +++ b/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) diff --git a/home-manager/progs/emacs.nix b/home-manager/progs/emacs.nix index 49a1821..a2c9f1b 100644 --- a/home-manager/progs/emacs.nix +++ b/home-manager/progs/emacs.nix @@ -6,19 +6,24 @@ }: { imports = [ + inputs.nix-doom-emacs-unstraightened.homeModule ( { ... }: { nixpkgs.overlays = [ + inputs.nix-doom-emacs-unstraightened.overlays.default inputs.emacs-overlay.overlays.default ]; } ) + ]; - programs.emacs = { + programs.emacs.package = pkgs.emacs-unstable-pgtk; + + programs.doom-emacs = { enable = true; - package = pkgs.emacs-unstable-pgtk; + doomDir = ./doom.d; extraPackages = epkgs: [ epkgs.dracula-theme @@ -27,6 +32,6 @@ # for file search pkgs.fd ]; - extraConfig = ""; + }; } From 6f868d6069130985463a57f0936b1d68463c6e46 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 17 Oct 2025 13:27:19 -0400 Subject: [PATCH 387/724] update --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 92fa29b..7ac5b33 100644 --- a/flake.lock +++ b/flake.lock @@ -196,11 +196,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1760700290, - "narHash": "sha256-thtIzWn8YB/zXfXR0Cv7pQ0ID8YTc05d9eedk1lu+zI=", + "lastModified": 1760721062, + "narHash": "sha256-ZOIN/KI7lQ6kdg00fiK4rzShBamWS63iIFXRdXa/RGY=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "b80575644cb2bf9eb0050974dcd988e781ffd340", + "rev": "154ff02273624f98242682b2a015e67664a00df7", "type": "github" }, "original": { @@ -229,11 +229,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1760524031, - "narHash": "sha256-hcyRViwdsrNUjHTcY0VGygcAawcyU4zYEq7ZZObFwkw=", + "lastModified": 1760713401, + "narHash": "sha256-87WP8+hzAkt9JjsQ08ZvdAnfC8vLPxLQlSOF4C6Yka0=", "owner": "YaLTeR", "repo": "niri", - "rev": "2776005c5fc4fbb85636672213b8b84a319dfb01", + "rev": "ada6e844ba609db60830e92316f989cb7e1e8bdf", "type": "github" }, "original": { @@ -433,11 +433,11 @@ ] }, "locked": { - "lastModified": 1760675007, - "narHash": "sha256-uzFK9GgP/6TiPyXmSXeNQld3pG1zeWsPfi+ut/vrkrI=", + "lastModified": 1760721442, + "narHash": "sha256-mhHwhnxlJm+bA6Na5OHPzUR5pU0nshi+7lRzneaXR0A=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "11308e8294b68cda466145d5982996c489c126bc", + "rev": "377329200e79c3fdadd6d74322657c564d4b8ef0", "type": "github" }, "original": { From f6d4bb2ea9b21e0ebcfeae6f536cf7462e2f18e3 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 17 Oct 2025 14:06:58 -0400 Subject: [PATCH 388/724] fix doom emacs --- home-manager/progs/emacs.nix | 4 +--- home-manager/progs/niri.nix | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/home-manager/progs/emacs.nix b/home-manager/progs/emacs.nix index a2c9f1b..c973326 100644 --- a/home-manager/progs/emacs.nix +++ b/home-manager/progs/emacs.nix @@ -19,11 +19,10 @@ ]; - programs.emacs.package = pkgs.emacs-unstable-pgtk; - programs.doom-emacs = { enable = true; doomDir = ./doom.d; + emacs = pkgs.emacs-unstable-pgtk; extraPackages = epkgs: [ epkgs.dracula-theme @@ -32,6 +31,5 @@ # for file search pkgs.fd ]; - }; } diff --git a/home-manager/progs/niri.nix b/home-manager/progs/niri.nix index 367b1a4..fd4d90a 100644 --- a/home-manager/progs/niri.nix +++ b/home-manager/progs/niri.nix @@ -140,6 +140,9 @@ in # Application launcher "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 From 23a881a11454f3059b94a6c433f84e193a647c60 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 18 Oct 2025 19:24:59 -0400 Subject: [PATCH 389/724] update + fix emacs --- flake.lock | 36 +++++++++++++++---------------- home-manager/progs/doom.d/init.el | 2 +- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index 7ac5b33..a1d07b7 100644 --- a/flake.lock +++ b/flake.lock @@ -62,11 +62,11 @@ ] }, "locked": { - "lastModified": 1760721928, - "narHash": "sha256-Bg2sdZZL3zJH61CZ8/84E7xscvBeP1wsae4K2kp75wY=", + "lastModified": 1760808266, + "narHash": "sha256-Xa8sYbZmHFmM+pJUxMyJJIWYELkN3BJma5hqlNjWpvU=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "2be53643710f2cd0ea0f980b582ec1d7a29fe75d", + "rev": "fc9f5fc2de590ab90d9c89d2f66ad443efd3da4c", "type": "github" }, "original": { @@ -196,11 +196,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1760721062, - "narHash": "sha256-ZOIN/KI7lQ6kdg00fiK4rzShBamWS63iIFXRdXa/RGY=", + "lastModified": 1760774008, + "narHash": "sha256-NchPYxFkN9XOOuocGXBmRFAh9NVFybmAev62zG1nL2A=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "154ff02273624f98242682b2a015e67664a00df7", + "rev": "27e012b4cd49e9ac438573ec7a6db3e5835828c3", "type": "github" }, "original": { @@ -229,11 +229,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1760713401, - "narHash": "sha256-87WP8+hzAkt9JjsQ08ZvdAnfC8vLPxLQlSOF4C6Yka0=", + "lastModified": 1760768097, + "narHash": "sha256-RvlONuKFKu+v7h/MorLONcPzXMMe6zs8aJUDOsfjr1I=", "owner": "YaLTeR", "repo": "niri", - "rev": "ada6e844ba609db60830e92316f989cb7e1e8bdf", + "rev": "8c8447918f4fd7bc6c86a8622b1db52417fbbbbd", "type": "github" }, "original": { @@ -254,11 +254,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1760690526, - "narHash": "sha256-EKZSnsbDshv4N7iqgEBJCmzcKA6K+j6IEzlovRaw7q8=", + "lastModified": 1760776702, + "narHash": "sha256-LDEpYekCpiIHbLjp9YEWCk99DDAYj847/gCdLVTG/bc=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "6e51c071d78c0b088f53f8a42c581d96b8cc2310", + "rev": "43ad9b9c3f7417b42d52e6c61983772f8376fb8a", "type": "github" }, "original": { @@ -362,11 +362,11 @@ ] }, "locked": { - "lastModified": 1760668505, - "narHash": "sha256-Ed0cGwPZtLRiSvMx4KgPx8bhLYzn5jiJ7s5o5vj4oG0=", + "lastModified": 1760754684, + "narHash": "sha256-B4+gmoRuvjZGKvDQtMjYkqyA89gZLjrXObZrXFrcKOk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "18234d2c11b10eaec9ccc3a1089a5ea872ec8858", + "rev": "16c233757f1b200936f1b39961c901733936c616", "type": "github" }, "original": { @@ -433,11 +433,11 @@ ] }, "locked": { - "lastModified": 1760721442, - "narHash": "sha256-mhHwhnxlJm+bA6Na5OHPzUR5pU0nshi+7lRzneaXR0A=", + "lastModified": 1760818795, + "narHash": "sha256-dOpzApjgTFlBTWmb1AFtV2W41H1xpNzEMD2OHVMs6rM=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "377329200e79c3fdadd6d74322657c564d4b8ef0", + "rev": "b121d5d8212364b90757fd17d9c75c50f9e824da", "type": "github" }, "original": { diff --git a/home-manager/progs/doom.d/init.el b/home-manager/progs/doom.d/init.el index 426e305..7c26ae1 100644 --- a/home-manager/progs/doom.d/init.el +++ b/home-manager/progs/doom.d/init.el @@ -142,7 +142,7 @@ ;;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 + (java +lsp) ; the poster child for carpal tunnel syndrome ;;javascript ; all(hope(abandon(ye(who(enter(here)))))) ;;julia ; a better, faster MATLAB ;;kotlin ; a better, slicker Java(Script) From 28b0f90b7b5097ae871f50adbb4ffc1d57e5c4c9 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 19 Oct 2025 02:14:34 -0400 Subject: [PATCH 390/724] update --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index a1d07b7..e408a00 100644 --- a/flake.lock +++ b/flake.lock @@ -62,11 +62,11 @@ ] }, "locked": { - "lastModified": 1760808266, - "narHash": "sha256-Xa8sYbZmHFmM+pJUxMyJJIWYELkN3BJma5hqlNjWpvU=", + "lastModified": 1760837483, + "narHash": "sha256-CSjfwhEusww0SPzHJt/XSCt+ldE7/2cmM3rEXGt+uF4=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "fc9f5fc2de590ab90d9c89d2f66ad443efd3da4c", + "rev": "2dae8a3895abc3b56556561fef7165c6078fba4e", "type": "github" }, "original": { @@ -362,11 +362,11 @@ ] }, "locked": { - "lastModified": 1760754684, - "narHash": "sha256-B4+gmoRuvjZGKvDQtMjYkqyA89gZLjrXObZrXFrcKOk=", + "lastModified": 1760841560, + "narHash": "sha256-NVOl5Lk1QD+i4I4My4f85yjXBinu+OXOUWskPNtzKHs=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "16c233757f1b200936f1b39961c901733936c616", + "rev": "a9121dc4ccd63e0309426b91bd7a494189516274", "type": "github" }, "original": { @@ -433,11 +433,11 @@ ] }, "locked": { - "lastModified": 1760818795, - "narHash": "sha256-dOpzApjgTFlBTWmb1AFtV2W41H1xpNzEMD2OHVMs6rM=", + "lastModified": 1760843785, + "narHash": "sha256-lp6xctqGBNKZ3pmRlALX1puVG7EKQa4xAq+2leThDKw=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "b121d5d8212364b90757fd17d9c75c50f9e824da", + "rev": "a36f9da8a234b59dd5fc4484e37dadae2aa75b80", "type": "github" }, "original": { From af462d5be8dd888e67b83d6ef89846ce36651888 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 20 Oct 2025 22:09:20 -0400 Subject: [PATCH 391/724] niri: fix screenshots + update --- flake.lock | 48 ++++++++++++++++++------------------- home-manager/progs/niri.nix | 4 ++-- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/flake.lock b/flake.lock index e408a00..e0e8247 100644 --- a/flake.lock +++ b/flake.lock @@ -62,11 +62,11 @@ ] }, "locked": { - "lastModified": 1760837483, - "narHash": "sha256-CSjfwhEusww0SPzHJt/XSCt+ldE7/2cmM3rEXGt+uF4=", + "lastModified": 1761011672, + "narHash": "sha256-YNz90Z/9TLQ7ZIPy+LDIwwyweIulpcG3af7fCQfH0GM=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "2dae8a3895abc3b56556561fef7165c6078fba4e", + "rev": "f340e55a063e44ab6d34a03980390722d1fe59fa", "type": "github" }, "original": { @@ -196,11 +196,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1760774008, - "narHash": "sha256-NchPYxFkN9XOOuocGXBmRFAh9NVFybmAev62zG1nL2A=", + "lastModified": 1760950171, + "narHash": "sha256-E2ySTu/oK7cYBdAI3tlGP9zVjF4mZgWJ1OZInBCMb00=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "27e012b4cd49e9ac438573ec7a6db3e5835828c3", + "rev": "f851a923137c0a54719412146fd63d24b3214e60", "type": "github" }, "original": { @@ -229,11 +229,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1760768097, - "narHash": "sha256-RvlONuKFKu+v7h/MorLONcPzXMMe6zs8aJUDOsfjr1I=", + "lastModified": 1760940149, + "narHash": "sha256-KbM47vD6E0cx+v4jYQZ8mD5N186AKm2CQlyh34TW58U=", "owner": "YaLTeR", "repo": "niri", - "rev": "8c8447918f4fd7bc6c86a8622b1db52417fbbbbd", + "rev": "b3245b81a6ed8edfaf5388a74d2e0a23c24941e5", "type": "github" }, "original": { @@ -254,11 +254,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1760776702, - "narHash": "sha256-LDEpYekCpiIHbLjp9YEWCk99DDAYj847/gCdLVTG/bc=", + "lastModified": 1760959896, + "narHash": "sha256-BUSVHhuQlJHVU6gk1i3UOxZmCXFCegekWeZMGg1vIOQ=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "43ad9b9c3f7417b42d52e6c61983772f8376fb8a", + "rev": "428a3d65266ccc08663ea3d5bed2dd22e5821055", "type": "github" }, "original": { @@ -284,11 +284,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1760106635, - "narHash": "sha256-2GoxVaKWTHBxRoeUYSjv0AfSOx4qw5CWSFz2b+VolKU=", + "lastModified": 1760958188, + "narHash": "sha256-2m1S4jl+GEDtlt2QqeHil8Ny456dcGSKJAM7q3j/BFU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9ed85f8afebf2b7478f25db0a98d0e782c0ed903", + "rev": "d6645c340ef7d821602fd2cd199e8d1eed10afbc", "type": "github" }, "original": { @@ -300,11 +300,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1760580664, - "narHash": "sha256-/YdfibIrnqXAL8p5kqCU345mzpHoOtuVIkMiI2pF4Dc=", + "lastModified": 1760862643, + "narHash": "sha256-PXwG0TM7Ek87DNx4LbGWuD93PbFeKAJs4FfALtp7Wo0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "98ff3f9af2684f6136c24beef08f5e2033fc5389", + "rev": "33c6dca0c0cb31d6addcd34e90a63ad61826b28c", "type": "github" }, "original": { @@ -362,11 +362,11 @@ ] }, "locked": { - "lastModified": 1760841560, - "narHash": "sha256-NVOl5Lk1QD+i4I4My4f85yjXBinu+OXOUWskPNtzKHs=", + "lastModified": 1760927964, + "narHash": "sha256-+TjujgwBpeN0aaQ/lZQ8UPsWl9oEaihgbt6FvxTlpZk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a9121dc4ccd63e0309426b91bd7a494189516274", + "rev": "6b1e691089a62d0852f9d3fd6693ee027bc98ac3", "type": "github" }, "original": { @@ -433,11 +433,11 @@ ] }, "locked": { - "lastModified": 1760843785, - "narHash": "sha256-lp6xctqGBNKZ3pmRlALX1puVG7EKQa4xAq+2leThDKw=", + "lastModified": 1761010106, + "narHash": "sha256-f9VDB1N4fx2LhYeSQKmBnZpBkNSTSIhHBPIeFckDnUI=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "a36f9da8a234b59dd5fc4484e37dadae2aa75b80", + "rev": "9324a38a7447f0fdc831c241ccf5b9f8708bcdf8", "type": "github" }, "original": { diff --git a/home-manager/progs/niri.nix b/home-manager/progs/niri.nix index fd4d90a..539f768 100644 --- a/home-manager/progs/niri.nix +++ b/home-manager/progs/niri.nix @@ -152,11 +152,11 @@ in "Mod+X".action = spawn (lib.getExe pkgs.swaylock); # screenshotting - "Print".action = screenshot; + "Print".action.screenshot = [ ]; # https://github.com/sodiboo/niri-flake/commit/a7949bd0f5551fdfffd04cb9735ad3cd3167d624#r153571513 # "Ctrl+Print".action = screenshot-screen; - "Alt+Print".action = screenshot-window; + "Alt+Print".action.screenshot-window = [ ]; # Volume control "XF86AudioRaiseVolume".action = spawn [ From 001a31eef05378b793f135d3b905460fff677578 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 21 Oct 2025 21:06:26 -0400 Subject: [PATCH 392/724] update --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index e0e8247..226e460 100644 --- a/flake.lock +++ b/flake.lock @@ -62,11 +62,11 @@ ] }, "locked": { - "lastModified": 1761011672, - "narHash": "sha256-YNz90Z/9TLQ7ZIPy+LDIwwyweIulpcG3af7fCQfH0GM=", + "lastModified": 1761066981, + "narHash": "sha256-1h6ka2meYM/1BMl1BNnUdBLwi3wpjAiJdb5dzeZ0hnI=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "f340e55a063e44ab6d34a03980390722d1fe59fa", + "rev": "849ba43061087465bf661c6194b5c0305b16d9b2", "type": "github" }, "original": { @@ -254,11 +254,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1760959896, - "narHash": "sha256-BUSVHhuQlJHVU6gk1i3UOxZmCXFCegekWeZMGg1vIOQ=", + "lastModified": 1761036267, + "narHash": "sha256-l4HsojIUeqsC/J+DaLkMhJaEo9Mk8RZJwKxBjBghb1M=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "428a3d65266ccc08663ea3d5bed2dd22e5821055", + "rev": "2936eb901015dc83c200a102c064d13ab042a704", "type": "github" }, "original": { @@ -362,11 +362,11 @@ ] }, "locked": { - "lastModified": 1760927964, - "narHash": "sha256-+TjujgwBpeN0aaQ/lZQ8UPsWl9oEaihgbt6FvxTlpZk=", + "lastModified": 1761014195, + "narHash": "sha256-PlIZkwQM0an4ptA7vEC39ZlJcXPxqtKWtsRCwKz3I4w=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "6b1e691089a62d0852f9d3fd6693ee027bc98ac3", + "rev": "f34ca7f18bd13e9f4487b0bff3017d3188f21904", "type": "github" }, "original": { @@ -433,11 +433,11 @@ ] }, "locked": { - "lastModified": 1761010106, - "narHash": "sha256-f9VDB1N4fx2LhYeSQKmBnZpBkNSTSIhHBPIeFckDnUI=", + "lastModified": 1761081495, + "narHash": "sha256-L0MCEvm37OppIHTiMt4yxfum4m7IfeHXHQaC3EeA/eo=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "9324a38a7447f0fdc831c241ccf5b9f8708bcdf8", + "rev": "a2691fb00e51ee9b20c02526bb40c5362649bd3c", "type": "github" }, "original": { From 9efc996a937c660c81e6585789735d4404ed6c44 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 22 Oct 2025 10:12:14 -0400 Subject: [PATCH 393/724] update --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 226e460..54b968c 100644 --- a/flake.lock +++ b/flake.lock @@ -62,11 +62,11 @@ ] }, "locked": { - "lastModified": 1761066981, - "narHash": "sha256-1h6ka2meYM/1BMl1BNnUdBLwi3wpjAiJdb5dzeZ0hnI=", + "lastModified": 1761124442, + "narHash": "sha256-gWqnKK0invzlx5CpQiBUMhIzCbMW4lha8MjXuWv4u3I=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "849ba43061087465bf661c6194b5c0305b16d9b2", + "rev": "92bf36de8dd61f3ee234ce561aa9d59543b17516", "type": "github" }, "original": { @@ -254,11 +254,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1761036267, - "narHash": "sha256-l4HsojIUeqsC/J+DaLkMhJaEo9Mk8RZJwKxBjBghb1M=", + "lastModified": 1761122711, + "narHash": "sha256-hsP+ZhyWCXvuPEwsNXRHnAdH2GaE2drpZhEdq6FvvUo=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "2936eb901015dc83c200a102c064d13ab042a704", + "rev": "12a8115881535976e7e847fd30999fa9b505101c", "type": "github" }, "original": { @@ -362,11 +362,11 @@ ] }, "locked": { - "lastModified": 1761014195, - "narHash": "sha256-PlIZkwQM0an4ptA7vEC39ZlJcXPxqtKWtsRCwKz3I4w=", + "lastModified": 1761100675, + "narHash": "sha256-LX3TCDBeNpCWTDXtGyRASVcLmRPChSli34bgHnZ1DCw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "f34ca7f18bd13e9f4487b0bff3017d3188f21904", + "rev": "72161c6c53f6e3f8dadaf54b2204a5094c6a16ae", "type": "github" }, "original": { @@ -433,11 +433,11 @@ ] }, "locked": { - "lastModified": 1761081495, - "narHash": "sha256-L0MCEvm37OppIHTiMt4yxfum4m7IfeHXHQaC3EeA/eo=", + "lastModified": 1761110379, + "narHash": "sha256-Um+bUt1ZlQgy+P0b4eHGnZUEDjDti+ibOwfsCfklTOk=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "a2691fb00e51ee9b20c02526bb40c5362649bd3c", + "rev": "647840beb53ff5b12a1e916e5ce6edf94f7cd21f", "type": "github" }, "original": { From d5955c8f7307c339dbc2d3e0d13081e49a76b90f Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 23 Oct 2025 15:39:40 -0400 Subject: [PATCH 394/724] update --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 54b968c..c0abccb 100644 --- a/flake.lock +++ b/flake.lock @@ -62,11 +62,11 @@ ] }, "locked": { - "lastModified": 1761124442, - "narHash": "sha256-gWqnKK0invzlx5CpQiBUMhIzCbMW4lha8MjXuWv4u3I=", + "lastModified": 1761236754, + "narHash": "sha256-Cdlmub+XPoQFVJgHehJFektBAYdEZ2lYKI5GTSE9YeY=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "92bf36de8dd61f3ee234ce561aa9d59543b17516", + "rev": "ae64bd8d6bec219e500d7b811acdcbd3f12c8be8", "type": "github" }, "original": { @@ -196,11 +196,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1760950171, - "narHash": "sha256-E2ySTu/oK7cYBdAI3tlGP9zVjF4mZgWJ1OZInBCMb00=", + "lastModified": 1761187190, + "narHash": "sha256-5ln16iOeWpEX5MO7M3jzFEBNFE42gpFsCvSvPjtF6tQ=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "f851a923137c0a54719412146fd63d24b3214e60", + "rev": "77a07f5d3b775fba67550c38122ebb8d3ee3ba1c", "type": "github" }, "original": { @@ -254,11 +254,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1761122711, - "narHash": "sha256-hsP+ZhyWCXvuPEwsNXRHnAdH2GaE2drpZhEdq6FvvUo=", + "lastModified": 1761209034, + "narHash": "sha256-b6CL1U1vtHoDc38lciFoB6FBHJA2L0F0HVMP+7hnt1Q=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "12a8115881535976e7e847fd30999fa9b505101c", + "rev": "a996ea1f4449c6d564a34361f2325a9092ffa37d", "type": "github" }, "original": { @@ -300,11 +300,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1760862643, - "narHash": "sha256-PXwG0TM7Ek87DNx4LbGWuD93PbFeKAJs4FfALtp7Wo0=", + "lastModified": 1761016216, + "narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "33c6dca0c0cb31d6addcd34e90a63ad61826b28c", + "rev": "481cf557888e05d3128a76f14c76397b7d7cc869", "type": "github" }, "original": { @@ -362,11 +362,11 @@ ] }, "locked": { - "lastModified": 1761100675, - "narHash": "sha256-LX3TCDBeNpCWTDXtGyRASVcLmRPChSli34bgHnZ1DCw=", + "lastModified": 1761186948, + "narHash": "sha256-mylLEdzqx4M9TrwFIPc+o0dqabHvFGbNJZGRgE43Ya0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "72161c6c53f6e3f8dadaf54b2204a5094c6a16ae", + "rev": "1d1c8a009adeb4c0561bb1feea8ec7b97749946b", "type": "github" }, "original": { @@ -410,11 +410,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1759707084, - "narHash": "sha256-0pkftKs6/LReNvxw7DVTN2AJEheZVgyeK0Aarbagi70=", + "lastModified": 1761173223, + "narHash": "sha256-FumZh+fPRaKXkl9Y1uTh5KV7Io/AyOZso+UkqLhLArs=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "a9188e70bd748118b4d56a529871b9de5adb9988", + "rev": "bf745144acda1343934e9a094cf9458a54d57889", "type": "github" }, "original": { @@ -433,11 +433,11 @@ ] }, "locked": { - "lastModified": 1761110379, - "narHash": "sha256-Um+bUt1ZlQgy+P0b4eHGnZUEDjDti+ibOwfsCfklTOk=", + "lastModified": 1761180075, + "narHash": "sha256-V4WLeUQ4gCGZiVihlXWBOZ/1FNcL0jM4zgTY1haJLvY=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "647840beb53ff5b12a1e916e5ce6edf94f7cd21f", + "rev": "771a2604606905d8c0ffe3b818dc2cc5bd1405d8", "type": "github" }, "original": { From a3cc4e15d4d5ee43c8e597af3f5f25cf8bb1bb34 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 24 Oct 2025 10:07:31 -0400 Subject: [PATCH 395/724] update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index c0abccb..3278356 100644 --- a/flake.lock +++ b/flake.lock @@ -62,11 +62,11 @@ ] }, "locked": { - "lastModified": 1761236754, - "narHash": "sha256-Cdlmub+XPoQFVJgHehJFektBAYdEZ2lYKI5GTSE9YeY=", + "lastModified": 1761297333, + "narHash": "sha256-tXicOtrJf+d5Vs5YYgBklZTZRSz7+KM/+d4sXGbenD4=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "ae64bd8d6bec219e500d7b811acdcbd3f12c8be8", + "rev": "d36da5f070cd7b2ec532789e02ac2b8e8c48342d", "type": "github" }, "original": { @@ -196,11 +196,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1761187190, - "narHash": "sha256-5ln16iOeWpEX5MO7M3jzFEBNFE42gpFsCvSvPjtF6tQ=", + "lastModified": 1761306170, + "narHash": "sha256-CmM+0+D5vKq6QJdM7ci8DJqX16cNvbEKwUEjxIPgbpY=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "77a07f5d3b775fba67550c38122ebb8d3ee3ba1c", + "rev": "6d5497681c9c4a7d4d344b0c21b8cb5546a904b4", "type": "github" }, "original": { @@ -254,11 +254,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1761209034, - "narHash": "sha256-b6CL1U1vtHoDc38lciFoB6FBHJA2L0F0HVMP+7hnt1Q=", + "lastModified": 1761295322, + "narHash": "sha256-VlINPofmVh5GiSi3YSdosZhwOgfppHRChtGdG4A/jy4=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "a996ea1f4449c6d564a34361f2325a9092ffa37d", + "rev": "be5705cd483c90667466fd770d9f75cf73555ad0", "type": "github" }, "original": { @@ -300,11 +300,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1761016216, - "narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=", + "lastModified": 1761173472, + "narHash": "sha256-m9W0dYXflzeGgKNravKJvTMR4Qqa2MVD11AwlGMufeE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "481cf557888e05d3128a76f14c76397b7d7cc869", + "rev": "c8aa8cc00a5cb57fada0851a038d35c08a36a2bb", "type": "github" }, "original": { @@ -362,11 +362,11 @@ ] }, "locked": { - "lastModified": 1761186948, - "narHash": "sha256-mylLEdzqx4M9TrwFIPc+o0dqabHvFGbNJZGRgE43Ya0=", + "lastModified": 1761273263, + "narHash": "sha256-6d6ojnu6A6sVxIjig8OL6E1T8Ge9st3YGgVwg5MOY+Q=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "1d1c8a009adeb4c0561bb1feea8ec7b97749946b", + "rev": "28405834d4fdd458d28e123fae4db148daecec6f", "type": "github" }, "original": { @@ -433,11 +433,11 @@ ] }, "locked": { - "lastModified": 1761180075, - "narHash": "sha256-V4WLeUQ4gCGZiVihlXWBOZ/1FNcL0jM4zgTY1haJLvY=", + "lastModified": 1761269012, + "narHash": "sha256-/naxU8jbaoZM3CQCjJiI6Z5+vsv+zA7eZdhFY1tbzsM=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "771a2604606905d8c0ffe3b818dc2cc5bd1405d8", + "rev": "c7f5f0122cf8c4bfd9ef3b138eb615f0e54f1459", "type": "github" }, "original": { From 80bea4d7631d3a820cf9976ef4ce1717841ea829 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 26 Oct 2025 02:14:28 -0400 Subject: [PATCH 396/724] update --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 3278356..6d5a9e8 100644 --- a/flake.lock +++ b/flake.lock @@ -62,11 +62,11 @@ ] }, "locked": { - "lastModified": 1761297333, - "narHash": "sha256-tXicOtrJf+d5Vs5YYgBklZTZRSz7+KM/+d4sXGbenD4=", + "lastModified": 1761442148, + "narHash": "sha256-B4MAykIMc2Bu43PhN+Gx4tARFWLkD9EDnDJ6o70JHz8=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "d36da5f070cd7b2ec532789e02ac2b8e8c48342d", + "rev": "529736848e3f5682ccb00f3251e805033e08ff62", "type": "github" }, "original": { @@ -196,11 +196,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1761306170, - "narHash": "sha256-CmM+0+D5vKq6QJdM7ci8DJqX16cNvbEKwUEjxIPgbpY=", + "lastModified": 1761424128, + "narHash": "sha256-VktqwJG446dRB6FI1vu+BEciYWua+oIiPivGK7l3BSs=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "6d5497681c9c4a7d4d344b0c21b8cb5546a904b4", + "rev": "3ec59f4b1259c583c289e35b1754dfb167e2e90f", "type": "github" }, "original": { @@ -229,11 +229,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1760940149, - "narHash": "sha256-KbM47vD6E0cx+v4jYQZ8mD5N186AKm2CQlyh34TW58U=", + "lastModified": 1761337523, + "narHash": "sha256-j6hQ1B7TJt9irtvt2Kxbrb8pq16C8yv4w+M/Dbghabw=", "owner": "YaLTeR", "repo": "niri", - "rev": "b3245b81a6ed8edfaf5388a74d2e0a23c24941e5", + "rev": "4310c20c320d040f3df7a93de4064e452a1876ae", "type": "github" }, "original": { @@ -254,11 +254,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1761295322, - "narHash": "sha256-VlINPofmVh5GiSi3YSdosZhwOgfppHRChtGdG4A/jy4=", + "lastModified": 1761381428, + "narHash": "sha256-mAaCP5hnmWIQuo5rP5LjK0QJ6jjakkBF88Q3IMMfpnQ=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "be5705cd483c90667466fd770d9f75cf73555ad0", + "rev": "5b252316b81839b72ce671e8199b25d76405f864", "type": "github" }, "original": { @@ -362,11 +362,11 @@ ] }, "locked": { - "lastModified": 1761273263, - "narHash": "sha256-6d6ojnu6A6sVxIjig8OL6E1T8Ge9st3YGgVwg5MOY+Q=", + "lastModified": 1761446259, + "narHash": "sha256-JNNOtIIVIX+yBIsh1rq1Nxhc1LZq168vuQB5sqrZbCY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "28405834d4fdd458d28e123fae4db148daecec6f", + "rev": "95098bb4d55ebe167c082fc40705a73ef76b58e4", "type": "github" }, "original": { @@ -410,11 +410,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1761173223, - "narHash": "sha256-FumZh+fPRaKXkl9Y1uTh5KV7Io/AyOZso+UkqLhLArs=", + "lastModified": 1761422250, + "narHash": "sha256-+pN8VAh8OVUSj8zPoI8QfC93JMIKPaAOABrbeeiO/Hk=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "bf745144acda1343934e9a094cf9458a54d57889", + "rev": "2dd40ecfe882c1659e0e46c761974702c7ab5fde", "type": "github" }, "original": { @@ -433,11 +433,11 @@ ] }, "locked": { - "lastModified": 1761269012, - "narHash": "sha256-/naxU8jbaoZM3CQCjJiI6Z5+vsv+zA7eZdhFY1tbzsM=", + "lastModified": 1761448226, + "narHash": "sha256-WGhAhTRY5pKmP0vx8mURN2OcYKwJXQacX6m6Ouf+XEw=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "c7f5f0122cf8c4bfd9ef3b138eb615f0e54f1459", + "rev": "f2579d18a51c900cd6273a02532b33a288f81c2c", "type": "github" }, "original": { From e4fc35e212a0021df7815667ce97f97cc7abd347 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 26 Oct 2025 21:09:00 -0400 Subject: [PATCH 397/724] rust: wasm32-unknown-unknown target --- home-manager/no-gui.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 546d4fb..5739f4e 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -20,7 +20,10 @@ let "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 From b59e44db60309c7f61895592d5ebdc6e06fc35b4 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 27 Oct 2025 00:42:52 -0400 Subject: [PATCH 398/724] update --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 6d5a9e8..cc670f9 100644 --- a/flake.lock +++ b/flake.lock @@ -62,11 +62,11 @@ ] }, "locked": { - "lastModified": 1761442148, - "narHash": "sha256-B4MAykIMc2Bu43PhN+Gx4tARFWLkD9EDnDJ6o70JHz8=", + "lastModified": 1761532382, + "narHash": "sha256-j7UBuq/IbI2uYyFSbO4pRrRdQ4EPVFJSb4nmj2F8HhU=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "529736848e3f5682ccb00f3251e805033e08ff62", + "rev": "b877b340deac13aeca7063f4801a1cbf9b8a4a00", "type": "github" }, "original": { @@ -196,11 +196,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1761424128, - "narHash": "sha256-VktqwJG446dRB6FI1vu+BEciYWua+oIiPivGK7l3BSs=", + "lastModified": 1761474290, + "narHash": "sha256-ufbchtYD+mTCdhmK8Mld4qzN89TN4cxceOTXtIjLAGA=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "3ec59f4b1259c583c289e35b1754dfb167e2e90f", + "rev": "d68e48d09510bc7b0724e25da8eab868189c7084", "type": "github" }, "original": { @@ -229,11 +229,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1761337523, - "narHash": "sha256-j6hQ1B7TJt9irtvt2Kxbrb8pq16C8yv4w+M/Dbghabw=", + "lastModified": 1761460429, + "narHash": "sha256-pJeM23DGMD5AK4gdNaDM1qsIv87NYQJgEh2E8tRd7es=", "owner": "YaLTeR", "repo": "niri", - "rev": "4310c20c320d040f3df7a93de4064e452a1876ae", + "rev": "e6f3c538da0c646bda43fcde7ef7dc3b771e0c8b", "type": "github" }, "original": { @@ -254,11 +254,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1761381428, - "narHash": "sha256-mAaCP5hnmWIQuo5rP5LjK0QJ6jjakkBF88Q3IMMfpnQ=", + "lastModified": 1761467852, + "narHash": "sha256-M2bRZMmnVV1+e1X6FCscMJolHAFmvWu2EjhEPJRhXF0=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "5b252316b81839b72ce671e8199b25d76405f864", + "rev": "14b79d72246afb9b9fc356ac60538e1e9b7b9ee1", "type": "github" }, "original": { @@ -300,11 +300,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1761173472, - "narHash": "sha256-m9W0dYXflzeGgKNravKJvTMR4Qqa2MVD11AwlGMufeE=", + "lastModified": 1761468971, + "narHash": "sha256-vY2OLVg5ZTobdroQKQQSipSIkHlxOTrIF1fsMzPh8w8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c8aa8cc00a5cb57fada0851a038d35c08a36a2bb", + "rev": "78e34d1667d32d8a0ffc3eba4591ff256e80576e", "type": "github" }, "original": { @@ -362,11 +362,11 @@ ] }, "locked": { - "lastModified": 1761446259, - "narHash": "sha256-JNNOtIIVIX+yBIsh1rq1Nxhc1LZq168vuQB5sqrZbCY=", + "lastModified": 1761532837, + "narHash": "sha256-78mCSQgC/a6/0vWYrvE/g9E3gGsJLyBBGtmHe3ZOLG4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "95098bb4d55ebe167c082fc40705a73ef76b58e4", + "rev": "4f5f89f1cfd8553b1285a4a0879ea1b2b05ad286", "type": "github" }, "original": { @@ -433,11 +433,11 @@ ] }, "locked": { - "lastModified": 1761448226, - "narHash": "sha256-WGhAhTRY5pKmP0vx8mURN2OcYKwJXQacX6m6Ouf+XEw=", + "lastModified": 1761535208, + "narHash": "sha256-E1PobJMiFmVUX2YdqYk/MpKb0LXavOYvlg8DCBBzlHc=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "f2579d18a51c900cd6273a02532b33a288f81c2c", + "rev": "79a94872a3e6993a051c4e22a2dcb02c1d088acf", "type": "github" }, "original": { From 4d004a7e9f24ff21aa7d3167df931978d1559785 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 29 Oct 2025 11:51:04 -0400 Subject: [PATCH 399/724] update --- flake.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index cc670f9..67c4561 100644 --- a/flake.lock +++ b/flake.lock @@ -62,11 +62,11 @@ ] }, "locked": { - "lastModified": 1761532382, - "narHash": "sha256-j7UBuq/IbI2uYyFSbO4pRrRdQ4EPVFJSb4nmj2F8HhU=", + "lastModified": 1761729218, + "narHash": "sha256-TzxCjY5CfqpRUEl8670vL0zMu6xjL5jaotwXr612+eY=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "b877b340deac13aeca7063f4801a1cbf9b8a4a00", + "rev": "287821df7a311478722ad9f29f00b82b54568508", "type": "github" }, "original": { @@ -196,11 +196,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1761474290, - "narHash": "sha256-ufbchtYD+mTCdhmK8Mld4qzN89TN4cxceOTXtIjLAGA=", + "lastModified": 1761724527, + "narHash": "sha256-nB500dSUaNBtOsu5JI1PDNmjuFD6Kdbkh648q0FoaIY=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "d68e48d09510bc7b0724e25da8eab868189c7084", + "rev": "1ff74954f559bb2da63e28b3fcffd3b09ec32842", "type": "github" }, "original": { @@ -229,11 +229,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1761460429, - "narHash": "sha256-pJeM23DGMD5AK4gdNaDM1qsIv87NYQJgEh2E8tRd7es=", + "lastModified": 1761721311, + "narHash": "sha256-fXBALdA4CKAYslcuamjzQZLUTCNBIKWybj+/2rwe3Z0=", "owner": "YaLTeR", "repo": "niri", - "rev": "e6f3c538da0c646bda43fcde7ef7dc3b771e0c8b", + "rev": "6e8fd153395036c2daa7c214695ed9baf2409a2e", "type": "github" }, "original": { @@ -254,11 +254,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1761467852, - "narHash": "sha256-M2bRZMmnVV1+e1X6FCscMJolHAFmvWu2EjhEPJRhXF0=", + "lastModified": 1761727442, + "narHash": "sha256-ujGHrDLX5G1sqjq54nGVoRpqEdv1R0RzySUxtC+4WzA=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "14b79d72246afb9b9fc356ac60538e1e9b7b9ee1", + "rev": "8bfa7cf089da6393e243a1684825191b17b2fb2b", "type": "github" }, "original": { @@ -284,11 +284,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1760958188, - "narHash": "sha256-2m1S4jl+GEDtlt2QqeHil8Ny456dcGSKJAM7q3j/BFU=", + "lastModified": 1761751191, + "narHash": "sha256-qdFiHCcY8N6HOXcikXCzulyu2T51vacDfp+CgfijKU0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d6645c340ef7d821602fd2cd199e8d1eed10afbc", + "rev": "46f9982c9bb90b715f700495c46654cd8a301e95", "type": "github" }, "original": { @@ -362,11 +362,11 @@ ] }, "locked": { - "lastModified": 1761532837, - "narHash": "sha256-78mCSQgC/a6/0vWYrvE/g9E3gGsJLyBBGtmHe3ZOLG4=", + "lastModified": 1761705569, + "narHash": "sha256-dqljv29XldlKvdTwFw8GkxOQHrz3/13yxdwHW8+nzBI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "4f5f89f1cfd8553b1285a4a0879ea1b2b05ad286", + "rev": "bca7909cb02f5139e0a490b0ff4bae775ea3ebf6", "type": "github" }, "original": { @@ -410,11 +410,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1761422250, - "narHash": "sha256-+pN8VAh8OVUSj8zPoI8QfC93JMIKPaAOABrbeeiO/Hk=", + "lastModified": 1761622056, + "narHash": "sha256-fBrUszJXmB4MY+wf3QsCnqWHcz7u7fLq0QMAWCltIQg=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "2dd40ecfe882c1659e0e46c761974702c7ab5fde", + "rev": "0728d59ff6463a502e001fb090f6eb92dbc04756", "type": "github" }, "original": { @@ -433,11 +433,11 @@ ] }, "locked": { - "lastModified": 1761535208, - "narHash": "sha256-E1PobJMiFmVUX2YdqYk/MpKb0LXavOYvlg8DCBBzlHc=", + "lastModified": 1761712008, + "narHash": "sha256-Nf2s59dLg6KDUV0omZqIlOGNUxw/Rl/KKXEXQGFCAlo=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "79a94872a3e6993a051c4e22a2dcb02c1d088acf", + "rev": "1383ed38745d12f3896c996848d24c451643db58", "type": "github" }, "original": { From 53d158fa752a22f315ead7144f780a1753026a71 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 29 Oct 2025 12:38:13 -0400 Subject: [PATCH 400/724] add stub for video-trimmer --- home-manager/gui.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home-manager/gui.nix b/home-manager/gui.nix index 40b484c..14c7f7b 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -131,6 +131,9 @@ # openstreetmap josm + + # in unstable ATM, gotta wait for it to hit stable + # video-trimmer ] # all the fonts (builtins.filter lib.isDerivation (builtins.attrValues nerd-fonts)) From 452ba6a96bff69eccd596c11ed4db2c7b10c8a31 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 29 Oct 2025 12:39:59 -0400 Subject: [PATCH 401/724] niri: update xwayland handling --- home-manager/progs/niri.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/home-manager/progs/niri.nix b/home-manager/progs/niri.nix index 539f768..46f29b7 100644 --- a/home-manager/progs/niri.nix +++ b/home-manager/progs/niri.nix @@ -36,10 +36,6 @@ in disable-primary = true; }; - environment = { - DISPLAY = ":0"; - }; - # skip the hotkey menu thingy hotkey-overlay.skip-at-startup = true; @@ -61,6 +57,8 @@ in }; }; + xwayland-satellite.path = lib.getExe pkgs.xwayland-satellite; + spawn-at-startup = [ { command = [ @@ -80,14 +78,6 @@ in "${../wallpaper.png}" ]; } - - # Xwayland on niri via xwayland-satellite - { - command = [ - (lib.getExe pkgs.xwayland-satellite) - config.programs.niri.settings.environment.DISPLAY - ]; - } ]; window-rules = [ From 5543eaac052fb5a4c81affed3fd2ebe4a10ea6da Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 30 Oct 2025 14:47:50 -0400 Subject: [PATCH 402/724] update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 67c4561..c23ce96 100644 --- a/flake.lock +++ b/flake.lock @@ -62,11 +62,11 @@ ] }, "locked": { - "lastModified": 1761729218, - "narHash": "sha256-TzxCjY5CfqpRUEl8670vL0zMu6xjL5jaotwXr612+eY=", + "lastModified": 1761841397, + "narHash": "sha256-EIaOQPgJWwqNCBUh5DcWQP01UeQMTVgcMhqZCEtnjHU=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "287821df7a311478722ad9f29f00b82b54568508", + "rev": "5c5cbc65bafbb97d8a0ceb0f7e191af7a5088cde", "type": "github" }, "original": { @@ -254,11 +254,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1761727442, - "narHash": "sha256-ujGHrDLX5G1sqjq54nGVoRpqEdv1R0RzySUxtC+4WzA=", + "lastModified": 1761813790, + "narHash": "sha256-votwija8BDvBuZ4e+/sjkgGCBdMkdAzOCgSWjJ4Pnnk=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "8bfa7cf089da6393e243a1684825191b17b2fb2b", + "rev": "1840592d2e45e7bfec6c0a5da6d113eaa0f3fc9c", "type": "github" }, "original": { @@ -284,11 +284,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1761751191, - "narHash": "sha256-qdFiHCcY8N6HOXcikXCzulyu2T51vacDfp+CgfijKU0=", + "lastModified": 1761827175, + "narHash": "sha256-XdPVSYyIBK4/ruoqujaQmmSGg3J2/EenexV9IEXhr6o=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "46f9982c9bb90b715f700495c46654cd8a301e95", + "rev": "43ffe9ac82567512abb83187cb673de1091bdfa8", "type": "github" }, "original": { @@ -300,11 +300,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1761468971, - "narHash": "sha256-vY2OLVg5ZTobdroQKQQSipSIkHlxOTrIF1fsMzPh8w8=", + "lastModified": 1761597516, + "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "78e34d1667d32d8a0ffc3eba4591ff256e80576e", + "rev": "daf6dc47aa4b44791372d6139ab7b25269184d55", "type": "github" }, "original": { @@ -362,11 +362,11 @@ ] }, "locked": { - "lastModified": 1761705569, - "narHash": "sha256-dqljv29XldlKvdTwFw8GkxOQHrz3/13yxdwHW8+nzBI=", + "lastModified": 1761791894, + "narHash": "sha256-myRIDh+PxaREz+z9LzbqBJF+SnTFJwkthKDX9zMyddY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "bca7909cb02f5139e0a490b0ff4bae775ea3ebf6", + "rev": "59c45eb69d9222a4362673141e00ff77842cd219", "type": "github" }, "original": { @@ -433,11 +433,11 @@ ] }, "locked": { - "lastModified": 1761712008, - "narHash": "sha256-Nf2s59dLg6KDUV0omZqIlOGNUxw/Rl/KKXEXQGFCAlo=", + "lastModified": 1761798236, + "narHash": "sha256-NigAG0gHH3i7Z+me/2uqH8A/utt4NGkMgBDAa2XpkFA=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "1383ed38745d12f3896c996848d24c451643db58", + "rev": "8d9c7683366269d2991698059816cd8c2800d3ff", "type": "github" }, "original": { From 086a380459a0a5fc9d792fa306dba9f4b0a9a3d9 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 31 Oct 2025 14:50:58 -0400 Subject: [PATCH 403/724] update --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index c23ce96..06b45cd 100644 --- a/flake.lock +++ b/flake.lock @@ -62,11 +62,11 @@ ] }, "locked": { - "lastModified": 1761841397, - "narHash": "sha256-EIaOQPgJWwqNCBUh5DcWQP01UeQMTVgcMhqZCEtnjHU=", + "lastModified": 1761931628, + "narHash": "sha256-G9KYIs/8RhXetSVdRf8DE3yk1lA4/H1wKdG2Rd+mJ5U=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "5c5cbc65bafbb97d8a0ceb0f7e191af7a5088cde", + "rev": "c496ba450a9ccc5b1b9a055ab5505ed9d45443d7", "type": "github" }, "original": { @@ -254,11 +254,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1761813790, - "narHash": "sha256-votwija8BDvBuZ4e+/sjkgGCBdMkdAzOCgSWjJ4Pnnk=", + "lastModified": 1761900131, + "narHash": "sha256-Cqtyj6ycbjBFAcoTfWdfSNJb2JZae5Lmg6pkuU38K/M=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "1840592d2e45e7bfec6c0a5da6d113eaa0f3fc9c", + "rev": "e4d1a2826d37bb8d6b434691da1298f05c58586a", "type": "github" }, "original": { @@ -284,11 +284,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1761827175, - "narHash": "sha256-XdPVSYyIBK4/ruoqujaQmmSGg3J2/EenexV9IEXhr6o=", + "lastModified": 1761933221, + "narHash": "sha256-rNHeoG3ZrA94jczyLSjxCtu67YYPYIlXXr0uhG3wNxM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "43ffe9ac82567512abb83187cb673de1091bdfa8", + "rev": "7467f155fcba189eb088a7601f44fbef7688669b", "type": "github" }, "original": { @@ -362,11 +362,11 @@ ] }, "locked": { - "lastModified": 1761791894, - "narHash": "sha256-myRIDh+PxaREz+z9LzbqBJF+SnTFJwkthKDX9zMyddY=", + "lastModified": 1761878277, + "narHash": "sha256-6fCtyVdTzoQejwoextAu7dCLoy5fyD3WVh+Qm7t2Nhg=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "59c45eb69d9222a4362673141e00ff77842cd219", + "rev": "6604534e44090c917db714faa58d47861657690c", "type": "github" }, "original": { @@ -433,11 +433,11 @@ ] }, "locked": { - "lastModified": 1761798236, - "narHash": "sha256-NigAG0gHH3i7Z+me/2uqH8A/utt4NGkMgBDAa2XpkFA=", + "lastModified": 1761859061, + "narHash": "sha256-5C2x+ZQQZAAy0LowYgacT1KG83nXxjcYKMzedx89Wtw=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "8d9c7683366269d2991698059816cd8c2800d3ff", + "rev": "26142b84460636c55bd612ae67225056c7faf134", "type": "github" }, "original": { From 30e7cd8020d32dce486e2ac31c84cee38cd3f53d Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 2 Nov 2025 19:31:55 -0500 Subject: [PATCH 404/724] update --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 06b45cd..216db47 100644 --- a/flake.lock +++ b/flake.lock @@ -62,11 +62,11 @@ ] }, "locked": { - "lastModified": 1761931628, - "narHash": "sha256-G9KYIs/8RhXetSVdRf8DE3yk1lA4/H1wKdG2Rd+mJ5U=", + "lastModified": 1762100620, + "narHash": "sha256-bwYa95G8ceJT1WkOEn1BFJxH69Ip3YXJnNJ30tj8Bi0=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "c496ba450a9ccc5b1b9a055ab5505ed9d45443d7", + "rev": "ca54e503d4cce74ffda90bb124c4df89b230f5bd", "type": "github" }, "original": { @@ -196,11 +196,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1761724527, - "narHash": "sha256-nB500dSUaNBtOsu5JI1PDNmjuFD6Kdbkh648q0FoaIY=", + "lastModified": 1762112996, + "narHash": "sha256-hDYJWcxcYrpCJ9Lxva9B+pAlhGJgwbr2e0guoQQfMoc=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "1ff74954f559bb2da63e28b3fcffd3b09ec32842", + "rev": "bf4782cf43600a4bf14269ee28a7daae962b054b", "type": "github" }, "original": { @@ -229,11 +229,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1761721311, - "narHash": "sha256-fXBALdA4CKAYslcuamjzQZLUTCNBIKWybj+/2rwe3Z0=", + "lastModified": 1761888958, + "narHash": "sha256-YgArUHI81Esn6fOCwVSrMI2G4RI3f3BPbRbPWsJubAc=", "owner": "YaLTeR", "repo": "niri", - "rev": "6e8fd153395036c2daa7c214695ed9baf2409a2e", + "rev": "e2576879216a39e5c45b9d2906531bc2065e724c", "type": "github" }, "original": { @@ -254,11 +254,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1761900131, - "narHash": "sha256-Cqtyj6ycbjBFAcoTfWdfSNJb2JZae5Lmg6pkuU38K/M=", + "lastModified": 1762072564, + "narHash": "sha256-DidTaTWm0RExWQmzZ8f2q8b3j+AWrJ5YVagkvmzOivo=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "e4d1a2826d37bb8d6b434691da1298f05c58586a", + "rev": "1bc572c024fd95f436842d3f44c6684c1b60ae08", "type": "github" }, "original": { @@ -300,11 +300,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1761597516, - "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=", + "lastModified": 1761999846, + "narHash": "sha256-IYlYnp4O4dzEpL77BD/lj5NnJy2J8qbHkNSFiPBCbqo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "daf6dc47aa4b44791372d6139ab7b25269184d55", + "rev": "3de8f8d73e35724bf9abef41f1bdbedda1e14a31", "type": "github" }, "original": { @@ -362,11 +362,11 @@ ] }, "locked": { - "lastModified": 1761878277, - "narHash": "sha256-6fCtyVdTzoQejwoextAu7dCLoy5fyD3WVh+Qm7t2Nhg=", + "lastModified": 1762051177, + "narHash": "sha256-pESNTx/m3WnrYx+OujBtDP5Bj0/mAyHa4MgEwzkgkLE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "6604534e44090c917db714faa58d47861657690c", + "rev": "08c33e87c4829bbdd42b5af247cf7a19e126369f", "type": "github" }, "original": { @@ -433,11 +433,11 @@ ] }, "locked": { - "lastModified": 1761859061, - "narHash": "sha256-5C2x+ZQQZAAy0LowYgacT1KG83nXxjcYKMzedx89Wtw=", + "lastModified": 1762067864, + "narHash": "sha256-Q7o8NTYIbGMmMrgrx9PTmmaj/GM/DWJjM6U+daaiiyk=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "26142b84460636c55bd612ae67225056c7faf134", + "rev": "68b3775543b442b06a76e498fd342b16a8619757", "type": "github" }, "original": { From 186c36877d32d871ee28759a239bd1419dbfda77 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 3 Nov 2025 01:13:36 -0500 Subject: [PATCH 405/724] doom: enable javascript --- home-manager/progs/doom.d/init.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/progs/doom.d/init.el b/home-manager/progs/doom.d/init.el index 7c26ae1..1bc3029 100644 --- a/home-manager/progs/doom.d/init.el +++ b/home-manager/progs/doom.d/init.el @@ -143,7 +143,7 @@ json ; At least it ain't XML ;;janet ; Fun fact: Janet is me! (java +lsp) ; the poster child for carpal tunnel syndrome - ;;javascript ; all(hope(abandon(ye(who(enter(here)))))) + javascript ; 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 From b4d89249ae8c3c44ac4680ec1790a785c8baf443 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 3 Nov 2025 13:21:00 -0500 Subject: [PATCH 406/724] update --- flake.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 216db47..c9669ca 100644 --- a/flake.lock +++ b/flake.lock @@ -62,11 +62,11 @@ ] }, "locked": { - "lastModified": 1762100620, - "narHash": "sha256-bwYa95G8ceJT1WkOEn1BFJxH69Ip3YXJnNJ30tj8Bi0=", + "lastModified": 1762189807, + "narHash": "sha256-BM5xwxFQ9tKxWYw2DPezZWcnyTsfj/g42SG4Zd+8WXg=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "ca54e503d4cce74ffda90bb124c4df89b230f5bd", + "rev": "fa9d3723ae196e4e71e17a1c5933a1c0c35245c8", "type": "github" }, "original": { @@ -169,11 +169,11 @@ ] }, "locked": { - "lastModified": 1756744479, - "narHash": "sha256-EyZXusK/wRD3V9vDh00W2Re3Eg8UQ+LjVBQrrH9dq1U=", + "lastModified": 1762179568, + "narHash": "sha256-sv6YY19xIweeRwos41cvT92+SZcF6d6o4BcSuPnrPwQ=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "747b7912f49e2885090c83364d88cf853a020ac1", + "rev": "cbe4178bf694a9081d51e8ac55e5baadc1d4fa40", "type": "github" }, "original": { @@ -196,11 +196,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1762112996, - "narHash": "sha256-hDYJWcxcYrpCJ9Lxva9B+pAlhGJgwbr2e0guoQQfMoc=", + "lastModified": 1762152856, + "narHash": "sha256-U3SDbk7tIwLChpvb3FL66o8V0byaQ2RGMiy/3oLdxTI=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "bf4782cf43600a4bf14269ee28a7daae962b054b", + "rev": "df17789929ac80f4157b15724450db6a303a6dc9", "type": "github" }, "original": { @@ -229,11 +229,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1761888958, - "narHash": "sha256-YgArUHI81Esn6fOCwVSrMI2G4RI3f3BPbRbPWsJubAc=", + "lastModified": 1762146685, + "narHash": "sha256-anRlNG6t7esBbF1+ALDeathVBSclA0PEL52Vo0WnN5g=", "owner": "YaLTeR", "repo": "niri", - "rev": "e2576879216a39e5c45b9d2906531bc2065e724c", + "rev": "a2ca2b3c866bc781b12c334a9f949b3db6d7c943", "type": "github" }, "original": { @@ -254,11 +254,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1762072564, - "narHash": "sha256-DidTaTWm0RExWQmzZ8f2q8b3j+AWrJ5YVagkvmzOivo=", + "lastModified": 1762159500, + "narHash": "sha256-8nnHDCOA1oqqnx8GVoNxPjBhIaxIeAv9dV0q/xKMO/o=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "1bc572c024fd95f436842d3f44c6684c1b60ae08", + "rev": "cbd71d6ffc8386cb12e993c778e12d9ac2d989ef", "type": "github" }, "original": { @@ -284,11 +284,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1761933221, - "narHash": "sha256-rNHeoG3ZrA94jczyLSjxCtu67YYPYIlXXr0uhG3wNxM=", + "lastModified": 1762179181, + "narHash": "sha256-T4+TNfXlF/gHbcNCC2HY7sMGBKgqNzyYeMBWmcbH7/o=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "7467f155fcba189eb088a7601f44fbef7688669b", + "rev": "256770618502d2eda892af3ae91da5e386ce9586", "type": "github" }, "original": { @@ -362,11 +362,11 @@ ] }, "locked": { - "lastModified": 1762051177, - "narHash": "sha256-pESNTx/m3WnrYx+OujBtDP5Bj0/mAyHa4MgEwzkgkLE=", + "lastModified": 1762137611, + "narHash": "sha256-sTqb10FR/YQCuGbw16qxliX0NFlYg6evSEjN8w+9IYE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "08c33e87c4829bbdd42b5af247cf7a19e126369f", + "rev": "3a0ebe5d2965692f990cb27e62f501ad35e3deeb", "type": "github" }, "original": { @@ -433,11 +433,11 @@ ] }, "locked": { - "lastModified": 1762067864, - "narHash": "sha256-Q7o8NTYIbGMmMrgrx9PTmmaj/GM/DWJjM6U+daaiiyk=", + "lastModified": 1762131860, + "narHash": "sha256-sIPhzkDrfe6ptthZiwoxQyO6rKd9PgJnl+LOyythQkI=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "68b3775543b442b06a76e498fd342b16a8619757", + "rev": "10e69cb268b1d3dc91135e72f5462b2acfbcc3aa", "type": "github" }, "original": { From 61d053cc1bcfa9c69b1eb7f1516827f38333d45a Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 3 Nov 2025 16:17:30 -0500 Subject: [PATCH 407/724] doom: js things --- home-manager/no-gui.nix | 2 ++ home-manager/progs/doom.d/init.el | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 5739f4e..1a3a276 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -46,6 +46,8 @@ let marksman # markdown lsp typescript-language-server # typescript lsp cmake-language-server # cmake lsp + + typescript ]; java_tools = with pkgs; [ diff --git a/home-manager/progs/doom.d/init.el b/home-manager/progs/doom.d/init.el index 1bc3029..222e08d 100644 --- a/home-manager/progs/doom.d/init.el +++ b/home-manager/progs/doom.d/init.el @@ -143,7 +143,7 @@ json ; At least it ain't XML ;;janet ; Fun fact: Janet is me! (java +lsp) ; the poster child for carpal tunnel syndrome - javascript ; all(hope(abandon(ye(who(enter(here)))))) + (javascript +lsp) ; 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 From e19be9143f57b33f0d0629dcd2d6d7edc8725c6b Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 3 Nov 2025 19:41:51 -0500 Subject: [PATCH 408/724] add btusb kernel module (maybe fixes bluetooth issues?) --- etcnixos/common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/etcnixos/common.nix b/etcnixos/common.nix index d8f0104..8c85f7a 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -117,6 +117,7 @@ "ip_tables" "iptable_nat" "msr" + "btusb" ]; }; From f562baccf53325201285ea3b060ae481616756ae Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 5 Nov 2025 00:18:46 -0500 Subject: [PATCH 409/724] update --- flake.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index c9669ca..ff6f098 100644 --- a/flake.lock +++ b/flake.lock @@ -62,11 +62,11 @@ ] }, "locked": { - "lastModified": 1762189807, - "narHash": "sha256-BM5xwxFQ9tKxWYw2DPezZWcnyTsfj/g42SG4Zd+8WXg=", + "lastModified": 1762308713, + "narHash": "sha256-EaX+Yu/nsPDe+1rv2RSPP/zc5Jotc0HD3XzQVA7LxnI=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "fa9d3723ae196e4e71e17a1c5933a1c0c35245c8", + "rev": "80b800345a4bbe611aafb9f722b2928a12b93222", "type": "github" }, "original": { @@ -169,11 +169,11 @@ ] }, "locked": { - "lastModified": 1762179568, - "narHash": "sha256-sv6YY19xIweeRwos41cvT92+SZcF6d6o4BcSuPnrPwQ=", + "lastModified": 1762205063, + "narHash": "sha256-If6vQ+KvtKs3ARBO9G3l+4wFSCYtRBrwX1z+I+B61wQ=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "cbe4178bf694a9081d51e8ac55e5baadc1d4fa40", + "rev": "88b8a563ff5704f4e8d8e5118fb911fa2110ca05", "type": "github" }, "original": { @@ -196,11 +196,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1762152856, - "narHash": "sha256-U3SDbk7tIwLChpvb3FL66o8V0byaQ2RGMiy/3oLdxTI=", + "lastModified": 1762307471, + "narHash": "sha256-tfT7MtW77rOtu3nfClgJm8FO1E/esoGY7xy+QZ3ob9c=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "df17789929ac80f4157b15724450db6a303a6dc9", + "rev": "0abb5bca37e977cd4d04f95a35b7091adfeea1c3", "type": "github" }, "original": { @@ -254,11 +254,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1762159500, - "narHash": "sha256-8nnHDCOA1oqqnx8GVoNxPjBhIaxIeAv9dV0q/xKMO/o=", + "lastModified": 1762245876, + "narHash": "sha256-xEZqTOyPCX1vjpW42JFPiUQfi/XmB5z+MqF4q+Ka1gw=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "cbd71d6ffc8386cb12e993c778e12d9ac2d989ef", + "rev": "c0aaa1fabedf4d9b63d4321e7eb7b52fc96a3267", "type": "github" }, "original": { @@ -284,11 +284,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1762179181, - "narHash": "sha256-T4+TNfXlF/gHbcNCC2HY7sMGBKgqNzyYeMBWmcbH7/o=", + "lastModified": 1762267440, + "narHash": "sha256-WHjEJ80oYbWyNu0dxysBs5oMlBc5w7YYzL1/UPj4iGo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "256770618502d2eda892af3ae91da5e386ce9586", + "rev": "2e85ae1b7030df39269d29118b1f74944d0c8f15", "type": "github" }, "original": { @@ -362,11 +362,11 @@ ] }, "locked": { - "lastModified": 1762137611, - "narHash": "sha256-sTqb10FR/YQCuGbw16qxliX0NFlYg6evSEjN8w+9IYE=", + "lastModified": 1762310305, + "narHash": "sha256-EW7xlGJnCW3mKujn/F8me52NXB4nBtabArsRNwehtHM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "3a0ebe5d2965692f990cb27e62f501ad35e3deeb", + "rev": "4e8e5dfb8e649d3e05d9a173ce9a9cb0498e89c2", "type": "github" }, "original": { @@ -410,11 +410,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1761622056, - "narHash": "sha256-fBrUszJXmB4MY+wf3QsCnqWHcz7u7fLq0QMAWCltIQg=", + "lastModified": 1762302024, + "narHash": "sha256-F+4W0J5r7fbEl+VmATFqAA5+4dFSNAmLJB7tAtrTIkY=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "0728d59ff6463a502e001fb090f6eb92dbc04756", + "rev": "53b6072bd995b5b4017999cf247f9eb6660c72a2", "type": "github" }, "original": { @@ -433,11 +433,11 @@ ] }, "locked": { - "lastModified": 1762131860, - "narHash": "sha256-sIPhzkDrfe6ptthZiwoxQyO6rKd9PgJnl+LOyythQkI=", + "lastModified": 1762310635, + "narHash": "sha256-yA6dIqFGGHzSFGaFtCDQP70X++2V9d6T8KI7eAnwbWc=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "10e69cb268b1d3dc91135e72f5462b2acfbcc3aa", + "rev": "3a02f3ff6dc3708329e95f17beaa8f30f09d0894", "type": "github" }, "original": { From e97654b11b48bfb430fbe7dccd64e06da98868af Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 5 Nov 2025 13:23:52 -0500 Subject: [PATCH 410/724] update --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index ff6f098..16b83c6 100644 --- a/flake.lock +++ b/flake.lock @@ -39,11 +39,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1760602791, - "narHash": "sha256-voIvrHMgs2zFNtYDxVnyBpmSCE3NFZAhhcZsUneDMLw=", + "lastModified": 1762312706, + "narHash": "sha256-R3I8NErGSCd6kSTUBNe7SNcRDUtJ1xl8zvD13C6SrRg=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "f9664ae058d67b8d97cb8a9c40744fefc3e5479f", + "rev": "ead254e15269bf8564625df4c8d2af6690a0df49", "type": "github" }, "original": { @@ -62,11 +62,11 @@ ] }, "locked": { - "lastModified": 1762308713, - "narHash": "sha256-EaX+Yu/nsPDe+1rv2RSPP/zc5Jotc0HD3XzQVA7LxnI=", + "lastModified": 1762359868, + "narHash": "sha256-FKn8KF2UNbxZIQJ09VitZ/16E8toZN4gM+qqljVf45E=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "80b800345a4bbe611aafb9f722b2928a12b93222", + "rev": "e828183cf33679f67da737218bb7a3b5ab89a5dd", "type": "github" }, "original": { @@ -196,11 +196,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1762307471, - "narHash": "sha256-tfT7MtW77rOtu3nfClgJm8FO1E/esoGY7xy+QZ3ob9c=", + "lastModified": 1762341801, + "narHash": "sha256-zx7UxreMz646qikxw+So7eGRQeWccKFZxuMvJowJuFs=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "0abb5bca37e977cd4d04f95a35b7091adfeea1c3", + "rev": "20aadad64b8b8cbebc71371713c141d91d7f8172", "type": "github" }, "original": { @@ -254,11 +254,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1762245876, - "narHash": "sha256-xEZqTOyPCX1vjpW42JFPiUQfi/XmB5z+MqF4q+Ka1gw=", + "lastModified": 1762332266, + "narHash": "sha256-ex3caQ24O6zrL9TWm73MHudOYiQcEK7L4BEKSV7Yc1M=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "c0aaa1fabedf4d9b63d4321e7eb7b52fc96a3267", + "rev": "dd616d7d3c75b1b0906243531294f5ada3be4e29", "type": "github" }, "original": { @@ -284,11 +284,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1762267440, - "narHash": "sha256-WHjEJ80oYbWyNu0dxysBs5oMlBc5w7YYzL1/UPj4iGo=", + "lastModified": 1762336257, + "narHash": "sha256-2u5rstcMTqpAr4UF+exs5WGOT62VJRb4yauR6JJHJXs=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "2e85ae1b7030df39269d29118b1f74944d0c8f15", + "rev": "d48e8f0e1691e0200a675c13df7c85e275090a15", "type": "github" }, "original": { @@ -300,11 +300,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1761999846, - "narHash": "sha256-IYlYnp4O4dzEpL77BD/lj5NnJy2J8qbHkNSFiPBCbqo=", + "lastModified": 1762233356, + "narHash": "sha256-cGS3lLTYusbEP/IJIWGgnkzIl+FA5xDvtiHyjalGr4k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3de8f8d73e35724bf9abef41f1bdbedda1e14a31", + "rev": "ca534a76c4afb2bdc07b681dbc11b453bab21af8", "type": "github" }, "original": { @@ -433,11 +433,11 @@ ] }, "locked": { - "lastModified": 1762310635, - "narHash": "sha256-yA6dIqFGGHzSFGaFtCDQP70X++2V9d6T8KI7eAnwbWc=", + "lastModified": 1762363692, + "narHash": "sha256-EuNgwhBI8LDDsEkPpOfnZLzvEdKtPmlZxIZKe0GXbqA=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "3a02f3ff6dc3708329e95f17beaa8f30f09d0894", + "rev": "8c6c037d72944da0e327c4bfe1cf5ce9ff0eeba4", "type": "github" }, "original": { From 797235c4ac4c5727c88d709b26f3b597dd709bea Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 7 Nov 2025 02:23:48 -0500 Subject: [PATCH 411/724] doom: fix things --- home-manager/progs/doom.d/init.el | 4 ++-- home-manager/progs/emacs.nix | 18 ++++++++++++------ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/home-manager/progs/doom.d/init.el b/home-manager/progs/doom.d/init.el index 222e08d..523442e 100644 --- a/home-manager/progs/doom.d/init.el +++ b/home-manager/progs/doom.d/init.el @@ -143,7 +143,7 @@ json ; At least it ain't XML ;;janet ; Fun fact: Janet is me! (java +lsp) ; the poster child for carpal tunnel syndrome - (javascript +lsp) ; all(hope(abandon(ye(who(enter(here)))))) + (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 @@ -188,7 +188,7 @@ ;;emms ;;everywhere ; *leave* Emacs!? You must be joking ;;irc ; how neckbeards socialize - (rss +org) ; emacs as an RSS reader + ;;(rss +org) ; emacs as an RSS reader :config ;;literate diff --git a/home-manager/progs/emacs.nix b/home-manager/progs/emacs.nix index c973326..23d722e 100644 --- a/home-manager/progs/emacs.nix +++ b/home-manager/progs/emacs.nix @@ -23,13 +23,19 @@ enable = true; doomDir = ./doom.d; emacs = pkgs.emacs-unstable-pgtk; - extraPackages = epkgs: [ - epkgs.dracula-theme + extraPackages = + epkgs: + [ + epkgs.dracula-theme + ] + ++ (with pkgs; [ + shellcheck + shfmt - pkgs.shellcheck + # for file search + fd - # for file search - pkgs.fd - ]; + pandoc + ]); }; } From 1e3b449a344a6322b758775dc4ecba98796f4459 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 7 Nov 2025 08:28:16 -0500 Subject: [PATCH 412/724] update --- flake.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 16b83c6..e4756eb 100644 --- a/flake.lock +++ b/flake.lock @@ -62,11 +62,11 @@ ] }, "locked": { - "lastModified": 1762359868, - "narHash": "sha256-FKn8KF2UNbxZIQJ09VitZ/16E8toZN4gM+qqljVf45E=", + "lastModified": 1762507632, + "narHash": "sha256-prNQsJ4puBo4h+IAC/elO8Mbygiz3SBeOGB72RqXMsc=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "e828183cf33679f67da737218bb7a3b5ab89a5dd", + "rev": "9e2937bba3c9bf92f0249591f332780de8f290ef", "type": "github" }, "original": { @@ -196,11 +196,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1762341801, - "narHash": "sha256-zx7UxreMz646qikxw+So7eGRQeWccKFZxuMvJowJuFs=", + "lastModified": 1762499019, + "narHash": "sha256-debiIeLJUOxMc0G/cADieAVehxafd7OwyVyyG2Q8XIg=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "20aadad64b8b8cbebc71371713c141d91d7f8172", + "rev": "f4f31ea5bfa24325f4ac34a528937ee1b83e6869", "type": "github" }, "original": { @@ -229,11 +229,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1762146685, - "narHash": "sha256-anRlNG6t7esBbF1+ALDeathVBSclA0PEL52Vo0WnN5g=", + "lastModified": 1762492604, + "narHash": "sha256-cjXYF5+gGaapr6d1Jz70GZQVzK4qzwDUwU86p9+H2mM=", "owner": "YaLTeR", "repo": "niri", - "rev": "a2ca2b3c866bc781b12c334a9f949b3db6d7c943", + "rev": "2144f9a6ae7b675213f9bd86d0989c334baa1c00", "type": "github" }, "original": { @@ -254,11 +254,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1762332266, - "narHash": "sha256-ex3caQ24O6zrL9TWm73MHudOYiQcEK7L4BEKSV7Yc1M=", + "lastModified": 1762505014, + "narHash": "sha256-bztXLrBB9SNtAMGf8lxn5+rjQeRnPZfih8NJKSEyGHY=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "dd616d7d3c75b1b0906243531294f5ada3be4e29", + "rev": "f5e88b4266c68afe6888fc9026511c5450817f13", "type": "github" }, "original": { @@ -284,11 +284,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1762336257, - "narHash": "sha256-2u5rstcMTqpAr4UF+exs5WGOT62VJRb4yauR6JJHJXs=", + "lastModified": 1762463231, + "narHash": "sha256-hv1mG5j5PTbnWbtHHomzTus77pIxsc4x8VrMjc7+/YE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d48e8f0e1691e0200a675c13df7c85e275090a15", + "rev": "52113c4f5cfd1e823001310e56d9c8d0699a6226", "type": "github" }, "original": { @@ -362,11 +362,11 @@ ] }, "locked": { - "lastModified": 1762310305, - "narHash": "sha256-EW7xlGJnCW3mKujn/F8me52NXB4nBtabArsRNwehtHM=", + "lastModified": 1762483116, + "narHash": "sha256-Z8EVsTH10BjCdFyPxbUu5jBV+HGL39rh9+beQcnNRm0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "4e8e5dfb8e649d3e05d9a173ce9a9cb0498e89c2", + "rev": "9de55b59b6aaadbd9dbf223765a835239b767ee5", "type": "github" }, "original": { @@ -410,11 +410,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1762302024, - "narHash": "sha256-F+4W0J5r7fbEl+VmATFqAA5+4dFSNAmLJB7tAtrTIkY=", + "lastModified": 1762488100, + "narHash": "sha256-pD8YqwP0/irHWzJtVElnVljR+OaJPAVbJBwqix+uB5A=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "53b6072bd995b5b4017999cf247f9eb6660c72a2", + "rev": "3cd3edffe1be197326e9314816b16bb4e3d685b1", "type": "github" }, "original": { @@ -433,11 +433,11 @@ ] }, "locked": { - "lastModified": 1762363692, - "narHash": "sha256-EuNgwhBI8LDDsEkPpOfnZLzvEdKtPmlZxIZKe0GXbqA=", + "lastModified": 1762497066, + "narHash": "sha256-pS45age8ZlpDk52kJLjPwoGNJE/XB0LZbyIFte2vtok=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "8c6c037d72944da0e327c4bfe1cf5ce9ff0eeba4", + "rev": "e774c6421714a7a54ed4dfb65d1c936b8728d589", "type": "github" }, "original": { From acdc2f2b9807a38f6bcae2eb86c5b8a51dc5d7f9 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 7 Nov 2025 13:15:33 -0500 Subject: [PATCH 413/724] update --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index e4756eb..962b7e0 100644 --- a/flake.lock +++ b/flake.lock @@ -62,11 +62,11 @@ ] }, "locked": { - "lastModified": 1762507632, - "narHash": "sha256-prNQsJ4puBo4h+IAC/elO8Mbygiz3SBeOGB72RqXMsc=", + "lastModified": 1762532555, + "narHash": "sha256-KfAf3APVExIlap1mIye9ekmhVrgVbltyuJftLn6lQWY=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "9e2937bba3c9bf92f0249591f332780de8f290ef", + "rev": "8b213b6aee69e21a6a3b224274e41417a202c70b", "type": "github" }, "original": { @@ -300,11 +300,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1762233356, - "narHash": "sha256-cGS3lLTYusbEP/IJIWGgnkzIl+FA5xDvtiHyjalGr4k=", + "lastModified": 1762498405, + "narHash": "sha256-Zg/SCgCaAioc0/SVZQJxuECGPJy+OAeBcGeA5okdYDc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ca534a76c4afb2bdc07b681dbc11b453bab21af8", + "rev": "6faeb062ee4cf4f105989d490831713cc5a43ee1", "type": "github" }, "original": { @@ -433,11 +433,11 @@ ] }, "locked": { - "lastModified": 1762497066, - "narHash": "sha256-pS45age8ZlpDk52kJLjPwoGNJE/XB0LZbyIFte2vtok=", + "lastModified": 1762525036, + "narHash": "sha256-vAY2vFmoGM47Fu+fVjOeW/xLJyAGAbd7e/4tB6Vt0QY=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "e774c6421714a7a54ed4dfb65d1c936b8728d589", + "rev": "5499dafb945eaf92d54374ec3f15053f908e2dc9", "type": "github" }, "original": { From 510ef06249337a63d6597133ff781b75aa91da1a Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 9 Nov 2025 23:36:47 -0500 Subject: [PATCH 414/724] update --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 962b7e0..1e4be77 100644 --- a/flake.lock +++ b/flake.lock @@ -62,11 +62,11 @@ ] }, "locked": { - "lastModified": 1762532555, - "narHash": "sha256-KfAf3APVExIlap1mIye9ekmhVrgVbltyuJftLn6lQWY=", + "lastModified": 1762738181, + "narHash": "sha256-XWyYd3UlyID0ClqD9WO/I4EZxOwuWmQnvuPIDOHaOvc=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "8b213b6aee69e21a6a3b224274e41417a202c70b", + "rev": "254ef7fe6f1b78339104b314f2d434fa396720fc", "type": "github" }, "original": { @@ -196,11 +196,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1762499019, - "narHash": "sha256-debiIeLJUOxMc0G/cADieAVehxafd7OwyVyyG2Q8XIg=", + "lastModified": 1762691844, + "narHash": "sha256-hCh64w8kfXnZ/8H7Xpvjns8yBxFKnTO6OJ9954MUbXU=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "f4f31ea5bfa24325f4ac34a528937ee1b83e6869", + "rev": "51f33610ed555bff3b3c80fb634f860f8ba6a85a", "type": "github" }, "original": { @@ -254,11 +254,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1762505014, - "narHash": "sha256-bztXLrBB9SNtAMGf8lxn5+rjQeRnPZfih8NJKSEyGHY=", + "lastModified": 1762677406, + "narHash": "sha256-Wqhq8aOmppXZpmYScBbVCpqRFSlMS5fixgS+oWDsdNs=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "f5e88b4266c68afe6888fc9026511c5450817f13", + "rev": "3df6eefb4a0837874ebc23ca98c7c8eec947f248", "type": "github" }, "original": { @@ -362,11 +362,11 @@ ] }, "locked": { - "lastModified": 1762483116, - "narHash": "sha256-Z8EVsTH10BjCdFyPxbUu5jBV+HGL39rh9+beQcnNRm0=", + "lastModified": 1762742448, + "narHash": "sha256-XMxV0h13gg63s0sV6beihCIqdpcJhtbse6DHI743nvo=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "9de55b59b6aaadbd9dbf223765a835239b767ee5", + "rev": "7f3556887e3375dc26ff1601b57c93ee286f2c5e", "type": "github" }, "original": { @@ -433,11 +433,11 @@ ] }, "locked": { - "lastModified": 1762525036, - "narHash": "sha256-vAY2vFmoGM47Fu+fVjOeW/xLJyAGAbd7e/4tB6Vt0QY=", + "lastModified": 1762748864, + "narHash": "sha256-YgQ80R6TW9GxS0Ozaqe9mTVewuOWqwRmMUhRUpKsoCs=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "5499dafb945eaf92d54374ec3f15053f908e2dc9", + "rev": "02bb5919dab81a3fea4d8d4663ea67922a463cd3", "type": "github" }, "original": { From f264f5f0602cda420cd0902c2bfddc200c186608 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 10 Nov 2025 10:47:07 -0500 Subject: [PATCH 415/724] disable global allowUnfree --- etcnixos/common.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/etcnixos/common.nix b/etcnixos/common.nix index 8c85f7a..255cd80 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -25,8 +25,6 @@ services.tlp.enable = false; services.tuned.enable = true; - nixpkgs.config.allowUnfree = true; - # allow overclocking (I actually underclock but lol) hardware.amdgpu.overdrive.ppfeaturemask = "0xFFF7FFFF"; From ff56f3d91765649ce44097cb87abe0ff319b3e1a Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 10 Nov 2025 12:21:21 -0500 Subject: [PATCH 416/724] update --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 1e4be77..3683f19 100644 --- a/flake.lock +++ b/flake.lock @@ -62,11 +62,11 @@ ] }, "locked": { - "lastModified": 1762738181, - "narHash": "sha256-XWyYd3UlyID0ClqD9WO/I4EZxOwuWmQnvuPIDOHaOvc=", + "lastModified": 1762792048, + "narHash": "sha256-l/riLq0AjVNPRo7JoUm59iIx8JngUvISZgtOrY+YVvE=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "254ef7fe6f1b78339104b314f2d434fa396720fc", + "rev": "bae64fc16ef4294c2f1f13b740f55dd4ab347f96", "type": "github" }, "original": { @@ -196,11 +196,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1762691844, - "narHash": "sha256-hCh64w8kfXnZ/8H7Xpvjns8yBxFKnTO6OJ9954MUbXU=", + "lastModified": 1762783880, + "narHash": "sha256-s8wez34Fu8W0Ok1uGS5HoeZO/iI/uMxdIij+qOg+8G4=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "51f33610ed555bff3b3c80fb634f860f8ba6a85a", + "rev": "415015559d210cc46933512247f1126d4a824d01", "type": "github" }, "original": { @@ -229,11 +229,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1762492604, - "narHash": "sha256-cjXYF5+gGaapr6d1Jz70GZQVzK4qzwDUwU86p9+H2mM=", + "lastModified": 1762777867, + "narHash": "sha256-KAn8ZiGt4xhG4TEQcXVtBs6rlhik77kNuWuJiP5bzd0=", "owner": "YaLTeR", "repo": "niri", - "rev": "2144f9a6ae7b675213f9bd86d0989c334baa1c00", + "rev": "9b11e39890867976e4b26590cf5de085163e3ff6", "type": "github" }, "original": { @@ -254,11 +254,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1762677406, - "narHash": "sha256-Wqhq8aOmppXZpmYScBbVCpqRFSlMS5fixgS+oWDsdNs=", + "lastModified": 1762769782, + "narHash": "sha256-wNOnbHeEfvXaesvQofkHKgfmZOFHSG65dIfmpRK5E3I=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "3df6eefb4a0837874ebc23ca98c7c8eec947f248", + "rev": "c7fd9e387155b5f59de591d473bbcc58b56ab369", "type": "github" }, "original": { @@ -410,11 +410,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1762488100, - "narHash": "sha256-pD8YqwP0/irHWzJtVElnVljR+OaJPAVbJBwqix+uB5A=", + "lastModified": 1762747449, + "narHash": "sha256-Z1TKiux8K09a93w4PFDFsj8HFugXNy3iCC3Z8MpR5Rk=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "3cd3edffe1be197326e9314816b16bb4e3d685b1", + "rev": "6338574bc5c036487486acde264f38f39ea15fad", "type": "github" }, "original": { From 1636a2da516202cbe376ab712d5099a1f3509397 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 11 Nov 2025 00:51:53 -0500 Subject: [PATCH 417/724] update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 3683f19..e9612bc 100644 --- a/flake.lock +++ b/flake.lock @@ -62,11 +62,11 @@ ] }, "locked": { - "lastModified": 1762792048, - "narHash": "sha256-l/riLq0AjVNPRo7JoUm59iIx8JngUvISZgtOrY+YVvE=", + "lastModified": 1762824461, + "narHash": "sha256-nLmxMay/A84TIXt4mKbI3CiQCm5ug9zcIPQGEyOtG6I=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "bae64fc16ef4294c2f1f13b740f55dd4ab347f96", + "rev": "2ca4c8ea31b95d9a6598ae38e35a949b002dff52", "type": "github" }, "original": { @@ -196,11 +196,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1762783880, - "narHash": "sha256-s8wez34Fu8W0Ok1uGS5HoeZO/iI/uMxdIij+qOg+8G4=", + "lastModified": 1762810134, + "narHash": "sha256-eu8Gkb/y/5pRS3Ml/sg3oeUtFFzlJMpDrJRgPgOXz38=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "415015559d210cc46933512247f1126d4a824d01", + "rev": "44c5a2c19b7b22d1b2375ef95f656291a0af3a1b", "type": "github" }, "original": { @@ -229,11 +229,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1762777867, - "narHash": "sha256-KAn8ZiGt4xhG4TEQcXVtBs6rlhik77kNuWuJiP5bzd0=", + "lastModified": 1762804232, + "narHash": "sha256-LCddK36/6u73jed1yuqbu6JKWIITsc42qoM883DgwJg=", "owner": "YaLTeR", "repo": "niri", - "rev": "9b11e39890867976e4b26590cf5de085163e3ff6", + "rev": "978c4e6c8afc0199e2cbd9037bdc7c41fbbab2a3", "type": "github" }, "original": { @@ -300,11 +300,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1762498405, - "narHash": "sha256-Zg/SCgCaAioc0/SVZQJxuECGPJy+OAeBcGeA5okdYDc=", + "lastModified": 1762756533, + "narHash": "sha256-HiRDeUOD1VLklHeOmaKDzf+8Hb7vSWPVFcWwaTrpm+U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6faeb062ee4cf4f105989d490831713cc5a43ee1", + "rev": "c2448301fb856e351aab33e64c33a3fc8bcf637d", "type": "github" }, "original": { @@ -362,11 +362,11 @@ ] }, "locked": { - "lastModified": 1762742448, - "narHash": "sha256-XMxV0h13gg63s0sV6beihCIqdpcJhtbse6DHI743nvo=", + "lastModified": 1762828736, + "narHash": "sha256-RxtFHWZpKwVcWHhx88E2NhWuBbgYVqIoIDynGs5FoJs=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "7f3556887e3375dc26ff1601b57c93ee286f2c5e", + "rev": "8d5baa5628f6dbd7ce6beca3c299bae27755204c", "type": "github" }, "original": { @@ -433,11 +433,11 @@ ] }, "locked": { - "lastModified": 1762748864, - "narHash": "sha256-YgQ80R6TW9GxS0Ozaqe9mTVewuOWqwRmMUhRUpKsoCs=", + "lastModified": 1762835117, + "narHash": "sha256-qwUWaKy+kmTBk6xxMI0yfkD5IU2gcxXOXNPJ2T+Enys=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "02bb5919dab81a3fea4d8d4663ea67922a463cd3", + "rev": "51f5194aff34d130d07f684df2a85b10a3933558", "type": "github" }, "original": { From baa19ac5a896a5bc4cd6d9698c68495b714af479 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 12 Nov 2025 10:11:23 -0500 Subject: [PATCH 418/724] update --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index e9612bc..07bc66e 100644 --- a/flake.lock +++ b/flake.lock @@ -62,11 +62,11 @@ ] }, "locked": { - "lastModified": 1762824461, - "narHash": "sha256-nLmxMay/A84TIXt4mKbI3CiQCm5ug9zcIPQGEyOtG6I=", + "lastModified": 1762938833, + "narHash": "sha256-DAyy8XG0qsbv6JZ+AXTcEA+b9W//pQnNQJBiOzdOO/0=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "2ca4c8ea31b95d9a6598ae38e35a949b002dff52", + "rev": "d144aad6de2aeccf61ba8e3283059f95b93acb24", "type": "github" }, "original": { @@ -196,11 +196,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1762810134, - "narHash": "sha256-eu8Gkb/y/5pRS3Ml/sg3oeUtFFzlJMpDrJRgPgOXz38=", + "lastModified": 1762938849, + "narHash": "sha256-ltM04Wy+vMm/EAwhGTl2BYjCgF+Kq4lltpDH9NEh264=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "44c5a2c19b7b22d1b2375ef95f656291a0af3a1b", + "rev": "ea9b76cfa921d42a7502260b2d1296798089dfe6", "type": "github" }, "original": { @@ -229,11 +229,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1762804232, - "narHash": "sha256-LCddK36/6u73jed1yuqbu6JKWIITsc42qoM883DgwJg=", + "lastModified": 1762881062, + "narHash": "sha256-j0Gxopn4jGYQae/90V2v4u4+Ec+gFLq3UbSaGfczpOM=", "owner": "YaLTeR", "repo": "niri", - "rev": "978c4e6c8afc0199e2cbd9037bdc7c41fbbab2a3", + "rev": "5b77107161c504376b962107913bf74b575703e7", "type": "github" }, "original": { @@ -254,11 +254,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1762769782, - "narHash": "sha256-wNOnbHeEfvXaesvQofkHKgfmZOFHSG65dIfmpRK5E3I=", + "lastModified": 1762937100, + "narHash": "sha256-vVM8PKSd9MRRmeMQ4qOLIhsUtBnEozHXr8e20xvpX78=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "c7fd9e387155b5f59de591d473bbcc58b56ab369", + "rev": "e2cfa1ca0af3e6e5dc01bd5ba478e0c623251504", "type": "github" }, "original": { @@ -284,11 +284,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1762463231, - "narHash": "sha256-hv1mG5j5PTbnWbtHHomzTus77pIxsc4x8VrMjc7+/YE=", + "lastModified": 1762847253, + "narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "52113c4f5cfd1e823001310e56d9c8d0699a6226", + "rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9", "type": "github" }, "original": { @@ -362,11 +362,11 @@ ] }, "locked": { - "lastModified": 1762828736, - "narHash": "sha256-RxtFHWZpKwVcWHhx88E2NhWuBbgYVqIoIDynGs5FoJs=", + "lastModified": 1762915112, + "narHash": "sha256-d9j1g8nKmYDHy+/bIOPQTh9IwjRliqaTM0QLHMV92Ic=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "8d5baa5628f6dbd7ce6beca3c299bae27755204c", + "rev": "aa1e85921cfa04de7b6914982a94621fbec5cc02", "type": "github" }, "original": { @@ -433,11 +433,11 @@ ] }, "locked": { - "lastModified": 1762835117, - "narHash": "sha256-qwUWaKy+kmTBk6xxMI0yfkD5IU2gcxXOXNPJ2T+Enys=", + "lastModified": 1762903129, + "narHash": "sha256-4vxtwKSBiiJ950ccLo8kQvBGwyNjhglOgWI5b/sjGXY=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "51f5194aff34d130d07f684df2a85b10a3933558", + "rev": "d03a5917aef22219df1f97b6da6fe5b8039be8de", "type": "github" }, "original": { From 1ec0d8bc7c5c962e03d34d0b6fc3e1983ca10da2 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 12 Nov 2025 23:34:01 -0500 Subject: [PATCH 419/724] 25.05 -> unstable --- etcnixos/common.nix | 2 +- etcnixos/system-mreow.nix | 18 ------------------ flake.lock | 33 ++++++++++++++++----------------- flake.nix | 4 ++-- home-manager/gui.nix | 2 +- home-manager/no-gui.nix | 19 ++++++++++++------- 6 files changed, 32 insertions(+), 46 deletions(-) diff --git a/etcnixos/common.nix b/etcnixos/common.nix index 255cd80..1c6670e 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -35,7 +35,7 @@ enable = true; settings = { default_session = { - command = "${lib.getExe pkgs.greetd.tuigreet} --time --cmd niri-session"; + command = "${lib.getExe pkgs.tuigreet} --time --cmd niri-session"; user = username; }; }; diff --git a/etcnixos/system-mreow.nix b/etcnixos/system-mreow.nix index f78f65b..834f5a9 100644 --- a/etcnixos/system-mreow.nix +++ b/etcnixos/system-mreow.nix @@ -27,24 +27,6 @@ # PST # time.timeZone = lib.mkForce "America/Los_Angeles"; - services.greetd = { - enable = true; - settings = { - default_session = { - command = "${lib.getExe pkgs.greetd.tuigreet} --time --cmd niri-session"; - user = username; - }; - }; - }; - - 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 = { }; diff --git a/flake.lock b/flake.lock index 07bc66e..97940cb 100644 --- a/flake.lock +++ b/flake.lock @@ -62,11 +62,11 @@ ] }, "locked": { - "lastModified": 1762938833, - "narHash": "sha256-DAyy8XG0qsbv6JZ+AXTcEA+b9W//pQnNQJBiOzdOO/0=", + "lastModified": 1762997295, + "narHash": "sha256-/4kxhVbD/wHVVg9B2srm1NzXEEmEI239JwMtyNYgZQQ=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "d144aad6de2aeccf61ba8e3283059f95b93acb24", + "rev": "4897d454109bd9965a8372363169a5b676753094", "type": "github" }, "original": { @@ -141,16 +141,15 @@ ] }, "locked": { - "lastModified": 1758463745, - "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", + "lastModified": 1762964643, + "narHash": "sha256-RYHN8O/Aja59XDji6WSJZPkJpYVUfpSkyH+PEupBJqM=", "owner": "nix-community", "repo": "home-manager", - "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", + "rev": "827f2a23373a774a8805f84ca5344654c31f354b", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.05", "repo": "home-manager", "type": "github" } @@ -300,16 +299,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1762756533, - "narHash": "sha256-HiRDeUOD1VLklHeOmaKDzf+8Hb7vSWPVFcWwaTrpm+U=", + "lastModified": 1762844143, + "narHash": "sha256-SlybxLZ1/e4T2lb1czEtWVzDCVSTvk9WLwGhmxFmBxI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c2448301fb856e351aab33e64c33a3fc8bcf637d", + "rev": "9da7f1cf7f8a6e2a7cb3001b048546c92a8258b4", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -362,11 +361,11 @@ ] }, "locked": { - "lastModified": 1762915112, - "narHash": "sha256-d9j1g8nKmYDHy+/bIOPQTh9IwjRliqaTM0QLHMV92Ic=", + "lastModified": 1763001554, + "narHash": "sha256-wsfhRTuxu6f06RMmP4JWcq3wWRlmYtQaJZ6b3f+EJ94=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "aa1e85921cfa04de7b6914982a94621fbec5cc02", + "rev": "315d97eb753cee8e1aa039a5e622b84d32a454bb", "type": "github" }, "original": { @@ -433,11 +432,11 @@ ] }, "locked": { - "lastModified": 1762903129, - "narHash": "sha256-4vxtwKSBiiJ950ccLo8kQvBGwyNjhglOgWI5b/sjGXY=", + "lastModified": 1763007974, + "narHash": "sha256-XMgjrDIHonLqIjc1eMQkLeemGcNqqYU0Dq+zNmeMYOI=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "d03a5917aef22219df1f97b6da6fe5b8039be8de", + "rev": "eff1c79c78950ebb4ce70c3d51513e294cf30b52", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 646e224..a5db65c 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "System nixOS flake"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; lanzaboote = { url = "github:nix-community/lanzaboote"; @@ -13,7 +13,7 @@ nixos-hardware.url = "github:NixOS/nixos-hardware/master"; home-manager = { - url = "github:nix-community/home-manager/release-25.05"; + url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/home-manager/gui.nix b/home-manager/gui.nix index 14c7f7b..424f0f9 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -62,7 +62,7 @@ #fonts noto-fonts - noto-fonts-emoji + noto-fonts-color-emoji liberation_ttf #for ebook reading diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 1a3a276..656dc0b 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -157,7 +157,7 @@ in ffmpeg-full # microcontroller tooling - probe-rs + probe-rs-tools (python312.withPackages ( ps: with ps; [ @@ -226,20 +226,19 @@ in 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 = { + settings = { init = { # master -> main defaultBranch = "main"; }; push.autoSetupRemote = true; + user = { + name = "Simon Gardling"; + email = "titaniumtown@proton.me"; + }; }; # gpg signing keys @@ -248,4 +247,10 @@ in signByDefault = true; }; }; + + # better way to view diffs + programs.delta = { + enable = true; + enableGitIntegration = true; + }; } From 5d04a928c6d912eac9fd189ffebf4d76225a7d78 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 12 Nov 2025 23:34:05 -0500 Subject: [PATCH 420/724] opencode --- .gitattributes | 6 ++--- home-manager/no-gui.nix | 1 + home-manager/progs/opencode.nix | 29 ++++++++++++++++++++++++ home-manager/secrets/openrouter_api_key | Bin 0 -> 96 bytes 4 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 home-manager/progs/opencode.nix create mode 100644 home-manager/secrets/openrouter_api_key diff --git a/.gitattributes b/.gitattributes index ca3cf03..78df606 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,2 @@ -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 +/etcnixos/secrets/** filter=git-crypt diff=git-crypt +/home-manager/secrets/** filter=git-crypt diff=git-crypt diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 656dc0b..736328d 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -114,6 +114,7 @@ in imports = [ ./progs/fish.nix ./progs/helix.nix + ./progs/opencode.nix ( { ... }: { diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix new file mode 100644 index 0000000..cac46c6 --- /dev/null +++ b/home-manager/progs/opencode.nix @@ -0,0 +1,29 @@ +{ + config, + lib, + pkgs, + ... +}: +{ + programs.opencode = { + enable = true; + rules = ""; + settings = { + theme = "opencode"; + model = "moonshotai/kimi-k2-thinking"; + autoshare = false; + autoupdate = true; + provider = { + openrouter = { + models = { + # put models here + }; + options = { + # TODO! use agenix here instead + apiKey = "{file:${../secrets/openrouter_api_key}}"; + }; + }; + }; + }; + }; +} diff --git a/home-manager/secrets/openrouter_api_key b/home-manager/secrets/openrouter_api_key new file mode 100644 index 0000000000000000000000000000000000000000..e3113ea97ea1e9e6e1dd0eaa261598e525b9b584 GIT binary patch literal 96 zcmZQ@_Y83kiVO&0_*{H$GW+C!+8-Nyw-u+)h+|$ee@4afde4B(udNk$&P5-eBGdA3 ze)31|!g+tc@;10RMLm3N{jT{} Date: Thu, 13 Nov 2025 00:20:01 -0500 Subject: [PATCH 421/724] eww: update bluetooth status command --- home-manager/progs/eww/config/statusbar.yuck | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/progs/eww/config/statusbar.yuck b/home-manager/progs/eww/config/statusbar.yuck index 866155d..e417d99 100644 --- a/home-manager/progs/eww/config/statusbar.yuck +++ b/home-manager/progs/eww/config/statusbar.yuck @@ -79,7 +79,7 @@ :text "${bluetooth-name} σ°‚―"))) ; `FNR == 1 + head -c 30` so the name doesn't explode the screen -(defpoll bluetooth-name :interval "10s" `bluetoothctl devices Connected | awk 'FNR == 1 {print substr($0,1,30)}'`) +(defpoll bluetooth-name :interval "10s" `bluetoothctl devices Connected | awk '$1 == "Device" {print $0}' | cut -d' ' -f3-`) (defwidget time [] (box From a7579007d2628d8375733b510deda732ffdeace3 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 14 Nov 2025 12:08:53 -0500 Subject: [PATCH 422/724] enable kmscon --- etcnixos/common.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/etcnixos/common.nix b/etcnixos/common.nix index 1c6670e..8c45068 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -31,6 +31,8 @@ hardware.enableRedistributableFirmware = true; hardware.cpu.amd.updateMicrocode = true; + services.kmscon.enable = true; + services.greetd = { enable = true; settings = { From 2cfaef962af7b32abc3e60b44982503154b6407c Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 14 Nov 2025 12:34:43 -0500 Subject: [PATCH 423/724] opencode: kimi k2 thinking -> glm-4.6 --- home-manager/progs/opencode.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index cac46c6..739333e 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -10,7 +10,7 @@ rules = ""; settings = { theme = "opencode"; - model = "moonshotai/kimi-k2-thinking"; + model = "z-ai/glm-4.6"; autoshare = false; autoupdate = true; provider = { From 8e7e09753b7b722ac0f9b08ff8629fa2c17a7edd Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 14 Nov 2025 14:11:18 -0500 Subject: [PATCH 424/724] opencode: add rules --- home-manager/progs/opencode.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index 739333e..51765ba 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -7,7 +7,17 @@ { programs.opencode = { enable = true; - rules = ""; + 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. + + ## Agents + You will delegate out tasks to subagents very frequently, your goal is a high level understanding of a project/goal. + + ## Think deeply about everything. + When given a problem, break it down, abstract it out, understand the fundamentals, then solve it in the real world. + ''; settings = { theme = "opencode"; model = "z-ai/glm-4.6"; From 1d6bbc25b05c3d1b01fdcc6c623164ad93f891a2 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 15 Nov 2025 23:25:49 -0500 Subject: [PATCH 425/724] yarn: delete fancontrol --- etcnixos/system-yarn.nix | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/etcnixos/system-yarn.nix b/etcnixos/system-yarn.nix index d15f976..0124105 100644 --- a/etcnixos/system-yarn.nix +++ b/etcnixos/system-yarn.nix @@ -17,12 +17,6 @@ inputs.nixos-hardware.nixosModules.common-cpu-amd-zenpower ]; networking.hostId = "abf570f9"; - boot = { - kernelModules = [ - # kernel module for case fan control - "nct6775" - ]; - }; # services.openssh = { # enable = true; @@ -49,29 +43,4 @@ systemd.services.lactd.wantedBy = [ "multi-user.target" ]; systemd.services.lactd.serviceConfig.ExecStartPre = "${lib.getExe pkgs.bash} -c \"sleep 3s\""; - - # control case fans with gpu temperature - # I have case fans attached to my gpu for better cooling - hardware.fancontrol = { - enable = false; - 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 - ''; - }; - - systemd.services.fancontrol.serviceConfig.ExecStartPre = "${lib.getExe pkgs.bash} -c \"sleep 3s\""; } From 864dae3aaef0e7d10da44ec27fe4ece6d0d37839 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 15 Nov 2025 23:33:12 -0500 Subject: [PATCH 426/724] yarn: enable sshd --- etcnixos/system-yarn.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/etcnixos/system-yarn.nix b/etcnixos/system-yarn.nix index 0124105..b0035f6 100644 --- a/etcnixos/system-yarn.nix +++ b/etcnixos/system-yarn.nix @@ -18,17 +18,17 @@ ]; networking.hostId = "abf570f9"; - # 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" - # }; - # }; + 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; From 8857fccbdbc0034ee5b60708b5026b3b9949d443 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 16 Nov 2025 01:08:29 -0500 Subject: [PATCH 427/724] vr: remove pr #391367 fix --- etcnixos/vr.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/etcnixos/vr.nix b/etcnixos/vr.nix index 7a3253f..83f3524 100644 --- a/etcnixos/vr.nix +++ b/etcnixos/vr.nix @@ -14,15 +14,6 @@ enable = true; openFirewall = true; - package = ( - # https://github.com/NixOS/nixpkgs/pull/391367 - pkgs.wivrn.overrideAttrs (old: { - cmakeFlags = old.cmakeFlags ++ [ - (lib.cmakeFeature "OPENCOMPOSITE_SEARCH_PATH" "${pkgs.opencomposite}/lib/opencomposite") - ]; - }) - ); - # Write information to /etc/xdg/openxr/1/active_runtime.json, VR applications # will automatically read this and work with wivrn defaultRuntime = true; From 9bbf3f909253675af988675a2fed96d706c656be Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 16 Nov 2025 01:20:41 -0500 Subject: [PATCH 428/724] greetd: terminal.vt = 2 when vt = 1 (default), some dmesg/systemd log messages spammed and overrided the tuigreet tui. --- etcnixos/common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/etcnixos/common.nix b/etcnixos/common.nix index 8c45068..949883e 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -40,6 +40,7 @@ command = "${lib.getExe pkgs.tuigreet} --time --cmd niri-session"; user = username; }; + terminal.vt = lib.mkForce 2; }; }; From 1524b0d801cdcedfdaa6ec0326024605c3780ace Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 16 Nov 2025 01:42:42 -0500 Subject: [PATCH 429/724] integrate power_bat into config --- .../progs/eww/config/scripts/power_bat.rs | 58 +++++++++++++++++++ home-manager/progs/eww/config/statusbar.yuck | 3 +- home-manager/progs/eww/eww.nix | 1 + home-manager/progs/eww/power_bat.nix | 4 ++ 4 files changed, 64 insertions(+), 2 deletions(-) create mode 100755 home-manager/progs/eww/config/scripts/power_bat.rs create mode 100644 home-manager/progs/eww/power_bat.nix diff --git a/home-manager/progs/eww/config/scripts/power_bat.rs b/home-manager/progs/eww/config/scripts/power_bat.rs new file mode 100755 index 0000000..77da27a --- /dev/null +++ b/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 { + 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>(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 + ); +} \ No newline at end of file diff --git a/home-manager/progs/eww/config/statusbar.yuck b/home-manager/progs/eww/config/statusbar.yuck index e417d99..d570301 100644 --- a/home-manager/progs/eww/config/statusbar.yuck +++ b/home-manager/progs/eww/config/statusbar.yuck @@ -92,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 diff --git a/home-manager/progs/eww/eww.nix b/home-manager/progs/eww/eww.nix index 407b208..5419c93 100644 --- a/home-manager/progs/eww/eww.nix +++ b/home-manager/progs/eww/eww.nix @@ -4,6 +4,7 @@ zsh bluez brightnessctl + (callPackage ./power_bat.nix {}) ]; programs.eww = { diff --git a/home-manager/progs/eww/power_bat.nix b/home-manager/progs/eww/power_bat.nix new file mode 100644 index 0000000..ec9f886 --- /dev/null +++ b/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} "$@" +'' From 508ff933c911355da45d156139b4bc336867bb29 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 16 Nov 2025 02:49:37 -0500 Subject: [PATCH 430/724] yarn: impermanence --- etcnixos/hardware_desktop.nix | 29 --------------- etcnixos/impermanence-disk-config.nix | 52 +++++++++++++++++++++++++++ etcnixos/impermanence.nix | 35 ++++++++++++++++++ etcnixos/system-yarn.nix | 11 +++++- flake.lock | 16 +++++++++ flake.nix | 5 +++ 6 files changed, 118 insertions(+), 30 deletions(-) delete mode 100644 etcnixos/hardware_desktop.nix create mode 100644 etcnixos/impermanence-disk-config.nix create mode 100644 etcnixos/impermanence.nix diff --git a/etcnixos/hardware_desktop.nix b/etcnixos/hardware_desktop.nix deleted file mode 100644 index c1e2481..0000000 --- a/etcnixos/hardware_desktop.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - config, - lib, - pkgs, - modulesPath, - ... -}: -{ - 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" ]; - }; - -} diff --git a/etcnixos/impermanence-disk-config.nix b/etcnixos/impermanence-disk-config.nix new file mode 100644 index 0000000..4c091c1 --- /dev/null +++ b/etcnixos/impermanence-disk-config.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; +} diff --git a/etcnixos/impermanence.nix b/etcnixos/impermanence.nix new file mode 100644 index 0000000..2f8600d --- /dev/null +++ b/etcnixos/impermanence.nix @@ -0,0 +1,35 @@ +{ + 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" + ]; + + users.${username} = { + directories = [ + "." + ]; + }; + }; + + systemd.tmpfiles.rules = [ + "d /etc 755 root" + ]; +} diff --git a/etcnixos/system-yarn.nix b/etcnixos/system-yarn.nix index b0035f6..bc499e8 100644 --- a/etcnixos/system-yarn.nix +++ b/etcnixos/system-yarn.nix @@ -8,14 +8,23 @@ }: { imports = [ + ./impermanence-disk-config.nix ./common.nix - ./hardware_desktop.nix + ./impermanence.nix ./no-rgb.nix ./vr.nix inputs.nixos-hardware.nixosModules.common-cpu-amd-pstate inputs.nixos-hardware.nixosModules.common-cpu-amd-zenpower + inputs.impermanence.nixosModules.impermanence + inputs.disko.nixosModules.disko ]; + + fileSystems."/media/games" = { + device = "/dev/disk/by-uuid/1878136e-765d-4784-b204-3536ab4fdac8"; + fsType = "f2fs"; + options = [ "nofail" ]; + }; networking.hostId = "abf570f9"; services.openssh = { diff --git a/flake.lock b/flake.lock index 97940cb..d86b64d 100644 --- a/flake.lock +++ b/flake.lock @@ -154,6 +154,21 @@ "type": "github" } }, + "impermanence": { + "locked": { + "lastModified": 1737831083, + "narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=", + "owner": "nix-community", + "repo": "impermanence", + "rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "impermanence", + "type": "github" + } + }, "lanzaboote": { "inputs": { "crane": "crane", @@ -344,6 +359,7 @@ "disko": "disko", "emacs-overlay": "emacs-overlay", "home-manager": "home-manager", + "impermanence": "impermanence", "lanzaboote": "lanzaboote", "niri": "niri", "nix-doom-emacs-unstraightened": "nix-doom-emacs-unstraightened", diff --git a/flake.nix b/flake.nix index a5db65c..743f7c5 100644 --- a/flake.nix +++ b/flake.nix @@ -52,6 +52,11 @@ inputs.nixpkgs.follows = "nixpkgs"; inputs.emacs-overlay.follows = "emacs-overlay"; }; + + impermanence = { + url = "github:nix-community/impermanence"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = From 6bbf4ce0fdec9c155460dc686a84650dd64fe490 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 16 Nov 2025 15:52:52 -0500 Subject: [PATCH 431/724] yarn: enable ssh as root --- etcnixos/system-yarn.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etcnixos/system-yarn.nix b/etcnixos/system-yarn.nix index bc499e8..efe5e05 100644 --- a/etcnixos/system-yarn.nix +++ b/etcnixos/system-yarn.nix @@ -35,7 +35,7 @@ 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" + PermitRootLogin = "yes"; # "yes", "without-password", "prohibit-password", "forced-commands-only", "no" }; }; From bc28ac1727e7be6f32ad5157440c4af1fd5889d1 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 16 Nov 2025 19:30:08 -0500 Subject: [PATCH 432/724] yarn: deploy-rs --- etcnixos/common.nix | 14 +++- etcnixos/system-yarn.nix | 16 +++-- flake.lock | 130 ++++++++++++++++++++++++++++--------- flake.nix | 16 +++++ home-manager/home-yarn.nix | 73 +++++++++++++++++++++ 5 files changed, 214 insertions(+), 35 deletions(-) diff --git a/etcnixos/common.nix b/etcnixos/common.nix index 949883e..c4e74e2 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -33,11 +33,23 @@ services.kmscon.enable = true; + # Gamescope configuration for Steam Deck-like experience + programs = { + gamescope = { + enable = true; + capSysNice = true; + }; + steam = { + enable = true; + gamescopeSession.enable = true; + }; + }; + services.greetd = { enable = true; settings = { default_session = { - command = "${lib.getExe pkgs.tuigreet} --time --cmd niri-session"; + command = "${lib.getExe pkgs.tuigreet} --sessions --time"; user = username; }; terminal.vt = lib.mkForce 2; diff --git a/etcnixos/system-yarn.nix b/etcnixos/system-yarn.nix index efe5e05..b49d963 100644 --- a/etcnixos/system-yarn.nix +++ b/etcnixos/system-yarn.nix @@ -25,20 +25,26 @@ fsType = "f2fs"; options = [ "nofail" ]; }; + networking.hostId = "abf570f9"; 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 = "yes"; # "yes", "without-password", "prohibit-password", "forced-commands-only", "no" + 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; diff --git a/flake.lock b/flake.lock index d86b64d..11a9cf4 100644 --- a/flake.lock +++ b/flake.lock @@ -15,6 +15,28 @@ "type": "github" } }, + "deploy-rs": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": [ + "nixpkgs" + ], + "utils": "utils" + }, + "locked": { + "lastModified": 1762286984, + "narHash": "sha256-9I2H9x5We6Pl+DBYHjR1s3UT8wgwcpAH03kn9CqtdQc=", + "owner": "serokell", + "repo": "deploy-rs", + "rev": "9c870f63e28ec1e83305f7f6cb73c941e699f74f", + "type": "github" + }, + "original": { + "owner": "serokell", + "repo": "deploy-rs", + "type": "github" + } + }, "disko": { "inputs": { "nixpkgs": [ @@ -62,11 +84,11 @@ ] }, "locked": { - "lastModified": 1762997295, - "narHash": "sha256-/4kxhVbD/wHVVg9B2srm1NzXEEmEI239JwMtyNYgZQQ=", + "lastModified": 1763310170, + "narHash": "sha256-XFB1UvfWL9JgJqBKicGe2f8+cW7zh1yMcgKof8dGlvw=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "4897d454109bd9965a8372363169a5b676753094", + "rev": "d33a3fae28a7f2c8ab0b6bdfd929eb73692ce06a", "type": "github" }, "original": { @@ -76,6 +98,22 @@ } }, "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": 1747046372, @@ -141,11 +179,11 @@ ] }, "locked": { - "lastModified": 1762964643, - "narHash": "sha256-RYHN8O/Aja59XDji6WSJZPkJpYVUfpSkyH+PEupBJqM=", + "lastModified": 1763313531, + "narHash": "sha256-yvdCYUL85zEDp2NzPUBmaNBXP6KnWEOhAk3j7PTfsKw=", "owner": "nix-community", "repo": "home-manager", - "rev": "827f2a23373a774a8805f84ca5344654c31f354b", + "rev": "3670a78eee49deebe4825fc8ecc46b172d1a8391", "type": "github" }, "original": { @@ -172,7 +210,7 @@ "lanzaboote": { "inputs": { "crane": "crane", - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "flake-parts": "flake-parts", "nixpkgs": [ "nixpkgs" @@ -183,11 +221,11 @@ ] }, "locked": { - "lastModified": 1762205063, - "narHash": "sha256-If6vQ+KvtKs3ARBO9G3l+4wFSCYtRBrwX1z+I+B61wQ=", + "lastModified": 1763154177, + "narHash": "sha256-LIIrMS2f2pPT2/BHs8dfGeupI23v5DNcoRz3W+iMsUA=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "88b8a563ff5704f4e8d8e5118fb911fa2110ca05", + "rev": "70be03ab23d0988224e152f5b52e2fbf44a6d8ee", "type": "github" }, "original": { @@ -210,11 +248,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1762938849, - "narHash": "sha256-ltM04Wy+vMm/EAwhGTl2BYjCgF+Kq4lltpDH9NEh264=", + "lastModified": 1763289873, + "narHash": "sha256-vzVbMit/Y8IdSYiN2jal77Bp0uRw3MNqSoqy0l4dYoo=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "ea9b76cfa921d42a7502260b2d1296798089dfe6", + "rev": "13d47ed15fc3d8cc98ad42525e85851faf15a47c", "type": "github" }, "original": { @@ -243,11 +281,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1762881062, - "narHash": "sha256-j0Gxopn4jGYQae/90V2v4u4+Ec+gFLq3UbSaGfczpOM=", + "lastModified": 1763286485, + "narHash": "sha256-noCCGXkqQxHT+Pk723/poMqkbLHPtgENwg/kntlh2mA=", "owner": "YaLTeR", "repo": "niri", - "rev": "5b77107161c504376b962107913bf74b575703e7", + "rev": "9dad215b9f384310dea53fbd1aa8010e42f779f4", "type": "github" }, "original": { @@ -265,14 +303,14 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems" + "systems": "systems_2" }, "locked": { - "lastModified": 1762937100, - "narHash": "sha256-vVM8PKSd9MRRmeMQ4qOLIhsUtBnEozHXr8e20xvpX78=", + "lastModified": 1763282415, + "narHash": "sha256-Blb9l3DjFXjhYOqR7RoA/TQUS7BnBN4VufpRvG4XSlo=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "e2cfa1ca0af3e6e5dc01bd5ba478e0c623251504", + "rev": "b04d4b93dc60bc586224b28564b116f0692ce05c", "type": "github" }, "original": { @@ -314,11 +352,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1762844143, - "narHash": "sha256-SlybxLZ1/e4T2lb1czEtWVzDCVSTvk9WLwGhmxFmBxI=", + "lastModified": 1762977756, + "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9da7f1cf7f8a6e2a7cb3001b048546c92a8258b4", + "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", "type": "github" }, "original": { @@ -356,6 +394,7 @@ }, "root": { "inputs": { + "deploy-rs": "deploy-rs", "disko": "disko", "emacs-overlay": "emacs-overlay", "home-manager": "home-manager", @@ -377,11 +416,11 @@ ] }, "locked": { - "lastModified": 1763001554, - "narHash": "sha256-wsfhRTuxu6f06RMmP4JWcq3wWRlmYtQaJZ6b3f+EJ94=", + "lastModified": 1763260832, + "narHash": "sha256-KMEJ9S7bZLvDIfVu2XdEJTZVYAc/arjFt5KnhGqwCOg=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "315d97eb753cee8e1aa039a5e622b84d32a454bb", + "rev": "c3cea2a0ec0d5debbef4aa2a0cfe59bd0fb0aeeb", "type": "github" }, "original": { @@ -405,6 +444,39 @@ "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" + } + }, + "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": { @@ -448,11 +520,11 @@ ] }, "locked": { - "lastModified": 1763007974, - "narHash": "sha256-XMgjrDIHonLqIjc1eMQkLeemGcNqqYU0Dq+zNmeMYOI=", + "lastModified": 1763317021, + "narHash": "sha256-UOP9AyuBvQCEzGe6u8FxuhnJU2ShUPU4G7z7zraFNoo=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "eff1c79c78950ebb4ce70c3d51513e294cf30b52", + "rev": "db2be18049b9159a33ee7083566040fca4254c03", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 743f7c5..478cb19 100644 --- a/flake.nix +++ b/flake.nix @@ -57,6 +57,11 @@ url = "github:nix-community/impermanence"; inputs.nixpkgs.follows = "nixpkgs"; }; + + deploy-rs = { + url = "github:serokell/deploy-rs"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = @@ -66,6 +71,7 @@ lanzaboote, nixos-hardware, home-manager, + deploy-rs, ... }@inputs: let @@ -78,6 +84,7 @@ in { formatter.${system} = nixpkgs.legacyPackages.${system}.nixfmt-rfc-style; + nixosConfigurations = nixpkgs.lib.foldl' ( config: hostname: config @@ -110,5 +117,14 @@ }; } ) { } hostnames; + + # Deploy-rs configuration for yarn host only + deploy.nodes.yarn = { + hostname = "desktop"; + profiles.system = { + user = "root"; + path = deploy-rs.lib.${system}.activate.nixos self.nixosConfigurations.yarn; + }; + }; }; } diff --git a/home-manager/home-yarn.nix b/home-manager/home-yarn.nix index d6f4614..d47f01d 100644 --- a/home-manager/home-yarn.nix +++ b/home-manager/home-yarn.nix @@ -16,8 +16,81 @@ # https://github.com/NixOS/nixpkgs/pull/339370#issuecomment-2731336341 bs-manager + + # Steam session scripts + (writeShellScriptBin "steam-session" '' + #!/usr/bin/env bash + set -xeuo pipefail + + gamescopeArgs=( + --adaptive-sync # VRR support + --hdr-enabled + --mangoapp # performance overlay + --rt + --steam + ) + + steamArgs=( + -pipewire-dmabuf + -tenfoot + ) + + mangoConfig=( + cpu_temp + gpu_temp + ram + vram + ) + + mangoVars=( + MANGOHUD=1 + MANGOHUD_CONFIG="$(IFS=,; echo "''${mangoConfig[*]}")" + ) + + export "''${mangoVars[@]}" + exec gamescope "''${gamescopeArgs[@]}" -- steam "''${steamArgs[@]}" + '') + + (writeShellScriptBin "steam-session-greetd" '' + #!/usr/bin/env bash + set -xeuo pipefail + + # Set environment variables for Steam gaming session + export STEAM_RUNTIME=1 + export SDL_VIDEODRIVER=wayland + export QT_QPA_PLATFORM=wayland + export GDK_BACKEND=wayland + export XDG_CURRENT_DESKTOP=Steam + export XDG_SESSION_TYPE=wayland + + # Kill any existing compositor + pkill niri || true + + # Start Steam in Big Picture mode with gamescope + exec steam-session + '') ]; + # Create desktop entry for Steam session + xdg.dataFile."wayland-sessions/steam-session.desktop".text = '' + [Desktop Entry] + Name=Steam Session + Comment=Steam Deck-like gaming session with gamescope + Exec=${config.home.homeDirectory}/.nix-profile/bin/steam-session-greetd + Type=Application + DesktopNames=steam + ''; + + # Create desktop entry for Niri session + xdg.dataFile."wayland-sessions/niri-session.desktop".text = '' + [Desktop Entry] + Name=Niri Session + Comment=Niri Wayland compositor + Exec=${config.programs.niri.package}/bin/niri-session + Type=Application + DesktopNames=niri + ''; + programs.obs-studio = { enable = true; plugins = with pkgs.obs-studio-plugins; [ From 7e6ae44b604dd4c09732257e3b02eeba77d6854e Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 16 Nov 2025 19:30:38 -0500 Subject: [PATCH 433/724] yarn: disable vr --- etcnixos/system-yarn.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etcnixos/system-yarn.nix b/etcnixos/system-yarn.nix index b49d963..8c43ed0 100644 --- a/etcnixos/system-yarn.nix +++ b/etcnixos/system-yarn.nix @@ -12,7 +12,7 @@ ./common.nix ./impermanence.nix ./no-rgb.nix - ./vr.nix + # ./vr.nix inputs.nixos-hardware.nixosModules.common-cpu-amd-pstate inputs.nixos-hardware.nixosModules.common-cpu-amd-zenpower From 95be00dcfcd8f67283cb3164693d2a18c8555e95 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 16 Nov 2025 20:02:22 -0500 Subject: [PATCH 434/724] yarn: use sshUser for deploy --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 478cb19..5b4737e 100644 --- a/flake.nix +++ b/flake.nix @@ -122,7 +122,7 @@ deploy.nodes.yarn = { hostname = "desktop"; profiles.system = { - user = "root"; + sshUser = "root"; path = deploy-rs.lib.${system}.activate.nixos self.nixosConfigurations.yarn; }; }; From b703162066efbfcd909b8db3967e5ba3fc716259 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 16 Nov 2025 23:24:41 -0500 Subject: [PATCH 435/724] yarn: add session for steam --- etcnixos/common.nix | 33 ++++++++++++++++++++++++++++++++- etcnixos/steam.nix | 3 +++ home-manager/home-yarn.nix | 20 -------------------- 3 files changed, 35 insertions(+), 21 deletions(-) diff --git a/etcnixos/common.nix b/etcnixos/common.nix index c4e74e2..e8a3af5 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -49,13 +49,44 @@ enable = true; settings = { default_session = { - command = "${lib.getExe pkgs.tuigreet} --sessions --time"; + command = "${lib.getExe pkgs.tuigreet} --sessions /etc/xdg/wayland-sessions/ --time"; user = username; }; terminal.vt = lib.mkForce 2; }; }; + # Create steam session script + environment.etc."steam-session-greetd".source = pkgs.writeShellScript "steam-session-greetd" '' + export STEAM_RUNTIME=1 + export SDL_VIDEODRIVER=wayland + export QT_QPA_PLATFORM=wayland + export GDK_BACKEND=wayland + export XDG_CURRENT_DESKTOP=Steam + export XDG_SESSION_TYPE=wayland + export MANGOHUD=1 + exec ${pkgs.gamescope}/bin/gamescope --adaptive-sync --hdr-enabled --mangoapp --rt --steam -- ${pkgs.steam}/bin/steam -pipewire-dmabuf -tenfoot + ''; + + # Create system-wide session files + environment.etc."xdg/wayland-sessions/steam-session.desktop".text = '' + [Desktop Entry] + Name=Steam Session + Comment=Steam Deck-like gaming session with gamescope + Exec=/etc/steam-session-greetd + Type=Application + DesktopNames=steam + ''; + + environment.etc."xdg/wayland-sessions/niri-session.desktop".text = '' + [Desktop Entry] + Name=Niri Session + Comment=Niri Wayland compositor + Exec=${pkgs.niri}/bin/niri-session + Type=Application + DesktopNames=niri + ''; + system.activationScripts = { # FIX: https://github.com/NixOS/nix/issues/2982 "profile-channel-dummy".text = '' diff --git a/etcnixos/steam.nix b/etcnixos/steam.nix index 94fd12f..2a893c9 100644 --- a/etcnixos/steam.nix +++ b/etcnixos/steam.nix @@ -21,5 +21,8 @@ environment.systemPackages = with pkgs; [ steamtinkerlaunch + mangohud + goverlay + yad ]; } diff --git a/home-manager/home-yarn.nix b/home-manager/home-yarn.nix index d47f01d..07c1660 100644 --- a/home-manager/home-yarn.nix +++ b/home-manager/home-yarn.nix @@ -71,26 +71,6 @@ '') ]; - # Create desktop entry for Steam session - xdg.dataFile."wayland-sessions/steam-session.desktop".text = '' - [Desktop Entry] - Name=Steam Session - Comment=Steam Deck-like gaming session with gamescope - Exec=${config.home.homeDirectory}/.nix-profile/bin/steam-session-greetd - Type=Application - DesktopNames=steam - ''; - - # Create desktop entry for Niri session - xdg.dataFile."wayland-sessions/niri-session.desktop".text = '' - [Desktop Entry] - Name=Niri Session - Comment=Niri Wayland compositor - Exec=${config.programs.niri.package}/bin/niri-session - Type=Application - DesktopNames=niri - ''; - programs.obs-studio = { enable = true; plugins = with pkgs.obs-studio-plugins; [ From e1e7cae5aecf07e722ef162ad14eb829bd035fad Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 17 Nov 2025 08:13:18 -0500 Subject: [PATCH 436/724] update --- flake.lock | 111 +++++++++++++++++++++++++++++++++++------------------ 1 file changed, 74 insertions(+), 37 deletions(-) diff --git a/flake.lock b/flake.lock index 11a9cf4..6220334 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "crane": { "locked": { - "lastModified": 1754269165, - "narHash": "sha256-0tcS8FHd4QjbCVoxN9jI+PjHgA4vc/IjkUSp+N3zy0U=", + "lastModified": 1762538466, + "narHash": "sha256-8zrIPl6J+wLm9MH5ksHcW7BUHo7jSNOu0/hA0ohOOaM=", "owner": "ipetkov", "repo": "crane", - "rev": "444e81206df3f7d92780680e45858e31d2f07a08", + "rev": "0cea393fffb39575c46b7a0318386467272182fe", "type": "github" }, "original": { @@ -84,11 +84,11 @@ ] }, "locked": { - "lastModified": 1763310170, - "narHash": "sha256-XFB1UvfWL9JgJqBKicGe2f8+cW7zh1yMcgKof8dGlvw=", + "lastModified": 1763371146, + "narHash": "sha256-9n/PIfFd2GKhHJzL/VpMqCZ7zxuEii2SqMeYV1sUBOY=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "d33a3fae28a7f2c8ab0b6bdfd929eb73692ce06a", + "rev": "310c28bf9dfb03c2205cdf57ac64a9197d61ecf8", "type": "github" }, "original": { @@ -97,6 +97,28 @@ "type": "github" } }, + "fenix": { + "inputs": { + "nixpkgs": [ + "lanzaboote", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { + "lastModified": 1763361733, + "narHash": "sha256-ka7dpwH3HIXCyD2wl5F7cPLeRbqZoY2ullALsvxdPt8=", + "owner": "nix-community", + "repo": "fenix", + "rev": "6c8d48e3b0ae371b19ac1485744687b788e80193", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -116,11 +138,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { @@ -137,11 +159,11 @@ ] }, "locked": { - "lastModified": 1754091436, - "narHash": "sha256-XKqDMN1/Qj1DKivQvscI4vmHfDfvYR2pfuFOJiCeewM=", + "lastModified": 1762980239, + "narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "67df8c627c2c39c41dbec76a1f201929929ab0bd", + "rev": "52a2caecc898d0b46b2b905f058ccc5081f842da", "type": "github" }, "original": { @@ -210,22 +232,20 @@ "lanzaboote": { "inputs": { "crane": "crane", + "fenix": "fenix", "flake-compat": "flake-compat_2", "flake-parts": "flake-parts", "nixpkgs": [ "nixpkgs" ], - "pre-commit-hooks-nix": "pre-commit-hooks-nix", - "rust-overlay": [ - "rust-overlay" - ] + "pre-commit-hooks-nix": "pre-commit-hooks-nix" }, "locked": { - "lastModified": 1763154177, - "narHash": "sha256-LIIrMS2f2pPT2/BHs8dfGeupI23v5DNcoRz3W+iMsUA=", + "lastModified": 1763376718, + "narHash": "sha256-bIYjIla2w6bzozkohYxsU/BP0hLs9w48ZwxBfg3cShE=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "70be03ab23d0988224e152f5b52e2fbf44a6d8ee", + "rev": "0859944b08039342a9bb069e7edc1e62bb4d0e65", "type": "github" }, "original": { @@ -248,11 +268,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1763289873, - "narHash": "sha256-vzVbMit/Y8IdSYiN2jal77Bp0uRw3MNqSoqy0l4dYoo=", + "lastModified": 1763376268, + "narHash": "sha256-B1IJKNni8sIjMSdtnvgWsDvhb+FpUBIitq8cidysZGo=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "13d47ed15fc3d8cc98ad42525e85851faf15a47c", + "rev": "9b0c42a79bd092971e183d102365e549e4280002", "type": "github" }, "original": { @@ -281,11 +301,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1763286485, - "narHash": "sha256-noCCGXkqQxHT+Pk723/poMqkbLHPtgENwg/kntlh2mA=", + "lastModified": 1763370666, + "narHash": "sha256-Y4IYBfaTxffpm6UIbhY1Xfpij+aVh/C+tF9Tdg6nYig=", "owner": "YaLTeR", "repo": "niri", - "rev": "9dad215b9f384310dea53fbd1aa8010e42f779f4", + "rev": "7f19d268b3563e3683eaca02d9665fed66ce862e", "type": "github" }, "original": { @@ -352,11 +372,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1762977756, - "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", + "lastModified": 1763283776, + "narHash": "sha256-Y7TDFPK4GlqrKrivOcsHG8xSGqQx3A6c+i7novT85Uk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", + "rev": "50a96edd8d0db6cc8db57dab6bb6d6ee1f3dc49a", "type": "github" }, "original": { @@ -379,11 +399,11 @@ ] }, "locked": { - "lastModified": 1750779888, - "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", + "lastModified": 1763319842, + "narHash": "sha256-YG19IyrTdnVn0l3DvcUYm85u3PaqBt6tI6VvolcuHnA=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", + "rev": "7275fa67fbbb75891c16d9dee7d88e58aea2d761", "type": "github" }, "original": { @@ -409,6 +429,23 @@ "zen-browser": "zen-browser" } }, + "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1762860488, + "narHash": "sha256-rMfWMCOo/pPefM2We0iMBLi2kLBAnYoB9thi4qS7uk4=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "2efc80078029894eec0699f62ec8d5c1a56af763", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, "rust-overlay": { "inputs": { "nixpkgs": [ @@ -416,11 +453,11 @@ ] }, "locked": { - "lastModified": 1763260832, - "narHash": "sha256-KMEJ9S7bZLvDIfVu2XdEJTZVYAc/arjFt5KnhGqwCOg=", + "lastModified": 1763347184, + "narHash": "sha256-6QH8hpCYJxifvyHEYg+Da0BotUn03BwLIvYo3JAxuqQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c3cea2a0ec0d5debbef4aa2a0cfe59bd0fb0aeeb", + "rev": "08895cce80433978d5bfd668efa41c5e24578cbd", "type": "github" }, "original": { @@ -520,11 +557,11 @@ ] }, "locked": { - "lastModified": 1763317021, - "narHash": "sha256-UOP9AyuBvQCEzGe6u8FxuhnJU2ShUPU4G7z7zraFNoo=", + "lastModified": 1763353619, + "narHash": "sha256-y30wSzjr7QiO4OVB/Tt7dnLRLIuK2EpaftpKeMMLGu0=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "db2be18049b9159a33ee7083566040fca4254c03", + "rev": "7463345c68cfdd9e92e2d40e390b1a802b0f2add", "type": "github" }, "original": { From 04b7415c946639fa518a0f00f176b8cd6a1b0a8a Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 17 Nov 2025 08:13:29 -0500 Subject: [PATCH 437/724] Revert "yarn: disable vr" This reverts commit ca3242c568f8bb3af20dce7152fc83556aaf7303. --- etcnixos/system-yarn.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etcnixos/system-yarn.nix b/etcnixos/system-yarn.nix index 8c43ed0..b49d963 100644 --- a/etcnixos/system-yarn.nix +++ b/etcnixos/system-yarn.nix @@ -12,7 +12,7 @@ ./common.nix ./impermanence.nix ./no-rgb.nix - # ./vr.nix + ./vr.nix inputs.nixos-hardware.nixosModules.common-cpu-amd-pstate inputs.nixos-hardware.nixosModules.common-cpu-amd-zenpower From 947e284eba830561d409185edcf3edae2aa3d857 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 17 Nov 2025 08:14:55 -0500 Subject: [PATCH 438/724] cleanup flake inputs follows declarations --- flake.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/flake.nix b/flake.nix index 5b4737e..0e2264a 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,6 @@ lanzaboote = { url = "github:nix-community/lanzaboote"; inputs.nixpkgs.follows = "nixpkgs"; - inputs.rust-overlay.follows = "rust-overlay"; }; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; @@ -55,7 +54,6 @@ impermanence = { url = "github:nix-community/impermanence"; - inputs.nixpkgs.follows = "nixpkgs"; }; deploy-rs = { From f430b4de28004c178872d2b24fcf7755e73bc573 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 17 Nov 2025 10:55:11 -0500 Subject: [PATCH 439/724] opencode: use floor model (cheapest) --- home-manager/progs/opencode.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index 51765ba..51c6bad 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -20,7 +20,7 @@ ''; settings = { theme = "opencode"; - model = "z-ai/glm-4.6"; + model = "z-ai/glm-4.6:floor"; autoshare = false; autoupdate = true; provider = { From b61067ba473bcf68f49e553b91ed036b55419333 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 17 Nov 2025 11:33:54 -0500 Subject: [PATCH 440/724] opencode: change small_model + add info about Bash timeout in rules --- home-manager/progs/opencode.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index 51c6bad..45479be 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -17,10 +17,17 @@ ## 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. ''; settings = { theme = "opencode"; + model = "z-ai/glm-4.6:floor"; + # small model used for titles + small_model = "z-ai/glm-4-32b:floor"; + autoshare = false; autoupdate = true; provider = { From 46edea5033170c5101cce144efe18563cd538f3c Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 17 Nov 2025 22:05:33 -0500 Subject: [PATCH 441/724] delete old steam session work --- home-manager/home-yarn.nix | 53 -------------------------------------- 1 file changed, 53 deletions(-) diff --git a/home-manager/home-yarn.nix b/home-manager/home-yarn.nix index 07c1660..d6f4614 100644 --- a/home-manager/home-yarn.nix +++ b/home-manager/home-yarn.nix @@ -16,59 +16,6 @@ # https://github.com/NixOS/nixpkgs/pull/339370#issuecomment-2731336341 bs-manager - - # Steam session scripts - (writeShellScriptBin "steam-session" '' - #!/usr/bin/env bash - set -xeuo pipefail - - gamescopeArgs=( - --adaptive-sync # VRR support - --hdr-enabled - --mangoapp # performance overlay - --rt - --steam - ) - - steamArgs=( - -pipewire-dmabuf - -tenfoot - ) - - mangoConfig=( - cpu_temp - gpu_temp - ram - vram - ) - - mangoVars=( - MANGOHUD=1 - MANGOHUD_CONFIG="$(IFS=,; echo "''${mangoConfig[*]}")" - ) - - export "''${mangoVars[@]}" - exec gamescope "''${gamescopeArgs[@]}" -- steam "''${steamArgs[@]}" - '') - - (writeShellScriptBin "steam-session-greetd" '' - #!/usr/bin/env bash - set -xeuo pipefail - - # Set environment variables for Steam gaming session - export STEAM_RUNTIME=1 - export SDL_VIDEODRIVER=wayland - export QT_QPA_PLATFORM=wayland - export GDK_BACKEND=wayland - export XDG_CURRENT_DESKTOP=Steam - export XDG_SESSION_TYPE=wayland - - # Kill any existing compositor - pkill niri || true - - # Start Steam in Big Picture mode with gamescope - exec steam-session - '') ]; programs.obs-studio = { From e58b549a26437abe47aa7893df9c99515063036f Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 17 Nov 2025 23:52:14 -0500 Subject: [PATCH 442/724] steam: move session stuff to steam.nix + remove mangohud --- etcnixos/common.nix | 22 ---------------------- etcnixos/steam.nix | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/etcnixos/common.nix b/etcnixos/common.nix index e8a3af5..cda51f4 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -56,28 +56,6 @@ }; }; - # Create steam session script - environment.etc."steam-session-greetd".source = pkgs.writeShellScript "steam-session-greetd" '' - export STEAM_RUNTIME=1 - export SDL_VIDEODRIVER=wayland - export QT_QPA_PLATFORM=wayland - export GDK_BACKEND=wayland - export XDG_CURRENT_DESKTOP=Steam - export XDG_SESSION_TYPE=wayland - export MANGOHUD=1 - exec ${pkgs.gamescope}/bin/gamescope --adaptive-sync --hdr-enabled --mangoapp --rt --steam -- ${pkgs.steam}/bin/steam -pipewire-dmabuf -tenfoot - ''; - - # Create system-wide session files - environment.etc."xdg/wayland-sessions/steam-session.desktop".text = '' - [Desktop Entry] - Name=Steam Session - Comment=Steam Deck-like gaming session with gamescope - Exec=/etc/steam-session-greetd - Type=Application - DesktopNames=steam - ''; - environment.etc."xdg/wayland-sessions/niri-session.desktop".text = '' [Desktop Entry] Name=Niri Session diff --git a/etcnixos/steam.nix b/etcnixos/steam.nix index 2a893c9..2cad5d4 100644 --- a/etcnixos/steam.nix +++ b/etcnixos/steam.nix @@ -25,4 +25,26 @@ goverlay yad ]; + + # Create steam session script + environment.etc."steam-session-greetd".source = pkgs.writeShellScript "steam-session-greetd" '' + export STEAM_RUNTIME=1 + export SDL_VIDEODRIVER=wayland + export QT_QPA_PLATFORM=wayland + export GDK_BACKEND=wayland + export XDG_CURRENT_DESKTOP=Steam + export XDG_SESSION_TYPE=wayland + exec ${pkgs.gamescope}/bin/gamescope --adaptive-sync --hdr-enabled --mangoapp --rt --steam -- ${pkgs.steam}/bin/steam -pipewire-dmabuf -tenfoot + ''; + + # Create system-wide session files + environment.etc."xdg/wayland-sessions/steam-session.desktop".text = '' + [Desktop Entry] + Name=Steam Session + Comment=Steam Deck-like gaming session with gamescope + Exec=/etc/steam-session-greetd + Type=Application + DesktopNames=steam + ''; + } From 732ccd46c7da745402d55eb432ede9784c6e21b0 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 17 Nov 2025 23:52:55 -0500 Subject: [PATCH 443/724] niri-session: just use niri-session, not real path --- etcnixos/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etcnixos/common.nix b/etcnixos/common.nix index cda51f4..cad4ab1 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -60,7 +60,7 @@ [Desktop Entry] Name=Niri Session Comment=Niri Wayland compositor - Exec=${pkgs.niri}/bin/niri-session + Exec=niri-session Type=Application DesktopNames=niri ''; From ce48fefe07b9b2249e90645ac49380dc39c9c871 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 18 Nov 2025 13:11:52 -0500 Subject: [PATCH 444/724] update --- flake.lock | 108 ++++++++++++++++++++++------------------------------- 1 file changed, 45 insertions(+), 63 deletions(-) diff --git a/flake.lock b/flake.lock index 6220334..6be1e56 100644 --- a/flake.lock +++ b/flake.lock @@ -84,11 +84,11 @@ ] }, "locked": { - "lastModified": 1763371146, - "narHash": "sha256-9n/PIfFd2GKhHJzL/VpMqCZ7zxuEii2SqMeYV1sUBOY=", + "lastModified": 1763483321, + "narHash": "sha256-HWDUa79LkobXkOWRxY4La8+msU09FijWsvTvjNEHqOc=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "310c28bf9dfb03c2205cdf57ac64a9197d61ecf8", + "rev": "4bb6bffa29ffe387076109ea60abeb32667c79c7", "type": "github" }, "original": { @@ -97,28 +97,6 @@ "type": "github" } }, - "fenix": { - "inputs": { - "nixpkgs": [ - "lanzaboote", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1763361733, - "narHash": "sha256-ka7dpwH3HIXCyD2wl5F7cPLeRbqZoY2ullALsvxdPt8=", - "owner": "nix-community", - "repo": "fenix", - "rev": "6c8d48e3b0ae371b19ac1485744687b788e80193", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -201,11 +179,11 @@ ] }, "locked": { - "lastModified": 1763313531, - "narHash": "sha256-yvdCYUL85zEDp2NzPUBmaNBXP6KnWEOhAk3j7PTfsKw=", + "lastModified": 1763416652, + "narHash": "sha256-8EBEEvtzQ11LCxpQHMNEBQAGtQiCu/pqP9zSovDSbNM=", "owner": "nix-community", "repo": "home-manager", - "rev": "3670a78eee49deebe4825fc8ecc46b172d1a8391", + "rev": "ea164b7c9ccdc2321379c2ff78fd4317b4c41312", "type": "github" }, "original": { @@ -232,20 +210,20 @@ "lanzaboote": { "inputs": { "crane": "crane", - "fenix": "fenix", "flake-compat": "flake-compat_2", "flake-parts": "flake-parts", "nixpkgs": [ "nixpkgs" ], - "pre-commit-hooks-nix": "pre-commit-hooks-nix" + "pre-commit-hooks-nix": "pre-commit-hooks-nix", + "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1763376718, - "narHash": "sha256-bIYjIla2w6bzozkohYxsU/BP0hLs9w48ZwxBfg3cShE=", + "lastModified": 1763485704, + "narHash": "sha256-3er/jo34r75PesrkI939JC0g1MqsMZQZgVtNzSKYoaE=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "0859944b08039342a9bb069e7edc1e62bb4d0e65", + "rev": "1a6b487e3045b916240ca52c22ebb22263bf1cff", "type": "github" }, "original": { @@ -268,11 +246,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1763376268, - "narHash": "sha256-B1IJKNni8sIjMSdtnvgWsDvhb+FpUBIitq8cidysZGo=", + "lastModified": 1763482445, + "narHash": "sha256-UTfApBU4zEQD/vnmAMvr7T2/ysLaeXXCkXqEcr9OTG4=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "9b0c42a79bd092971e183d102365e549e4280002", + "rev": "ea4e51d3476a54253458855a0aae7f9a0fbda89d", "type": "github" }, "original": { @@ -301,11 +279,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1763370666, - "narHash": "sha256-Y4IYBfaTxffpm6UIbhY1Xfpij+aVh/C+tF9Tdg6nYig=", + "lastModified": 1763477637, + "narHash": "sha256-2Povv/mrawCMr2v57P4eC12wAzocQkKXnnk1ThEhpn0=", "owner": "YaLTeR", "repo": "niri", - "rev": "7f19d268b3563e3683eaca02d9665fed66ce862e", + "rev": "d7ce12a5409a53247356f831fb4b4a39f625ad49", "type": "github" }, "original": { @@ -326,11 +304,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1763282415, - "narHash": "sha256-Blb9l3DjFXjhYOqR7RoA/TQUS7BnBN4VufpRvG4XSlo=", + "lastModified": 1763455474, + "narHash": "sha256-26EpEcaKpfYrT9KDJkZzF2Aq9cjQ8IgyjZE+FaosnAY=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "b04d4b93dc60bc586224b28564b116f0692ce05c", + "rev": "6a29ceffa63c9bed771848ad2f7a2dfee82cb88b", "type": "github" }, "original": { @@ -425,30 +403,14 @@ "nix-flatpak": "nix-flatpak", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", - "rust-overlay": "rust-overlay", + "rust-overlay": "rust-overlay_2", "zen-browser": "zen-browser" } }, - "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1762860488, - "narHash": "sha256-rMfWMCOo/pPefM2We0iMBLi2kLBAnYoB9thi4qS7uk4=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "2efc80078029894eec0699f62ec8d5c1a56af763", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, "rust-overlay": { "inputs": { "nixpkgs": [ + "lanzaboote", "nixpkgs" ] }, @@ -466,6 +428,26 @@ "type": "github" } }, + "rust-overlay_2": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1763433504, + "narHash": "sha256-cVid5UNpk88sPYHkLAA5aZEHOFQXSB/2L1vl18Aq7IM=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "42ce16c6d8318a654d53f047c9400b7d902d6e61", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -557,11 +539,11 @@ ] }, "locked": { - "lastModified": 1763353619, - "narHash": "sha256-y30wSzjr7QiO4OVB/Tt7dnLRLIuK2EpaftpKeMMLGu0=", + "lastModified": 1763457799, + "narHash": "sha256-33hJpIuqbn/PHf4VCZAktxDCUxnWLOtMAOyAFd75O9E=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "7463345c68cfdd9e92e2d40e390b1a802b0f2add", + "rev": "85bc80b9d8c8b22ed273163dd7c7adfad9287a5d", "type": "github" }, "original": { From 6f49548d32319196943ffe375a328e60b31de92f Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 20 Nov 2025 22:20:16 -0500 Subject: [PATCH 445/724] eww: format --- home-manager/progs/eww/eww.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/progs/eww/eww.nix b/home-manager/progs/eww/eww.nix index 5419c93..944b140 100644 --- a/home-manager/progs/eww/eww.nix +++ b/home-manager/progs/eww/eww.nix @@ -4,7 +4,7 @@ zsh bluez brightnessctl - (callPackage ./power_bat.nix {}) + (callPackage ./power_bat.nix { }) ]; programs.eww = { From 61f9a87f677c63a4e3fda6031c94602342c45bb0 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 20 Nov 2025 22:20:19 -0500 Subject: [PATCH 446/724] opencode: things --- home-manager/progs/opencode.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index 45479be..f1e42ec 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -12,28 +12,35 @@ 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. - ## Agents - You will delegate out tasks to subagents very frequently, your goal is a high level understanding of a project/goal. - ## 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. + + ## Nix + For using `nix build` for any test, always append `-L --rebuild`. Build results are cached and may not behave as expected. ''; settings = { theme = "opencode"; - model = "z-ai/glm-4.6:floor"; + model = "openrouter/z-ai/glm-4.6"; # small model used for titles - small_model = "z-ai/glm-4-32b:floor"; + small_model = "openrouter/qwen/qwen3-coder-30b-a3b-instruct"; autoshare = false; autoupdate = true; + agent = { + }; provider = { openrouter = { models = { - # put models here + "z-ai/glm-4.6" = { }; + "minimax/minimax-m2" = { }; + "google/gemini-3-pro-preview" = { }; + "anthropic/claude-sonnet-4.5" = { }; + "qwen/qwen3-coder-30b-a3b-instruct" = { }; }; options = { # TODO! use agenix here instead From 7436b530e8036b9663e9ac92665bbb61d7e46b9f Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 20 Nov 2025 22:21:25 -0500 Subject: [PATCH 447/724] update --- flake.lock | 88 +++++++++++++++++++----------------------------------- 1 file changed, 31 insertions(+), 57 deletions(-) diff --git a/flake.lock b/flake.lock index 6be1e56..3497c48 100644 --- a/flake.lock +++ b/flake.lock @@ -84,11 +84,11 @@ ] }, "locked": { - "lastModified": 1763483321, - "narHash": "sha256-HWDUa79LkobXkOWRxY4La8+msU09FijWsvTvjNEHqOc=", + "lastModified": 1763688394, + "narHash": "sha256-NQlu1H2yFMPbXA1cVxpe1NoZEWjQEjA5cOVxcdDxobs=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "4bb6bffa29ffe387076109ea60abeb32667c79c7", + "rev": "0e6a5613f3579105bfed585a8ef76f5113e052c9", "type": "github" }, "original": { @@ -116,11 +116,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -129,32 +129,11 @@ "type": "github" } }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "lanzaboote", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1762980239, - "narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "52a2caecc898d0b46b2b905f058ccc5081f842da", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ "lanzaboote", - "pre-commit-hooks-nix", + "pre-commit", "nixpkgs" ] }, @@ -210,20 +189,18 @@ "lanzaboote": { "inputs": { "crane": "crane", - "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts", "nixpkgs": [ "nixpkgs" ], - "pre-commit-hooks-nix": "pre-commit-hooks-nix", + "pre-commit": "pre-commit", "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1763485704, - "narHash": "sha256-3er/jo34r75PesrkI939JC0g1MqsMZQZgVtNzSKYoaE=", + "lastModified": 1763563389, + "narHash": "sha256-ATuiSBINBTjVXiGOYJAX6ttiDElV9MmjkqG4A8a/J8g=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "1a6b487e3045b916240ca52c22ebb22263bf1cff", + "rev": "b2f781751764ff57d54f7cf1910ae1bbf268ed1c", "type": "github" }, "original": { @@ -246,11 +223,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1763482445, - "narHash": "sha256-UTfApBU4zEQD/vnmAMvr7T2/ysLaeXXCkXqEcr9OTG4=", + "lastModified": 1763662529, + "narHash": "sha256-ecxJlSd4YH9gmzsrtfV7Q+7tQ64J2nLz8v7d2raXo/E=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "ea4e51d3476a54253458855a0aae7f9a0fbda89d", + "rev": "a062c6b4ad79eb62f5d0ecd52c3afe06df776690", "type": "github" }, "original": { @@ -279,11 +256,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1763477637, - "narHash": "sha256-2Povv/mrawCMr2v57P4eC12wAzocQkKXnnk1ThEhpn0=", + "lastModified": 1763574558, + "narHash": "sha256-PdXkgqtbVFdZNhmTrZLTDMGb4zzaSK2RnKUXM8bIDo4=", "owner": "YaLTeR", "repo": "niri", - "rev": "d7ce12a5409a53247356f831fb4b4a39f625ad49", + "rev": "6fcdb9242e65ed5825e7fda2a7935b412588b63a", "type": "github" }, "original": { @@ -304,11 +281,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1763455474, - "narHash": "sha256-26EpEcaKpfYrT9KDJkZzF2Aq9cjQ8IgyjZE+FaosnAY=", + "lastModified": 1763628304, + "narHash": "sha256-2fKeIoO2lfU4qVlnDWXoWUnZ+KVKJazfEPqRgw2sG1g=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "6a29ceffa63c9bed771848ad2f7a2dfee82cb88b", + "rev": "b85e73e7886c7d200d517c91fe66d1dc49ac3053", "type": "github" }, "original": { @@ -350,11 +327,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1763283776, - "narHash": "sha256-Y7TDFPK4GlqrKrivOcsHG8xSGqQx3A6c+i7novT85Uk=", + "lastModified": 1763421233, + "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "50a96edd8d0db6cc8db57dab6bb6d6ee1f3dc49a", + "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648", "type": "github" }, "original": { @@ -364,12 +341,9 @@ "type": "github" } }, - "pre-commit-hooks-nix": { + "pre-commit": { "inputs": { - "flake-compat": [ - "lanzaboote", - "flake-compat" - ], + "flake-compat": "flake-compat_2", "gitignore": "gitignore", "nixpkgs": [ "lanzaboote", @@ -435,11 +409,11 @@ ] }, "locked": { - "lastModified": 1763433504, - "narHash": "sha256-cVid5UNpk88sPYHkLAA5aZEHOFQXSB/2L1vl18Aq7IM=", + "lastModified": 1763692705, + "narHash": "sha256-tCKCyMYU0Vy+ph/xswlNsYXXjnFVweWBV+ew/5FS9tA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "42ce16c6d8318a654d53f047c9400b7d902d6e61", + "rev": "6fbf5d328dce1828d887b8ee7d44a785196a34e7", "type": "github" }, "original": { @@ -539,11 +513,11 @@ ] }, "locked": { - "lastModified": 1763457799, - "narHash": "sha256-33hJpIuqbn/PHf4VCZAktxDCUxnWLOtMAOyAFd75O9E=", + "lastModified": 1763663426, + "narHash": "sha256-txr1cH5j+b14jYGvE0BQE/6OgSyHQqGoeeEFlJz7Q8o=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "85bc80b9d8c8b22ed273163dd7c7adfad9287a5d", + "rev": "34fd0de7cea96cab0307cf07aa5723b60fd775ef", "type": "github" }, "original": { From 4022796403e5c4128c8ffce4a4e0cd1de1526569 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 20 Nov 2025 22:35:20 -0500 Subject: [PATCH 448/724] steam: disable mangoapp --- etcnixos/steam.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etcnixos/steam.nix b/etcnixos/steam.nix index 2cad5d4..ef43b97 100644 --- a/etcnixos/steam.nix +++ b/etcnixos/steam.nix @@ -34,7 +34,7 @@ export GDK_BACKEND=wayland export XDG_CURRENT_DESKTOP=Steam export XDG_SESSION_TYPE=wayland - exec ${pkgs.gamescope}/bin/gamescope --adaptive-sync --hdr-enabled --mangoapp --rt --steam -- ${pkgs.steam}/bin/steam -pipewire-dmabuf -tenfoot + exec ${pkgs.gamescope}/bin/gamescope --adaptive-sync --hdr-enabled --rt --steam -- ${pkgs.steam}/bin/steam -pipewire-dmabuf -tenfoot ''; # Create system-wide session files From acba4cf67f0b203efe3fab9a3af4b5aa515b631f Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 21 Nov 2025 10:14:31 -0500 Subject: [PATCH 449/724] use jovian-nixos + fixup niri display session handling --- etcnixos/common.nix | 27 ++++++----------------- etcnixos/steam.nix | 22 ------------------- etcnixos/system-mreow.nix | 21 ++++++++++++++++++ etcnixos/system-yarn.nix | 14 ++++++++++++ flake.lock | 44 +++++++++++++++++++++++++++++++++++++ flake.nix | 10 ++++++++- home-manager/progs/niri.nix | 3 ++- 7 files changed, 97 insertions(+), 44 deletions(-) diff --git a/etcnixos/common.nix b/etcnixos/common.nix index cad4ab1..0417087 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -6,6 +6,7 @@ system, hostname, inputs, + niri-package, ... }: { @@ -33,6 +34,9 @@ services.kmscon.enable = true; + # Add niri to display manager session packages + services.displayManager.sessionPackages = [ niri-package ]; + # Gamescope configuration for Steam Deck-like experience programs = { gamescope = { @@ -45,26 +49,6 @@ }; }; - services.greetd = { - enable = true; - settings = { - default_session = { - command = "${lib.getExe pkgs.tuigreet} --sessions /etc/xdg/wayland-sessions/ --time"; - user = username; - }; - terminal.vt = lib.mkForce 2; - }; - }; - - environment.etc."xdg/wayland-sessions/niri-session.desktop".text = '' - [Desktop Entry] - Name=Niri Session - Comment=Niri Wayland compositor - Exec=niri-session - Type=Application - DesktopNames=niri - ''; - system.activationScripts = { # FIX: https://github.com/NixOS/nix/issues/2982 "profile-channel-dummy".text = '' @@ -97,6 +81,9 @@ ]; }; + # allow unfree packages for jovian-nixos + nixpkgs.config.allowUnfree = true; + # kernel options boot = { kernelPackages = pkgs.linuxPackages_latest; diff --git a/etcnixos/steam.nix b/etcnixos/steam.nix index ef43b97..2a893c9 100644 --- a/etcnixos/steam.nix +++ b/etcnixos/steam.nix @@ -25,26 +25,4 @@ goverlay yad ]; - - # Create steam session script - environment.etc."steam-session-greetd".source = pkgs.writeShellScript "steam-session-greetd" '' - export STEAM_RUNTIME=1 - export SDL_VIDEODRIVER=wayland - export QT_QPA_PLATFORM=wayland - export GDK_BACKEND=wayland - export XDG_CURRENT_DESKTOP=Steam - export XDG_SESSION_TYPE=wayland - exec ${pkgs.gamescope}/bin/gamescope --adaptive-sync --hdr-enabled --rt --steam -- ${pkgs.steam}/bin/steam -pipewire-dmabuf -tenfoot - ''; - - # Create system-wide session files - environment.etc."xdg/wayland-sessions/steam-session.desktop".text = '' - [Desktop Entry] - Name=Steam Session - Comment=Steam Deck-like gaming session with gamescope - Exec=/etc/steam-session-greetd - Type=Application - DesktopNames=steam - ''; - } diff --git a/etcnixos/system-mreow.nix b/etcnixos/system-mreow.nix index 834f5a9..bac09f7 100644 --- a/etcnixos/system-mreow.nix +++ b/etcnixos/system-mreow.nix @@ -34,4 +34,25 @@ # disable framework kernel module # https://github.com/NixOS/nixos-hardware/issues/1330 hardware.framework.enableKmod = false; + + # Greetd display manager + services.greetd = { + enable = true; + settings = { + default_session = { + command = "${lib.getExe pkgs.tuigreet} --sessions /etc/xdg/wayland-sessions/ --time"; + user = username; + }; + terminal.vt = lib.mkForce 2; + }; + }; + + environment.etc."xdg/wayland-sessions/niri-session.desktop".text = '' + [Desktop Entry] + Name=Niri Session + Comment=Niri Wayland compositor + Exec=niri-session + Type=Application + DesktopNames=niri + ''; } diff --git a/etcnixos/system-yarn.nix b/etcnixos/system-yarn.nix index b49d963..60b2f6c 100644 --- a/etcnixos/system-yarn.nix +++ b/etcnixos/system-yarn.nix @@ -18,6 +18,7 @@ inputs.nixos-hardware.nixosModules.common-cpu-amd-zenpower inputs.impermanence.nixosModules.impermanence inputs.disko.nixosModules.disko + inputs.jovian-nixos.nixosModules.default ]; fileSystems."/media/games" = { @@ -58,4 +59,17 @@ systemd.services.lactd.wantedBy = [ "multi-user.target" ]; systemd.services.lactd.serviceConfig.ExecStartPre = "${lib.getExe pkgs.bash} -c \"sleep 3s\""; + + jovian = { + devices.steamdeck.enable = false; + steam = { + enable = true; + autoStart = true; + desktopSession = "niri"; + user = username; + }; + }; + + # Disable gamescope from common.nix to avoid conflict with jovian-nixos + programs.gamescope.enable = lib.mkForce false; } diff --git a/flake.lock b/flake.lock index 3497c48..b6a192d 100644 --- a/flake.lock +++ b/flake.lock @@ -186,6 +186,27 @@ "type": "github" } }, + "jovian-nixos": { + "inputs": { + "nix-github-actions": "nix-github-actions", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1763640802, + "narHash": "sha256-TAsO9p2cF/Wm6sYWPqvC/mBzMBzG119XLB6T0XwU2NU=", + "owner": "Jovian-Experiments", + "repo": "Jovian-NixOS", + "rev": "4b1c28efe3b31e00c427e651b398d8251dd29812", + "type": "github" + }, + "original": { + "owner": "Jovian-Experiments", + "repo": "Jovian-NixOS", + "type": "github" + } + }, "lanzaboote": { "inputs": { "crane": "crane", @@ -309,6 +330,28 @@ "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": 1762847253, @@ -371,6 +414,7 @@ "emacs-overlay": "emacs-overlay", "home-manager": "home-manager", "impermanence": "impermanence", + "jovian-nixos": "jovian-nixos", "lanzaboote": "lanzaboote", "niri": "niri", "nix-doom-emacs-unstraightened": "nix-doom-emacs-unstraightened", diff --git a/flake.nix b/flake.nix index 0e2264a..3af431d 100644 --- a/flake.nix +++ b/flake.nix @@ -60,6 +60,11 @@ url = "github:serokell/deploy-rs"; inputs.nixpkgs.follows = "nixpkgs"; }; + + jovian-nixos = { + url = "github:Jovian-Experiments/Jovian-NixOS"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = @@ -70,6 +75,7 @@ nixos-hardware, home-manager, deploy-rs, + jovian-nixos, ... }@inputs: let @@ -79,6 +85,7 @@ "mreow" "yarn" ]; + niri-package = inputs.niri.packages.${system}.niri-unstable; in { formatter.${system} = nixpkgs.legacyPackages.${system}.nixfmt-rfc-style; @@ -93,6 +100,7 @@ inputs username hostname + niri-package ; }; modules = [ @@ -103,7 +111,7 @@ # home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.extraSpecialArgs = { - inherit inputs hostname username; + inherit inputs hostname username niri-package; homeDirectory = "/home/${username}"; stateVersion = config.system.stateVersion; }; diff --git a/home-manager/progs/niri.nix b/home-manager/progs/niri.nix index 46f29b7..9f1890f 100644 --- a/home-manager/progs/niri.nix +++ b/home-manager/progs/niri.nix @@ -3,6 +3,7 @@ pkgs, lib, inputs, + niri-package, ... }: let @@ -22,7 +23,7 @@ in ]; programs.niri = { - package = pkgs.niri-unstable; + package = niri-package; settings = { prefer-no-csd = true; From e5585ef68cf03464c1b767c7042ca370ed284794 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 21 Nov 2025 10:34:00 -0500 Subject: [PATCH 450/724] update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index b6a192d..cfeea9e 100644 --- a/flake.lock +++ b/flake.lock @@ -84,11 +84,11 @@ ] }, "locked": { - "lastModified": 1763688394, - "narHash": "sha256-NQlu1H2yFMPbXA1cVxpe1NoZEWjQEjA5cOVxcdDxobs=", + "lastModified": 1763716549, + "narHash": "sha256-nZe4Vl3NOJn6HnWM3LUnnUgWNZiI3CteYusb7WEZ/p0=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "0e6a5613f3579105bfed585a8ef76f5113e052c9", + "rev": "17a8fe835d67419003e7592b14f2208ac018fc36", "type": "github" }, "original": { @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1763640802, - "narHash": "sha256-TAsO9p2cF/Wm6sYWPqvC/mBzMBzG119XLB6T0XwU2NU=", + "lastModified": 1763714684, + "narHash": "sha256-ZNJPAaeSYQTDgvwwE8XHhCz4HiHqYoUyoXdoBE2nxug=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "4b1c28efe3b31e00c427e651b398d8251dd29812", + "rev": "6178d787ee61b8586fdb0ccb8644fbfd5317d0f3", "type": "github" }, "original": { @@ -244,11 +244,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1763662529, - "narHash": "sha256-ecxJlSd4YH9gmzsrtfV7Q+7tQ64J2nLz8v7d2raXo/E=", + "lastModified": 1763729081, + "narHash": "sha256-7v6tHiCUgqXH4J4aFguWxrqR1pJgkN9/yvPo/5Q1ih4=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "a062c6b4ad79eb62f5d0ecd52c3afe06df776690", + "rev": "a340576313f2410b9ab673dd006d9d0fbaf75c8e", "type": "github" }, "original": { @@ -277,11 +277,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1763574558, - "narHash": "sha256-PdXkgqtbVFdZNhmTrZLTDMGb4zzaSK2RnKUXM8bIDo4=", + "lastModified": 1763724970, + "narHash": "sha256-C/L6eK+azCMnOAs4wtHRk+z9XDLKUlMI2Qf2BIwmayU=", "owner": "YaLTeR", "repo": "niri", - "rev": "6fcdb9242e65ed5825e7fda2a7935b412588b63a", + "rev": "07b387df46f36b88548b7067560b25c38dc3a5b4", "type": "github" }, "original": { @@ -302,11 +302,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1763628304, - "narHash": "sha256-2fKeIoO2lfU4qVlnDWXoWUnZ+KVKJazfEPqRgw2sG1g=", + "lastModified": 1763714674, + "narHash": "sha256-sxQVz6ipBpb0AOFinRFb/XXMuEgcE8PfNsl9K70HUDE=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "b85e73e7886c7d200d517c91fe66d1dc49ac3053", + "rev": "9bdf69d16fc8b0e698b51ba6abe53ff27c141579", "type": "github" }, "original": { @@ -534,11 +534,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1762747449, - "narHash": "sha256-Z1TKiux8K09a93w4PFDFsj8HFugXNy3iCC3Z8MpR5Rk=", + "lastModified": 1763704521, + "narHash": "sha256-ceYEV6PnvUN8Zixao4gpPuN+VT3B0SlAXKuPNHZhqUY=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "6338574bc5c036487486acde264f38f39ea15fad", + "rev": "f379ff5722a821212eb59ada9cf8e51cb3654aad", "type": "github" }, "original": { From ae825d0ac3d47f4fd61a795d9354db571c209c20 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 21 Nov 2025 12:19:28 -0500 Subject: [PATCH 451/724] etcnixos -> system --- .gitattributes | 2 +- flake.nix | 2 +- {etcnixos => system}/common.nix | 0 {etcnixos => system}/declarative-nm.nix | 0 {etcnixos => system}/hardware_laptop.nix | 0 {etcnixos => system}/impermanence-disk-config.nix | 0 {etcnixos => system}/impermanence.nix | 0 {etcnixos => system}/networking.nix | 0 {etcnixos => system}/no-rgb.nix | 0 {etcnixos => system}/secrets/disk-password | Bin {etcnixos => system}/secrets/password-hash | Bin {etcnixos => system}/secrets/secureboot.tar | Bin {etcnixos => system}/secrets/wifi-passwords.nix | Bin {etcnixos => system}/steam.nix | 0 {etcnixos => system}/system-mreow.nix | 0 {etcnixos => system}/system-yarn.nix | 0 {etcnixos => system}/vm.nix | 0 {etcnixos => system}/vr.nix | 0 18 files changed, 2 insertions(+), 2 deletions(-) rename {etcnixos => system}/common.nix (100%) rename {etcnixos => system}/declarative-nm.nix (100%) rename {etcnixos => system}/hardware_laptop.nix (100%) rename {etcnixos => system}/impermanence-disk-config.nix (100%) rename {etcnixos => system}/impermanence.nix (100%) rename {etcnixos => system}/networking.nix (100%) rename {etcnixos => system}/no-rgb.nix (100%) rename {etcnixos => system}/secrets/disk-password (100%) rename {etcnixos => system}/secrets/password-hash (100%) rename {etcnixos => system}/secrets/secureboot.tar (100%) rename {etcnixos => system}/secrets/wifi-passwords.nix (100%) rename {etcnixos => system}/steam.nix (100%) rename {etcnixos => system}/system-mreow.nix (100%) rename {etcnixos => system}/system-yarn.nix (100%) rename {etcnixos => system}/vm.nix (100%) rename {etcnixos => system}/vr.nix (100%) diff --git a/.gitattributes b/.gitattributes index 78df606..4037332 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,2 @@ -/etcnixos/secrets/** filter=git-crypt diff=git-crypt +/system/secrets/** filter=git-crypt diff=git-crypt /home-manager/secrets/** filter=git-crypt diff=git-crypt diff --git a/flake.nix b/flake.nix index 3af431d..850f8b4 100644 --- a/flake.nix +++ b/flake.nix @@ -118,7 +118,7 @@ home-manager.users.${username} = import ./home-manager/home-${hostname}.nix; } ) - ./etcnixos/system-${hostname}.nix + ./system/system-${hostname}.nix ]; }; } diff --git a/etcnixos/common.nix b/system/common.nix similarity index 100% rename from etcnixos/common.nix rename to system/common.nix diff --git a/etcnixos/declarative-nm.nix b/system/declarative-nm.nix similarity index 100% rename from etcnixos/declarative-nm.nix rename to system/declarative-nm.nix diff --git a/etcnixos/hardware_laptop.nix b/system/hardware_laptop.nix similarity index 100% rename from etcnixos/hardware_laptop.nix rename to system/hardware_laptop.nix diff --git a/etcnixos/impermanence-disk-config.nix b/system/impermanence-disk-config.nix similarity index 100% rename from etcnixos/impermanence-disk-config.nix rename to system/impermanence-disk-config.nix diff --git a/etcnixos/impermanence.nix b/system/impermanence.nix similarity index 100% rename from etcnixos/impermanence.nix rename to system/impermanence.nix diff --git a/etcnixos/networking.nix b/system/networking.nix similarity index 100% rename from etcnixos/networking.nix rename to system/networking.nix diff --git a/etcnixos/no-rgb.nix b/system/no-rgb.nix similarity index 100% rename from etcnixos/no-rgb.nix rename to system/no-rgb.nix diff --git a/etcnixos/secrets/disk-password b/system/secrets/disk-password similarity index 100% rename from etcnixos/secrets/disk-password rename to system/secrets/disk-password diff --git a/etcnixos/secrets/password-hash b/system/secrets/password-hash similarity index 100% rename from etcnixos/secrets/password-hash rename to system/secrets/password-hash diff --git a/etcnixos/secrets/secureboot.tar b/system/secrets/secureboot.tar similarity index 100% rename from etcnixos/secrets/secureboot.tar rename to system/secrets/secureboot.tar diff --git a/etcnixos/secrets/wifi-passwords.nix b/system/secrets/wifi-passwords.nix similarity index 100% rename from etcnixos/secrets/wifi-passwords.nix rename to system/secrets/wifi-passwords.nix diff --git a/etcnixos/steam.nix b/system/steam.nix similarity index 100% rename from etcnixos/steam.nix rename to system/steam.nix diff --git a/etcnixos/system-mreow.nix b/system/system-mreow.nix similarity index 100% rename from etcnixos/system-mreow.nix rename to system/system-mreow.nix diff --git a/etcnixos/system-yarn.nix b/system/system-yarn.nix similarity index 100% rename from etcnixos/system-yarn.nix rename to system/system-yarn.nix diff --git a/etcnixos/vm.nix b/system/vm.nix similarity index 100% rename from etcnixos/vm.nix rename to system/vm.nix diff --git a/etcnixos/vr.nix b/system/vr.nix similarity index 100% rename from etcnixos/vr.nix rename to system/vr.nix From a03a88a2fd5883c666c5bf53566be38b8328da3c Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 21 Nov 2025 12:29:27 -0500 Subject: [PATCH 452/724] opencode: use llama 3.1 8b for small_model --- home-manager/progs/opencode.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index f1e42ec..82c53d9 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -27,7 +27,7 @@ model = "openrouter/z-ai/glm-4.6"; # small model used for titles - small_model = "openrouter/qwen/qwen3-coder-30b-a3b-instruct"; + small_model = "openrouter/meta-llama/llama-3.1-8b-instruct"; autoshare = false; autoupdate = true; @@ -41,6 +41,7 @@ "google/gemini-3-pro-preview" = { }; "anthropic/claude-sonnet-4.5" = { }; "qwen/qwen3-coder-30b-a3b-instruct" = { }; + "openrouter/meta-llama/llama-3.1-8b-instruct" = { }; }; options = { # TODO! use agenix here instead From 7e2d71f44f43461a27b52aeb2e8f8f2b0e0d574c Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 21 Nov 2025 12:56:19 -0500 Subject: [PATCH 453/724] opencode: modify rules --- home-manager/progs/opencode.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index 82c53d9..308831a 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -19,6 +19,10 @@ 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. + ## Behavior + Do not be sycophantic in your responses. + Do not use emojis unless explicitly asked. + ## Nix For using `nix build` for any test, always append `-L --rebuild`. Build results are cached and may not behave as expected. ''; From 61d6c588b67047a29435a148502c4ff5f076eec4 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 21 Nov 2025 13:31:21 -0500 Subject: [PATCH 454/724] opencode: use gpt-oss 20b for small_model --- home-manager/progs/opencode.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index 308831a..961db70 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -31,7 +31,7 @@ model = "openrouter/z-ai/glm-4.6"; # small model used for titles - small_model = "openrouter/meta-llama/llama-3.1-8b-instruct"; + small_model = "openrouter/openai/gpt-oss-20b"; autoshare = false; autoupdate = true; @@ -45,7 +45,7 @@ "google/gemini-3-pro-preview" = { }; "anthropic/claude-sonnet-4.5" = { }; "qwen/qwen3-coder-30b-a3b-instruct" = { }; - "openrouter/meta-llama/llama-3.1-8b-instruct" = { }; + "openrouter/openai/gpt-oss-20b" = { }; }; options = { # TODO! use agenix here instead From af3d07ca5e0af9ae4b5edb266283acc05adf7584 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 21 Nov 2025 14:14:45 -0500 Subject: [PATCH 455/724] fmt --- flake.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 850f8b4..2bfd51a 100644 --- a/flake.nix +++ b/flake.nix @@ -111,7 +111,12 @@ # home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.extraSpecialArgs = { - inherit inputs hostname username niri-package; + inherit + inputs + hostname + username + niri-package + ; homeDirectory = "/home/${username}"; stateVersion = config.system.stateVersion; }; From 189d74e043a03c45c59dd5f9955b7d95af3294fb Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 23 Nov 2025 14:59:20 -0500 Subject: [PATCH 456/724] update --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index cfeea9e..1d056a2 100644 --- a/flake.lock +++ b/flake.lock @@ -84,11 +84,11 @@ ] }, "locked": { - "lastModified": 1763716549, - "narHash": "sha256-nZe4Vl3NOJn6HnWM3LUnnUgWNZiI3CteYusb7WEZ/p0=", + "lastModified": 1763915029, + "narHash": "sha256-zDTUgZ5Zxpwayn5dBSpxlrg0sPBKzf50Dl5NzG1ff60=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "17a8fe835d67419003e7592b14f2208ac018fc36", + "rev": "dff0bc28c1ac7659de7a00d26e3178fa01c1bda9", "type": "github" }, "original": { @@ -158,11 +158,11 @@ ] }, "locked": { - "lastModified": 1763416652, - "narHash": "sha256-8EBEEvtzQ11LCxpQHMNEBQAGtQiCu/pqP9zSovDSbNM=", + "lastModified": 1763906693, + "narHash": "sha256-inm7paa3myo8gE4TzjM8OPvsEg8xocWreIZBgBPEKgo=", "owner": "nix-community", "repo": "home-manager", - "rev": "ea164b7c9ccdc2321379c2ff78fd4317b4c41312", + "rev": "3d6c1c8fa0bea3a1a7ba23d6fa5993116766073b", "type": "github" }, "original": { @@ -217,11 +217,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1763563389, - "narHash": "sha256-ATuiSBINBTjVXiGOYJAX6ttiDElV9MmjkqG4A8a/J8g=", + "lastModified": 1763915949, + "narHash": "sha256-YNpC4LU9yzClkGua09AUDAJkuVHLpeupBTDHvUafHhw=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "b2f781751764ff57d54f7cf1910ae1bbf268ed1c", + "rev": "0dc06f7c67f5787a4dedfb49399d3106cf73c095", "type": "github" }, "original": { @@ -244,11 +244,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1763729081, - "narHash": "sha256-7v6tHiCUgqXH4J4aFguWxrqR1pJgkN9/yvPo/5Q1ih4=", + "lastModified": 1763926903, + "narHash": "sha256-V6y29WYLeJDBU31CfzkdaBQZ8t1Uu13VpeSDUr/+vg4=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "a340576313f2410b9ab673dd006d9d0fbaf75c8e", + "rev": "cad5e606ba48f4ff0cc5236f2187fc27411b098e", "type": "github" }, "original": { @@ -277,11 +277,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1763724970, - "narHash": "sha256-C/L6eK+azCMnOAs4wtHRk+z9XDLKUlMI2Qf2BIwmayU=", + "lastModified": 1763923333, + "narHash": "sha256-Yzb8d6XBtIj1aPt9RPa4UmRyzELHfPqb/rjbC3pq9SM=", "owner": "YaLTeR", "repo": "niri", - "rev": "07b387df46f36b88548b7067560b25c38dc3a5b4", + "rev": "c558516d4ca54d1ecee6cc8e398c1141f79564d1", "type": "github" }, "original": { @@ -302,11 +302,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1763714674, - "narHash": "sha256-sxQVz6ipBpb0AOFinRFb/XXMuEgcE8PfNsl9K70HUDE=", + "lastModified": 1763800807, + "narHash": "sha256-tK9pVRCXZJ+PULpwp/Dlfcju5xQm/k7b8XL2YQmB9rU=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "9bdf69d16fc8b0e698b51ba6abe53ff27c141579", + "rev": "b24973e36ddb32120af50d99f04db1ff5fdf6374", "type": "github" }, "original": { @@ -370,11 +370,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1763421233, - "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=", + "lastModified": 1763678758, + "narHash": "sha256-+hBiJ+kG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648", + "rev": "117cc7f94e8072499b0a7aa4c52084fa4e11cc9b", "type": "github" }, "original": { @@ -453,11 +453,11 @@ ] }, "locked": { - "lastModified": 1763692705, - "narHash": "sha256-tCKCyMYU0Vy+ph/xswlNsYXXjnFVweWBV+ew/5FS9tA=", + "lastModified": 1763865987, + "narHash": "sha256-DJpzM8Jz3B0azJcAoF+YFHr8rEbxYLJ0wy1kWZ29HOw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "6fbf5d328dce1828d887b8ee7d44a785196a34e7", + "rev": "042d905c01a6eec3bcae8530dacb19cda9758a63", "type": "github" }, "original": { @@ -557,11 +557,11 @@ ] }, "locked": { - "lastModified": 1763663426, - "narHash": "sha256-txr1cH5j+b14jYGvE0BQE/6OgSyHQqGoeeEFlJz7Q8o=", + "lastModified": 1763922466, + "narHash": "sha256-B/jxhKHXFwYBekp/lJsZC+6RV4qOvPgaUYLmz0mpNl4=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "34fd0de7cea96cab0307cf07aa5723b60fd775ef", + "rev": "88d00b7d2fca281d674bb347282784bfe6ff27d6", "type": "github" }, "original": { From 44700240a05a7fdde0c25d3c446f56d342bbb9ca Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 24 Nov 2025 10:35:31 -0500 Subject: [PATCH 457/724] update --- flake.lock | 72 +++++++++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/flake.lock b/flake.lock index 1d056a2..1c216c3 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "crane": { "locked": { - "lastModified": 1762538466, - "narHash": "sha256-8zrIPl6J+wLm9MH5ksHcW7BUHo7jSNOu0/hA0ohOOaM=", + "lastModified": 1763938834, + "narHash": "sha256-j8iB0Yr4zAvQLueCZ5abxfk6fnG/SJ5JnGUziETjwfg=", "owner": "ipetkov", "repo": "crane", - "rev": "0cea393fffb39575c46b7a0318386467272182fe", + "rev": "d9e753122e51cee64eb8d2dddfe11148f339f5a2", "type": "github" }, "original": { @@ -84,11 +84,11 @@ ] }, "locked": { - "lastModified": 1763915029, - "narHash": "sha256-zDTUgZ5Zxpwayn5dBSpxlrg0sPBKzf50Dl5NzG1ff60=", + "lastModified": 1763977942, + "narHash": "sha256-Dhi5xNbhZI/GNKgxun7ckVCwLYepuWwMIPn8dYFJl0E=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "dff0bc28c1ac7659de7a00d26e3178fa01c1bda9", + "rev": "f87351a238ddda570226360a8e0725fc2d75f273", "type": "github" }, "original": { @@ -158,11 +158,11 @@ ] }, "locked": { - "lastModified": 1763906693, - "narHash": "sha256-inm7paa3myo8gE4TzjM8OPvsEg8xocWreIZBgBPEKgo=", + "lastModified": 1763997646, + "narHash": "sha256-hLIvcdKAtwt5eZchw+7AZFXx3NniHPbZ7puYruofsD8=", "owner": "nix-community", "repo": "home-manager", - "rev": "3d6c1c8fa0bea3a1a7ba23d6fa5993116766073b", + "rev": "b9c0dae3e474631d4813c685187f5b4e01c34d39", "type": "github" }, "original": { @@ -217,11 +217,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1763915949, - "narHash": "sha256-YNpC4LU9yzClkGua09AUDAJkuVHLpeupBTDHvUafHhw=", + "lastModified": 1763975256, + "narHash": "sha256-IhdDL+0YwlLz5Ty0EnAxWN/btemN9FxcQbYs/V/8jvs=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "0dc06f7c67f5787a4dedfb49399d3106cf73c095", + "rev": "6803b15c4ab9df2dcc478254b4adb55524746ac7", "type": "github" }, "original": { @@ -244,11 +244,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1763926903, - "narHash": "sha256-V6y29WYLeJDBU31CfzkdaBQZ8t1Uu13VpeSDUr/+vg4=", + "lastModified": 1763995371, + "narHash": "sha256-Cbekq2OAWevdTayYMO7SCf05aGHPZ236MTyCkKyYZOs=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "cad5e606ba48f4ff0cc5236f2187fc27411b098e", + "rev": "c4fb0f9d13fadf1b3c33e693509d8cdcbbd7d08e", "type": "github" }, "original": { @@ -277,11 +277,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1763923333, - "narHash": "sha256-Yzb8d6XBtIj1aPt9RPa4UmRyzELHfPqb/rjbC3pq9SM=", + "lastModified": 1763990232, + "narHash": "sha256-RdtlZ+nufSwEgNsF0yuTOO2eGpn87Qm9b3tRQPsibH4=", "owner": "YaLTeR", "repo": "niri", - "rev": "c558516d4ca54d1ecee6cc8e398c1141f79564d1", + "rev": "45b45ac29d654c0e6759ab996c69dfde40053536", "type": "github" }, "original": { @@ -302,11 +302,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1763800807, - "narHash": "sha256-tK9pVRCXZJ+PULpwp/Dlfcju5xQm/k7b8XL2YQmB9rU=", + "lastModified": 1763980357, + "narHash": "sha256-o39Zr+uZ01yq217KAQTUxO8k9gN7PLKYmoK1UTQ7eBc=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "b24973e36ddb32120af50d99f04db1ff5fdf6374", + "rev": "817bc5de1ebd1045f591ae1e7cb67e78e098019c", "type": "github" }, "original": { @@ -370,11 +370,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1763678758, - "narHash": "sha256-+hBiJ+kG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s=", + "lastModified": 1763835633, + "narHash": "sha256-HzxeGVID5MChuCPESuC0dlQL1/scDKu+MmzoVBJxulM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "117cc7f94e8072499b0a7aa4c52084fa4e11cc9b", + "rev": "050e09e091117c3d7328c7b2b7b577492c43c134", "type": "github" }, "original": { @@ -394,11 +394,11 @@ ] }, "locked": { - "lastModified": 1763319842, - "narHash": "sha256-YG19IyrTdnVn0l3DvcUYm85u3PaqBt6tI6VvolcuHnA=", + "lastModified": 1763741496, + "narHash": "sha256-uIRqs/H18YEtMOn1OkbnPH+aNTwXKx+iU3qnxEkVUd0=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "7275fa67fbbb75891c16d9dee7d88e58aea2d761", + "rev": "20e71a403c5de9ce5bd799031440da9728c1cda1", "type": "github" }, "original": { @@ -433,11 +433,11 @@ ] }, "locked": { - "lastModified": 1763347184, - "narHash": "sha256-6QH8hpCYJxifvyHEYg+Da0BotUn03BwLIvYo3JAxuqQ=", + "lastModified": 1763865987, + "narHash": "sha256-DJpzM8Jz3B0azJcAoF+YFHr8rEbxYLJ0wy1kWZ29HOw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "08895cce80433978d5bfd668efa41c5e24578cbd", + "rev": "042d905c01a6eec3bcae8530dacb19cda9758a63", "type": "github" }, "original": { @@ -453,11 +453,11 @@ ] }, "locked": { - "lastModified": 1763865987, - "narHash": "sha256-DJpzM8Jz3B0azJcAoF+YFHr8rEbxYLJ0wy1kWZ29HOw=", + "lastModified": 1763952169, + "narHash": "sha256-+PeDBD8P+NKauH+w7eO/QWCIp8Cx4mCfWnh9sJmy9CM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "042d905c01a6eec3bcae8530dacb19cda9758a63", + "rev": "ab726555a9a72e6dc80649809147823a813fa95b", "type": "github" }, "original": { @@ -557,11 +557,11 @@ ] }, "locked": { - "lastModified": 1763922466, - "narHash": "sha256-B/jxhKHXFwYBekp/lJsZC+6RV4qOvPgaUYLmz0mpNl4=", + "lastModified": 1763958868, + "narHash": "sha256-IOP3fAjawH68FL1RDakySNRK6XNYdZajX538Q3U58Y0=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "88d00b7d2fca281d674bb347282784bfe6ff27d6", + "rev": "15db6bda557066f3525010209bde4ec5f968f2ba", "type": "github" }, "original": { From a6d0fbf4b8b44fd476dfa9dcd3b837bbbc96e8fd Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 24 Nov 2025 11:44:39 -0500 Subject: [PATCH 458/724] nix: re-enable optimise store --- system/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/common.nix b/system/common.nix index 0417087..e584510 100644 --- a/system/common.nix +++ b/system/common.nix @@ -72,7 +72,7 @@ nix = { # optimize the store - optimise.automatic = false; + optimise.automatic = true; # enable flakes! settings.experimental-features = [ From 3bcb62f8158bba0ff3cd55cf188f64e923d47a37 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 24 Nov 2025 16:43:12 -0500 Subject: [PATCH 459/724] nixpkgs: patching test --- ...eat-make-boot-messages-configureable.patch | 118 ++++++++++++++++++ flake.nix | 18 ++- 2 files changed, 132 insertions(+), 4 deletions(-) create mode 100644 0001-feat-make-boot-messages-configureable.patch diff --git a/0001-feat-make-boot-messages-configureable.patch b/0001-feat-make-boot-messages-configureable.patch new file mode 100644 index 0000000..f8005b6 --- /dev/null +++ b/0001-feat-make-boot-messages-configureable.patch @@ -0,0 +1,118 @@ +From 35d194ebf61d1fc29bc3759249dae5dd6096a5c0 Mon Sep 17 00:00:00 2001 +From: Simon Gardling +Date: Mon, 24 Nov 2025 15:06:26 -0500 +Subject: [PATCH] feat: make boot messages configureable + +--- + nixos/modules/system/boot/stage-1-init.sh | 4 ++-- + nixos/modules/system/boot/stage-1.nix | 21 ++++++++++++++++++++- + nixos/modules/system/boot/stage-2-init.sh | 2 +- + nixos/modules/system/boot/stage-2.nix | 11 ++++++++++- + 4 files changed, 33 insertions(+), 5 deletions(-) + +diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh +index b8dbfb70c0bb..09ef663dbb6f 100644 +--- a/nixos/modules/system/boot/stage-1-init.sh ++++ b/nixos/modules/system/boot/stage-1-init.sh +@@ -73,7 +73,7 @@ trap 'fail' 0 + + # Print a greeting. + info +-info "<<< @distroName@ Stage 1 >>>" ++info "[1;32m@stage1Greeting@[0m" + info + + # Make several required directories. +@@ -445,7 +445,7 @@ lustrateRoot () { + local root="$1" + + echo +- echo -e "\e[1;33m<<< @distroName@ is now lustrating the root filesystem (cruft goes to /old-root) >>>\e[0m" ++ echo -e "\\e[1;33m@lustrateMessage@\\e[0m" + echo + + mkdir -m 0755 -p "$root/old-root.tmp" +diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix +index c87b3ecef4da..434e33ee8b70 100644 +--- a/nixos/modules/system/boot/stage-1.nix ++++ b/nixos/modules/system/boot/stage-1.nix +@@ -309,7 +309,8 @@ let + + inherit (config.boot) resumeDevice; + +- inherit (config.system.nixos) distroName; ++ stage1Greeting = config.boot.initrd.stage1Greeting; ++ lustrateMessage = config.boot.initrd.lustrateMessage; + + inherit (config.system.build) earlyMountScript; + +@@ -686,6 +687,24 @@ in + ''; + }; + ++ boot.initrd.stage1Greeting = mkOption { ++ type = types.str; ++ default = "<<< ${config.system.nixos.distroName} Stage 1 >>>"; ++ defaultText = lib.literalExpression ''"<<< ''${config.system.nixos.distroName} Stage 1 >>>"''; ++ description = '' ++ The greeting message displayed during NixOS stage 1 boot. ++ ''; ++ }; ++ ++ boot.initrd.lustrateMessage = mkOption { ++ type = types.str; ++ default = "<<< ${config.system.nixos.distroName} is now lustrating the root filesystem (cruft goes to /old-root) >>>"; ++ defaultText = lib.literalExpression ''"<<< ''${config.system.nixos.distroName} is now lustrating the root filesystem (cruft goes to /old-root) >>>"''; ++ description = '' ++ The message displayed when lustrating the root filesystem. ++ ''; ++ }; ++ + boot.loader.supportsInitrdSecrets = mkOption { + internal = true; + default = false; +diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh +index e960f1bbcc39..c9884a719012 100755 +--- a/nixos/modules/system/boot/stage-2-init.sh ++++ b/nixos/modules/system/boot/stage-2-init.sh +@@ -19,7 +19,7 @@ if [ "${IN_NIXOS_SYSTEMD_STAGE1:-}" != true ]; then + + # Print a greeting. + echo +- echo -e "\e[1;32m<<< @distroName@ Stage 2 >>>\e[0m" ++ echo -e "\\e[1;32m@stage2Greeting@\\e[0m" + echo + + +diff --git a/nixos/modules/system/boot/stage-2.nix b/nixos/modules/system/boot/stage-2.nix +index 9565ac5e8ef1..993f4415cf24 100644 +--- a/nixos/modules/system/boot/stage-2.nix ++++ b/nixos/modules/system/boot/stage-2.nix +@@ -19,7 +19,7 @@ let + systemConfig = null; # replaced in ../activation/top-level.nix + inherit (config.boot) systemdExecutable; + nixStoreMountOpts = lib.concatStringsSep " " (map lib.escapeShellArg config.boot.nixStoreMountOpts); +- inherit (config.system.nixos) distroName; ++ stage2Greeting = config.boot.stage2Greeting; + inherit useHostResolvConf; + inherit (config.system.build) earlyMountScript; + path = lib.makeBinPath ( +@@ -87,6 +87,15 @@ in + ''; + }; + ++ stage2Greeting = mkOption { ++ type = types.str; ++ default = "<<< ${config.system.nixos.distroName} Stage 2 >>>"; ++ defaultText = lib.literalExpression ''"<<< ''${config.system.nixos.distroName} Stage 2 >>>"''; ++ description = '' ++ The greeting message displayed during NixOS stage 2 boot. ++ ''; ++ }; ++ + extraSystemdUnitPaths = mkOption { + default = [ ]; + type = types.listOf types.str; +-- +2.51.2 + diff --git a/flake.nix b/flake.nix index 2bfd51a..3518bac 100644 --- a/flake.nix +++ b/flake.nix @@ -70,7 +70,6 @@ outputs = { self, - nixpkgs, lanzaboote, nixos-hardware, home-manager, @@ -86,15 +85,26 @@ "yarn" ]; niri-package = inputs.niri.packages.${system}.niri-unstable; + + patchedNixpkgsSrc = (import inputs.nixpkgs { inherit system; }).applyPatches { + name = "nixpkgs-patched"; + src = inputs.nixpkgs; + patches = [ ./0001-feat-make-boot-messages-configureable.patch ]; + }; + + patchedNixpkgs = import patchedNixpkgsSrc { inherit system; }; in { - formatter.${system} = nixpkgs.legacyPackages.${system}.nixfmt-rfc-style; + formatter.${system} = patchedNixpkgs.nixfmt-rfc-style; - nixosConfigurations = nixpkgs.lib.foldl' ( + nixosConfigurations = patchedNixpkgs.lib.foldl' ( config: hostname: config // { - "${hostname}" = nixpkgs.lib.nixosSystem { + "${hostname}" = import "${patchedNixpkgsSrc}/nixos/lib/eval-config.nix" { + lib = patchedNixpkgs.lib; + baseModules = import "${patchedNixpkgsSrc}/nixos/modules/module-list.nix"; + inherit system; specialArgs = { inherit inputs From a876c4d0a943b55e93fcfb3b8778a3a8bd80b729 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 24 Nov 2025 16:43:16 -0500 Subject: [PATCH 460/724] Revert "nixpkgs: patching test" This reverts commit 6204949bdcd106a328fa9fccd779aa99a4753713. --- ...eat-make-boot-messages-configureable.patch | 118 ------------------ flake.nix | 18 +-- 2 files changed, 4 insertions(+), 132 deletions(-) delete mode 100644 0001-feat-make-boot-messages-configureable.patch diff --git a/0001-feat-make-boot-messages-configureable.patch b/0001-feat-make-boot-messages-configureable.patch deleted file mode 100644 index f8005b6..0000000 --- a/0001-feat-make-boot-messages-configureable.patch +++ /dev/null @@ -1,118 +0,0 @@ -From 35d194ebf61d1fc29bc3759249dae5dd6096a5c0 Mon Sep 17 00:00:00 2001 -From: Simon Gardling -Date: Mon, 24 Nov 2025 15:06:26 -0500 -Subject: [PATCH] feat: make boot messages configureable - ---- - nixos/modules/system/boot/stage-1-init.sh | 4 ++-- - nixos/modules/system/boot/stage-1.nix | 21 ++++++++++++++++++++- - nixos/modules/system/boot/stage-2-init.sh | 2 +- - nixos/modules/system/boot/stage-2.nix | 11 ++++++++++- - 4 files changed, 33 insertions(+), 5 deletions(-) - -diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh -index b8dbfb70c0bb..09ef663dbb6f 100644 ---- a/nixos/modules/system/boot/stage-1-init.sh -+++ b/nixos/modules/system/boot/stage-1-init.sh -@@ -73,7 +73,7 @@ trap 'fail' 0 - - # Print a greeting. - info --info "<<< @distroName@ Stage 1 >>>" -+info "[1;32m@stage1Greeting@[0m" - info - - # Make several required directories. -@@ -445,7 +445,7 @@ lustrateRoot () { - local root="$1" - - echo -- echo -e "\e[1;33m<<< @distroName@ is now lustrating the root filesystem (cruft goes to /old-root) >>>\e[0m" -+ echo -e "\\e[1;33m@lustrateMessage@\\e[0m" - echo - - mkdir -m 0755 -p "$root/old-root.tmp" -diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix -index c87b3ecef4da..434e33ee8b70 100644 ---- a/nixos/modules/system/boot/stage-1.nix -+++ b/nixos/modules/system/boot/stage-1.nix -@@ -309,7 +309,8 @@ let - - inherit (config.boot) resumeDevice; - -- inherit (config.system.nixos) distroName; -+ stage1Greeting = config.boot.initrd.stage1Greeting; -+ lustrateMessage = config.boot.initrd.lustrateMessage; - - inherit (config.system.build) earlyMountScript; - -@@ -686,6 +687,24 @@ in - ''; - }; - -+ boot.initrd.stage1Greeting = mkOption { -+ type = types.str; -+ default = "<<< ${config.system.nixos.distroName} Stage 1 >>>"; -+ defaultText = lib.literalExpression ''"<<< ''${config.system.nixos.distroName} Stage 1 >>>"''; -+ description = '' -+ The greeting message displayed during NixOS stage 1 boot. -+ ''; -+ }; -+ -+ boot.initrd.lustrateMessage = mkOption { -+ type = types.str; -+ default = "<<< ${config.system.nixos.distroName} is now lustrating the root filesystem (cruft goes to /old-root) >>>"; -+ defaultText = lib.literalExpression ''"<<< ''${config.system.nixos.distroName} is now lustrating the root filesystem (cruft goes to /old-root) >>>"''; -+ description = '' -+ The message displayed when lustrating the root filesystem. -+ ''; -+ }; -+ - boot.loader.supportsInitrdSecrets = mkOption { - internal = true; - default = false; -diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh -index e960f1bbcc39..c9884a719012 100755 ---- a/nixos/modules/system/boot/stage-2-init.sh -+++ b/nixos/modules/system/boot/stage-2-init.sh -@@ -19,7 +19,7 @@ if [ "${IN_NIXOS_SYSTEMD_STAGE1:-}" != true ]; then - - # Print a greeting. - echo -- echo -e "\e[1;32m<<< @distroName@ Stage 2 >>>\e[0m" -+ echo -e "\\e[1;32m@stage2Greeting@\\e[0m" - echo - - -diff --git a/nixos/modules/system/boot/stage-2.nix b/nixos/modules/system/boot/stage-2.nix -index 9565ac5e8ef1..993f4415cf24 100644 ---- a/nixos/modules/system/boot/stage-2.nix -+++ b/nixos/modules/system/boot/stage-2.nix -@@ -19,7 +19,7 @@ let - systemConfig = null; # replaced in ../activation/top-level.nix - inherit (config.boot) systemdExecutable; - nixStoreMountOpts = lib.concatStringsSep " " (map lib.escapeShellArg config.boot.nixStoreMountOpts); -- inherit (config.system.nixos) distroName; -+ stage2Greeting = config.boot.stage2Greeting; - inherit useHostResolvConf; - inherit (config.system.build) earlyMountScript; - path = lib.makeBinPath ( -@@ -87,6 +87,15 @@ in - ''; - }; - -+ stage2Greeting = mkOption { -+ type = types.str; -+ default = "<<< ${config.system.nixos.distroName} Stage 2 >>>"; -+ defaultText = lib.literalExpression ''"<<< ''${config.system.nixos.distroName} Stage 2 >>>"''; -+ description = '' -+ The greeting message displayed during NixOS stage 2 boot. -+ ''; -+ }; -+ - extraSystemdUnitPaths = mkOption { - default = [ ]; - type = types.listOf types.str; --- -2.51.2 - diff --git a/flake.nix b/flake.nix index 3518bac..2bfd51a 100644 --- a/flake.nix +++ b/flake.nix @@ -70,6 +70,7 @@ outputs = { self, + nixpkgs, lanzaboote, nixos-hardware, home-manager, @@ -85,26 +86,15 @@ "yarn" ]; niri-package = inputs.niri.packages.${system}.niri-unstable; - - patchedNixpkgsSrc = (import inputs.nixpkgs { inherit system; }).applyPatches { - name = "nixpkgs-patched"; - src = inputs.nixpkgs; - patches = [ ./0001-feat-make-boot-messages-configureable.patch ]; - }; - - patchedNixpkgs = import patchedNixpkgsSrc { inherit system; }; in { - formatter.${system} = patchedNixpkgs.nixfmt-rfc-style; + formatter.${system} = nixpkgs.legacyPackages.${system}.nixfmt-rfc-style; - nixosConfigurations = patchedNixpkgs.lib.foldl' ( + nixosConfigurations = nixpkgs.lib.foldl' ( config: hostname: config // { - "${hostname}" = import "${patchedNixpkgsSrc}/nixos/lib/eval-config.nix" { - lib = patchedNixpkgs.lib; - baseModules = import "${patchedNixpkgsSrc}/nixos/modules/module-list.nix"; - inherit system; + "${hostname}" = nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs From 7b53591724cfe0e0224d133dc164c58c45645f50 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 24 Nov 2025 18:13:33 -0500 Subject: [PATCH 461/724] update --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 1c216c3..1dc9ac4 100644 --- a/flake.lock +++ b/flake.lock @@ -84,11 +84,11 @@ ] }, "locked": { - "lastModified": 1763977942, - "narHash": "sha256-Dhi5xNbhZI/GNKgxun7ckVCwLYepuWwMIPn8dYFJl0E=", + "lastModified": 1764001463, + "narHash": "sha256-4kEGNgKDLTv8Vw2mMi/0lJoXY3NyritYHvm8T/YPoxE=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "f87351a238ddda570226360a8e0725fc2d75f273", + "rev": "fcc5578b096e98a2f0c9657634b6f19bd17805b2", "type": "github" }, "original": { @@ -158,11 +158,11 @@ ] }, "locked": { - "lastModified": 1763997646, - "narHash": "sha256-hLIvcdKAtwt5eZchw+7AZFXx3NniHPbZ7puYruofsD8=", + "lastModified": 1764007004, + "narHash": "sha256-OnonWWGrUGPc3y1TES/RVCe4Gd75YgdU8aIp07Au4lc=", "owner": "nix-community", "repo": "home-manager", - "rev": "b9c0dae3e474631d4813c685187f5b4e01c34d39", + "rev": "125e40fa68b340aee9d474a46b540907e2537b5c", "type": "github" }, "original": { @@ -244,11 +244,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1763995371, - "narHash": "sha256-Cbekq2OAWevdTayYMO7SCf05aGHPZ236MTyCkKyYZOs=", + "lastModified": 1764008093, + "narHash": "sha256-8OmHLuPkZMjjEkn/TA2tk/3tEOE+zoUYiP5YFk7JsrU=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "c4fb0f9d13fadf1b3c33e693509d8cdcbbd7d08e", + "rev": "340b81b5d7cb4f15bf23f9ae8e372366c06fd423", "type": "github" }, "original": { @@ -557,11 +557,11 @@ ] }, "locked": { - "lastModified": 1763958868, - "narHash": "sha256-IOP3fAjawH68FL1RDakySNRK6XNYdZajX538Q3U58Y0=", + "lastModified": 1764015829, + "narHash": "sha256-Oi3D37fFYvYRC4cA2voW8kICzmtUCYMoGSuyYuazDZ8=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "15db6bda557066f3525010209bde4ec5f968f2ba", + "rev": "011760d40ec6ac8af6b078d58def3c7d2d994a53", "type": "github" }, "original": { From 6b53f29ae0a89edb364767d80c5199e9b52b455d Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 25 Nov 2025 13:08:30 -0500 Subject: [PATCH 462/724] update --- flake.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 1dc9ac4..f86ed7b 100644 --- a/flake.lock +++ b/flake.lock @@ -84,11 +84,11 @@ ] }, "locked": { - "lastModified": 1764001463, - "narHash": "sha256-4kEGNgKDLTv8Vw2mMi/0lJoXY3NyritYHvm8T/YPoxE=", + "lastModified": 1764088169, + "narHash": "sha256-l0zJRJg8Fm4pcewILYqw/0jkLdMn2Kvl2SLG9xK9HB8=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "fcc5578b096e98a2f0c9657634b6f19bd17805b2", + "rev": "ea48b8bca040158fe8559179a9a71b462cdeda03", "type": "github" }, "original": { @@ -158,11 +158,11 @@ ] }, "locked": { - "lastModified": 1764007004, - "narHash": "sha256-OnonWWGrUGPc3y1TES/RVCe4Gd75YgdU8aIp07Au4lc=", + "lastModified": 1764075860, + "narHash": "sha256-KYEIHCBBw+/lwKsJNRNoUxBB4ZY2LK0G0T8f+0i65q0=", "owner": "nix-community", "repo": "home-manager", - "rev": "125e40fa68b340aee9d474a46b540907e2537b5c", + "rev": "295d90e22d557ccc3049dc92460b82f372cd3892", "type": "github" }, "original": { @@ -244,11 +244,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1764008093, - "narHash": "sha256-8OmHLuPkZMjjEkn/TA2tk/3tEOE+zoUYiP5YFk7JsrU=", + "lastModified": 1764081740, + "narHash": "sha256-eeQzyHJjSQTxcjSCy1OgOgNAUjdBnIjSYntfJK0Z4+I=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "340b81b5d7cb4f15bf23f9ae8e372366c06fd423", + "rev": "e579b1a51f26341eeeb41e32d5b5c6e2a032e339", "type": "github" }, "original": { @@ -277,11 +277,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1763990232, - "narHash": "sha256-RdtlZ+nufSwEgNsF0yuTOO2eGpn87Qm9b3tRQPsibH4=", + "lastModified": 1764046829, + "narHash": "sha256-XFSR43nAKXDMhtNa+V2sd6Url/bCPGwawkmCqUKKRfI=", "owner": "YaLTeR", "repo": "niri", - "rev": "45b45ac29d654c0e6759ab996c69dfde40053536", + "rev": "54c7fdcd1adcfade596aca1070062f3f0fb5d4d0", "type": "github" }, "original": { @@ -302,11 +302,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1763980357, - "narHash": "sha256-o39Zr+uZ01yq217KAQTUxO8k9gN7PLKYmoK1UTQ7eBc=", + "lastModified": 1764060317, + "narHash": "sha256-ngeRNhpBYCuMgG+wbiwDv1lp4f1Tda3EHjnfxfsz7Tw=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "817bc5de1ebd1045f591ae1e7cb67e78e098019c", + "rev": "8342ea98bf04d41447d3b7513760232407d351e0", "type": "github" }, "original": { @@ -354,11 +354,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1762847253, - "narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=", + "lastModified": 1764080039, + "narHash": "sha256-b1MtLQsQc4Ji1u08f+C6g5XrmLPkJQ1fhNkCt+0AERQ=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9", + "rev": "da17006633ca9cda369be82893ae36824a2ddf1a", "type": "github" }, "original": { @@ -370,11 +370,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1763835633, - "narHash": "sha256-HzxeGVID5MChuCPESuC0dlQL1/scDKu+MmzoVBJxulM=", + "lastModified": 1763966396, + "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "050e09e091117c3d7328c7b2b7b577492c43c134", + "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a", "type": "github" }, "original": { @@ -453,11 +453,11 @@ ] }, "locked": { - "lastModified": 1763952169, - "narHash": "sha256-+PeDBD8P+NKauH+w7eO/QWCIp8Cx4mCfWnh9sJmy9CM=", + "lastModified": 1764038373, + "narHash": "sha256-M6w2wNBRelcavoDAyFL2iO4NeWknD40ASkH1S3C0YGM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ab726555a9a72e6dc80649809147823a813fa95b", + "rev": "ab3536fe850211a96673c6ffb2cb88aab8071cc9", "type": "github" }, "original": { From 5c30ce8fd9a15c2b814550096b5d88ba068b4c8c Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 25 Nov 2025 13:29:02 -0500 Subject: [PATCH 463/724] cachyos + cleanup --- flake.lock | 52 ++++++++++++++++++++++++++++++++++++++--- flake.nix | 19 +++++++++++++-- system/common.nix | 9 ++++++- system/system-mreow.nix | 17 ++++---------- system/system-yarn.nix | 6 ++++- 5 files changed, 83 insertions(+), 20 deletions(-) diff --git a/flake.lock b/flake.lock index f86ed7b..2d91086 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,36 @@ { "nodes": { + "chaotic": { + "inputs": { + "flake-schemas": "flake-schemas", + "home-manager": [ + "home-manager" + ], + "jovian": [ + "jovian" + ], + "nixpkgs": [ + "nixpkgs" + ], + "rust-overlay": [ + "rust-overlay" + ] + }, + "locked": { + "lastModified": 1764031508, + "narHash": "sha256-4Yh26aEgO1O0kV6qhW+Uw/CzAQTSbGkBGuiw6OkI/Ws=", + "owner": "chaotic-cx", + "repo": "nyx", + "rev": "2d5f96ca62d47d93d67fa7267e92aa2f660a3a36", + "type": "github" + }, + "original": { + "owner": "chaotic-cx", + "ref": "nyxpkgs-unstable", + "repo": "nyx", + "type": "github" + } + }, "crane": { "locked": { "lastModified": 1763938834, @@ -129,6 +160,20 @@ "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": [ @@ -186,7 +231,7 @@ "type": "github" } }, - "jovian-nixos": { + "jovian": { "inputs": { "nix-github-actions": "nix-github-actions", "nixpkgs": [ @@ -333,7 +378,7 @@ "nix-github-actions": { "inputs": { "nixpkgs": [ - "jovian-nixos", + "jovian", "nixpkgs" ] }, @@ -409,12 +454,13 @@ }, "root": { "inputs": { + "chaotic": "chaotic", "deploy-rs": "deploy-rs", "disko": "disko", "emacs-overlay": "emacs-overlay", "home-manager": "home-manager", "impermanence": "impermanence", - "jovian-nixos": "jovian-nixos", + "jovian": "jovian", "lanzaboote": "lanzaboote", "niri": "niri", "nix-doom-emacs-unstraightened": "nix-doom-emacs-unstraightened", diff --git a/flake.nix b/flake.nix index 2bfd51a..33d03de 100644 --- a/flake.nix +++ b/flake.nix @@ -61,10 +61,22 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - jovian-nixos = { + jovian = { url = "github:Jovian-Experiments/Jovian-NixOS"; inputs.nixpkgs.follows = "nixpkgs"; }; + + chaotic = { + url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; + + inputs = { + nixpkgs.follows = "nixpkgs"; + home-manager.follows = "home-manager"; + rust-overlay.follows = "rust-overlay"; + jovian.follows = "jovian"; + }; + }; + }; outputs = @@ -75,7 +87,8 @@ nixos-hardware, home-manager, deploy-rs, - jovian-nixos, + jovian, + chaotic, ... }@inputs: let @@ -104,7 +117,9 @@ ; }; modules = [ + chaotic.nixosModules.default home-manager.nixosModules.home-manager + jovian.nixosModules.default ( { config, ... }: { diff --git a/system/common.nix b/system/common.nix index e584510..a7cc393 100644 --- a/system/common.nix +++ b/system/common.nix @@ -81,12 +81,19 @@ ]; }; + # 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 = { }; + # allow unfree packages for jovian-nixos nixpkgs.config.allowUnfree = true; + services.scx.enable = true; + # kernel options boot = { - kernelPackages = pkgs.linuxPackages_latest; + # kernelPackages = pkgs.linuxPackages_cachyos-lto; + # kernelPackages = pkgs.linuxPackages_latest; # kernelPackages = pkgs.linuxPackages; lanzaboote = { diff --git a/system/system-mreow.nix b/system/system-mreow.nix index bac09f7..3066df8 100644 --- a/system/system-mreow.nix +++ b/system/system-mreow.nix @@ -27,9 +27,10 @@ # 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 = { }; + boot.kernelPackages = pkgs.linuxPackages_cachyos-lto.cachyOverride { + # my system is zen 5, but zen 4 is the highest option + mArch = "ZEN4"; + }; # disable framework kernel module # https://github.com/NixOS/nixos-hardware/issues/1330 @@ -43,16 +44,6 @@ command = "${lib.getExe pkgs.tuigreet} --sessions /etc/xdg/wayland-sessions/ --time"; user = username; }; - terminal.vt = lib.mkForce 2; }; }; - - environment.etc."xdg/wayland-sessions/niri-session.desktop".text = '' - [Desktop Entry] - Name=Niri Session - Comment=Niri Wayland compositor - Exec=niri-session - Type=Application - DesktopNames=niri - ''; } diff --git a/system/system-yarn.nix b/system/system-yarn.nix index 60b2f6c..6d5b03a 100644 --- a/system/system-yarn.nix +++ b/system/system-yarn.nix @@ -18,9 +18,13 @@ inputs.nixos-hardware.nixosModules.common-cpu-amd-zenpower inputs.impermanence.nixosModules.impermanence inputs.disko.nixosModules.disko - inputs.jovian-nixos.nixosModules.default ]; + boot.kernelPackages = pkgs.linuxPackages_cachyos-lto.cachyOverride { + # this system is zen 3, but this is the highest level this system supports + mArch = "GENERIC_V4"; + }; + fileSystems."/media/games" = { device = "/dev/disk/by-uuid/1878136e-765d-4784-b204-3536ab4fdac8"; fsType = "f2fs"; From 02d3a721f65d31f1f187efcd81c8851915a7890a Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 25 Nov 2025 19:44:29 -0500 Subject: [PATCH 464/724] Revert "cachyos + cleanup" This reverts commit 66b4931d083f0cc2adebf15dfdd3ccdc1bed5c4b. --- flake.lock | 52 +++-------------------------------------- flake.nix | 19 ++------------- system/common.nix | 9 +------ system/system-mreow.nix | 17 ++++++++++---- system/system-yarn.nix | 6 +---- 5 files changed, 20 insertions(+), 83 deletions(-) diff --git a/flake.lock b/flake.lock index 2d91086..f86ed7b 100644 --- a/flake.lock +++ b/flake.lock @@ -1,36 +1,5 @@ { "nodes": { - "chaotic": { - "inputs": { - "flake-schemas": "flake-schemas", - "home-manager": [ - "home-manager" - ], - "jovian": [ - "jovian" - ], - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": [ - "rust-overlay" - ] - }, - "locked": { - "lastModified": 1764031508, - "narHash": "sha256-4Yh26aEgO1O0kV6qhW+Uw/CzAQTSbGkBGuiw6OkI/Ws=", - "owner": "chaotic-cx", - "repo": "nyx", - "rev": "2d5f96ca62d47d93d67fa7267e92aa2f660a3a36", - "type": "github" - }, - "original": { - "owner": "chaotic-cx", - "ref": "nyxpkgs-unstable", - "repo": "nyx", - "type": "github" - } - }, "crane": { "locked": { "lastModified": 1763938834, @@ -160,20 +129,6 @@ "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": [ @@ -231,7 +186,7 @@ "type": "github" } }, - "jovian": { + "jovian-nixos": { "inputs": { "nix-github-actions": "nix-github-actions", "nixpkgs": [ @@ -378,7 +333,7 @@ "nix-github-actions": { "inputs": { "nixpkgs": [ - "jovian", + "jovian-nixos", "nixpkgs" ] }, @@ -454,13 +409,12 @@ }, "root": { "inputs": { - "chaotic": "chaotic", "deploy-rs": "deploy-rs", "disko": "disko", "emacs-overlay": "emacs-overlay", "home-manager": "home-manager", "impermanence": "impermanence", - "jovian": "jovian", + "jovian-nixos": "jovian-nixos", "lanzaboote": "lanzaboote", "niri": "niri", "nix-doom-emacs-unstraightened": "nix-doom-emacs-unstraightened", diff --git a/flake.nix b/flake.nix index 33d03de..2bfd51a 100644 --- a/flake.nix +++ b/flake.nix @@ -61,22 +61,10 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - jovian = { + jovian-nixos = { url = "github:Jovian-Experiments/Jovian-NixOS"; inputs.nixpkgs.follows = "nixpkgs"; }; - - chaotic = { - url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; - - inputs = { - nixpkgs.follows = "nixpkgs"; - home-manager.follows = "home-manager"; - rust-overlay.follows = "rust-overlay"; - jovian.follows = "jovian"; - }; - }; - }; outputs = @@ -87,8 +75,7 @@ nixos-hardware, home-manager, deploy-rs, - jovian, - chaotic, + jovian-nixos, ... }@inputs: let @@ -117,9 +104,7 @@ ; }; modules = [ - chaotic.nixosModules.default home-manager.nixosModules.home-manager - jovian.nixosModules.default ( { config, ... }: { diff --git a/system/common.nix b/system/common.nix index a7cc393..e584510 100644 --- a/system/common.nix +++ b/system/common.nix @@ -81,19 +81,12 @@ ]; }; - # 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 = { }; - # allow unfree packages for jovian-nixos nixpkgs.config.allowUnfree = true; - services.scx.enable = true; - # kernel options boot = { - # kernelPackages = pkgs.linuxPackages_cachyos-lto; - # kernelPackages = pkgs.linuxPackages_latest; + kernelPackages = pkgs.linuxPackages_latest; # kernelPackages = pkgs.linuxPackages; lanzaboote = { diff --git a/system/system-mreow.nix b/system/system-mreow.nix index 3066df8..bac09f7 100644 --- a/system/system-mreow.nix +++ b/system/system-mreow.nix @@ -27,10 +27,9 @@ # PST # time.timeZone = lib.mkForce "America/Los_Angeles"; - boot.kernelPackages = pkgs.linuxPackages_cachyos-lto.cachyOverride { - # my system is zen 5, but zen 4 is the highest option - mArch = "ZEN4"; - }; + # 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 @@ -44,6 +43,16 @@ command = "${lib.getExe pkgs.tuigreet} --sessions /etc/xdg/wayland-sessions/ --time"; user = username; }; + terminal.vt = lib.mkForce 2; }; }; + + environment.etc."xdg/wayland-sessions/niri-session.desktop".text = '' + [Desktop Entry] + Name=Niri Session + Comment=Niri Wayland compositor + Exec=niri-session + Type=Application + DesktopNames=niri + ''; } diff --git a/system/system-yarn.nix b/system/system-yarn.nix index 6d5b03a..60b2f6c 100644 --- a/system/system-yarn.nix +++ b/system/system-yarn.nix @@ -18,13 +18,9 @@ inputs.nixos-hardware.nixosModules.common-cpu-amd-zenpower inputs.impermanence.nixosModules.impermanence inputs.disko.nixosModules.disko + inputs.jovian-nixos.nixosModules.default ]; - boot.kernelPackages = pkgs.linuxPackages_cachyos-lto.cachyOverride { - # this system is zen 3, but this is the highest level this system supports - mArch = "GENERIC_V4"; - }; - fileSystems."/media/games" = { device = "/dev/disk/by-uuid/1878136e-765d-4784-b204-3536ab4fdac8"; fsType = "f2fs"; From 175b2f62873f23136de299380938aec5f37c9ebf Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 26 Nov 2025 01:53:28 -0500 Subject: [PATCH 465/724] opencode: use only free models + stuff --- home-manager/progs/opencode.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index 961db70..96c2126 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -21,7 +21,8 @@ ## Behavior Do not be sycophantic in your responses. - Do not use emojis unless explicitly asked. + Do not use emojis unless explicitly asked to. This includes in code. + ALWAYS test code before returning to the user with something you think works. Always verify your work. ## Nix For using `nix build` for any test, always append `-L --rebuild`. Build results are cached and may not behave as expected. @@ -29,9 +30,9 @@ settings = { theme = "opencode"; - model = "openrouter/z-ai/glm-4.6"; + model = "openrouter/kwaipilot/kat-coder-pro:free"; # small model used for titles - small_model = "openrouter/openai/gpt-oss-20b"; + small_model = "openrouter/openai/gpt-oss-20b:free"; autoshare = false; autoupdate = true; @@ -40,12 +41,7 @@ provider = { openrouter = { models = { - "z-ai/glm-4.6" = { }; - "minimax/minimax-m2" = { }; - "google/gemini-3-pro-preview" = { }; - "anthropic/claude-sonnet-4.5" = { }; - "qwen/qwen3-coder-30b-a3b-instruct" = { }; - "openrouter/openai/gpt-oss-20b" = { }; + "openai/gpt-oss-20b:free" = { }; }; options = { # TODO! use agenix here instead From 087d06002b30fad9669a5e89df09485524fa1c26 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 26 Nov 2025 17:52:58 -0500 Subject: [PATCH 466/724] update --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index f86ed7b..3a0654d 100644 --- a/flake.lock +++ b/flake.lock @@ -84,11 +84,11 @@ ] }, "locked": { - "lastModified": 1764088169, - "narHash": "sha256-l0zJRJg8Fm4pcewILYqw/0jkLdMn2Kvl2SLG9xK9HB8=", + "lastModified": 1764174444, + "narHash": "sha256-Ja2aZJkEBCoGKsl0TrQDK8tveKOf6vh6nKJGzD8ztEo=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "ea48b8bca040158fe8559179a9a71b462cdeda03", + "rev": "f94be383bc1277da3055ddd588db0ca1a9d44151", "type": "github" }, "original": { @@ -158,11 +158,11 @@ ] }, "locked": { - "lastModified": 1764075860, - "narHash": "sha256-KYEIHCBBw+/lwKsJNRNoUxBB4ZY2LK0G0T8f+0i65q0=", + "lastModified": 1764194569, + "narHash": "sha256-iUM9ktarEzThkayyZrzQ7oycPshAY2XRQqVKz0xX/L0=", "owner": "nix-community", "repo": "home-manager", - "rev": "295d90e22d557ccc3049dc92460b82f372cd3892", + "rev": "9651819d75f6c7ffaf8a9227490ac704f29659f0", "type": "github" }, "original": { @@ -244,11 +244,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1764081740, - "narHash": "sha256-eeQzyHJjSQTxcjSCy1OgOgNAUjdBnIjSYntfJK0Z4+I=", + "lastModified": 1764165116, + "narHash": "sha256-DN0m9X9dFPxNTfhaUWlHoM2CFbNiWgxVHzC4j0AIiuc=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "e579b1a51f26341eeeb41e32d5b5c6e2a032e339", + "rev": "ae097a3c5ef217f9441d0da1c0bc14bbb4796b94", "type": "github" }, "original": { @@ -277,11 +277,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1764046829, - "narHash": "sha256-XFSR43nAKXDMhtNa+V2sd6Url/bCPGwawkmCqUKKRfI=", + "lastModified": 1764160906, + "narHash": "sha256-6Dud/oe0UnkgCe+JAGF+GjXl6S6ynpcAUYWCdbXjJL4=", "owner": "YaLTeR", "repo": "niri", - "rev": "54c7fdcd1adcfade596aca1070062f3f0fb5d4d0", + "rev": "8370c539fb584f78924b826d0ac0ad8fa068cf95", "type": "github" }, "original": { @@ -302,11 +302,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1764060317, - "narHash": "sha256-ngeRNhpBYCuMgG+wbiwDv1lp4f1Tda3EHjnfxfsz7Tw=", + "lastModified": 1764146691, + "narHash": "sha256-WJgFQ/31oUPItd8ffyse/Bv4hxLWpXe0QjZu+If4eGo=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "8342ea98bf04d41447d3b7513760232407d351e0", + "rev": "2c445fa938acb9500939eb2896cd2491b22f4206", "type": "github" }, "original": { @@ -453,11 +453,11 @@ ] }, "locked": { - "lastModified": 1764038373, - "narHash": "sha256-M6w2wNBRelcavoDAyFL2iO4NeWknD40ASkH1S3C0YGM=", + "lastModified": 1764124769, + "narHash": "sha256-vcoOEy3i8AGJi3Y2C48hrf6CuL2h8W1gLe1gNt72Kxg=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ab3536fe850211a96673c6ffb2cb88aab8071cc9", + "rev": "5da8c00313b4434f00aed6b4c94cd3b207bafdc5", "type": "github" }, "original": { @@ -557,11 +557,11 @@ ] }, "locked": { - "lastModified": 1764015829, - "narHash": "sha256-Oi3D37fFYvYRC4cA2voW8kICzmtUCYMoGSuyYuazDZ8=", + "lastModified": 1764166920, + "narHash": "sha256-AEpt8JdKA4RVobRjaR7S2QP3bmUz8dhuWasB7mr9Ylo=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "011760d40ec6ac8af6b078d58def3c7d2d994a53", + "rev": "6f5d615393a5e923ea2883ef28e274031d1b1e1e", "type": "github" }, "original": { From 6da17c82f4fd348a265aae08d0f19805fb3caa28 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 29 Nov 2025 23:22:24 -0500 Subject: [PATCH 467/724] update --- flake.lock | 66 +++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index 3a0654d..93ab290 100644 --- a/flake.lock +++ b/flake.lock @@ -84,11 +84,11 @@ ] }, "locked": { - "lastModified": 1764174444, - "narHash": "sha256-Ja2aZJkEBCoGKsl0TrQDK8tveKOf6vh6nKJGzD8ztEo=", + "lastModified": 1764467126, + "narHash": "sha256-OyfyG50PDcUeA/DRoi8qroyc3LBryfhAhBpUPPR/fqE=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "f94be383bc1277da3055ddd588db0ca1a9d44151", + "rev": "c14775bf6dd493c38d5ec1642feaefdd15021196", "type": "github" }, "original": { @@ -158,11 +158,11 @@ ] }, "locked": { - "lastModified": 1764194569, - "narHash": "sha256-iUM9ktarEzThkayyZrzQ7oycPshAY2XRQqVKz0xX/L0=", + "lastModified": 1764361670, + "narHash": "sha256-jgWzgpIaHbL3USIq0gihZeuy1lLf2YSfwvWEwnfAJUw=", "owner": "nix-community", "repo": "home-manager", - "rev": "9651819d75f6c7ffaf8a9227490ac704f29659f0", + "rev": "780be8ef503a28939cf9dc7996b48ffb1a3e04c6", "type": "github" }, "original": { @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1763714684, - "narHash": "sha256-ZNJPAaeSYQTDgvwwE8XHhCz4HiHqYoUyoXdoBE2nxug=", + "lastModified": 1764275117, + "narHash": "sha256-DRcv8Y0BnWm4ZhUQnaYk1dNzC6ZhA2W9Vv5Jl4n0RbE=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "6178d787ee61b8586fdb0ccb8644fbfd5317d0f3", + "rev": "96023dcc9a0febaaa3b91f447b9ae2fbe86f2923", "type": "github" }, "original": { @@ -244,11 +244,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1764165116, - "narHash": "sha256-DN0m9X9dFPxNTfhaUWlHoM2CFbNiWgxVHzC4j0AIiuc=", + "lastModified": 1764405884, + "narHash": "sha256-TnvBRPmcpcyinvLgsitHS7w5soSa6yNBfRYEI2TK1Ts=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "ae097a3c5ef217f9441d0da1c0bc14bbb4796b94", + "rev": "10aae4855ee275f7d80d85f4328c24265fb20f1f", "type": "github" }, "original": { @@ -277,11 +277,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1764160906, - "narHash": "sha256-6Dud/oe0UnkgCe+JAGF+GjXl6S6ynpcAUYWCdbXjJL4=", + "lastModified": 1764399944, + "narHash": "sha256-FC9eYtSmplgxllCX4/3hJq5J3sXWKLSc7at8ZUxycVw=", "owner": "YaLTeR", "repo": "niri", - "rev": "8370c539fb584f78924b826d0ac0ad8fa068cf95", + "rev": "b35bcae35b3f9665043c335e55ed5828af77db85", "type": "github" }, "original": { @@ -302,11 +302,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1764146691, - "narHash": "sha256-WJgFQ/31oUPItd8ffyse/Bv4hxLWpXe0QjZu+If4eGo=", + "lastModified": 1764405710, + "narHash": "sha256-Mla0vUpLDyp+IeXpVTrXzi13TffgN0rJRthdV2Ym//U=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "2c445fa938acb9500939eb2896cd2491b22f4206", + "rev": "39abac814c3efe0ec6d45d97f59c6ae06f946687", "type": "github" }, "original": { @@ -354,11 +354,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1764080039, - "narHash": "sha256-b1MtLQsQc4Ji1u08f+C6g5XrmLPkJQ1fhNkCt+0AERQ=", + "lastModified": 1764440730, + "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "da17006633ca9cda369be82893ae36824a2ddf1a", + "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3", "type": "github" }, "original": { @@ -370,11 +370,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1763966396, - "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=", + "lastModified": 1764242076, + "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a", + "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", "type": "github" }, "original": { @@ -453,11 +453,11 @@ ] }, "locked": { - "lastModified": 1764124769, - "narHash": "sha256-vcoOEy3i8AGJi3Y2C48hrf6CuL2h8W1gLe1gNt72Kxg=", + "lastModified": 1764470739, + "narHash": "sha256-sa9f81B1dWO16QtgDTWHX8DQbiHKzHndpaunY5EQtwE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "5da8c00313b4434f00aed6b4c94cd3b207bafdc5", + "rev": "3bfa664055e1a09c6aedab5533c5fc8d6ca5741a", "type": "github" }, "original": { @@ -534,11 +534,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1763704521, - "narHash": "sha256-ceYEV6PnvUN8Zixao4gpPuN+VT3B0SlAXKuPNHZhqUY=", + "lastModified": 1764366786, + "narHash": "sha256-yVCJ4Qe/JkdKDu0DddFdAQgDQVeF12nxH7zv3jtooV4=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "f379ff5722a821212eb59ada9cf8e51cb3654aad", + "rev": "b362a3873710a42f7ac2d8ba03772d8290733934", "type": "github" }, "original": { @@ -557,11 +557,11 @@ ] }, "locked": { - "lastModified": 1764166920, - "narHash": "sha256-AEpt8JdKA4RVobRjaR7S2QP3bmUz8dhuWasB7mr9Ylo=", + "lastModified": 1764414951, + "narHash": "sha256-pZ2m2JmTTMyqiKB8WSigsSvAeoShI6OSRhzBuRO9SVY=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "6f5d615393a5e923ea2883ef28e274031d1b1e1e", + "rev": "10d2aa53ada9b14f6df2f9877d6a057f0a2b262f", "type": "github" }, "original": { From 88f103cb9723ea0ebe138d948704f9bc06ff04d5 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 2 Dec 2025 00:28:02 -0500 Subject: [PATCH 468/724] update --- flake.lock | 90 +++++++++++++++++++++++++++--------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/flake.lock b/flake.lock index 93ab290..88b5518 100644 --- a/flake.lock +++ b/flake.lock @@ -61,11 +61,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1762312706, - "narHash": "sha256-R3I8NErGSCd6kSTUBNe7SNcRDUtJ1xl8zvD13C6SrRg=", + "lastModified": 1764569695, + "narHash": "sha256-fvsIPA9syYvImkNmmjLJlquz+2P4qqWhTmuxUIODYkw=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "ead254e15269bf8564625df4c8d2af6690a0df49", + "rev": "2e16934f020eea3061e58ccc00afd50c1dc1a516", "type": "github" }, "original": { @@ -84,11 +84,11 @@ ] }, "locked": { - "lastModified": 1764467126, - "narHash": "sha256-OyfyG50PDcUeA/DRoi8qroyc3LBryfhAhBpUPPR/fqE=", + "lastModified": 1764638962, + "narHash": "sha256-r9mEkGInHn03TOV7zcH1Ghvd609R2dUjCtbdcxFAIgw=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "c14775bf6dd493c38d5ec1642feaefdd15021196", + "rev": "c45af5fd46b8131b4ff699ec56f8359b2d1deb1a", "type": "github" }, "original": { @@ -116,11 +116,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { @@ -158,11 +158,11 @@ ] }, "locked": { - "lastModified": 1764361670, - "narHash": "sha256-jgWzgpIaHbL3USIq0gihZeuy1lLf2YSfwvWEwnfAJUw=", + "lastModified": 1764636297, + "narHash": "sha256-S41K55kw+hWgDfgKmZ9/fMZ3F0BQDMvqFfE120fMHeE=", "owner": "nix-community", "repo": "home-manager", - "rev": "780be8ef503a28939cf9dc7996b48ffb1a3e04c6", + "rev": "ff067cfc619fdf6f82d50344e7d19ff2323f0827", "type": "github" }, "original": { @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1764275117, - "narHash": "sha256-DRcv8Y0BnWm4ZhUQnaYk1dNzC6ZhA2W9Vv5Jl4n0RbE=", + "lastModified": 1764612577, + "narHash": "sha256-sHI+7m/ryVYf7agWkutYbvzUS07aAd8g2NVWgUqhxLg=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "96023dcc9a0febaaa3b91f447b9ae2fbe86f2923", + "rev": "bcb22e208cf8883004fcec3a33f2500e7dc319a5", "type": "github" }, "original": { @@ -217,11 +217,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1763975256, - "narHash": "sha256-IhdDL+0YwlLz5Ty0EnAxWN/btemN9FxcQbYs/V/8jvs=", + "lastModified": 1764622702, + "narHash": "sha256-HggOVvg2U3EwT44wPHEwFKromf9qR9rTqfV1i3q7rYs=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "6803b15c4ab9df2dcc478254b4adb55524746ac7", + "rev": "6242b3b2b5e5afcf329027ed4eb5fa6e2eab10f1", "type": "github" }, "original": { @@ -244,11 +244,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1764405884, - "narHash": "sha256-TnvBRPmcpcyinvLgsitHS7w5soSa6yNBfRYEI2TK1Ts=", + "lastModified": 1764595404, + "narHash": "sha256-FMKDx+r0c7L1ekkIt2dNYgvXULVfSCDN9zXnAOnArew=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "10aae4855ee275f7d80d85f4328c24265fb20f1f", + "rev": "36483fec897fc0c336b3075b3b2d387edac71c9e", "type": "github" }, "original": { @@ -277,11 +277,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1764399944, - "narHash": "sha256-FC9eYtSmplgxllCX4/3hJq5J3sXWKLSc7at8ZUxycVw=", + "lastModified": 1764485473, + "narHash": "sha256-RlGEcuZFB/IdvYLrYsf0RpgvNtCMyIuBLt3lS+GZvP8=", "owner": "YaLTeR", "repo": "niri", - "rev": "b35bcae35b3f9665043c335e55ed5828af77db85", + "rev": "311ca6b5da19f5acd7d3e481620de57240ce8f7c", "type": "github" }, "original": { @@ -302,11 +302,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1764405710, - "narHash": "sha256-Mla0vUpLDyp+IeXpVTrXzi13TffgN0rJRthdV2Ym//U=", + "lastModified": 1764578891, + "narHash": "sha256-lYZa3qoW+dfZTospRNqzk3LW5O2MK1OpumBbKVil6vg=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "39abac814c3efe0ec6d45d97f59c6ae06f946687", + "rev": "1b9f309afacfb1d83c06014f4d801ca93d728e53", "type": "github" }, "original": { @@ -370,11 +370,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1764242076, - "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", + "lastModified": 1764517877, + "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", + "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", "type": "github" }, "original": { @@ -394,11 +394,11 @@ ] }, "locked": { - "lastModified": 1763741496, - "narHash": "sha256-uIRqs/H18YEtMOn1OkbnPH+aNTwXKx+iU3qnxEkVUd0=", + "lastModified": 1763988335, + "narHash": "sha256-QlcnByMc8KBjpU37rbq5iP7Cp97HvjRP0ucfdh+M4Qc=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "20e71a403c5de9ce5bd799031440da9728c1cda1", + "rev": "50b9238891e388c9fdc6a5c49e49c42533a1b5ce", "type": "github" }, "original": { @@ -433,11 +433,11 @@ ] }, "locked": { - "lastModified": 1763865987, - "narHash": "sha256-DJpzM8Jz3B0azJcAoF+YFHr8rEbxYLJ0wy1kWZ29HOw=", + "lastModified": 1764470739, + "narHash": "sha256-sa9f81B1dWO16QtgDTWHX8DQbiHKzHndpaunY5EQtwE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "042d905c01a6eec3bcae8530dacb19cda9758a63", + "rev": "3bfa664055e1a09c6aedab5533c5fc8d6ca5741a", "type": "github" }, "original": { @@ -453,11 +453,11 @@ ] }, "locked": { - "lastModified": 1764470739, - "narHash": "sha256-sa9f81B1dWO16QtgDTWHX8DQbiHKzHndpaunY5EQtwE=", + "lastModified": 1764643237, + "narHash": "sha256-6Ezx9DqVv5UZ7DBK9rcNwBuQUENFyWPS7M09I+FvNao=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "3bfa664055e1a09c6aedab5533c5fc8d6ca5741a", + "rev": "e66d6b924ac59e6c722f69332f6540ea57c69233", "type": "github" }, "original": { @@ -534,11 +534,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1764366786, - "narHash": "sha256-yVCJ4Qe/JkdKDu0DddFdAQgDQVeF12nxH7zv3jtooV4=", + "lastModified": 1764560400, + "narHash": "sha256-Qz1WvGdawnoz4dG3JtCtlParmdQHM5xu6osnXeVOqYI=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "b362a3873710a42f7ac2d8ba03772d8290733934", + "rev": "9a71e77b1e06dbad4a472265e59b52ac83cbe00c", "type": "github" }, "original": { @@ -557,11 +557,11 @@ ] }, "locked": { - "lastModified": 1764414951, - "narHash": "sha256-pZ2m2JmTTMyqiKB8WSigsSvAeoShI6OSRhzBuRO9SVY=", + "lastModified": 1764598958, + "narHash": "sha256-sJQHRL8trBoG/ArR+mUlyp5cyKU0pgQY+qDQzZGnVgM=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "10d2aa53ada9b14f6df2f9877d6a057f0a2b262f", + "rev": "8cded25e10b13e2999241f1c73a7d4e5e5d6f69e", "type": "github" }, "original": { From 6fa94c3c3549539abecc21e715acff63000c7fb8 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 2 Dec 2025 00:39:29 -0500 Subject: [PATCH 469/724] opencode: nix specify git add usage --- home-manager/progs/opencode.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index 96c2126..70ccb97 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -26,6 +26,7 @@ ## Nix For using `nix build` for any test, always append `-L --rebuild`. Build results are cached and may not behave as expected. + If you get an error that a file can't be found, always try to `git add` the file before trying other troubleshooting steps. ''; settings = { theme = "opencode"; From 8c2e513fd90d9413ed6e995b36c170986eda259e Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 2 Dec 2025 15:39:19 -0500 Subject: [PATCH 470/724] fix amdgpu ppfeaturemask --- system/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/common.nix b/system/common.nix index e584510..680175e 100644 --- a/system/common.nix +++ b/system/common.nix @@ -27,7 +27,7 @@ services.tuned.enable = true; # allow overclocking (I actually underclock but lol) - hardware.amdgpu.overdrive.ppfeaturemask = "0xFFF7FFFF"; + hardware.amdgpu.overdrive.ppfeaturemask = "0xFFFFFFFF"; hardware.enableRedistributableFirmware = true; hardware.cpu.amd.updateMicrocode = true; From 9a670104b1cd87b669bcd36971785f141e76973c Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 2 Dec 2025 15:56:25 -0500 Subject: [PATCH 471/724] cleanup --- system/common.nix | 9 ++++----- system/{hardware_laptop.nix => disk_mreow.nix} | 0 ...mpermanence-disk-config.nix => disk_yarn.nix} | 0 system/system-mreow.nix | 2 +- system/system-yarn.nix | 16 ++++++++++++---- 5 files changed, 17 insertions(+), 10 deletions(-) rename system/{hardware_laptop.nix => disk_mreow.nix} (100%) rename system/{impermanence-disk-config.nix => disk_yarn.nix} (100%) diff --git a/system/common.nix b/system/common.nix index 680175e..64195a8 100644 --- a/system/common.nix +++ b/system/common.nix @@ -16,9 +16,12 @@ ./steam.nix ./networking.nix - inputs.nixos-hardware.nixosModules.common-pc-ssd 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 ]; # use tuned instead of tlp or ppd @@ -37,7 +40,6 @@ # Add niri to display manager session packages services.displayManager.sessionPackages = [ niri-package ]; - # Gamescope configuration for Steam Deck-like experience programs = { gamescope = { enable = true; @@ -81,9 +83,6 @@ ]; }; - # allow unfree packages for jovian-nixos - nixpkgs.config.allowUnfree = true; - # kernel options boot = { kernelPackages = pkgs.linuxPackages_latest; diff --git a/system/hardware_laptop.nix b/system/disk_mreow.nix similarity index 100% rename from system/hardware_laptop.nix rename to system/disk_mreow.nix diff --git a/system/impermanence-disk-config.nix b/system/disk_yarn.nix similarity index 100% rename from system/impermanence-disk-config.nix rename to system/disk_yarn.nix diff --git a/system/system-mreow.nix b/system/system-mreow.nix index bac09f7..b61c5e7 100644 --- a/system/system-mreow.nix +++ b/system/system-mreow.nix @@ -9,7 +9,7 @@ { imports = [ ./common.nix - ./hardware_laptop.nix + ./disk_mreow.nix inputs.nixos-hardware.nixosModules.framework-amd-ai-300-series ]; diff --git a/system/system-yarn.nix b/system/system-yarn.nix index 60b2f6c..785274c 100644 --- a/system/system-yarn.nix +++ b/system/system-yarn.nix @@ -8,16 +8,13 @@ }: { imports = [ - ./impermanence-disk-config.nix + ./disk_yarn.nix ./common.nix ./impermanence.nix ./no-rgb.nix ./vr.nix - inputs.nixos-hardware.nixosModules.common-cpu-amd-pstate - inputs.nixos-hardware.nixosModules.common-cpu-amd-zenpower inputs.impermanence.nixosModules.impermanence - inputs.disko.nixosModules.disko inputs.jovian-nixos.nixosModules.default ]; @@ -60,6 +57,17 @@ 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" + ]; + jovian = { devices.steamdeck.enable = false; steam = { From f7b65fd822ea816179ce58e0587af8a580510e5d Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 4 Dec 2025 18:25:59 -0500 Subject: [PATCH 472/724] update --- flake.lock | 66 +++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index 88b5518..8976169 100644 --- a/flake.lock +++ b/flake.lock @@ -61,11 +61,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1764569695, - "narHash": "sha256-fvsIPA9syYvImkNmmjLJlquz+2P4qqWhTmuxUIODYkw=", + "lastModified": 1764841324, + "narHash": "sha256-gee2gqaSa69pwV6hFW2lXWUK1whTlZo70E8NVzE5iHM=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "2e16934f020eea3061e58ccc00afd50c1dc1a516", + "rev": "a4a61976dcc7247b59506cada0351f846519d08e", "type": "github" }, "original": { @@ -84,11 +84,11 @@ ] }, "locked": { - "lastModified": 1764638962, - "narHash": "sha256-r9mEkGInHn03TOV7zcH1Ghvd609R2dUjCtbdcxFAIgw=", + "lastModified": 1764865815, + "narHash": "sha256-2AbdDDM9zINH8Jrv6WCRcqbPo63MZVKfcZ1Go3niZm0=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "c45af5fd46b8131b4ff699ec56f8359b2d1deb1a", + "rev": "ee6f974aab6c923b460c869c0069b9ad67f07bde", "type": "github" }, "original": { @@ -158,11 +158,11 @@ ] }, "locked": { - "lastModified": 1764636297, - "narHash": "sha256-S41K55kw+hWgDfgKmZ9/fMZ3F0BQDMvqFfE120fMHeE=", + "lastModified": 1764872372, + "narHash": "sha256-uZuXRz9CzeCHsRbc2MQvKomwoX6GcFC5BUMEk3ouSFU=", "owner": "nix-community", "repo": "home-manager", - "rev": "ff067cfc619fdf6f82d50344e7d19ff2323f0827", + "rev": "05a56dbf24f195c62286e3273a2671d3b4904b00", "type": "github" }, "original": { @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1764612577, - "narHash": "sha256-sHI+7m/ryVYf7agWkutYbvzUS07aAd8g2NVWgUqhxLg=", + "lastModified": 1764746434, + "narHash": "sha256-6ymFuw+Z1C90ezf8H0BP3c2JFZhJYwMq31px2StwWHU=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "bcb22e208cf8883004fcec3a33f2500e7dc319a5", + "rev": "b4c0b604148adacf119b89824ed26df8926ce42c", "type": "github" }, "original": { @@ -244,11 +244,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1764595404, - "narHash": "sha256-FMKDx+r0c7L1ekkIt2dNYgvXULVfSCDN9zXnAOnArew=", + "lastModified": 1764796736, + "narHash": "sha256-JMSsWdmmzLtwVV8Z9x2mDjgA5i7DkJYnYQwkJWeHE40=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "36483fec897fc0c336b3075b3b2d387edac71c9e", + "rev": "a482ee6c7423ff90771958cd4bab95e4410b0381", "type": "github" }, "original": { @@ -277,11 +277,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1764485473, - "narHash": "sha256-RlGEcuZFB/IdvYLrYsf0RpgvNtCMyIuBLt3lS+GZvP8=", + "lastModified": 1764678181, + "narHash": "sha256-TMs2Px19UAG06zITXAH7efl7X8G7BDyMCy1ilX/8wy0=", "owner": "YaLTeR", "repo": "niri", - "rev": "311ca6b5da19f5acd7d3e481620de57240ce8f7c", + "rev": "f874b2fce50e0f7ba21e270c86cfa168a1506b82", "type": "github" }, "original": { @@ -302,11 +302,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1764578891, - "narHash": "sha256-lYZa3qoW+dfZTospRNqzk3LW5O2MK1OpumBbKVil6vg=", + "lastModified": 1764851332, + "narHash": "sha256-yjDpscQqmn0r0IHfzsFOFPcgBrqtzzXKzVr7HQX7HGs=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "1b9f309afacfb1d83c06014f4d801ca93d728e53", + "rev": "2efe20f4a4d382133a3b8c4efd7cd5329bf07160", "type": "github" }, "original": { @@ -370,11 +370,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1764517877, - "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", + "lastModified": 1764667669, + "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", + "rev": "418468ac9527e799809c900eda37cbff999199b6", "type": "github" }, "original": { @@ -453,11 +453,11 @@ ] }, "locked": { - "lastModified": 1764643237, - "narHash": "sha256-6Ezx9DqVv5UZ7DBK9rcNwBuQUENFyWPS7M09I+FvNao=", + "lastModified": 1764816035, + "narHash": "sha256-F0IQSmSj4t2ThkbWZooAhkCTO+YpZSd2Pqiv2uoYEHo=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "e66d6b924ac59e6c722f69332f6540ea57c69233", + "rev": "74d9abb7c5c030469f90d97a67d127cc5d76c238", "type": "github" }, "original": { @@ -534,11 +534,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1764560400, - "narHash": "sha256-Qz1WvGdawnoz4dG3JtCtlParmdQHM5xu6osnXeVOqYI=", + "lastModified": 1764721075, + "narHash": "sha256-ChH4nq0cMEEkzkHqKlQt5Z7wxrk8ybcEHuA1YKAYmV0=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "9a71e77b1e06dbad4a472265e59b52ac83cbe00c", + "rev": "1b918e29b419e89910014054e8b71d54c9235ea5", "type": "github" }, "original": { @@ -557,11 +557,11 @@ ] }, "locked": { - "lastModified": 1764598958, - "narHash": "sha256-sJQHRL8trBoG/ArR+mUlyp5cyKU0pgQY+qDQzZGnVgM=", + "lastModified": 1764825646, + "narHash": "sha256-QkKEkj3GXpkPxJz9S1RgaMlxstkyaj5IKVWvxIbtC8w=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "8cded25e10b13e2999241f1c73a7d4e5e5d6f69e", + "rev": "8c9284cc227a5c7cd8f1e1fa7a6882b0907187c8", "type": "github" }, "original": { From fc38b5df20709c3ec626794d229a5240e1c0a33d Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 5 Dec 2025 10:34:54 -0500 Subject: [PATCH 473/724] opencode: nix remove --rebuild usage --- home-manager/progs/opencode.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index 70ccb97..cdf5f5a 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -25,7 +25,7 @@ ALWAYS test code before returning to the user with something you think works. Always verify your work. ## Nix - For using `nix build` for any test, always append `-L --rebuild`. Build results are cached and may not behave as expected. + 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. ''; settings = { From f6ca87d18241315fbc046042d1e4357e49d76e4a Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 7 Dec 2025 15:02:09 -0500 Subject: [PATCH 474/724] update --- flake.lock | 66 +++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index 8976169..2bad697 100644 --- a/flake.lock +++ b/flake.lock @@ -61,11 +61,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1764841324, - "narHash": "sha256-gee2gqaSa69pwV6hFW2lXWUK1whTlZo70E8NVzE5iHM=", + "lastModified": 1764883736, + "narHash": "sha256-oP8meVh4uf0WFporFSGjd0m+aK6BbhaY24wEi0mTySY=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "a4a61976dcc7247b59506cada0351f846519d08e", + "rev": "9ef731939a130975227ac21370c09999f0dbccb3", "type": "github" }, "original": { @@ -84,11 +84,11 @@ ] }, "locked": { - "lastModified": 1764865815, - "narHash": "sha256-2AbdDDM9zINH8Jrv6WCRcqbPo63MZVKfcZ1Go3niZm0=", + "lastModified": 1765124616, + "narHash": "sha256-BLZUbNoVrp5R2qm7je2YnDx04fX7aWGGqI/bwp9lbqw=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "ee6f974aab6c923b460c869c0069b9ad67f07bde", + "rev": "c5886a924cf07c21ade34757434d9d510d4edb3e", "type": "github" }, "original": { @@ -158,11 +158,11 @@ ] }, "locked": { - "lastModified": 1764872372, - "narHash": "sha256-uZuXRz9CzeCHsRbc2MQvKomwoX6GcFC5BUMEk3ouSFU=", + "lastModified": 1764998300, + "narHash": "sha256-fZatn/KLfHLDXnF0wy7JxXqGaZmGDTVufT4o/AOlj44=", "owner": "nix-community", "repo": "home-manager", - "rev": "05a56dbf24f195c62286e3273a2671d3b4904b00", + "rev": "27a6182347ccae90a88231ae0dc5dfa7d15815bb", "type": "github" }, "original": { @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1764746434, - "narHash": "sha256-6ymFuw+Z1C90ezf8H0BP3c2JFZhJYwMq31px2StwWHU=", + "lastModified": 1764922999, + "narHash": "sha256-LSvUxKm6S6ZAd/otQSkAHd3+8KJhi8OwGJGSe0K//B8=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "b4c0b604148adacf119b89824ed26df8926ce42c", + "rev": "9b9ead1b5591b68f4048e7205ba1397bc85ce6c4", "type": "github" }, "original": { @@ -217,11 +217,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1764622702, - "narHash": "sha256-HggOVvg2U3EwT44wPHEwFKromf9qR9rTqfV1i3q7rYs=", + "lastModified": 1765062926, + "narHash": "sha256-p0DkyfrMae/6SVPCb/XY5f9fOFc+fwtOCteRqD297QE=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "6242b3b2b5e5afcf329027ed4eb5fa6e2eab10f1", + "rev": "4f5fc14c175cd0574ca0f4c5a05fae63758f0c47", "type": "github" }, "original": { @@ -244,11 +244,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1764796736, - "narHash": "sha256-JMSsWdmmzLtwVV8Z9x2mDjgA5i7DkJYnYQwkJWeHE40=", + "lastModified": 1765120349, + "narHash": "sha256-MvwrHRV80hOdEwfLgI16XhApHuvj69aAgUWQ8ZBgAqE=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "a482ee6c7423ff90771958cd4bab95e4410b0381", + "rev": "0f4acff79842637e92f5f2609d3844bac9d5e592", "type": "github" }, "original": { @@ -277,11 +277,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1764678181, - "narHash": "sha256-TMs2Px19UAG06zITXAH7efl7X8G7BDyMCy1ilX/8wy0=", + "lastModified": 1764966114, + "narHash": "sha256-nC0Fsu4zSdabdR4tHHMCrTgqLms612eEDy5VCdQVZFk=", "owner": "YaLTeR", "repo": "niri", - "rev": "f874b2fce50e0f7ba21e270c86cfa168a1506b82", + "rev": "ba29735fbbd8cf8319c71ccb55b54a0580007c80", "type": "github" }, "original": { @@ -302,11 +302,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1764851332, - "narHash": "sha256-yjDpscQqmn0r0IHfzsFOFPcgBrqtzzXKzVr7HQX7HGs=", + "lastModified": 1765096813, + "narHash": "sha256-unpizSGQxGNvihMZakLKfHjPhTdio4obY7x+3P/c8Zk=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "2efe20f4a4d382133a3b8c4efd7cd5329bf07160", + "rev": "33b3fe542bbddaac1e1b8d3f14c697cfe821d27a", "type": "github" }, "original": { @@ -370,11 +370,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1764667669, - "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=", + "lastModified": 1764950072, + "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "418468ac9527e799809c900eda37cbff999199b6", + "rev": "f61125a668a320878494449750330ca58b78c557", "type": "github" }, "original": { @@ -453,11 +453,11 @@ ] }, "locked": { - "lastModified": 1764816035, - "narHash": "sha256-F0IQSmSj4t2ThkbWZooAhkCTO+YpZSd2Pqiv2uoYEHo=", + "lastModified": 1765075567, + "narHash": "sha256-KFDCdQcHJ0hE3Nt5Gm5enRIhmtEifAjpxgUQ3mzSJpA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "74d9abb7c5c030469f90d97a67d127cc5d76c238", + "rev": "769156779b41e8787a46ca3d7d76443aaf68be6f", "type": "github" }, "original": { @@ -557,11 +557,11 @@ ] }, "locked": { - "lastModified": 1764825646, - "narHash": "sha256-QkKEkj3GXpkPxJz9S1RgaMlxstkyaj5IKVWvxIbtC8w=", + "lastModified": 1765084755, + "narHash": "sha256-Da6OF+dMG/L8IRrWE7bgJPclrh6e8BJCUs0mp8V9MsA=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "8c9284cc227a5c7cd8f1e1fa7a6882b0907187c8", + "rev": "3865973f52b821abc9c1cb2b21245391de42cc79", "type": "github" }, "original": { From b2e6ae7126a6d6faac15bb75223950d8c82c6cbc Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 7 Dec 2025 23:10:49 -0500 Subject: [PATCH 475/724] mreow: re-enable nixos-hardware's audioEnchancement for fw13 --- system/system-mreow.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/system/system-mreow.nix b/system/system-mreow.nix index b61c5e7..5ac9e28 100644 --- a/system/system-mreow.nix +++ b/system/system-mreow.nix @@ -14,15 +14,8 @@ inputs.nixos-hardware.nixosModules.framework-amd-ai-300-series ]; - # completely and utterly broken - /* - hardware.framework.laptop13.audioEnhancement = { - enable = true; - - # seems audio doesn't work without this - hideRawDevice = false; - }; - */ + hardware.framework.laptop13.audioEnhancement.rawDeviceName = + lib.mkDefault "alsa_output.pci-0000_c1_00.6.analog-stereo"; # PST # time.timeZone = lib.mkForce "America/Los_Angeles"; From 000d8fdf123f1bc5fcb9212cb9431614b44184d3 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 7 Dec 2025 23:11:11 -0500 Subject: [PATCH 476/724] mreow: enable framework kmod again --- system/system-mreow.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/system-mreow.nix b/system/system-mreow.nix index 5ac9e28..e5899f5 100644 --- a/system/system-mreow.nix +++ b/system/system-mreow.nix @@ -26,7 +26,7 @@ # disable framework kernel module # https://github.com/NixOS/nixos-hardware/issues/1330 - hardware.framework.enableKmod = false; + # hardware.framework.enableKmod = false; # Greetd display manager services.greetd = { From 09414f17a393bfcaafbd5e28ff22b5dae5ea19d1 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 7 Dec 2025 23:11:22 -0500 Subject: [PATCH 477/724] mreow: disable custom vt used for greetd --- system/system-mreow.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/system/system-mreow.nix b/system/system-mreow.nix index e5899f5..27db6c4 100644 --- a/system/system-mreow.nix +++ b/system/system-mreow.nix @@ -36,7 +36,6 @@ command = "${lib.getExe pkgs.tuigreet} --sessions /etc/xdg/wayland-sessions/ --time"; user = username; }; - terminal.vt = lib.mkForce 2; }; }; From 61863770fdb08ed0c7fefd461f825b4d90dcf3d6 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 7 Dec 2025 23:56:21 -0500 Subject: [PATCH 478/724] mreow: remove unneeded niri-session.desktop file creation --- system/system-mreow.nix | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/system/system-mreow.nix b/system/system-mreow.nix index 27db6c4..7dc406d 100644 --- a/system/system-mreow.nix +++ b/system/system-mreow.nix @@ -33,18 +33,9 @@ enable = true; settings = { default_session = { - command = "${lib.getExe pkgs.tuigreet} --sessions /etc/xdg/wayland-sessions/ --time"; + command = "${lib.getExe pkgs.tuigreet} --time"; user = username; }; }; }; - - environment.etc."xdg/wayland-sessions/niri-session.desktop".text = '' - [Desktop Entry] - Name=Niri Session - Comment=Niri Wayland compositor - Exec=niri-session - Type=Application - DesktopNames=niri - ''; } From 26e93112ca2597b446dadd548298e73872751e5a Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 8 Dec 2025 11:23:16 -0500 Subject: [PATCH 479/724] mreow: removed commented out config --- system/system-mreow.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/system/system-mreow.nix b/system/system-mreow.nix index 7dc406d..ecfc6ad 100644 --- a/system/system-mreow.nix +++ b/system/system-mreow.nix @@ -24,10 +24,6 @@ # 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; - # Greetd display manager services.greetd = { enable = true; From 6dbc01e0892657a5fd70c10781cb1cd110fbfd10 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 8 Dec 2025 17:14:24 -0500 Subject: [PATCH 480/724] update --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 2bad697..00db93c 100644 --- a/flake.lock +++ b/flake.lock @@ -84,11 +84,11 @@ ] }, "locked": { - "lastModified": 1765124616, - "narHash": "sha256-BLZUbNoVrp5R2qm7je2YnDx04fX7aWGGqI/bwp9lbqw=", + "lastModified": 1765211398, + "narHash": "sha256-Ym8wBHRHIZxd7TgblS2ZK25bPJpYwdZdg+YQDT+g12w=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "c5886a924cf07c21ade34757434d9d510d4edb3e", + "rev": "b053300454d56dfc6881d465dc1cad11d0fac031", "type": "github" }, "original": { @@ -158,11 +158,11 @@ ] }, "locked": { - "lastModified": 1764998300, - "narHash": "sha256-fZatn/KLfHLDXnF0wy7JxXqGaZmGDTVufT4o/AOlj44=", + "lastModified": 1765217760, + "narHash": "sha256-BVVyAodLcAD8KOtR3yCStBHSE0WAH/xQWH9f0qsxbmk=", "owner": "nix-community", "repo": "home-manager", - "rev": "27a6182347ccae90a88231ae0dc5dfa7d15815bb", + "rev": "e5b1f87841810fc24772bf4389f9793702000c9b", "type": "github" }, "original": { @@ -244,11 +244,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1765120349, - "narHash": "sha256-MvwrHRV80hOdEwfLgI16XhApHuvj69aAgUWQ8ZBgAqE=", + "lastModified": 1765203308, + "narHash": "sha256-UCXnStBJfVIefhYps7Hc0ysTD2ioQSy/luERteyzmgg=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "0f4acff79842637e92f5f2609d3844bac9d5e592", + "rev": "a72f97fd585aed83dada77cd1bf2b121648d3577", "type": "github" }, "original": { @@ -302,11 +302,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1765096813, - "narHash": "sha256-unpizSGQxGNvihMZakLKfHjPhTdio4obY7x+3P/c8Zk=", + "lastModified": 1765189887, + "narHash": "sha256-iSAhq9YZczZRnj5dNCLxA5KWFPxQ2EV0Hzs78UKSA5E=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "33b3fe542bbddaac1e1b8d3f14c697cfe821d27a", + "rev": "fa2ccf9e35b7f5c99f28a50938c8db951531f544", "type": "github" }, "original": { @@ -453,11 +453,11 @@ ] }, "locked": { - "lastModified": 1765075567, - "narHash": "sha256-KFDCdQcHJ0hE3Nt5Gm5enRIhmtEifAjpxgUQ3mzSJpA=", + "lastModified": 1765161692, + "narHash": "sha256-XdY9AFzmgRPYIhP4N+WiCHMNxPoifP5/Ld+orMYBD8c=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "769156779b41e8787a46ca3d7d76443aaf68be6f", + "rev": "7ed7e8c74be95906275805db68201e74e9904f07", "type": "github" }, "original": { @@ -534,11 +534,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1764721075, - "narHash": "sha256-ChH4nq0cMEEkzkHqKlQt5Z7wxrk8ybcEHuA1YKAYmV0=", + "lastModified": 1765201946, + "narHash": "sha256-7zkEUqmeWToaTGp29YI7HUN7qiSCauNB2ep0TpB1Jwk=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "1b918e29b419e89910014054e8b71d54c9235ea5", + "rev": "2f9981ad0890739980d09cd2a18293a1d47d0f01", "type": "github" }, "original": { @@ -557,11 +557,11 @@ ] }, "locked": { - "lastModified": 1765084755, - "narHash": "sha256-Da6OF+dMG/L8IRrWE7bgJPclrh6e8BJCUs0mp8V9MsA=", + "lastModified": 1765175766, + "narHash": "sha256-M4zs4bVUv0UNuVGspwwlcGs5FpCDt52LQBA5a9nj5Lg=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "3865973f52b821abc9c1cb2b21245391de42cc79", + "rev": "5126a8426773dc213a8c0f0d646aca116194dab6", "type": "github" }, "original": { From bc2e50283f0a821fd412f18fc504f130beaccaf2 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 9 Dec 2025 18:45:33 -0500 Subject: [PATCH 481/724] update --- flake.lock | 78 +++++++++++++++++++++++++++--------------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/flake.lock b/flake.lock index 00db93c..f42c2d8 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "crane": { "locked": { - "lastModified": 1763938834, - "narHash": "sha256-j8iB0Yr4zAvQLueCZ5abxfk6fnG/SJ5JnGUziETjwfg=", + "lastModified": 1765145449, + "narHash": "sha256-aBVHGWWRzSpfL++LubA0CwOOQ64WNLegrYHwsVuVN7A=", "owner": "ipetkov", "repo": "crane", - "rev": "d9e753122e51cee64eb8d2dddfe11148f339f5a2", + "rev": "69f538cdce5955fcd47abfed4395dc6d5194c1c5", "type": "github" }, "original": { @@ -61,11 +61,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1764883736, - "narHash": "sha256-oP8meVh4uf0WFporFSGjd0m+aK6BbhaY24wEi0mTySY=", + "lastModified": 1765148465, + "narHash": "sha256-GgBP9SubDzbBM9BeP13fqsxIrtzQqe+u5b6iT/jezF0=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "9ef731939a130975227ac21370c09999f0dbccb3", + "rev": "3ad2d9cdbb24d695e83724691a33b0e7b07d4b6e", "type": "github" }, "original": { @@ -84,11 +84,11 @@ ] }, "locked": { - "lastModified": 1765211398, - "narHash": "sha256-Ym8wBHRHIZxd7TgblS2ZK25bPJpYwdZdg+YQDT+g12w=", + "lastModified": 1765297775, + "narHash": "sha256-2GZWXMs3EwKaz/SXfjqfVNqQdxA4IcXZ9lTS0VYwJug=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "b053300454d56dfc6881d465dc1cad11d0fac031", + "rev": "78bc6baf16ced8a8ce49cfb8805a547be326bfc3", "type": "github" }, "original": { @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1764922999, - "narHash": "sha256-LSvUxKm6S6ZAd/otQSkAHd3+8KJhi8OwGJGSe0K//B8=", + "lastModified": 1765270480, + "narHash": "sha256-RUknLx2grxAphg1h9e4CiEAsZli2FV3U4zkFKGh0n7A=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "9b9ead1b5591b68f4048e7205ba1397bc85ce6c4", + "rev": "491926ed7cc85a2b9a6a85ee8d3c9e932c49d14d", "type": "github" }, "original": { @@ -217,11 +217,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1765062926, - "narHash": "sha256-p0DkyfrMae/6SVPCb/XY5f9fOFc+fwtOCteRqD297QE=", + "lastModified": 1765275983, + "narHash": "sha256-CI04kxXPY+FdPm8NgX2+TOgXhAu3hS7RQlhpI69ouVo=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "4f5fc14c175cd0574ca0f4c5a05fae63758f0c47", + "rev": "d125c8b4e696ae3642867c8cfa2c095ac631bea6", "type": "github" }, "original": { @@ -244,11 +244,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1765203308, - "narHash": "sha256-UCXnStBJfVIefhYps7Hc0ysTD2ioQSy/luERteyzmgg=", + "lastModified": 1765308450, + "narHash": "sha256-mnlUhv+eBpqR5/eU1zIrqFPwZl5P/ua/GIkXOl5HGLo=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "a72f97fd585aed83dada77cd1bf2b121648d3577", + "rev": "8e1063dea235dc1b4b5261f0c498717af2453a00", "type": "github" }, "original": { @@ -277,11 +277,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1764966114, - "narHash": "sha256-nC0Fsu4zSdabdR4tHHMCrTgqLms612eEDy5VCdQVZFk=", + "lastModified": 1765306956, + "narHash": "sha256-dAnL/EFft88xvKBLSE4pxSD5D945Cjm3E59bSl0feSE=", "owner": "YaLTeR", "repo": "niri", - "rev": "ba29735fbbd8cf8319c71ccb55b54a0580007c80", + "rev": "4d058e611147803f5188e417943c6653d846542f", "type": "github" }, "original": { @@ -302,11 +302,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1765189887, - "narHash": "sha256-iSAhq9YZczZRnj5dNCLxA5KWFPxQ2EV0Hzs78UKSA5E=", + "lastModified": 1765270042, + "narHash": "sha256-B7yJdo71GOwqa8E3ZNA49PBvur2pVs3tklqa1ZiL8UU=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "fa2ccf9e35b7f5c99f28a50938c8db951531f544", + "rev": "39a6724614a4371a71dbe58ca670dac26580f409", "type": "github" }, "original": { @@ -370,11 +370,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1764950072, - "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", + "lastModified": 1765186076, + "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f61125a668a320878494449750330ca58b78c557", + "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8", "type": "github" }, "original": { @@ -394,11 +394,11 @@ ] }, "locked": { - "lastModified": 1763988335, - "narHash": "sha256-QlcnByMc8KBjpU37rbq5iP7Cp97HvjRP0ucfdh+M4Qc=", + "lastModified": 1765016596, + "narHash": "sha256-rhSqPNxDVow7OQKi4qS5H8Au0P4S3AYbawBSmJNUtBQ=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "50b9238891e388c9fdc6a5c49e49c42533a1b5ce", + "rev": "548fc44fca28a5e81c5d6b846e555e6b9c2a5a3c", "type": "github" }, "original": { @@ -433,11 +433,11 @@ ] }, "locked": { - "lastModified": 1764470739, - "narHash": "sha256-sa9f81B1dWO16QtgDTWHX8DQbiHKzHndpaunY5EQtwE=", + "lastModified": 1765075567, + "narHash": "sha256-KFDCdQcHJ0hE3Nt5Gm5enRIhmtEifAjpxgUQ3mzSJpA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "3bfa664055e1a09c6aedab5533c5fc8d6ca5741a", + "rev": "769156779b41e8787a46ca3d7d76443aaf68be6f", "type": "github" }, "original": { @@ -453,11 +453,11 @@ ] }, "locked": { - "lastModified": 1765161692, - "narHash": "sha256-XdY9AFzmgRPYIhP4N+WiCHMNxPoifP5/Ld+orMYBD8c=", + "lastModified": 1765248027, + "narHash": "sha256-ngar+yP06x3+2k2Iey29uU0DWx5ur06h3iPBQXlU+yI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "7ed7e8c74be95906275805db68201e74e9904f07", + "rev": "7b50ad68415ae5be7ee4cc68fa570c420741b644", "type": "github" }, "original": { @@ -557,11 +557,11 @@ ] }, "locked": { - "lastModified": 1765175766, - "narHash": "sha256-M4zs4bVUv0UNuVGspwwlcGs5FpCDt52LQBA5a9nj5Lg=", + "lastModified": 1765275990, + "narHash": "sha256-2WhSfO4JjBqGIJJvwnwtOpoeTs628Y8GD7KthIoNhIY=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "5126a8426773dc213a8c0f0d646aca116194dab6", + "rev": "e7f4849710fe306852551f4ec34c6fc648896c22", "type": "github" }, "original": { From dc11f34ead4f985afe0c851a6add703d3dfd7ac7 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 9 Dec 2025 21:52:29 -0500 Subject: [PATCH 482/724] opencode: use llm-agents build --- flake.lock | 83 ++++++++++++++++++++++++++++++++- flake.nix | 5 ++ home-manager/progs/opencode.nix | 2 + 3 files changed, 89 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index f42c2d8..b572d38 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,27 @@ { "nodes": { + "blueprint": { + "inputs": { + "nixpkgs": [ + "llm-agents", + "nixpkgs" + ], + "systems": "systems_2" + }, + "locked": { + "lastModified": 1763308703, + "narHash": "sha256-O9Y+Wer8wOh+N+4kcCK5p/VLrXyX+ktk0/s3HdZvJzk=", + "owner": "numtide", + "repo": "blueprint", + "rev": "5a9bba070f801d63e2af3c9ef00b86b212429f4f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "blueprint", + "type": "github" + } + }, "crane": { "locked": { "lastModified": 1765145449, @@ -230,6 +252,28 @@ "type": "github" } }, + "llm-agents": { + "inputs": { + "blueprint": "blueprint", + "nixpkgs": [ + "nixpkgs" + ], + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1765334599, + "narHash": "sha256-xVZHs+7+xQzWXmZOKGeRBAdfK3XA1iBgpVxAbhvIR14=", + "owner": "numtide", + "repo": "llm-agents.nix", + "rev": "81f63b868cd2ebb1b0b7fca520ef082589b8d9dc", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "llm-agents.nix", + "type": "github" + } + }, "niri": { "inputs": { "niri-stable": "niri-stable", @@ -299,7 +343,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1765270042, @@ -416,6 +460,7 @@ "impermanence": "impermanence", "jovian-nixos": "jovian-nixos", "lanzaboote": "lanzaboote", + "llm-agents": "llm-agents", "niri": "niri", "nix-doom-emacs-unstraightened": "nix-doom-emacs-unstraightened", "nix-flatpak": "nix-flatpak", @@ -496,6 +541,42 @@ "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" + } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "llm-agents", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1762938485, + "narHash": "sha256-AlEObg0syDl+Spi4LsZIBrjw+snSVU4T8MOeuZJUJjM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "utils": { "inputs": { "systems": "systems" diff --git a/flake.nix b/flake.nix index 2bfd51a..b68bac1 100644 --- a/flake.nix +++ b/flake.nix @@ -65,6 +65,11 @@ url = "github:Jovian-Experiments/Jovian-NixOS"; inputs.nixpkgs.follows = "nixpkgs"; }; + + llm-agents = { + url = "github:numtide/llm-agents.nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index cdf5f5a..2a61bc9 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -2,10 +2,12 @@ config, lib, pkgs, + inputs, ... }: { programs.opencode = { + package = inputs.llm-agents.packages.${pkgs.system}.opencode; enable = true; rules = '' You are an intelligent and observant agent. From f836415f43bf8af397d9723f5fe78c2a43a6cd0e Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 9 Dec 2025 21:52:46 -0500 Subject: [PATCH 483/724] opencode: move to devstral --- home-manager/progs/opencode.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index 2a61bc9..7c9f53f 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -33,7 +33,7 @@ settings = { theme = "opencode"; - model = "openrouter/kwaipilot/kat-coder-pro:free"; + model = "openrouter/mistralai/devstral-2512:free"; # small model used for titles small_model = "openrouter/openai/gpt-oss-20b:free"; @@ -45,6 +45,7 @@ openrouter = { models = { "openai/gpt-oss-20b:free" = { }; + "mistralai/devstral-2512:free" = { }; }; options = { # TODO! use agenix here instead From 8eea17dc585af90ab28c74c58e917559be9ac1dd Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 10 Dec 2025 06:30:17 -0500 Subject: [PATCH 484/724] add tmux --- system/common.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/system/common.nix b/system/common.nix index 64195a8..c9756e4 100644 --- a/system/common.nix +++ b/system/common.nix @@ -254,6 +254,8 @@ # needed for home-manager git + + tmux ]; # wayland with electron/chromium applications From ccd36998a1303c8396a2286bac48eb72e9f9a363 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 10 Dec 2025 06:38:26 -0500 Subject: [PATCH 485/724] yarn: disable suspend + friends --- system/system-yarn.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/system/system-yarn.nix b/system/system-yarn.nix index 785274c..a3e4918 100644 --- a/system/system-yarn.nix +++ b/system/system-yarn.nix @@ -24,6 +24,13 @@ options = [ "nofail" ]; }; + systemd.targets = { + sleep.enable = false; + suspend.enable = false; + hibernate.enable = false; + hybrid-sleep.enable = false; + }; + networking.hostId = "abf570f9"; services.openssh = { From 22da11348f07247c0f011fbcab389973500c73a3 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 12 Dec 2025 15:57:14 -0500 Subject: [PATCH 486/724] update --- flake.lock | 72 +++++++++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/flake.lock b/flake.lock index b572d38..04a226a 100644 --- a/flake.lock +++ b/flake.lock @@ -83,11 +83,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1765148465, - "narHash": "sha256-GgBP9SubDzbBM9BeP13fqsxIrtzQqe+u5b6iT/jezF0=", + "lastModified": 1765413096, + "narHash": "sha256-ADJNz84TCmcEScOeibny6/NmGXjV6BylbDD1xZnm7bE=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "3ad2d9cdbb24d695e83724691a33b0e7b07d4b6e", + "rev": "008a539d628c8c4c4e895b8f5166b390e988dbfb", "type": "github" }, "original": { @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1765297775, - "narHash": "sha256-2GZWXMs3EwKaz/SXfjqfVNqQdxA4IcXZ9lTS0VYwJug=", + "lastModified": 1765441709, + "narHash": "sha256-2LRXe8A779U0m1NTHAaCzNy7WngXFAQw4Gc5vBl33F8=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "78bc6baf16ced8a8ce49cfb8805a547be326bfc3", + "rev": "27ced263ed6b7a6968f9f449d66aa299cb0f14a7", "type": "github" }, "original": { @@ -180,11 +180,11 @@ ] }, "locked": { - "lastModified": 1765217760, - "narHash": "sha256-BVVyAodLcAD8KOtR3yCStBHSE0WAH/xQWH9f0qsxbmk=", + "lastModified": 1765480374, + "narHash": "sha256-HlbvQAqLx7WqZFFQZ8nu5UUJAVlXiV/kqKbyueA8srw=", "owner": "nix-community", "repo": "home-manager", - "rev": "e5b1f87841810fc24772bf4389f9793702000c9b", + "rev": "39cb677ed9e908e90478aa9fe5f3383dfc1a63f3", "type": "github" }, "original": { @@ -216,11 +216,11 @@ ] }, "locked": { - "lastModified": 1765270480, - "narHash": "sha256-RUknLx2grxAphg1h9e4CiEAsZli2FV3U4zkFKGh0n7A=", + "lastModified": 1765526639, + "narHash": "sha256-4U8crbUT3PDQdqhaMLnVaxnciBlcnDAw8XAJaXiS0pA=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "491926ed7cc85a2b9a6a85ee8d3c9e932c49d14d", + "rev": "457a55ed77a105088a47cb55b9eccf7768559451", "type": "github" }, "original": { @@ -239,11 +239,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1765275983, - "narHash": "sha256-CI04kxXPY+FdPm8NgX2+TOgXhAu3hS7RQlhpI69ouVo=", + "lastModified": 1765382359, + "narHash": "sha256-RJmgVDzjRI18BWVogG6wpsl1UCuV6ui8qr4DJ1LfWZ8=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "d125c8b4e696ae3642867c8cfa2c095ac631bea6", + "rev": "e8c096ade12ec9130ff931b0f0e25d2f1bc63607", "type": "github" }, "original": { @@ -261,11 +261,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1765334599, - "narHash": "sha256-xVZHs+7+xQzWXmZOKGeRBAdfK3XA1iBgpVxAbhvIR14=", + "lastModified": 1765549999, + "narHash": "sha256-CEzP3hVccghgleHi+ms6BUslYAaZ9WgIz7cRclupiT4=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "81f63b868cd2ebb1b0b7fca520ef082589b8d9dc", + "rev": "cd88c75a88b158ae97b084d6e3e32bba78ba01fc", "type": "github" }, "original": { @@ -288,11 +288,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1765308450, - "narHash": "sha256-mnlUhv+eBpqR5/eU1zIrqFPwZl5P/ua/GIkXOl5HGLo=", + "lastModified": 1765528203, + "narHash": "sha256-DTs3VkvRjW/Quu7y9hzNUrddysBXbcqv5Rpo4rtQYQI=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "8e1063dea235dc1b4b5261f0c498717af2453a00", + "rev": "8f74fd85c7b42f2d06347a9c9eaff6d4904854f3", "type": "github" }, "original": { @@ -321,11 +321,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1765306956, - "narHash": "sha256-dAnL/EFft88xvKBLSE4pxSD5D945Cjm3E59bSl0feSE=", + "lastModified": 1765524373, + "narHash": "sha256-gi38XWhkb+H8iHhlXgv7MgUaQCuhmaTzKmq3yzYOg9g=", "owner": "YaLTeR", "repo": "niri", - "rev": "4d058e611147803f5188e417943c6653d846542f", + "rev": "c22d8358c293f5e66748d8ac20600e6b114f9743", "type": "github" }, "original": { @@ -346,11 +346,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1765270042, - "narHash": "sha256-B7yJdo71GOwqa8E3ZNA49PBvur2pVs3tklqa1ZiL8UU=", + "lastModified": 1765529275, + "narHash": "sha256-U6lMX7a9Ey7Bui1PquCrTuhd61tQd3M8y8OuzrvDo+s=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "39a6724614a4371a71dbe58ca670dac26580f409", + "rev": "5650168db49bc6c252437542a87f4b9f925a9ef6", "type": "github" }, "original": { @@ -498,11 +498,11 @@ ] }, "locked": { - "lastModified": 1765248027, - "narHash": "sha256-ngar+yP06x3+2k2Iey29uU0DWx5ur06h3iPBQXlU+yI=", + "lastModified": 1765507345, + "narHash": "sha256-fq34mBLvAgv93EuZjGp7cVV633pxnph9AVuB/Ql5y5Q=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "7b50ad68415ae5be7ee4cc68fa570c420741b644", + "rev": "a9471b23bf656d69ceb2d5ddccdc5082d51fc0e3", "type": "github" }, "original": { @@ -615,11 +615,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1765201946, - "narHash": "sha256-7zkEUqmeWToaTGp29YI7HUN7qiSCauNB2ep0TpB1Jwk=", + "lastModified": 1765343581, + "narHash": "sha256-HtTPbV6z6AJPg2d0bHaJKFrnNha+SEbHvbJafKAQ614=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "2f9981ad0890739980d09cd2a18293a1d47d0f01", + "rev": "f0ad674b7009a6afd80cea59d4fbf975dd68ee95", "type": "github" }, "original": { @@ -638,11 +638,11 @@ ] }, "locked": { - "lastModified": 1765275990, - "narHash": "sha256-2WhSfO4JjBqGIJJvwnwtOpoeTs628Y8GD7KthIoNhIY=", + "lastModified": 1765543504, + "narHash": "sha256-JicwCbAs6gEXl1zBZmaQmWERNkZkYLOPU4Je2QRZKxw=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "e7f4849710fe306852551f4ec34c6fc648896c22", + "rev": "7697c47740fbe3ebe84130b1666830857ccb76fb", "type": "github" }, "original": { From cabf3c9c996f59e133e681d7db03287224c584e1 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 13 Dec 2025 00:39:40 -0500 Subject: [PATCH 487/724] update --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 04a226a..9ce8746 100644 --- a/flake.lock +++ b/flake.lock @@ -261,11 +261,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1765549999, - "narHash": "sha256-CEzP3hVccghgleHi+ms6BUslYAaZ9WgIz7cRclupiT4=", + "lastModified": 1765594737, + "narHash": "sha256-9r+CxptJlqTdREkSHA1pxc3oZYnpgYNkAymkQLB0R8w=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "cd88c75a88b158ae97b084d6e3e32bba78ba01fc", + "rev": "fb30f7dd63c0c7227c4b80a4dbfb6765f4b9a900", "type": "github" }, "original": { @@ -288,11 +288,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1765528203, - "narHash": "sha256-DTs3VkvRjW/Quu7y9hzNUrddysBXbcqv5Rpo4rtQYQI=", + "lastModified": 1765602747, + "narHash": "sha256-W/5L5akXAqacv6WznbJat3lfhP5jyPUWx5uhTk91kUY=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "8f74fd85c7b42f2d06347a9c9eaff6d4904854f3", + "rev": "5c6cdc032e5b01e1aee5c6232c14e584f0e319e1", "type": "github" }, "original": { @@ -414,11 +414,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1765186076, - "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=", + "lastModified": 1765472234, + "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8", + "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b", "type": "github" }, "original": { @@ -498,11 +498,11 @@ ] }, "locked": { - "lastModified": 1765507345, - "narHash": "sha256-fq34mBLvAgv93EuZjGp7cVV633pxnph9AVuB/Ql5y5Q=", + "lastModified": 1765593578, + "narHash": "sha256-qbl874bCIy9+OLImdfBfZ9ITUDDjjTAB04Dk4PlZFV0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a9471b23bf656d69ceb2d5ddccdc5082d51fc0e3", + "rev": "348b94ed9ddffccdf1a65582a2dcff0a4a3eeeb4", "type": "github" }, "original": { @@ -638,11 +638,11 @@ ] }, "locked": { - "lastModified": 1765543504, - "narHash": "sha256-JicwCbAs6gEXl1zBZmaQmWERNkZkYLOPU4Je2QRZKxw=", + "lastModified": 1765589985, + "narHash": "sha256-jsaE3UG7BpthBJZtaXCCuH1rYdQBauUA3Otv3NF20FM=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "7697c47740fbe3ebe84130b1666830857ccb76fb", + "rev": "c79311e5b4f299ab3713b23dfbc98c853bb5f070", "type": "github" }, "original": { From f09bdc306ed0c77132e2ffedd0f684c5ffd21a34 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 16 Dec 2025 03:45:27 -0500 Subject: [PATCH 488/724] update --- flake.lock | 90 +++++++++++++++++++++++++++--------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/flake.lock b/flake.lock index 9ce8746..0524aa3 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ }, "crane": { "locked": { - "lastModified": 1765145449, - "narHash": "sha256-aBVHGWWRzSpfL++LubA0CwOOQ64WNLegrYHwsVuVN7A=", + "lastModified": 1765739568, + "narHash": "sha256-gQYx35Of4UDKUjAYvmxjUEh/DdszYeTtT6MDin4loGE=", "owner": "ipetkov", "repo": "crane", - "rev": "69f538cdce5955fcd47abfed4395dc6d5194c1c5", + "rev": "67d2baff0f9f677af35db61b32b5df6863bcc075", "type": "github" }, "original": { @@ -83,11 +83,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1765413096, - "narHash": "sha256-ADJNz84TCmcEScOeibny6/NmGXjV6BylbDD1xZnm7bE=", + "lastModified": 1765742720, + "narHash": "sha256-ZCOYpKs1HTzq+6cexuDHhbkhrIzN6q/aNy87I3vAodA=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "008a539d628c8c4c4e895b8f5166b390e988dbfb", + "rev": "59956c3aabff98459055a8784a8adc6495cebb03", "type": "github" }, "original": { @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1765441709, - "narHash": "sha256-2LRXe8A779U0m1NTHAaCzNy7WngXFAQw4Gc5vBl33F8=", + "lastModified": 1765852003, + "narHash": "sha256-CBzHIIARV1/aSSm7OpNu2YEf0DJ6BtlfXvUZHVxEU2w=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "27ced263ed6b7a6968f9f449d66aa299cb0f14a7", + "rev": "0ed34dfadbf48ab8618e36129b165bb42ac47ddb", "type": "github" }, "original": { @@ -180,11 +180,11 @@ ] }, "locked": { - "lastModified": 1765480374, - "narHash": "sha256-HlbvQAqLx7WqZFFQZ8nu5UUJAVlXiV/kqKbyueA8srw=", + "lastModified": 1765860045, + "narHash": "sha256-7Lxp/PfOy4h3QIDtmWG/EgycaswqRSkDX4DGtet14NE=", "owner": "nix-community", "repo": "home-manager", - "rev": "39cb677ed9e908e90478aa9fe5f3383dfc1a63f3", + "rev": "09de9577d47d8bffb11c449b6a3d24e32ac16c99", "type": "github" }, "original": { @@ -239,11 +239,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1765382359, - "narHash": "sha256-RJmgVDzjRI18BWVogG6wpsl1UCuV6ui8qr4DJ1LfWZ8=", + "lastModified": 1765858498, + "narHash": "sha256-vM8t6pzK8HdNE9X791HbjnIOA8unIxAy8Rr65JcHox8=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "e8c096ade12ec9130ff931b0f0e25d2f1bc63607", + "rev": "05105f22aa92aa51092f24fe8bb57ca0cb4a2b93", "type": "github" }, "original": { @@ -261,11 +261,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1765594737, - "narHash": "sha256-9r+CxptJlqTdREkSHA1pxc3oZYnpgYNkAymkQLB0R8w=", + "lastModified": 1765854155, + "narHash": "sha256-yrECdmBoMhUAA8FqUJ1LbtDjuwn+38OkFgRrwbEq/DU=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "fb30f7dd63c0c7227c4b80a4dbfb6765f4b9a900", + "rev": "9ee377d02d7e50e2903d9c7fa53138aebd9ae944", "type": "github" }, "original": { @@ -288,11 +288,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1765602747, - "narHash": "sha256-W/5L5akXAqacv6WznbJat3lfhP5jyPUWx5uhTk91kUY=", + "lastModified": 1765867692, + "narHash": "sha256-zuAmnzaB5uDqgXh/Y/Cx+zBef2lYKoVAPYErXQfk/4A=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "5c6cdc032e5b01e1aee5c6232c14e584f0e319e1", + "rev": "603ea180e61c6ef143b789a3eaca12ffdfc7c60a", "type": "github" }, "original": { @@ -321,11 +321,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1765524373, - "narHash": "sha256-gi38XWhkb+H8iHhlXgv7MgUaQCuhmaTzKmq3yzYOg9g=", + "lastModified": 1765861551, + "narHash": "sha256-1Bo86J/7nm8sndZz9gGW0agydYzLYimdz9aQEhnf1zY=", "owner": "YaLTeR", "repo": "niri", - "rev": "c22d8358c293f5e66748d8ac20600e6b114f9743", + "rev": "2641356d41199a40ccc9a2e9f61bd34d7e7c8220", "type": "github" }, "original": { @@ -346,11 +346,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1765529275, - "narHash": "sha256-U6lMX7a9Ey7Bui1PquCrTuhd61tQd3M8y8OuzrvDo+s=", + "lastModified": 1765796272, + "narHash": "sha256-fvXIK26UnX+mXPH7NXqjXjBS8quUQ9espBcrvdftM3Y=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "5650168db49bc6c252437542a87f4b9f925a9ef6", + "rev": "c2d21cb48de8c47472688748e3fff83ab6f5132f", "type": "github" }, "original": { @@ -414,11 +414,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1765472234, - "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=", + "lastModified": 1765779637, + "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b", + "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", "type": "github" }, "original": { @@ -438,11 +438,11 @@ ] }, "locked": { - "lastModified": 1765016596, - "narHash": "sha256-rhSqPNxDVow7OQKi4qS5H8Au0P4S3AYbawBSmJNUtBQ=", + "lastModified": 1765464257, + "narHash": "sha256-dixPWKiHzh80PtD0aLuxYNQ0xP+843dfXG/yM3OzaYQ=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "548fc44fca28a5e81c5d6b846e555e6b9c2a5a3c", + "rev": "09e45f2598e1a8499c3594fe11ec2943f34fe509", "type": "github" }, "original": { @@ -478,11 +478,11 @@ ] }, "locked": { - "lastModified": 1765075567, - "narHash": "sha256-KFDCdQcHJ0hE3Nt5Gm5enRIhmtEifAjpxgUQ3mzSJpA=", + "lastModified": 1765680428, + "narHash": "sha256-fyPmRof9SZeI14ChPk5rVPOm7ISiiGkwGCunkhM+eUg=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "769156779b41e8787a46ca3d7d76443aaf68be6f", + "rev": "eb3898d8ef143d4bf0f7f2229105fc51c7731b2f", "type": "github" }, "original": { @@ -498,11 +498,11 @@ ] }, "locked": { - "lastModified": 1765593578, - "narHash": "sha256-qbl874bCIy9+OLImdfBfZ9ITUDDjjTAB04Dk4PlZFV0=", + "lastModified": 1765852971, + "narHash": "sha256-rQdOMqfQNhcfqvh1dFIVWh09mrIWwerUJqqBdhIsf8g=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "348b94ed9ddffccdf1a65582a2dcff0a4a3eeeb4", + "rev": "5f98ccecc9f1bc1c19c0a350a659af1a04b3b319", "type": "github" }, "original": { @@ -615,11 +615,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1765343581, - "narHash": "sha256-HtTPbV6z6AJPg2d0bHaJKFrnNha+SEbHvbJafKAQ614=", + "lastModified": 1765858323, + "narHash": "sha256-pRyLIpUN56iG3ipPh5Pcwb2tSXFNr8kMYZNEO5kglsI=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "f0ad674b7009a6afd80cea59d4fbf975dd68ee95", + "rev": "1bbd5cae7ec80241e8b44629d4da503ed7cf18c9", "type": "github" }, "original": { @@ -638,11 +638,11 @@ ] }, "locked": { - "lastModified": 1765589985, - "narHash": "sha256-jsaE3UG7BpthBJZtaXCCuH1rYdQBauUA3Otv3NF20FM=", + "lastModified": 1765764138, + "narHash": "sha256-Nb5y5xSDQLMeUYiA1bQkbmHffGm0d/XXWoJjFu8ovw0=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "c79311e5b4f299ab3713b23dfbc98c853bb5f070", + "rev": "bd8815d0a686267386268e7cc70315124e21362b", "type": "github" }, "original": { From f3d5bd630cd5e3198195318cb7a582a0e2d1e881 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 20 Dec 2025 01:18:41 -0500 Subject: [PATCH 489/724] update --- flake.lock | 90 +++++++++++++++++++++++++++--------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/flake.lock b/flake.lock index 0524aa3..e64313f 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1762286984, - "narHash": "sha256-9I2H9x5We6Pl+DBYHjR1s3UT8wgwcpAH03kn9CqtdQc=", + "lastModified": 1766051518, + "narHash": "sha256-znKOwPXQnt3o7lDb3hdf19oDo0BLP4MfBOYiWkEHoik=", "owner": "serokell", "repo": "deploy-rs", - "rev": "9c870f63e28ec1e83305f7f6cb73c941e699f74f", + "rev": "d5eff7f948535b9c723d60cd8239f8f11ddc90fa", "type": "github" }, "original": { @@ -83,11 +83,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1765742720, - "narHash": "sha256-ZCOYpKs1HTzq+6cexuDHhbkhrIzN6q/aNy87I3vAodA=", + "lastModified": 1765960743, + "narHash": "sha256-zR+EfDMcyAWPSkkXauzaEcbzsKUoDMwNVVtJvsQSXqo=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "59956c3aabff98459055a8784a8adc6495cebb03", + "rev": "0dfb874b57690dbbddd8167792de5ea9ff9a7d76", "type": "github" }, "original": { @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1765852003, - "narHash": "sha256-CBzHIIARV1/aSSm7OpNu2YEf0DJ6BtlfXvUZHVxEU2w=", + "lastModified": 1766195763, + "narHash": "sha256-lplNDhZG8lf9o2ZFyOHVxjSnYs4M+bmSbzEhrnNm4LY=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "0ed34dfadbf48ab8618e36129b165bb42ac47ddb", + "rev": "f4ad950dd72c8eb510de4887d52b620d1fe7a96e", "type": "github" }, "original": { @@ -180,11 +180,11 @@ ] }, "locked": { - "lastModified": 1765860045, - "narHash": "sha256-7Lxp/PfOy4h3QIDtmWG/EgycaswqRSkDX4DGtet14NE=", + "lastModified": 1766171975, + "narHash": "sha256-47Ee0bTidhF/3/sHuYnWRuxcCrrm0mBNDxBkOTd3wWQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "09de9577d47d8bffb11c449b6a3d24e32ac16c99", + "rev": "bb35f07cc95a73aacbaf1f7f46bb8a3f40f265b5", "type": "github" }, "original": { @@ -216,11 +216,11 @@ ] }, "locked": { - "lastModified": 1765526639, - "narHash": "sha256-4U8crbUT3PDQdqhaMLnVaxnciBlcnDAw8XAJaXiS0pA=", + "lastModified": 1766137899, + "narHash": "sha256-G4UMKyt6iLlK3eeFQuIKKG+9FwattDMmtYsoF0+b4zk=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "457a55ed77a105088a47cb55b9eccf7768559451", + "rev": "d9879776a2ba5def8cf5e73c05b3f62563f77a71", "type": "github" }, "original": { @@ -239,11 +239,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1765858498, - "narHash": "sha256-vM8t6pzK8HdNE9X791HbjnIOA8unIxAy8Rr65JcHox8=", + "lastModified": 1766146127, + "narHash": "sha256-6bA+9FNE7bWOUanW6Mujcbzhm9A74dCTUBX5/bA0RVQ=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "05105f22aa92aa51092f24fe8bb57ca0cb4a2b93", + "rev": "b8c5ab2bd227f840bc8e1944631fe718b19c3336", "type": "github" }, "original": { @@ -261,11 +261,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1765854155, - "narHash": "sha256-yrECdmBoMhUAA8FqUJ1LbtDjuwn+38OkFgRrwbEq/DU=", + "lastModified": 1766209986, + "narHash": "sha256-z7O0jxXUC+M8ALwKqyx7s1HfYXM74af4jBJCgPaYZfE=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "9ee377d02d7e50e2903d9c7fa53138aebd9ae944", + "rev": "21a32502df27ce76bf199415c01e6e4af88a3504", "type": "github" }, "original": { @@ -288,11 +288,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1765867692, - "narHash": "sha256-zuAmnzaB5uDqgXh/Y/Cx+zBef2lYKoVAPYErXQfk/4A=", + "lastModified": 1766209779, + "narHash": "sha256-aYOnrT1M5xxqn1Ka66jh9JspE9GejyX16bgA2Fex9dQ=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "603ea180e61c6ef143b789a3eaca12ffdfc7c60a", + "rev": "3a174fe817fc39f09267a464d0ba93606aac7277", "type": "github" }, "original": { @@ -321,11 +321,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1765861551, - "narHash": "sha256-1Bo86J/7nm8sndZz9gGW0agydYzLYimdz9aQEhnf1zY=", + "lastModified": 1766207058, + "narHash": "sha256-7E45lo+Yt4zaOlrCQWGSGwvFKzS5MxlP0gPCkggy+8w=", "owner": "YaLTeR", "repo": "niri", - "rev": "2641356d41199a40ccc9a2e9f61bd34d7e7c8220", + "rev": "7a237e519c69ec493851ffac169abb3aa917a7b3", "type": "github" }, "original": { @@ -346,11 +346,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1765796272, - "narHash": "sha256-fvXIK26UnX+mXPH7NXqjXjBS8quUQ9espBcrvdftM3Y=", + "lastModified": 1766047659, + "narHash": "sha256-8jebwDZJbJ7rnZ7lJR22m9WsJk6ZPJtozK6HxpNeAEg=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "c2d21cb48de8c47472688748e3fff83ab6f5132f", + "rev": "d53bcf25afb8d0cc056217a85dc4cc07d639cc88", "type": "github" }, "original": { @@ -414,11 +414,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1765779637, - "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", + "lastModified": 1766070988, + "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", + "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8", "type": "github" }, "original": { @@ -498,11 +498,11 @@ ] }, "locked": { - "lastModified": 1765852971, - "narHash": "sha256-rQdOMqfQNhcfqvh1dFIVWh09mrIWwerUJqqBdhIsf8g=", + "lastModified": 1766198367, + "narHash": "sha256-f1L1rCEu2Zew6zdiZ38jJDZd65ktE7UN+Gqn2LHPiFI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "5f98ccecc9f1bc1c19c0a350a659af1a04b3b319", + "rev": "66bb33fdfb50b1ee724381c3f5d6012dac6c89b3", "type": "github" }, "original": { @@ -564,11 +564,11 @@ ] }, "locked": { - "lastModified": 1762938485, - "narHash": "sha256-AlEObg0syDl+Spi4LsZIBrjw+snSVU4T8MOeuZJUJjM=", + "lastModified": 1766000401, + "narHash": "sha256-+cqN4PJz9y0JQXfAK5J1drd0U05D5fcAGhzhfVrDlsI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4", + "rev": "42d96e75aa56a3f70cab7e7dc4a32868db28e8fd", "type": "github" }, "original": { @@ -615,11 +615,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1765858323, - "narHash": "sha256-pRyLIpUN56iG3ipPh5Pcwb2tSXFNr8kMYZNEO5kglsI=", + "lastModified": 1765935116, + "narHash": "sha256-lNyckAdrhNKXsi9pNOBYajntNFlWs+BITVoIZuNuwX0=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "1bbd5cae7ec80241e8b44629d4da503ed7cf18c9", + "rev": "979eab242e60cf481a31d9de508a1bdaf2dcf7d4", "type": "github" }, "original": { @@ -638,11 +638,11 @@ ] }, "locked": { - "lastModified": 1765764138, - "narHash": "sha256-Nb5y5xSDQLMeUYiA1bQkbmHffGm0d/XXWoJjFu8ovw0=", + "lastModified": 1766204826, + "narHash": "sha256-NccmxYNOUHLLehsBLaeZ3QtVlDfIW1FDBe3W/kIDwa0=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "bd8815d0a686267386268e7cc70315124e21362b", + "rev": "4563d0ffdf586368f1bec1a39cc20c9b12b73884", "type": "github" }, "original": { From 7ef220a852e05d3cac9f740d4a75d98a397600a6 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 21 Dec 2025 22:04:20 -0500 Subject: [PATCH 490/724] update --- flake.lock | 60 +++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index e64313f..522d942 100644 --- a/flake.lock +++ b/flake.lock @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1766195763, - "narHash": "sha256-lplNDhZG8lf9o2ZFyOHVxjSnYs4M+bmSbzEhrnNm4LY=", + "lastModified": 1766370686, + "narHash": "sha256-HZ1uIvsj/NTcvg6qzlHoZYKweQr0AT92puSnmeB6tuY=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "f4ad950dd72c8eb510de4887d52b620d1fe7a96e", + "rev": "db25d925f0d299cb32c38eb0d0e30cfb285245ca", "type": "github" }, "original": { @@ -180,11 +180,11 @@ ] }, "locked": { - "lastModified": 1766171975, - "narHash": "sha256-47Ee0bTidhF/3/sHuYnWRuxcCrrm0mBNDxBkOTd3wWQ=", + "lastModified": 1766282146, + "narHash": "sha256-0V/nKU93KdYGi+5LB/MVo355obBJw/2z9b2xS3bPJxY=", "owner": "nix-community", "repo": "home-manager", - "rev": "bb35f07cc95a73aacbaf1f7f46bb8a3f40f265b5", + "rev": "61fcc9de76b88e55578eb5d79fc80f2b236df707", "type": "github" }, "original": { @@ -216,11 +216,11 @@ ] }, "locked": { - "lastModified": 1766137899, - "narHash": "sha256-G4UMKyt6iLlK3eeFQuIKKG+9FwattDMmtYsoF0+b4zk=", + "lastModified": 1766225187, + "narHash": "sha256-6hcaU8qtmixsaEUbjPiOFd5aJPZxAIBokl5d7dkab3k=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "d9879776a2ba5def8cf5e73c05b3f62563f77a71", + "rev": "bb53a85db9210204a98f771f10f1f5b4e06ccb2d", "type": "github" }, "original": { @@ -239,11 +239,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1766146127, - "narHash": "sha256-6bA+9FNE7bWOUanW6Mujcbzhm9A74dCTUBX5/bA0RVQ=", + "lastModified": 1766225539, + "narHash": "sha256-0Y6o3oUmQCxrzLIvZTcUAQCPEXAc+tU+N3ZjmzdrC28=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "b8c5ab2bd227f840bc8e1944631fe718b19c3336", + "rev": "14455220bef50f8df94f05e5763cdf51bc704acd", "type": "github" }, "original": { @@ -261,11 +261,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1766209986, - "narHash": "sha256-z7O0jxXUC+M8ALwKqyx7s1HfYXM74af4jBJCgPaYZfE=", + "lastModified": 1766372112, + "narHash": "sha256-C838MDCpDHu+AXd4TDt61K2wIRMOEMszsHqqQgL9CYM=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "21a32502df27ce76bf199415c01e6e4af88a3504", + "rev": "7002a34a7dfb4688a3c140d9480b23944e3f7c1b", "type": "github" }, "original": { @@ -288,11 +288,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1766209779, - "narHash": "sha256-aYOnrT1M5xxqn1Ka66jh9JspE9GejyX16bgA2Fex9dQ=", + "lastModified": 1766368023, + "narHash": "sha256-Qtgo/ptf+oiPVKP+lnXmrEWCddGOsMJMrwyH/GI04vI=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "3a174fe817fc39f09267a464d0ba93606aac7277", + "rev": "a27b7db4a7e6ea7a613c36ad45f5d9cf201c7603", "type": "github" }, "original": { @@ -321,11 +321,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1766207058, - "narHash": "sha256-7E45lo+Yt4zaOlrCQWGSGwvFKzS5MxlP0gPCkggy+8w=", + "lastModified": 1766229062, + "narHash": "sha256-8iBPfiM3w0m7Qrs3PyFyiN+I96ba4owEaSZ9ahgPdqM=", "owner": "YaLTeR", "repo": "niri", - "rev": "7a237e519c69ec493851ffac169abb3aa917a7b3", + "rev": "19e55a2df095d14f9490b79e38193ad4b4e87bb9", "type": "github" }, "original": { @@ -498,11 +498,11 @@ ] }, "locked": { - "lastModified": 1766198367, - "narHash": "sha256-f1L1rCEu2Zew6zdiZ38jJDZd65ktE7UN+Gqn2LHPiFI=", + "lastModified": 1766371695, + "narHash": "sha256-W7CX9vy7H2Jj3E8NI4djHyF8iHSxKpb2c/7uNQ/vGFU=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "66bb33fdfb50b1ee724381c3f5d6012dac6c89b3", + "rev": "d81285ba8199b00dc31847258cae3c655b605e8c", "type": "github" }, "original": { @@ -615,11 +615,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1765935116, - "narHash": "sha256-lNyckAdrhNKXsi9pNOBYajntNFlWs+BITVoIZuNuwX0=", + "lastModified": 1766363450, + "narHash": "sha256-buO37E9GTM4Qh1tvBjpSB/JGWN72EYKMUB/Lt8LrW7w=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "979eab242e60cf481a31d9de508a1bdaf2dcf7d4", + "rev": "bf738fffbb26669d0ba9d7a3ecdba3b47afa8a85", "type": "github" }, "original": { @@ -638,11 +638,11 @@ ] }, "locked": { - "lastModified": 1766204826, - "narHash": "sha256-NccmxYNOUHLLehsBLaeZ3QtVlDfIW1FDBe3W/kIDwa0=", + "lastModified": 1766359145, + "narHash": "sha256-/HbtppVEx4kkyNWHE+4yQXwx413qNam4Tix4WiJakog=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "4563d0ffdf586368f1bec1a39cc20c9b12b73884", + "rev": "5a0d4afa5a67a4e6df8116f97e27c10c9d47de6b", "type": "github" }, "original": { From bf931f3845afb4305d86667ac42516602d368d6c Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 24 Dec 2025 03:00:28 -0500 Subject: [PATCH 491/724] llama.cpp things --- home-manager/progs/opencode.nix | 16 +++++++-- system/common.nix | 1 + system/llama-cpp.nix | 60 +++++++++++++++++++++++++++++++++ 3 files changed, 74 insertions(+), 3 deletions(-) create mode 100644 system/llama-cpp.nix diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index 7c9f53f..282f399 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -24,7 +24,7 @@ ## Behavior Do not be sycophantic in your responses. Do not use emojis unless explicitly asked to. This includes in code. - ALWAYS test code before returning to the user with something you think works. Always verify your work. + Use Test Driven Development methodology. ## Nix For using `nix build` append `-L` to get better visibility into the logs. @@ -39,8 +39,7 @@ autoshare = false; autoupdate = true; - agent = { - }; + agent = { }; provider = { openrouter = { models = { @@ -52,6 +51,17 @@ apiKey = "{file:${../secrets/openrouter_api_key}}"; }; }; + # Local llama-cpp server with OpenAI-compatible API + "llama.cpp" = { + npm = "@ai-sdk/openai-compatible"; + options = { + baseURL = "http://127.0.0.1:8012/v1"; + }; + + models = { + "local" = { }; + }; + }; }; }; }; diff --git a/system/common.nix b/system/common.nix index c9756e4..06038ca 100644 --- a/system/common.nix +++ b/system/common.nix @@ -15,6 +15,7 @@ # ./vm.nix ./steam.nix ./networking.nix + ./llama-cpp.nix inputs.disko.nixosModules.disko inputs.lanzaboote.nixosModules.lanzaboote diff --git a/system/llama-cpp.nix b/system/llama-cpp.nix new file mode 100644 index 0000000..dcd9b5a --- /dev/null +++ b/system/llama-cpp.nix @@ -0,0 +1,60 @@ +{ + config, + pkgs, + lib, + hostname, + inputs, + ... +}: +let + # stolen from: https://stackoverflow.com/a/42398526 + optimizeWithFlags = + pkg: flags: + lib.overrideDerivation pkg ( + old: + let + newflags = lib.foldl' (acc: x: "${acc} ${x}") "" flags; + oldflags = if (lib.hasAttr "NIX_CFLAGS_COMPILE" old) then "${old.NIX_CFLAGS_COMPILE}" else ""; + in + { + NIX_CFLAGS_COMPILE = "${oldflags} ${newflags}"; + # stdenv = pkgs.clang19Stdenv; + } + ); + + optimizePackage = + pkg: + optimizeWithFlags pkg [ + "-O3" + "-march=znver5" + "-mtune=znver5" + ]; +in +{ + services.llama-cpp = { + enable = true; + model = pkgs.fetchurl { + url = "https://huggingface.co/bartowski/Nanbeige_Nanbeige4-3B-Thinking-2511-GGUF/resolve/main/Nanbeige_Nanbeige4-3B-Thinking-2511-IQ4_NL.gguf"; + sha256 = "c49cd4652cffc3da91986ac2c3dccdf9ab19afe007445f30fe83001eb29b44cf"; + }; + + host = "127.0.0.1"; + port = 8012; + package = pkgs.llama-cpp.override { vulkanSupport = true; }; + + extraFlags = [ + # Context size + "-c" + "32768" + + "-ngl" + "99" + + "--alias" + "local" + ]; + }; + + # have to do this in order to get vulkan to work + systemd.services.llama-cpp.serviceConfig.DynamicUser = lib.mkForce false; +} From 34c46050333ea604a87d844eb0f0087391c0ae4c Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 24 Dec 2025 03:05:23 -0500 Subject: [PATCH 492/724] fix mullvad version mismatch --- system/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/common.nix b/system/common.nix index 06038ca..4db9ce2 100644 --- a/system/common.nix +++ b/system/common.nix @@ -238,7 +238,7 @@ # System packages environment.systemPackages = with pkgs; [ - mullvad-vpn + # mullvad-vpn is provided by services.mullvad-vpn.enable #secureboot ctl sbctl From 22f4cfc675ffaf733806c69d12a7632aa3884814 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 24 Dec 2025 08:00:19 -0500 Subject: [PATCH 493/724] update --- flake.lock | 78 +++++++++++++++++++++++++++--------------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/flake.lock b/flake.lock index 522d942..034a1b2 100644 --- a/flake.lock +++ b/flake.lock @@ -83,11 +83,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1765960743, - "narHash": "sha256-zR+EfDMcyAWPSkkXauzaEcbzsKUoDMwNVVtJvsQSXqo=", + "lastModified": 1766534665, + "narHash": "sha256-CK+FiKpZtVKouX+V+8JSQDkzhVi5+51sA/w4TbKStTk=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "0dfb874b57690dbbddd8167792de5ea9ff9a7d76", + "rev": "85183e606dba606250367ad807b111de983d06e9", "type": "github" }, "original": { @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1766370686, - "narHash": "sha256-HZ1uIvsj/NTcvg6qzlHoZYKweQr0AT92puSnmeB6tuY=", + "lastModified": 1766567781, + "narHash": "sha256-BPN+JjLCl7LioqwfTmC63PKGWB1Y7oDJuNvvvfti8ss=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "db25d925f0d299cb32c38eb0d0e30cfb285245ca", + "rev": "4589ed86590aa7917d5dfa467f1f96394f2b406c", "type": "github" }, "original": { @@ -180,11 +180,11 @@ ] }, "locked": { - "lastModified": 1766282146, - "narHash": "sha256-0V/nKU93KdYGi+5LB/MVo355obBJw/2z9b2xS3bPJxY=", + "lastModified": 1766553851, + "narHash": "sha256-hHKQhHkXxuPJwLkI8wdu826GLV5AcuW9/HVdc9eBnTU=", "owner": "nix-community", "repo": "home-manager", - "rev": "61fcc9de76b88e55578eb5d79fc80f2b236df707", + "rev": "7eca7f7081036a7b740090994c9ec543927f89a7", "type": "github" }, "original": { @@ -216,11 +216,11 @@ ] }, "locked": { - "lastModified": 1766225187, - "narHash": "sha256-6hcaU8qtmixsaEUbjPiOFd5aJPZxAIBokl5d7dkab3k=", + "lastModified": 1766561058, + "narHash": "sha256-VFqsBWqFFBTBqKFw0fGw2a2mJjPP9HPW8nXEW2A5zJM=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "bb53a85db9210204a98f771f10f1f5b4e06ccb2d", + "rev": "9d0abe57d633a6e08d72865a761891a8c81e740f", "type": "github" }, "original": { @@ -261,11 +261,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1766372112, - "narHash": "sha256-C838MDCpDHu+AXd4TDt61K2wIRMOEMszsHqqQgL9CYM=", + "lastModified": 1766578041, + "narHash": "sha256-Plb7KOekejobcVCX9G9OZ9yfJQy8u/6fqn6pnjfEwh8=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "7002a34a7dfb4688a3c140d9480b23944e3f7c1b", + "rev": "c549c49f42ec6bf26893e69542de019e77faa910", "type": "github" }, "original": { @@ -288,11 +288,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1766368023, - "narHash": "sha256-Qtgo/ptf+oiPVKP+lnXmrEWCddGOsMJMrwyH/GI04vI=", + "lastModified": 1766517173, + "narHash": "sha256-zhb16f8hDVw7rsVNEIZQJOw78VQ4Eu3sjzwznxSzVtk=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "a27b7db4a7e6ea7a613c36ad45f5d9cf201c7603", + "rev": "ff40739a8a6d1f2890e91b5bedbb8f09e6c43e4f", "type": "github" }, "original": { @@ -321,11 +321,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1766229062, - "narHash": "sha256-8iBPfiM3w0m7Qrs3PyFyiN+I96ba4owEaSZ9ahgPdqM=", + "lastModified": 1766483519, + "narHash": "sha256-LRSUhcm2erq/v/6EkwVP86kdVyRSsZ+AYQgwsKJMwCM=", "owner": "YaLTeR", "repo": "niri", - "rev": "19e55a2df095d14f9490b79e38193ad4b4e87bb9", + "rev": "4d295418ce8e8e110060396bb485c4f0c381d37e", "type": "github" }, "original": { @@ -346,11 +346,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1766047659, - "narHash": "sha256-8jebwDZJbJ7rnZ7lJR22m9WsJk6ZPJtozK6HxpNeAEg=", + "lastModified": 1766566021, + "narHash": "sha256-MWxqdnpb8jcSCG422DUPmY5YJaS43cNBz/Ye+/zom8Y=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "d53bcf25afb8d0cc056217a85dc4cc07d639cc88", + "rev": "8ff96ee59daff42af952106313285dfefb7a3cad", "type": "github" }, "original": { @@ -398,11 +398,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1764440730, - "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=", + "lastModified": 1766568855, + "narHash": "sha256-UXVtN77D7pzKmzOotFTStgZBqpOcf8cO95FcupWp4Zo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3", + "rev": "c5db9569ac9cc70929c268ac461f4003e3e5ca80", "type": "github" }, "original": { @@ -414,11 +414,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1766070988, - "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=", + "lastModified": 1766309749, + "narHash": "sha256-3xY8CZ4rSnQ0NqGhMKAy5vgC+2IVK0NoVEzDoOh4DA4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8", + "rev": "a6531044f6d0bef691ea18d4d4ce44d0daa6e816", "type": "github" }, "original": { @@ -498,11 +498,11 @@ ] }, "locked": { - "lastModified": 1766371695, - "narHash": "sha256-W7CX9vy7H2Jj3E8NI4djHyF8iHSxKpb2c/7uNQ/vGFU=", + "lastModified": 1766544144, + "narHash": "sha256-5ppfEyZqX6FMluZHty7Dvw4xN10vLq1yQosp7dGG/28=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "d81285ba8199b00dc31847258cae3c655b605e8c", + "rev": "5359a4fdc3fa9baa2edcf49758d404dfeeca7743", "type": "github" }, "original": { @@ -615,11 +615,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1766363450, - "narHash": "sha256-buO37E9GTM4Qh1tvBjpSB/JGWN72EYKMUB/Lt8LrW7w=", + "lastModified": 1766429945, + "narHash": "sha256-9Kv4gWagx/u4RfZJzBMAoagW9ava5waxd+XoTkzqF7E=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "bf738fffbb26669d0ba9d7a3ecdba3b47afa8a85", + "rev": "0dde7ca1d3a8e8c5082533d76084e2aa02bef70e", "type": "github" }, "original": { @@ -638,11 +638,11 @@ ] }, "locked": { - "lastModified": 1766359145, - "narHash": "sha256-/HbtppVEx4kkyNWHE+4yQXwx413qNam4Tix4WiJakog=", + "lastModified": 1766410104, + "narHash": "sha256-Eh+TUdb4CGscBLG3Q6QOQOjEdPCmHPClGyeHf4F67Mk=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "5a0d4afa5a67a4e6df8116f97e27c10c9d47de6b", + "rev": "eaff1bc54b9a8bd698c2dc47823400460e9f38a0", "type": "github" }, "original": { From 46fd408b960b719f7195c0f9dec51a8b1f55a2a4 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 25 Dec 2025 03:11:44 -0500 Subject: [PATCH 494/724] update --- flake.lock | 60 +++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index 034a1b2..8b1ee0d 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ }, "crane": { "locked": { - "lastModified": 1765739568, - "narHash": "sha256-gQYx35Of4UDKUjAYvmxjUEh/DdszYeTtT6MDin4loGE=", + "lastModified": 1766194365, + "narHash": "sha256-4AFsUZ0kl6MXSm4BaQgItD0VGlEKR3iq7gIaL7TjBvc=", "owner": "ipetkov", "repo": "crane", - "rev": "67d2baff0f9f677af35db61b32b5df6863bcc075", + "rev": "7d8ec2c71771937ab99790b45e6d9b93d15d9379", "type": "github" }, "original": { @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1766567781, - "narHash": "sha256-BPN+JjLCl7LioqwfTmC63PKGWB1Y7oDJuNvvvfti8ss=", + "lastModified": 1766629658, + "narHash": "sha256-91VYIIS8Hg9EiZ03i3TRP6sngynSTvkp323NSwPGlS4=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "4589ed86590aa7917d5dfa467f1f96394f2b406c", + "rev": "c51a0f162582292fb4fb6524ae455f5b07937f9e", "type": "github" }, "original": { @@ -239,11 +239,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1766225539, - "narHash": "sha256-0Y6o3oUmQCxrzLIvZTcUAQCPEXAc+tU+N3ZjmzdrC28=", + "lastModified": 1766582277, + "narHash": "sha256-mUZRMKId7Uycwnt31RytPwhmY/8UTbk92ckZWHoS0Eg=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "14455220bef50f8df94f05e5763cdf51bc704acd", + "rev": "4c78502846c1ef668eedbd4f55d818ebac5388ac", "type": "github" }, "original": { @@ -261,11 +261,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1766578041, - "narHash": "sha256-Plb7KOekejobcVCX9G9OZ9yfJQy8u/6fqn6pnjfEwh8=", + "lastModified": 1766646264, + "narHash": "sha256-PucLpwugy43sf4eNTnZGXNiFQiuwTPHpGSPmQO0lo6s=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "c549c49f42ec6bf26893e69542de019e77faa910", + "rev": "cc7fd1a9d1effe5323f939433c4cf034248f6a7b", "type": "github" }, "original": { @@ -288,11 +288,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1766517173, - "narHash": "sha256-zhb16f8hDVw7rsVNEIZQJOw78VQ4Eu3sjzwznxSzVtk=", + "lastModified": 1766648798, + "narHash": "sha256-3gO5c6r1ldr9IfL2JXjCD96PJLIBpxwACgOoLhod1Gg=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "ff40739a8a6d1f2890e91b5bedbb8f09e6c43e4f", + "rev": "aa880b9f44ec1319546362d05776f5a167341c7b", "type": "github" }, "original": { @@ -321,11 +321,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1766483519, - "narHash": "sha256-LRSUhcm2erq/v/6EkwVP86kdVyRSsZ+AYQgwsKJMwCM=", + "lastModified": 1766645570, + "narHash": "sha256-4JPTr1GhX+VbscihE7PxYJraygOA7UduAPfFTXKV+Dw=", "owner": "YaLTeR", "repo": "niri", - "rev": "4d295418ce8e8e110060396bb485c4f0c381d37e", + "rev": "1a63089d67739da92259aefa57fc3785ef8d8d8f", "type": "github" }, "original": { @@ -438,11 +438,11 @@ ] }, "locked": { - "lastModified": 1765464257, - "narHash": "sha256-dixPWKiHzh80PtD0aLuxYNQ0xP+843dfXG/yM3OzaYQ=", + "lastModified": 1765911976, + "narHash": "sha256-t3T/xm8zstHRLx+pIHxVpQTiySbKqcQbK+r+01XVKc0=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "09e45f2598e1a8499c3594fe11ec2943f34fe509", + "rev": "b68b780b69702a090c8bb1b973bab13756cc7a27", "type": "github" }, "original": { @@ -478,11 +478,11 @@ ] }, "locked": { - "lastModified": 1765680428, - "narHash": "sha256-fyPmRof9SZeI14ChPk5rVPOm7ISiiGkwGCunkhM+eUg=", + "lastModified": 1766285238, + "narHash": "sha256-DqVXFZ4ToiFHgnxebMWVL70W+U+JOxpmfD37eWD/Qc8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "eb3898d8ef143d4bf0f7f2229105fc51c7731b2f", + "rev": "c4249d0c370d573d95e33b472014eae4f2507c2f", "type": "github" }, "original": { @@ -498,11 +498,11 @@ ] }, "locked": { - "lastModified": 1766544144, - "narHash": "sha256-5ppfEyZqX6FMluZHty7Dvw4xN10vLq1yQosp7dGG/28=", + "lastModified": 1766630657, + "narHash": "sha256-wW15buPGU29v0XuAmDkc30+d5j4Tmg/V8AkpHH+hDWY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "5359a4fdc3fa9baa2edcf49758d404dfeeca7743", + "rev": "3bf67c5e473f29ca79ff15904f3072d87cf6d087", "type": "github" }, "original": { @@ -638,11 +638,11 @@ ] }, "locked": { - "lastModified": 1766410104, - "narHash": "sha256-Eh+TUdb4CGscBLG3Q6QOQOjEdPCmHPClGyeHf4F67Mk=", + "lastModified": 1766614843, + "narHash": "sha256-upUQfQv7Xiy5IZzfsVOL0lH4A/wuUQjG2jlzmBmVuwU=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "eaff1bc54b9a8bd698c2dc47823400460e9f38a0", + "rev": "b01d17acbec3d1b76fecf500289d8509da202585", "type": "github" }, "original": { From ea9510edd485133306f8ec2a0a2744801b168499 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 25 Dec 2025 03:59:31 -0500 Subject: [PATCH 495/724] opencode: move to glm 4.7 (free) --- home-manager/progs/opencode.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index 282f399..3478d3e 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -33,7 +33,7 @@ settings = { theme = "opencode"; - model = "openrouter/mistralai/devstral-2512:free"; + model = "z-ai/glm-4.7"; # small model used for titles small_model = "openrouter/openai/gpt-oss-20b:free"; @@ -44,7 +44,6 @@ openrouter = { models = { "openai/gpt-oss-20b:free" = { }; - "mistralai/devstral-2512:free" = { }; }; options = { # TODO! use agenix here instead From 56d9a5ddfe3d3cbf9714f99c4ca6b036bfff7882 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 25 Dec 2025 04:00:17 -0500 Subject: [PATCH 496/724] llama-cpp: remove --- home-manager/progs/opencode.nix | 11 ------ system/common.nix | 1 - system/llama-cpp.nix | 60 --------------------------------- 3 files changed, 72 deletions(-) delete mode 100644 system/llama-cpp.nix diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index 3478d3e..eaed9ff 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -50,17 +50,6 @@ apiKey = "{file:${../secrets/openrouter_api_key}}"; }; }; - # Local llama-cpp server with OpenAI-compatible API - "llama.cpp" = { - npm = "@ai-sdk/openai-compatible"; - options = { - baseURL = "http://127.0.0.1:8012/v1"; - }; - - models = { - "local" = { }; - }; - }; }; }; }; diff --git a/system/common.nix b/system/common.nix index 4db9ce2..c5727d2 100644 --- a/system/common.nix +++ b/system/common.nix @@ -15,7 +15,6 @@ # ./vm.nix ./steam.nix ./networking.nix - ./llama-cpp.nix inputs.disko.nixosModules.disko inputs.lanzaboote.nixosModules.lanzaboote diff --git a/system/llama-cpp.nix b/system/llama-cpp.nix deleted file mode 100644 index dcd9b5a..0000000 --- a/system/llama-cpp.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ - config, - pkgs, - lib, - hostname, - inputs, - ... -}: -let - # stolen from: https://stackoverflow.com/a/42398526 - optimizeWithFlags = - pkg: flags: - lib.overrideDerivation pkg ( - old: - let - newflags = lib.foldl' (acc: x: "${acc} ${x}") "" flags; - oldflags = if (lib.hasAttr "NIX_CFLAGS_COMPILE" old) then "${old.NIX_CFLAGS_COMPILE}" else ""; - in - { - NIX_CFLAGS_COMPILE = "${oldflags} ${newflags}"; - # stdenv = pkgs.clang19Stdenv; - } - ); - - optimizePackage = - pkg: - optimizeWithFlags pkg [ - "-O3" - "-march=znver5" - "-mtune=znver5" - ]; -in -{ - services.llama-cpp = { - enable = true; - model = pkgs.fetchurl { - url = "https://huggingface.co/bartowski/Nanbeige_Nanbeige4-3B-Thinking-2511-GGUF/resolve/main/Nanbeige_Nanbeige4-3B-Thinking-2511-IQ4_NL.gguf"; - sha256 = "c49cd4652cffc3da91986ac2c3dccdf9ab19afe007445f30fe83001eb29b44cf"; - }; - - host = "127.0.0.1"; - port = 8012; - package = pkgs.llama-cpp.override { vulkanSupport = true; }; - - extraFlags = [ - # Context size - "-c" - "32768" - - "-ngl" - "99" - - "--alias" - "local" - ]; - }; - - # have to do this in order to get vulkan to work - systemd.services.llama-cpp.serviceConfig.DynamicUser = lib.mkForce false; -} From 96d25e5ef8d9ea4bf719a48cbd2a34f337ea335a Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 25 Dec 2025 04:19:35 -0500 Subject: [PATCH 497/724] initrd: migrate to systemd-initrd --- system/common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/system/common.nix b/system/common.nix index c5727d2..5a9db90 100644 --- a/system/common.nix +++ b/system/common.nix @@ -110,6 +110,7 @@ }; initrd = { + systemd.enable = true; compressor = "zstd"; availableKernelModules = [ "xhci_pci" From 90610ab1d800da5493cfa4751461e6c67e71e769 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 26 Dec 2025 14:00:24 -0500 Subject: [PATCH 498/724] update --- flake.lock | 60 +++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index 8b1ee0d..625aede 100644 --- a/flake.lock +++ b/flake.lock @@ -83,11 +83,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1766534665, - "narHash": "sha256-CK+FiKpZtVKouX+V+8JSQDkzhVi5+51sA/w4TbKStTk=", + "lastModified": 1766618641, + "narHash": "sha256-/zLb6YzJJ3ZnTCjmakOOt83qtQiF9+GJ2NesFk+c8WM=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "85183e606dba606250367ad807b111de983d06e9", + "rev": "21682009b155c0b67ec47100e09cad3b298aa52f", "type": "github" }, "original": { @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1766629658, - "narHash": "sha256-91VYIIS8Hg9EiZ03i3TRP6sngynSTvkp323NSwPGlS4=", + "lastModified": 1766769109, + "narHash": "sha256-oW8ZBTNxmdQ2Sa0LO8sbHFbBC6j0y+W7OZBUn4OaKe8=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "c51a0f162582292fb4fb6524ae455f5b07937f9e", + "rev": "b2f86a72a5f491b2d761c5a5091364b93f9ecad0", "type": "github" }, "original": { @@ -180,11 +180,11 @@ ] }, "locked": { - "lastModified": 1766553851, - "narHash": "sha256-hHKQhHkXxuPJwLkI8wdu826GLV5AcuW9/HVdc9eBnTU=", + "lastModified": 1766682973, + "narHash": "sha256-GKO35onS711ThCxwWcfuvbIBKXwriahGqs+WZuJ3v9E=", "owner": "nix-community", "repo": "home-manager", - "rev": "7eca7f7081036a7b740090994c9ec543927f89a7", + "rev": "91cdb0e2d574c64fae80d221f4bf09d5592e9ec2", "type": "github" }, "original": { @@ -261,11 +261,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1766646264, - "narHash": "sha256-PucLpwugy43sf4eNTnZGXNiFQiuwTPHpGSPmQO0lo6s=", + "lastModified": 1766758582, + "narHash": "sha256-4ppTzdCHmCe3QDL8l2dZLlSzxlIIjQTo7prTmJBAdd0=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "cc7fd1a9d1effe5323f939433c4cf034248f6a7b", + "rev": "b8e3f88008187faa078341504b6a84ba522af511", "type": "github" }, "original": { @@ -288,11 +288,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1766648798, - "narHash": "sha256-3gO5c6r1ldr9IfL2JXjCD96PJLIBpxwACgOoLhod1Gg=", + "lastModified": 1766765523, + "narHash": "sha256-DCk3GKdKZNjpvNuDy9ZVfVwCy3tlm96/UZnYkJO7N44=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "aa880b9f44ec1319546362d05776f5a167341c7b", + "rev": "a3e638c75d07de759421e6f34bd69c3f9a0a3567", "type": "github" }, "original": { @@ -321,11 +321,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1766645570, - "narHash": "sha256-4JPTr1GhX+VbscihE7PxYJraygOA7UduAPfFTXKV+Dw=", + "lastModified": 1766751930, + "narHash": "sha256-83/YSW6c58i/iwGzAFApuMy6MCgoIaROeCcoIGh+ViU=", "owner": "YaLTeR", "repo": "niri", - "rev": "1a63089d67739da92259aefa57fc3785ef8d8d8f", + "rev": "b5640d5293ad8dca06cb447692ea7cbb21680eb1", "type": "github" }, "original": { @@ -346,11 +346,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1766566021, - "narHash": "sha256-MWxqdnpb8jcSCG422DUPmY5YJaS43cNBz/Ye+/zom8Y=", + "lastModified": 1766738714, + "narHash": "sha256-7kIfulmTW1aHEYVF8jLACdzbUJPrYerMXrcUB1NSyDk=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "8ff96ee59daff42af952106313285dfefb7a3cad", + "rev": "726300f3861897c2e5519acd3dd74ca8aea16b62", "type": "github" }, "original": { @@ -414,11 +414,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1766309749, - "narHash": "sha256-3xY8CZ4rSnQ0NqGhMKAy5vgC+2IVK0NoVEzDoOh4DA4=", + "lastModified": 1766651565, + "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a6531044f6d0bef691ea18d4d4ce44d0daa6e816", + "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539", "type": "github" }, "original": { @@ -498,11 +498,11 @@ ] }, "locked": { - "lastModified": 1766630657, - "narHash": "sha256-wW15buPGU29v0XuAmDkc30+d5j4Tmg/V8AkpHH+hDWY=", + "lastModified": 1766717007, + "narHash": "sha256-ZjLiHCHgoH2maP5ZAKn0anrHymbjGOS5/PZqfJUK8Ik=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "3bf67c5e473f29ca79ff15904f3072d87cf6d087", + "rev": "a18efe8a9112175e43397cf870fb6bc1ca480548", "type": "github" }, "original": { @@ -638,11 +638,11 @@ ] }, "locked": { - "lastModified": 1766614843, - "narHash": "sha256-upUQfQv7Xiy5IZzfsVOL0lH4A/wuUQjG2jlzmBmVuwU=", + "lastModified": 1766697593, + "narHash": "sha256-mGZBEN67mxeOsBhplBRLm6L+y++8jU46EEUYgemG1aQ=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "b01d17acbec3d1b76fecf500289d8509da202585", + "rev": "98d8f48ba80a4b6e3b56addad850d57132301075", "type": "github" }, "original": { From ef5b048f145fde733bd51ec0d3c45d5474a44e3a Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 29 Dec 2025 14:40:05 -0500 Subject: [PATCH 499/724] update --- flake.lock | 66 +++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index 625aede..73f5d74 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ }, "crane": { "locked": { - "lastModified": 1766194365, - "narHash": "sha256-4AFsUZ0kl6MXSm4BaQgItD0VGlEKR3iq7gIaL7TjBvc=", + "lastModified": 1766774972, + "narHash": "sha256-8qxEFpj4dVmIuPn9j9z6NTbU+hrcGjBOvaxTzre5HmM=", "owner": "ipetkov", "repo": "crane", - "rev": "7d8ec2c71771937ab99790b45e6d9b93d15d9379", + "rev": "01bc1d404a51a0a07e9d8759cd50a7903e218c82", "type": "github" }, "original": { @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1766769109, - "narHash": "sha256-oW8ZBTNxmdQ2Sa0LO8sbHFbBC6j0y+W7OZBUn4OaKe8=", + "lastModified": 1767028469, + "narHash": "sha256-855Z4/UuinyyplJ1Ayw5sRlGqpX1s0kiCkh+pFgXiw4=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "b2f86a72a5f491b2d761c5a5091364b93f9ecad0", + "rev": "e434cb40e1a77ef70a4d8a848ccca91d0a7e42ad", "type": "github" }, "original": { @@ -180,11 +180,11 @@ ] }, "locked": { - "lastModified": 1766682973, - "narHash": "sha256-GKO35onS711ThCxwWcfuvbIBKXwriahGqs+WZuJ3v9E=", + "lastModified": 1766980997, + "narHash": "sha256-oegDNAvyQwaG3GqSi4U5jpKM7SYHGESGVIuKMRV/lbw=", "owner": "nix-community", "repo": "home-manager", - "rev": "91cdb0e2d574c64fae80d221f4bf09d5592e9ec2", + "rev": "7a7b43c7231a439d248179ba8d561dd6cd81799b", "type": "github" }, "original": { @@ -239,11 +239,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1766582277, - "narHash": "sha256-mUZRMKId7Uycwnt31RytPwhmY/8UTbk92ckZWHoS0Eg=", + "lastModified": 1767013031, + "narHash": "sha256-p8ANXBakAtfX/aEhLbU6w0tuQe3nrBvLdHbKirJP7ug=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "4c78502846c1ef668eedbd4f55d818ebac5388ac", + "rev": "c2a82339373daee8cbbcad5f51f22ae6b71069e0", "type": "github" }, "original": { @@ -261,11 +261,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1766758582, - "narHash": "sha256-4ppTzdCHmCe3QDL8l2dZLlSzxlIIjQTo7prTmJBAdd0=", + "lastModified": 1767018837, + "narHash": "sha256-sMa8NaM/nfElqiezqVdrg20BqRlfz/olk48hU0Mc5OU=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "b8e3f88008187faa078341504b6a84ba522af511", + "rev": "edcea569dfdadb140d6e6960bdf91ecda19b3696", "type": "github" }, "original": { @@ -288,11 +288,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1766765523, - "narHash": "sha256-DCk3GKdKZNjpvNuDy9ZVfVwCy3tlm96/UZnYkJO7N44=", + "lastModified": 1767006817, + "narHash": "sha256-dQwprSLwnGSX9UG6PzTLydPhpAqhtkoWRj0MZiA1h9k=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "a3e638c75d07de759421e6f34bd69c3f9a0a3567", + "rev": "e24815f0bc94b0e7134d8ac31a061f11d1a20524", "type": "github" }, "original": { @@ -346,11 +346,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1766738714, - "narHash": "sha256-7kIfulmTW1aHEYVF8jLACdzbUJPrYerMXrcUB1NSyDk=", + "lastModified": 1766998163, + "narHash": "sha256-MEMdc9f0ZUxBTBd26deeHEq5QEAlPtVVIx85qfTJOkA=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "726300f3861897c2e5519acd3dd74ca8aea16b62", + "rev": "d2474fae63af528dbdb793f0a01f6c1f102fac45", "type": "github" }, "original": { @@ -414,11 +414,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1766651565, - "narHash": "sha256-QEhk0eXgyIqTpJ/ehZKg9IKS7EtlWxF3N7DXy42zPfU=", + "lastModified": 1766902085, + "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e2499d5539c16d0d173ba53552a4ff8547f4539", + "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4", "type": "github" }, "original": { @@ -478,11 +478,11 @@ ] }, "locked": { - "lastModified": 1766285238, - "narHash": "sha256-DqVXFZ4ToiFHgnxebMWVL70W+U+JOxpmfD37eWD/Qc8=", + "lastModified": 1766976750, + "narHash": "sha256-w+o3AIBI56tzfMJRqRXg9tSXnpQRN5hAT15o2t9rxYw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c4249d0c370d573d95e33b472014eae4f2507c2f", + "rev": "9fe44e7f05b734a64a01f92fc51ad064fb0a884f", "type": "github" }, "original": { @@ -498,11 +498,11 @@ ] }, "locked": { - "lastModified": 1766717007, - "narHash": "sha256-ZjLiHCHgoH2maP5ZAKn0anrHymbjGOS5/PZqfJUK8Ik=", + "lastModified": 1766976750, + "narHash": "sha256-w+o3AIBI56tzfMJRqRXg9tSXnpQRN5hAT15o2t9rxYw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a18efe8a9112175e43397cf870fb6bc1ca480548", + "rev": "9fe44e7f05b734a64a01f92fc51ad064fb0a884f", "type": "github" }, "original": { @@ -638,11 +638,11 @@ ] }, "locked": { - "lastModified": 1766697593, - "narHash": "sha256-mGZBEN67mxeOsBhplBRLm6L+y++8jU46EEUYgemG1aQ=", + "lastModified": 1766897152, + "narHash": "sha256-mD1GDg1eIHYUwk536j4uJX1IfQArsLQm2SL7rTQwAPI=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "98d8f48ba80a4b6e3b56addad850d57132301075", + "rev": "fe8d1a61a904b336f453d7ab5ae7d691a21c5cbf", "type": "github" }, "original": { From d0c4c26d9ada4a4939fcddf990e4c1e07b33c2af Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 29 Dec 2025 15:28:04 -0500 Subject: [PATCH 500/724] wifi: move to ensureProfiles --- system/common.nix | 1 - system/declarative-nm.nix | 51 ------------------------------ system/networking.nix | 4 +-- system/secrets/wifi-passwords.nix | Bin 947 -> 2842 bytes 4 files changed, 2 insertions(+), 54 deletions(-) delete mode 100644 system/declarative-nm.nix diff --git a/system/common.nix b/system/common.nix index 5a9db90..aa67120 100644 --- a/system/common.nix +++ b/system/common.nix @@ -11,7 +11,6 @@ }: { imports = [ - ./declarative-nm.nix # ./vm.nix ./steam.nix ./networking.nix diff --git a/system/declarative-nm.nix b/system/declarative-nm.nix deleted file mode 100644 index c011896..0000000 --- a/system/declarative-nm.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -# from: https://discourse.nixos.org/t/imperative-declarative-wifi-networks-with-wpa-supplicant/12394/6 -let - cfg = config.networking.networkmanager; - - getFileName = lib.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] - ${lib.optionalString (opt.psk != null) '' - key-mgmt=wpa-psk - psk=${opt.psk}''} - ''; - }; - }; - - keyFiles = lib.mapAttrs' createWifi config.networking.wireless.networks; -in -{ - config = lib.mkIf cfg.enable { - environment.etc = keyFiles; - - systemd.services.NetworkManager-predefined-connections = { - restartTriggers = lib.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" ]; - }; - }; -} diff --git a/system/networking.nix b/system/networking.nix index 976aaa9..b47530e 100644 --- a/system/networking.nix +++ b/system/networking.nix @@ -19,8 +19,8 @@ # fix suspend issue powersave = false; }; - }; - wireless.networks = import ./secrets/wifi-passwords.nix; + ensureProfiles.profiles = import ./secrets/wifi-passwords.nix; + }; }; } diff --git a/system/secrets/wifi-passwords.nix b/system/secrets/wifi-passwords.nix index 42d15a52b24a027788a0de7c027940b3731b2300..f00fd26ea8875614babb85d1179a5b91d782eb2e 100644 GIT binary patch literal 2842 zcmZQ@_Y83kiVO&0i0a!vh3n?a?Fv=5{~3x~9v4ZM-SMo}{kKY&Usm3Jz1+2RX%&nX;uKhC93VO%aL|oc{k6gZ;|z#5M}uFgIO)VeX*Xi)-zbdSoZLeg#`rL+1&9!%489kXBe_FV#$<@6} zQLUT(*-ugTwVy7p*(2q5^{oBpKWXQ*-)?R?;24wNduYnDZ_)1~;#DJsSe8-e}}o#J)^BoYkH7=*or^ue(on{Y)@FdbBA^@xW5KfJ0fbYm!ws zXFWgobux2i-LKac_up097`UWF$+UI`zq$MP*4di*qH9zG+;;J*o^pA8((3pQ&ss*0 zi6T73|C%q9?NHq7eCwc)(aV;@S0uMAeX+*Z&N|u8de{4$YkJenpFbz`Nu}4H7W2DS zdMQmmvcEX+^W7-POH-xZH?VGa!!UIV-=@o@9@3d>r0ocIP8_Qf_c3iPwdu3pOl?jISe1awJSNg>Fn9Ria%^sw%?Ad zws%n9o6coba$59EX};UJ>oqo&ksohuzF?C3O@Bk=@5P zn5;Tu@<;aW#)z-KbQXVN+N^TY^+D&fS)Fa>x98Uh_Oq2a9oo7xDpITL-f zxjrAietld1d?l;i>ABYz*zr2*>?n7dtGD*r?K!J09Ir{7uTI%3{^%1=;E!cHUrpX5 zb0#3VK6|qXuf&XtKHD8~#I;mv1NL7v@(-5!eAu0*rptI!Tg#6CL-XXX=lSCgd8tfm z3*uXte|)~vq{@BYVrNDtnl267_HTvVBF-r9-`-jUN3K4aWc$24ZPE^lXNyZj(;uBU zU1rBP?ZYNF_e%TO9mZ}^Hoig@+xUz^m4ohBdMc>07Cz25w<+BedQI@M`>7=-y7%|< zRwVu5-g>ESvfC*R$-_FGV%r)NwRFNo5h>Gx=EwS zS-djw&C3;Y)%GSOXPZbXtvA}wmft#&tt!A`6V1`vbAA5A?ZWjY z#dl+Lw?4b*KkwzTlhb%-6s`AG`Ea~cz?)g|snuG>HPb=_xu$x|`u)MbVp6lnxu-f0 zo=7}rU(lZ;vhVZGd+KF#7EH2SR`GY2o-&(giI$N*^MSvs8I&T56;5vFb`*U6=xouC zD}s@+0x5GJZFuXo!VYfYcb6BmxHY}xVi+Sy|35RSv;riQ`4T~@2@&`*0|5PP|t=|hF@Z0k)g z)>US)T-(X17S&SJ`>fl$yZ*EFasJn<#Pt#%?Re%_q;}A2qQaZZzNT1)(kAwWJVw`( z&8P8p+&}%~>Y`re`EES3~SpFUN^4sYs{#$tz~Ho?GrvU|&}- zSEOmt{nGl@6P$PdE}j?p!nff7euvAw4t z|8G{j*`3WZZ$D0!nkdA6h$~gGea`#ZfM@fz6maihe#7K`WcsEFJ_dQyzAARGubB8} zeQM?QS@F%c%B5Cr%s*JZ!7^cMYPRm}?I}}@&oA43vhTu!()87G-wh>R%`WKPdT(F- zdq%H3_cu#f?552%_gwq!`MhOULNlHR2WL#&@QTTyfXUW6^$X{LPcF`dn)4kio{P@D z|9s1)Igt}5&bU*i>lwi!Co!!+CH(U{we*==T=<0B_isC_!s)}fY~S{*b30n~m^MF5 zxS_aMu9kr(?$x;#<=md0o-O*bPM`5v8beK7w#pWUZU0hK4(A$Ms!Y2OrI2*sdis@$x1C|a zOAPd!q$gR~bw0?tx_hOsq~PW4?dGTF7u=k3U~=y4mF<~tgp0R^+ALZjaGKLL=FyCG z@4mD}Fjd6;n!{VaYH_jo+BZMBwAm(Yz2470bGydGn6mDB^OfBet}gv~?aZggpO?nG zy)sALw4y0;rsQO;>-#ooP2K+1@65IZHRk#9x7Sp>kaB%_zF9c*d4_Gv@%Svx-10E5 zmHoRaCRZLlutYQRM*5Gct2?LOYmm?{E-q2Hnf_Oz-*x}>No>c(T#6;9y0D2({r2Wy z`>vHKib}jEr)aE+E|@lptMmNwD;>dIT;>Z;H8Q<4p!M%_UK=JCUo1& zAK#|vx+)27=H}5nvE1Bw|4|Q9`OYFYM(&^ndkfi^Wi@a0j=!-A$P=jLp1pNrl)6|? zw@iWI+uh$ArPV$%K3Xial|?3L@BcY0b6#!#3#P05UJObm29?pSGICLxK^?}S-qy{ z*^Q4{6N5q)ur53KxU$pxrLX_>CE=>#PLf=0d!70BvF_0|W>_U*!KTswL*7q9L}gdN zm8%~OS^^IBRp;<8`dlS5IY3^I@6UdlAAPQ+(L%qjEiU&nDB|1uL3F{Avl>rk{9dO# zOKX++tc&R(pOSejlBDHqWW%Ym1L$GDj5 lwpI$S;7@mJFMsMX`K<1-OUJ^rXIU0K>N=ZmYL|FpF#x;hacKYm literal 947 zcmZQ@_Y83kiVO&0xLDpOd+4&JyY1Qrjk<6R+0!qWh1Ao+?wvX6epT%5?O(5!FXCRN z<-42vM#QGP^J20$&bI3$L>0)3{F#z;GjAu`KL@QP4=bjw)o|`{lUiJ5AlMSSj(;1s z&c91XdR|m#ywb{%{;9=zS28+!_0QnjhjiB;H+aJGT&pndtj{mykJ-o5dJ2BEEL!m9 z|A~J8ly`!Q%MY80?pV%zbH^IlZI}MfblPZj;*)Dp{@>gdq0PLFyB56DS;4xLIem`N z%QqbwT+3G9F6S3Iq$P8gU&*IIu34$)M9rUf<_G=%f82HJ*rwn91s|FVD%yCRDobqbTh)E>{;rN;l7$+Y9ZvPJ$28u-h)z>$TV^iszyE~bFYUEoO;jb% zt(#*y!=dNR|7Vp_yX?GqKFCaFa;VGk(rhnaHK z`dX%UXO!}NI)6cP^VYY1x=Zi;_J1SkqtWpBy{p^Cf0JY07(f5x(kvQt_ML{&(?`$c z)e{OOT&^?87BA*gN#>tt;`@6>#u-id__W4c%gK!YW3viQZH@Zzb^Vd3jogvN$?KoI zKd{VThs4{d77@CCYdP{e{`-`@)8n!{a=Tn%HzSjkj-&UAh4Lock0RsjT<-1t_cUpJ z)? Date: Mon, 29 Dec 2025 15:28:28 -0500 Subject: [PATCH 501/724] wifi: re-enable wifi power savings --- system/networking.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/networking.nix b/system/networking.nix index b47530e..0cc23ca 100644 --- a/system/networking.nix +++ b/system/networking.nix @@ -17,7 +17,7 @@ wifi = { scanRandMacAddress = true; # fix suspend issue - powersave = false; + # powersave = false; }; ensureProfiles.profiles = import ./secrets/wifi-passwords.nix; From e8b3a72896f52c55202abfe43bd56e543d4b9dc8 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 5 Jan 2026 16:59:13 -0500 Subject: [PATCH 502/724] update --- flake.lock | 90 +++++++++++++++++++++++++++--------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/flake.lock b/flake.lock index 73f5d74..c5ae772 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1763308703, - "narHash": "sha256-O9Y+Wer8wOh+N+4kcCK5p/VLrXyX+ktk0/s3HdZvJzk=", + "lastModified": 1767386128, + "narHash": "sha256-BJDu7dIMauO2nYRSL4aI8wDNtEm2KOb7lDKP3hxdrpo=", "owner": "numtide", "repo": "blueprint", - "rev": "5a9bba070f801d63e2af3c9ef00b86b212429f4f", + "rev": "0ed984d51a3031065925ab08812a5434f40b93d4", "type": "github" }, "original": { @@ -83,11 +83,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1766618641, - "narHash": "sha256-/zLb6YzJJ3ZnTCjmakOOt83qtQiF9+GJ2NesFk+c8WM=", + "lastModified": 1767229380, + "narHash": "sha256-Uc6qONH3jjUVDgW+pPBCGC7mh88ZY05u1y37fQrsxq0=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "21682009b155c0b67ec47100e09cad3b298aa52f", + "rev": "38d94da67dc84897a4318714dcc48494c016d8c4", "type": "github" }, "original": { @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1767028469, - "narHash": "sha256-855Z4/UuinyyplJ1Ayw5sRlGqpX1s0kiCkh+pFgXiw4=", + "lastModified": 1767633352, + "narHash": "sha256-3xuGNsENX27IP4ZQOOfkZo7RL+AP8MH298rj6NGCztA=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "e434cb40e1a77ef70a4d8a848ccca91d0a7e42ad", + "rev": "867150b00f5d212258f48787b741ff145b24e2bc", "type": "github" }, "original": { @@ -180,11 +180,11 @@ ] }, "locked": { - "lastModified": 1766980997, - "narHash": "sha256-oegDNAvyQwaG3GqSi4U5jpKM7SYHGESGVIuKMRV/lbw=", + "lastModified": 1767619743, + "narHash": "sha256-N0kK1JqxIjFl7hPAfhkW6C9AO7feYJUWLPyqJO2VuQQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "7a7b43c7231a439d248179ba8d561dd6cd81799b", + "rev": "a65c04965c841eb01ba401f5162f12bc8d52014f", "type": "github" }, "original": { @@ -216,11 +216,11 @@ ] }, "locked": { - "lastModified": 1766561058, - "narHash": "sha256-VFqsBWqFFBTBqKFw0fGw2a2mJjPP9HPW8nXEW2A5zJM=", + "lastModified": 1767082077, + "narHash": "sha256-2tL1mRb9uFJThUNfuDm/ehrnPvImL/QDtCxfn71IEz4=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "9d0abe57d633a6e08d72865a761891a8c81e740f", + "rev": "efd4b22e6fdc6d7fb4e186ae333a4b74e03da440", "type": "github" }, "original": { @@ -239,11 +239,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1767013031, - "narHash": "sha256-p8ANXBakAtfX/aEhLbU6w0tuQe3nrBvLdHbKirJP7ug=", + "lastModified": 1767618050, + "narHash": "sha256-ASAOWk0bZnK7F5w54j22JQaYHQCbeEBTt4J6kkOcUiI=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "c2a82339373daee8cbbcad5f51f22ae6b71069e0", + "rev": "0d57507b648c2dd658165843f98acbf55fdbc23b", "type": "github" }, "original": { @@ -261,11 +261,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1767018837, - "narHash": "sha256-sMa8NaM/nfElqiezqVdrg20BqRlfz/olk48hU0Mc5OU=", + "lastModified": 1767633439, + "narHash": "sha256-5yW/iVS9vrMe04N1B2hf08io1lS+7FPEtgm2w33FXyI=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "edcea569dfdadb140d6e6960bdf91ecda19b3696", + "rev": "542b1915e9e5b40e99210fd84ffe7c8c9eeda4ae", "type": "github" }, "original": { @@ -288,11 +288,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1767006817, - "narHash": "sha256-dQwprSLwnGSX9UG6PzTLydPhpAqhtkoWRj0MZiA1h9k=", + "lastModified": 1767624540, + "narHash": "sha256-A53/9fnu/40wo6T2MF3lm07zD7N+cC0E5QEYFfFLGwA=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "e24815f0bc94b0e7134d8ac31a061f11d1a20524", + "rev": "62e47d55c0f8bc9cd5413b94134867d970e5e296", "type": "github" }, "original": { @@ -321,11 +321,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1766751930, - "narHash": "sha256-83/YSW6c58i/iwGzAFApuMy6MCgoIaROeCcoIGh+ViU=", + "lastModified": 1767598098, + "narHash": "sha256-IyH3zaCT2JZ6fdY4vKlUz2RbDdxaryvSZWUVixKYrKM=", "owner": "YaLTeR", "repo": "niri", - "rev": "b5640d5293ad8dca06cb447692ea7cbb21680eb1", + "rev": "b7eb8a635b7f75705808eaed85c016f02ae4fd2d", "type": "github" }, "original": { @@ -346,11 +346,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1766998163, - "narHash": "sha256-MEMdc9f0ZUxBTBd26deeHEq5QEAlPtVVIx85qfTJOkA=", + "lastModified": 1767603080, + "narHash": "sha256-LKg5MicVxzczP7dN0xGBX3ZG/BxVxGQbZHWy583Bs+w=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "d2474fae63af528dbdb793f0a01f6c1f102fac45", + "rev": "8b9dcfca5130c6f35ba23405f7fad779affa97e6", "type": "github" }, "original": { @@ -398,11 +398,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1766568855, - "narHash": "sha256-UXVtN77D7pzKmzOotFTStgZBqpOcf8cO95FcupWp4Zo=", + "lastModified": 1767185284, + "narHash": "sha256-ljDBUDpD1Cg5n3mJI81Hz5qeZAwCGxon4kQW3Ho3+6Q=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "c5db9569ac9cc70929c268ac461f4003e3e5ca80", + "rev": "40b1a28dce561bea34858287fbb23052c3ee63fe", "type": "github" }, "original": { @@ -414,11 +414,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1766902085, - "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=", + "lastModified": 1767379071, + "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4", + "rev": "fb7944c166a3b630f177938e478f0378e64ce108", "type": "github" }, "original": { @@ -498,11 +498,11 @@ ] }, "locked": { - "lastModified": 1766976750, - "narHash": "sha256-w+o3AIBI56tzfMJRqRXg9tSXnpQRN5hAT15o2t9rxYw=", + "lastModified": 1767581716, + "narHash": "sha256-FUbiUzdrGkLou37OGfb4vCLPnqdSIvtmJBxjh2iljiE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "9fe44e7f05b734a64a01f92fc51ad064fb0a884f", + "rev": "1d3f83babdd21e16bf5cfe0f1efcb4f49ee1bc2c", "type": "github" }, "original": { @@ -564,11 +564,11 @@ ] }, "locked": { - "lastModified": 1766000401, - "narHash": "sha256-+cqN4PJz9y0JQXfAK5J1drd0U05D5fcAGhzhfVrDlsI=", + "lastModified": 1767468822, + "narHash": "sha256-MpffQxHxmjVKMiQd0Tg2IM/bSjjdQAM+NDcX6yxj7rE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "42d96e75aa56a3f70cab7e7dc4a32868db28e8fd", + "rev": "d56486eb9493ad9c4777c65932618e9c2d0468fc", "type": "github" }, "original": { @@ -638,11 +638,11 @@ ] }, "locked": { - "lastModified": 1766897152, - "narHash": "sha256-mD1GDg1eIHYUwk536j4uJX1IfQArsLQm2SL7rTQwAPI=", + "lastModified": 1767568852, + "narHash": "sha256-6s8hL3YX9zAq2T7qvcwwzaEVwc9MEYbW+C2LcAAQfbk=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "fe8d1a61a904b336f453d7ab5ae7d691a21c5cbf", + "rev": "350c729b261e6f5529460140a5f0943dd4c5e156", "type": "github" }, "original": { From 008b93d66006105823169ee645613080383b21aa Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 7 Jan 2026 14:18:46 -0500 Subject: [PATCH 503/724] update --- flake.lock | 155 +++++++++++++++++++++++++++++----------------- system/common.nix | 3 +- 2 files changed, 99 insertions(+), 59 deletions(-) diff --git a/flake.lock b/flake.lock index c5ae772..33c646e 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ }, "crane": { "locked": { - "lastModified": 1766774972, - "narHash": "sha256-8qxEFpj4dVmIuPn9j9z6NTbU+hrcGjBOvaxTzre5HmM=", + "lastModified": 1767461147, + "narHash": "sha256-TH/xTeq/RI+DOzo+c+4F431eVuBpYVwQwBxzURe7kcI=", "owner": "ipetkov", "repo": "crane", - "rev": "01bc1d404a51a0a07e9d8759cd50a7903e218c82", + "rev": "7d59256814085fd9666a2ae3e774dc5ee216b630", "type": "github" }, "original": { @@ -83,11 +83,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1767229380, - "narHash": "sha256-Uc6qONH3jjUVDgW+pPBCGC7mh88ZY05u1y37fQrsxq0=", + "lastModified": 1767773143, + "narHash": "sha256-QL/t9v2kFNxBDyNJb/s411o3mxujan+QX5IZglTdpTk=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "38d94da67dc84897a4318714dcc48494c016d8c4", + "rev": "3e15fb36d7f94f0a218bda977be4d3f5da983a71", "type": "github" }, "original": { @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1767633352, - "narHash": "sha256-3xuGNsENX27IP4ZQOOfkZo7RL+AP8MH298rj6NGCztA=", + "lastModified": 1767803522, + "narHash": "sha256-S6podKjKK1zlogdq7YBI7rmeQNp2e/A7fJjcnBMEBz8=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "867150b00f5d212258f48787b741ff145b24e2bc", + "rev": "4a1550b5d54ef8cdb5dd4db5558942e3466a946b", "type": "github" }, "original": { @@ -138,15 +138,15 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", - "owner": "edolstra", + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { - "owner": "edolstra", + "owner": "NixOS", "repo": "flake-compat", "type": "github" } @@ -180,11 +180,32 @@ ] }, "locked": { - "lastModified": 1767619743, - "narHash": "sha256-N0kK1JqxIjFl7hPAfhkW6C9AO7feYJUWLPyqJO2VuQQ=", + "lastModified": 1767802041, + "narHash": "sha256-ZhgbFGQGeJaZ/xkwyHlgUCeHuIdEDqugYkObPL0NCyo=", "owner": "nix-community", "repo": "home-manager", - "rev": "a65c04965c841eb01ba401f5162f12bc8d52014f", + "rev": "bdaa3743831168787f528570f2b87963e72a2f23", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "impermanence", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1747978958, + "narHash": "sha256-pQQnbxWpY3IiZqgelXHIe/OAE/Yv4NSQq7fch7M6nXQ=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "7419250703fd5eb50e99bdfb07a86671939103ea", "type": "github" }, "original": { @@ -194,12 +215,16 @@ } }, "impermanence": { + "inputs": { + "home-manager": "home-manager_2", + "nixpkgs": "nixpkgs" + }, "locked": { - "lastModified": 1737831083, - "narHash": "sha256-LJggUHbpyeDvNagTUrdhe/pRVp4pnS6wVKALS782gRI=", + "lastModified": 1767548760, + "narHash": "sha256-SSLzVz9l/wDyuXYd7Y4wVe36Lj1qV7u2QqvEYbFvYZ8=", "owner": "nix-community", "repo": "impermanence", - "rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170", + "rev": "f868c97f9e7f62879a97b4ad0e00b64782a845db", "type": "github" }, "original": { @@ -216,11 +241,11 @@ ] }, "locked": { - "lastModified": 1767082077, - "narHash": "sha256-2tL1mRb9uFJThUNfuDm/ehrnPvImL/QDtCxfn71IEz4=", + "lastModified": 1767777502, + "narHash": "sha256-jXb2kBU6lO6Q6S9zoR/bhVLMjg2hM9EW8gWIwsmkj64=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "efd4b22e6fdc6d7fb4e186ae333a4b74e03da440", + "rev": "a81fad3f4a70fdaa779e74b7da2063fa2e358028", "type": "github" }, "original": { @@ -239,11 +264,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1767618050, - "narHash": "sha256-ASAOWk0bZnK7F5w54j22JQaYHQCbeEBTt4J6kkOcUiI=", + "lastModified": 1767697030, + "narHash": "sha256-0iVZ99H3kR5h6Lhw8kDDuUc5C/k6iismeWgCS1qWTQ4=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "0d57507b648c2dd658165843f98acbf55fdbc23b", + "rev": "657469e8f036334db768daaf7732b1174676054b", "type": "github" }, "original": { @@ -261,11 +286,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1767633439, - "narHash": "sha256-5yW/iVS9vrMe04N1B2hf08io1lS+7FPEtgm2w33FXyI=", + "lastModified": 1767796466, + "narHash": "sha256-8rwPauge7ZsXqVzVVHU1ilG6tLhvcgXUmC6BJjlLA34=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "542b1915e9e5b40e99210fd84ffe7c8c9eeda4ae", + "rev": "5888ba875bd4b3afe746a176699cf1287feddac0", "type": "github" }, "original": { @@ -288,11 +313,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1767624540, - "narHash": "sha256-A53/9fnu/40wo6T2MF3lm07zD7N+cC0E5QEYFfFLGwA=", + "lastModified": 1767797159, + "narHash": "sha256-vbUQBtsyKtFB5YqTKdvOBstAKObPC1pxRigP/LZy8fw=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "62e47d55c0f8bc9cd5413b94134867d970e5e296", + "rev": "acfdefdd43810c099c0783862d7a41037f874d16", "type": "github" }, "original": { @@ -321,11 +346,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1767598098, - "narHash": "sha256-IyH3zaCT2JZ6fdY4vKlUz2RbDdxaryvSZWUVixKYrKM=", + "lastModified": 1767792726, + "narHash": "sha256-qS4tdG2iUQwSld9dTH1gk8GcIOrRi9umMgPv8MGDIA0=", "owner": "YaLTeR", "repo": "niri", - "rev": "b7eb8a635b7f75705808eaed85c016f02ae4fd2d", + "rev": "10df9f4717cbd4efd20ae796eb6b0aa400127bdc", "type": "github" }, "original": { @@ -346,11 +371,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1767603080, - "narHash": "sha256-LKg5MicVxzczP7dN0xGBX3ZG/BxVxGQbZHWy583Bs+w=", + "lastModified": 1767775754, + "narHash": "sha256-vs72qXEIS0EiuWYm0BtZ5MDRMu0hyjeqG8NaH+3Z0Nw=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "8b9dcfca5130c6f35ba23405f7fad779affa97e6", + "rev": "4940d5dd36f72723f85248014d5df5eef3ce7124", "type": "github" }, "original": { @@ -414,11 +439,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1767379071, - "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", + "lastModified": 1748026106, + "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1767767207, + "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fb7944c166a3b630f177938e478f0378e64ce108", + "rev": "5912c1772a44e31bf1c63c0390b90501e5026886", "type": "github" }, "original": { @@ -438,11 +479,11 @@ ] }, "locked": { - "lastModified": 1765911976, - "narHash": "sha256-t3T/xm8zstHRLx+pIHxVpQTiySbKqcQbK+r+01XVKc0=", + "lastModified": 1767281941, + "narHash": "sha256-6MkqajPICgugsuZ92OMoQcgSHnD6sJHwk8AxvMcIgTE=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "b68b780b69702a090c8bb1b973bab13756cc7a27", + "rev": "f0927703b7b1c8d97511c4116eb9b4ec6645a0fa", "type": "github" }, "original": { @@ -465,7 +506,7 @@ "nix-doom-emacs-unstraightened": "nix-doom-emacs-unstraightened", "nix-flatpak": "nix-flatpak", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "rust-overlay": "rust-overlay_2", "zen-browser": "zen-browser" } @@ -478,11 +519,11 @@ ] }, "locked": { - "lastModified": 1766976750, - "narHash": "sha256-w+o3AIBI56tzfMJRqRXg9tSXnpQRN5hAT15o2t9rxYw=", + "lastModified": 1767495280, + "narHash": "sha256-hEEgtE/RSRigw8xscchGymf/t1nluZwTfru4QF6O1CQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "9fe44e7f05b734a64a01f92fc51ad064fb0a884f", + "rev": "cb24c5cc207ba8e9a4ce245eedd2d37c3a988bc1", "type": "github" }, "original": { @@ -498,11 +539,11 @@ ] }, "locked": { - "lastModified": 1767581716, - "narHash": "sha256-FUbiUzdrGkLou37OGfb4vCLPnqdSIvtmJBxjh2iljiE=", + "lastModified": 1767754000, + "narHash": "sha256-znoNJs2QZFl+wCFLd6FbUJ00c74kvzOjyQYXc45uFvo=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "1d3f83babdd21e16bf5cfe0f1efcb4f49ee1bc2c", + "rev": "0b3a5ad260479f2c9bdadf3ba5b2a4be359cfcdd", "type": "github" }, "original": { @@ -564,11 +605,11 @@ ] }, "locked": { - "lastModified": 1767468822, - "narHash": "sha256-MpffQxHxmjVKMiQd0Tg2IM/bSjjdQAM+NDcX6yxj7rE=", + "lastModified": 1767738726, + "narHash": "sha256-bHATlMr42JABTJgi4Wc8SJCK8Cv9AnR6HCl3k8eTwEs=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "d56486eb9493ad9c4777c65932618e9c2d0468fc", + "rev": "4db0238d79254c6d14f251808dc5264b8fc81b73", "type": "github" }, "original": { @@ -638,11 +679,11 @@ ] }, "locked": { - "lastModified": 1767568852, - "narHash": "sha256-6s8hL3YX9zAq2T7qvcwwzaEVwc9MEYbW+C2LcAAQfbk=", + "lastModified": 1767763594, + "narHash": "sha256-5ysv8EuVAgDoYmNuXEUNf7vBzdeRaFxeIlIndv5HMvs=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "350c729b261e6f5529460140a5f0943dd4c5e156", + "rev": "8b2302d8c10369c9135552cc892da75cff5ddb03", "type": "github" }, "original": { diff --git a/system/common.nix b/system/common.nix index aa67120..28a6cd2 100644 --- a/system/common.nix +++ b/system/common.nix @@ -223,8 +223,6 @@ services.gvfs.enable = true; programs.gphoto2.enable = true; - programs.adb.enable = true; - # Enable thermal data services.thermald.enable = true; @@ -256,6 +254,7 @@ git tmux + android-tools ]; # wayland with electron/chromium applications From 19224d03b9dbaf5adfd1d0de5bdacf6fc96e24d2 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 8 Jan 2026 06:12:50 -0500 Subject: [PATCH 504/724] flake: inline dependencies --- flake.lock | 128 ++++++++++++++++------------------------------------- flake.nix | 3 ++ 2 files changed, 41 insertions(+), 90 deletions(-) diff --git a/flake.lock b/flake.lock index 33c646e..f49c85d 100644 --- a/flake.lock +++ b/flake.lock @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1767803522, - "narHash": "sha256-S6podKjKK1zlogdq7YBI7rmeQNp2e/A7fJjcnBMEBz8=", + "lastModified": 1767863967, + "narHash": "sha256-Yr4d2RRrnz1H1XE4gFYV9gXTXL/WEM8YguLHvtK3Oxs=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "4a1550b5d54ef8cdb5dd4db5558942e3466a946b", + "rev": "2bb26f2f973bfbb0bf127ff8d1ff5f0a12c0a355", "type": "github" }, "original": { @@ -180,32 +180,11 @@ ] }, "locked": { - "lastModified": 1767802041, - "narHash": "sha256-ZhgbFGQGeJaZ/xkwyHlgUCeHuIdEDqugYkObPL0NCyo=", + "lastModified": 1767864335, + "narHash": "sha256-2L1hc/V2oHMVsAKxyCoSD0q5lL2ap7MR8pk9U2YB9gs=", "owner": "nix-community", "repo": "home-manager", - "rev": "bdaa3743831168787f528570f2b87963e72a2f23", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ - "impermanence", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1747978958, - "narHash": "sha256-pQQnbxWpY3IiZqgelXHIe/OAE/Yv4NSQq7fch7M6nXQ=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "7419250703fd5eb50e99bdfb07a86671939103ea", + "rev": "af7f14ddf770e269bb67cea19708198e618b5c75", "type": "github" }, "original": { @@ -216,15 +195,19 @@ }, "impermanence": { "inputs": { - "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs" + "home-manager": [ + "home-manager" + ], + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1767548760, - "narHash": "sha256-SSLzVz9l/wDyuXYd7Y4wVe36Lj1qV7u2QqvEYbFvYZ8=", + "lastModified": 1767822991, + "narHash": "sha256-iyrn9AcPZCoyxX4OT8eMkBsjG7SRUQXXS/V1JzxS7rA=", "owner": "nix-community", "repo": "impermanence", - "rev": "f868c97f9e7f62879a97b4ad0e00b64782a845db", + "rev": "82e5bc4508cab9e8d5a136626276eb5bbce5e9c5", "type": "github" }, "original": { @@ -261,7 +244,9 @@ "nixpkgs" ], "pre-commit": "pre-commit", - "rust-overlay": "rust-overlay" + "rust-overlay": [ + "rust-overlay" + ] }, "locked": { "lastModified": 1767697030, @@ -286,11 +271,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1767796466, - "narHash": "sha256-8rwPauge7ZsXqVzVVHU1ilG6tLhvcgXUmC6BJjlLA34=", + "lastModified": 1767866249, + "narHash": "sha256-34M8rysW3vuOYijI/Ns59bPkKPecaQW5oOupR45IRwQ=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "5888ba875bd4b3afe746a176699cf1287feddac0", + "rev": "7173b37ee4ff714e34dab539aeccb0cc7e4b24dc", "type": "github" }, "original": { @@ -313,11 +298,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1767797159, - "narHash": "sha256-vbUQBtsyKtFB5YqTKdvOBstAKObPC1pxRigP/LZy8fw=", + "lastModified": 1767833217, + "narHash": "sha256-HLr9k8g1Geq40PLsNw7I5N8TZkBYtQVjkgDPV/Kehxk=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "acfdefdd43810c099c0783862d7a41037f874d16", + "rev": "a789aa1512a9157d5d3392b27e60621fd0d83438", "type": "github" }, "original": { @@ -371,11 +356,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1767775754, - "narHash": "sha256-vs72qXEIS0EiuWYm0BtZ5MDRMu0hyjeqG8NaH+3Z0Nw=", + "lastModified": 1767862133, + "narHash": "sha256-wxs62H8lxO+5FH+8JfJMwZyg4Yx3HwY67QSLwYi/olw=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "4940d5dd36f72723f85248014d5df5eef3ce7124", + "rev": "6337dd4ccf780724ea6e8adbf1c721fef7515ae3", "type": "github" }, "original": { @@ -438,22 +423,6 @@ } }, "nixpkgs": { - "locked": { - "lastModified": 1748026106, - "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { "locked": { "lastModified": 1767767207, "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=", @@ -506,44 +475,23 @@ "nix-doom-emacs-unstraightened": "nix-doom-emacs-unstraightened", "nix-flatpak": "nix-flatpak", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", - "rust-overlay": "rust-overlay_2", + "nixpkgs": "nixpkgs", + "rust-overlay": "rust-overlay", "zen-browser": "zen-browser" } }, "rust-overlay": { "inputs": { "nixpkgs": [ - "lanzaboote", "nixpkgs" ] }, "locked": { - "lastModified": 1767495280, - "narHash": "sha256-hEEgtE/RSRigw8xscchGymf/t1nluZwTfru4QF6O1CQ=", + "lastModified": 1767840362, + "narHash": "sha256-ZtsFqUhilubohNZ1TgpQIFsi4biZTwRH9rjZsDRDik8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "cb24c5cc207ba8e9a4ce245eedd2d37c3a988bc1", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_2": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1767754000, - "narHash": "sha256-znoNJs2QZFl+wCFLd6FbUJ00c74kvzOjyQYXc45uFvo=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "0b3a5ad260479f2c9bdadf3ba5b2a4be359cfcdd", + "rev": "d159ea1fc321c60f88a616ac28bab660092a227d", "type": "github" }, "original": { @@ -605,11 +553,11 @@ ] }, "locked": { - "lastModified": 1767738726, - "narHash": "sha256-bHATlMr42JABTJgi4Wc8SJCK8Cv9AnR6HCl3k8eTwEs=", + "lastModified": 1767801790, + "narHash": "sha256-QfX6g3Wj2vQe7oBJEbTf0npvC6sJoDbF9hb2+gM5tf8=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "4db0238d79254c6d14f251808dc5264b8fc81b73", + "rev": "778a1d691f1ef45dd68c661715c5bf8cbf131c80", "type": "github" }, "original": { @@ -656,11 +604,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1766429945, - "narHash": "sha256-9Kv4gWagx/u4RfZJzBMAoagW9ava5waxd+XoTkzqF7E=", + "lastModified": 1767830382, + "narHash": "sha256-0PgS7M1SV6JCN3MugFZPaP8J+Mr2o7lSDFTPVYZSIAY=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "0dde7ca1d3a8e8c5082533d76084e2aa02bef70e", + "rev": "74cf1a95a35fd7aec76432bc2cd9b310e0d908c5", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b68bac1..90cdffe 100644 --- a/flake.nix +++ b/flake.nix @@ -7,6 +7,7 @@ lanzaboote = { url = "github:nix-community/lanzaboote"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.rust-overlay.follows = "rust-overlay"; }; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; @@ -54,6 +55,8 @@ impermanence = { url = "github:nix-community/impermanence"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.home-manager.follows = "home-manager"; }; deploy-rs = { From cd572954ec7fdeeacf0e1bfb3dc139e38f454a46 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 9 Jan 2026 12:30:18 -0500 Subject: [PATCH 505/724] opencode: fix glm4.7 --- home-manager/progs/opencode.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index eaed9ff..a648f29 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -33,7 +33,7 @@ settings = { theme = "opencode"; - model = "z-ai/glm-4.7"; + model = "openrouter/z-ai/glm-4.7"; # small model used for titles small_model = "openrouter/openai/gpt-oss-20b:free"; @@ -44,6 +44,7 @@ openrouter = { models = { "openai/gpt-oss-20b:free" = { }; + "z-ai/glm-4.7" = { }; }; options = { # TODO! use agenix here instead From 8cb35128ccfaddbedad60c6874297159cdd35abb Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 9 Jan 2026 12:42:22 -0500 Subject: [PATCH 506/724] opencode: minimax m2.1 --- home-manager/progs/opencode.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index a648f29..212b5be 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -33,7 +33,7 @@ settings = { theme = "opencode"; - model = "openrouter/z-ai/glm-4.7"; + model = "openrouter/minimax/minimax-m2.1"; # small model used for titles small_model = "openrouter/openai/gpt-oss-20b:free"; @@ -44,7 +44,7 @@ openrouter = { models = { "openai/gpt-oss-20b:free" = { }; - "z-ai/glm-4.7" = { }; + "minimax/minimax-m2.1" = { }; }; options = { # TODO! use agenix here instead From bb9de5c914342384df3e1aa73abb2f08bbe0501b Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 12 Jan 2026 14:20:19 -0500 Subject: [PATCH 507/724] fix opencode + use free model --- flake.lock | 12 ++++++------ home-manager/progs/opencode.nix | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index f49c85d..a09df95 100644 --- a/flake.lock +++ b/flake.lock @@ -271,11 +271,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1767866249, - "narHash": "sha256-34M8rysW3vuOYijI/Ns59bPkKPecaQW5oOupR45IRwQ=", + "lastModified": 1768227710, + "narHash": "sha256-m6GRI1hzt/jfKaPyyraxUCi0HAc6ROwasemyeWGulJA=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "7173b37ee4ff714e34dab539aeccb0cc7e4b24dc", + "rev": "321aab84a04492df7230090eabc61fa0b224a106", "type": "github" }, "original": { @@ -553,11 +553,11 @@ ] }, "locked": { - "lastModified": 1767801790, - "narHash": "sha256-QfX6g3Wj2vQe7oBJEbTf0npvC6sJoDbF9hb2+gM5tf8=", + "lastModified": 1768158989, + "narHash": "sha256-67vyT1+xClLldnumAzCTBvU0jLZ1YBcf4vANRWP3+Ak=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "778a1d691f1ef45dd68c661715c5bf8cbf131c80", + "rev": "e96d59dff5c0d7fddb9d113ba108f03c3ef99eca", "type": "github" }, "original": { diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index 212b5be..9c41e1f 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -33,7 +33,7 @@ settings = { theme = "opencode"; - model = "openrouter/minimax/minimax-m2.1"; + model = "opencode/glm-4.7-free"; # small model used for titles small_model = "openrouter/openai/gpt-oss-20b:free"; From 40aacdee5416e025679d5d2b2296a5834455b6ed Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 12 Jan 2026 15:17:30 -0500 Subject: [PATCH 508/724] update (without nixpkgs) --- flake.lock | 66 +++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index a09df95..c9a5ae4 100644 --- a/flake.lock +++ b/flake.lock @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1767863967, - "narHash": "sha256-Yr4d2RRrnz1H1XE4gFYV9gXTXL/WEM8YguLHvtK3Oxs=", + "lastModified": 1768238022, + "narHash": "sha256-lc40dAJi/AE38Oz3ebmzpnoPILUg7gzT2s93gzUzafc=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "2bb26f2f973bfbb0bf127ff8d1ff5f0a12c0a355", + "rev": "28210bc3e3aa1dfb883504d95c07705afcab4670", "type": "github" }, "original": { @@ -180,11 +180,11 @@ ] }, "locked": { - "lastModified": 1767864335, - "narHash": "sha256-2L1hc/V2oHMVsAKxyCoSD0q5lL2ap7MR8pk9U2YB9gs=", + "lastModified": 1768248913, + "narHash": "sha256-Kr45H5StnR9hgEhpKD8/BDZLvEpLVJb51lvIDQ9EC7U=", "owner": "nix-community", "repo": "home-manager", - "rev": "af7f14ddf770e269bb67cea19708198e618b5c75", + "rev": "360620ec9d5ffc186b5b1fca4c5f5b2e1634a5cf", "type": "github" }, "original": { @@ -224,11 +224,11 @@ ] }, "locked": { - "lastModified": 1767777502, - "narHash": "sha256-jXb2kBU6lO6Q6S9zoR/bhVLMjg2hM9EW8gWIwsmkj64=", + "lastModified": 1767888166, + "narHash": "sha256-dfZKtAv2bTD8EsOxLQ6/a7zSZt8KTy+HuRq3wz1z3LA=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "a81fad3f4a70fdaa779e74b7da2063fa2e358028", + "rev": "3e0747d31474cdb182801518e39511eed2c84c91", "type": "github" }, "original": { @@ -249,11 +249,11 @@ ] }, "locked": { - "lastModified": 1767697030, - "narHash": "sha256-0iVZ99H3kR5h6Lhw8kDDuUc5C/k6iismeWgCS1qWTQ4=", + "lastModified": 1768208826, + "narHash": "sha256-HWnVcDDuBCHUDoDpNADw1LybfF4jKofGAynV4HDRRrg=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "657469e8f036334db768daaf7732b1174676054b", + "rev": "ba5f08218d4f14bf1baeeb69eaadb7a2f2d995af", "type": "github" }, "original": { @@ -298,11 +298,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1767833217, - "narHash": "sha256-HLr9k8g1Geq40PLsNw7I5N8TZkBYtQVjkgDPV/Kehxk=", + "lastModified": 1768200625, + "narHash": "sha256-/OzaFZnKs9hbqv1pnB9riPBdgQo8qACYme2VrC5uVjI=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "a789aa1512a9157d5d3392b27e60621fd0d83438", + "rev": "bc9753e6e2f20873307e246f859c463f9d20ce1d", "type": "github" }, "original": { @@ -331,11 +331,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1767792726, - "narHash": "sha256-qS4tdG2iUQwSld9dTH1gk8GcIOrRi9umMgPv8MGDIA0=", + "lastModified": 1768196703, + "narHash": "sha256-mttBQdVnVFO3mn+M+oqCsZZOtS2HvXYy+VaHxb8YuMw=", "owner": "YaLTeR", "repo": "niri", - "rev": "10df9f4717cbd4efd20ae796eb6b0aa400127bdc", + "rev": "3672e79369d72297abda8878245ea4ec327062c6", "type": "github" }, "original": { @@ -356,11 +356,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1767862133, - "narHash": "sha256-wxs62H8lxO+5FH+8JfJMwZyg4Yx3HwY67QSLwYi/olw=", + "lastModified": 1768207864, + "narHash": "sha256-JUU3iYKlDQ0EIcNC9kIcQbHmdRa8it0bxUMr4vfNSjk=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "6337dd4ccf780724ea6e8adbf1c721fef7515ae3", + "rev": "735ab2d975c05195a468e410a5da071d2e7fada4", "type": "github" }, "original": { @@ -371,11 +371,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1754777568, - "narHash": "sha256-0bBqT+3XncgF8F03RFAamw9vdf0VmaDoIJLTGkjfQZs=", + "lastModified": 1768119771, + "narHash": "sha256-kbbmAfCXcgjdShTDDEn/pCoC5rKQMTd1BksXANn8D2A=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "62f636b87ef6050760a8cb325cadb90674d1e23e", + "rev": "2e49028cb29c76c8553c6099b19f11879db2cbd1", "type": "github" }, "original": { @@ -487,11 +487,11 @@ ] }, "locked": { - "lastModified": 1767840362, - "narHash": "sha256-ZtsFqUhilubohNZ1TgpQIFsi4biZTwRH9rjZsDRDik8=", + "lastModified": 1768186348, + "narHash": "sha256-nkpIe3zkpeoFuOl8xBpexulECsHLQ9Ljg1gW3bPCjSI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "d159ea1fc321c60f88a616ac28bab660092a227d", + "rev": "af69e497567a5945a64057717bc9b17c8478097e", "type": "github" }, "original": { @@ -604,11 +604,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1767830382, - "narHash": "sha256-0PgS7M1SV6JCN3MugFZPaP8J+Mr2o7lSDFTPVYZSIAY=", + "lastModified": 1768106915, + "narHash": "sha256-HlLo9zH4ULRXlmlIK948cHmdVhxyHgTHxGaoCRlW4k8=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "74cf1a95a35fd7aec76432bc2cd9b310e0d908c5", + "rev": "72245e108f3b03c3c4474d2de9de2d1830849603", "type": "github" }, "original": { @@ -627,11 +627,11 @@ ] }, "locked": { - "lastModified": 1767763594, - "narHash": "sha256-5ysv8EuVAgDoYmNuXEUNf7vBzdeRaFxeIlIndv5HMvs=", + "lastModified": 1768183082, + "narHash": "sha256-XsiMOsqRLfmUi+24F7adhb/GAM2dMvplzwaW2Wxg/lo=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "8b2302d8c10369c9135552cc892da75cff5ddb03", + "rev": "cdbc300fd89d503a95d1c8564de31a93d7b0a0ae", "type": "github" }, "original": { From d8f5d9cfd2e22550c7d83faee5ced6a7716ef6cc Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 12 Jan 2026 15:20:00 -0500 Subject: [PATCH 509/724] nixfmt-rfc-style -> nixfmt --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 90cdffe..25f45ea 100644 --- a/flake.nix +++ b/flake.nix @@ -96,7 +96,7 @@ niri-package = inputs.niri.packages.${system}.niri-unstable; in { - formatter.${system} = nixpkgs.legacyPackages.${system}.nixfmt-rfc-style; + formatter.${system} = nixpkgs.legacyPackages.${system}.nixfmt; nixosConfigurations = nixpkgs.lib.foldl' ( config: hostname: From 9134c2bfa87b7bcc2c90f817784159962d6fbd7a Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 12 Jan 2026 15:22:16 -0500 Subject: [PATCH 510/724] nixfmt -> nixfmt-tree --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 25f45ea..6c53421 100644 --- a/flake.nix +++ b/flake.nix @@ -96,7 +96,7 @@ niri-package = inputs.niri.packages.${system}.niri-unstable; in { - formatter.${system} = nixpkgs.legacyPackages.${system}.nixfmt; + formatter.${system} = nixpkgs.legacyPackages.${system}.nixfmt-tree; nixosConfigurations = nixpkgs.lib.foldl' ( config: hostname: From e5b7ec5cf0c4f08b8aef8b2cd7f7a48f77b990c2 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 12 Jan 2026 15:27:12 -0500 Subject: [PATCH 511/724] fix pkgs.system deprecation --- home-manager/no-gui.nix | 2 +- home-manager/progs/opencode.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 736328d..98210d9 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -218,7 +218,7 @@ in # 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"] ''; diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index 9c41e1f..eee4599 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -7,7 +7,7 @@ }: { programs.opencode = { - package = inputs.llm-agents.packages.${pkgs.system}.opencode; + package = inputs.llm-agents.packages.${pkgs.stdenv.hostPlatform.system}.opencode; enable = true; rules = '' You are an intelligent and observant agent. From 5102c2ef34c9fe4dd0ddcc7f5bd45420e3d83b8f Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 12 Jan 2026 15:31:01 -0500 Subject: [PATCH 512/724] fix no-gui nixfmt formatter package --- home-manager/no-gui.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 98210d9..c7aa9f0 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -147,7 +147,7 @@ in sshfs # nix formatter - nixfmt-rfc-style + nixfmt-tree # serial viewer minicom From 63811ce166d53bad872a6aa95e06800915c60eb5 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 13 Jan 2026 14:46:55 -0500 Subject: [PATCH 513/724] opencode: make oh-my-opencode.json declarative also --- home-manager/progs/opencode.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index eee4599..d18ace2 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -5,7 +5,24 @@ inputs, ... }: +let + ohMyOpencodeConfig = { + "$schema" = + "https://raw.githubusercontent.com/code-yeongyu/oh-my-opencode/master/assets/oh-my-opencode.schema.json"; + agents = { + Sisyphus.model = "opencode/glm-4.7-free"; + librarian.model = "opencode/glm-4.7-free"; + explore.model = "opencode/glm-4.7-free"; + oracle.model = "opencode/glm-4.7-free"; + frontend-ui-ux-engineer.model = "opencode/glm-4.7-free"; + document-writer.model = "opencode/glm-4.7-free"; + multimodal-looker.model = "opencode/glm-4.7-free"; + }; + }; +in { + xdg.configFile."opencode/oh-my-opencode.json".text = builtins.toJSON ohMyOpencodeConfig; + programs.opencode = { package = inputs.llm-agents.packages.${pkgs.stdenv.hostPlatform.system}.opencode; enable = true; From 754b9fea9ed1984ee73039b7f2450a79b93228b2 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 14 Jan 2026 11:22:21 -0500 Subject: [PATCH 514/724] mreow: try and fix graphical corruption issue --- system/system-mreow.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/system/system-mreow.nix b/system/system-mreow.nix index ecfc6ad..aadfc75 100644 --- a/system/system-mreow.nix +++ b/system/system-mreow.nix @@ -14,6 +14,12 @@ 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"; From b13b4fc959d2a0fcd2b00b8cbd75655ac72a93d2 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 14 Jan 2026 22:22:43 -0500 Subject: [PATCH 515/724] opencode: change models --- home-manager/progs/opencode.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index d18ace2..0651b3c 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -10,13 +10,13 @@ let "$schema" = "https://raw.githubusercontent.com/code-yeongyu/oh-my-opencode/master/assets/oh-my-opencode.schema.json"; agents = { - Sisyphus.model = "opencode/glm-4.7-free"; - librarian.model = "opencode/glm-4.7-free"; - explore.model = "opencode/glm-4.7-free"; - oracle.model = "opencode/glm-4.7-free"; - frontend-ui-ux-engineer.model = "opencode/glm-4.7-free"; - document-writer.model = "opencode/glm-4.7-free"; - multimodal-looker.model = "opencode/glm-4.7-free"; + Sisyphus.model = "anthropic/claude-opus-4-5"; + librarian.model = "anthropic/claude-haiku-4-5"; + explore.model = "anthropic/claude-haiku-4-5"; + oracle.model = "openrouter/openai/gpt-5.2"; + frontend-ui-ux-engineer.model = "openrouter/google/gemini-3-pro-preview"; + document-writer.model = "anthropic/claude-sonnet-4-5"; + multimodal-looker.model = "openrouter/allenai/molmo-2-8b:free"; }; }; in @@ -50,7 +50,7 @@ in settings = { theme = "opencode"; - model = "opencode/glm-4.7-free"; + model = "anthropic/claude-opus-4-5"; # small model used for titles small_model = "openrouter/openai/gpt-oss-20b:free"; From ac4dc8979d6b3340c8a716e51fce5b48497c40ca Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 15 Jan 2026 14:48:20 -0500 Subject: [PATCH 516/724] remove power profile things --- system/common.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/system/common.nix b/system/common.nix index 28a6cd2..7b0f24f 100644 --- a/system/common.nix +++ b/system/common.nix @@ -23,11 +23,6 @@ inputs.nixos-hardware.nixosModules.common-pc-ssd ]; - # use tuned instead of tlp or ppd - services.power-profiles-daemon.enable = false; - services.tlp.enable = false; - services.tuned.enable = true; - # allow overclocking (I actually underclock but lol) hardware.amdgpu.overdrive.ppfeaturemask = "0xFFFFFFFF"; From 7032772b65f8c01ea74f703b63cf499fbfc26ccd Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 17 Jan 2026 23:45:52 -0500 Subject: [PATCH 517/724] opencode: fix molmo model --- home-manager/progs/opencode.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index 0651b3c..ebbf413 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -62,6 +62,7 @@ in models = { "openai/gpt-oss-20b:free" = { }; "minimax/minimax-m2.1" = { }; + "allenai/molmo-2-8b:free" = { }; }; options = { # TODO! use agenix here instead From f27dd63d0297a1de114d9c7810b6c37f9bfb5523 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 17 Jan 2026 23:47:20 -0500 Subject: [PATCH 518/724] opencode: remove molmo model --- home-manager/progs/opencode.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index ebbf413..0e77ed6 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -16,7 +16,7 @@ let oracle.model = "openrouter/openai/gpt-5.2"; frontend-ui-ux-engineer.model = "openrouter/google/gemini-3-pro-preview"; document-writer.model = "anthropic/claude-sonnet-4-5"; - multimodal-looker.model = "openrouter/allenai/molmo-2-8b:free"; + multimodal-looker.model = "anthropic/claude-haiku-4-5"; }; }; in @@ -62,7 +62,6 @@ in models = { "openai/gpt-oss-20b:free" = { }; "minimax/minimax-m2.1" = { }; - "allenai/molmo-2-8b:free" = { }; }; options = { # TODO! use agenix here instead From 57484e7cc7408b99c0cb7379c601b7f4a36c7c34 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 19 Jan 2026 23:33:50 -0500 Subject: [PATCH 519/724] yarn: disable steamos-update --- system/system-yarn.nix | 65 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/system/system-yarn.nix b/system/system-yarn.nix index a3e4918..5c6f1ff 100644 --- a/system/system-yarn.nix +++ b/system/system-yarn.nix @@ -75,6 +75,71 @@ "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 = { From d8f4ff5c95ea7f0a8dd7524b5ee19d6c59feedc2 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 19 Jan 2026 23:34:08 -0500 Subject: [PATCH 520/724] yarn: fix impermiance home directory --- system/impermanence.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/system/impermanence.nix b/system/impermanence.nix index 2f8600d..b22eab9 100644 --- a/system/impermanence.nix +++ b/system/impermanence.nix @@ -21,12 +21,15 @@ "/etc/ssh/ssh_host_rsa_key.pub" "/etc/machine-id" ]; + }; - users.${username} = { - directories = [ - "." - ]; - }; + # 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 = [ From 05700ca1dc05f418c7c887ff99fe1515421eee61 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 21 Jan 2026 15:21:28 -0500 Subject: [PATCH 521/724] opencode: abstract out haiku model name --- home-manager/progs/opencode.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index 0e77ed6..3cdbfa2 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -6,17 +6,21 @@ ... }: let + # what model should be used in place of haiku? + # glm 4.7-flash is an example + haiku-model = "anthropic/claude-haiku-4-5"; + ohMyOpencodeConfig = { "$schema" = "https://raw.githubusercontent.com/code-yeongyu/oh-my-opencode/master/assets/oh-my-opencode.schema.json"; agents = { Sisyphus.model = "anthropic/claude-opus-4-5"; - librarian.model = "anthropic/claude-haiku-4-5"; - explore.model = "anthropic/claude-haiku-4-5"; + librarian.model = haiku-model; + explore.model = haiku-model; oracle.model = "openrouter/openai/gpt-5.2"; frontend-ui-ux-engineer.model = "openrouter/google/gemini-3-pro-preview"; document-writer.model = "anthropic/claude-sonnet-4-5"; - multimodal-looker.model = "anthropic/claude-haiku-4-5"; + multimodal-looker.model = haiku-model; }; }; in From 25959fb6d0778cc81f0bf1d2b843ecac1b29be12 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 21 Jan 2026 15:23:01 -0500 Subject: [PATCH 522/724] hostPlatform -> targetPlatform --- home-manager/progs/opencode.nix | 2 +- system/common.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index 3cdbfa2..cc87b61 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -28,7 +28,7 @@ in xdg.configFile."opencode/oh-my-opencode.json".text = builtins.toJSON ohMyOpencodeConfig; programs.opencode = { - package = inputs.llm-agents.packages.${pkgs.stdenv.hostPlatform.system}.opencode; + package = inputs.llm-agents.packages.${pkgs.stdenv.targetPlatform.system}.opencode; enable = true; rules = '' You are an intelligent and observant agent. diff --git a/system/common.nix b/system/common.nix index 7b0f24f..ed8b541 100644 --- a/system/common.nix +++ b/system/common.nix @@ -272,7 +272,7 @@ networking.firewall.allowedTCPPorts = [ 53317 ]; system.stateVersion = "25.05"; - nixpkgs.hostPlatform = "x86_64-linux"; + nixpkgs.targetPlatform = "x86_64-linux"; documentation.enable = true; documentation.man.enable = true; From bf2cf6df58bc6c5a61e85c11591a5d497c0f7299 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 22 Jan 2026 12:25:57 -0500 Subject: [PATCH 523/724] fix hostPlatform --- system/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/common.nix b/system/common.nix index ed8b541..7b0f24f 100644 --- a/system/common.nix +++ b/system/common.nix @@ -272,7 +272,7 @@ networking.firewall.allowedTCPPorts = [ 53317 ]; system.stateVersion = "25.05"; - nixpkgs.targetPlatform = "x86_64-linux"; + nixpkgs.hostPlatform = "x86_64-linux"; documentation.enable = true; documentation.man.enable = true; From e83911112ee88adf204bb7dd6306a566933feeca Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 22 Jan 2026 14:13:03 -0500 Subject: [PATCH 524/724] update --- flake.lock | 108 ++++++++++++++++++++++++++--------------------------- 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/flake.lock b/flake.lock index c9a5ae4..28248c1 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ }, "crane": { "locked": { - "lastModified": 1767461147, - "narHash": "sha256-TH/xTeq/RI+DOzo+c+4F431eVuBpYVwQwBxzURe7kcI=", + "lastModified": 1767744144, + "narHash": "sha256-9/9ntI0D+HbN4G0TrK3KmHbTvwgswz7p8IEJsWyef8Q=", "owner": "ipetkov", "repo": "crane", - "rev": "7d59256814085fd9666a2ae3e774dc5ee216b630", + "rev": "2fb033290bf6b23f226d4c8b32f7f7a16b043d7e", "type": "github" }, "original": { @@ -66,11 +66,11 @@ ] }, "locked": { - "lastModified": 1746728054, - "narHash": "sha256-eDoSOhxGEm2PykZFa/x9QG5eTH0MJdiJ9aR00VAofXE=", + "lastModified": 1768920986, + "narHash": "sha256-CNzzBsRhq7gg4BMBuTDObiWDH/rFYHEuDRVOwCcwXw4=", "owner": "nix-community", "repo": "disko", - "rev": "ff442f5d1425feb86344c028298548024f21256d", + "rev": "de5708739256238fb912c62f03988815db89ec9a", "type": "github" }, "original": { @@ -83,11 +83,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1767773143, - "narHash": "sha256-QL/t9v2kFNxBDyNJb/s411o3mxujan+QX5IZglTdpTk=", + "lastModified": 1768984347, + "narHash": "sha256-VvC4rgAAaFnYLCdcUoz7dTE3kuBNuHIc+GlXOrPCxpg=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "3e15fb36d7f94f0a218bda977be4d3f5da983a71", + "rev": "57818a6da90fbef39ff80d62fab2cd319496c3b9", "type": "github" }, "original": { @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1768238022, - "narHash": "sha256-lc40dAJi/AE38Oz3ebmzpnoPILUg7gzT2s93gzUzafc=", + "lastModified": 1769102592, + "narHash": "sha256-HLBblJ0V7MAw94uNU+ov7Kg6F8BeM6pIzbBrXgf9Wa8=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "28210bc3e3aa1dfb883504d95c07705afcab4670", + "rev": "a14a17238a9f13f46f152d0841645e70dff5d5ad", "type": "github" }, "original": { @@ -180,11 +180,11 @@ ] }, "locked": { - "lastModified": 1768248913, - "narHash": "sha256-Kr45H5StnR9hgEhpKD8/BDZLvEpLVJb51lvIDQ9EC7U=", + "lastModified": 1769102673, + "narHash": "sha256-/qvRFjn1s3bIJdSKG6IpaE6ML3j9anQKUqGhmt4Qe+E=", "owner": "nix-community", "repo": "home-manager", - "rev": "360620ec9d5ffc186b5b1fca4c5f5b2e1634a5cf", + "rev": "b0491fe55680bd19be8e74847969dad9d7784658", "type": "github" }, "original": { @@ -203,11 +203,11 @@ ] }, "locked": { - "lastModified": 1767822991, - "narHash": "sha256-iyrn9AcPZCoyxX4OT8eMkBsjG7SRUQXXS/V1JzxS7rA=", + "lastModified": 1768941735, + "narHash": "sha256-OyxsfXNcOkt06/kM+4bnuC8moDx+t7Qr+RB0BBa83Ig=", "owner": "nix-community", "repo": "impermanence", - "rev": "82e5bc4508cab9e8d5a136626276eb5bbce5e9c5", + "rev": "69ecf31e8fddc9354a4b418f3a517445d486bb54", "type": "github" }, "original": { @@ -224,11 +224,11 @@ ] }, "locked": { - "lastModified": 1767888166, - "narHash": "sha256-dfZKtAv2bTD8EsOxLQ6/a7zSZt8KTy+HuRq3wz1z3LA=", + "lastModified": 1768986040, + "narHash": "sha256-83npNk7w9yNJfSnpdZPNUjbhQwGVef3BWyBuIe6TJfk=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "3e0747d31474cdb182801518e39511eed2c84c91", + "rev": "d75e3c96c9f935a6ccdd4a91209950289b2dc2fc", "type": "github" }, "original": { @@ -249,11 +249,11 @@ ] }, "locked": { - "lastModified": 1768208826, - "narHash": "sha256-HWnVcDDuBCHUDoDpNADw1LybfF4jKofGAynV4HDRRrg=", + "lastModified": 1768307256, + "narHash": "sha256-3yDvlAqWa0Vk3B9hFRJJrSs1xc+FwVQFLtu//VrTR4c=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "ba5f08218d4f14bf1baeeb69eaadb7a2f2d995af", + "rev": "7e031eb535a494582f4fc58735b5aecba7b57058", "type": "github" }, "original": { @@ -271,11 +271,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1768227710, - "narHash": "sha256-m6GRI1hzt/jfKaPyyraxUCi0HAc6ROwasemyeWGulJA=", + "lastModified": 1769092149, + "narHash": "sha256-XTC3tMduDWgsxX3cCt+s93Gp3G7VcgaxW0YJGO5V7Ug=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "321aab84a04492df7230090eabc61fa0b224a106", + "rev": "3d080a925240a30ce22cd2f82d6962ac950c3a31", "type": "github" }, "original": { @@ -298,11 +298,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1768200625, - "narHash": "sha256-/OzaFZnKs9hbqv1pnB9riPBdgQo8qACYme2VrC5uVjI=", + "lastModified": 1769095293, + "narHash": "sha256-GPlRdJ7LVLyabpJ2tDA9Bj5em9wi3mKXeedIDl7+LWs=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "bc9753e6e2f20873307e246f859c463f9d20ce1d", + "rev": "180bdbbc91c89f540a52d2b31c8c08116c53b91f", "type": "github" }, "original": { @@ -331,11 +331,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1768196703, - "narHash": "sha256-mttBQdVnVFO3mn+M+oqCsZZOtS2HvXYy+VaHxb8YuMw=", + "lastModified": 1768678265, + "narHash": "sha256-Ub8eed4DsfIDWyg30xEe+8bSxL/z5Af/gCjmvJ0V/Hs=", "owner": "YaLTeR", "repo": "niri", - "rev": "3672e79369d72297abda8878245ea4ec327062c6", + "rev": "d7184a04b904e07113f4623610775ae78d32394c", "type": "github" }, "original": { @@ -356,11 +356,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1768207864, - "narHash": "sha256-JUU3iYKlDQ0EIcNC9kIcQbHmdRa8it0bxUMr4vfNSjk=", + "lastModified": 1769071968, + "narHash": "sha256-P+RuimrEk2jmkXpJuy1wS+ih6eMdjAm7YiN8Q9g9xhY=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "735ab2d975c05195a468e410a5da071d2e7fada4", + "rev": "d9761c3ab2cec2579bfcfb8249e59b324d2a1df4", "type": "github" }, "original": { @@ -371,11 +371,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1768119771, - "narHash": "sha256-kbbmAfCXcgjdShTDDEn/pCoC5rKQMTd1BksXANn8D2A=", + "lastModified": 1768656715, + "narHash": "sha256-Sbh037scxKFm7xL0ahgSCw+X2/5ZKeOwI2clqrYr9j4=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "2e49028cb29c76c8553c6099b19f11879db2cbd1", + "rev": "123fe29340a5b8671367055b75a6e7c320d6f89a", "type": "github" }, "original": { @@ -408,11 +408,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1767185284, - "narHash": "sha256-ljDBUDpD1Cg5n3mJI81Hz5qeZAwCGxon4kQW3Ho3+6Q=", + "lastModified": 1769086393, + "narHash": "sha256-3ymIZ8s3+hu7sDl/Y48o6bwMxorfKrmn97KuWiw1vjY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "40b1a28dce561bea34858287fbb23052c3ee63fe", + "rev": "9f7ba891ea5fc3ededd7804f1a23fafadbcb26ca", "type": "github" }, "original": { @@ -424,11 +424,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1767767207, - "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=", + "lastModified": 1769018530, + "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5912c1772a44e31bf1c63c0390b90501e5026886", + "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", "type": "github" }, "original": { @@ -487,11 +487,11 @@ ] }, "locked": { - "lastModified": 1768186348, - "narHash": "sha256-nkpIe3zkpeoFuOl8xBpexulECsHLQ9Ljg1gW3bPCjSI=", + "lastModified": 1769091129, + "narHash": "sha256-Jj/vIHjiu4OdDIrDXZ3xOPCJrMZZKzhE2UIVXV/NYzY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "af69e497567a5945a64057717bc9b17c8478097e", + "rev": "131e22d6a6d54ab72aeef6a5a661ab7005b4c596", "type": "github" }, "original": { @@ -604,11 +604,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1768106915, - "narHash": "sha256-HlLo9zH4ULRXlmlIK948cHmdVhxyHgTHxGaoCRlW4k8=", + "lastModified": 1768765571, + "narHash": "sha256-C1JbyJ3ftogmN3vmLNfyPtnJw2wY64TiUTIhFtk1Leg=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "72245e108f3b03c3c4474d2de9de2d1830849603", + "rev": "ed1cef792b4def3321ff9ab5479df09609f17a69", "type": "github" }, "original": { @@ -627,11 +627,11 @@ ] }, "locked": { - "lastModified": 1768183082, - "narHash": "sha256-XsiMOsqRLfmUi+24F7adhb/GAM2dMvplzwaW2Wxg/lo=", + "lastModified": 1769059766, + "narHash": "sha256-u95Qe60mF3eoEqrd0tIej4A8TDWoc/N4ZjZ60npplgw=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "cdbc300fd89d503a95d1c8564de31a93d7b0a0ae", + "rev": "dc0483a6e3ff1ffb04ad77d26c1a4458f4cf82d6", "type": "github" }, "original": { From 47a5620bbffaa7950e2a35950ac02612d818a8aa Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 22 Jan 2026 14:13:30 -0500 Subject: [PATCH 525/724] fix python312 jaraco-test --- home-manager/no-gui.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index c7aa9f0..30cec98 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -120,6 +120,14 @@ in { nixpkgs.overlays = [ inputs.rust-overlay.overlays.default + # Workaround: jaraco-test tests fail with pytest INTERNALERROR on nixos-unstable + (final: prev: { + python312 = prev.python312.override { + packageOverrides = pyFinal: pyPrev: { + jaraco-test = pyPrev.jaraco-test.overridePythonAttrs { doCheck = false; }; + }; + }; + }) ]; } ) From dcc4866769587d3d49730d8ccfe6255b46a5e7c9 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 22 Jan 2026 14:13:53 -0500 Subject: [PATCH 526/724] move to python313 to fix jaraco-test instead --- home-manager/no-gui.nix | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 30cec98..52e0718 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -120,14 +120,6 @@ in { nixpkgs.overlays = [ inputs.rust-overlay.overlays.default - # Workaround: jaraco-test tests fail with pytest INTERNALERROR on nixos-unstable - (final: prev: { - python312 = prev.python312.override { - packageOverrides = pyFinal: pyPrev: { - jaraco-test = pyPrev.jaraco-test.overridePythonAttrs { doCheck = false; }; - }; - }; - }) ]; } ) @@ -168,7 +160,7 @@ in # microcontroller tooling probe-rs-tools - (python312.withPackages ( + (python313.withPackages ( ps: with ps; [ mypy # type checking types-requests # add types for requests methods From 219cd0b7e0653dde7f4e93581398cd2a6dcbd591 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 22 Jan 2026 14:17:54 -0500 Subject: [PATCH 527/724] fmt --- home-manager/progs/opencode.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index cc87b61..30c2c06 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -9,7 +9,7 @@ let # what model should be used in place of haiku? # glm 4.7-flash is an example haiku-model = "anthropic/claude-haiku-4-5"; - + ohMyOpencodeConfig = { "$schema" = "https://raw.githubusercontent.com/code-yeongyu/oh-my-opencode/master/assets/oh-my-opencode.schema.json"; From 4b7d7881afb5d8efe82675cfc2b066e0a56a0155 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 23 Jan 2026 13:09:33 -0500 Subject: [PATCH 528/724] update --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 28248c1..aee776c 100644 --- a/flake.lock +++ b/flake.lock @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1769102592, - "narHash": "sha256-HLBblJ0V7MAw94uNU+ov7Kg6F8BeM6pIzbBrXgf9Wa8=", + "lastModified": 1769159866, + "narHash": "sha256-bD29R6Nn6U7zcb9tntjY3XVzRjjc96unrZkIgk4QR3Y=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "a14a17238a9f13f46f152d0841645e70dff5d5ad", + "rev": "d0c49bc1530da602ba93066200a6ecaaee2056a7", "type": "github" }, "original": { @@ -180,11 +180,11 @@ ] }, "locked": { - "lastModified": 1769102673, - "narHash": "sha256-/qvRFjn1s3bIJdSKG6IpaE6ML3j9anQKUqGhmt4Qe+E=", + "lastModified": 1769187349, + "narHash": "sha256-clG+nT6I2qxjIgk5WoSDKJyNhzKJs9jzbCujPF2S/yg=", "owner": "nix-community", "repo": "home-manager", - "rev": "b0491fe55680bd19be8e74847969dad9d7784658", + "rev": "082a4cd87c6089d1d9c58ebe52655f9e07245fcb", "type": "github" }, "original": { @@ -224,11 +224,11 @@ ] }, "locked": { - "lastModified": 1768986040, - "narHash": "sha256-83npNk7w9yNJfSnpdZPNUjbhQwGVef3BWyBuIe6TJfk=", + "lastModified": 1769153735, + "narHash": "sha256-ZMMGBhFx7MSxn8PV33MfJDN5AwEm1qur2I+ygaCeMOg=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "d75e3c96c9f935a6ccdd4a91209950289b2dc2fc", + "rev": "ecddd35ae96e09e50c7cf0b0d7b3ca71ebb245ad", "type": "github" }, "original": { @@ -249,11 +249,11 @@ ] }, "locked": { - "lastModified": 1768307256, - "narHash": "sha256-3yDvlAqWa0Vk3B9hFRJJrSs1xc+FwVQFLtu//VrTR4c=", + "lastModified": 1769175598, + "narHash": "sha256-xGlAdk2c1mVxOTMzzCYHDYuXaBMoH1BTr2nJOGkY/SQ=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "7e031eb535a494582f4fc58735b5aecba7b57058", + "rev": "1bea6e953d06da77729edd0004291ced527bcb4a", "type": "github" }, "original": { @@ -271,11 +271,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1769092149, - "narHash": "sha256-XTC3tMduDWgsxX3cCt+s93Gp3G7VcgaxW0YJGO5V7Ug=", + "lastModified": 1769179138, + "narHash": "sha256-o51hx7iJFacHWeUoeczozlPfiJz/efiLNkEzDOg5Dps=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "3d080a925240a30ce22cd2f82d6962ac950c3a31", + "rev": "cd994b5ff299de10c087b61d01a008cedc8aae58", "type": "github" }, "original": { @@ -298,11 +298,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1769095293, - "narHash": "sha256-GPlRdJ7LVLyabpJ2tDA9Bj5em9wi3mKXeedIDl7+LWs=", + "lastModified": 1769170609, + "narHash": "sha256-LiyaKNga2z/iG4pNr86iQLySEDoOytEzTCblxzRjnCk=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "180bdbbc91c89f540a52d2b31c8c08116c53b91f", + "rev": "08d6e6adf34b0af12be7eaeacc0b4c1a8580b3da", "type": "github" }, "original": { @@ -356,11 +356,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1769071968, - "narHash": "sha256-P+RuimrEk2jmkXpJuy1wS+ih6eMdjAm7YiN8Q9g9xhY=", + "lastModified": 1769158158, + "narHash": "sha256-8aJTIBqVbFIIM77ZtCCtSRtfmwFuijUhV/keweyYDYs=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "d9761c3ab2cec2579bfcfb8249e59b324d2a1df4", + "rev": "63422a000ca41bb3238950094240efedaf7cbda5", "type": "github" }, "original": { @@ -487,11 +487,11 @@ ] }, "locked": { - "lastModified": 1769091129, - "narHash": "sha256-Jj/vIHjiu4OdDIrDXZ3xOPCJrMZZKzhE2UIVXV/NYzY=", + "lastModified": 1769136478, + "narHash": "sha256-8UNd5lmGf8phCr/aKxagJ4kNsF0pCHLish2G4ZKCFFY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "131e22d6a6d54ab72aeef6a5a661ab7005b4c596", + "rev": "470ee44393bb19887056b557ea2c03fc5230bd5a", "type": "github" }, "original": { @@ -627,11 +627,11 @@ ] }, "locked": { - "lastModified": 1769059766, - "narHash": "sha256-u95Qe60mF3eoEqrd0tIej4A8TDWoc/N4ZjZ60npplgw=", + "lastModified": 1769189189, + "narHash": "sha256-JvsG6aWbVwES8++eYMqYFdoPIXYFUZl9J0DmhJ2wCWQ=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "dc0483a6e3ff1ffb04ad77d26c1a4458f4cf82d6", + "rev": "c7197cdd02440ffbbe0a8e1fe9187c941a52ffe4", "type": "github" }, "original": { From 37cd3f981495209dbca45978b790987bf8ff96ea Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 25 Jan 2026 00:40:31 -0500 Subject: [PATCH 529/724] update --- flake.lock | 78 +++++++++++++++++++++++++++--------------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/flake.lock b/flake.lock index aee776c..416c467 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ }, "crane": { "locked": { - "lastModified": 1767744144, - "narHash": "sha256-9/9ntI0D+HbN4G0TrK3KmHbTvwgswz7p8IEJsWyef8Q=", + "lastModified": 1769287525, + "narHash": "sha256-gABuYA6BzoRMLuPaeO5p7SLrpd4qExgkwEmYaYQY4bM=", "owner": "ipetkov", "repo": "crane", - "rev": "2fb033290bf6b23f226d4c8b32f7f7a16b043d7e", + "rev": "0314e365877a85c9e5758f9ea77a9972afbb4c21", "type": "github" }, "original": { @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1769159866, - "narHash": "sha256-bD29R6Nn6U7zcb9tntjY3XVzRjjc96unrZkIgk4QR3Y=", + "lastModified": 1769306011, + "narHash": "sha256-yh27kFW0S03NM6Xi4gc9JN2gobLgW+oHAPro5lRrOVc=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "d0c49bc1530da602ba93066200a6ecaaee2056a7", + "rev": "ffd3a16e5417a68d55bc25a6e1ad66c95c2ad767", "type": "github" }, "original": { @@ -180,11 +180,11 @@ ] }, "locked": { - "lastModified": 1769187349, - "narHash": "sha256-clG+nT6I2qxjIgk5WoSDKJyNhzKJs9jzbCujPF2S/yg=", + "lastModified": 1769289524, + "narHash": "sha256-6Cwtvzrw79cOk1lCzN2aKSVrpgSOSQoYhyMmhXXZjTA=", "owner": "nix-community", "repo": "home-manager", - "rev": "082a4cd87c6089d1d9c58ebe52655f9e07245fcb", + "rev": "2539eba97a6df237d75617c25cd2dbef92df3d5b", "type": "github" }, "original": { @@ -224,11 +224,11 @@ ] }, "locked": { - "lastModified": 1769153735, - "narHash": "sha256-ZMMGBhFx7MSxn8PV33MfJDN5AwEm1qur2I+ygaCeMOg=", + "lastModified": 1769273817, + "narHash": "sha256-+iyLihi/ynJokMgJZMRXuMuI6DPGUQRajz5ztNCHgnI=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "ecddd35ae96e09e50c7cf0b0d7b3ca71ebb245ad", + "rev": "98f988ad46e31f9956c5f6874dfb3580a7ff3969", "type": "github" }, "original": { @@ -249,11 +249,11 @@ ] }, "locked": { - "lastModified": 1769175598, - "narHash": "sha256-xGlAdk2c1mVxOTMzzCYHDYuXaBMoH1BTr2nJOGkY/SQ=", + "lastModified": 1769301952, + "narHash": "sha256-XxYnvAPv2kZBTUywng8mvX2OJtq0Dx3FDyta1NmSjRc=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "1bea6e953d06da77729edd0004291ced527bcb4a", + "rev": "4673781e286eeeb35fec07b01cad87d41d94a349", "type": "github" }, "original": { @@ -271,11 +271,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1769179138, - "narHash": "sha256-o51hx7iJFacHWeUoeczozlPfiJz/efiLNkEzDOg5Dps=", + "lastModified": 1769234232, + "narHash": "sha256-88lfPFXzCfxVhWJBq9RvwqvAa5IH+iLcR7f+gRl+8IM=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "cd994b5ff299de10c087b61d01a008cedc8aae58", + "rev": "861ade6060a73482cfd08bd992fa687f910e5c7c", "type": "github" }, "original": { @@ -298,11 +298,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1769170609, - "narHash": "sha256-LiyaKNga2z/iG4pNr86iQLySEDoOytEzTCblxzRjnCk=", + "lastModified": 1769282225, + "narHash": "sha256-5rcscjSoahWOb/xTNCLlqh/PKfNwvAwcf2hQ7XLj5RI=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "08d6e6adf34b0af12be7eaeacc0b4c1a8580b3da", + "rev": "2efd11d9a6b5655c3b97beb666739eabcebd6171", "type": "github" }, "original": { @@ -356,11 +356,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1769158158, - "narHash": "sha256-8aJTIBqVbFIIM77ZtCCtSRtfmwFuijUhV/keweyYDYs=", + "lastModified": 1769244263, + "narHash": "sha256-kn4ylXn5G+/AutGVtDczPGjwKmsXQs+BqZB0IeyyeXw=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "63422a000ca41bb3238950094240efedaf7cbda5", + "rev": "11401bae5bf33c20d1be6cb8c5fe90641f253f24", "type": "github" }, "original": { @@ -408,11 +408,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1769086393, - "narHash": "sha256-3ymIZ8s3+hu7sDl/Y48o6bwMxorfKrmn97KuWiw1vjY=", + "lastModified": 1769302137, + "narHash": "sha256-QEDtctEkOsbx8nlFh4yqPEOtr4tif6KTqWwJ37IM2ds=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "9f7ba891ea5fc3ededd7804f1a23fafadbcb26ca", + "rev": "a351494b0e35fd7c0b7a1aae82f0afddf4907aa8", "type": "github" }, "original": { @@ -448,11 +448,11 @@ ] }, "locked": { - "lastModified": 1767281941, - "narHash": "sha256-6MkqajPICgugsuZ92OMoQcgSHnD6sJHwk8AxvMcIgTE=", + "lastModified": 1769069492, + "narHash": "sha256-Efs3VUPelRduf3PpfPP2ovEB4CXT7vHf8W+xc49RL/U=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "f0927703b7b1c8d97511c4116eb9b4ec6645a0fa", + "rev": "a1ef738813b15cf8ec759bdff5761b027e3e1d23", "type": "github" }, "original": { @@ -487,11 +487,11 @@ ] }, "locked": { - "lastModified": 1769136478, - "narHash": "sha256-8UNd5lmGf8phCr/aKxagJ4kNsF0pCHLish2G4ZKCFFY=", + "lastModified": 1769309768, + "narHash": "sha256-AbOIlNO+JoqRJkK1VrnDXhxuX6CrdtIu2hSuy4pxi3g=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "470ee44393bb19887056b557ea2c03fc5230bd5a", + "rev": "140c9dc582cb73ada2d63a2180524fcaa744fad5", "type": "github" }, "original": { @@ -604,11 +604,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1768765571, - "narHash": "sha256-C1JbyJ3ftogmN3vmLNfyPtnJw2wY64TiUTIhFtk1Leg=", + "lastModified": 1769279212, + "narHash": "sha256-LAd6DYp6bbnQqtzMm62BE/0IMy67A4CgyYVi4xvyD6s=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "ed1cef792b4def3321ff9ab5479df09609f17a69", + "rev": "3af3e3ab78d0eb96fb9b5161693811e050b90991", "type": "github" }, "original": { @@ -627,11 +627,11 @@ ] }, "locked": { - "lastModified": 1769189189, - "narHash": "sha256-JvsG6aWbVwES8++eYMqYFdoPIXYFUZl9J0DmhJ2wCWQ=", + "lastModified": 1769319042, + "narHash": "sha256-2MmX9m8ZZgXEakZ9us2CsxG8Uz6ZjaFM+Xe5Y7VrZTQ=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "c7197cdd02440ffbbe0a8e1fe9187c941a52ffe4", + "rev": "500f06314aebde1174ca6da147ccf59259abf6c0", "type": "github" }, "original": { From f5dc44330c529072729f9cfeea71afcb8630722e Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 26 Jan 2026 00:46:00 -0500 Subject: [PATCH 530/724] wlx-overlay-s -> wayvr --- system/vr.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/vr.nix b/system/vr.nix index 83f3524..7a15fa7 100644 --- a/system/vr.nix +++ b/system/vr.nix @@ -42,7 +42,7 @@ } ]; - application = [ pkgs.wlx-overlay-s ]; + application = [ pkgs.wayvr ]; }; }; }; From eb15c4fbd2abfe3de98cda56cf28170bf8d2b24b Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 26 Jan 2026 17:57:50 -0500 Subject: [PATCH 531/724] yarn: set static ip --- system/system-yarn.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/system/system-yarn.nix b/system/system-yarn.nix index 5c6f1ff..a00939e 100644 --- a/system/system-yarn.nix +++ b/system/system-yarn.nix @@ -33,6 +33,22 @@ 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 ]; From b45f66c6ce2b91078f6ea987af6a793738de349e Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 27 Jan 2026 13:52:12 -0500 Subject: [PATCH 532/724] grayjay --- home-manager/gui.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home-manager/gui.nix b/home-manager/gui.nix index 424f0f9..471c730 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -18,6 +18,7 @@ pkg: builtins.elem (lib.getName pkg) [ "apple_cursor" + "grayjay" ]; home.packages = @@ -34,6 +35,7 @@ [ tor-browser inputs.zen-browser.packages."${system}".twilight + grayjay ] # music library management From c80a8cf2c12d2cd430284aa12b26cc877cfb454c Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 27 Jan 2026 23:26:01 -0500 Subject: [PATCH 533/724] opencode: add info about android app UI interaction --- home-manager/progs/opencode.nix | 48 +++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index 30c2c06..feb7896 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -50,6 +50,54 @@ in ## 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 + 3. Calculate center coordinates from bounds + 4. Tap/interact + 5. Wait β†’ screenshot β†’ verify result ''; settings = { theme = "opencode"; From df0f6982d0b56063de1760fa8add5858d0e2455b Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 28 Jan 2026 11:25:26 -0500 Subject: [PATCH 534/724] update --- flake.lock | 90 +++++++++++++++++++++++++++--------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/flake.lock b/flake.lock index 416c467..a401625 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1767386128, - "narHash": "sha256-BJDu7dIMauO2nYRSL4aI8wDNtEm2KOb7lDKP3hxdrpo=", + "lastModified": 1769353768, + "narHash": "sha256-zI+7cbMI4wMIR57jMjDSEsVb3grapTnURDxxJPYFIW0=", "owner": "numtide", "repo": "blueprint", - "rev": "0ed984d51a3031065925ab08812a5434f40b93d4", + "rev": "c7da5c70ad1c9b60b6f5d4f674fbe205d48d8f6c", "type": "github" }, "original": { @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1769306011, - "narHash": "sha256-yh27kFW0S03NM6Xi4gc9JN2gobLgW+oHAPro5lRrOVc=", + "lastModified": 1769594889, + "narHash": "sha256-15Sb7QhUEFrRAzRMxaiGxCQxddkFAydA5ZtYRoL/Z00=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "ffd3a16e5417a68d55bc25a6e1ad66c95c2ad767", + "rev": "4e58fc3fa871106900fab58a7ade8736c315d5af", "type": "github" }, "original": { @@ -180,11 +180,11 @@ ] }, "locked": { - "lastModified": 1769289524, - "narHash": "sha256-6Cwtvzrw79cOk1lCzN2aKSVrpgSOSQoYhyMmhXXZjTA=", + "lastModified": 1769579508, + "narHash": "sha256-EE2bs7xFrC64qrj0N2zP6E6e/nmhcdw6v/grdYi+BiY=", "owner": "nix-community", "repo": "home-manager", - "rev": "2539eba97a6df237d75617c25cd2dbef92df3d5b", + "rev": "eec72f127831326b042d1f35003767a4ab6a9516", "type": "github" }, "original": { @@ -203,11 +203,11 @@ ] }, "locked": { - "lastModified": 1768941735, - "narHash": "sha256-OyxsfXNcOkt06/kM+4bnuC8moDx+t7Qr+RB0BBa83Ig=", + "lastModified": 1769548169, + "narHash": "sha256-03+JxvzmfwRu+5JafM0DLbxgHttOQZkUtDWBmeUkN8Y=", "owner": "nix-community", "repo": "impermanence", - "rev": "69ecf31e8fddc9354a4b418f3a517445d486bb54", + "rev": "7b1d382faf603b6d264f58627330f9faa5cba149", "type": "github" }, "original": { @@ -224,11 +224,11 @@ ] }, "locked": { - "lastModified": 1769273817, - "narHash": "sha256-+iyLihi/ynJokMgJZMRXuMuI6DPGUQRajz5ztNCHgnI=", + "lastModified": 1769596123, + "narHash": "sha256-kcElu+HiwNIJiaNH41IdemFaaGyU3TqI4ebx5CQMHFs=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "98f988ad46e31f9956c5f6874dfb3580a7ff3969", + "rev": "d6bf85533180720680544a0791c7334e315c4fd6", "type": "github" }, "original": { @@ -249,11 +249,11 @@ ] }, "locked": { - "lastModified": 1769301952, - "narHash": "sha256-XxYnvAPv2kZBTUywng8mvX2OJtq0Dx3FDyta1NmSjRc=", + "lastModified": 1769417433, + "narHash": "sha256-0WZ7I/N9InaBHL96/qdiJxg8mqFW3vRla8Z062JmQFE=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "4673781e286eeeb35fec07b01cad87d41d94a349", + "rev": "1902463415745b992dbaf301b2a35a1277be1584", "type": "github" }, "original": { @@ -271,11 +271,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1769234232, - "narHash": "sha256-88lfPFXzCfxVhWJBq9RvwqvAa5IH+iLcR7f+gRl+8IM=", + "lastModified": 1769611617, + "narHash": "sha256-+bDjPaUXXvZ+eGNeqGcZQM1ontShZKIkhW5aiSM0SIk=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "861ade6060a73482cfd08bd992fa687f910e5c7c", + "rev": "08381f74f518ef4963c43b562cc17f9c134173d7", "type": "github" }, "original": { @@ -298,11 +298,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1769282225, - "narHash": "sha256-5rcscjSoahWOb/xTNCLlqh/PKfNwvAwcf2hQ7XLj5RI=", + "lastModified": 1769582851, + "narHash": "sha256-T2a9J3iZ+p+dSmrd8mGgehvXrzwnFlMF22BmBqYHkVg=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "2efd11d9a6b5655c3b97beb666739eabcebd6171", + "rev": "8942525e9d5c79f6b47cffef4992454c9b3f9b69", "type": "github" }, "original": { @@ -331,11 +331,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1768678265, - "narHash": "sha256-Ub8eed4DsfIDWyg30xEe+8bSxL/z5Af/gCjmvJ0V/Hs=", + "lastModified": 1769577126, + "narHash": "sha256-v9vz9Rj4MGwPuhGELdvpRKl2HH+xvkgat6VwL0L86Fg=", "owner": "YaLTeR", "repo": "niri", - "rev": "d7184a04b904e07113f4623610775ae78d32394c", + "rev": "f30db163b5748e8cf95c05aba77d0d3736f40543", "type": "github" }, "original": { @@ -356,11 +356,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1769244263, - "narHash": "sha256-kn4ylXn5G+/AutGVtDczPGjwKmsXQs+BqZB0IeyyeXw=", + "lastModified": 1769590344, + "narHash": "sha256-IO71Efl9r0mKH+ZSLe9Xj4ZzKp75TE8t8otPS57/O3I=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "11401bae5bf33c20d1be6cb8c5fe90641f253f24", + "rev": "3fc11d166b98a685b13de7f5f7ca787b8568b8b7", "type": "github" }, "original": { @@ -424,11 +424,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1769018530, - "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", + "lastModified": 1769461804, + "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", + "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", "type": "github" }, "original": { @@ -487,11 +487,11 @@ ] }, "locked": { - "lastModified": 1769309768, - "narHash": "sha256-AbOIlNO+JoqRJkK1VrnDXhxuX6CrdtIu2hSuy4pxi3g=", + "lastModified": 1769568593, + "narHash": "sha256-vf3cZf8imUlPzFtICa1uyReDzoPV0XhHOIRM3tqI5VY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "140c9dc582cb73ada2d63a2180524fcaa744fad5", + "rev": "6fe5039018d05cee5d01dda7df1c0846fb7943a4", "type": "github" }, "original": { @@ -553,11 +553,11 @@ ] }, "locked": { - "lastModified": 1768158989, - "narHash": "sha256-67vyT1+xClLldnumAzCTBvU0jLZ1YBcf4vANRWP3+Ak=", + "lastModified": 1769515380, + "narHash": "sha256-CWWK3PaQ7zhr+Jcf5zyaTR2cfRBXPo09H7+5nWApL8s=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "e96d59dff5c0d7fddb9d113ba108f03c3ef99eca", + "rev": "9911802c2822def2eec3d22e2cafd1619ede94a5", "type": "github" }, "original": { @@ -604,11 +604,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1769279212, - "narHash": "sha256-LAd6DYp6bbnQqtzMm62BE/0IMy67A4CgyYVi4xvyD6s=", + "lastModified": 1769356222, + "narHash": "sha256-Q0BVubV9ZnmLs506EhBSPglM+YJK56wsQNbeecvWPUo=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "3af3e3ab78d0eb96fb9b5161693811e050b90991", + "rev": "cf14278b92b0a91d01587f09b4b00ea655ae24e6", "type": "github" }, "original": { @@ -627,11 +627,11 @@ ] }, "locked": { - "lastModified": 1769319042, - "narHash": "sha256-2MmX9m8ZZgXEakZ9us2CsxG8Uz6ZjaFM+Xe5Y7VrZTQ=", + "lastModified": 1769589275, + "narHash": "sha256-hU6J/bU8mHhJrV/asVDQ9oY7gcH/MMSOGtr4iOYy8lc=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "500f06314aebde1174ca6da147ccf59259abf6c0", + "rev": "a318ae926a6f96cce4cb8498ad986b33a6d44b21", "type": "github" }, "original": { From d6d3e9d0eee722a46e8f644ca2b8ccb67049bc1f Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 28 Jan 2026 11:38:16 -0500 Subject: [PATCH 535/724] add oh-my-opencode --- flake.lock | 56 +++++++++++++++++++++++++++++++++ flake.nix | 6 ++++ home-manager/progs/opencode.nix | 4 +++ 3 files changed, 66 insertions(+) diff --git a/flake.lock b/flake.lock index a401625..272cf30 100644 --- a/flake.lock +++ b/flake.lock @@ -151,6 +151,24 @@ "type": "github" } }, + "flake-utils": { + "inputs": { + "systems": "systems_4" + }, + "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": [ @@ -438,6 +456,28 @@ "type": "github" } }, + "oh-my-opencode": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1769568828, + "narHash": "sha256-BQVuBk91oRiXiv6a9cqvMALSDhqyJMeEVzna3vggf2Y=", + "owner": "yebei199", + "repo": "oh-my-opencode", + "rev": "662ca217a3a737c95b8cd3279d740015c9c524af", + "type": "github" + }, + "original": { + "owner": "yebei199", + "ref": "nix", + "repo": "oh-my-opencode", + "type": "github" + } + }, "pre-commit": { "inputs": { "flake-compat": "flake-compat_2", @@ -476,6 +516,7 @@ "nix-flatpak": "nix-flatpak", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", + "oh-my-opencode": "oh-my-opencode", "rust-overlay": "rust-overlay", "zen-browser": "zen-browser" } @@ -545,6 +586,21 @@ "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" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 6c53421..c32a2f8 100644 --- a/flake.nix +++ b/flake.nix @@ -73,6 +73,12 @@ 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"; + }; }; outputs = diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index feb7896..2b9321a 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -25,6 +25,10 @@ let }; in { + home.packages = [ + inputs.oh-my-opencode.packages.${pkgs.stdenv.hostPlatform.system}.oh-my-opencode + ]; + xdg.configFile."opencode/oh-my-opencode.json".text = builtins.toJSON ohMyOpencodeConfig; programs.opencode = { From 9c6dad1266e850e8e5b5213d29e6ee5ef3f5a988 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 28 Jan 2026 11:49:04 -0500 Subject: [PATCH 536/724] Revert "add oh-my-opencode" This reverts commit 2b912cc38eb34cd7e2edfb3b8816d196e89f667c. --- flake.lock | 56 --------------------------------- flake.nix | 6 ---- home-manager/progs/opencode.nix | 4 --- 3 files changed, 66 deletions(-) diff --git a/flake.lock b/flake.lock index 272cf30..a401625 100644 --- a/flake.lock +++ b/flake.lock @@ -151,24 +151,6 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "systems_4" - }, - "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": [ @@ -456,28 +438,6 @@ "type": "github" } }, - "oh-my-opencode": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1769568828, - "narHash": "sha256-BQVuBk91oRiXiv6a9cqvMALSDhqyJMeEVzna3vggf2Y=", - "owner": "yebei199", - "repo": "oh-my-opencode", - "rev": "662ca217a3a737c95b8cd3279d740015c9c524af", - "type": "github" - }, - "original": { - "owner": "yebei199", - "ref": "nix", - "repo": "oh-my-opencode", - "type": "github" - } - }, "pre-commit": { "inputs": { "flake-compat": "flake-compat_2", @@ -516,7 +476,6 @@ "nix-flatpak": "nix-flatpak", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", - "oh-my-opencode": "oh-my-opencode", "rust-overlay": "rust-overlay", "zen-browser": "zen-browser" } @@ -586,21 +545,6 @@ "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" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index c32a2f8..6c53421 100644 --- a/flake.nix +++ b/flake.nix @@ -73,12 +73,6 @@ 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"; - }; }; outputs = diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index 2b9321a..feb7896 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -25,10 +25,6 @@ let }; in { - home.packages = [ - inputs.oh-my-opencode.packages.${pkgs.stdenv.hostPlatform.system}.oh-my-opencode - ]; - xdg.configFile."opencode/oh-my-opencode.json".text = builtins.toJSON ohMyOpencodeConfig; programs.opencode = { From 55031bb08688236aa9afaa2cbb6209884afecdba Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 28 Jan 2026 12:04:23 -0500 Subject: [PATCH 537/724] opencode: move away from claude --- home-manager/progs/opencode.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index feb7896..3c5f121 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -8,18 +8,21 @@ let # what model should be used in place of haiku? # glm 4.7-flash is an example - haiku-model = "anthropic/claude-haiku-4-5"; + haiku-model = "openrouter/z-ai/glm-4.7-flash"; + + + opus-model = "openrouter/moonshotai/kimi-k2.5"; ohMyOpencodeConfig = { "$schema" = "https://raw.githubusercontent.com/code-yeongyu/oh-my-opencode/master/assets/oh-my-opencode.schema.json"; agents = { - Sisyphus.model = "anthropic/claude-opus-4-5"; + Sisyphus.model = opus-model; librarian.model = haiku-model; explore.model = haiku-model; oracle.model = "openrouter/openai/gpt-5.2"; frontend-ui-ux-engineer.model = "openrouter/google/gemini-3-pro-preview"; - document-writer.model = "anthropic/claude-sonnet-4-5"; + document-writer.model = opus-model; multimodal-looker.model = haiku-model; }; }; @@ -102,7 +105,7 @@ in settings = { theme = "opencode"; - model = "anthropic/claude-opus-4-5"; + model = opus-model; # small model used for titles small_model = "openrouter/openai/gpt-oss-20b:free"; From a4380d59abfcb1e5ab68802f3562c6cdfc14313c Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 28 Jan 2026 12:16:00 -0500 Subject: [PATCH 538/724] Reapply "add oh-my-opencode" This reverts commit 8297cd01f4b47e1edea4aefd3ac84091869826d6. --- flake.lock | 56 +++++++++++++++++++++++++++++++++ flake.nix | 6 ++++ home-manager/progs/opencode.nix | 4 +++ 3 files changed, 66 insertions(+) diff --git a/flake.lock b/flake.lock index a401625..272cf30 100644 --- a/flake.lock +++ b/flake.lock @@ -151,6 +151,24 @@ "type": "github" } }, + "flake-utils": { + "inputs": { + "systems": "systems_4" + }, + "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": [ @@ -438,6 +456,28 @@ "type": "github" } }, + "oh-my-opencode": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1769568828, + "narHash": "sha256-BQVuBk91oRiXiv6a9cqvMALSDhqyJMeEVzna3vggf2Y=", + "owner": "yebei199", + "repo": "oh-my-opencode", + "rev": "662ca217a3a737c95b8cd3279d740015c9c524af", + "type": "github" + }, + "original": { + "owner": "yebei199", + "ref": "nix", + "repo": "oh-my-opencode", + "type": "github" + } + }, "pre-commit": { "inputs": { "flake-compat": "flake-compat_2", @@ -476,6 +516,7 @@ "nix-flatpak": "nix-flatpak", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", + "oh-my-opencode": "oh-my-opencode", "rust-overlay": "rust-overlay", "zen-browser": "zen-browser" } @@ -545,6 +586,21 @@ "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" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 6c53421..c32a2f8 100644 --- a/flake.nix +++ b/flake.nix @@ -73,6 +73,12 @@ 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"; + }; }; outputs = diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index 3c5f121..8ddb569 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -28,6 +28,10 @@ let }; in { + home.packages = [ + inputs.oh-my-opencode.packages.${pkgs.stdenv.hostPlatform.system}.oh-my-opencode + ]; + xdg.configFile."opencode/oh-my-opencode.json".text = builtins.toJSON ohMyOpencodeConfig; programs.opencode = { From 1d0553cc6e3950f026ada084602eb7b9269ab01c Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 28 Jan 2026 12:16:31 -0500 Subject: [PATCH 539/724] opencode: use my fork of oh-my-opencode --- flake.lock | 10 +++++----- flake.nix | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 272cf30..d106227 100644 --- a/flake.lock +++ b/flake.lock @@ -464,15 +464,15 @@ ] }, "locked": { - "lastModified": 1769568828, - "narHash": "sha256-BQVuBk91oRiXiv6a9cqvMALSDhqyJMeEVzna3vggf2Y=", - "owner": "yebei199", + "lastModified": 1769620461, + "narHash": "sha256-0bkdu0vuxg6jrLY1Bo7SPLHsKBeClxznmDGMsxC/wt8=", + "owner": "titaniumtown", "repo": "oh-my-opencode", - "rev": "662ca217a3a737c95b8cd3279d740015c9c524af", + "rev": "95f5e85721a185c5b682cfa0157920c865849a73", "type": "github" }, "original": { - "owner": "yebei199", + "owner": "titaniumtown", "ref": "nix", "repo": "oh-my-opencode", "type": "github" diff --git a/flake.nix b/flake.nix index c32a2f8..f987bd5 100644 --- a/flake.nix +++ b/flake.nix @@ -76,7 +76,7 @@ # 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"; + url = "github:titaniumtown/oh-my-opencode/nix"; inputs.nixpkgs.follows = "nixpkgs"; }; }; From 0ee7299249570e27ab7ebcdbd231dfc0bc539825 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 28 Jan 2026 12:22:48 -0500 Subject: [PATCH 540/724] opencode: add oh-my-opencode as a plugin --- home-manager/progs/opencode.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index 8ddb569..1ff2107 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -116,6 +116,7 @@ in autoshare = false; autoupdate = true; agent = { }; + plugin = [ "oh-my-opencode" ]; provider = { openrouter = { models = { From 7b605b609ed87e6255b5857c7a3aa95c2d1d225d Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 28 Jan 2026 12:47:43 -0500 Subject: [PATCH 541/724] opencode: fix oh-my-opencode Prometheus + Atlas --- home-manager/progs/opencode.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index 1ff2107..5dd35ff 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -18,6 +18,8 @@ let "https://raw.githubusercontent.com/code-yeongyu/oh-my-opencode/master/assets/oh-my-opencode.schema.json"; agents = { Sisyphus.model = opus-model; + Prometheus.model = opus-model; + Atlas.model = opus-model; librarian.model = haiku-model; explore.model = haiku-model; oracle.model = "openrouter/openai/gpt-5.2"; From 746661beaded9bc5cede96d9bad05be3a7fab179 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 28 Jan 2026 13:23:38 -0500 Subject: [PATCH 542/724] opencode: overhaul oh-my-opencode config --- home-manager/progs/opencode.nix | 38 ++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index 5dd35ff..cdff4a1 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -10,22 +10,43 @@ let # glm 4.7-flash is an example haiku-model = "openrouter/z-ai/glm-4.7-flash"; - opus-model = "openrouter/moonshotai/kimi-k2.5"; ohMyOpencodeConfig = { "$schema" = "https://raw.githubusercontent.com/code-yeongyu/oh-my-opencode/master/assets/oh-my-opencode.schema.json"; agents = { - Sisyphus.model = opus-model; - Prometheus.model = opus-model; - Atlas.model = opus-model; + sisyphus.model = opus-model; + oracle = { + model = "openrouter/openai/gpt-5.2"; + variant = "high"; + }; librarian.model = haiku-model; explore.model = haiku-model; - oracle.model = "openrouter/openai/gpt-5.2"; - frontend-ui-ux-engineer.model = "openrouter/google/gemini-3-pro-preview"; - document-writer.model = opus-model; - multimodal-looker.model = haiku-model; + multimodal-looker.model = "openrouter/google/gemini-3-flash-preview"; + + prometheus.model = opus-model; + metis.model = opus-model; + momus = { + model = "openrouter/openai/gpt-5.2"; + variant = "medium"; + }; + atlas.model = opus-model; + }; + categories = { + visual-engineering.model = "openrouter/google/gemini-3-pro"; + ultrabrain = { + model = "openrouter/openai/gpt-5.2-codex"; + variant = "xhigh"; + }; + artistry = { + model = "openrouter/google/gemini-3-pro"; + variant = "max"; + }; + quick.model = haiku-model; + "unspecified-low".model = opus-model; + "unspecified-high".model = opus-model; + writing.model = "openrouter/google/gemini-3-flash-preview"; }; }; in @@ -124,6 +145,7 @@ in models = { "openai/gpt-oss-20b:free" = { }; "minimax/minimax-m2.1" = { }; + "z-ai/glm-4.7-flash" = {}; }; options = { # TODO! use agenix here instead From 231794a48baf948275761913e0d3972b9d6638df Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 29 Jan 2026 14:51:34 -0500 Subject: [PATCH 543/724] update --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index d106227..d31ad51 100644 --- a/flake.lock +++ b/flake.lock @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1769594889, - "narHash": "sha256-15Sb7QhUEFrRAzRMxaiGxCQxddkFAydA5ZtYRoL/Z00=", + "lastModified": 1769678758, + "narHash": "sha256-ktTHIW3ZlYJSNVp3PUQNm7a4qXariT7TpRKwjlzhlZc=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "4e58fc3fa871106900fab58a7ade8736c315d5af", + "rev": "ac11c0675cf12b591c4f132e726f391f95981d16", "type": "github" }, "original": { @@ -198,11 +198,11 @@ ] }, "locked": { - "lastModified": 1769579508, - "narHash": "sha256-EE2bs7xFrC64qrj0N2zP6E6e/nmhcdw6v/grdYi+BiY=", + "lastModified": 1769699427, + "narHash": "sha256-dAQt3qXugGhg92A+jqaUcmH0elbgEN/mV4vy1+ohLZk=", "owner": "nix-community", "repo": "home-manager", - "rev": "eec72f127831326b042d1f35003767a4ab6a9516", + "rev": "2a08ab21abc8b482f41c521b5f9b0df5b18a67eb", "type": "github" }, "original": { @@ -289,11 +289,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1769611617, - "narHash": "sha256-+bDjPaUXXvZ+eGNeqGcZQM1ontShZKIkhW5aiSM0SIk=", + "lastModified": 1769711683, + "narHash": "sha256-XI7DhTfATVquiC6TEwNXn6oOrDRjhkHnN4VV8oopjOw=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "08381f74f518ef4963c43b562cc17f9c134173d7", + "rev": "0a6ee6135ab795b544a3f96e9bc280168423662c", "type": "github" }, "original": { @@ -316,11 +316,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1769582851, - "narHash": "sha256-T2a9J3iZ+p+dSmrd8mGgehvXrzwnFlMF22BmBqYHkVg=", + "lastModified": 1769714858, + "narHash": "sha256-IHHAKi8yMonZZmVHUQxew1V9UfLBG8Um9PLbNPx3OA4=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "8942525e9d5c79f6b47cffef4992454c9b3f9b69", + "rev": "dfbb02586582d5332d0c06653583b9d743bce081", "type": "github" }, "original": { @@ -374,11 +374,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1769590344, - "narHash": "sha256-IO71Efl9r0mKH+ZSLe9Xj4ZzKp75TE8t8otPS57/O3I=", + "lastModified": 1769677259, + "narHash": "sha256-On/Ue/+X9Ikg5vti1gnOFqP1PsOjlJgrrM6HIrngiL0=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "3fc11d166b98a685b13de7f5f7ca787b8568b8b7", + "rev": "446cdd1a7c065865f79135745d835ccc04e6197e", "type": "github" }, "original": { @@ -528,11 +528,11 @@ ] }, "locked": { - "lastModified": 1769568593, - "narHash": "sha256-vf3cZf8imUlPzFtICa1uyReDzoPV0XhHOIRM3tqI5VY=", + "lastModified": 1769655783, + "narHash": "sha256-Yq4uj+RjiE2Bw7C+7Mojdiw0kTh9xwJxUo6IjofZV+c=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "6fe5039018d05cee5d01dda7df1c0846fb7943a4", + "rev": "8b94aae763a09749cc153bab0b14e6ad8fc95494", "type": "github" }, "original": { @@ -609,11 +609,11 @@ ] }, "locked": { - "lastModified": 1769515380, - "narHash": "sha256-CWWK3PaQ7zhr+Jcf5zyaTR2cfRBXPo09H7+5nWApL8s=", + "lastModified": 1769691507, + "narHash": "sha256-8aAYwyVzSSwIhP2glDhw/G0i5+wOrren3v6WmxkVonM=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "9911802c2822def2eec3d22e2cafd1619ede94a5", + "rev": "28b19c5844cc6e2257801d43f2772a4b4c050a1b", "type": "github" }, "original": { @@ -660,11 +660,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1769356222, - "narHash": "sha256-Q0BVubV9ZnmLs506EhBSPglM+YJK56wsQNbeecvWPUo=", + "lastModified": 1769713942, + "narHash": "sha256-0BtCSO2qzYK/akRDsERqRVLknCYD3FYErc+szreSHUo=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "cf14278b92b0a91d01587f09b4b00ea655ae24e6", + "rev": "37ec78ee26e158b71f42e113e0e7dd9d5eb6bdb0", "type": "github" }, "original": { @@ -683,11 +683,11 @@ ] }, "locked": { - "lastModified": 1769589275, - "narHash": "sha256-hU6J/bU8mHhJrV/asVDQ9oY7gcH/MMSOGtr4iOYy8lc=", + "lastModified": 1769665477, + "narHash": "sha256-wD3QwqGZ1cqZDkDQanwy3HgoVL4Dooqlgta3jOu3Mng=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "a318ae926a6f96cce4cb8498ad986b33a6d44b21", + "rev": "e97c8e719c7e2567ccf86d279f73ade1dbf72373", "type": "github" }, "original": { From c6a7f9935489ff951e692276e75a5ae59b2ea106 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 29 Jan 2026 21:09:28 -0500 Subject: [PATCH 544/724] oh-my-opencode: move to fork and update --- flake.lock | 10 +++++----- flake.nix | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index d31ad51..b64c01e 100644 --- a/flake.lock +++ b/flake.lock @@ -464,15 +464,15 @@ ] }, "locked": { - "lastModified": 1769620461, - "narHash": "sha256-0bkdu0vuxg6jrLY1Bo7SPLHsKBeClxznmDGMsxC/wt8=", - "owner": "titaniumtown", + "lastModified": 1769737152, + "narHash": "sha256-acFesH4jvsWkHi2fbqKb0370iBvBl9djVXdfInNkwxo=", + "owner": "yebei199", "repo": "oh-my-opencode", - "rev": "95f5e85721a185c5b682cfa0157920c865849a73", + "rev": "368a92b694bb130415e576b58f838f8f5ea69d8a", "type": "github" }, "original": { - "owner": "titaniumtown", + "owner": "yebei199", "ref": "nix", "repo": "oh-my-opencode", "type": "github" diff --git a/flake.nix b/flake.nix index f987bd5..c32a2f8 100644 --- a/flake.nix +++ b/flake.nix @@ -76,7 +76,7 @@ # wait for https://github.com/code-yeongyu/oh-my-opencode/pull/921 to be merged oh-my-opencode = { - url = "github:titaniumtown/oh-my-opencode/nix"; + url = "github:yebei199/oh-my-opencode/nix"; inputs.nixpkgs.follows = "nixpkgs"; }; }; From 79199f11951366648a91ffb7aa648a25c1f8a638 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 29 Jan 2026 21:09:48 -0500 Subject: [PATCH 545/724] opencode: add note about coordinates and UI interaction --- home-manager/progs/opencode.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index cdff4a1..ebfde61 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -125,6 +125,8 @@ in 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 From 55f4417533e2326dc5f62885a9709aa403fab8dd Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 31 Jan 2026 00:53:29 -0500 Subject: [PATCH 546/724] fmt --- home-manager/progs/opencode.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index ebfde61..778a4d2 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -147,7 +147,7 @@ in models = { "openai/gpt-oss-20b:free" = { }; "minimax/minimax-m2.1" = { }; - "z-ai/glm-4.7-flash" = {}; + "z-ai/glm-4.7-flash" = { }; }; options = { # TODO! use agenix here instead From 2673c624d0536304dc2990d3f5c86f7a8a01b9e5 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 31 Jan 2026 00:53:37 -0500 Subject: [PATCH 547/724] 1gb hugepages --- system/common.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/system/common.nix b/system/common.nix index 7b0f24f..280c79d 100644 --- a/system/common.nix +++ b/system/common.nix @@ -122,6 +122,13 @@ "msr" "btusb" ]; + + kernelParams = [ + # 1gb huge pages + "hugepagesz=1G" + "hugepages=3" + ]; + }; environment.etc = { From 80659e76048f8cef97db07666bbcea114a5293c2 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 31 Jan 2026 00:56:23 -0500 Subject: [PATCH 548/724] Revert "oh-my-opencode: move to fork and update" This reverts commit 94f98ae34c4bdf62b1f72050eddf2a4819bf4fcf. --- flake.lock | 10 +++++----- flake.nix | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index b64c01e..d31ad51 100644 --- a/flake.lock +++ b/flake.lock @@ -464,15 +464,15 @@ ] }, "locked": { - "lastModified": 1769737152, - "narHash": "sha256-acFesH4jvsWkHi2fbqKb0370iBvBl9djVXdfInNkwxo=", - "owner": "yebei199", + "lastModified": 1769620461, + "narHash": "sha256-0bkdu0vuxg6jrLY1Bo7SPLHsKBeClxznmDGMsxC/wt8=", + "owner": "titaniumtown", "repo": "oh-my-opencode", - "rev": "368a92b694bb130415e576b58f838f8f5ea69d8a", + "rev": "95f5e85721a185c5b682cfa0157920c865849a73", "type": "github" }, "original": { - "owner": "yebei199", + "owner": "titaniumtown", "ref": "nix", "repo": "oh-my-opencode", "type": "github" diff --git a/flake.nix b/flake.nix index c32a2f8..f987bd5 100644 --- a/flake.nix +++ b/flake.nix @@ -76,7 +76,7 @@ # 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"; + url = "github:titaniumtown/oh-my-opencode/nix"; inputs.nixpkgs.follows = "nixpkgs"; }; }; From 3cea367a43041f607f797359e53633fcb4ba66bd Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 31 Jan 2026 00:56:31 -0500 Subject: [PATCH 549/724] update --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index d31ad51..ee49cc4 100644 --- a/flake.lock +++ b/flake.lock @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1769678758, - "narHash": "sha256-ktTHIW3ZlYJSNVp3PUQNm7a4qXariT7TpRKwjlzhlZc=", + "lastModified": 1769824510, + "narHash": "sha256-eR1c/iKIHUXYW/PthilPJPO4/DnHQcVp2IpdIkgHJaw=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "ac11c0675cf12b591c4f132e726f391f95981d16", + "rev": "656fc2edb2d52e7cc547290df5e955325a80c0f8", "type": "github" }, "original": { @@ -198,11 +198,11 @@ ] }, "locked": { - "lastModified": 1769699427, - "narHash": "sha256-dAQt3qXugGhg92A+jqaUcmH0elbgEN/mV4vy1+ohLZk=", + "lastModified": 1769813945, + "narHash": "sha256-9ABv9Lo9t6MrFjlnRnU8Zw1C6LVj2+R8PipQ/rxGLHk=", "owner": "nix-community", "repo": "home-manager", - "rev": "2a08ab21abc8b482f41c521b5f9b0df5b18a67eb", + "rev": "475921375def3eb930e1f8883f619ff8609accb6", "type": "github" }, "original": { @@ -289,11 +289,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1769711683, - "narHash": "sha256-XI7DhTfATVquiC6TEwNXn6oOrDRjhkHnN4VV8oopjOw=", + "lastModified": 1769830491, + "narHash": "sha256-qiScNwBoY79YezHgAcqnbVjXvbCQtwDw/EYxy/pUCR0=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "0a6ee6135ab795b544a3f96e9bc280168423662c", + "rev": "989ed811a3115ffd4c44a8a7bc4d0ed61f511abd", "type": "github" }, "original": { @@ -528,11 +528,11 @@ ] }, "locked": { - "lastModified": 1769655783, - "narHash": "sha256-Yq4uj+RjiE2Bw7C+7Mojdiw0kTh9xwJxUo6IjofZV+c=", + "lastModified": 1769828398, + "narHash": "sha256-zmnvRUm15QrlKH0V1BZoiT3U+Q+tr+P5Osi8qgtL9fY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "8b94aae763a09749cc153bab0b14e6ad8fc95494", + "rev": "a1d32c90c8a4ea43e9586b7e5894c179d5747425", "type": "github" }, "original": { @@ -683,11 +683,11 @@ ] }, "locked": { - "lastModified": 1769665477, - "narHash": "sha256-wD3QwqGZ1cqZDkDQanwy3HgoVL4Dooqlgta3jOu3Mng=", + "lastModified": 1769748063, + "narHash": "sha256-H5XCtJMS3RQKHeaS+axX7CAJ0WwuTUYGy4uzLFSm0Xc=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "e97c8e719c7e2567ccf86d279f73ade1dbf72373", + "rev": "efdd1e683da9412f515b9bd42c37861978c2fd3a", "type": "github" }, "original": { From 4dd25c9d67993c7d494b91bc2e192a00be4d10b4 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 2 Feb 2026 13:05:01 -0500 Subject: [PATCH 550/724] Reapply "oh-my-opencode: move to fork and update" This reverts commit bc6e196548c2f2c03e325c229b71855fe889d7e2. --- flake.lock | 10 +++++----- flake.nix | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index ee49cc4..e3b3104 100644 --- a/flake.lock +++ b/flake.lock @@ -464,15 +464,15 @@ ] }, "locked": { - "lastModified": 1769620461, - "narHash": "sha256-0bkdu0vuxg6jrLY1Bo7SPLHsKBeClxznmDGMsxC/wt8=", - "owner": "titaniumtown", + "lastModified": 1769737152, + "narHash": "sha256-acFesH4jvsWkHi2fbqKb0370iBvBl9djVXdfInNkwxo=", + "owner": "yebei199", "repo": "oh-my-opencode", - "rev": "95f5e85721a185c5b682cfa0157920c865849a73", + "rev": "368a92b694bb130415e576b58f838f8f5ea69d8a", "type": "github" }, "original": { - "owner": "titaniumtown", + "owner": "yebei199", "ref": "nix", "repo": "oh-my-opencode", "type": "github" diff --git a/flake.nix b/flake.nix index f987bd5..c32a2f8 100644 --- a/flake.nix +++ b/flake.nix @@ -76,7 +76,7 @@ # wait for https://github.com/code-yeongyu/oh-my-opencode/pull/921 to be merged oh-my-opencode = { - url = "github:titaniumtown/oh-my-opencode/nix"; + url = "github:yebei199/oh-my-opencode/nix"; inputs.nixpkgs.follows = "nixpkgs"; }; }; From 7eb9024e024be3b74474559b8d67f72370f72e8e Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 2 Feb 2026 13:05:18 -0500 Subject: [PATCH 551/724] oh-my-opencode: update --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index e3b3104..a39c8a3 100644 --- a/flake.lock +++ b/flake.lock @@ -464,11 +464,11 @@ ] }, "locked": { - "lastModified": 1769737152, - "narHash": "sha256-acFesH4jvsWkHi2fbqKb0370iBvBl9djVXdfInNkwxo=", + "lastModified": 1770000517, + "narHash": "sha256-LH5lC9yyvULGOgCLmptIFujm0vQiAXuIq4wAHcnUxmk=", "owner": "yebei199", "repo": "oh-my-opencode", - "rev": "368a92b694bb130415e576b58f838f8f5ea69d8a", + "rev": "cb229cff13565d44aa09868abdfe7ab5b6086feb", "type": "github" }, "original": { From 8799909928f382f7dd68dacfb9162103dbb242c4 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 2 Feb 2026 13:08:00 -0500 Subject: [PATCH 552/724] update --- flake.lock | 66 +++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index a39c8a3..2c4773b 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1766051518, - "narHash": "sha256-znKOwPXQnt3o7lDb3hdf19oDo0BLP4MfBOYiWkEHoik=", + "lastModified": 1770019181, + "narHash": "sha256-hwsYgDnby50JNVpTRYlF3UR/Rrpt01OrxVuryF40CFY=", "owner": "serokell", "repo": "deploy-rs", - "rev": "d5eff7f948535b9c723d60cd8239f8f11ddc90fa", + "rev": "77c906c0ba56aabdbc72041bf9111b565cdd6171", "type": "github" }, "original": { @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1769824510, - "narHash": "sha256-eR1c/iKIHUXYW/PthilPJPO4/DnHQcVp2IpdIkgHJaw=", + "lastModified": 1770053181, + "narHash": "sha256-YxLkG+tzWSX98pRt+4frXkZHPrHpu7afZXe9gCJ+aEo=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "656fc2edb2d52e7cc547290df5e955325a80c0f8", + "rev": "a4a3e2816dc1adff3fa15fcf01dd95bf556ec96f", "type": "github" }, "original": { @@ -198,11 +198,11 @@ ] }, "locked": { - "lastModified": 1769813945, - "narHash": "sha256-9ABv9Lo9t6MrFjlnRnU8Zw1C6LVj2+R8PipQ/rxGLHk=", + "lastModified": 1769978395, + "narHash": "sha256-gj1yP3spUb1vGtaF5qPhshd2j0cg4xf51pklDsIm19Q=", "owner": "nix-community", "repo": "home-manager", - "rev": "475921375def3eb930e1f8883f619ff8609accb6", + "rev": "984708c34d3495a518e6ab6b8633469bbca2f77a", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1769596123, - "narHash": "sha256-kcElu+HiwNIJiaNH41IdemFaaGyU3TqI4ebx5CQMHFs=", + "lastModified": 1769857393, + "narHash": "sha256-3sgdsShDEyA/Jd+VKS8cI2GYHfkS482zH80QcXBF77E=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "d6bf85533180720680544a0791c7334e315c4fd6", + "rev": "91d6a007c918d3e862ec2418babfe271a4f7bfaa", "type": "github" }, "original": { @@ -267,11 +267,11 @@ ] }, "locked": { - "lastModified": 1769417433, - "narHash": "sha256-0WZ7I/N9InaBHL96/qdiJxg8mqFW3vRla8Z062JmQFE=", + "lastModified": 1769949118, + "narHash": "sha256-Ue9kYZenqMw9yHGFnBpoWxQqhs2tlH/el4AxKVicXBE=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "1902463415745b992dbaf301b2a35a1277be1584", + "rev": "0be0641613a13323a61a6406c46b6f28b8894395", "type": "github" }, "original": { @@ -289,11 +289,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1769830491, - "narHash": "sha256-qiScNwBoY79YezHgAcqnbVjXvbCQtwDw/EYxy/pUCR0=", + "lastModified": 1770044450, + "narHash": "sha256-+lybmHhVmvQdEyRRjet6CUklqlXBI6d3X6He8W8OxR0=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "989ed811a3115ffd4c44a8a7bc4d0ed61f511abd", + "rev": "a4ac109ce799a7bba717c37e21f8ca15201b7cc0", "type": "github" }, "original": { @@ -316,11 +316,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1769714858, - "narHash": "sha256-IHHAKi8yMonZZmVHUQxew1V9UfLBG8Um9PLbNPx3OA4=", + "lastModified": 1769980417, + "narHash": "sha256-BOxPHApuXJE0wFKaDK811u5Ihvn4gnsXhCABo0O/u/Q=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "dfbb02586582d5332d0c06653583b9d743bce081", + "rev": "ca6c544ca6a737bdb32676046bf98aca11f8f13d", "type": "github" }, "original": { @@ -374,11 +374,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1769677259, - "narHash": "sha256-On/Ue/+X9Ikg5vti1gnOFqP1PsOjlJgrrM6HIrngiL0=", + "lastModified": 1770023115, + "narHash": "sha256-Q9azPUVNEmMxZVW+y/XDHMthjq5Up9jTnArAdMDhaEM=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "446cdd1a7c065865f79135745d835ccc04e6197e", + "rev": "6659b85b1c9865382d2e522f3f7b60c3243fd8d6", "type": "github" }, "original": { @@ -442,11 +442,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1769461804, - "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", + "lastModified": 1770019141, + "narHash": "sha256-VKS4ZLNx4PNrABoB0L8KUpc1fE7CLpQXQs985tGfaCU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", + "rev": "cb369ef2efd432b3cdf8622b0ffc0a97a02f3137", "type": "github" }, "original": { @@ -528,11 +528,11 @@ ] }, "locked": { - "lastModified": 1769828398, - "narHash": "sha256-zmnvRUm15QrlKH0V1BZoiT3U+Q+tr+P5Osi8qgtL9fY=", + "lastModified": 1770001842, + "narHash": "sha256-ZAyTeILfdWwDp1nuF0RK3McBduMi49qnJvrS+3Ezpac=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a1d32c90c8a4ea43e9586b7e5894c179d5747425", + "rev": "5018343419ea808f8a413241381976b7e60951f2", "type": "github" }, "original": { @@ -683,11 +683,11 @@ ] }, "locked": { - "lastModified": 1769748063, - "narHash": "sha256-H5XCtJMS3RQKHeaS+axX7CAJ0WwuTUYGy4uzLFSm0Xc=", + "lastModified": 1770018638, + "narHash": "sha256-u9fl3Q+ZVPcwnfxGO1V997Gt0vT2m4lvfYp/QvSZRjw=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "efdd1e683da9412f515b9bd42c37861978c2fd3a", + "rev": "fbbadeb3bbed799f5bd86094ebf186658764eb30", "type": "github" }, "original": { From 626b3bb56a284159e7d823db56869eb6c6f55819 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 2 Feb 2026 13:23:10 -0500 Subject: [PATCH 553/724] vm: enable + android --- system/common.nix | 2 +- system/vm.nix | 33 +++------------------------------ 2 files changed, 4 insertions(+), 31 deletions(-) diff --git a/system/common.nix b/system/common.nix index 280c79d..8110256 100644 --- a/system/common.nix +++ b/system/common.nix @@ -11,7 +11,7 @@ }: { imports = [ - # ./vm.nix + ./vm.nix ./steam.nix ./networking.nix diff --git a/system/vm.nix b/system/vm.nix index 9f87c3b..e0f4b65 100644 --- a/system/vm.nix +++ b/system/vm.nix @@ -5,6 +5,9 @@ ... }: { + # android virtualization + virtualisation.waydroid.enable = true; + programs.virt-manager.enable = true; users.groups.libvirtd.members = [ username ]; @@ -13,36 +16,6 @@ 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; From fb31191b229c0a14342b1f04b32de9ba78f1edc7 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 2 Feb 2026 13:33:49 -0500 Subject: [PATCH 554/724] waydroid -> waydroid-nftables --- system/vm.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/system/vm.nix b/system/vm.nix index e0f4b65..6d0b294 100644 --- a/system/vm.nix +++ b/system/vm.nix @@ -6,8 +6,13 @@ }: { # android virtualization - virtualisation.waydroid.enable = true; - + 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 ]; From c0acfa1cf2ff8f28cdb1d847c2646a225f9e0413 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 3 Feb 2026 12:49:33 -0500 Subject: [PATCH 555/724] update --- flake.lock | 78 +++++++++++++++++++++++++++--------------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/flake.lock b/flake.lock index 2c4773b..14c5213 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ }, "crane": { "locked": { - "lastModified": 1769287525, - "narHash": "sha256-gABuYA6BzoRMLuPaeO5p7SLrpd4qExgkwEmYaYQY4bM=", + "lastModified": 1769737823, + "narHash": "sha256-DrBaNpZ+sJ4stXm+0nBX7zqZT9t9P22zbk6m5YhQxS4=", "owner": "ipetkov", "repo": "crane", - "rev": "0314e365877a85c9e5758f9ea77a9972afbb4c21", + "rev": "b2f45c3830aa96b7456a4c4bc327d04d7a43e1ba", "type": "github" }, "original": { @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1770053181, - "narHash": "sha256-YxLkG+tzWSX98pRt+4frXkZHPrHpu7afZXe9gCJ+aEo=", + "lastModified": 1770140424, + "narHash": "sha256-OjLbCjC7TpcZ07cxSmjzELafXBay861hIhrfrRMXZ98=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "a4a3e2816dc1adff3fa15fcf01dd95bf556ec96f", + "rev": "196631c2e3c55526c8a67bfa7f4f06aeb11ffac6", "type": "github" }, "original": { @@ -267,11 +267,11 @@ ] }, "locked": { - "lastModified": 1769949118, - "narHash": "sha256-Ue9kYZenqMw9yHGFnBpoWxQqhs2tlH/el4AxKVicXBE=", + "lastModified": 1770064250, + "narHash": "sha256-3HB6gfnKZnwDoH77lnJktJtQWEZ+D35Oi53pNF6YwO4=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "0be0641613a13323a61a6406c46b6f28b8894395", + "rev": "9985b98c74dcc7b1c7ccfe8693daf37caa4ed2ea", "type": "github" }, "original": { @@ -289,11 +289,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1770044450, - "narHash": "sha256-+lybmHhVmvQdEyRRjet6CUklqlXBI6d3X6He8W8OxR0=", + "lastModified": 1770131791, + "narHash": "sha256-RIRWfFGjLaRjc9hadAbvyf61U+0Vos75ck2aPZQWtpw=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "a4ac109ce799a7bba717c37e21f8ca15201b7cc0", + "rev": "fb8e3ede565da2db8e04608cc59ba3d526476984", "type": "github" }, "original": { @@ -316,11 +316,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1769980417, - "narHash": "sha256-BOxPHApuXJE0wFKaDK811u5Ihvn4gnsXhCABo0O/u/Q=", + "lastModified": 1770133761, + "narHash": "sha256-3/2F3IfdyEz9ot0NytsVymt5Ma54EBBWcAc3CJKQFPE=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "ca6c544ca6a737bdb32676046bf98aca11f8f13d", + "rev": "c44eff590edaff58ef9e34ecf38f6fbccb1be647", "type": "github" }, "original": { @@ -349,11 +349,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1769577126, - "narHash": "sha256-v9vz9Rj4MGwPuhGELdvpRKl2HH+xvkgat6VwL0L86Fg=", + "lastModified": 1770092965, + "narHash": "sha256-++K1ftjwPqMJzIO8t2GsdkYQzC2LLA5A1w21Uo+SLz4=", "owner": "YaLTeR", "repo": "niri", - "rev": "f30db163b5748e8cf95c05aba77d0d3736f40543", + "rev": "189917c93329c86ac2ddd89f459c26a028d590ba", "type": "github" }, "original": { @@ -374,11 +374,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1770023115, - "narHash": "sha256-Q9azPUVNEmMxZVW+y/XDHMthjq5Up9jTnArAdMDhaEM=", + "lastModified": 1770109133, + "narHash": "sha256-ZvFy7n6AEAFU9bJYE5LCecNiCXWVY6sWHu95OqJwg9E=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "6659b85b1c9865382d2e522f3f7b60c3243fd8d6", + "rev": "907ed01ec980745a8cfbcb2cbf8fb0612743361f", "type": "github" }, "original": { @@ -442,11 +442,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1770019141, - "narHash": "sha256-VKS4ZLNx4PNrABoB0L8KUpc1fE7CLpQXQs985tGfaCU=", + "lastModified": 1770115704, + "narHash": "sha256-KHFT9UWOF2yRPlAnSXQJh6uVcgNcWlFqqiAZ7OVlHNc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cb369ef2efd432b3cdf8622b0ffc0a97a02f3137", + "rev": "e6eae2ee2110f3d31110d5c222cd395303343b08", "type": "github" }, "original": { @@ -464,11 +464,11 @@ ] }, "locked": { - "lastModified": 1770000517, - "narHash": "sha256-LH5lC9yyvULGOgCLmptIFujm0vQiAXuIq4wAHcnUxmk=", + "lastModified": 1770100438, + "narHash": "sha256-E3YRaxVaAkbXkUupL2gn+QRRCZ3rn7Uc0RC3XIAXYS4=", "owner": "yebei199", "repo": "oh-my-opencode", - "rev": "cb229cff13565d44aa09868abdfe7ab5b6086feb", + "rev": "25103f10a09534f5ab26e97824f833404e44fb11", "type": "github" }, "original": { @@ -488,11 +488,11 @@ ] }, "locked": { - "lastModified": 1769069492, - "narHash": "sha256-Efs3VUPelRduf3PpfPP2ovEB4CXT7vHf8W+xc49RL/U=", + "lastModified": 1769939035, + "narHash": "sha256-Fok2AmefgVA0+eprw2NDwqKkPGEI5wvR+twiZagBvrg=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "a1ef738813b15cf8ec759bdff5761b027e3e1d23", + "rev": "a8ca480175326551d6c4121498316261cbb5b260", "type": "github" }, "original": { @@ -528,11 +528,11 @@ ] }, "locked": { - "lastModified": 1770001842, - "narHash": "sha256-ZAyTeILfdWwDp1nuF0RK3McBduMi49qnJvrS+3Ezpac=", + "lastModified": 1770088046, + "narHash": "sha256-4hfYDnUTvL1qSSZEA4CEThxfz+KlwSFQ30Z9jgDguO0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "5018343419ea808f8a413241381976b7e60951f2", + "rev": "71f9daa4e05e49c434d08627e755495ae222bc34", "type": "github" }, "original": { @@ -660,11 +660,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1769713942, - "narHash": "sha256-0BtCSO2qzYK/akRDsERqRVLknCYD3FYErc+szreSHUo=", + "lastModified": 1770083504, + "narHash": "sha256-1CB57EPNjZOAjMeFzkG5wbzjuLuKT317alEK6JUf9sc=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "37ec78ee26e158b71f42e113e0e7dd9d5eb6bdb0", + "rev": "75c9f5e77573b36b8d341c28c0d32e9c9a0a2309", "type": "github" }, "original": { @@ -683,11 +683,11 @@ ] }, "locked": { - "lastModified": 1770018638, - "narHash": "sha256-u9fl3Q+ZVPcwnfxGO1V997Gt0vT2m4lvfYp/QvSZRjw=", + "lastModified": 1770097899, + "narHash": "sha256-FKRpvwWR96VDW4bdsxIrZgIAXvdXqsCTaV1HghCJBoQ=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "fbbadeb3bbed799f5bd86094ebf186658764eb30", + "rev": "615a27db86f3fddd0f096b5e9ea832795a4608d1", "type": "github" }, "original": { From b7d99a1d1ac6f62318eea7fc652ad6f0131a7e71 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 3 Feb 2026 12:54:53 -0500 Subject: [PATCH 556/724] opencode: don't use glm-4.7-flash --- home-manager/progs/opencode.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index 778a4d2..7143fdf 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -8,7 +8,7 @@ let # what model should be used in place of haiku? # glm 4.7-flash is an example - haiku-model = "openrouter/z-ai/glm-4.7-flash"; + haiku-model = "openrouter/z-ai/glm-4.7"; opus-model = "openrouter/moonshotai/kimi-k2.5"; @@ -147,7 +147,6 @@ in models = { "openai/gpt-oss-20b:free" = { }; "minimax/minimax-m2.1" = { }; - "z-ai/glm-4.7-flash" = { }; }; options = { # TODO! use agenix here instead From 96fd5ca12b41c5e2cc07045e8ac20f12a825656d Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 3 Feb 2026 13:20:14 -0500 Subject: [PATCH 557/724] noctalia --- flake.lock | 21 +++++++++ flake.nix | 5 +++ home-manager/desktop.nix | 5 ++- home-manager/progs/eww/eww.nix | 19 +++++++- home-manager/progs/niri.nix | 10 ----- home-manager/progs/noctalia.nix | 79 +++++++++++++++++++++++++++++++++ home-manager/progs/opencode.nix | 2 +- system/common.nix | 3 ++ 8 files changed, 131 insertions(+), 13 deletions(-) create mode 100644 home-manager/progs/noctalia.nix diff --git a/flake.lock b/flake.lock index 14c5213..9446441 100644 --- a/flake.lock +++ b/flake.lock @@ -456,6 +456,26 @@ "type": "github" } }, + "noctalia": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1770139227, + "narHash": "sha256-z7k7weJ+DvPBmyITbj42kGRQOR2dp+7VyhxFOfUaQ3Y=", + "owner": "noctalia-dev", + "repo": "noctalia-shell", + "rev": "ab7102a7b073adad53c4b4e09fdf07a7c68ca749", + "type": "github" + }, + "original": { + "owner": "noctalia-dev", + "repo": "noctalia-shell", + "type": "github" + } + }, "oh-my-opencode": { "inputs": { "flake-utils": "flake-utils", @@ -516,6 +536,7 @@ "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" diff --git a/flake.nix b/flake.nix index c32a2f8..3fc7cd1 100644 --- a/flake.nix +++ b/flake.nix @@ -69,6 +69,11 @@ 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"; diff --git a/home-manager/desktop.nix b/home-manager/desktop.nix index 8ac8cc9..1aa044a 100644 --- a/home-manager/desktop.nix +++ b/home-manager/desktop.nix @@ -10,13 +10,16 @@ ./progs/niri.nix # statusbar - ./progs/eww/eww.nix + # ./progs/eww/eww.nix # lockscreen ./progs/swaylock.nix # notification daemon ./progs/dunst.nix + + # noctalia desktop shell + ./progs/noctalia.nix ]; home.packages = with pkgs; [ diff --git a/home-manager/progs/eww/eww.nix b/home-manager/progs/eww/eww.nix index 944b140..56505b9 100644 --- a/home-manager/progs/eww/eww.nix +++ b/home-manager/progs/eww/eww.nix @@ -1,4 +1,9 @@ -{ pkgs, ... }: +{ + pkgs, + lib, + config, + ... +}: { home.packages = with pkgs; [ zsh @@ -11,4 +16,16 @@ enable = true; configDir = ./config; }; + + programs.niri.settings.spawn-at-startup = [ + { + command = [ + (lib.getExe config.programs.eww.package) + "-c" + "${config.programs.eww.configDir}" + "open" + "statusbar" + ]; + } + ]; } diff --git a/home-manager/progs/niri.nix b/home-manager/progs/niri.nix index 9f1890f..2d60211 100644 --- a/home-manager/progs/niri.nix +++ b/home-manager/progs/niri.nix @@ -61,16 +61,6 @@ in xwayland-satellite.path = lib.getExe pkgs.xwayland-satellite; 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 = [ diff --git a/home-manager/progs/noctalia.nix b/home-manager/progs/noctalia.nix new file mode 100644 index 0000000..da5970a --- /dev/null +++ b/home-manager/progs/noctalia.nix @@ -0,0 +1,79 @@ +{ + 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; + }; + }; + }; + + 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"); + + }; + }; + +} diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index 7143fdf..df5f9c3 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -8,7 +8,7 @@ let # what model should be used in place of haiku? # glm 4.7-flash is an example - haiku-model = "openrouter/z-ai/glm-4.7"; + haiku-model = "anthropic/claude-haiku-4-5"; opus-model = "openrouter/moonshotai/kimi-k2.5"; diff --git a/system/common.nix b/system/common.nix index 8110256..ebb64f0 100644 --- a/system/common.nix +++ b/system/common.nix @@ -164,6 +164,9 @@ # power statistics upower.enable = true; + + # power profiles for noctalia shell + power-profiles-daemon.enable = true; }; # EST From 171c67d66187ca31e8603a41c2be8e73a199bb05 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 3 Feb 2026 13:29:34 -0500 Subject: [PATCH 558/724] noctalia stuff --- home-manager/progs/eww/eww.nix | 9 +++++++++ home-manager/progs/niri.nix | 11 ----------- home-manager/progs/noctalia.nix | 13 +++++++++++++ 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/home-manager/progs/eww/eww.nix b/home-manager/progs/eww/eww.nix index 56505b9..62f8f2b 100644 --- a/home-manager/progs/eww/eww.nix +++ b/home-manager/progs/eww/eww.nix @@ -27,5 +27,14 @@ "statusbar" ]; } + + # swaybg works on more than just sway (sets a wallpaper) + { + command = [ + (lib.getExe pkgs.swaybg) + "-i" + "${../wallpaper.png}" + ]; + } ]; } diff --git a/home-manager/progs/niri.nix b/home-manager/progs/niri.nix index 2d60211..f34f2e2 100644 --- a/home-manager/progs/niri.nix +++ b/home-manager/progs/niri.nix @@ -60,17 +60,6 @@ in xwayland-satellite.path = lib.getExe pkgs.xwayland-satellite; - spawn-at-startup = [ - # swaybg works on more than just sway (sets a wallpaper) - { - command = [ - (lib.getExe pkgs.swaybg) - "-i" - "${../wallpaper.png}" - ]; - } - ]; - window-rules = [ { draw-border-with-background = false; } { diff --git a/home-manager/progs/noctalia.nix b/home-manager/progs/noctalia.nix index da5970a..9bbd4f2 100644 --- a/home-manager/progs/noctalia.nix +++ b/home-manager/progs/noctalia.nix @@ -26,6 +26,19 @@ darkMode = true; useWallpaperColors = true; }; + location = { + weatherEnabled = false; + }; + wallpaper = { + enabled = true; + }; + }; + }; + + home.file.".cache/noctalia/wallpapers.json" = { + text = builtins.toJSON { + defaultWallpaper = "${../wallpaper.png}"; + wallpapers = { }; }; }; From cbd1a134fb3974d4f3b0494b790402ff7e129d66 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 3 Feb 2026 13:32:46 -0500 Subject: [PATCH 559/724] enable geoclue2 --- system/common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/system/common.nix b/system/common.nix index ebb64f0..558b32d 100644 --- a/system/common.nix +++ b/system/common.nix @@ -167,6 +167,9 @@ # power profiles for noctalia shell power-profiles-daemon.enable = true; + + # geolocation (uses beacondb.net by default) + geoclue2.enable = true; }; # EST From 5d55f01250501234c5615cc6004db945982f43f4 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 3 Feb 2026 14:45:15 -0500 Subject: [PATCH 560/724] opencode: add note about playwright browser_install --- home-manager/progs/opencode.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index df5f9c3..467165f 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -71,6 +71,7 @@ in ## 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 it requires root and will not work. ## Behavior Do not be sycophantic in your responses. From 048fffc307894ab029dadea40ed4ccbebc10bbb6 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 4 Feb 2026 14:08:24 -0500 Subject: [PATCH 561/724] update --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 9446441..b3b4233 100644 --- a/flake.lock +++ b/flake.lock @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1770140424, - "narHash": "sha256-OjLbCjC7TpcZ07cxSmjzELafXBay861hIhrfrRMXZ98=", + "lastModified": 1770223675, + "narHash": "sha256-Bd2473gF9uqClsfTrQ31IFsOB00hLwyytFUa94qDfko=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "196631c2e3c55526c8a67bfa7f4f06aeb11ffac6", + "rev": "55b048d3e18414795103efa199473a470c525bd2", "type": "github" }, "original": { @@ -198,11 +198,11 @@ ] }, "locked": { - "lastModified": 1769978395, - "narHash": "sha256-gj1yP3spUb1vGtaF5qPhshd2j0cg4xf51pklDsIm19Q=", + "lastModified": 1770164260, + "narHash": "sha256-mQgOAYWlVJyuyXjZN6yxqXWyODvQI5P/UZUCU7IOuYo=", "owner": "nix-community", "repo": "home-manager", - "rev": "984708c34d3495a518e6ab6b8633469bbca2f77a", + "rev": "4fda26500b4539e0a1e3afba9f0e1616bdad4f85", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1769857393, - "narHash": "sha256-3sgdsShDEyA/Jd+VKS8cI2GYHfkS482zH80QcXBF77E=", + "lastModified": 1770220783, + "narHash": "sha256-PuE3L+NeoFkBqtboAJxNscXi7Ksvh7Db/gwA5pFn9+o=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "91d6a007c918d3e862ec2418babfe271a4f7bfaa", + "rev": "90836023417512a2f93cdc3c4b10a060091b43f3", "type": "github" }, "original": { @@ -289,11 +289,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1770131791, - "narHash": "sha256-RIRWfFGjLaRjc9hadAbvyf61U+0Vos75ck2aPZQWtpw=", + "lastModified": 1770215677, + "narHash": "sha256-2re/gbzb2fZHpQp6u7mM5rBVhf55McYdwOeGdYgJNKo=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "fb8e3ede565da2db8e04608cc59ba3d526476984", + "rev": "a23961fc90c59a0cd7f4886c0bcc0efd796a8287", "type": "github" }, "original": { @@ -316,11 +316,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1770133761, - "narHash": "sha256-3/2F3IfdyEz9ot0NytsVymt5Ma54EBBWcAc3CJKQFPE=", + "lastModified": 1770169657, + "narHash": "sha256-wiWbmO2xUoqh5DuSBYVLGOICo9AOcYq9mNPsvCtL7SM=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "c44eff590edaff58ef9e34ecf38f6fbccb1be647", + "rev": "4c962a3fd37ef268337ed113cbffabfd1fe3ca5c", "type": "github" }, "original": { @@ -463,11 +463,11 @@ ] }, "locked": { - "lastModified": 1770139227, - "narHash": "sha256-z7k7weJ+DvPBmyITbj42kGRQOR2dp+7VyhxFOfUaQ3Y=", + "lastModified": 1770231512, + "narHash": "sha256-yuWZ9o2Ntjuiz2QJfkmbjVTDGl1jfLyWip8qqd1gf/M=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "ab7102a7b073adad53c4b4e09fdf07a7c68ca749", + "rev": "3a1dbd4c281bbdaa25b78aa1731042b1a723aca0", "type": "github" }, "original": { @@ -549,11 +549,11 @@ ] }, "locked": { - "lastModified": 1770088046, - "narHash": "sha256-4hfYDnUTvL1qSSZEA4CEThxfz+KlwSFQ30Z9jgDguO0=", + "lastModified": 1770174315, + "narHash": "sha256-GUaMxDmJB1UULsIYpHtfblskVC6zymAaQ/Zqfo+13jc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "71f9daa4e05e49c434d08627e755495ae222bc34", + "rev": "095c394bb91342882f27f6c73f64064fb9de9f2a", "type": "github" }, "original": { @@ -681,11 +681,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1770083504, - "narHash": "sha256-1CB57EPNjZOAjMeFzkG5wbzjuLuKT317alEK6JUf9sc=", + "lastModified": 1770167989, + "narHash": "sha256-rE2WTxKHe3KMG/Zr5YUNeKHkZfWwSFl7yJXrOKnunHg=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "75c9f5e77573b36b8d341c28c0d32e9c9a0a2309", + "rev": "0947c4685f6237d4f8045482ce0c62feab40b6c4", "type": "github" }, "original": { @@ -704,11 +704,11 @@ ] }, "locked": { - "lastModified": 1770097899, - "narHash": "sha256-FKRpvwWR96VDW4bdsxIrZgIAXvdXqsCTaV1HghCJBoQ=", + "lastModified": 1770230276, + "narHash": "sha256-Kx0G9tiq8w52sbHJhJ/NWtXA9DaiswVJ4mMSGzVi8bQ=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "615a27db86f3fddd0f096b5e9ea832795a4608d1", + "rev": "1e3fd9868ba83159c1a094f98184c47e4e4470fd", "type": "github" }, "original": { From a5d94c4c26c18f42fb748b3aba423629620e8878 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 4 Feb 2026 15:20:29 -0500 Subject: [PATCH 562/724] emacs: all treesitter grammars --- home-manager/progs/emacs.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/home-manager/progs/emacs.nix b/home-manager/progs/emacs.nix index 23d722e..96cae3c 100644 --- a/home-manager/progs/emacs.nix +++ b/home-manager/progs/emacs.nix @@ -25,8 +25,9 @@ emacs = pkgs.emacs-unstable-pgtk; extraPackages = epkgs: - [ - epkgs.dracula-theme + with epkgs; [ + dracula-theme + treesit-grammars.with-all-grammars ] ++ (with pkgs; [ shellcheck From 8360cc4203cda6960ba55a6e41d3cb428edcaf2a Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 5 Feb 2026 13:26:57 -0500 Subject: [PATCH 563/724] update --- flake.lock | 60 +++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index b3b4233..73c1128 100644 --- a/flake.lock +++ b/flake.lock @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1770223675, - "narHash": "sha256-Bd2473gF9uqClsfTrQ31IFsOB00hLwyytFUa94qDfko=", + "lastModified": 1770313032, + "narHash": "sha256-M34gN/3h6ATUCYGBn2dEyt8taQTdZ23gKTBIYHVh0j8=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "55b048d3e18414795103efa199473a470c525bd2", + "rev": "7be2629491f5e1939b1c60bcd9534f3b1c18be8b", "type": "github" }, "original": { @@ -198,11 +198,11 @@ ] }, "locked": { - "lastModified": 1770164260, - "narHash": "sha256-mQgOAYWlVJyuyXjZN6yxqXWyODvQI5P/UZUCU7IOuYo=", + "lastModified": 1770310759, + "narHash": "sha256-KsoavnriDUjaEP0x77JC19E9ehiVjThy/Jvno3FwNdE=", "owner": "nix-community", "repo": "home-manager", - "rev": "4fda26500b4539e0a1e3afba9f0e1616bdad4f85", + "rev": "332027bc0ac95d230b8c680dcc44e56f9a3c9339", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1770220783, - "narHash": "sha256-PuE3L+NeoFkBqtboAJxNscXi7Ksvh7Db/gwA5pFn9+o=", + "lastModified": 1770311254, + "narHash": "sha256-4b9UMiD7CGGbXB2VEuAgnn+gErQP3v4Bddx32Uo96zo=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "90836023417512a2f93cdc3c4b10a060091b43f3", + "rev": "d15853dadb69837bc1e86c5be52c1e6b4bda3da4", "type": "github" }, "original": { @@ -289,11 +289,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1770215677, - "narHash": "sha256-2re/gbzb2fZHpQp6u7mM5rBVhf55McYdwOeGdYgJNKo=", + "lastModified": 1770303620, + "narHash": "sha256-INHLINEa/P+nhCqVhWOs4muNhGPp5oR6oGQXG+JcohQ=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "a23961fc90c59a0cd7f4886c0bcc0efd796a8287", + "rev": "feee43be680e42a2668ea73a0d0e1799ef42117a", "type": "github" }, "original": { @@ -316,11 +316,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1770169657, - "narHash": "sha256-wiWbmO2xUoqh5DuSBYVLGOICo9AOcYq9mNPsvCtL7SM=", + "lastModified": 1770271466, + "narHash": "sha256-Pyc3p/V7ruQplnU31r+umLSNlSGwOOoHzhWfzfLmiiw=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "4c962a3fd37ef268337ed113cbffabfd1fe3ca5c", + "rev": "76e1d271485b00a5d98aeb1dd76408594741c039", "type": "github" }, "original": { @@ -442,11 +442,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1770115704, - "narHash": "sha256-KHFT9UWOF2yRPlAnSXQJh6uVcgNcWlFqqiAZ7OVlHNc=", + "lastModified": 1770197578, + "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e6eae2ee2110f3d31110d5c222cd395303343b08", + "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", "type": "github" }, "original": { @@ -463,11 +463,11 @@ ] }, "locked": { - "lastModified": 1770231512, - "narHash": "sha256-yuWZ9o2Ntjuiz2QJfkmbjVTDGl1jfLyWip8qqd1gf/M=", + "lastModified": 1770304450, + "narHash": "sha256-Z4CCgseJdBkl5xdb/MZw5MmRkw1/CmIsQR0KasHktwE=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "3a1dbd4c281bbdaa25b78aa1731042b1a723aca0", + "rev": "20a1b115d72d6f906414930cb9cfeb98362d8948", "type": "github" }, "original": { @@ -549,11 +549,11 @@ ] }, "locked": { - "lastModified": 1770174315, - "narHash": "sha256-GUaMxDmJB1UULsIYpHtfblskVC6zymAaQ/Zqfo+13jc=", + "lastModified": 1770260791, + "narHash": "sha256-ADTBfENFjRVDQMcCycyX/pAy6NFI/Ct6Mrar3gsmXI0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "095c394bb91342882f27f6c73f64064fb9de9f2a", + "rev": "42ec85352e419e601775c57256a52f6d48a39906", "type": "github" }, "original": { @@ -630,11 +630,11 @@ ] }, "locked": { - "lastModified": 1769691507, - "narHash": "sha256-8aAYwyVzSSwIhP2glDhw/G0i5+wOrren3v6WmxkVonM=", + "lastModified": 1770228511, + "narHash": "sha256-wQ6NJSuFqAEmIg2VMnLdCnUc0b7vslUohqqGGD+Fyxk=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "28b19c5844cc6e2257801d43f2772a4b4c050a1b", + "rev": "337a4fe074be1042a35086f15481d763b8ddc0e7", "type": "github" }, "original": { @@ -704,11 +704,11 @@ ] }, "locked": { - "lastModified": 1770230276, - "narHash": "sha256-Kx0G9tiq8w52sbHJhJ/NWtXA9DaiswVJ4mMSGzVi8bQ=", + "lastModified": 1770266898, + "narHash": "sha256-RGFUUbo2AABP17BlCH240tyDFVGcMhz8R+HwmYsv7pc=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "1e3fd9868ba83159c1a094f98184c47e4e4470fd", + "rev": "8098fd20ce52c78d0a6227ab675f29f1195642d3", "type": "github" }, "original": { From 5cf8599ce05ed95be2f12cd2fb1f858cf9b1d600 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 5 Feb 2026 15:05:03 -0500 Subject: [PATCH 564/724] opencode: fix ultrabrain model --- home-manager/progs/opencode.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index 467165f..f208183 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -148,6 +148,9 @@ in models = { "openai/gpt-oss-20b:free" = { }; "minimax/minimax-m2.1" = { }; + "openai/gpt-5.2-codex" = { + variant = "xhigh"; + }; }; options = { # TODO! use agenix here instead From 2b82f23e2c7cd256fe5c99001be623f82d8c93fa Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 5 Feb 2026 15:05:09 -0500 Subject: [PATCH 565/724] fmt --- home-manager/progs/emacs.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/home-manager/progs/emacs.nix b/home-manager/progs/emacs.nix index 96cae3c..0725b5d 100644 --- a/home-manager/progs/emacs.nix +++ b/home-manager/progs/emacs.nix @@ -25,7 +25,8 @@ emacs = pkgs.emacs-unstable-pgtk; extraPackages = epkgs: - with epkgs; [ + with epkgs; + [ dracula-theme treesit-grammars.with-all-grammars ] From cb30cad74db6fa69817e108e26e49eb410a01df8 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 7 Feb 2026 01:22:32 -0500 Subject: [PATCH 566/724] update --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 73c1128..e180d37 100644 --- a/flake.lock +++ b/flake.lock @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1770313032, - "narHash": "sha256-M34gN/3h6ATUCYGBn2dEyt8taQTdZ23gKTBIYHVh0j8=", + "lastModified": 1770429449, + "narHash": "sha256-e/2yL05KOr2pXRm5utKwzRWfZAcvnZrlA86EBDzYn60=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "7be2629491f5e1939b1c60bcd9534f3b1c18be8b", + "rev": "7897f7cbd9a4402429a5c9d814ca95cf98135ec6", "type": "github" }, "original": { @@ -198,11 +198,11 @@ ] }, "locked": { - "lastModified": 1770310759, - "narHash": "sha256-KsoavnriDUjaEP0x77JC19E9ehiVjThy/Jvno3FwNdE=", + "lastModified": 1770318660, + "narHash": "sha256-yFVde8QZK7Dc0Xa8eQDsmxLX4NJNfL1NKfctSyiQgMY=", "owner": "nix-community", "repo": "home-manager", - "rev": "332027bc0ac95d230b8c680dcc44e56f9a3c9339", + "rev": "471e6a065f9efed51488d7c51a9abbd387df91b8", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1770311254, - "narHash": "sha256-4b9UMiD7CGGbXB2VEuAgnn+gErQP3v4Bddx32Uo96zo=", + "lastModified": 1770366813, + "narHash": "sha256-q6dmMSV2EcA6/EXy2oJXoLgxSGjrKY0bixfYbK4fi/4=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "d15853dadb69837bc1e86c5be52c1e6b4bda3da4", + "rev": "2af374cd694b45c7d1773edda154081d0ee81f64", "type": "github" }, "original": { @@ -289,11 +289,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1770303620, - "narHash": "sha256-INHLINEa/P+nhCqVhWOs4muNhGPp5oR6oGQXG+JcohQ=", + "lastModified": 1770435437, + "narHash": "sha256-QGFHw3wc08DgAt2GllBgrOnCcgXTMwOsokdfMDHVprI=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "feee43be680e42a2668ea73a0d0e1799ef42117a", + "rev": "36fb71277896585b319e56e8a98c265f24813e30", "type": "github" }, "original": { @@ -316,11 +316,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1770271466, - "narHash": "sha256-Pyc3p/V7ruQplnU31r+umLSNlSGwOOoHzhWfzfLmiiw=", + "lastModified": 1770400632, + "narHash": "sha256-TsOt49sYfzmxSTj2wKHKK2ZToCByLJLxPbwbu1brDt0=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "76e1d271485b00a5d98aeb1dd76408594741c039", + "rev": "652dbeb0ac2c481dee5b57be972c6fd6feb38adc", "type": "github" }, "original": { @@ -349,11 +349,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1770092965, - "narHash": "sha256-++K1ftjwPqMJzIO8t2GsdkYQzC2LLA5A1w21Uo+SLz4=", + "lastModified": 1770394936, + "narHash": "sha256-Pa0fkyLYUR+pZh7phPENDUo4mJIweaAm0uV83iUUlX8=", "owner": "YaLTeR", "repo": "niri", - "rev": "189917c93329c86ac2ddd89f459c26a028d590ba", + "rev": "549148d27779d024255a84535b42b947f1c2a113", "type": "github" }, "original": { @@ -463,11 +463,11 @@ ] }, "locked": { - "lastModified": 1770304450, - "narHash": "sha256-Z4CCgseJdBkl5xdb/MZw5MmRkw1/CmIsQR0KasHktwE=", + "lastModified": 1770436113, + "narHash": "sha256-Ekc6E1uo7OBMROUUZ3pBiTwha7KlHcsNf6jy1g1hCco=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "20a1b115d72d6f906414930cb9cfeb98362d8948", + "rev": "93838353573233b5584b106eb897a37f8a4e63ac", "type": "github" }, "original": { @@ -549,11 +549,11 @@ ] }, "locked": { - "lastModified": 1770260791, - "narHash": "sha256-ADTBfENFjRVDQMcCycyX/pAy6NFI/Ct6Mrar3gsmXI0=", + "lastModified": 1770433312, + "narHash": "sha256-IaiqGwmLBrR0z67t/oaS6GIFxv9V8mDY7dBTuYVTbKY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "42ec85352e419e601775c57256a52f6d48a39906", + "rev": "9922ff9f99a6436756cbe6f5d11f9c3630e58cf0", "type": "github" }, "original": { @@ -704,11 +704,11 @@ ] }, "locked": { - "lastModified": 1770266898, - "narHash": "sha256-RGFUUbo2AABP17BlCH240tyDFVGcMhz8R+HwmYsv7pc=", + "lastModified": 1770438513, + "narHash": "sha256-KfU+O0b5nkZPkekAK9rDkOeXxefgOqr+3Kgl2/42BuE=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "8098fd20ce52c78d0a6227ab675f29f1195642d3", + "rev": "737f04a2e22cc9dab37f13457e88226653edbfdd", "type": "github" }, "original": { From 494d3c042da5599b63ecb0b4020ab420dd00db30 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 8 Feb 2026 20:51:31 -0500 Subject: [PATCH 567/724] wifi: add network --- system/secrets/wifi-passwords.nix | Bin 2842 -> 3111 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/system/secrets/wifi-passwords.nix b/system/secrets/wifi-passwords.nix index f00fd26ea8875614babb85d1179a5b91d782eb2e..98677a319628faef9bced73bf2112048047f4fe5 100644 GIT binary patch literal 3111 zcmZQ@_Y83kiVO&02>t4GT4}GqPGsU`D zEtuhef8k$cm)&ZAi&_gydo&~doK}dkJ=&5Sn)&+>uj1aIk1u++1Q$LP*mRSh^Gj@H z&Fk(35#Mj#+cSUrU$#2)!&g77WxaQbONTG!g?__*QGtgKj$3@Mn-F~c&2#IPwa>fX zy)F0Xzb9;b$ou$NZApG+vE2sjKP6KSGZuf1lurm05La0J&Hm^8CX=EgmK)EWjgpXy z?|;{Q{(C}3=*xb0k9eyYMx7fQBC|x9OE>W@TYG)_p&5&f%jD0*$X?03;@ z4Oo`6-0n%8L|-`w`Bka>MZ zeDQ_zjAvF}JTP_Tr~7*^{(G9Ta+zJ}>>RHQ%XI1JqJ)cSEJpp+x%y8OL*~w&apx4z zlV@?WnKQMWwjQi<)9=60ru(2Zm1XZ&&G~)Yd*7`N@!+kTQJ~Ut*Y2>9hE=j+#ij$% zk2dMQzh6J0%UOM4&x6X8DT2Xw&pgVOURbp5_|$IwPVLn!0v5#$6CRsa^T=i${rw|w zXV1Ysb0&sXwxzw8JT>FS-q;gDwX;p`z0sEW^3yESsZ7S~rADgm-I9GVeY3JIl{bAj zUftZyBFHt_)#CW?mP(0L3c1&s<*(=HsO;bHSR&3*;Ac;+%1_hfYuj{B-3{+~th>ND zpm5DxNv+IR{!4U~tOc0#s#P;XZ)t>|d$oG%p9#9BtmOmJ3Z@1~Us=0kj?FJW1N~mV z0@Mdo>U6H>-=J1&bX7NhlT zch;*#RXwOXeKcIXz?voJ@Au1wueRPg{&RW2;d1#?OQU#>?KbJHFjlgn{(PtO>cfua zBYhtZ8=99lPO#`u=Y6t*Y2v5(2CN&btukk=UY#SuFFNhg8^wu-W{U}&;aT*5+QfJN z>#F+}F>7fEM10PhQMmm88^16Y`+ax$j9v3w)gl=}f~+)JDvdI^B=!}Veuyvcx>YlU z`TUvn7K^tYr9<2D~5T|#8v-p6}+SYlYX+DC%ayA7}Xvtv2`JR-O}F{CGl56aVDiI|Zw5?4NLKpL{t#n}360*XQ46P2c##ES5wb zS+#0c(*AdPUBUT6XAV^^JliPC>4|cIiwFFa4{D=l5-ke(_P#*xzMR(t6`Rr!Q_<)u;A5a^r(i zFZMqlX5LiMeDHD~yKZ1~u6@L>uI$?6h;xol3$MmU99DDCzq?{KSIzO$X3t;ff73Ph zyPL69#5wdo+qnrVHhmIfNW1uCSNW60n}o&1E^`(w{4r89olIyTRH#o48{=q z|Nm}h%}Z3^dNOgpi}uVp%!=9>>}z#J;y1`KS~ZH^o8csgUPpRbgGQ z=Sj@hs2hJ6dq3UDT6I*X!|fqQ=K5plyPq?&JrljwPd(3i&YkYlYQNvO>G87#GFvJpdsQyT zOj+6aXsPY0O=1~kjTNU|TEf)McE}uxo>HNd6!!C9qAi#8{v=(4wy#gwo_)D)9X(~o zuABvLdvzDhb;}m{={vi_N;2YCjpyFKCXZIT_D($?mBat@5LdS8y<66mOD(k085qqB zj#p{(p1ZtdCA(9_V{wE4G$yH{X$i^nsQ z1I5=JB;Q0-pRl8cj2VRtA&ei?bDlc;QDTZm^3yI9=$CxYL({-%O{69-xOCp^8N6-PmV6S zs(R03=572@F{5NoLF{dzUO9G~1)5ub>{;Z%=P2j+VvX>xfICY3q4$e9pG3CWE<9rd~~kgYNy8oPeXHQeSi?+Q1gkg3G`SyQ!t`IcXtW54bU-#V+=9tRFa1bcmc@?BSR z?&n>MMmFk)a;BQkZ+d^t@Z^;{3w9hdW#>Np>r=C>(@Pceh{iSVDwurJXU^R%#MRZi zR^+7Gi$FJA^$C)obKcOiq|6P1?Blo1TJ`cmUUk$Zi zy<^qA-+ysi)RNPe)|q}_vz5rWTU+6zk-b0kvVy*r@AmG>$A7iA%59xDX`9V~xt{ic z^;(YvmK8=$d&gh1;fSQ%k26jw#nv{Z0qxOFDzBv$MKG8f*MueiNmeT=+UDv}{dMl{ z$`!A8<4(3%1n^wiwX$PE@q-I$S57@TyTdkDQ~UL*&iC*49ogVz>?5#3@nM0x!)%9# zA11}!V!BiBFuN;CRquzxk^O=0&x=cV=Q=pfjLZJ~GH8dapE<8U=5Li^zU^$wtIipP zT)gpiRZGZ?#R;-$qIwV0?uu;Py<_`4k%i0NDtCzUziVqM@T}KfoKmrg*?`S$MgK3R z-AY$muPAEo%#Vzh7mHt}oRNR*k5q)<(UqUWrZ&d~eDmBIoe&|pTgg$QX}`foGd}sZ Na<^-Ka`-F^008H~4*>uG literal 2842 zcmZQ@_Y83kiVO&0i0a!vh3n?a?Fv=5{~3x~9v4ZM-SMo}{kKY&Usm3Jz1+2RX%&nX;uKhC93VO%aL|oc{k6gZ;|z#5M}uFgIO)VeX*Xi)-zbdSoZLeg#`rL+1&9!%489kXBe_FV#$<@6} zQLUT(*-ugTwVy7p*(2q5^{oBpKWXQ*-)?R?;24wNduYnDZ_)1~;#DJsSe8-e}}o#J)^BoYkH7=*or^ue(on{Y)@FdbBA^@xW5KfJ0fbYm!ws zXFWgobux2i-LKac_up097`UWF$+UI`zq$MP*4di*qH9zG+;;J*o^pA8((3pQ&ss*0 zi6T73|C%q9?NHq7eCwc)(aV;@S0uMAeX+*Z&N|u8de{4$YkJenpFbz`Nu}4H7W2DS zdMQmmvcEX+^W7-POH-xZH?VGa!!UIV-=@o@9@3d>r0ocIP8_Qf_c3iPwdu3pOl?jISe1awJSNg>Fn9Ria%^sw%?Ad zws%n9o6coba$59EX};UJ>oqo&ksohuzF?C3O@Bk=@5P zn5;Tu@<;aW#)z-KbQXVN+N^TY^+D&fS)Fa>x98Uh_Oq2a9oo7xDpITL-f zxjrAietld1d?l;i>ABYz*zr2*>?n7dtGD*r?K!J09Ir{7uTI%3{^%1=;E!cHUrpX5 zb0#3VK6|qXuf&XtKHD8~#I;mv1NL7v@(-5!eAu0*rptI!Tg#6CL-XXX=lSCgd8tfm z3*uXte|)~vq{@BYVrNDtnl267_HTvVBF-r9-`-jUN3K4aWc$24ZPE^lXNyZj(;uBU zU1rBP?ZYNF_e%TO9mZ}^Hoig@+xUz^m4ohBdMc>07Cz25w<+BedQI@M`>7=-y7%|< zRwVu5-g>ESvfC*R$-_FGV%r)NwRFNo5h>Gx=EwS zS-djw&C3;Y)%GSOXPZbXtvA}wmft#&tt!A`6V1`vbAA5A?ZWjY z#dl+Lw?4b*KkwzTlhb%-6s`AG`Ea~cz?)g|snuG>HPb=_xu$x|`u)MbVp6lnxu-f0 zo=7}rU(lZ;vhVZGd+KF#7EH2SR`GY2o-&(giI$N*^MSvs8I&T56;5vFb`*U6=xouC zD}s@+0x5GJZFuXo!VYfYcb6BmxHY}xVi+Sy|35RSv;riQ`4T~@2@&`*0|5PP|t=|hF@Z0k)g z)>US)T-(X17S&SJ`>fl$yZ*EFasJn<#Pt#%?Re%_q;}A2qQaZZzNT1)(kAwWJVw`( z&8P8p+&}%~>Y`re`EES3~SpFUN^4sYs{#$tz~Ho?GrvU|&}- zSEOmt{nGl@6P$PdE}j?p!nff7euvAw4t z|8G{j*`3WZZ$D0!nkdA6h$~gGea`#ZfM@fz6maihe#7K`WcsEFJ_dQyzAARGubB8} zeQM?QS@F%c%B5Cr%s*JZ!7^cMYPRm}?I}}@&oA43vhTu!()87G-wh>R%`WKPdT(F- zdq%H3_cu#f?552%_gwq!`MhOULNlHR2WL#&@QTTyfXUW6^$X{LPcF`dn)4kio{P@D z|9s1)Igt}5&bU*i>lwi!Co!!+CH(U{we*==T=<0B_isC_!s)}fY~S{*b30n~m^MF5 zxS_aMu9kr(?$x;#<=md0o-O*bPM`5v8beK7w#pWUZU0hK4(A$Ms!Y2OrI2*sdis@$x1C|a zOAPd!q$gR~bw0?tx_hOsq~PW4?dGTF7u=k3U~=y4mF<~tgp0R^+ALZjaGKLL=FyCG z@4mD}Fjd6;n!{VaYH_jo+BZMBwAm(Yz2470bGydGn6mDB^OfBet}gv~?aZggpO?nG zy)sALw4y0;rsQO;>-#ooP2K+1@65IZHRk#9x7Sp>kaB%_zF9c*d4_Gv@%Svx-10E5 zmHoRaCRZLlutYQRM*5Gct2?LOYmm?{E-q2Hnf_Oz-*x}>No>c(T#6;9y0D2({r2Wy z`>vHKib}jEr)aE+E|@lptMmNwD;>dIT;>Z;H8Q<4p!M%_UK=JCUo1& zAK#|vx+)27=H}5nvE1Bw|4|Q9`OYFYM(&^ndkfi^Wi@a0j=!-A$P=jLp1pNrl)6|? zw@iWI+uh$ArPV$%K3Xial|?3L@BcY0b6#!#3#P05UJObm29?pSGICLxK^?}S-qy{ z*^Q4{6N5q)ur53KxU$pxrLX_>CE=>#PLf=0d!70BvF_0|W>_U*!KTswL*7q9L}gdN zm8%~OS^^IBRp;<8`dlS5IY3^I@6UdlAAPQ+(L%qjEiU&nDB|1uL3F{Avl>rk{9dO# zOKX++tc&R(pOSejlBDHqWW%Ym1L$GDj5 lwpI$S;7@mJFMsMX`K<1-OUJ^rXIU0K>N=ZmYL|FpF#x;hacKYm From 82bb4f4ec8d897e3c31657da03ee17d55f9a3060 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 9 Feb 2026 15:26:55 -0500 Subject: [PATCH 568/724] update --- flake.lock | 84 +++++++++++++++++++++++++++--------------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/flake.lock b/flake.lock index e180d37..a9a864a 100644 --- a/flake.lock +++ b/flake.lock @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1770429449, - "narHash": "sha256-e/2yL05KOr2pXRm5utKwzRWfZAcvnZrlA86EBDzYn60=", + "lastModified": 1770602774, + "narHash": "sha256-eRcZ279Oaf8ViHtvdWVTpcD9x7bvJ3ipQ1Xq9bd+qlk=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "7897f7cbd9a4402429a5c9d814ca95cf98135ec6", + "rev": "a3d87c21d1464f1069d8125cafe6adb84d200185", "type": "github" }, "original": { @@ -198,11 +198,11 @@ ] }, "locked": { - "lastModified": 1770318660, - "narHash": "sha256-yFVde8QZK7Dc0Xa8eQDsmxLX4NJNfL1NKfctSyiQgMY=", + "lastModified": 1770654520, + "narHash": "sha256-mg5WZMIPGsFu9MxSrUcuJUPMbfMsF77el5yb/7rc10k=", "owner": "nix-community", "repo": "home-manager", - "rev": "471e6a065f9efed51488d7c51a9abbd387df91b8", + "rev": "6c4fdbe1ad198fac36c320fd45c5957324a80b8e", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1770366813, - "narHash": "sha256-q6dmMSV2EcA6/EXy2oJXoLgxSGjrKY0bixfYbK4fi/4=", + "lastModified": 1770656651, + "narHash": "sha256-p0bV6EkZZRHyPm3ZJfo0txhuhy9gSfEAzzFc3zG1iLA=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "2af374cd694b45c7d1773edda154081d0ee81f64", + "rev": "2a3cd5fe86931bb928d56c11857d2f825014b852", "type": "github" }, "original": { @@ -267,11 +267,11 @@ ] }, "locked": { - "lastModified": 1770064250, - "narHash": "sha256-3HB6gfnKZnwDoH77lnJktJtQWEZ+D35Oi53pNF6YwO4=", + "lastModified": 1770579389, + "narHash": "sha256-2OwcZVHHsq3DSnJsUOiw0i/ovRqdlIG4uj5RPRql+8I=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "9985b98c74dcc7b1c7ccfe8693daf37caa4ed2ea", + "rev": "7b637233a79e6041affba3f33957995c57f4b140", "type": "github" }, "original": { @@ -289,11 +289,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1770435437, - "narHash": "sha256-QGFHw3wc08DgAt2GllBgrOnCcgXTMwOsokdfMDHVprI=", + "lastModified": 1770647950, + "narHash": "sha256-5IBnmc6yMO4p26kJfHQylCJEci8X8vhp5AYG41yjNU8=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "36fb71277896585b319e56e8a98c265f24813e30", + "rev": "752fd7ca23ccbe5f5b00c0c65db9d8dbb755e119", "type": "github" }, "original": { @@ -316,11 +316,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1770400632, - "narHash": "sha256-TsOt49sYfzmxSTj2wKHKK2ZToCByLJLxPbwbu1brDt0=", + "lastModified": 1770620836, + "narHash": "sha256-HPoMvo/EqIr6xDDRlk6DGZYdu1Hte7lGLZaGZ5017Uc=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "652dbeb0ac2c481dee5b57be972c6fd6feb38adc", + "rev": "ff1edce403a67cfac7bf1038d348f2ef457ac691", "type": "github" }, "original": { @@ -349,11 +349,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1770394936, - "narHash": "sha256-Pa0fkyLYUR+pZh7phPENDUo4mJIweaAm0uV83iUUlX8=", + "lastModified": 1770394959, + "narHash": "sha256-if7bIsomdceIufOhkFwN74rFY/pLCWPynRxGyol2viQ=", "owner": "YaLTeR", "repo": "niri", - "rev": "549148d27779d024255a84535b42b947f1c2a113", + "rev": "ab47f5cec4c1c5758afeb91c0c98554ffd3433db", "type": "github" }, "original": { @@ -374,11 +374,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1770109133, - "narHash": "sha256-ZvFy7n6AEAFU9bJYE5LCecNiCXWVY6sWHu95OqJwg9E=", + "lastModified": 1770643317, + "narHash": "sha256-Ms87nT97V7MmGLLXTcK4dK4dyeNrD/g8PUeKq7MS8QA=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "907ed01ec980745a8cfbcb2cbf8fb0612743361f", + "rev": "c48c8a9499cbfb65158597a9c9ae0fed4e511bae", "type": "github" }, "original": { @@ -426,11 +426,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1769302137, - "narHash": "sha256-QEDtctEkOsbx8nlFh4yqPEOtr4tif6KTqWwJ37IM2ds=", + "lastModified": 1770631810, + "narHash": "sha256-b7iK/x+zOXbjhRqa+XBlYla4zFvPZyU5Ln2HJkiSnzc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "a351494b0e35fd7c0b7a1aae82f0afddf4907aa8", + "rev": "2889685785848de940375bf7fea5e7c5a3c8d502", "type": "github" }, "original": { @@ -442,11 +442,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1770197578, - "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", + "lastModified": 1770562336, + "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", + "rev": "d6c71932130818840fc8fe9509cf50be8c64634f", "type": "github" }, "original": { @@ -463,11 +463,11 @@ ] }, "locked": { - "lastModified": 1770436113, - "narHash": "sha256-Ekc6E1uo7OBMROUUZ3pBiTwha7KlHcsNf6jy1g1hCco=", + "lastModified": 1770663741, + "narHash": "sha256-WbvQaDozCrJSWCTuAmVFZLJeOtiOjCatBjUmQHipiIQ=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "93838353573233b5584b106eb897a37f8a4e63ac", + "rev": "8b43787ef55f4742c241c33a6b4bd90525e85016", "type": "github" }, "original": { @@ -549,11 +549,11 @@ ] }, "locked": { - "lastModified": 1770433312, - "narHash": "sha256-IaiqGwmLBrR0z67t/oaS6GIFxv9V8mDY7dBTuYVTbKY=", + "lastModified": 1770606655, + "narHash": "sha256-rpJf+kxvLWv32ivcgu8d+JeJooog3boJCT8J3joJvvM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "9922ff9f99a6436756cbe6f5d11f9c3630e58cf0", + "rev": "11a396520bf911e4ed01e78e11633d3fc63b350e", "type": "github" }, "original": { @@ -681,11 +681,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1770167989, - "narHash": "sha256-rE2WTxKHe3KMG/Zr5YUNeKHkZfWwSFl7yJXrOKnunHg=", + "lastModified": 1770583271, + "narHash": "sha256-Q75S8cEqJoZ92s1y4zArvk2U1ayAy2E4SaF7gbNXkYQ=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "0947c4685f6237d4f8045482ce0c62feab40b6c4", + "rev": "86f5bd5d867ad6e120935dfe825f6b903ebbeddd", "type": "github" }, "original": { @@ -704,11 +704,11 @@ ] }, "locked": { - "lastModified": 1770438513, - "narHash": "sha256-KfU+O0b5nkZPkekAK9rDkOeXxefgOqr+3Kgl2/42BuE=", + "lastModified": 1770568363, + "narHash": "sha256-RJ/C24wN7LyuMmBgvIutA/PqXXceZtJtUCuZSaTjF/4=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "737f04a2e22cc9dab37f13457e88226653edbfdd", + "rev": "2ada8a826ea88512387a5a17ee96f16369bcdd80", "type": "github" }, "original": { From 8eb245cabcc791e38d4d96477f7ef11d6c46da2b Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 10 Feb 2026 18:11:28 -0500 Subject: [PATCH 569/724] opencode: fix playwright skill --- home-manager/progs/opencode.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index f208183..b9b4b71 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -53,8 +53,14 @@ in { home.packages = [ inputs.oh-my-opencode.packages.${pkgs.stdenv.hostPlatform.system}.oh-my-opencode + 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; programs.opencode = { @@ -71,7 +77,7 @@ in ## 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 it requires root and will not work. + 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. From 69809df7817744aae5390e0dfe3db3793aae7df3 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 11 Feb 2026 19:22:46 -0500 Subject: [PATCH 570/724] opencode: fix playwright skill: 2 --- home-manager/progs/opencode.nix | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index b9b4b71..cfaca72 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -63,6 +63,36 @@ in 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; From e0ad87d748487e87c6128e708d486a9bee213afe Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 15 Feb 2026 23:32:11 -0500 Subject: [PATCH 571/724] rust: stable -> nightly --- home-manager/no-gui.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 52e0718..649db1f 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -10,7 +10,7 @@ }: let rust_pkgs = with pkgs; [ - (rust-bin.stable.latest.default.override ({ + (rust-bin.nightly.latest.default.override ({ extensions = [ "rust-src" "rust-analyzer" From eac5eebb69fcd3a626a81f460ceffa0dd86033aa Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 15 Feb 2026 23:32:38 -0500 Subject: [PATCH 572/724] update --- flake.lock | 102 ++++++++++++++++++++++++++--------------------------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/flake.lock b/flake.lock index a9a864a..582ce9b 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ }, "crane": { "locked": { - "lastModified": 1769737823, - "narHash": "sha256-DrBaNpZ+sJ4stXm+0nBX7zqZT9t9P22zbk6m5YhQxS4=", + "lastModified": 1770419512, + "narHash": "sha256-o8Vcdz6B6bkiGUYkZqFwH3Pv1JwZyXht3dMtS7RchIo=", "owner": "ipetkov", "repo": "crane", - "rev": "b2f45c3830aa96b7456a4c4bc327d04d7a43e1ba", + "rev": "2510f2cbc3ccd237f700bb213756a8f35c32d8d7", "type": "github" }, "original": { @@ -83,11 +83,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1768984347, - "narHash": "sha256-VvC4rgAAaFnYLCdcUoz7dTE3kuBNuHIc+GlXOrPCxpg=", + "lastModified": 1771047055, + "narHash": "sha256-A5QktV1imIj1STwdt0MiZ5erGPnmFBjk2JC6gcgFFjQ=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "57818a6da90fbef39ff80d62fab2cd319496c3b9", + "rev": "9019a168873afc983631eeb830053ebdb799be40", "type": "github" }, "original": { @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1770602774, - "narHash": "sha256-eRcZ279Oaf8ViHtvdWVTpcD9x7bvJ3ipQ1Xq9bd+qlk=", + "lastModified": 1771207599, + "narHash": "sha256-VLw03hyJp6mQMl7r1Phv6z+ktHN6jJwDcxDSiZY/fCY=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "a3d87c21d1464f1069d8125cafe6adb84d200185", + "rev": "b6f3379e6f23e2af91a251593226030c442e017f", "type": "github" }, "original": { @@ -198,11 +198,11 @@ ] }, "locked": { - "lastModified": 1770654520, - "narHash": "sha256-mg5WZMIPGsFu9MxSrUcuJUPMbfMsF77el5yb/7rc10k=", + "lastModified": 1771188132, + "narHash": "sha256-qLXxN/tPrZtnekaLBQuVtxQfvqqs5cT5WbyH4zZaTGI=", "owner": "nix-community", "repo": "home-manager", - "rev": "6c4fdbe1ad198fac36c320fd45c5957324a80b8e", + "rev": "ae8003d8b61d0d373e7ca3da1a48f9c870d15df9", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1770656651, - "narHash": "sha256-p0bV6EkZZRHyPm3ZJfo0txhuhy9gSfEAzzFc3zG1iLA=", + "lastModified": 1770915266, + "narHash": "sha256-2oD6ud7iathz3rb0TcZyMqAsG+u2KRpkcAY3CCBt5rs=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "2a3cd5fe86931bb928d56c11857d2f825014b852", + "rev": "deee66bd287521aa4008f0bb616060f37c058980", "type": "github" }, "original": { @@ -267,11 +267,11 @@ ] }, "locked": { - "lastModified": 1770579389, - "narHash": "sha256-2OwcZVHHsq3DSnJsUOiw0i/ovRqdlIG4uj5RPRql+8I=", + "lastModified": 1770734117, + "narHash": "sha256-PNXSnK507MRj+hYMgnUR7InNJzVCmOfsjHV4YXZgpwQ=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "7b637233a79e6041affba3f33957995c57f4b140", + "rev": "2038a9a19adb886eccba775321b055fdbdc5029d", "type": "github" }, "original": { @@ -289,11 +289,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1770647950, - "narHash": "sha256-5IBnmc6yMO4p26kJfHQylCJEci8X8vhp5AYG41yjNU8=", + "lastModified": 1771211873, + "narHash": "sha256-pt6pz2UCrfPpH86C1BSWaThbD1cHvYyZYs0ociv7txQ=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "752fd7ca23ccbe5f5b00c0c65db9d8dbb755e119", + "rev": "b73c33c4a725c11287add48d74a174dd109fcd0b", "type": "github" }, "original": { @@ -316,11 +316,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1770620836, - "narHash": "sha256-HPoMvo/EqIr6xDDRlk6DGZYdu1Hte7lGLZaGZ5017Uc=", + "lastModified": 1771197610, + "narHash": "sha256-482qPcmmuH32EIneik7AGSbuKwDteg29MYXmpN4Srd0=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "ff1edce403a67cfac7bf1038d348f2ef457ac691", + "rev": "d4b632053ada7f646b93e2714ace9a1160e9d490", "type": "github" }, "original": { @@ -349,11 +349,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1770394959, - "narHash": "sha256-if7bIsomdceIufOhkFwN74rFY/pLCWPynRxGyol2viQ=", + "lastModified": 1771182017, + "narHash": "sha256-lrXBx91NQAVoFeFUNZi46ZWP9M6tbBmT5BNsqSh8QOY=", "owner": "YaLTeR", "repo": "niri", - "rev": "ab47f5cec4c1c5758afeb91c0c98554ffd3433db", + "rev": "1fa0338a172a69b05a1a35d55b291693ff1bc29f", "type": "github" }, "original": { @@ -374,11 +374,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1770643317, - "narHash": "sha256-Ms87nT97V7MmGLLXTcK4dK4dyeNrD/g8PUeKq7MS8QA=", + "lastModified": 1771059089, + "narHash": "sha256-0UCTQpyhLj8jPB2rUotrtGJ1dOnhC7rQ8cWCqifZVck=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "c48c8a9499cbfb65158597a9c9ae0fed4e511bae", + "rev": "ee8c6178e5cc11a10bfcd9f0d4317bc95ec6a4e1", "type": "github" }, "original": { @@ -426,11 +426,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1770631810, - "narHash": "sha256-b7iK/x+zOXbjhRqa+XBlYla4zFvPZyU5Ln2HJkiSnzc=", + "lastModified": 1771171797, + "narHash": "sha256-ngIarpog/Hv5r9M1YyvsaaSUBCqtWqHl6pibq6n2ppo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "2889685785848de940375bf7fea5e7c5a3c8d502", + "rev": "531af1dbaee7cfdd7aed1e595ce418b7e2e99a80", "type": "github" }, "original": { @@ -442,11 +442,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1770562336, - "narHash": "sha256-ub1gpAONMFsT/GU2hV6ZWJjur8rJ6kKxdm9IlCT0j84=", + "lastModified": 1771008912, + "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d6c71932130818840fc8fe9509cf50be8c64634f", + "rev": "a82ccc39b39b621151d6732718e3e250109076fa", "type": "github" }, "original": { @@ -463,11 +463,11 @@ ] }, "locked": { - "lastModified": 1770663741, - "narHash": "sha256-WbvQaDozCrJSWCTuAmVFZLJeOtiOjCatBjUmQHipiIQ=", + "lastModified": 1771201930, + "narHash": "sha256-Oirf2QTHL0gRKNCGEwZ2vx6JnlGLO51mBzlkEB2QTAU=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "8b43787ef55f4742c241c33a6b4bd90525e85016", + "rev": "1dc00a137325f8a9308baed0845911ef37626dd9", "type": "github" }, "original": { @@ -484,11 +484,11 @@ ] }, "locked": { - "lastModified": 1770100438, - "narHash": "sha256-E3YRaxVaAkbXkUupL2gn+QRRCZ3rn7Uc0RC3XIAXYS4=", + "lastModified": 1770618333, + "narHash": "sha256-7Y9e2nrsi4yKwBXZ7RUF1B5FN4RJUT4rYI1SvA0vDEw=", "owner": "yebei199", "repo": "oh-my-opencode", - "rev": "25103f10a09534f5ab26e97824f833404e44fb11", + "rev": "bde5264e4c3a91ded482acd35c8ed239d21d1de2", "type": "github" }, "original": { @@ -549,11 +549,11 @@ ] }, "locked": { - "lastModified": 1770606655, - "narHash": "sha256-rpJf+kxvLWv32ivcgu8d+JeJooog3boJCT8J3joJvvM=", + "lastModified": 1771211437, + "narHash": "sha256-lcNK438i4DGtyA+bPXXyVLHVmJjYpVKmpux9WASa3ro=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "11a396520bf911e4ed01e78e11633d3fc63b350e", + "rev": "c62195b3d6e1bb11e0c2fb2a494117d3b55d410f", "type": "github" }, "original": { @@ -681,11 +681,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1770583271, - "narHash": "sha256-Q75S8cEqJoZ92s1y4zArvk2U1ayAy2E4SaF7gbNXkYQ=", + "lastModified": 1771195969, + "narHash": "sha256-BUE41HjLIGPjq3U8VXPjf8asH8GaMI7FYdgrIHKFMXA=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "86f5bd5d867ad6e120935dfe825f6b903ebbeddd", + "rev": "536bd32efc935bf876d6de385ec18a1b715c9358", "type": "github" }, "original": { @@ -704,11 +704,11 @@ ] }, "locked": { - "lastModified": 1770568363, - "narHash": "sha256-RJ/C24wN7LyuMmBgvIutA/PqXXceZtJtUCuZSaTjF/4=", + "lastModified": 1771206413, + "narHash": "sha256-Xb9C9FOhOsKzE0CeJjkDcnrkZxuakL8R1jO1Y6DK4KI=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "2ada8a826ea88512387a5a17ee96f16369bcdd80", + "rev": "5829bfc09897aa4a3a88bef548eadac0430c60ab", "type": "github" }, "original": { From 237937be3528c7fba307d52209bf980340d922c8 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 16 Feb 2026 00:25:18 -0500 Subject: [PATCH 573/724] opencode: fix oh-my-opencode build --- home-manager/progs/opencode.nix | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index cfaca72..919a41d 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -51,10 +51,29 @@ let }; in { - home.packages = [ - inputs.oh-my-opencode.packages.${pkgs.stdenv.hostPlatform.system}.oh-my-opencode - pkgs.playwright-driver.browsers - ]; + 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}"; From fe7bf30b6f15406d040a47527385429be6b673ae Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 16 Feb 2026 12:35:32 -0500 Subject: [PATCH 574/724] opencode: add note about autoupdate --- home-manager/progs/opencode.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index 919a41d..5590d64 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -195,6 +195,8 @@ in 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" ]; From c3948b05ac2a899ff26dd023badd5dffadb5605c Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 16 Feb 2026 12:35:43 -0500 Subject: [PATCH 575/724] update --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 582ce9b..d00b28d 100644 --- a/flake.lock +++ b/flake.lock @@ -83,11 +83,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1771047055, - "narHash": "sha256-A5QktV1imIj1STwdt0MiZ5erGPnmFBjk2JC6gcgFFjQ=", + "lastModified": 1771210705, + "narHash": "sha256-uODa73oH05QfbF/gWjgIIBPJP4U8NjlurUizNnzgrio=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "9019a168873afc983631eeb830053ebdb799be40", + "rev": "28e52b8c898636bc860a123d2ba7bda1514ffd2b", "type": "github" }, "original": { @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1771207599, - "narHash": "sha256-VLw03hyJp6mQMl7r1Phv6z+ktHN6jJwDcxDSiZY/fCY=", + "lastModified": 1771260238, + "narHash": "sha256-NOM20wP/DRY8FxgCoRSIdg2q1PED2kKiAkvmisGUo50=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "b6f3379e6f23e2af91a251593226030c442e017f", + "rev": "a209d97a86a8a7d8d752a357e8f6d4018ffb80aa", "type": "github" }, "original": { @@ -289,11 +289,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1771211873, - "narHash": "sha256-pt6pz2UCrfPpH86C1BSWaThbD1cHvYyZYs0ociv7txQ=", + "lastModified": 1771253715, + "narHash": "sha256-xEMerB3SlsiDFguHIvxOltxs9gj0jyCrNDC0nudwt7A=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "b73c33c4a725c11287add48d74a174dd109fcd0b", + "rev": "23833180b905a5eab8ffe805c6d9658548668848", "type": "github" }, "original": { @@ -374,11 +374,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1771059089, - "narHash": "sha256-0UCTQpyhLj8jPB2rUotrtGJ1dOnhC7rQ8cWCqifZVck=", + "lastModified": 1771238037, + "narHash": "sha256-P+CJXjvTOuYsXFt8g2fMQasLtm3y4BJpvwAZZznBwpw=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "ee8c6178e5cc11a10bfcd9f0d4317bc95ec6a4e1", + "rev": "7485d1d75b1bc5ea76bf892a316065f86e3e1a4a", "type": "github" }, "original": { @@ -426,11 +426,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1771171797, - "narHash": "sha256-ngIarpog/Hv5r9M1YyvsaaSUBCqtWqHl6pibq6n2ppo=", + "lastModified": 1771257191, + "narHash": "sha256-H1l+zHq+ZinWH7F1IidpJ2farmbfHXjaxAm1RKWE1KI=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "531af1dbaee7cfdd7aed1e595ce418b7e2e99a80", + "rev": "66e1a090ded57a0f88e2b381a7d4daf4a5722c3f", "type": "github" }, "original": { @@ -463,11 +463,11 @@ ] }, "locked": { - "lastModified": 1771201930, - "narHash": "sha256-Oirf2QTHL0gRKNCGEwZ2vx6JnlGLO51mBzlkEB2QTAU=", + "lastModified": 1771261371, + "narHash": "sha256-IeS634ahWumw+ep/qLLClRtzg44br+FvarWzfVSH4tA=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "1dc00a137325f8a9308baed0845911ef37626dd9", + "rev": "181da4d3d0ba5766abd104fa4afe7c3c969f5b97", "type": "github" }, "original": { @@ -704,11 +704,11 @@ ] }, "locked": { - "lastModified": 1771206413, - "narHash": "sha256-Xb9C9FOhOsKzE0CeJjkDcnrkZxuakL8R1jO1Y6DK4KI=", + "lastModified": 1771247135, + "narHash": "sha256-qDFOVzhs8S/dk3Eqvyqi7veWKEviZuh0hjTNsb4TZ2I=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "5829bfc09897aa4a3a88bef548eadac0430c60ab", + "rev": "a96ac9e2ae07ccd8522a790ff720db11dd3bdd6e", "type": "github" }, "original": { From e5f71981f7885db4cde4ed5a343c0bcd3c469fbd Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 16 Feb 2026 16:52:29 -0500 Subject: [PATCH 576/724] opencode: change opus-model --- home-manager/progs/opencode.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index 5590d64..d91352a 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -10,7 +10,7 @@ let # glm 4.7-flash is an example haiku-model = "anthropic/claude-haiku-4-5"; - opus-model = "openrouter/moonshotai/kimi-k2.5"; + opus-model = "anthropic/claude-opus-4-6"; ohMyOpencodeConfig = { "$schema" = From 387d9fec128d0a1678849da31eb2557a68ae35fe Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 16 Feb 2026 20:24:43 -0500 Subject: [PATCH 577/724] opencode: change multimodel looker model --- home-manager/progs/opencode.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index d91352a..a83b02d 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -23,7 +23,7 @@ let }; librarian.model = haiku-model; explore.model = haiku-model; - multimodal-looker.model = "openrouter/google/gemini-3-flash-preview"; + multimodal-looker.model = "anthropic/claude-sonnet-4-5"; prometheus.model = opus-model; metis.model = opus-model; From 220eca3b2dac6b8cf2e6788fc89e0657f43b247a Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 17 Feb 2026 10:48:30 -0500 Subject: [PATCH 578/724] update --- flake.lock | 72 +++++++++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/flake.lock b/flake.lock index d00b28d..ebc1966 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ }, "crane": { "locked": { - "lastModified": 1770419512, - "narHash": "sha256-o8Vcdz6B6bkiGUYkZqFwH3Pv1JwZyXht3dMtS7RchIo=", + "lastModified": 1771121070, + "narHash": "sha256-aIlv7FRXF9q70DNJPI237dEDAznSKaXmL5lfK/Id/bI=", "owner": "ipetkov", "repo": "crane", - "rev": "2510f2cbc3ccd237f700bb213756a8f35c32d8d7", + "rev": "a2812c19f1ed2e5ed5ce2ef7109798b575c180e1", "type": "github" }, "original": { @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1771260238, - "narHash": "sha256-NOM20wP/DRY8FxgCoRSIdg2q1PED2kKiAkvmisGUo50=", + "lastModified": 1771320728, + "narHash": "sha256-2PMYnQz8BWNROAys9oeZf5jszyOs9sJHf0I+TXk2qog=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "a209d97a86a8a7d8d752a357e8f6d4018ffb80aa", + "rev": "32eeb8a34ee65cc3adc4df9fbbbf62c7107499c6", "type": "github" }, "original": { @@ -198,11 +198,11 @@ ] }, "locked": { - "lastModified": 1771188132, - "narHash": "sha256-qLXxN/tPrZtnekaLBQuVtxQfvqqs5cT5WbyH4zZaTGI=", + "lastModified": 1771269455, + "narHash": "sha256-BZ31eN5F99YH6vkc4AhzKGE+tJgJ52kl8f01K7wCs8w=", "owner": "nix-community", "repo": "home-manager", - "rev": "ae8003d8b61d0d373e7ca3da1a48f9c870d15df9", + "rev": "5f1d42a97b19803041434f66681d5c44c9ae62e3", "type": "github" }, "original": { @@ -267,11 +267,11 @@ ] }, "locked": { - "lastModified": 1770734117, - "narHash": "sha256-PNXSnK507MRj+hYMgnUR7InNJzVCmOfsjHV4YXZgpwQ=", + "lastModified": 1771322141, + "narHash": "sha256-7NF2aiWw7cL+KAdOgSXEV9fg4Y6SH8NmEgSBYIdKfcw=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "2038a9a19adb886eccba775321b055fdbdc5029d", + "rev": "89594c01208e1e0218050d63a3570a3e1b4447ac", "type": "github" }, "original": { @@ -289,11 +289,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1771253715, - "narHash": "sha256-xEMerB3SlsiDFguHIvxOltxs9gj0jyCrNDC0nudwt7A=", + "lastModified": 1771338738, + "narHash": "sha256-CH6gkznCEgsEjobD2zUvFSlYg1LTNQoO0aliRCuwCQw=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "23833180b905a5eab8ffe805c6d9658548668848", + "rev": "cb932aee9b1e7cef0f2d6f005667808eebad72f0", "type": "github" }, "original": { @@ -316,11 +316,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1771197610, - "narHash": "sha256-482qPcmmuH32EIneik7AGSbuKwDteg29MYXmpN4Srd0=", + "lastModified": 1771308899, + "narHash": "sha256-kb/4oSHB261GOLhVGgrzTOqo/ImeCi/WS25q2ujtHGc=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "d4b632053ada7f646b93e2714ace9a1160e9d490", + "rev": "f3e98ba073bd7e2717a07d622f9b737c461a97b9", "type": "github" }, "original": { @@ -349,11 +349,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1771182017, - "narHash": "sha256-lrXBx91NQAVoFeFUNZi46ZWP9M6tbBmT5BNsqSh8QOY=", + "lastModified": 1771305475, + "narHash": "sha256-lqweVTwHhYc+9T33cysp38gVwxaibGJHriOPZXWyhCY=", "owner": "YaLTeR", "repo": "niri", - "rev": "1fa0338a172a69b05a1a35d55b291693ff1bc29f", + "rev": "a2a52911757cb3b497db9407592f9b4c439571ea", "type": "github" }, "original": { @@ -374,11 +374,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1771238037, - "narHash": "sha256-P+CJXjvTOuYsXFt8g2fMQasLtm3y4BJpvwAZZznBwpw=", + "lastModified": 1771323596, + "narHash": "sha256-O+xIe7XPMrcEvPua4y3RoPui8Lvi04mpKQcajnfIO6M=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "7485d1d75b1bc5ea76bf892a316065f86e3e1a4a", + "rev": "8037b4cec6f93ec04e68992f40005c13dc628784", "type": "github" }, "original": { @@ -463,11 +463,11 @@ ] }, "locked": { - "lastModified": 1771261371, - "narHash": "sha256-IeS634ahWumw+ep/qLLClRtzg44br+FvarWzfVSH4tA=", + "lastModified": 1771340206, + "narHash": "sha256-IanPDIuEft3uxOorgp5Sk1e5Vil2DYWL5FwN4zh4LF0=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "181da4d3d0ba5766abd104fa4afe7c3c969f5b97", + "rev": "c2629c3c2fadb47695e8e3deb37d7a416644bf3e", "type": "github" }, "original": { @@ -508,11 +508,11 @@ ] }, "locked": { - "lastModified": 1769939035, - "narHash": "sha256-Fok2AmefgVA0+eprw2NDwqKkPGEI5wvR+twiZagBvrg=", + "lastModified": 1770726378, + "narHash": "sha256-kck+vIbGOaM/dHea7aTBxdFYpeUl/jHOy5W3eyRvVx8=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "a8ca480175326551d6c4121498316261cbb5b260", + "rev": "5eaaedde414f6eb1aea8b8525c466dc37bba95ae", "type": "github" }, "original": { @@ -549,11 +549,11 @@ ] }, "locked": { - "lastModified": 1771211437, - "narHash": "sha256-lcNK438i4DGtyA+bPXXyVLHVmJjYpVKmpux9WASa3ro=", + "lastModified": 1771297684, + "narHash": "sha256-wieWskQxZLPlNXX06JEB0bMoS/ZYQ89xBzF0RL9lyLs=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c62195b3d6e1bb11e0c2fb2a494117d3b55d410f", + "rev": "755d3669699a7c62aef35af187d75dc2728cfd85", "type": "github" }, "original": { @@ -704,11 +704,11 @@ ] }, "locked": { - "lastModified": 1771247135, - "narHash": "sha256-qDFOVzhs8S/dk3Eqvyqi7veWKEviZuh0hjTNsb4TZ2I=", + "lastModified": 1771303996, + "narHash": "sha256-cwf75uTx8cGJCP+nohi7iVTE+lmfevBxNgirkMLkuEY=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "a96ac9e2ae07ccd8522a790ff720db11dd3bdd6e", + "rev": "a7659a805bda3ae8e4861572d8dc0f1d29f3fc3c", "type": "github" }, "original": { From a5dbb63eab6c0d1d12b7253a13041632ffab6cbc Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 18 Feb 2026 12:47:42 -0500 Subject: [PATCH 579/724] update --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index ebc1966..ebae41e 100644 --- a/flake.lock +++ b/flake.lock @@ -83,11 +83,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1771210705, - "narHash": "sha256-uODa73oH05QfbF/gWjgIIBPJP4U8NjlurUizNnzgrio=", + "lastModified": 1771392781, + "narHash": "sha256-OfN1elxo/JUjz4n8blH/CEdgaqzS30Q0+IvGhuH+Bek=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "28e52b8c898636bc860a123d2ba7bda1514ffd2b", + "rev": "74d1b871b75fb19feefa2722628aecfe0b828e79", "type": "github" }, "original": { @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1771320728, - "narHash": "sha256-2PMYnQz8BWNROAys9oeZf5jszyOs9sJHf0I+TXk2qog=", + "lastModified": 1771436278, + "narHash": "sha256-rDa+zcdMcWyUwuPw8fH9YMC5qx6htcN+1oRR6t84Df4=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "32eeb8a34ee65cc3adc4df9fbbbf62c7107499c6", + "rev": "833ec1392353e2175723ea57cb3ac2344b0d6529", "type": "github" }, "original": { @@ -198,11 +198,11 @@ ] }, "locked": { - "lastModified": 1771269455, - "narHash": "sha256-BZ31eN5F99YH6vkc4AhzKGE+tJgJ52kl8f01K7wCs8w=", + "lastModified": 1771422582, + "narHash": "sha256-xK5kl3OBZaF1VwziVMX+SZ2LT9Fbu5o8vRDt78uR7no=", "owner": "nix-community", "repo": "home-manager", - "rev": "5f1d42a97b19803041434f66681d5c44c9ae62e3", + "rev": "b3ccd4bb262f4e6d3248b46cede92b90c4a42094", "type": "github" }, "original": { @@ -289,11 +289,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1771338738, - "narHash": "sha256-CH6gkznCEgsEjobD2zUvFSlYg1LTNQoO0aliRCuwCQw=", + "lastModified": 1771427464, + "narHash": "sha256-VhAD/KfXc5NudSjzhsiU27asKu99jwrb7TsD2BRpLZs=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "cb932aee9b1e7cef0f2d6f005667808eebad72f0", + "rev": "b9565d386f29e6b10cc7c513be3697e7c6694f9c", "type": "github" }, "original": { @@ -374,11 +374,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1771323596, - "narHash": "sha256-O+xIe7XPMrcEvPua4y3RoPui8Lvi04mpKQcajnfIO6M=", + "lastModified": 1771405583, + "narHash": "sha256-4oY7z5kTyBIl0YtYJ5g489BYYsvRpnhLNGl1hlNzUsA=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "8037b4cec6f93ec04e68992f40005c13dc628784", + "rev": "833313cd1f7d018ee7e7820c9da24272e321fd6c", "type": "github" }, "original": { @@ -426,11 +426,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1771257191, - "narHash": "sha256-H1l+zHq+ZinWH7F1IidpJ2farmbfHXjaxAm1RKWE1KI=", + "lastModified": 1771423359, + "narHash": "sha256-yRKJ7gpVmXbX2ZcA8nFi6CMPkJXZGjie2unsiMzj3Ig=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "66e1a090ded57a0f88e2b381a7d4daf4a5722c3f", + "rev": "740a22363033e9f1bb6270fbfb5a9574067af15b", "type": "github" }, "original": { @@ -463,11 +463,11 @@ ] }, "locked": { - "lastModified": 1771340206, - "narHash": "sha256-IanPDIuEft3uxOorgp5Sk1e5Vil2DYWL5FwN4zh4LF0=", + "lastModified": 1771434371, + "narHash": "sha256-1ivy5+FBZMSojnduPnG6K8w5EFxyP61vthmLXzfGwco=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "c2629c3c2fadb47695e8e3deb37d7a416644bf3e", + "rev": "04589a4f58c7315b035633a274d1fc820d34c31a", "type": "github" }, "original": { @@ -549,11 +549,11 @@ ] }, "locked": { - "lastModified": 1771297684, - "narHash": "sha256-wieWskQxZLPlNXX06JEB0bMoS/ZYQ89xBzF0RL9lyLs=", + "lastModified": 1771384185, + "narHash": "sha256-KvmjUeA7uODwzbcQoN/B8DCZIbhT/Q/uErF1BBMcYnw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "755d3669699a7c62aef35af187d75dc2728cfd85", + "rev": "23dd7fa91602a68bd04847ac41bc10af1e6e2fd2", "type": "github" }, "original": { @@ -704,11 +704,11 @@ ] }, "locked": { - "lastModified": 1771303996, - "narHash": "sha256-cwf75uTx8cGJCP+nohi7iVTE+lmfevBxNgirkMLkuEY=", + "lastModified": 1771408254, + "narHash": "sha256-TpOZrNqRPiOS+lJaIujV6vrO6P3mzBqBWzD30fq6UBU=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "a7659a805bda3ae8e4861572d8dc0f1d29f3fc3c", + "rev": "3130227ce1aaf23055bce75b845375f84d57e52c", "type": "github" }, "original": { From 955cc5df5a8b7bba76fabfb46f0f9ccb315c9f64 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 19 Feb 2026 12:51:01 -0500 Subject: [PATCH 580/724] update --- flake.lock | 72 +++++++++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/flake.lock b/flake.lock index ebae41e..e4160b4 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1769353768, - "narHash": "sha256-zI+7cbMI4wMIR57jMjDSEsVb3grapTnURDxxJPYFIW0=", + "lastModified": 1771437256, + "narHash": "sha256-bLqwib+rtyBRRVBWhMuBXPCL/OThfokA+j6+uH7jDGU=", "owner": "numtide", "repo": "blueprint", - "rev": "c7da5c70ad1c9b60b6f5d4f674fbe205d48d8f6c", + "rev": "06ee7190dc2620ea98af9eb225aa9627b68b0e33", "type": "github" }, "original": { @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1771436278, - "narHash": "sha256-rDa+zcdMcWyUwuPw8fH9YMC5qx6htcN+1oRR6t84Df4=", + "lastModified": 1771493471, + "narHash": "sha256-phJ0ZmIQs99xbdC3F8dFD5n2lG8wcNRBqKN0lyNsjjU=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "833ec1392353e2175723ea57cb3ac2344b0d6529", + "rev": "b50e3f1df21ca7992de400b05240edd6d47a3fd3", "type": "github" }, "original": { @@ -198,11 +198,11 @@ ] }, "locked": { - "lastModified": 1771422582, - "narHash": "sha256-xK5kl3OBZaF1VwziVMX+SZ2LT9Fbu5o8vRDt78uR7no=", + "lastModified": 1771519029, + "narHash": "sha256-H59Qf82wv5kBXVoyXsmUKW+9J3o8FqgY4uKaLdsLdLg=", "owner": "nix-community", "repo": "home-manager", - "rev": "b3ccd4bb262f4e6d3248b46cede92b90c4a42094", + "rev": "167e0b6837115e672ec5f58e2b0ea39093abe807", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1770915266, - "narHash": "sha256-2oD6ud7iathz3rb0TcZyMqAsG+u2KRpkcAY3CCBt5rs=", + "lastModified": 1771440156, + "narHash": "sha256-IrznE3ZQ+tf6amuQW/zlVkA18LzknWK+Hbt6tdmNtnw=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "deee66bd287521aa4008f0bb616060f37c058980", + "rev": "faf829408344456d53c33df0a99f2f307498c830", "type": "github" }, "original": { @@ -267,11 +267,11 @@ ] }, "locked": { - "lastModified": 1771322141, - "narHash": "sha256-7NF2aiWw7cL+KAdOgSXEV9fg4Y6SH8NmEgSBYIdKfcw=", + "lastModified": 1771492583, + "narHash": "sha256-nQzvnU4BGu8dA6BsPPCqmVcab/3ebVmHtX3ZWbW3Hxc=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "89594c01208e1e0218050d63a3570a3e1b4447ac", + "rev": "5e9380994665ef66c87ab8e22c913ff837174ce4", "type": "github" }, "original": { @@ -289,11 +289,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1771427464, - "narHash": "sha256-VhAD/KfXc5NudSjzhsiU27asKu99jwrb7TsD2BRpLZs=", + "lastModified": 1771512095, + "narHash": "sha256-OzcIFLbaY6BXZKKUq+NOSR43ixR5Ul9NP+xDYsxVAqw=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "b9565d386f29e6b10cc7c513be3697e7c6694f9c", + "rev": "b0450365f22aad65d3ab7dce0b43cb301bad855a", "type": "github" }, "original": { @@ -316,11 +316,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1771308899, - "narHash": "sha256-kb/4oSHB261GOLhVGgrzTOqo/ImeCi/WS25q2ujtHGc=", + "lastModified": 1771514840, + "narHash": "sha256-t3WbZvwoDj/75YDX/nwkZuxanZLZaWr9meSfKswaN6g=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "f3e98ba073bd7e2717a07d622f9b737c461a97b9", + "rev": "4f69ab280e9bb34e2c0b67fdfa6f0978a170ef56", "type": "github" }, "original": { @@ -374,11 +374,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1771405583, - "narHash": "sha256-4oY7z5kTyBIl0YtYJ5g489BYYsvRpnhLNGl1hlNzUsA=", + "lastModified": 1771491986, + "narHash": "sha256-VKR4E2Li3xPAyCgnPGK04qMebvyHjgMnc7Ly18bOy68=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "833313cd1f7d018ee7e7820c9da24272e321fd6c", + "rev": "e3f0afe382a24ad02cd6348d8ccb7c73bed726f4", "type": "github" }, "original": { @@ -442,11 +442,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1771008912, - "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", + "lastModified": 1771369470, + "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a82ccc39b39b621151d6732718e3e250109076fa", + "rev": "0182a361324364ae3f436a63005877674cf45efb", "type": "github" }, "original": { @@ -463,11 +463,11 @@ ] }, "locked": { - "lastModified": 1771434371, - "narHash": "sha256-1ivy5+FBZMSojnduPnG6K8w5EFxyP61vthmLXzfGwco=", + "lastModified": 1771513929, + "narHash": "sha256-dPeHevAT1Cb2w/Wrfz/d5i6RfO8bvbGl/KrTPxU2l3w=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "04589a4f58c7315b035633a274d1fc820d34c31a", + "rev": "9c47ce03f200e0b8fc515d973440d5bc3e359785", "type": "github" }, "original": { @@ -549,11 +549,11 @@ ] }, "locked": { - "lastModified": 1771384185, - "narHash": "sha256-KvmjUeA7uODwzbcQoN/B8DCZIbhT/Q/uErF1BBMcYnw=", + "lastModified": 1771470520, + "narHash": "sha256-PvytHcaYN5cPUll7FB70mXv1rRsIBRmu47fFfq3haxA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "23dd7fa91602a68bd04847ac41bc10af1e6e2fd2", + "rev": "a1d4cc1f264c45d3745af0d2ca5e59d460e58777", "type": "github" }, "original": { @@ -704,11 +704,11 @@ ] }, "locked": { - "lastModified": 1771408254, - "narHash": "sha256-TpOZrNqRPiOS+lJaIujV6vrO6P3mzBqBWzD30fq6UBU=", + "lastModified": 1771503632, + "narHash": "sha256-qvI2afshgl062MRRpal5s76PWFev0Vm1xv4hl2+wT/8=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "3130227ce1aaf23055bce75b845375f84d57e52c", + "rev": "48e35b2df995cf65603f447d5d2e30c34e63cd3f", "type": "github" }, "original": { From 01fb4aeb89df392642e1edb93c5d766bdf546ddd Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 19 Feb 2026 17:09:15 -0500 Subject: [PATCH 581/724] opencode: change models --- home-manager/progs/opencode.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index a83b02d..dfc5ebe 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -7,23 +7,23 @@ }: let # what model should be used in place of haiku? - # glm 4.7-flash is an example - haiku-model = "anthropic/claude-haiku-4-5"; + haiku-model = "openrouter/z-ai/glm-5"; - opus-model = "anthropic/claude-opus-4-6"; + opus-model = "openrouter/z-ai/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 = { - model = "openrouter/openai/gpt-5.2"; + model = "openrouter/openai/gpt-5.2-codex"; variant = "high"; }; librarian.model = haiku-model; explore.model = haiku-model; - multimodal-looker.model = "anthropic/claude-sonnet-4-5"; + multimodal-looker.model = "openrouter/qwen/qwen3-vl-30b-a3b-thinking"; prometheus.model = opus-model; metis.model = opus-model; @@ -44,8 +44,7 @@ let variant = "max"; }; quick.model = haiku-model; - "unspecified-low".model = opus-model; - "unspecified-high".model = opus-model; + deep.model = opus-model; writing.model = "openrouter/google/gemini-3-flash-preview"; }; }; From e54f83c45a303c8a3dbf3122a35d07d34c12165d Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 20 Feb 2026 14:15:01 -0500 Subject: [PATCH 582/724] update --- flake.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index e4160b4..67e40ec 100644 --- a/flake.lock +++ b/flake.lock @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1771493471, - "narHash": "sha256-phJ0ZmIQs99xbdC3F8dFD5n2lG8wcNRBqKN0lyNsjjU=", + "lastModified": 1771605598, + "narHash": "sha256-qRpPy61fgu6z4JdyFMxEgQ68eU3b8BERDIG9J9pW92g=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "b50e3f1df21ca7992de400b05240edd6d47a3fd3", + "rev": "def7029460cf6dd1309fc56402b08dd56a2af9c6", "type": "github" }, "original": { @@ -198,11 +198,11 @@ ] }, "locked": { - "lastModified": 1771519029, - "narHash": "sha256-H59Qf82wv5kBXVoyXsmUKW+9J3o8FqgY4uKaLdsLdLg=", + "lastModified": 1771531206, + "narHash": "sha256-1R3Wx6KUkMb4x4E5UOhW9p6rqiexzSGGWxZqSHqW5n0=", "owner": "nix-community", "repo": "home-manager", - "rev": "167e0b6837115e672ec5f58e2b0ea39093abe807", + "rev": "91be7cce763fa4022c7cf025a71b0c366d1b6e77", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1771440156, - "narHash": "sha256-IrznE3ZQ+tf6amuQW/zlVkA18LzknWK+Hbt6tdmNtnw=", + "lastModified": 1771587792, + "narHash": "sha256-XGFLdlLOez7f0rmjlF+1TLXyBguy8gx2aBHx/Q5JXxs=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "faf829408344456d53c33df0a99f2f307498c830", + "rev": "b49fc54950e251f166a2240799315033ab7a8916", "type": "github" }, "original": { @@ -289,11 +289,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1771512095, - "narHash": "sha256-OzcIFLbaY6BXZKKUq+NOSR43ixR5Ul9NP+xDYsxVAqw=", + "lastModified": 1771598023, + "narHash": "sha256-OfEOXiwtt49IJSpGbQJ40Xe7JaSjpGWZ527GGGif3TA=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "b0450365f22aad65d3ab7dce0b43cb301bad855a", + "rev": "4844fc996b7853d2556bad744489f3ae88741f03", "type": "github" }, "original": { @@ -374,11 +374,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1771491986, - "narHash": "sha256-VKR4E2Li3xPAyCgnPGK04qMebvyHjgMnc7Ly18bOy68=", + "lastModified": 1771578044, + "narHash": "sha256-wGozuioU2dQ0ZYTBmx53D2UK+fiUXrTzImWR8cftkWY=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "e3f0afe382a24ad02cd6348d8ccb7c73bed726f4", + "rev": "12c70619a1e5ca391c93aa9806b2c63bc34c7c7d", "type": "github" }, "original": { @@ -463,11 +463,11 @@ ] }, "locked": { - "lastModified": 1771513929, - "narHash": "sha256-dPeHevAT1Cb2w/Wrfz/d5i6RfO8bvbGl/KrTPxU2l3w=", + "lastModified": 1771609315, + "narHash": "sha256-p5LXHaCQZKSiGzDgWjj8v280juAaTg0vgzT2C90RVxM=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "9c47ce03f200e0b8fc515d973440d5bc3e359785", + "rev": "c6f4a6bc161323ec630cc0bd1bbd3812259b5a5a", "type": "github" }, "original": { @@ -549,11 +549,11 @@ ] }, "locked": { - "lastModified": 1771470520, - "narHash": "sha256-PvytHcaYN5cPUll7FB70mXv1rRsIBRmu47fFfq3haxA=", + "lastModified": 1771556776, + "narHash": "sha256-zKprqMQDl3xVfhSSYvgru1IGXjFdxryWk+KqK0I20Xk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a1d4cc1f264c45d3745af0d2ca5e59d460e58777", + "rev": "8b3f46b8a6d17ab46e533a5e3d5b1cc2ff228860", "type": "github" }, "original": { @@ -704,11 +704,11 @@ ] }, "locked": { - "lastModified": 1771503632, - "narHash": "sha256-qvI2afshgl062MRRpal5s76PWFev0Vm1xv4hl2+wT/8=", + "lastModified": 1771562861, + "narHash": "sha256-6oT3rF68W8HERLXvFfEkpz8xpAVLKZsY1ZuR/BbDTO8=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "48e35b2df995cf65603f447d5d2e30c34e63cd3f", + "rev": "7783a3adf3d5a9599a82c75a44c7482e70398ac2", "type": "github" }, "original": { From c27923a6ab5461a16d94f35965ad0bdbbb296da9 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 22 Feb 2026 01:51:23 -0500 Subject: [PATCH 583/724] update --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 67e40ec..6ec0295 100644 --- a/flake.lock +++ b/flake.lock @@ -83,11 +83,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1771392781, - "narHash": "sha256-OfN1elxo/JUjz4n8blH/CEdgaqzS30Q0+IvGhuH+Bek=", + "lastModified": 1771637851, + "narHash": "sha256-GmrqCINhfdO3EthpVG8ZsoTdfzj3vaEdz9soJwiI2HY=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "74d1b871b75fb19feefa2722628aecfe0b828e79", + "rev": "ac649cce2abd1eb9d6d3f161928f9a7665b63310", "type": "github" }, "original": { @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1771605598, - "narHash": "sha256-qRpPy61fgu6z4JdyFMxEgQ68eU3b8BERDIG9J9pW92g=", + "lastModified": 1771728721, + "narHash": "sha256-03w1Ka71dJlerySoIT5ZGm/+bx0qONZIjELY4ghkxIo=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "def7029460cf6dd1309fc56402b08dd56a2af9c6", + "rev": "d7e50ce0c6e1ca698217a251d432799683d23831", "type": "github" }, "original": { @@ -198,11 +198,11 @@ ] }, "locked": { - "lastModified": 1771531206, - "narHash": "sha256-1R3Wx6KUkMb4x4E5UOhW9p6rqiexzSGGWxZqSHqW5n0=", + "lastModified": 1771683283, + "narHash": "sha256-WxAEkAbo8dP7qiyPM6VN4ZGAxfuBVlNBNPkrqkrXVEc=", "owner": "nix-community", "repo": "home-manager", - "rev": "91be7cce763fa4022c7cf025a71b0c366d1b6e77", + "rev": "c6ed3eab64d23520bcbb858aa53fe2b533725d4a", "type": "github" }, "original": { @@ -289,11 +289,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1771598023, - "narHash": "sha256-OfEOXiwtt49IJSpGbQJ40Xe7JaSjpGWZ527GGGif3TA=", + "lastModified": 1771730908, + "narHash": "sha256-AkmTeSJSGniBsCbc+Oy5emrQflyTzUweOVcQLf69z1A=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "4844fc996b7853d2556bad744489f3ae88741f03", + "rev": "352ee8c439a3c2c7987f6cfaebddcf87c924959a", "type": "github" }, "original": { @@ -316,11 +316,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1771514840, - "narHash": "sha256-t3WbZvwoDj/75YDX/nwkZuxanZLZaWr9meSfKswaN6g=", + "lastModified": 1771638124, + "narHash": "sha256-rIF69lE48tBvOMFiIyserOa0MF3SXh1ZiRqv7WqlUew=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "4f69ab280e9bb34e2c0b67fdfa6f0978a170ef56", + "rev": "a1dac2b08c329af22200104c3c4b18de5ded6034", "type": "github" }, "original": { @@ -374,11 +374,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1771578044, - "narHash": "sha256-wGozuioU2dQ0ZYTBmx53D2UK+fiUXrTzImWR8cftkWY=", + "lastModified": 1771663801, + "narHash": "sha256-gh0OVgAERhv1uSXzTgd0p7GioEG1Jg44FVxc72aM//A=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "12c70619a1e5ca391c93aa9806b2c63bc34c7c7d", + "rev": "0bf7a181e28a8c3d1e89b18f79b15d516f2fb670", "type": "github" }, "original": { @@ -463,11 +463,11 @@ ] }, "locked": { - "lastModified": 1771609315, - "narHash": "sha256-p5LXHaCQZKSiGzDgWjj8v280juAaTg0vgzT2C90RVxM=", + "lastModified": 1771732280, + "narHash": "sha256-pwfFptl7m1Xu+I7eSjapRfIBtVH9rsLpzuaCouraz9U=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "c6f4a6bc161323ec630cc0bd1bbd3812259b5a5a", + "rev": "341c5ee138d688ac1a7ffb1543ce2a3c9801aa34", "type": "github" }, "original": { @@ -549,11 +549,11 @@ ] }, "locked": { - "lastModified": 1771556776, - "narHash": "sha256-zKprqMQDl3xVfhSSYvgru1IGXjFdxryWk+KqK0I20Xk=", + "lastModified": 1771729765, + "narHash": "sha256-HNsDSR5bhLSrIpi9bTb2uTK1qnPo1xFSBxs6YmFyprk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "8b3f46b8a6d17ab46e533a5e3d5b1cc2ff228860", + "rev": "be926cb1a76e8450ab2b92121b2e88d09fa4d41c", "type": "github" }, "original": { @@ -704,11 +704,11 @@ ] }, "locked": { - "lastModified": 1771562861, - "narHash": "sha256-6oT3rF68W8HERLXvFfEkpz8xpAVLKZsY1ZuR/BbDTO8=", + "lastModified": 1771719171, + "narHash": "sha256-ZDE3//9Hg+9X5xXcDJ4k/d6qcOVQ4MrTmvf1zv/omZY=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "7783a3adf3d5a9599a82c75a44c7482e70398ac2", + "rev": "2a71f2e720db962f2522b38704e23e11163e91ae", "type": "github" }, "original": { From 9b40d3d09be57d013aec5f88011a775d1a4e053f Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 24 Feb 2026 14:23:13 -0500 Subject: [PATCH 584/724] opencode: openrouter + glm 5 -> zai coding plan glm 4.7 --- home-manager/progs/opencode.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index dfc5ebe..20f2264 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -7,9 +7,9 @@ }: let # what model should be used in place of haiku? - haiku-model = "openrouter/z-ai/glm-5"; + haiku-model = "zai-coding-plan/glm-4.7"; - opus-model = "openrouter/z-ai/glm-5"; + opus-model = "zai-coding-plan/glm-4.7"; ohMyOpencodeConfig = { "$schema" = From 03338416025d1718c744209ff611dc37620bfdac Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 24 Feb 2026 22:44:03 -0500 Subject: [PATCH 585/724] steam: fix switch-to-desktop PR located here: https://github.com/Jovian-Experiments/Jovian-NixOS/pull/550 --- flake.lock | 11 ++++++----- flake.nix | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 6ec0295..e7b1c56 100644 --- a/flake.lock +++ b/flake.lock @@ -242,15 +242,16 @@ ] }, "locked": { - "lastModified": 1771587792, - "narHash": "sha256-XGFLdlLOez7f0rmjlF+1TLXyBguy8gx2aBHx/Q5JXxs=", - "owner": "Jovian-Experiments", + "lastModified": 1771990646, + "narHash": "sha256-39FItSah91qXFKj1Zac4vQ+afdMOFOZkrQ6IyUs1eiU=", + "owner": "Titaniumtown", "repo": "Jovian-NixOS", - "rev": "b49fc54950e251f166a2240799315033ab7a8916", + "rev": "dd265e7a1e6ae1d6b1fd06c120ef40cac287ec57", "type": "github" }, "original": { - "owner": "Jovian-Experiments", + "owner": "Titaniumtown", + "ref": "fix/steamos-manager-desktop-switch", "repo": "Jovian-NixOS", "type": "github" } diff --git a/flake.nix b/flake.nix index 3fc7cd1..3cdd8eb 100644 --- a/flake.nix +++ b/flake.nix @@ -65,7 +65,7 @@ }; jovian-nixos = { - url = "github:Jovian-Experiments/Jovian-NixOS"; + url = "github:Titaniumtown/Jovian-NixOS/fix/steamos-manager-desktop-switch"; inputs.nixpkgs.follows = "nixpkgs"; }; From a4164ce07c4a1b63099f1f296b6702a0eff7a956 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 25 Feb 2026 01:57:48 -0500 Subject: [PATCH 586/724] steam: add entry for prism launcher --- flake.lock | 63 +++++++++++++++++++++++++++-- flake.nix | 5 +++ home-manager/home-yarn.nix | 15 +++++++ home-manager/secrets/steam-user-id | Bin 0 -> 32 bytes 4 files changed, 79 insertions(+), 4 deletions(-) create mode 100644 home-manager/secrets/steam-user-id diff --git a/flake.lock b/flake.lock index e7b1c56..3aa865e 100644 --- a/flake.lock +++ b/flake.lock @@ -6,7 +6,7 @@ "llm-agents", "nixpkgs" ], - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1771437256, @@ -153,7 +153,25 @@ }, "flake-utils": { "inputs": { - "systems": "systems_4" + "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, @@ -256,6 +274,27 @@ "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", @@ -372,7 +411,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1771663801, @@ -479,7 +518,7 @@ }, "oh-my-opencode": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" ] @@ -530,6 +569,7 @@ "home-manager": "home-manager", "impermanence": "impermanence", "jovian-nixos": "jovian-nixos", + "json2steamshortcut": "json2steamshortcut", "lanzaboote": "lanzaboote", "llm-agents": "llm-agents", "niri": "niri", @@ -623,6 +663,21 @@ "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": [ diff --git a/flake.nix b/flake.nix index 3cdd8eb..9c6dccd 100644 --- a/flake.nix +++ b/flake.nix @@ -84,6 +84,11 @@ url = "github:yebei199/oh-my-opencode/nix"; inputs.nixpkgs.follows = "nixpkgs"; }; + + json2steamshortcut = { + url = "github:ChrisOboe/json2steamshortcut"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = diff --git a/home-manager/home-yarn.nix b/home-manager/home-yarn.nix index d6f4614..1d145a3 100644 --- a/home-manager/home-yarn.nix +++ b/home-manager/home-yarn.nix @@ -9,6 +9,7 @@ imports = [ ./gui.nix ./desktop.nix + inputs.json2steamshortcut.homeModules.default ]; home.packages = with pkgs; [ @@ -26,4 +27,18 @@ 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" ]; + } + ]; + }; } diff --git a/home-manager/secrets/steam-user-id b/home-manager/secrets/steam-user-id new file mode 100644 index 0000000000000000000000000000000000000000..deeb7992698edf628bd61b7f9ffc1edd511c56fe GIT binary patch literal 32 ocmZQ@_Y83kiVO&0SS5EhcSYOTRg1Qsxgot_cgJcIJE7b@0M&O6Q2+n{ literal 0 HcmV?d00001 From 4d7d5c736b064bf38c3ee4f13c6740433dd55938 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 25 Feb 2026 02:19:07 -0500 Subject: [PATCH 587/724] opencode: glm-4.7 -> glm-5 --- home-manager/progs/opencode.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index 20f2264..7379181 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -7,9 +7,9 @@ }: let # what model should be used in place of haiku? - haiku-model = "zai-coding-plan/glm-4.7"; + haiku-model = "zai-coding-plan/glm-5"; - opus-model = "zai-coding-plan/glm-4.7"; + opus-model = "zai-coding-plan/glm-5"; ohMyOpencodeConfig = { "$schema" = From a1a259d424fc67f4813cfc9c29fd0cee94d2e495 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 25 Feb 2026 14:39:37 -0500 Subject: [PATCH 588/724] steam: upstream fix for switch-to-desktop --- flake.lock | 11 +++++------ flake.nix | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 3aa865e..70aa902 100644 --- a/flake.lock +++ b/flake.lock @@ -260,16 +260,15 @@ ] }, "locked": { - "lastModified": 1771990646, - "narHash": "sha256-39FItSah91qXFKj1Zac4vQ+afdMOFOZkrQ6IyUs1eiU=", - "owner": "Titaniumtown", + "lastModified": 1772014238, + "narHash": "sha256-iYLoK6Dq9cKYD6WBIxwUFFHQFxhK+ssvSRf/TWxPbUQ=", + "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "dd265e7a1e6ae1d6b1fd06c120ef40cac287ec57", + "rev": "52f140c07493f8bb6cd0773c7e1afe3e1fd1d1fa", "type": "github" }, "original": { - "owner": "Titaniumtown", - "ref": "fix/steamos-manager-desktop-switch", + "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", "type": "github" } diff --git a/flake.nix b/flake.nix index 9c6dccd..6d4004d 100644 --- a/flake.nix +++ b/flake.nix @@ -65,7 +65,7 @@ }; jovian-nixos = { - url = "github:Titaniumtown/Jovian-NixOS/fix/steamos-manager-desktop-switch"; + url = "github:Jovian-Experiments/Jovian-NixOS"; inputs.nixpkgs.follows = "nixpkgs"; }; From f4d23b00a3c5181aa327658d5baee909a7842a68 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 26 Feb 2026 19:17:26 -0500 Subject: [PATCH 589/724] audio: disable rtkit to fix mumble --- system/common.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/system/common.nix b/system/common.nix index 558b32d..8c477cf 100644 --- a/system/common.nix +++ b/system/common.nix @@ -206,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; From 7097dcb4b80c47f03594f41dbe66c0d041b0a51d Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 26 Feb 2026 19:22:08 -0500 Subject: [PATCH 590/724] steam: enable sddm (now required) --- flake.lock | 6 +++--- system/system-yarn.nix | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 70aa902..3552d8e 100644 --- a/flake.lock +++ b/flake.lock @@ -260,11 +260,11 @@ ] }, "locked": { - "lastModified": 1772014238, - "narHash": "sha256-iYLoK6Dq9cKYD6WBIxwUFFHQFxhK+ssvSRf/TWxPbUQ=", + "lastModified": 1772108436, + "narHash": "sha256-rKRHAKnUolC+icX7SwT2lLPBYaCvKKuOyB6q5+3OBj0=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "52f140c07493f8bb6cd0773c7e1afe3e1fd1d1fa", + "rev": "aa31fa7f26454629a6029c81a849c17255176f87", "type": "github" }, "original": { diff --git a/system/system-yarn.nix b/system/system-yarn.nix index a00939e..40bbc33 100644 --- a/system/system-yarn.nix +++ b/system/system-yarn.nix @@ -166,6 +166,10 @@ }; }; + # 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; } From f94cfcbcb7fed96beea06e6983f8ddbe98c19146 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 27 Feb 2026 01:00:27 -0500 Subject: [PATCH 591/724] steam: fix jovian-nixos (use my fork) --- flake.lock | 11 ++++++----- flake.nix | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 3552d8e..8d513d3 100644 --- a/flake.lock +++ b/flake.lock @@ -260,15 +260,16 @@ ] }, "locked": { - "lastModified": 1772108436, - "narHash": "sha256-rKRHAKnUolC+icX7SwT2lLPBYaCvKKuOyB6q5+3OBj0=", - "owner": "Jovian-Experiments", + "lastModified": 1772169624, + "narHash": "sha256-YHaTNllFu90LdXqiNNoeDFnKwioa6lT+gXGGBOAvlfo=", + "owner": "Titaniumtown", "repo": "Jovian-NixOS", - "rev": "aa31fa7f26454629a6029c81a849c17255176f87", + "rev": "68f2a686a27f0b6899b085fd6e653fffa59db444", "type": "github" }, "original": { - "owner": "Jovian-Experiments", + "owner": "Titaniumtown", + "ref": "pr/fix-sddm-switch-to-desktop", "repo": "Jovian-NixOS", "type": "github" } diff --git a/flake.nix b/flake.nix index 6d4004d..3e2e9f9 100644 --- a/flake.nix +++ b/flake.nix @@ -65,7 +65,7 @@ }; jovian-nixos = { - url = "github:Jovian-Experiments/Jovian-NixOS"; + url = "github:Titaniumtown/Jovian-NixOS/pr/fix-sddm-switch-to-desktop"; inputs.nixpkgs.follows = "nixpkgs"; }; From 428fa2fd42c8c1881daa6e743dabd69fd1452fde Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 27 Feb 2026 21:59:01 -0500 Subject: [PATCH 592/724] git: add opencode related file to .gitignore --- home-manager/no-gui.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 649db1f..293ec2a 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -230,6 +230,8 @@ in lfs.enable = true; + ignores = [ ".sisyphus" ]; + settings = { init = { # master -> main From 232e23095012548e5422d1122e70685b5915467d Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 28 Feb 2026 01:37:43 -0500 Subject: [PATCH 593/724] opencode: ditch chatgpt --- home-manager/progs/opencode.nix | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index 7379181..3fb4df4 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -17,28 +17,19 @@ let agents = { sisyphus.model = opus-model; sisyphus-junior.model = opus-model; - oracle = { - model = "openrouter/openai/gpt-5.2-codex"; - variant = "high"; - }; + 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 = { - model = "openrouter/openai/gpt-5.2"; - variant = "medium"; - }; + momus = opus-model; atlas.model = opus-model; }; categories = { visual-engineering.model = "openrouter/google/gemini-3-pro"; - ultrabrain = { - model = "openrouter/openai/gpt-5.2-codex"; - variant = "xhigh"; - }; + ultrabrain = opus-model; artistry = { model = "openrouter/google/gemini-3-pro"; variant = "max"; @@ -203,10 +194,6 @@ in openrouter = { models = { "openai/gpt-oss-20b:free" = { }; - "minimax/minimax-m2.1" = { }; - "openai/gpt-5.2-codex" = { - variant = "xhigh"; - }; }; options = { # TODO! use agenix here instead From 2cea5cf092f5c5b3a9c7befecf9076149a631f77 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 2 Mar 2026 23:38:33 -0500 Subject: [PATCH 594/724] oh-my-opencode: fix json config --- home-manager/progs/opencode.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index 3fb4df4..3970752 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -17,19 +17,19 @@ let agents = { sisyphus.model = opus-model; sisyphus-junior.model = opus-model; - oracle = opus-model; + oracle.model = 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; + momus.model = opus-model; atlas.model = opus-model; }; categories = { visual-engineering.model = "openrouter/google/gemini-3-pro"; - ultrabrain = opus-model; + ultrabrain.model = opus-model; artistry = { model = "openrouter/google/gemini-3-pro"; variant = "max"; From bc1d0c37edb078da962cd4e1dfd66f7ba8e555dc Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 2 Mar 2026 23:39:22 -0500 Subject: [PATCH 595/724] update --- flake.lock | 120 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 71 insertions(+), 49 deletions(-) diff --git a/flake.lock b/flake.lock index 8d513d3..7496555 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ }, "crane": { "locked": { - "lastModified": 1771121070, - "narHash": "sha256-aIlv7FRXF9q70DNJPI237dEDAznSKaXmL5lfK/Id/bI=", + "lastModified": 1771796463, + "narHash": "sha256-9bCDuUzpwJXcHMQYMS1yNuzYMmKO/CCwCexpjWOl62I=", "owner": "ipetkov", "repo": "crane", - "rev": "a2812c19f1ed2e5ed5ce2ef7109798b575c180e1", + "rev": "3d3de3313e263e04894f284ac18177bd26169bad", "type": "github" }, "original": { @@ -83,11 +83,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1771637851, - "narHash": "sha256-GmrqCINhfdO3EthpVG8ZsoTdfzj3vaEdz9soJwiI2HY=", + "lastModified": 1772433867, + "narHash": "sha256-0dm0Oc5yd1vwqQoa3lAJznnocyCLkOC7zHkUTqCVI94=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "ac649cce2abd1eb9d6d3f161928f9a7665b63310", + "rev": "470e653f08cfe85bbc02516af65e44d3b9c735b8", "type": "github" }, "original": { @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1771728721, - "narHash": "sha256-03w1Ka71dJlerySoIT5ZGm/+bx0qONZIjELY4ghkxIo=", + "lastModified": 1772506370, + "narHash": "sha256-W+s8h4x6ivayhBTuHGR5WJ3PBx24vUCC2SOTYSd73qM=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "d7e50ce0c6e1ca698217a251d432799683d23831", + "rev": "71d60877e4b6caff448aa698efdf79335692162a", "type": "github" }, "original": { @@ -216,11 +216,11 @@ ] }, "locked": { - "lastModified": 1771683283, - "narHash": "sha256-WxAEkAbo8dP7qiyPM6VN4ZGAxfuBVlNBNPkrqkrXVEc=", + "lastModified": 1772380461, + "narHash": "sha256-O3ukj3Bb3V0Tiy/4LUfLlBpWypJ9P0JeUgsKl2nmZZY=", "owner": "nix-community", "repo": "home-manager", - "rev": "c6ed3eab64d23520bcbb858aa53fe2b533725d4a", + "rev": "f140aa04d7d14f8a50ab27f3691b5766b17ae961", "type": "github" }, "original": { @@ -307,11 +307,11 @@ ] }, "locked": { - "lastModified": 1771492583, - "narHash": "sha256-nQzvnU4BGu8dA6BsPPCqmVcab/3ebVmHtX3ZWbW3Hxc=", + "lastModified": 1772216104, + "narHash": "sha256-1TnGN26vnCEQk5m4AavJZxGZTb/6aZyphemRPRwFUfs=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "5e9380994665ef66c87ab8e22c913ff837174ce4", + "rev": "dbe5112de965bbbbff9f0729a9789c20a65ab047", "type": "github" }, "original": { @@ -329,11 +329,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1771730908, - "narHash": "sha256-AkmTeSJSGniBsCbc+Oy5emrQflyTzUweOVcQLf69z1A=", + "lastModified": 1772509932, + "narHash": "sha256-g7j7SERi1w8En6XY+fmwopwd4kY6utX+OmZ5DAoUdG8=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "352ee8c439a3c2c7987f6cfaebddcf87c924959a", + "rev": "699cd7b1346ead916f0958b3dbe78dc32df459d6", "type": "github" }, "original": { @@ -356,11 +356,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1771638124, - "narHash": "sha256-rIF69lE48tBvOMFiIyserOa0MF3SXh1ZiRqv7WqlUew=", + "lastModified": 1772473001, + "narHash": "sha256-vMhspzhj6M4hfqM/wLgPG81xQh2sN5x0N6a3rHp5ZRo=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "a1dac2b08c329af22200104c3c4b18de5ded6034", + "rev": "475eb9fc8d1ffa906ac215e78e758a29597fcd5e", "type": "github" }, "original": { @@ -389,11 +389,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1771305475, - "narHash": "sha256-lqweVTwHhYc+9T33cysp38gVwxaibGJHriOPZXWyhCY=", + "lastModified": 1772207631, + "narHash": "sha256-Jkkg+KqshFO3CbTszVVpkKN2AOObYz+wMsM3ONo1z5g=", "owner": "YaLTeR", "repo": "niri", - "rev": "a2a52911757cb3b497db9407592f9b4c439571ea", + "rev": "e708f546153f74acf33eb183b3b2992587a701e5", "type": "github" }, "original": { @@ -414,11 +414,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1771663801, - "narHash": "sha256-gh0OVgAERhv1uSXzTgd0p7GioEG1Jg44FVxc72aM//A=", + "lastModified": 1772442198, + "narHash": "sha256-ygRCY/7MtTATquYFh2dadiOF17Wh7aiYvkD6jTFNvdw=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "0bf7a181e28a8c3d1e89b18f79b15d516f2fb670", + "rev": "94230f71afa2caf576d9d852f5ed46a6050e8b0b", "type": "github" }, "original": { @@ -466,11 +466,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1771423359, - "narHash": "sha256-yRKJ7gpVmXbX2ZcA8nFi6CMPkJXZGjie2unsiMzj3Ig=", + "lastModified": 1771969195, + "narHash": "sha256-qwcDBtrRvJbrrnv1lf/pREQi8t2hWZxVAyeMo7/E9sw=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "740a22363033e9f1bb6270fbfb5a9574067af15b", + "rev": "41c6b421bdc301b2624486e11905c9af7b8ec68e", "type": "github" }, "original": { @@ -482,11 +482,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1771369470, - "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", + "lastModified": 1772433332, + "narHash": "sha256-izhTDFKsg6KeVBxJS9EblGeQ8y+O8eCa6RcW874vxEc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0182a361324364ae3f436a63005877674cf45efb", + "rev": "cf59864ef8aa2e178cccedbe2c178185b0365705", "type": "github" }, "original": { @@ -500,14 +500,15 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ] + ], + "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1771732280, - "narHash": "sha256-pwfFptl7m1Xu+I7eSjapRfIBtVH9rsLpzuaCouraz9U=", + "lastModified": 1772500480, + "narHash": "sha256-7Rj0vLxKBn25QDKaW1heAQPH9ICg/cyrlLsoEPO0E58=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "341c5ee138d688ac1a7ffb1543ce2a3c9801aa34", + "rev": "ddfb06fe5b8d859578b269362d2f3e21b5dc5a75", "type": "github" }, "original": { @@ -516,6 +517,27 @@ "type": "github" } }, + "noctalia-qs": { + "inputs": { + "nixpkgs": [ + "noctalia", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1772227064, + "narHash": "sha256-f821ZSoGpa/aXrWq0gPpea9qBnX8KDyavGKkptz2Mog=", + "owner": "noctalia-dev", + "repo": "noctalia-qs", + "rev": "0741d27d2f7db567270f139c5d1684614ecf9863", + "type": "github" + }, + "original": { + "owner": "noctalia-dev", + "repo": "noctalia-qs", + "type": "github" + } + }, "oh-my-opencode": { "inputs": { "flake-utils": "flake-utils_2", @@ -548,11 +570,11 @@ ] }, "locked": { - "lastModified": 1770726378, - "narHash": "sha256-kck+vIbGOaM/dHea7aTBxdFYpeUl/jHOy5W3eyRvVx8=", + "lastModified": 1771858127, + "narHash": "sha256-Gtre9YoYl3n25tJH2AoSdjuwcqij5CPxL3U3xysYD08=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "5eaaedde414f6eb1aea8b8525c466dc37bba95ae", + "rev": "49bbbfc218bf3856dfa631cead3b052d78248b83", "type": "github" }, "original": { @@ -590,11 +612,11 @@ ] }, "locked": { - "lastModified": 1771729765, - "narHash": "sha256-HNsDSR5bhLSrIpi9bTb2uTK1qnPo1xFSBxs6YmFyprk=", + "lastModified": 1772507320, + "narHash": "sha256-GdGXniFvtIfRiakc+ncdQYnoQjKbTCv9Imjfl4ggquI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "be926cb1a76e8450ab2b92121b2e88d09fa4d41c", + "rev": "1775eafa1879ac098ee436849bc9c3d963206f89", "type": "github" }, "original": { @@ -737,11 +759,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1771195969, - "narHash": "sha256-BUE41HjLIGPjq3U8VXPjf8asH8GaMI7FYdgrIHKFMXA=", + "lastModified": 1772429643, + "narHash": "sha256-M+bAeCCcjBnVk6w/4dIVvXvpJwOKnXjwi/lDbaN6Yws=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "536bd32efc935bf876d6de385ec18a1b715c9358", + "rev": "10f985b84cdbcc3bbf35b3e7e43d1b2a84fa9ce2", "type": "github" }, "original": { @@ -760,11 +782,11 @@ ] }, "locked": { - "lastModified": 1771719171, - "narHash": "sha256-ZDE3//9Hg+9X5xXcDJ4k/d6qcOVQ4MrTmvf1zv/omZY=", + "lastModified": 1772426935, + "narHash": "sha256-fLxV/FzP06eaoMFzwrnKk9x0b+kaNNjbFfp6+rsRKGs=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "2a71f2e720db962f2522b38704e23e11163e91ae", + "rev": "6caef0bf5e38a793fd269333f000b7299b160900", "type": "github" }, "original": { From d6f4c7b60e2a3443ef8afa0878745858e3842402 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 3 Mar 2026 10:42:42 -0500 Subject: [PATCH 596/724] jasmin: disable --- home-manager/no-gui.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 293ec2a..8117961 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -55,8 +55,8 @@ let google-java-format # formatter jdk # java - # java assembler - jasmin + # java assembler # BUG! broken + # jasmin ]; common_tools = with pkgs; [ From 53f7260c21b7e776bbdcd9366d1133f76da761c9 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 3 Mar 2026 18:13:26 -0500 Subject: [PATCH 597/724] update --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 7496555..89dfec2 100644 --- a/flake.lock +++ b/flake.lock @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1772506370, - "narHash": "sha256-W+s8h4x6ivayhBTuHGR5WJ3PBx24vUCC2SOTYSd73qM=", + "lastModified": 1772556483, + "narHash": "sha256-F68hfvbcOLFQQ0rSWzNu8tP3/2UW2aatY4iX8lLegLQ=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "71d60877e4b6caff448aa698efdf79335692162a", + "rev": "56072ed54f7f64e358dc629a0e422bbf000b5d0e", "type": "github" }, "original": { @@ -216,11 +216,11 @@ ] }, "locked": { - "lastModified": 1772380461, - "narHash": "sha256-O3ukj3Bb3V0Tiy/4LUfLlBpWypJ9P0JeUgsKl2nmZZY=", + "lastModified": 1772569491, + "narHash": "sha256-bdr6ueeXO1Xg91sFkuvaysYF0mVdwHBpdyhTjBEWv+s=", "owner": "nix-community", "repo": "home-manager", - "rev": "f140aa04d7d14f8a50ab27f3691b5766b17ae961", + "rev": "924e61f5c2aeab38504028078d7091077744ab17", "type": "github" }, "original": { @@ -329,11 +329,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1772509932, - "narHash": "sha256-g7j7SERi1w8En6XY+fmwopwd4kY6utX+OmZ5DAoUdG8=", + "lastModified": 1772548355, + "narHash": "sha256-gZxgYEus1trPpVpM7SzB7TY6X4+9RT1vy1EyFzzGTME=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "699cd7b1346ead916f0958b3dbe78dc32df459d6", + "rev": "9a0576dbea3dda5db55ec0dc9d68982ac96f3a3c", "type": "github" }, "original": { @@ -356,11 +356,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1772473001, - "narHash": "sha256-vMhspzhj6M4hfqM/wLgPG81xQh2sN5x0N6a3rHp5ZRo=", + "lastModified": 1772572827, + "narHash": "sha256-d91kXM4t1G0KQ/MB0LTP514IslsDu6ZBt4HQE7hVvzs=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "475eb9fc8d1ffa906ac215e78e758a29597fcd5e", + "rev": "7592181859ad2ab12913bbede47b45481b2b2938", "type": "github" }, "original": { @@ -482,11 +482,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1772433332, - "narHash": "sha256-izhTDFKsg6KeVBxJS9EblGeQ8y+O8eCa6RcW874vxEc=", + "lastModified": 1772542754, + "narHash": "sha256-WGV2hy+VIeQsYXpsLjdr4GvHv5eECMISX1zKLTedhdg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cf59864ef8aa2e178cccedbe2c178185b0365705", + "rev": "8c809a146a140c5c8806f13399592dbcb1bb5dc4", "type": "github" }, "original": { @@ -504,11 +504,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1772500480, - "narHash": "sha256-7Rj0vLxKBn25QDKaW1heAQPH9ICg/cyrlLsoEPO0E58=", + "lastModified": 1772565447, + "narHash": "sha256-3oPgLP54zZyAMomElJz5FwlGgA6caW4v4rI2lC5WqvY=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "ddfb06fe5b8d859578b269362d2f3e21b5dc5a75", + "rev": "ba5f933c582080083f849dcd52fa19133d83b85a", "type": "github" }, "original": { @@ -782,11 +782,11 @@ ] }, "locked": { - "lastModified": 1772426935, - "narHash": "sha256-fLxV/FzP06eaoMFzwrnKk9x0b+kaNNjbFfp6+rsRKGs=", + "lastModified": 1772517053, + "narHash": "sha256-aBuL2TFnyBLR+t6iBlKnTWWzprXYKQQIaV0IuCSPPeE=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "6caef0bf5e38a793fd269333f000b7299b160900", + "rev": "32e9673aee2ae994ced561247918952398a3e933", "type": "github" }, "original": { From 7dd227d91fb8d14bf526ec199c2dd3590b3c8b24 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 4 Mar 2026 19:22:16 -0500 Subject: [PATCH 598/724] update jovian-nixos --- flake.lock | 11 +++++------ flake.nix | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 89dfec2..0496e33 100644 --- a/flake.lock +++ b/flake.lock @@ -260,16 +260,15 @@ ] }, "locked": { - "lastModified": 1772169624, - "narHash": "sha256-YHaTNllFu90LdXqiNNoeDFnKwioa6lT+gXGGBOAvlfo=", - "owner": "Titaniumtown", + "lastModified": 1772517207, + "narHash": "sha256-qxHfxqbigqBTn//U4leIS5he22Wp1GS0+zmwGV7Pozs=", + "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "68f2a686a27f0b6899b085fd6e653fffa59db444", + "rev": "7ca1501c2d80900b5967baea4d42581f84b388dd", "type": "github" }, "original": { - "owner": "Titaniumtown", - "ref": "pr/fix-sddm-switch-to-desktop", + "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", "type": "github" } diff --git a/flake.nix b/flake.nix index 3e2e9f9..6d4004d 100644 --- a/flake.nix +++ b/flake.nix @@ -65,7 +65,7 @@ }; jovian-nixos = { - url = "github:Titaniumtown/Jovian-NixOS/pr/fix-sddm-switch-to-desktop"; + url = "github:Jovian-Experiments/Jovian-NixOS"; inputs.nixpkgs.follows = "nixpkgs"; }; From c13c1cb8100cf3305e8f08b607d1debe6c4fcc35 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 5 Mar 2026 08:55:53 -0500 Subject: [PATCH 599/724] update: noctalia, fix crashes --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 0496e33..876d743 100644 --- a/flake.lock +++ b/flake.lock @@ -503,11 +503,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1772565447, - "narHash": "sha256-3oPgLP54zZyAMomElJz5FwlGgA6caW4v4rI2lC5WqvY=", + "lastModified": 1772716565, + "narHash": "sha256-j17/j1dliOK9qg4909Qs4zTlr4wIYHA82YorXfbUQrc=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "ba5f933c582080083f849dcd52fa19133d83b85a", + "rev": "3e9c08b5b957b1ecaa788d45691939778997e8a2", "type": "github" }, "original": { @@ -524,11 +524,11 @@ ] }, "locked": { - "lastModified": 1772227064, - "narHash": "sha256-f821ZSoGpa/aXrWq0gPpea9qBnX8KDyavGKkptz2Mog=", + "lastModified": 1772673824, + "narHash": "sha256-TLHXPoELZA6VeuzC1Zpx+MnSsYzrJs+DSieMgfjAOJc=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "0741d27d2f7db567270f139c5d1684614ecf9863", + "rev": "f8531192cd09b9ea2e78d18e9cfc9d3dba498690", "type": "github" }, "original": { From e0c477b37941b29f56bbed63eb9a5e69d2f6bfcc Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 5 Mar 2026 12:36:16 -0500 Subject: [PATCH 600/724] update --- flake.lock | 144 ++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 110 insertions(+), 34 deletions(-) diff --git a/flake.lock b/flake.lock index 876d743..c56de2f 100644 --- a/flake.lock +++ b/flake.lock @@ -6,7 +6,10 @@ "llm-agents", "nixpkgs" ], - "systems": "systems_3" + "systems": [ + "llm-agents", + "systems" + ] }, "locked": { "lastModified": 1771437256, @@ -22,6 +25,40 @@ "type": "github" } }, + "bun2nix": { + "inputs": { + "flake-parts": [ + "llm-agents", + "flake-parts" + ], + "import-tree": "import-tree", + "nixpkgs": [ + "llm-agents", + "nixpkgs" + ], + "systems": [ + "llm-agents", + "systems" + ], + "treefmt-nix": [ + "llm-agents", + "treefmt-nix" + ] + }, + "locked": { + "lastModified": 1770895533, + "narHash": "sha256-v3QaK9ugy9bN9RXDnjw0i2OifKmz2NnKM82agtqm/UY=", + "owner": "nix-community", + "repo": "bun2nix", + "rev": "c843f477b15f51151f8c6bcc886954699440a6e1", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "bun2nix", + "type": "github" + } + }, "crane": { "locked": { "lastModified": 1771796463, @@ -83,11 +120,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1772433867, - "narHash": "sha256-0dm0Oc5yd1vwqQoa3lAJznnocyCLkOC7zHkUTqCVI94=", + "lastModified": 1772615218, + "narHash": "sha256-z+3c0AGkrMf1xZ+pq57aVp4Zo4KsqFMIjEVzSZinghc=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "470e653f08cfe85bbc02516af65e44d3b9c735b8", + "rev": "d23bbe87721c61f4d5a605f2914b32780bb89949", "type": "github" }, "original": { @@ -106,11 +143,11 @@ ] }, "locked": { - "lastModified": 1772556483, - "narHash": "sha256-F68hfvbcOLFQQ0rSWzNu8tP3/2UW2aatY4iX8lLegLQ=", + "lastModified": 1772706147, + "narHash": "sha256-C0UMYQg3KBU6+L8TLfQ/s60O6/Tiu/JpN8C/WiIH9DU=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "56072ed54f7f64e358dc629a0e422bbf000b5d0e", + "rev": "54af2ae96631311dc4d2686a07e4f472fb36f516", "type": "github" }, "original": { @@ -151,6 +188,27 @@ "type": "github" } }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "llm-agents", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1772408722, + "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems_2" @@ -216,11 +274,11 @@ ] }, "locked": { - "lastModified": 1772569491, - "narHash": "sha256-bdr6ueeXO1Xg91sFkuvaysYF0mVdwHBpdyhTjBEWv+s=", + "lastModified": 1772633327, + "narHash": "sha256-jl+DJB2DUx7EbWLRng+6HNWW/1/VQOnf0NsQB4PlA7I=", "owner": "nix-community", "repo": "home-manager", - "rev": "924e61f5c2aeab38504028078d7091077744ab17", + "rev": "5a75730e6f21ee624cbf86f4915c6e7489c74acc", "type": "github" }, "original": { @@ -252,6 +310,21 @@ "type": "github" } }, + "import-tree": { + "locked": { + "lastModified": 1763762820, + "narHash": "sha256-ZvYKbFib3AEwiNMLsejb/CWs/OL/srFQ8AogkebEPF0=", + "owner": "vic", + "repo": "import-tree", + "rev": "3c23749d8013ec6daa1d7255057590e9ca726646", + "type": "github" + }, + "original": { + "owner": "vic", + "repo": "import-tree", + "type": "github" + } + }, "jovian-nixos": { "inputs": { "nix-github-actions": "nix-github-actions", @@ -322,17 +395,20 @@ "llm-agents": { "inputs": { "blueprint": "blueprint", + "bun2nix": "bun2nix", + "flake-parts": "flake-parts", "nixpkgs": [ "nixpkgs" ], + "systems": "systems_3", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1772548355, - "narHash": "sha256-gZxgYEus1trPpVpM7SzB7TY6X4+9RT1vy1EyFzzGTME=", + "lastModified": 1772722494, + "narHash": "sha256-H8a7ykDwume9z4Y1JueO+FTGlzKS/+xsJh+13V20wLA=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "9a0576dbea3dda5db55ec0dc9d68982ac96f3a3c", + "rev": "fc8bf0ae9c6ac6835d01d04cc58e1f9ec717815c", "type": "github" }, "original": { @@ -355,11 +431,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1772572827, - "narHash": "sha256-d91kXM4t1G0KQ/MB0LTP514IslsDu6ZBt4HQE7hVvzs=", + "lastModified": 1772698812, + "narHash": "sha256-7+K/VaZ7TXUeUGSYshg8wC3UsRZHB+M4x6r38Q1B79c=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "7592181859ad2ab12913bbede47b45481b2b2938", + "rev": "5641625ef950f024e3e0e3f38bb91f876290c0be", "type": "github" }, "original": { @@ -413,11 +489,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1772442198, - "narHash": "sha256-ygRCY/7MtTATquYFh2dadiOF17Wh7aiYvkD6jTFNvdw=", + "lastModified": 1772716420, + "narHash": "sha256-T3UEKNTGqBl44AQ0+0OIpiWMXeQ8+4QW/akSc4yeL2A=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "94230f71afa2caf576d9d852f5ed46a6050e8b0b", + "rev": "be3ecb81a85be302e27d46ff32a1e251e444327d", "type": "github" }, "original": { @@ -481,11 +557,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1772542754, - "narHash": "sha256-WGV2hy+VIeQsYXpsLjdr4GvHv5eECMISX1zKLTedhdg=", + "lastModified": 1772624091, + "narHash": "sha256-QKyJ0QGWBn6r0invrMAK8dmJoBYWoOWy7lN+UHzW1jc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8c809a146a140c5c8806f13399592dbcb1bb5dc4", + "rev": "80bdc1e5ce51f56b19791b52b2901187931f5353", "type": "github" }, "original": { @@ -503,11 +579,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1772716565, - "narHash": "sha256-j17/j1dliOK9qg4909Qs4zTlr4wIYHA82YorXfbUQrc=", + "lastModified": 1772730317, + "narHash": "sha256-PWzdTJ8UL49qSY1tGc2TZ3pfI6kShZtR7mAyg47ZU5A=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "3e9c08b5b957b1ecaa788d45691939778997e8a2", + "rev": "e60ce173d4d1abeed7920522207c1ef016fb2e2f", "type": "github" }, "original": { @@ -611,11 +687,11 @@ ] }, "locked": { - "lastModified": 1772507320, - "narHash": "sha256-GdGXniFvtIfRiakc+ncdQYnoQjKbTCv9Imjfl4ggquI=", + "lastModified": 1772679930, + "narHash": "sha256-FxYmdacqrdDVeE9QqZKTIpNLjv2B8GSKssgwlZuTR98=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "1775eafa1879ac098ee436849bc9c3d963206f89", + "rev": "9b741db17141331fdb26270a1b66b81be8be9edd", "type": "github" }, "original": { @@ -707,11 +783,11 @@ ] }, "locked": { - "lastModified": 1770228511, - "narHash": "sha256-wQ6NJSuFqAEmIg2VMnLdCnUc0b7vslUohqqGGD+Fyxk=", + "lastModified": 1772660329, + "narHash": "sha256-IjU1FxYqm+VDe5qIOxoW+pISBlGvVApRjiw/Y/ttJzY=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "337a4fe074be1042a35086f15481d763b8ddc0e7", + "rev": "3710e0e1218041bbad640352a0440114b1e10428", "type": "github" }, "original": { @@ -781,11 +857,11 @@ ] }, "locked": { - "lastModified": 1772517053, - "narHash": "sha256-aBuL2TFnyBLR+t6iBlKnTWWzprXYKQQIaV0IuCSPPeE=", + "lastModified": 1772638901, + "narHash": "sha256-kzAyU054Mzpnzgx475MgmcjYJXxXWQWBG7LLsYtHXKw=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "32e9673aee2ae994ced561247918952398a3e933", + "rev": "75de12ddd50616a3628499ec18b648bceb88eb0d", "type": "github" }, "original": { From 7e0d0fe17bd2443f067564ad69f7e5d2d7ca1e16 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 6 Mar 2026 13:23:02 -0500 Subject: [PATCH 601/724] update --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index c56de2f..b756881 100644 --- a/flake.lock +++ b/flake.lock @@ -120,11 +120,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1772615218, - "narHash": "sha256-z+3c0AGkrMf1xZ+pq57aVp4Zo4KsqFMIjEVzSZinghc=", + "lastModified": 1772783183, + "narHash": "sha256-YpqMWBeMQHHwlwCjXe7zU9UKU8Up7rdXTKikPsiHNJw=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "d23bbe87721c61f4d5a605f2914b32780bb89949", + "rev": "15d55259159d471f5bd329c712f1010c39e3cc37", "type": "github" }, "original": { @@ -143,11 +143,11 @@ ] }, "locked": { - "lastModified": 1772706147, - "narHash": "sha256-C0UMYQg3KBU6+L8TLfQ/s60O6/Tiu/JpN8C/WiIH9DU=", + "lastModified": 1772818138, + "narHash": "sha256-Q/zaIhzvvjCN6/oPcOsyljP0LO0RUvB90BSuDNVYNF8=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "54af2ae96631311dc4d2686a07e4f472fb36f516", + "rev": "594ce4b67cd089110785a9c23731f61767d233d3", "type": "github" }, "original": { @@ -274,11 +274,11 @@ ] }, "locked": { - "lastModified": 1772633327, - "narHash": "sha256-jl+DJB2DUx7EbWLRng+6HNWW/1/VQOnf0NsQB4PlA7I=", + "lastModified": 1772807318, + "narHash": "sha256-Qjw6ILt8cb2HQQpCmWNLMZZ63wEo1KjTQt+1BcQBr7k=", "owner": "nix-community", "repo": "home-manager", - "rev": "5a75730e6f21ee624cbf86f4915c6e7489c74acc", + "rev": "daa2c221320809f5514edde74d0ad0193ad54ed8", "type": "github" }, "original": { @@ -333,11 +333,11 @@ ] }, "locked": { - "lastModified": 1772517207, - "narHash": "sha256-qxHfxqbigqBTn//U4leIS5he22Wp1GS0+zmwGV7Pozs=", + "lastModified": 1772783167, + "narHash": "sha256-yOeOq+dmcgkzLRolqAG28bA8ilj3D89vZgAIkBafC5A=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "7ca1501c2d80900b5967baea4d42581f84b388dd", + "rev": "2a9a092cabc057309900943d6c69ad4728c693ed", "type": "github" }, "original": { @@ -404,11 +404,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1772722494, - "narHash": "sha256-H8a7ykDwume9z4Y1JueO+FTGlzKS/+xsJh+13V20wLA=", + "lastModified": 1772806698, + "narHash": "sha256-hc6NZ0UlY5V1hHlrsCG+fJClReMJQCqW4SJ3Kq1SVK8=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "fc8bf0ae9c6ac6835d01d04cc58e1f9ec717815c", + "rev": "a90b7a43af62a0732c7aba479fd493c777956aa0", "type": "github" }, "original": { @@ -489,11 +489,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1772716420, - "narHash": "sha256-T3UEKNTGqBl44AQ0+0OIpiWMXeQ8+4QW/akSc4yeL2A=", + "lastModified": 1772787454, + "narHash": "sha256-ZX2thoeGlLv19f7dTYXn87mJqOKs2NcmQdW9Sz+ZbPg=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "be3ecb81a85be302e27d46ff32a1e251e444327d", + "rev": "1daa7d67180961e06d8fe0ef80394de5ec61fe93", "type": "github" }, "original": { @@ -579,11 +579,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1772730317, - "narHash": "sha256-PWzdTJ8UL49qSY1tGc2TZ3pfI6kShZtR7mAyg47ZU5A=", + "lastModified": 1772804651, + "narHash": "sha256-90DfP4v5+DITh2C12HP4v6hMkF0o6WN5TlrcOAQeMHI=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "e60ce173d4d1abeed7920522207c1ef016fb2e2f", + "rev": "6b64fa11fca2f4d80625dfa0e15523ed13808cf4", "type": "github" }, "original": { @@ -687,11 +687,11 @@ ] }, "locked": { - "lastModified": 1772679930, - "narHash": "sha256-FxYmdacqrdDVeE9QqZKTIpNLjv2B8GSKssgwlZuTR98=", + "lastModified": 1772775058, + "narHash": "sha256-i+I9RYN8kYb9/9kibkxd0avkkislD1tyWojSVgIy160=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "9b741db17141331fdb26270a1b66b81be8be9edd", + "rev": "629bbb7f9d02787a54e28398b411da849246253b", "type": "github" }, "original": { @@ -857,11 +857,11 @@ ] }, "locked": { - "lastModified": 1772638901, - "narHash": "sha256-kzAyU054Mzpnzgx475MgmcjYJXxXWQWBG7LLsYtHXKw=", + "lastModified": 1772772172, + "narHash": "sha256-OCEb6jXTvhnMTMqMLleYChekDO/zh+VtunBAS0WevPM=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "75de12ddd50616a3628499ec18b648bceb88eb0d", + "rev": "5f8f34c0dd56808ecbfa35697353c455e4a416b3", "type": "github" }, "original": { From 60a18947c4be01d457c784f3e8e4797bbb5cf668 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 7 Mar 2026 23:26:42 -0500 Subject: [PATCH 602/724] update --- flake.lock | 66 +++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index b756881..5013965 100644 --- a/flake.lock +++ b/flake.lock @@ -143,11 +143,11 @@ ] }, "locked": { - "lastModified": 1772818138, - "narHash": "sha256-Q/zaIhzvvjCN6/oPcOsyljP0LO0RUvB90BSuDNVYNF8=", + "lastModified": 1772938270, + "narHash": "sha256-EGGrJl8GkQianhniX6dvC8VJgtzJuZz7MBQCaU4fqd0=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "594ce4b67cd089110785a9c23731f61767d233d3", + "rev": "286f28782f03dcfbd6713fce333785e9f8c754e4", "type": "github" }, "original": { @@ -274,11 +274,11 @@ ] }, "locked": { - "lastModified": 1772807318, - "narHash": "sha256-Qjw6ILt8cb2HQQpCmWNLMZZ63wEo1KjTQt+1BcQBr7k=", + "lastModified": 1772845525, + "narHash": "sha256-Dp5Ir2u4jJDGCgeMRviHvEQDe+U37hMxp6RSNOoMMPc=", "owner": "nix-community", "repo": "home-manager", - "rev": "daa2c221320809f5514edde74d0ad0193ad54ed8", + "rev": "27b93804fbef1544cb07718d3f0a451f4c4cd6c0", "type": "github" }, "original": { @@ -333,11 +333,11 @@ ] }, "locked": { - "lastModified": 1772783167, - "narHash": "sha256-yOeOq+dmcgkzLRolqAG28bA8ilj3D89vZgAIkBafC5A=", + "lastModified": 1772824805, + "narHash": "sha256-wKzFqaZEMY9u7aWYTLDXbfiIQgW8qs//CjsP90rWK3I=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "2a9a092cabc057309900943d6c69ad4728c693ed", + "rev": "d4eb38b82303760a5cbc0a8d7faf47d735ece5ef", "type": "github" }, "original": { @@ -404,11 +404,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1772806698, - "narHash": "sha256-hc6NZ0UlY5V1hHlrsCG+fJClReMJQCqW4SJ3Kq1SVK8=", + "lastModified": 1772941110, + "narHash": "sha256-krm7enK551PkiQ+JxZ0VnxPinbCa/UmoDuyvfJ6m8jc=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "a90b7a43af62a0732c7aba479fd493c777956aa0", + "rev": "3e4f40c169079e883af315f015715da8a5349043", "type": "github" }, "original": { @@ -431,11 +431,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1772698812, - "narHash": "sha256-7+K/VaZ7TXUeUGSYshg8wC3UsRZHB+M4x6r38Q1B79c=", + "lastModified": 1772884214, + "narHash": "sha256-nl1U1E9Kk9ZmxWdqcwBuFaljxknbrwq8/bY+utQSajk=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "5641625ef950f024e3e0e3f38bb91f876290c0be", + "rev": "3fc5b3670ef77356173ca5f1fa5015e01204bc33", "type": "github" }, "original": { @@ -464,11 +464,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1772207631, - "narHash": "sha256-Jkkg+KqshFO3CbTszVVpkKN2AOObYz+wMsM3ONo1z5g=", + "lastModified": 1772873827, + "narHash": "sha256-T1igKylw0ZX8+yws4dWbkrSc+hZ1bmsM+Tjs4lxMYgo=", "owner": "YaLTeR", "repo": "niri", - "rev": "e708f546153f74acf33eb183b3b2992587a701e5", + "rev": "8f75d171b6017ed34043b1255ec4ffc374bf6ab0", "type": "github" }, "original": { @@ -489,11 +489,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1772787454, - "narHash": "sha256-ZX2thoeGlLv19f7dTYXn87mJqOKs2NcmQdW9Sz+ZbPg=", + "lastModified": 1772873381, + "narHash": "sha256-KU2Qs60vsoi8ysJ6Ufae1FhMJDJXgtLGM0qSIyPc/tQ=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "1daa7d67180961e06d8fe0ef80394de5ec61fe93", + "rev": "07eab5999957583fc0ced20e83ccf9c1b097be9f", "type": "github" }, "original": { @@ -557,11 +557,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1772624091, - "narHash": "sha256-QKyJ0QGWBn6r0invrMAK8dmJoBYWoOWy7lN+UHzW1jc=", + "lastModified": 1772773019, + "narHash": "sha256-E1bxHxNKfDoQUuvriG71+f+s/NT0qWkImXsYZNFFfCs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "80bdc1e5ce51f56b19791b52b2901187931f5353", + "rev": "aca4d95fce4914b3892661bcb80b8087293536c6", "type": "github" }, "original": { @@ -579,11 +579,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1772804651, - "narHash": "sha256-90DfP4v5+DITh2C12HP4v6hMkF0o6WN5TlrcOAQeMHI=", + "lastModified": 1772925400, + "narHash": "sha256-I0Gb+CO6bXi1U5PYgCqnuvI1B+R9kZtamLwhVvOywSo=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "6b64fa11fca2f4d80625dfa0e15523ed13808cf4", + "rev": "5f319987a5003c383678f4aae0cf71f78c7ea49e", "type": "github" }, "original": { @@ -687,11 +687,11 @@ ] }, "locked": { - "lastModified": 1772775058, - "narHash": "sha256-i+I9RYN8kYb9/9kibkxd0avkkislD1tyWojSVgIy160=", + "lastModified": 1772939270, + "narHash": "sha256-HbxD5DJAKxzo0G8on5wdY+OZNiUWt3FTvGmXmVEmg7g=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "629bbb7f9d02787a54e28398b411da849246253b", + "rev": "bb93f191a07c0165992ed6d0b4197ee5c7e6e641", "type": "github" }, "original": { @@ -857,11 +857,11 @@ ] }, "locked": { - "lastModified": 1772772172, - "narHash": "sha256-OCEb6jXTvhnMTMqMLleYChekDO/zh+VtunBAS0WevPM=", + "lastModified": 1772858378, + "narHash": "sha256-VPRlTud1REOz0GPjq3XQNjk5GpH/xNbeadiul4gkPGA=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "5f8f34c0dd56808ecbfa35697353c455e4a416b3", + "rev": "42e1e9a1cb5b507789a51193113d56f8f1bb08d9", "type": "github" }, "original": { From 4137aa4c0610305827df4e699a30939b7d838549 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 9 Mar 2026 12:26:07 -0400 Subject: [PATCH 603/724] update --- flake.lock | 66 +++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index 5013965..643c152 100644 --- a/flake.lock +++ b/flake.lock @@ -120,11 +120,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1772783183, - "narHash": "sha256-YpqMWBeMQHHwlwCjXe7zU9UKU8Up7rdXTKikPsiHNJw=", + "lastModified": 1773029989, + "narHash": "sha256-7TaTwmnyRLIxDcdRKFZrXhomqBFgHwr3GSIhNWLJKH4=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "15d55259159d471f5bd329c712f1010c39e3cc37", + "rev": "dd72eac1971616a6ebe81067cca33b14c148cbcd", "type": "github" }, "original": { @@ -143,11 +143,11 @@ ] }, "locked": { - "lastModified": 1772938270, - "narHash": "sha256-EGGrJl8GkQianhniX6dvC8VJgtzJuZz7MBQCaU4fqd0=", + "lastModified": 1773048760, + "narHash": "sha256-XDpe7ylSYpP2OUkVQBZY1RmJNjSgH5RTCH0ptFl7J/Y=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "286f28782f03dcfbd6713fce333785e9f8c754e4", + "rev": "a0c56789c42102f02795a7cfe2623b5600d2d356", "type": "github" }, "original": { @@ -274,11 +274,11 @@ ] }, "locked": { - "lastModified": 1772845525, - "narHash": "sha256-Dp5Ir2u4jJDGCgeMRviHvEQDe+U37hMxp6RSNOoMMPc=", + "lastModified": 1772985285, + "narHash": "sha256-wEEmvfqJcl9J0wyMgMrj1TixOgInBW/6tLPhWGoZE3s=", "owner": "nix-community", "repo": "home-manager", - "rev": "27b93804fbef1544cb07718d3f0a451f4c4cd6c0", + "rev": "5be5d8245cbc7bc0c09fbb5f38f23f223c543f85", "type": "github" }, "original": { @@ -404,11 +404,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1772941110, - "narHash": "sha256-krm7enK551PkiQ+JxZ0VnxPinbCa/UmoDuyvfJ6m8jc=", + "lastModified": 1773068014, + "narHash": "sha256-5WOIh+mgU1TLBVLOCgJDc3vSlx20saK+VYVZTl6MkSo=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "3e4f40c169079e883af315f015715da8a5349043", + "rev": "51efc59e9d492d10a2d85d57ba764898df71d0b9", "type": "github" }, "original": { @@ -431,11 +431,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1772884214, - "narHash": "sha256-nl1U1E9Kk9ZmxWdqcwBuFaljxknbrwq8/bY+utQSajk=", + "lastModified": 1773054080, + "narHash": "sha256-wNuvInrOs6sivWkYoVPc3bLHAoYZ/3L3tBj0VDFNipc=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "3fc5b3670ef77356173ca5f1fa5015e01204bc33", + "rev": "2a4de8b0b82d7879dc733cecc7233674441f7087", "type": "github" }, "original": { @@ -464,11 +464,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1772873827, - "narHash": "sha256-T1igKylw0ZX8+yws4dWbkrSc+hZ1bmsM+Tjs4lxMYgo=", + "lastModified": 1773048363, + "narHash": "sha256-36/JS195C94HUdTWfwYb1mYsorJZ8lj37qXUPcSvRkc=", "owner": "YaLTeR", "repo": "niri", - "rev": "8f75d171b6017ed34043b1255ec4ffc374bf6ab0", + "rev": "bf142e0b48d9ffc9a776a82585ee37ac35f07f0c", "type": "github" }, "original": { @@ -489,11 +489,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1772873381, - "narHash": "sha256-KU2Qs60vsoi8ysJ6Ufae1FhMJDJXgtLGM0qSIyPc/tQ=", + "lastModified": 1773047055, + "narHash": "sha256-KqUtQ/Rn05NPUOU6KwPT5GfZCcH+LNw4zzXVci4HPnc=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "07eab5999957583fc0ced20e83ccf9c1b097be9f", + "rev": "bbb63b1600ac4c26b97fea629323c7fb9859498e", "type": "github" }, "original": { @@ -541,11 +541,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1771969195, - "narHash": "sha256-qwcDBtrRvJbrrnv1lf/pREQi8t2hWZxVAyeMo7/E9sw=", + "lastModified": 1772972630, + "narHash": "sha256-mUJxsNOrBMNOUJzN0pfdVJ1r2pxeqm9gI/yIKXzVVbk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "41c6b421bdc301b2624486e11905c9af7b8ec68e", + "rev": "3966ce987e1a9a164205ac8259a5fe8a64528f72", "type": "github" }, "original": { @@ -579,11 +579,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1772925400, - "narHash": "sha256-I0Gb+CO6bXi1U5PYgCqnuvI1B+R9kZtamLwhVvOywSo=", + "lastModified": 1773072922, + "narHash": "sha256-Uy4eH1ANTNHH19fjiFZNdET9bV5aKtxuU4phgG4l+UY=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "5f319987a5003c383678f4aae0cf71f78c7ea49e", + "rev": "4d0897d6ed672d2d39b9805bb718ae55c5dbd117", "type": "github" }, "original": { @@ -687,11 +687,11 @@ ] }, "locked": { - "lastModified": 1772939270, - "narHash": "sha256-HbxD5DJAKxzo0G8on5wdY+OZNiUWt3FTvGmXmVEmg7g=", + "lastModified": 1773025773, + "narHash": "sha256-Wik8+xApNfldpUFjPmJkPdg0RrvUPSWGIZis+A/0N1w=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "bb93f191a07c0165992ed6d0b4197ee5c7e6e641", + "rev": "3c06fdbbd36ff60386a1e590ee0cd52dcd1892bf", "type": "github" }, "original": { @@ -857,11 +857,11 @@ ] }, "locked": { - "lastModified": 1772858378, - "narHash": "sha256-VPRlTud1REOz0GPjq3XQNjk5GpH/xNbeadiul4gkPGA=", + "lastModified": 1772945022, + "narHash": "sha256-Fv14NttjL/7xfi6eVwrSEBAyBvDjI00RLiRNqA5apcw=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "42e1e9a1cb5b507789a51193113d56f8f1bb08d9", + "rev": "3a6a5ca7fb48cc8fd8183386506a06579d1d79dc", "type": "github" }, "original": { From fdf23ebe2211f7e511a49bae592befe761d3240e Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 9 Mar 2026 13:13:59 -0400 Subject: [PATCH 604/724] oh-my-opencode: move to my llm-agents.nix fork --- flake.lock | 67 +++------------------------------ flake.nix | 8 +--- home-manager/progs/opencode.nix | 27 ++----------- 3 files changed, 11 insertions(+), 91 deletions(-) diff --git a/flake.lock b/flake.lock index 643c152..2f8adee 100644 --- a/flake.lock +++ b/flake.lock @@ -227,24 +227,6 @@ "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": [ @@ -404,15 +386,16 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1773068014, - "narHash": "sha256-5WOIh+mgU1TLBVLOCgJDc3vSlx20saK+VYVZTl6MkSo=", - "owner": "numtide", + "lastModified": 1773075920, + "narHash": "sha256-3ebydDinuiBxpJS2d8mAbbnbvhIYTKflOtQRxXR4XhA=", + "owner": "Titaniumtown", "repo": "llm-agents.nix", - "rev": "51efc59e9d492d10a2d85d57ba764898df71d0b9", + "rev": "838a33179e2364e010ed1dd16cb9ca95998f4237", "type": "github" }, "original": { - "owner": "numtide", + "owner": "Titaniumtown", + "ref": "pr/oh-my-opencode", "repo": "llm-agents.nix", "type": "github" } @@ -613,28 +596,6 @@ "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", @@ -675,7 +636,6 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "noctalia": "noctalia", - "oh-my-opencode": "oh-my-opencode", "rust-overlay": "rust-overlay", "zen-browser": "zen-browser" } @@ -760,21 +720,6 @@ "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": [ diff --git a/flake.nix b/flake.nix index 6d4004d..c821f09 100644 --- a/flake.nix +++ b/flake.nix @@ -75,13 +75,7 @@ }; 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"; + url = "github:Titaniumtown/llm-agents.nix/pr/oh-my-opencode"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index 3970752..36124cb 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -41,29 +41,10 @@ let }; 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.packages = [ + inputs.llm-agents.packages.${pkgs.stdenv.hostPlatform.system}.oh-my-opencode + pkgs.playwright-driver.browsers + ]; home.sessionVariables = { PLAYWRIGHT_BROWSERS_PATH = "${pkgs.playwright-driver.browsers}"; From 1b79e129253cbe0f099fca22da119febb6928a14 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 9 Mar 2026 15:24:17 -0400 Subject: [PATCH 605/724] update --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 2f8adee..0a25c6e 100644 --- a/flake.lock +++ b/flake.lock @@ -143,11 +143,11 @@ ] }, "locked": { - "lastModified": 1773048760, - "narHash": "sha256-XDpe7ylSYpP2OUkVQBZY1RmJNjSgH5RTCH0ptFl7J/Y=", + "lastModified": 1773075553, + "narHash": "sha256-gkotfp7ATGhSftWqYZXmig4e4r5R9NLTX/E6InmrYyk=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "a0c56789c42102f02795a7cfe2623b5600d2d356", + "rev": "d7310453099e60245b42bdd372ae417fcf814d0d", "type": "github" }, "original": { @@ -540,11 +540,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1772773019, - "narHash": "sha256-E1bxHxNKfDoQUuvriG71+f+s/NT0qWkImXsYZNFFfCs=", + "lastModified": 1772963539, + "narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "aca4d95fce4914b3892661bcb80b8087293536c6", + "rev": "9dcb002ca1690658be4a04645215baea8b95f31d", "type": "github" }, "original": { @@ -562,11 +562,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1773072922, - "narHash": "sha256-Uy4eH1ANTNHH19fjiFZNdET9bV5aKtxuU4phgG4l+UY=", + "lastModified": 1773080291, + "narHash": "sha256-3rJzXUYZOvAP7HvO9Atqm4/vyj96uus7iXNOk1yuvjI=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "4d0897d6ed672d2d39b9805bb718ae55c5dbd117", + "rev": "8be7a34b46d0cd9c615ac39db4efcc4529c67802", "type": "github" }, "original": { From 113f4373f879325c2f95f80271f343ce1b6484c8 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 10 Mar 2026 12:20:01 -0400 Subject: [PATCH 606/724] opencode: use upstream llm-agents.nix package for oh-my-opencode --- flake.lock | 11 +++++------ flake.nix | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 0a25c6e..bc0dcaa 100644 --- a/flake.lock +++ b/flake.lock @@ -386,16 +386,15 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1773075920, - "narHash": "sha256-3ebydDinuiBxpJS2d8mAbbnbvhIYTKflOtQRxXR4XhA=", - "owner": "Titaniumtown", + "lastModified": 1773158563, + "narHash": "sha256-VPvwW74LAdRnq0aFxft8aSn3dyX7cR4/y34orO1ey0g=", + "owner": "numtide", "repo": "llm-agents.nix", - "rev": "838a33179e2364e010ed1dd16cb9ca95998f4237", + "rev": "1b5bb4ebc886e51cc581eadd7926a47961951a1b", "type": "github" }, "original": { - "owner": "Titaniumtown", - "ref": "pr/oh-my-opencode", + "owner": "numtide", "repo": "llm-agents.nix", "type": "github" } diff --git a/flake.nix b/flake.nix index c821f09..801a4c9 100644 --- a/flake.nix +++ b/flake.nix @@ -75,7 +75,7 @@ }; llm-agents = { - url = "github:Titaniumtown/llm-agents.nix/pr/oh-my-opencode"; + url = "github:numtide/llm-agents.nix"; inputs.nixpkgs.follows = "nixpkgs"; }; From 1ee6356b57bf49509c535eb7c2a6765f6f0973af Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 10 Mar 2026 14:01:52 -0400 Subject: [PATCH 607/724] add dig --- home-manager/no-gui.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 8117961..a184713 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -107,6 +107,9 @@ let units jq + + # DNS things + dig ]; in From 886ac5e91d26a589990d16570e85909e228ccf34 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 10 Mar 2026 19:14:36 -0400 Subject: [PATCH 608/724] opencode: fix qwen3-vl-30b-a3b-thinking --- home-manager/progs/opencode.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index 36124cb..270ed18 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -175,6 +175,7 @@ in openrouter = { models = { "openai/gpt-oss-20b:free" = { }; + "qwen/qwen3-vl-30b-a3b-thinking" = { }; }; options = { # TODO! use agenix here instead From 963e046a936f1d28deb010ce31cdfdeb7f7bd2c8 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 11 Mar 2026 20:26:05 -0400 Subject: [PATCH 609/724] opencode: temp fix multimodal-looker --- home-manager/progs/opencode.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index 270ed18..8cc3957 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -20,7 +20,7 @@ let oracle.model = opus-model; librarian.model = haiku-model; explore.model = haiku-model; - multimodal-looker.model = "openrouter/qwen/qwen3-vl-30b-a3b-thinking"; + multimodal-looker.model = "anthropic/claude-opus-4.6"; prometheus.model = opus-model; metis.model = opus-model; From 3f5019aa05c8b1c6c6f38eac26a7e7b20e7b49d6 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 12 Mar 2026 01:12:58 -0400 Subject: [PATCH 610/724] update --- flake.lock | 90 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 53 insertions(+), 37 deletions(-) diff --git a/flake.lock b/flake.lock index bc0dcaa..1856782 100644 --- a/flake.lock +++ b/flake.lock @@ -120,11 +120,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1773029989, - "narHash": "sha256-7TaTwmnyRLIxDcdRKFZrXhomqBFgHwr3GSIhNWLJKH4=", + "lastModified": 1773217367, + "narHash": "sha256-6MMMwJwB/izkcXWX3tYjqVVGGnHcomuTKi+NPOgoGa0=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "dd72eac1971616a6ebe81067cca33b14c148cbcd", + "rev": "379d7d714768d19bb596bb96a7da7c86ebb191a6", "type": "github" }, "original": { @@ -143,11 +143,11 @@ ] }, "locked": { - "lastModified": 1773075553, - "narHash": "sha256-gkotfp7ATGhSftWqYZXmig4e4r5R9NLTX/E6InmrYyk=", + "lastModified": 1773281054, + "narHash": "sha256-BcL7qrh2xokyqQaQl3AVmqXun5jo1TRIr2+1cSvu57Y=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "d7310453099e60245b42bdd372ae417fcf814d0d", + "rev": "419fe196067af8368fb470f91cbcb5b33ecfdaa1", "type": "github" }, "original": { @@ -256,11 +256,11 @@ ] }, "locked": { - "lastModified": 1772985285, - "narHash": "sha256-wEEmvfqJcl9J0wyMgMrj1TixOgInBW/6tLPhWGoZE3s=", + "lastModified": 1773286336, + "narHash": "sha256-+yFtmhOHterllxWmV6YbdevTXpJdGS0mS0UmJ0k9fh0=", "owner": "nix-community", "repo": "home-manager", - "rev": "5be5d8245cbc7bc0c09fbb5f38f23f223c543f85", + "rev": "7d06e0cefe6e4a1e85b2b3274dcb0b3da242a557", "type": "github" }, "original": { @@ -315,11 +315,11 @@ ] }, "locked": { - "lastModified": 1772824805, - "narHash": "sha256-wKzFqaZEMY9u7aWYTLDXbfiIQgW8qs//CjsP90rWK3I=", + "lastModified": 1773237643, + "narHash": "sha256-L1/RhR9gBGon3+vUwt8LxFnkwBqZMNdQTHnjwGodjtw=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "d4eb38b82303760a5cbc0a8d7faf47d735ece5ef", + "rev": "cff48bb8dad9d56abd761825d02b892c543a1f38", "type": "github" }, "original": { @@ -386,11 +386,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1773158563, - "narHash": "sha256-VPvwW74LAdRnq0aFxft8aSn3dyX7cR4/y34orO1ey0g=", + "lastModified": 1773285537, + "narHash": "sha256-aR7njawsQYJ2M2S9wdi1iQrAABDYbULQSmeTrDJDq1o=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "1b5bb4ebc886e51cc581eadd7926a47961951a1b", + "rev": "6f1514d13eb203b774b1c8485bde5282956fff96", "type": "github" }, "original": { @@ -413,11 +413,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1773054080, - "narHash": "sha256-wNuvInrOs6sivWkYoVPc3bLHAoYZ/3L3tBj0VDFNipc=", + "lastModified": 1773170801, + "narHash": "sha256-TB9/4xKh8tZcbOtxlHB24EO4NlEIorxtcL3L7LOWLqA=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "2a4de8b0b82d7879dc733cecc7233674441f7087", + "rev": "5336c8d137d1a3ad055e83fa08dcb17c1f2b9444", "type": "github" }, "original": { @@ -446,11 +446,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1773048363, - "narHash": "sha256-36/JS195C94HUdTWfwYb1mYsorJZ8lj37qXUPcSvRkc=", + "lastModified": 1773130184, + "narHash": "sha256-3bwx4WqCB06yfQIGB+OgIckOkEDyKxiTD5pOo4Xz2rI=", "owner": "YaLTeR", "repo": "niri", - "rev": "bf142e0b48d9ffc9a776a82585ee37ac35f07f0c", + "rev": "b07bde3ee82dd73115e6b949e4f3f63695da35ea", "type": "github" }, "original": { @@ -471,11 +471,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1773047055, - "narHash": "sha256-KqUtQ/Rn05NPUOU6KwPT5GfZCcH+LNw4zzXVci4HPnc=", + "lastModified": 1773219742, + "narHash": "sha256-ABDUQZoEYe/i2B7vqsEh26xJxMFj7xGSHUcALCJvo80=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "bbb63b1600ac4c26b97fea629323c7fb9859498e", + "rev": "bf8b2ee1d08d25671bdcccef83ea482569b6a667", "type": "github" }, "original": { @@ -561,11 +561,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1773080291, - "narHash": "sha256-3rJzXUYZOvAP7HvO9Atqm4/vyj96uus7iXNOk1yuvjI=", + "lastModified": 1773289111, + "narHash": "sha256-TRnl+dxWHhZoegmytuFM2d0r1+DM6gB3L+maAkjJPCc=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "8be7a34b46d0cd9c615ac39db4efcc4529c67802", + "rev": "3cdd999664bfb922a8d389494e43bd570e63144c", "type": "github" }, "original": { @@ -579,14 +579,15 @@ "nixpkgs": [ "noctalia", "nixpkgs" - ] + ], + "systems": "systems_5" }, "locked": { - "lastModified": 1772673824, - "narHash": "sha256-TLHXPoELZA6VeuzC1Zpx+MnSsYzrJs+DSieMgfjAOJc=", + "lastModified": 1773175685, + "narHash": "sha256-YOkWzVq7opym1ovJvSCvqpG6OCDGJwPo/EPeRxcGay4=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "f8531192cd09b9ea2e78d18e9cfc9d3dba498690", + "rev": "6b9eceefde3d47ca83c544b54bcdd358be4cbd2f", "type": "github" }, "original": { @@ -646,11 +647,11 @@ ] }, "locked": { - "lastModified": 1773025773, - "narHash": "sha256-Wik8+xApNfldpUFjPmJkPdg0RrvUPSWGIZis+A/0N1w=", + "lastModified": 1773284828, + "narHash": "sha256-0qI+a9z7KpYCBbp4ENN32b2tf0VmC3MhgFw1KAroqxQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "3c06fdbbd36ff60386a1e590ee0cd52dcd1892bf", + "rev": "2b18fe48d9a8a4ff3850d56b67cfe72f2a589237", "type": "github" }, "original": { @@ -719,6 +720,21 @@ "type": "github" } }, + "systems_5": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -801,11 +817,11 @@ ] }, "locked": { - "lastModified": 1772945022, - "narHash": "sha256-Fv14NttjL/7xfi6eVwrSEBAyBvDjI00RLiRNqA5apcw=", + "lastModified": 1773290887, + "narHash": "sha256-L1yMYmFffHfZNP+hKJGRBmrFKkn/VDhu7jEbVftBQuM=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "3a6a5ca7fb48cc8fd8183386506a06579d1d79dc", + "rev": "9346698c4562819f61b4e5097151ec0b17729fab", "type": "github" }, "original": { From 1e90496cccd736615bf3dd5daa043ed8444036a1 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 12 Mar 2026 10:48:30 -0400 Subject: [PATCH 611/724] update --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 1856782..0d62ec8 100644 --- a/flake.lock +++ b/flake.lock @@ -120,11 +120,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1773217367, - "narHash": "sha256-6MMMwJwB/izkcXWX3tYjqVVGGnHcomuTKi+NPOgoGa0=", + "lastModified": 1773305487, + "narHash": "sha256-hs4jcJwji2+RQNfDh5tdFDSdtJhRK6rxjqyOHSqrg90=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "379d7d714768d19bb596bb96a7da7c86ebb191a6", + "rev": "f8329b44f7effa142759365b57f65fd9376c19fa", "type": "github" }, "original": { @@ -143,11 +143,11 @@ ] }, "locked": { - "lastModified": 1773281054, - "narHash": "sha256-BcL7qrh2xokyqQaQl3AVmqXun5jo1TRIr2+1cSvu57Y=", + "lastModified": 1773307905, + "narHash": "sha256-FpXEzY0VNGLbCN3KmZJS3mEy+pG5GiRjnMOCUVIMaq4=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "419fe196067af8368fb470f91cbcb5b33ecfdaa1", + "rev": "8166f96d36cc75e32e0aef7c26236b8a6f43a9c4", "type": "github" }, "original": { @@ -256,11 +256,11 @@ ] }, "locked": { - "lastModified": 1773286336, - "narHash": "sha256-+yFtmhOHterllxWmV6YbdevTXpJdGS0mS0UmJ0k9fh0=", + "lastModified": 1773324064, + "narHash": "sha256-CxgWYEenlf1z5KmbUSnBJ10rwfcV5Hbc00arXA6AMJc=", "owner": "nix-community", "repo": "home-manager", - "rev": "7d06e0cefe6e4a1e85b2b3274dcb0b3da242a557", + "rev": "7cd3093fc6a08f72b42761a37891624812859453", "type": "github" }, "original": { @@ -386,11 +386,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1773285537, - "narHash": "sha256-aR7njawsQYJ2M2S9wdi1iQrAABDYbULQSmeTrDJDq1o=", + "lastModified": 1773325712, + "narHash": "sha256-s83aVJRJmR2sa9otxXnefohasKuRJACZv7zDh0FHzdg=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "6f1514d13eb203b774b1c8485bde5282956fff96", + "rev": "dfe7089b3cb1766cf40dccd4378f240356bcf2b2", "type": "github" }, "original": { @@ -413,11 +413,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1773170801, - "narHash": "sha256-TB9/4xKh8tZcbOtxlHB24EO4NlEIorxtcL3L7LOWLqA=", + "lastModified": 1773303738, + "narHash": "sha256-qrl74wNFMTUzA8z6nSEWNjQcJI/MQEWdWu2Wn+u4Ctg=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "5336c8d137d1a3ad055e83fa08dcb17c1f2b9444", + "rev": "329df7671b7859abd1cbca5d5af296ed6dc22b46", "type": "github" }, "original": { @@ -471,11 +471,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1773219742, - "narHash": "sha256-ABDUQZoEYe/i2B7vqsEh26xJxMFj7xGSHUcALCJvo80=", + "lastModified": 1773306242, + "narHash": "sha256-Ksf9be4P2cPzyGfA8m6F0dJfC5h1gt5xtIZk9UaU3wA=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "bf8b2ee1d08d25671bdcccef83ea482569b6a667", + "rev": "d76fbb830585d9bdfcb1fc34e26bef42227fecb8", "type": "github" }, "original": { @@ -539,11 +539,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1772963539, - "narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=", + "lastModified": 1773122722, + "narHash": "sha256-FIqHByVqxCprNjor1NqF80F2QQoiiyqanNNefdlvOg4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9dcb002ca1690658be4a04645215baea8b95f31d", + "rev": "62dc67aa6a52b4364dd75994ec00b51fbf474e50", "type": "github" }, "original": { @@ -561,11 +561,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1773289111, - "narHash": "sha256-TRnl+dxWHhZoegmytuFM2d0r1+DM6gB3L+maAkjJPCc=", + "lastModified": 1773326851, + "narHash": "sha256-Ui6vjBF+iHuNgJUuS0Tc6xPZ2V+RBvgT4RSnlrVyrH4=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "3cdd999664bfb922a8d389494e43bd570e63144c", + "rev": "683e61744771263babc3fb6d3c270e273d3bf8e7", "type": "github" }, "original": { @@ -743,11 +743,11 @@ ] }, "locked": { - "lastModified": 1772660329, - "narHash": "sha256-IjU1FxYqm+VDe5qIOxoW+pISBlGvVApRjiw/Y/ttJzY=", + "lastModified": 1773297127, + "narHash": "sha256-6E/yhXP7Oy/NbXtf1ktzmU8SdVqJQ09HC/48ebEGBpk=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "3710e0e1218041bbad640352a0440114b1e10428", + "rev": "71b125cd05fbfd78cab3e070b73544abe24c5016", "type": "github" }, "original": { From 5a830ceb3220883c2ddde219f7342018cbfb29e8 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 12 Mar 2026 12:49:02 -0400 Subject: [PATCH 612/724] back to claude --- home-manager/progs/opencode.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index 8cc3957..5ef4a26 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -7,9 +7,9 @@ }: let # what model should be used in place of haiku? - haiku-model = "zai-coding-plan/glm-5"; + haiku-model = "anthropic/claude-haiku-4-5"; - opus-model = "zai-coding-plan/glm-5"; + opus-model = "anthropic/claude-opus-4-6"; ohMyOpencodeConfig = { "$schema" = @@ -20,7 +20,7 @@ let oracle.model = opus-model; librarian.model = haiku-model; explore.model = haiku-model; - multimodal-looker.model = "anthropic/claude-opus-4.6"; + multimodal-looker.model = "anthropic/claude-opus-4-6"; prometheus.model = opus-model; metis.model = opus-model; From d6e95111284f6b381cc4e671877fc4075785e7ad Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 13 Mar 2026 12:08:19 -0400 Subject: [PATCH 613/724] update --- flake.lock | 78 +++++++++++++++++++++++++++--------------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/flake.lock b/flake.lock index 0d62ec8..e8cac05 100644 --- a/flake.lock +++ b/flake.lock @@ -61,11 +61,11 @@ }, "crane": { "locked": { - "lastModified": 1771796463, - "narHash": "sha256-9bCDuUzpwJXcHMQYMS1yNuzYMmKO/CCwCexpjWOl62I=", + "lastModified": 1772080396, + "narHash": "sha256-84W9UNtSk9DNMh43WBkOjpkbfODlmg+RDi854PnNgLE=", "owner": "ipetkov", "repo": "crane", - "rev": "3d3de3313e263e04894f284ac18177bd26169bad", + "rev": "8525580bc0316c39dbfa18bd09a1331e98c9e463", "type": "github" }, "original": { @@ -120,11 +120,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1773305487, - "narHash": "sha256-hs4jcJwji2+RQNfDh5tdFDSdtJhRK6rxjqyOHSqrg90=", + "lastModified": 1773347377, + "narHash": "sha256-iRUtmc+RfmeJch3ySu3SNfP9ZaWAmIbF8545O+4KbLo=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "f8329b44f7effa142759365b57f65fd9376c19fa", + "rev": "f2257c3fa98ebbe964b5af74513e64b35ca427f4", "type": "github" }, "original": { @@ -143,11 +143,11 @@ ] }, "locked": { - "lastModified": 1773307905, - "narHash": "sha256-FpXEzY0VNGLbCN3KmZJS3mEy+pG5GiRjnMOCUVIMaq4=", + "lastModified": 1773394074, + "narHash": "sha256-840LKy3agH0n84cRrvQul7ccbcQJAVZlVryq+RBawD8=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "8166f96d36cc75e32e0aef7c26236b8a6f43a9c4", + "rev": "3bd386f244f04071005f586b2babc8d19eed329d", "type": "github" }, "original": { @@ -256,11 +256,11 @@ ] }, "locked": { - "lastModified": 1773324064, - "narHash": "sha256-CxgWYEenlf1z5KmbUSnBJ10rwfcV5Hbc00arXA6AMJc=", + "lastModified": 1773367248, + "narHash": "sha256-FFMc1uAwy2GYasd0rdNDVxKyAgzuoJH2M+GglBQbqf0=", "owner": "nix-community", "repo": "home-manager", - "rev": "7cd3093fc6a08f72b42761a37891624812859453", + "rev": "be0c641a6a5564caa33982faa1fe2c60d92131c7", "type": "github" }, "original": { @@ -315,11 +315,11 @@ ] }, "locked": { - "lastModified": 1773237643, - "narHash": "sha256-L1/RhR9gBGon3+vUwt8LxFnkwBqZMNdQTHnjwGodjtw=", + "lastModified": 1773380813, + "narHash": "sha256-6GDKki2AIkWgnnTGA1enQB3I1mI6rdPe4rrXafmmIiY=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "cff48bb8dad9d56abd761825d02b892c543a1f38", + "rev": "8347eae3a900c26b8223ee98697f30f4e88dc226", "type": "github" }, "original": { @@ -361,11 +361,11 @@ ] }, "locked": { - "lastModified": 1772216104, - "narHash": "sha256-1TnGN26vnCEQk5m4AavJZxGZTb/6aZyphemRPRwFUfs=", + "lastModified": 1773344150, + "narHash": "sha256-JSsXufJy2zdg5XS5pRGlkwF1dqN+sWPmCgrvJsnhEzg=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "dbe5112de965bbbbff9f0729a9789c20a65ab047", + "rev": "d21013305ef39e1d9d2d06b161c3785ffad82281", "type": "github" }, "original": { @@ -386,11 +386,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1773325712, - "narHash": "sha256-s83aVJRJmR2sa9otxXnefohasKuRJACZv7zDh0FHzdg=", + "lastModified": 1773412360, + "narHash": "sha256-d6FY3t40JRc3nNZUu40rhfcMrOlVQeXGjUvzG/l0G8M=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "dfe7089b3cb1766cf40dccd4378f240356bcf2b2", + "rev": "a638ae24d87ea4bb42f57416c0b3c75d980e810d", "type": "github" }, "original": { @@ -413,11 +413,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1773303738, - "narHash": "sha256-qrl74wNFMTUzA8z6nSEWNjQcJI/MQEWdWu2Wn+u4Ctg=", + "lastModified": 1773390002, + "narHash": "sha256-0RVjh9h0sgPHngxEs/Wd2/xdGsgKgZWjxFu5JsX3ASw=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "329df7671b7859abd1cbca5d5af296ed6dc22b46", + "rev": "adc63b19724247f947385381481effd225a6e2fc", "type": "github" }, "original": { @@ -471,11 +471,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1773306242, - "narHash": "sha256-Ksf9be4P2cPzyGfA8m6F0dJfC5h1gt5xtIZk9UaU3wA=", + "lastModified": 1773398320, + "narHash": "sha256-sMrDN0ao5De8adYVl7yPQurGpLTLQZ1vdbHh3ClFcw8=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "d76fbb830585d9bdfcb1fc34e26bef42227fecb8", + "rev": "9f275c681e22a663483a1e9018e7b55749f618a5", "type": "github" }, "original": { @@ -539,11 +539,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1773122722, - "narHash": "sha256-FIqHByVqxCprNjor1NqF80F2QQoiiyqanNNefdlvOg4=", + "lastModified": 1773282481, + "narHash": "sha256-b/GV2ysM8mKHhinse2wz+uP37epUrSE+sAKXy/xvBY4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "62dc67aa6a52b4364dd75994ec00b51fbf474e50", + "rev": "fe416aaedd397cacb33a610b33d60ff2b431b127", "type": "github" }, "original": { @@ -561,11 +561,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1773326851, - "narHash": "sha256-Ui6vjBF+iHuNgJUuS0Tc6xPZ2V+RBvgT4RSnlrVyrH4=", + "lastModified": 1773417435, + "narHash": "sha256-D07V2nOpP3dvibI9Odr4UggaHEvDFNUIygshxt/MC7I=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "683e61744771263babc3fb6d3c270e273d3bf8e7", + "rev": "3c9524a029fdf4e7d774ccdd7893dbfb83fd032a", "type": "github" }, "original": { @@ -606,11 +606,11 @@ ] }, "locked": { - "lastModified": 1771858127, - "narHash": "sha256-Gtre9YoYl3n25tJH2AoSdjuwcqij5CPxL3U3xysYD08=", + "lastModified": 1772024342, + "narHash": "sha256-+eXlIc4/7dE6EcPs9a2DaSY3fTA9AE526hGqkNID3Wg=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "49bbbfc218bf3856dfa631cead3b052d78248b83", + "rev": "6e34e97ed9788b17796ee43ccdbaf871a5c2b476", "type": "github" }, "original": { @@ -647,11 +647,11 @@ ] }, "locked": { - "lastModified": 1773284828, - "narHash": "sha256-0qI+a9z7KpYCBbp4ENN32b2tf0VmC3MhgFw1KAroqxQ=", + "lastModified": 1773371126, + "narHash": "sha256-SGnZQO8hnynR90Lo/1MVrTScsOPx9i26XjqSqoFOZ4E=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "2b18fe48d9a8a4ff3850d56b67cfe72f2a589237", + "rev": "475826b105eb52f39bd3281f60c052299e64d085", "type": "github" }, "original": { From 525e5a9771705129a1ce530096af70b3253b4e0a Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 15 Mar 2026 13:26:43 -0400 Subject: [PATCH 614/724] Revert "update" This reverts commit d6e95111284f6b381cc4e671877fc4075785e7ad. --- flake.lock | 78 +++++++++++++++++++++++++++--------------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/flake.lock b/flake.lock index e8cac05..0d62ec8 100644 --- a/flake.lock +++ b/flake.lock @@ -61,11 +61,11 @@ }, "crane": { "locked": { - "lastModified": 1772080396, - "narHash": "sha256-84W9UNtSk9DNMh43WBkOjpkbfODlmg+RDi854PnNgLE=", + "lastModified": 1771796463, + "narHash": "sha256-9bCDuUzpwJXcHMQYMS1yNuzYMmKO/CCwCexpjWOl62I=", "owner": "ipetkov", "repo": "crane", - "rev": "8525580bc0316c39dbfa18bd09a1331e98c9e463", + "rev": "3d3de3313e263e04894f284ac18177bd26169bad", "type": "github" }, "original": { @@ -120,11 +120,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1773347377, - "narHash": "sha256-iRUtmc+RfmeJch3ySu3SNfP9ZaWAmIbF8545O+4KbLo=", + "lastModified": 1773305487, + "narHash": "sha256-hs4jcJwji2+RQNfDh5tdFDSdtJhRK6rxjqyOHSqrg90=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "f2257c3fa98ebbe964b5af74513e64b35ca427f4", + "rev": "f8329b44f7effa142759365b57f65fd9376c19fa", "type": "github" }, "original": { @@ -143,11 +143,11 @@ ] }, "locked": { - "lastModified": 1773394074, - "narHash": "sha256-840LKy3agH0n84cRrvQul7ccbcQJAVZlVryq+RBawD8=", + "lastModified": 1773307905, + "narHash": "sha256-FpXEzY0VNGLbCN3KmZJS3mEy+pG5GiRjnMOCUVIMaq4=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "3bd386f244f04071005f586b2babc8d19eed329d", + "rev": "8166f96d36cc75e32e0aef7c26236b8a6f43a9c4", "type": "github" }, "original": { @@ -256,11 +256,11 @@ ] }, "locked": { - "lastModified": 1773367248, - "narHash": "sha256-FFMc1uAwy2GYasd0rdNDVxKyAgzuoJH2M+GglBQbqf0=", + "lastModified": 1773324064, + "narHash": "sha256-CxgWYEenlf1z5KmbUSnBJ10rwfcV5Hbc00arXA6AMJc=", "owner": "nix-community", "repo": "home-manager", - "rev": "be0c641a6a5564caa33982faa1fe2c60d92131c7", + "rev": "7cd3093fc6a08f72b42761a37891624812859453", "type": "github" }, "original": { @@ -315,11 +315,11 @@ ] }, "locked": { - "lastModified": 1773380813, - "narHash": "sha256-6GDKki2AIkWgnnTGA1enQB3I1mI6rdPe4rrXafmmIiY=", + "lastModified": 1773237643, + "narHash": "sha256-L1/RhR9gBGon3+vUwt8LxFnkwBqZMNdQTHnjwGodjtw=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "8347eae3a900c26b8223ee98697f30f4e88dc226", + "rev": "cff48bb8dad9d56abd761825d02b892c543a1f38", "type": "github" }, "original": { @@ -361,11 +361,11 @@ ] }, "locked": { - "lastModified": 1773344150, - "narHash": "sha256-JSsXufJy2zdg5XS5pRGlkwF1dqN+sWPmCgrvJsnhEzg=", + "lastModified": 1772216104, + "narHash": "sha256-1TnGN26vnCEQk5m4AavJZxGZTb/6aZyphemRPRwFUfs=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "d21013305ef39e1d9d2d06b161c3785ffad82281", + "rev": "dbe5112de965bbbbff9f0729a9789c20a65ab047", "type": "github" }, "original": { @@ -386,11 +386,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1773412360, - "narHash": "sha256-d6FY3t40JRc3nNZUu40rhfcMrOlVQeXGjUvzG/l0G8M=", + "lastModified": 1773325712, + "narHash": "sha256-s83aVJRJmR2sa9otxXnefohasKuRJACZv7zDh0FHzdg=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "a638ae24d87ea4bb42f57416c0b3c75d980e810d", + "rev": "dfe7089b3cb1766cf40dccd4378f240356bcf2b2", "type": "github" }, "original": { @@ -413,11 +413,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1773390002, - "narHash": "sha256-0RVjh9h0sgPHngxEs/Wd2/xdGsgKgZWjxFu5JsX3ASw=", + "lastModified": 1773303738, + "narHash": "sha256-qrl74wNFMTUzA8z6nSEWNjQcJI/MQEWdWu2Wn+u4Ctg=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "adc63b19724247f947385381481effd225a6e2fc", + "rev": "329df7671b7859abd1cbca5d5af296ed6dc22b46", "type": "github" }, "original": { @@ -471,11 +471,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1773398320, - "narHash": "sha256-sMrDN0ao5De8adYVl7yPQurGpLTLQZ1vdbHh3ClFcw8=", + "lastModified": 1773306242, + "narHash": "sha256-Ksf9be4P2cPzyGfA8m6F0dJfC5h1gt5xtIZk9UaU3wA=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "9f275c681e22a663483a1e9018e7b55749f618a5", + "rev": "d76fbb830585d9bdfcb1fc34e26bef42227fecb8", "type": "github" }, "original": { @@ -539,11 +539,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1773282481, - "narHash": "sha256-b/GV2ysM8mKHhinse2wz+uP37epUrSE+sAKXy/xvBY4=", + "lastModified": 1773122722, + "narHash": "sha256-FIqHByVqxCprNjor1NqF80F2QQoiiyqanNNefdlvOg4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fe416aaedd397cacb33a610b33d60ff2b431b127", + "rev": "62dc67aa6a52b4364dd75994ec00b51fbf474e50", "type": "github" }, "original": { @@ -561,11 +561,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1773417435, - "narHash": "sha256-D07V2nOpP3dvibI9Odr4UggaHEvDFNUIygshxt/MC7I=", + "lastModified": 1773326851, + "narHash": "sha256-Ui6vjBF+iHuNgJUuS0Tc6xPZ2V+RBvgT4RSnlrVyrH4=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "3c9524a029fdf4e7d774ccdd7893dbfb83fd032a", + "rev": "683e61744771263babc3fb6d3c270e273d3bf8e7", "type": "github" }, "original": { @@ -606,11 +606,11 @@ ] }, "locked": { - "lastModified": 1772024342, - "narHash": "sha256-+eXlIc4/7dE6EcPs9a2DaSY3fTA9AE526hGqkNID3Wg=", + "lastModified": 1771858127, + "narHash": "sha256-Gtre9YoYl3n25tJH2AoSdjuwcqij5CPxL3U3xysYD08=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "6e34e97ed9788b17796ee43ccdbaf871a5c2b476", + "rev": "49bbbfc218bf3856dfa631cead3b052d78248b83", "type": "github" }, "original": { @@ -647,11 +647,11 @@ ] }, "locked": { - "lastModified": 1773371126, - "narHash": "sha256-SGnZQO8hnynR90Lo/1MVrTScsOPx9i26XjqSqoFOZ4E=", + "lastModified": 1773284828, + "narHash": "sha256-0qI+a9z7KpYCBbp4ENN32b2tf0VmC3MhgFw1KAroqxQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "475826b105eb52f39bd3281f60c052299e64d085", + "rev": "2b18fe48d9a8a4ff3850d56b67cfe72f2a589237", "type": "github" }, "original": { From ef45e27ecc0e5c85506bf405c210f12d1e03d6d8 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 15 Mar 2026 13:27:18 -0400 Subject: [PATCH 615/724] update (except for nixpkgs) nixpkgs doesn't have a cache for nodejs-slim ??? so it tries to build on my machine, and I don't have enough ram I believe --- flake.lock | 90 +++++++++++++++++++++++++++--------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/flake.lock b/flake.lock index 0d62ec8..82fe868 100644 --- a/flake.lock +++ b/flake.lock @@ -61,11 +61,11 @@ }, "crane": { "locked": { - "lastModified": 1771796463, - "narHash": "sha256-9bCDuUzpwJXcHMQYMS1yNuzYMmKO/CCwCexpjWOl62I=", + "lastModified": 1772080396, + "narHash": "sha256-84W9UNtSk9DNMh43WBkOjpkbfODlmg+RDi854PnNgLE=", "owner": "ipetkov", "repo": "crane", - "rev": "3d3de3313e263e04894f284ac18177bd26169bad", + "rev": "8525580bc0316c39dbfa18bd09a1331e98c9e463", "type": "github" }, "original": { @@ -120,11 +120,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1773305487, - "narHash": "sha256-hs4jcJwji2+RQNfDh5tdFDSdtJhRK6rxjqyOHSqrg90=", + "lastModified": 1773347377, + "narHash": "sha256-iRUtmc+RfmeJch3ySu3SNfP9ZaWAmIbF8545O+4KbLo=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "f8329b44f7effa142759365b57f65fd9376c19fa", + "rev": "f2257c3fa98ebbe964b5af74513e64b35ca427f4", "type": "github" }, "original": { @@ -143,11 +143,11 @@ ] }, "locked": { - "lastModified": 1773307905, - "narHash": "sha256-FpXEzY0VNGLbCN3KmZJS3mEy+pG5GiRjnMOCUVIMaq4=", + "lastModified": 1773563837, + "narHash": "sha256-Nb+BBMFFbKG9rsuYBLVQ++p5P2r/LBI5U/K/6EX8fnA=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "8166f96d36cc75e32e0aef7c26236b8a6f43a9c4", + "rev": "20e4a98a43db00f7c0a17d39c8da6f9f0cfc62d9", "type": "github" }, "original": { @@ -256,11 +256,11 @@ ] }, "locked": { - "lastModified": 1773324064, - "narHash": "sha256-CxgWYEenlf1z5KmbUSnBJ10rwfcV5Hbc00arXA6AMJc=", + "lastModified": 1773422513, + "narHash": "sha256-MPjR48roW7CUMU6lu0+qQGqj92Kuh3paIulMWFZy+NQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "7cd3093fc6a08f72b42761a37891624812859453", + "rev": "ef12a9a2b0f77c8fa3dda1e7e494fca668909056", "type": "github" }, "original": { @@ -315,11 +315,11 @@ ] }, "locked": { - "lastModified": 1773237643, - "narHash": "sha256-L1/RhR9gBGon3+vUwt8LxFnkwBqZMNdQTHnjwGodjtw=", + "lastModified": 1773425725, + "narHash": "sha256-Hf7pr1RPWMc5ondGvUePv+lLhmwnFAFCk9xD/Ri3SLw=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "cff48bb8dad9d56abd761825d02b892c543a1f38", + "rev": "94908d0f543cb15dfc6ccc6dc760aa7a10267b30", "type": "github" }, "original": { @@ -361,11 +361,11 @@ ] }, "locked": { - "lastModified": 1772216104, - "narHash": "sha256-1TnGN26vnCEQk5m4AavJZxGZTb/6aZyphemRPRwFUfs=", + "lastModified": 1773344150, + "narHash": "sha256-JSsXufJy2zdg5XS5pRGlkwF1dqN+sWPmCgrvJsnhEzg=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "dbe5112de965bbbbff9f0729a9789c20a65ab047", + "rev": "d21013305ef39e1d9d2d06b161c3785ffad82281", "type": "github" }, "original": { @@ -386,11 +386,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1773325712, - "narHash": "sha256-s83aVJRJmR2sa9otxXnefohasKuRJACZv7zDh0FHzdg=", + "lastModified": 1773585334, + "narHash": "sha256-GJV6Bm/C1+3cq2L0uK0dE7F6EB6dz5N/H1GuOiwadtc=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "dfe7089b3cb1766cf40dccd4378f240356bcf2b2", + "rev": "0aa0a9a068beb125b148bf47ac45daf266dd0af3", "type": "github" }, "original": { @@ -413,11 +413,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1773303738, - "narHash": "sha256-qrl74wNFMTUzA8z6nSEWNjQcJI/MQEWdWu2Wn+u4Ctg=", + "lastModified": 1773577199, + "narHash": "sha256-Z77lGBRlueA+igtScByJ0soMRnEy5T/XG9w661OCPaw=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "329df7671b7859abd1cbca5d5af296ed6dc22b46", + "rev": "afc45f69929e5b5ab23d903b24532cfe718de6be", "type": "github" }, "original": { @@ -471,11 +471,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1773306242, - "narHash": "sha256-Ksf9be4P2cPzyGfA8m6F0dJfC5h1gt5xtIZk9UaU3wA=", + "lastModified": 1773478485, + "narHash": "sha256-vubxpEVCd+lteI4x3mGL8Olw4KjFTnC4rRA44J2C43s=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "d76fbb830585d9bdfcb1fc34e26bef42227fecb8", + "rev": "b7c270773befe69e9848ce6df6e7b4da3d73d20c", "type": "github" }, "original": { @@ -523,11 +523,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1772972630, - "narHash": "sha256-mUJxsNOrBMNOUJzN0pfdVJ1r2pxeqm9gI/yIKXzVVbk=", + "lastModified": 1773533765, + "narHash": "sha256-qonGfS2lzCgCl59Zl63jF6dIRRpvW3AJooBGMaXjHiY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3966ce987e1a9a164205ac8259a5fe8a64528f72", + "rev": "f8e82243fd601afb9f59ad230958bd073795cbfe", "type": "github" }, "original": { @@ -561,11 +561,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1773326851, - "narHash": "sha256-Ui6vjBF+iHuNgJUuS0Tc6xPZ2V+RBvgT4RSnlrVyrH4=", + "lastModified": 1773589052, + "narHash": "sha256-2W8HF9UrcrbYO8IEMWREWSvn6Z5rPJDA1XgkCMqY/xM=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "683e61744771263babc3fb6d3c270e273d3bf8e7", + "rev": "0d503343f48b634da93d8e158fd8909841ff5f3e", "type": "github" }, "original": { @@ -606,11 +606,11 @@ ] }, "locked": { - "lastModified": 1771858127, - "narHash": "sha256-Gtre9YoYl3n25tJH2AoSdjuwcqij5CPxL3U3xysYD08=", + "lastModified": 1772024342, + "narHash": "sha256-+eXlIc4/7dE6EcPs9a2DaSY3fTA9AE526hGqkNID3Wg=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "49bbbfc218bf3856dfa631cead3b052d78248b83", + "rev": "6e34e97ed9788b17796ee43ccdbaf871a5c2b476", "type": "github" }, "original": { @@ -647,11 +647,11 @@ ] }, "locked": { - "lastModified": 1773284828, - "narHash": "sha256-0qI+a9z7KpYCBbp4ENN32b2tf0VmC3MhgFw1KAroqxQ=", + "lastModified": 1773544328, + "narHash": "sha256-Iv+qez54LAz+isij4APBk31VWA//Go81hwFOXr5iWTw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "2b18fe48d9a8a4ff3850d56b67cfe72f2a589237", + "rev": "4f977d776793c8bfbfdd7eca7835847ccc48874e", "type": "github" }, "original": { @@ -794,11 +794,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1772429643, - "narHash": "sha256-M+bAeCCcjBnVk6w/4dIVvXvpJwOKnXjwi/lDbaN6Yws=", + "lastModified": 1773499041, + "narHash": "sha256-XZ4/tVdLeAYDgKe4JD4C7yYUKydMxwt8c2j6APFWcIc=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "10f985b84cdbcc3bbf35b3e7e43d1b2a84fa9ce2", + "rev": "309d8e2a29953f7465dc14c939e2afe4682c0aa9", "type": "github" }, "original": { @@ -817,11 +817,11 @@ ] }, "locked": { - "lastModified": 1773290887, - "narHash": "sha256-L1yMYmFffHfZNP+hKJGRBmrFKkn/VDhu7jEbVftBQuM=", + "lastModified": 1773588616, + "narHash": "sha256-Ukh79t1IMpP4FRsJDZ/3Y72VpW+QwNe/QRB5pTsH20Q=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "9346698c4562819f61b4e5097151ec0b17729fab", + "rev": "b34b64ee5a85ab61394c491ac3dad335d3cbfbb8", "type": "github" }, "original": { From 40e759d8ebfe67be7353791da7ead79dae7f2b02 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 16 Mar 2026 15:07:29 -0400 Subject: [PATCH 616/724] update (including nixpkgs) --- flake.lock | 97 +++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 66 insertions(+), 31 deletions(-) diff --git a/flake.lock b/flake.lock index 82fe868..b1d62fc 100644 --- a/flake.lock +++ b/flake.lock @@ -143,11 +143,11 @@ ] }, "locked": { - "lastModified": 1773563837, - "narHash": "sha256-Nb+BBMFFbKG9rsuYBLVQ++p5P2r/LBI5U/K/6EX8fnA=", + "lastModified": 1773683334, + "narHash": "sha256-7WnovunGdyavSBYaF2u5PtLEOXZz9GKitYfm/+72eMM=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "20e4a98a43db00f7c0a17d39c8da6f9f0cfc62d9", + "rev": "67f790b2a92a9a6b3c31238ed52a3c256e72101c", "type": "github" }, "original": { @@ -256,11 +256,11 @@ ] }, "locked": { - "lastModified": 1773422513, - "narHash": "sha256-MPjR48roW7CUMU6lu0+qQGqj92Kuh3paIulMWFZy+NQ=", + "lastModified": 1773681856, + "narHash": "sha256-+bRqxoFCJFO9ZTFhcCkzNXbDT3b8AEk88fyjB7Is6eo=", "owner": "nix-community", "repo": "home-manager", - "rev": "ef12a9a2b0f77c8fa3dda1e7e494fca668909056", + "rev": "57d5560ee92a424fb71fde800acd6ed2c725dfce", "type": "github" }, "original": { @@ -386,11 +386,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1773585334, - "narHash": "sha256-GJV6Bm/C1+3cq2L0uK0dE7F6EB6dz5N/H1GuOiwadtc=", + "lastModified": 1773673399, + "narHash": "sha256-JOcnmrHBA2S63kcfu20bEYnpkF0cRYE7BdZs5jMW+sY=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "0aa0a9a068beb125b148bf47ac45daf266dd0af3", + "rev": "cc1f5259ec9140bd921fc6070517f334eef36697", "type": "github" }, "original": { @@ -413,11 +413,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1773577199, - "narHash": "sha256-Z77lGBRlueA+igtScByJ0soMRnEy5T/XG9w661OCPaw=", + "lastModified": 1773675540, + "narHash": "sha256-P4S7I15rxuJ+Iq7F4Z1OrMAcZaJEiIasYNioiJjc4/s=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "afc45f69929e5b5ab23d903b24532cfe718de6be", + "rev": "9061fa226d41fceec5bcec72e0e7ee2282b5645e", "type": "github" }, "original": { @@ -539,11 +539,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1773122722, - "narHash": "sha256-FIqHByVqxCprNjor1NqF80F2QQoiiyqanNNefdlvOg4=", + "lastModified": 1773646010, + "narHash": "sha256-iYrs97hS7p5u4lQzuNWzuALGIOdkPXvjz7bviiBjUu8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "62dc67aa6a52b4364dd75994ec00b51fbf474e50", + "rev": "5b2c2d84341b2afb5647081c1386a80d7a8d8605", "type": "github" }, "original": { @@ -553,6 +553,22 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1770107345, + "narHash": "sha256-tbS0Ebx2PiA1FRW8mt8oejR0qMXmziJmPaU1d4kYY9g=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "4533d9293756b63904b7238acb84ac8fe4c8c2c4", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "noctalia": { "inputs": { "nixpkgs": [ @@ -561,11 +577,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1773589052, - "narHash": "sha256-2W8HF9UrcrbYO8IEMWREWSvn6Z5rPJDA1XgkCMqY/xM=", + "lastModified": 1773670009, + "narHash": "sha256-LEiA7ntxR6Biep4fgD2Jh9bB1g2olRNAToFUS51szDs=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "0d503343f48b634da93d8e158fd8909841ff5f3e", + "rev": "9511f1fce45ffe763d7954f3207e3dfd644c97f2", "type": "github" }, "original": { @@ -580,14 +596,15 @@ "noctalia", "nixpkgs" ], - "systems": "systems_5" + "systems": "systems_5", + "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1773175685, - "narHash": "sha256-YOkWzVq7opym1ovJvSCvqpG6OCDGJwPo/EPeRxcGay4=", + "lastModified": 1773514555, + "narHash": "sha256-XNmLf4HqUM6/he/eJiHT+Mvxmt7QuwgGU14jB4Ha+pM=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "6b9eceefde3d47ca83c544b54bcdd358be4cbd2f", + "rev": "8aa9d8ce86ef018fb442c585ad7fbb2a15a4f822", "type": "github" }, "original": { @@ -647,11 +664,11 @@ ] }, "locked": { - "lastModified": 1773544328, - "narHash": "sha256-Iv+qez54LAz+isij4APBk31VWA//Go81hwFOXr5iWTw=", + "lastModified": 1773630837, + "narHash": "sha256-zJhgAGnbVKeBMJOb9ctZm4BGS/Rnrz+5lfSXTVah4HQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "4f977d776793c8bfbfdd7eca7835847ccc48874e", + "rev": "f600ea449c7b5bb596fa1cf21c871cc5b9e31316", "type": "github" }, "original": { @@ -756,6 +773,24 @@ "type": "github" } }, + "treefmt-nix_2": { + "inputs": { + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1772660329, + "narHash": "sha256-IjU1FxYqm+VDe5qIOxoW+pISBlGvVApRjiw/Y/ttJzY=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "3710e0e1218041bbad640352a0440114b1e10428", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "utils": { "inputs": { "systems": "systems" @@ -794,11 +829,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1773499041, - "narHash": "sha256-XZ4/tVdLeAYDgKe4JD4C7yYUKydMxwt8c2j6APFWcIc=", + "lastModified": 1773622265, + "narHash": "sha256-wToKwH7IgWdGLMSIWksEDs4eumR6UbbsuPQ42r0oTXQ=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "309d8e2a29953f7465dc14c939e2afe4682c0aa9", + "rev": "a879e5e0896a326adc79c474bf457b8b99011027", "type": "github" }, "original": { @@ -817,11 +852,11 @@ ] }, "locked": { - "lastModified": 1773588616, - "narHash": "sha256-Ukh79t1IMpP4FRsJDZ/3Y72VpW+QwNe/QRB5pTsH20Q=", + "lastModified": 1773661718, + "narHash": "sha256-MYm1EKp/gbBi9wMEf7Lx0agIVnej/P61sg97EruWzrU=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "b34b64ee5a85ab61394c491ac3dad335d3cbfbb8", + "rev": "3ac6ea223b32ff63c45e3577712df991a35aaf33", "type": "github" }, "original": { From c73cf3fd7ce5e3d6bb6df800d639408a81587a29 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 17 Mar 2026 14:06:23 -0400 Subject: [PATCH 617/724] update --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index b1d62fc..979cdff 100644 --- a/flake.lock +++ b/flake.lock @@ -120,11 +120,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1773347377, - "narHash": "sha256-iRUtmc+RfmeJch3ySu3SNfP9ZaWAmIbF8545O+4KbLo=", + "lastModified": 1773626168, + "narHash": "sha256-FbI8Ugt1DuyBvG6o1w8M70srmZSmRgQfL5zMm/zqdzA=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "f2257c3fa98ebbe964b5af74513e64b35ca427f4", + "rev": "370777f398d2988ff8c3a957367c454fe7df8b44", "type": "github" }, "original": { @@ -143,11 +143,11 @@ ] }, "locked": { - "lastModified": 1773683334, - "narHash": "sha256-7WnovunGdyavSBYaF2u5PtLEOXZz9GKitYfm/+72eMM=", + "lastModified": 1773767118, + "narHash": "sha256-MoEcxqpGdlcTKZ2geW9pWT+uF7JkPmuwPL39RfL33Jc=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "67f790b2a92a9a6b3c31238ed52a3c256e72101c", + "rev": "26ab04c0ae5928d6cdd9ca866202f2a4ad2bf701", "type": "github" }, "original": { @@ -315,11 +315,11 @@ ] }, "locked": { - "lastModified": 1773425725, - "narHash": "sha256-Hf7pr1RPWMc5ondGvUePv+lLhmwnFAFCk9xD/Ri3SLw=", + "lastModified": 1773734427, + "narHash": "sha256-++kBv60TZhErAx0gHW+JbMPcrHTZNyvtqTfwyR+mZCU=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "94908d0f543cb15dfc6ccc6dc760aa7a10267b30", + "rev": "b67d0b7850a4ee02c92e4917dc88b9018adfce97", "type": "github" }, "original": { @@ -386,11 +386,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1773673399, - "narHash": "sha256-JOcnmrHBA2S63kcfu20bEYnpkF0cRYE7BdZs5jMW+sY=", + "lastModified": 1773767390, + "narHash": "sha256-8REVos3V8hBDF/j4vB4KPRP5rIQd2ukxkdrXYrlPrIg=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "cc1f5259ec9140bd921fc6070517f334eef36697", + "rev": "7509c7ed545ea3b5f11f8ed8a7efa7591157c9c8", "type": "github" }, "original": { @@ -413,11 +413,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1773675540, - "narHash": "sha256-P4S7I15rxuJ+Iq7F4Z1OrMAcZaJEiIasYNioiJjc4/s=", + "lastModified": 1773725889, + "narHash": "sha256-htkVJrtaWJS7wQSXg8d26RR6jF3Iab2bYTNfvTgv05Q=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "9061fa226d41fceec5bcec72e0e7ee2282b5645e", + "rev": "9987baf8f935a1b3b2aa89a44c13b3239ecc640e", "type": "github" }, "original": { @@ -471,11 +471,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1773478485, - "narHash": "sha256-vubxpEVCd+lteI4x3mGL8Olw4KjFTnC4rRA44J2C43s=", + "lastModified": 1773751230, + "narHash": "sha256-Jx9Y9VFCic1COMI8qBbrHrn75HQww5iF9gIqdTwHm4A=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "b7c270773befe69e9848ce6df6e7b4da3d73d20c", + "rev": "ee8c1796c8e4ba512b12f416e141d3905c9b563c", "type": "github" }, "original": { @@ -577,11 +577,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1773670009, - "narHash": "sha256-LEiA7ntxR6Biep4fgD2Jh9bB1g2olRNAToFUS51szDs=", + "lastModified": 1773755707, + "narHash": "sha256-X2Aw5PNzfcE6DpBMSKjbarAsGPA7xeJmutF/8cKChNM=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "9511f1fce45ffe763d7954f3207e3dfd644c97f2", + "rev": "23a5b1de55328ccbc9a4ed38fd30d7fdfdff2461", "type": "github" }, "original": { @@ -664,11 +664,11 @@ ] }, "locked": { - "lastModified": 1773630837, - "narHash": "sha256-zJhgAGnbVKeBMJOb9ctZm4BGS/Rnrz+5lfSXTVah4HQ=", + "lastModified": 1773716879, + "narHash": "sha256-vXCTasEzzTTd0ZGEuyle20H2hjRom66JeNr7i2ktHD0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "f600ea449c7b5bb596fa1cf21c871cc5b9e31316", + "rev": "1a9ddeb45c5751b800331363703641b84d1f41f0", "type": "github" }, "original": { @@ -852,11 +852,11 @@ ] }, "locked": { - "lastModified": 1773661718, - "narHash": "sha256-MYm1EKp/gbBi9wMEf7Lx0agIVnej/P61sg97EruWzrU=", + "lastModified": 1773737882, + "narHash": "sha256-P6k0BtT1/idYveVRdcwAZk8By9UjZW8XOMhSoS6wTBY=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "3ac6ea223b32ff63c45e3577712df991a35aaf33", + "rev": "a7f1db35d74faf04e5189b3a32f890186ace5c28", "type": "github" }, "original": { From 44e95981ed27e387d6a81df91511c3e23513f34b Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 18 Mar 2026 01:29:26 -0400 Subject: [PATCH 618/724] update --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 979cdff..980fe30 100644 --- a/flake.lock +++ b/flake.lock @@ -143,11 +143,11 @@ ] }, "locked": { - "lastModified": 1773767118, - "narHash": "sha256-MoEcxqpGdlcTKZ2geW9pWT+uF7JkPmuwPL39RfL33Jc=", + "lastModified": 1773799689, + "narHash": "sha256-28E3eEAsTpKM1DO7Kh/G7no6LgjRS9AatWlxpf7S9j8=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "26ab04c0ae5928d6cdd9ca866202f2a4ad2bf701", + "rev": "551783d72322677f386a1fa444539aa5241247c3", "type": "github" }, "original": { @@ -256,11 +256,11 @@ ] }, "locked": { - "lastModified": 1773681856, - "narHash": "sha256-+bRqxoFCJFO9ZTFhcCkzNXbDT3b8AEk88fyjB7Is6eo=", + "lastModified": 1773810247, + "narHash": "sha256-6Vz1Thy/1s7z+Rq5OfkWOBAdV4eD+OrvDs10yH6xJzQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "57d5560ee92a424fb71fde800acd6ed2c725dfce", + "rev": "d47357a4c806d18a3e853ad2699eaec3c01622e7", "type": "github" }, "original": { @@ -386,11 +386,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1773767390, - "narHash": "sha256-8REVos3V8hBDF/j4vB4KPRP5rIQd2ukxkdrXYrlPrIg=", + "lastModified": 1773806215, + "narHash": "sha256-EmtscmisuollZcAtoyrnb1RzvIf73mJ4gEitGbkGqL0=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "7509c7ed545ea3b5f11f8ed8a7efa7591157c9c8", + "rev": "e83165ec8289cbf4f7721489fb81df54797f5868", "type": "github" }, "original": { @@ -413,11 +413,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1773725889, - "narHash": "sha256-htkVJrtaWJS7wQSXg8d26RR6jF3Iab2bYTNfvTgv05Q=", + "lastModified": 1773809319, + "narHash": "sha256-ZuMZEuxqWneGaK+HAXz50JyCmtFo0neo6mp6F2NWj24=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "9987baf8f935a1b3b2aa89a44c13b3239ecc640e", + "rev": "c4ee62058cd37d7b842c3b081917f792efee9082", "type": "github" }, "original": { @@ -539,11 +539,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1773646010, - "narHash": "sha256-iYrs97hS7p5u4lQzuNWzuALGIOdkPXvjz7bviiBjUu8=", + "lastModified": 1773734432, + "narHash": "sha256-IF5ppUWh6gHGHYDbtVUyhwy/i7D261P7fWD1bPefOsw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5b2c2d84341b2afb5647081c1386a80d7a8d8605", + "rev": "cda48547b432e8d3b18b4180ba07473762ec8558", "type": "github" }, "original": { @@ -577,11 +577,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1773755707, - "narHash": "sha256-X2Aw5PNzfcE6DpBMSKjbarAsGPA7xeJmutF/8cKChNM=", + "lastModified": 1773777742, + "narHash": "sha256-3lluT9/nXWmv3yV3orSuMMgmj25wbOxy76mJzvqN/w0=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "23a5b1de55328ccbc9a4ed38fd30d7fdfdff2461", + "rev": "d9ae5e617f7f512ac7732c5cfb2538d1ae2fa594", "type": "github" }, "original": { @@ -664,11 +664,11 @@ ] }, "locked": { - "lastModified": 1773716879, - "narHash": "sha256-vXCTasEzzTTd0ZGEuyle20H2hjRom66JeNr7i2ktHD0=", + "lastModified": 1773803479, + "narHash": "sha256-GD6i1F2vrSxbsmbS92+8+x3DbHOJ+yrS78Pm4xigW4M=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "1a9ddeb45c5751b800331363703641b84d1f41f0", + "rev": "f17186f52e82ec5cf40920b58eac63b78692ac7c", "type": "github" }, "original": { From 73059edec7a1568dd5b931bda7c50d362de3f5c7 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 19 Mar 2026 09:31:58 -0400 Subject: [PATCH 619/724] update --- flake.lock | 66 +++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index 980fe30..05b1f20 100644 --- a/flake.lock +++ b/flake.lock @@ -120,11 +120,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1773626168, - "narHash": "sha256-FbI8Ugt1DuyBvG6o1w8M70srmZSmRgQfL5zMm/zqdzA=", + "lastModified": 1773876550, + "narHash": "sha256-gB8MjuySf5aTxLv+NgvmL/5IKFk3EjFe+cvum1mE8DM=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "370777f398d2988ff8c3a957367c454fe7df8b44", + "rev": "8b475fcb2574286d7f4413c22cc7902d80d21ced", "type": "github" }, "original": { @@ -143,11 +143,11 @@ ] }, "locked": { - "lastModified": 1773799689, - "narHash": "sha256-28E3eEAsTpKM1DO7Kh/G7no6LgjRS9AatWlxpf7S9j8=", + "lastModified": 1773912849, + "narHash": "sha256-j8+nTPoUiiyyMAN0bk/8AqqkApusi38laEaQ4m45KIA=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "551783d72322677f386a1fa444539aa5241247c3", + "rev": "4ce92db83efd3393ba51df6bbc06cc34f48c4475", "type": "github" }, "original": { @@ -256,11 +256,11 @@ ] }, "locked": { - "lastModified": 1773810247, - "narHash": "sha256-6Vz1Thy/1s7z+Rq5OfkWOBAdV4eD+OrvDs10yH6xJzQ=", + "lastModified": 1773898372, + "narHash": "sha256-PqeDgmyI/Df3/Mv0B81FP/ZC4KuO88YRQF5ZfeFyA4k=", "owner": "nix-community", "repo": "home-manager", - "rev": "d47357a4c806d18a3e853ad2699eaec3c01622e7", + "rev": "ecf019baf47df009937b5f8c4604cee10f410a76", "type": "github" }, "original": { @@ -315,11 +315,11 @@ ] }, "locked": { - "lastModified": 1773734427, - "narHash": "sha256-++kBv60TZhErAx0gHW+JbMPcrHTZNyvtqTfwyR+mZCU=", + "lastModified": 1773900606, + "narHash": "sha256-VcW+NF67YiEe7xkzbS3Ufb69AdU6tAciko2UumgmS5M=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "b67d0b7850a4ee02c92e4917dc88b9018adfce97", + "rev": "bfbdcd250b775ccef950db470b6cfefa5aa086cd", "type": "github" }, "original": { @@ -386,11 +386,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1773806215, - "narHash": "sha256-EmtscmisuollZcAtoyrnb1RzvIf73mJ4gEitGbkGqL0=", + "lastModified": 1773890325, + "narHash": "sha256-a+dGcpr6+LX2XKcFR5n2soeS2oS9w7zTTxb3m5a3cwY=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "e83165ec8289cbf4f7721489fb81df54797f5868", + "rev": "1b0a1d7396b2d3999b8ebe9246d97db8741438fb", "type": "github" }, "original": { @@ -413,11 +413,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1773809319, - "narHash": "sha256-ZuMZEuxqWneGaK+HAXz50JyCmtFo0neo6mp6F2NWj24=", + "lastModified": 1773889880, + "narHash": "sha256-cu23CGP+mD2wKPKaoGM7evZ1dXfjd+cjryqqqx2HloE=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "c4ee62058cd37d7b842c3b081917f792efee9082", + "rev": "63767d4572eb2e3da5e68f68de77d8f2cdeca8dd", "type": "github" }, "original": { @@ -471,11 +471,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1773751230, - "narHash": "sha256-Jx9Y9VFCic1COMI8qBbrHrn75HQww5iF9gIqdTwHm4A=", + "lastModified": 1773911054, + "narHash": "sha256-9ZC8Wk3IaWpeArY4bM+OZ/9YMkbPgTGDHhpmlXdgD+I=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "ee8c1796c8e4ba512b12f416e141d3905c9b563c", + "rev": "ae7dd228221076e7d1c18dd272ab14147d0bda07", "type": "github" }, "original": { @@ -539,11 +539,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1773734432, - "narHash": "sha256-IF5ppUWh6gHGHYDbtVUyhwy/i7D261P7fWD1bPefOsw=", + "lastModified": 1773821835, + "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cda48547b432e8d3b18b4180ba07473762ec8558", + "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0", "type": "github" }, "original": { @@ -577,11 +577,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1773777742, - "narHash": "sha256-3lluT9/nXWmv3yV3orSuMMgmj25wbOxy76mJzvqN/w0=", + "lastModified": 1773925146, + "narHash": "sha256-gccci8li5UaXsCgrgmT2TAgt1d4XJeHa9WyCkW/t6VY=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "d9ae5e617f7f512ac7732c5cfb2538d1ae2fa594", + "rev": "e08b08893e2194c0f6dc172f858e788ba825904d", "type": "github" }, "original": { @@ -600,11 +600,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1773514555, - "narHash": "sha256-XNmLf4HqUM6/he/eJiHT+Mvxmt7QuwgGU14jB4Ha+pM=", + "lastModified": 1773842483, + "narHash": "sha256-oRqz+5AbNKfUWWwN5c83CsSOsUWVGITh0HZg+wX5Q/8=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "8aa9d8ce86ef018fb442c585ad7fbb2a15a4f822", + "rev": "3962ff1e0b59ef067c57199d31271ddbf23b29cd", "type": "github" }, "original": { @@ -664,11 +664,11 @@ ] }, "locked": { - "lastModified": 1773803479, - "narHash": "sha256-GD6i1F2vrSxbsmbS92+8+x3DbHOJ+yrS78Pm4xigW4M=", + "lastModified": 1773889863, + "narHash": "sha256-tSsmZOHBgq4qfu5MNCAEsKZL1cI4avNLw2oUTXWeb74=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "f17186f52e82ec5cf40920b58eac63b78692ac7c", + "rev": "dbfd51be2692cb7022e301d14c139accb4ee63f0", "type": "github" }, "original": { From b6aca41ff32ef149bbaedefc39723b7898356206 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 19 Mar 2026 23:40:51 -0400 Subject: [PATCH 620/724] opencode: fix opencode plugins and anthropic --- flake.lock | 17 +++++++++++++++++ flake.nix | 5 +++++ home-manager/progs/opencode.nix | 17 ++++++++++++----- 3 files changed, 34 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 05b1f20..dde9d7d 100644 --- a/flake.lock +++ b/flake.lock @@ -613,6 +613,22 @@ "type": "github" } }, + "opencode-anthropic-user-agent-plugin": { + "flake": false, + "locked": { + "lastModified": 1773977067, + "narHash": "sha256-KUW3npBSvCYU5kEULmNI0MLBf6r6DFH1DUKNKNmul9Q=", + "owner": "dotCipher", + "repo": "opencode-anthropic-user-agent-plugin", + "rev": "5981826955f0429583ad8a5a25fd2909d292d882", + "type": "github" + }, + "original": { + "owner": "dotCipher", + "repo": "opencode-anthropic-user-agent-plugin", + "type": "github" + } + }, "pre-commit": { "inputs": { "flake-compat": "flake-compat_2", @@ -653,6 +669,7 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "noctalia": "noctalia", + "opencode-anthropic-user-agent-plugin": "opencode-anthropic-user-agent-plugin", "rust-overlay": "rust-overlay", "zen-browser": "zen-browser" } diff --git a/flake.nix b/flake.nix index 801a4c9..3ac9f1f 100644 --- a/flake.nix +++ b/flake.nix @@ -83,6 +83,11 @@ url = "github:ChrisOboe/json2steamshortcut"; inputs.nixpkgs.follows = "nixpkgs"; }; + + opencode-anthropic-user-agent-plugin = { + url = "github:dotCipher/opencode-anthropic-user-agent-plugin"; + flake = false; + }; }; outputs = diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index 5ef4a26..c78cd9e 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -39,10 +39,13 @@ let writing.model = "openrouter/google/gemini-3-flash-preview"; }; }; + oh-my-opencode-pkg = inputs.llm-agents.packages.${pkgs.stdenv.hostPlatform.system}.oh-my-opencode; + + anthropic-user-agent-plugin = inputs.opencode-anthropic-user-agent-plugin; in { home.packages = [ - inputs.llm-agents.packages.${pkgs.stdenv.hostPlatform.system}.oh-my-opencode + oh-my-opencode-pkg pkgs.playwright-driver.browsers ]; @@ -53,6 +56,13 @@ in xdg.configFile."opencode/oh-my-opencode.json".text = builtins.toJSON ohMyOpencodeConfig; + # Plugins are placed directly in the plugins directory so opencode + # auto-discovers them instead of downloading them from npm at runtime. + xdg.configFile."opencode/plugins/oh-my-opencode.js".source = + "${oh-my-opencode-pkg}/lib/oh-my-opencode/dist/index.js"; + xdg.configFile."opencode/plugins/opencode-anthropic-user-agent-plugin.js".source = + "${anthropic-user-agent-plugin}/index.js"; + xdg.configFile."opencode/skills/playwright.md".text = let browsers = pkgs.playwright-driver.browsers; @@ -166,11 +176,8 @@ in 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; + autoupdate = false; agent = { }; - plugin = [ "oh-my-opencode" ]; provider = { openrouter = { models = { From 1b810ada9d0302a23d514add53cbe0fbda142b78 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 20 Mar 2026 14:12:34 -0400 Subject: [PATCH 621/724] update: opencode-anthropic-user-agent-plugin --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index dde9d7d..b78e106 100644 --- a/flake.lock +++ b/flake.lock @@ -616,11 +616,11 @@ "opencode-anthropic-user-agent-plugin": { "flake": false, "locked": { - "lastModified": 1773977067, - "narHash": "sha256-KUW3npBSvCYU5kEULmNI0MLBf6r6DFH1DUKNKNmul9Q=", + "lastModified": 1774011798, + "narHash": "sha256-GdZK4wi+oNFjdM5pdGAJ6GCxWfZM3J86hq8DcqNp8hg=", "owner": "dotCipher", "repo": "opencode-anthropic-user-agent-plugin", - "rev": "5981826955f0429583ad8a5a25fd2909d292d882", + "rev": "f93bb1dfb744496335917391b6e37c34a9a81e7a", "type": "github" }, "original": { From 980a90ae047520437931129de9404f3e3b0cb641 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 20 Mar 2026 14:33:58 -0400 Subject: [PATCH 622/724] opencode: fix anthropic again (use claude code creds) --- flake.lock | 104 ++++++++++++++++++++++++-------- flake.nix | 5 +- home-manager/no-gui.nix | 2 + home-manager/progs/opencode.nix | 22 ++++++- 4 files changed, 101 insertions(+), 32 deletions(-) diff --git a/flake.lock b/flake.lock index b78e106..ee246b7 100644 --- a/flake.lock +++ b/flake.lock @@ -59,6 +59,25 @@ "type": "github" } }, + "claude-code": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1773961521, + "narHash": "sha256-enhjd1AcHHU+3RCRdSWVQj6TIqRXkJUbQSFVXzC6xLo=", + "owner": "sadjow", + "repo": "claude-code-nix", + "rev": "1519be1f77ed017ae4a88916ac54529cef885573", + "type": "github" + }, + "original": { + "owner": "sadjow", + "repo": "claude-code-nix", + "type": "github" + } + }, "crane": { "locked": { "lastModified": 1772080396, @@ -211,7 +230,25 @@ }, "flake-utils": { "inputs": { - "systems": "systems_2" + "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" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems_3" }, "locked": { "lastModified": 1710146030, @@ -330,7 +367,7 @@ }, "json2steamshortcut": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" ] @@ -382,7 +419,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_3", + "systems": "systems_4", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -468,7 +505,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1773911054, @@ -538,6 +575,22 @@ } }, "nixpkgs": { + "locked": { + "lastModified": 1773628058, + "narHash": "sha256-hpXH0z3K9xv0fHaje136KY872VT2T5uwxtezlAskQgY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f8573b9c935cfaa162dd62cc9e75ae2db86f85df", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { "locked": { "lastModified": 1773821835, "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", @@ -553,7 +606,7 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs_3": { "locked": { "lastModified": 1770107345, "narHash": "sha256-tbS0Ebx2PiA1FRW8mt8oejR0qMXmziJmPaU1d4kYY9g=", @@ -596,7 +649,7 @@ "noctalia", "nixpkgs" ], - "systems": "systems_5", + "systems": "systems_6", "treefmt-nix": "treefmt-nix_2" }, "locked": { @@ -613,22 +666,6 @@ "type": "github" } }, - "opencode-anthropic-user-agent-plugin": { - "flake": false, - "locked": { - "lastModified": 1774011798, - "narHash": "sha256-GdZK4wi+oNFjdM5pdGAJ6GCxWfZM3J86hq8DcqNp8hg=", - "owner": "dotCipher", - "repo": "opencode-anthropic-user-agent-plugin", - "rev": "f93bb1dfb744496335917391b6e37c34a9a81e7a", - "type": "github" - }, - "original": { - "owner": "dotCipher", - "repo": "opencode-anthropic-user-agent-plugin", - "type": "github" - } - }, "pre-commit": { "inputs": { "flake-compat": "flake-compat_2", @@ -654,6 +691,7 @@ }, "root": { "inputs": { + "claude-code": "claude-code", "deploy-rs": "deploy-rs", "disko": "disko", "emacs-overlay": "emacs-overlay", @@ -667,9 +705,8 @@ "nix-doom-emacs-unstraightened": "nix-doom-emacs-unstraightened", "nix-flatpak": "nix-flatpak", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "noctalia": "noctalia", - "opencode-anthropic-user-agent-plugin": "opencode-anthropic-user-agent-plugin", "rust-overlay": "rust-overlay", "zen-browser": "zen-browser" } @@ -755,6 +792,21 @@ } }, "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" + } + }, + "systems_6": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -792,7 +844,7 @@ }, "treefmt-nix_2": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1772660329, @@ -810,7 +862,7 @@ }, "utils": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1731533236, diff --git a/flake.nix b/flake.nix index 3ac9f1f..9067437 100644 --- a/flake.nix +++ b/flake.nix @@ -84,9 +84,8 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - opencode-anthropic-user-agent-plugin = { - url = "github:dotCipher/opencode-anthropic-user-agent-plugin"; - flake = false; + claude-code = { + url = "github:sadjow/claude-code-nix"; }; }; diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index a184713..3805bea 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -110,6 +110,8 @@ let # DNS things dig + + bun ]; in diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index c78cd9e..bdda947 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -41,12 +41,27 @@ let }; oh-my-opencode-pkg = inputs.llm-agents.packages.${pkgs.stdenv.hostPlatform.system}.oh-my-opencode; - anthropic-user-agent-plugin = inputs.opencode-anthropic-user-agent-plugin; + opencode-claude-auth = pkgs.stdenv.mkDerivation { + pname = "opencode-claude-auth"; + version = "0.5.7"; + src = pkgs.fetchurl { + url = "https://registry.npmjs.org/opencode-claude-auth/-/opencode-claude-auth-0.5.7.tgz"; + hash = "sha256-uGrh/hkXUCAL9m2fu6Tj0cPTvSOiY1ZEYT7m3ccHmrs="; + }; + unpackPhase = '' + tar xzf $src + ''; + installPhase = '' + mkdir -p $out + cp -r package/dist/* $out/ + ''; + }; in { home.packages = [ oh-my-opencode-pkg pkgs.playwright-driver.browsers + inputs.claude-code.packages.${pkgs.stdenv.hostPlatform.system}.claude-code ]; home.sessionVariables = { @@ -60,8 +75,8 @@ in # auto-discovers them instead of downloading them from npm at runtime. xdg.configFile."opencode/plugins/oh-my-opencode.js".source = "${oh-my-opencode-pkg}/lib/oh-my-opencode/dist/index.js"; - xdg.configFile."opencode/plugins/opencode-anthropic-user-agent-plugin.js".source = - "${anthropic-user-agent-plugin}/index.js"; + + xdg.configFile."opencode/plugins/opencode-claude-auth".source = opencode-claude-auth; xdg.configFile."opencode/skills/playwright.md".text = let @@ -178,6 +193,7 @@ in autoshare = false; autoupdate = false; agent = { }; + plugin = [ ]; provider = { openrouter = { models = { From 1a22fd9cdf9bfe77201c5bb867a69b5ad09621c7 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 20 Mar 2026 14:42:16 -0400 Subject: [PATCH 623/724] update --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index ee246b7..1c4ea75 100644 --- a/flake.lock +++ b/flake.lock @@ -139,11 +139,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1773876550, - "narHash": "sha256-gB8MjuySf5aTxLv+NgvmL/5IKFk3EjFe+cvum1mE8DM=", + "lastModified": 1773987920, + "narHash": "sha256-iO4svl8iB3zo1GArQpiFg+IBi/mENxn+AOCgOlMuO4Q=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "8b475fcb2574286d7f4413c22cc7902d80d21ced", + "rev": "ebf77f71c43cf4ff2cef5fb7f29cb3e189f17647", "type": "github" }, "original": { @@ -162,11 +162,11 @@ ] }, "locked": { - "lastModified": 1773912849, - "narHash": "sha256-j8+nTPoUiiyyMAN0bk/8AqqkApusi38laEaQ4m45KIA=", + "lastModified": 1774025049, + "narHash": "sha256-mlXHmmL8lZibp/DytQuHjCfl0iU56qf4uJjlLZFY1Kc=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "4ce92db83efd3393ba51df6bbc06cc34f48c4475", + "rev": "2f30afcd2ca141e1cf9745439fffcf5fb044dfc8", "type": "github" }, "original": { @@ -293,11 +293,11 @@ ] }, "locked": { - "lastModified": 1773898372, - "narHash": "sha256-PqeDgmyI/Df3/Mv0B81FP/ZC4KuO88YRQF5ZfeFyA4k=", + "lastModified": 1774007980, + "narHash": "sha256-FOnZjElEI8pqqCvB6K/1JRHTE8o4rer8driivTpq2uo=", "owner": "nix-community", "repo": "home-manager", - "rev": "ecf019baf47df009937b5f8c4604cee10f410a76", + "rev": "9670de2921812bc4e0452f6e3efd8c859696c183", "type": "github" }, "original": { @@ -352,11 +352,11 @@ ] }, "locked": { - "lastModified": 1773900606, - "narHash": "sha256-VcW+NF67YiEe7xkzbS3Ufb69AdU6tAciko2UumgmS5M=", + "lastModified": 1773949806, + "narHash": "sha256-W25eg57cTQSwey9nEf1AhHy895Yiwq74PgyJl2EuY3Q=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "bfbdcd250b775ccef950db470b6cfefa5aa086cd", + "rev": "425b357e190632600ca2b2daea3bdf28d57e3047", "type": "github" }, "original": { @@ -423,11 +423,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1773890325, - "narHash": "sha256-a+dGcpr6+LX2XKcFR5n2soeS2oS9w7zTTxb3m5a3cwY=", + "lastModified": 1774017304, + "narHash": "sha256-4+MRnM772f76dpsXUxVp/2jW68C2wp4766pujWyqzx8=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "1b0a1d7396b2d3999b8ebe9246d97db8741438fb", + "rev": "bbf9d11b64b8f42df45a8eb5829c9f64fe02cea8", "type": "github" }, "original": { @@ -508,11 +508,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1773911054, - "narHash": "sha256-9ZC8Wk3IaWpeArY4bM+OZ/9YMkbPgTGDHhpmlXdgD+I=", + "lastModified": 1773997252, + "narHash": "sha256-Yb3E25nkGye4YLc3in90mZp+qT5TgXWq3z5KQduAmoQ=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "ae7dd228221076e7d1c18dd272ab14147d0bda07", + "rev": "f0ce2c9e437124550d7e138b49dceef12a3a3001", "type": "github" }, "original": { @@ -560,11 +560,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1773533765, - "narHash": "sha256-qonGfS2lzCgCl59Zl63jF6dIRRpvW3AJooBGMaXjHiY=", + "lastModified": 1774018263, + "narHash": "sha256-HHYEwK1A22aSaxv2ibhMMkKvrDGKGlA/qObG4smrSqc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f8e82243fd601afb9f59ad230958bd073795cbfe", + "rev": "2d4b4717b2534fad5c715968c1cece04a172b365", "type": "github" }, "original": { @@ -630,11 +630,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1773925146, - "narHash": "sha256-gccci8li5UaXsCgrgmT2TAgt1d4XJeHa9WyCkW/t6VY=", + "lastModified": 1774029401, + "narHash": "sha256-pM4U3rRPs+QUh/qfPFhcpmN2g9Nb91eIro1xcLdEYnA=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "e08b08893e2194c0f6dc172f858e788ba825904d", + "rev": "56457b140047e96a7a1e3bae6cf00cb9485d49a1", "type": "github" }, "original": { @@ -718,11 +718,11 @@ ] }, "locked": { - "lastModified": 1773889863, - "narHash": "sha256-tSsmZOHBgq4qfu5MNCAEsKZL1cI4avNLw2oUTXWeb74=", + "lastModified": 1773975983, + "narHash": "sha256-zrRVwdfhDdohANqEhzY/ydeza6EXEi8AG6cyMRNYT9Q=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "dbfd51be2692cb7022e301d14c139accb4ee63f0", + "rev": "cc80954a95f6f356c303ed9f08d0b63ca86216ac", "type": "github" }, "original": { From 1c3a29dc5baf090cef64e681aefba897f41946ce Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 21 Mar 2026 07:06:02 -0400 Subject: [PATCH 624/724] opencode: fix opencode-claude-auth --- home-manager/progs/opencode.nix | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index bdda947..a404b17 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -40,22 +40,6 @@ let }; }; oh-my-opencode-pkg = inputs.llm-agents.packages.${pkgs.stdenv.hostPlatform.system}.oh-my-opencode; - - opencode-claude-auth = pkgs.stdenv.mkDerivation { - pname = "opencode-claude-auth"; - version = "0.5.7"; - src = pkgs.fetchurl { - url = "https://registry.npmjs.org/opencode-claude-auth/-/opencode-claude-auth-0.5.7.tgz"; - hash = "sha256-uGrh/hkXUCAL9m2fu6Tj0cPTvSOiY1ZEYT7m3ccHmrs="; - }; - unpackPhase = '' - tar xzf $src - ''; - installPhase = '' - mkdir -p $out - cp -r package/dist/* $out/ - ''; - }; in { home.packages = [ @@ -76,8 +60,6 @@ in xdg.configFile."opencode/plugins/oh-my-opencode.js".source = "${oh-my-opencode-pkg}/lib/oh-my-opencode/dist/index.js"; - xdg.configFile."opencode/plugins/opencode-claude-auth".source = opencode-claude-auth; - xdg.configFile."opencode/skills/playwright.md".text = let browsers = pkgs.playwright-driver.browsers; @@ -193,7 +175,7 @@ in autoshare = false; autoupdate = false; agent = { }; - plugin = [ ]; + plugin = [ "opencode-claude-auth" ]; provider = { openrouter = { models = { From 543930921f0ecc1ebeeb2b12ebac4842b445db28 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 21 Mar 2026 12:10:09 -0400 Subject: [PATCH 625/724] networking: fix in-flight wifi (dns) Fixes issue on in-flight wifi where I cannot access the login page. Turns out, `insertNameservers` goes before the delta wifi nameserver, this prevents `wifi.delta.com` from being resolved. So I need to use `appendNameservers` instead. --- system/networking.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/networking.nix b/system/networking.nix index 0cc23ca..23a6496 100644 --- a/system/networking.nix +++ b/system/networking.nix @@ -9,7 +9,7 @@ networkmanager = { enable = true; - insertNameservers = [ + appendNameservers = [ "1.1.1.1" "9.9.9.9" ]; From 1fc00ab1a37eb73355dcb7d4ee359149a32beabb Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 21 Mar 2026 13:29:40 -0400 Subject: [PATCH 626/724] zen: overhaul configuration Declaratively configure plugin installation and configuration. Use my own self-hosted sync server. --- flake.lock | 23 ++++ flake.nix | 8 ++ home-manager/gui.nix | 4 +- home-manager/progs/zen/dark-reader.nix | 164 +++++++++++++++++++++++++ home-manager/progs/zen/default.nix | 75 +++++++++++ home-manager/progs/zen/ublock.nix | 143 +++++++++++++++++++++ 6 files changed, 415 insertions(+), 2 deletions(-) create mode 100644 home-manager/progs/zen/dark-reader.nix create mode 100644 home-manager/progs/zen/default.nix create mode 100644 home-manager/progs/zen/ublock.nix diff --git a/flake.lock b/flake.lock index 1c4ea75..18f42a0 100644 --- a/flake.lock +++ b/flake.lock @@ -175,6 +175,28 @@ "type": "github" } }, + "firefox-addons": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "dir": "pkgs/firefox-addons", + "lastModified": 1774065775, + "narHash": "sha256-anJXbdfZMhXWjHSfB5v6e8+yv1ASTHM4TwikH8tloMI=", + "owner": "rycee", + "repo": "nur-expressions", + "rev": "4b3bbb9dc3c80d1b62228c9a2ca0bef74a24a192", + "type": "gitlab" + }, + "original": { + "dir": "pkgs/firefox-addons", + "owner": "rycee", + "repo": "nur-expressions", + "type": "gitlab" + } + }, "flake-compat": { "flake": false, "locked": { @@ -695,6 +717,7 @@ "deploy-rs": "deploy-rs", "disko": "disko", "emacs-overlay": "emacs-overlay", + "firefox-addons": "firefox-addons", "home-manager": "home-manager", "impermanence": "impermanence", "jovian-nixos": "jovian-nixos", diff --git a/flake.nix b/flake.nix index 9067437..67720b7 100644 --- a/flake.nix +++ b/flake.nix @@ -33,6 +33,11 @@ inputs.home-manager.follows = "home-manager"; }; + firefox-addons = { + url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + niri = { url = "github:sodiboo/niri-flake"; inputs.nixpkgs.follows = "nixpkgs"; @@ -132,6 +137,9 @@ { # home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; + home-manager.sharedModules = [ + inputs.zen-browser.homeModules.twilight + ]; home-manager.extraSpecialArgs = { inherit inputs diff --git a/home-manager/gui.nix b/home-manager/gui.nix index 471c730..40b5b94 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -2,6 +2,7 @@ pkgs, lib, inputs, + config, ... }: { @@ -12,6 +13,7 @@ ./progs/emacs.nix # ./progs/trezor.nix # - broken ./progs/flatpak.nix + ./progs/zen ]; nixpkgs.config.allowUnfreePredicate = @@ -34,7 +36,6 @@ # browsers [ tor-browser - inputs.zen-browser.packages."${system}".twilight grayjay ] @@ -171,7 +172,6 @@ }; home.sessionVariables = { - BROWSER = "zen"; LD_LIBRARY_PATH = "${pkgs.lib.makeLibraryPath [ pkgs.stdenv.cc.cc ]}"; diff --git a/home-manager/progs/zen/dark-reader.nix b/home-manager/progs/zen/dark-reader.nix new file mode 100644 index 0000000..4c6678c --- /dev/null +++ b/home-manager/progs/zen/dark-reader.nix @@ -0,0 +1,164 @@ +# Dark Reader extension settings +# Addon ID: addon@darkreader.org +{ lib }: +let + defaultTheme = { + mode = 1; + brightness = 100; + contrast = 100; + grayscale = 0; + sepia = 0; + useFont = false; + fontFamily = "Open Sans"; + textStroke = 0; + engine = "dynamicTheme"; + stylesheet = ""; + darkSchemeBackgroundColor = "#181a1b"; + darkSchemeTextColor = "#e8e6e3"; + lightSchemeBackgroundColor = "#dcdad7"; + lightSchemeTextColor = "#181a1b"; + scrollbarColor = ""; + selectionColor = "auto"; + styleSystemControls = false; + lightColorScheme = "Default"; + darkColorScheme = "Default"; + immediateModify = false; + }; + + mkCustomTheme = + { + url, + engine ? defaultTheme.engine, + builtIn ? false, + }: + { + inherit url; + theme = defaultTheme // { + inherit engine; + }; + } + // lib.optionalAttrs builtIn { inherit builtIn; }; +in +{ + force = true; + settings = { + enabled = true; + fetchNews = true; + syncSettings = true; + syncSitesFixes = false; + changeBrowserTheme = false; + enabledByDefault = false; + enableForPDF = true; + enableForProtectedPages = false; + enableContextMenus = false; + detectDarkTheme = true; + previewNewDesign = false; + previewNewestDesign = false; + + theme = defaultTheme; + + enabledFor = [ + "search.nixos.org" + "quizlet.com" + "claude.ai" + ]; + + disabledFor = [ + "cinny.envs.net" + "element.envs.net" + "mail.proton.me" + "mail.google.com" + "www.gardling.com" + "projects.fivethirtyeight.com" + "secure.bankofamerica.com" + "billpay-ui.bankofamerica.com" + "plus.pearson.com" + "immich.gardling.com" + "huggingface.co" + "session.masteringphysics.com" + "brainly.com" + "www.270towin.com" + "phet.colorado.edu" + "8042-1.portal.athenahealth.com" + "torrent.gardling.com" + "nssb-p.adm.fit.edu" + "mail.openbenchmarking.org" + "moneroocean.stream" + "app.diagrams.net" + "books.gw-project.org" + "chat.deepseek.com" + "n21.ultipro.com" + "www.egaroucid.nyanyan.dev" + "bitmagnet.gardling.com" + "frame.work" + "www.altcancer.net" + "jenkins.jpenilla.xyz" + "soulseek.gardling.com" + "discord.com" + "www.lufthansa.com" + "surveys.hyundaicx.com" + "www.apple.com" + "docs.google.com" + "marcuspork.com" + "en.akinator.com" + "www.reddit.com" + "terra.layoutit.com" + "www.ebay.com" + "www.nytimes.com" + "app.electricitymaps.com" + "www.revoy.com" + "kagi.com" + "www.bhphotovideo.com" + "survey.stackoverflow.co" + "www.google.com" + "en.wikipedia.org" + "workforcenow.adp.com" + "app.element.io" + "www.desmos.com" + "en.wiktionary.org" + "dariandean0.github.io" + ]; + + customThemes = [ + (mkCustomTheme { + url = [ "*.officeapps.live.com" ]; + engine = "cssFilter"; + builtIn = true; + }) + (mkCustomTheme { + url = [ "*.sharepoint.com" ]; + engine = "cssFilter"; + builtIn = true; + }) + (mkCustomTheme { + url = [ "docs.google.com" ]; + engine = "cssFilter"; + builtIn = true; + }) + (mkCustomTheme { + url = [ "onedrive.live.com" ]; + engine = "cssFilter"; + builtIn = true; + }) + (mkCustomTheme { + url = [ "huggingface.co" ]; + engine = "svgFilter"; + }) + (mkCustomTheme { + url = [ "www.last.fm" ]; + engine = "svgFilter"; + }) + ]; + + automation = { + enabled = false; + mode = ""; + behavior = "OnOff"; + }; + + time = { + activation = "18:00"; + deactivation = "9:00"; + }; + }; +} diff --git a/home-manager/progs/zen/default.nix b/home-manager/progs/zen/default.nix new file mode 100644 index 0000000..e1d5bfb --- /dev/null +++ b/home-manager/progs/zen/default.nix @@ -0,0 +1,75 @@ +{ + pkgs, + lib, + inputs, + config, + ... +}: +let + firefox-addons = inputs.firefox-addons.packages.${pkgs.stdenv.hostPlatform.system}; + buildFirefoxXpiAddon = + inputs.firefox-addons.lib.${pkgs.stdenv.hostPlatform.system}.buildFirefoxXpiAddon; + + hacker-smacker = buildFirefoxXpiAddon { + pname = "hacker-smacker"; + version = "2.2"; + addonId = "jid1-eo0mcXLTqCkaWA@jetpack"; + url = "https://addons.mozilla.org/firefox/downloads/file/4715262/hacker_smacker-2.2.xpi"; + sha256 = "d28f0597d5c4bae5db712b4875f4104120f7e55e5ea769c44d70996be31cc0d1"; + meta = with lib; { + homepage = "https://www.hackersmacker.org"; + description = "Highlight (friend) and filter (foe) individual authors on Hacker News"; + license = licenses.mit; + platforms = platforms.all; + }; + }; + + ublockSettings = import ./ublock.nix { inherit lib; }; + darkReaderSettings = import ./dark-reader.nix { inherit lib; }; +in +{ + programs.zen-browser = { + enable = true; + profiles.default = { + isDefault = true; + + extensions = { + force = true; + + packages = + (with firefox-addons; [ + bitwarden + buster-captcha-solver + consent-o-matic + darkreader + fastforwardteam + localcdn + refined-github + return-youtube-dislikes + search-by-image # reverse image search + ruffle_rs + snowflake + steam-database + ublock-origin + ]) + ++ [ hacker-smacker ]; + + settings = { + "uBlock0@raymondhill.net" = ublockSettings; + "addon@darkreader.org" = darkReaderSettings; + }; + }; + + settings = { + "identity.sync.tokenserver.uri" = "https://firefox-sync.sigkill.computer/1.0/sync/1.5"; + # auto-enable extensions on install + "extensions.autoDisableScopes" = 0; + }; + }; + }; + + # Zen ignores XDG and hardcodes ~/.zen β€” symlink to module-managed path + home.file.".zen".source = config.lib.file.mkOutOfStoreSymlink "${config.xdg.configHome}/zen"; + + home.sessionVariables.BROWSER = "zen"; +} diff --git a/home-manager/progs/zen/ublock.nix b/home-manager/progs/zen/ublock.nix new file mode 100644 index 0000000..35f3eb1 --- /dev/null +++ b/home-manager/progs/zen/ublock.nix @@ -0,0 +1,143 @@ +# uBlock Origin extension settings +# Addon ID: uBlock0@raymondhill.net +{ lib }: +{ + force = true; + settings = { + userSettings = { + cloudStorageEnabled = true; + externalLists = builtins.concatStringsSep "\n" [ + "https://abp.oisd.nl/" + "https://filters.adtidy.org/extension/ublock/filters/3.txt" + "https://gitflic.ru/project/magnolia1234/bypass-paywalls-clean-filters/blob/raw?file=bpc-paywall-filter.txt" + "https://raw.githubusercontent.com/DetachHead/ublock-filters/refs/heads/master/list.txt" + "https://raw.githubusercontent.com/laylavish/uBlockOrigin-HUGE-AI-Blocklist/main/list.txt" + ]; + importedLists = [ + "https://abp.oisd.nl/" + "https://filters.adtidy.org/extension/ublock/filters/3.txt" + "https://gitflic.ru/project/magnolia1234/bypass-paywalls-clean-filters/blob/raw?file=bpc-paywall-filter.txt" + "https://raw.githubusercontent.com/DetachHead/ublock-filters/refs/heads/master/list.txt" + "https://raw.githubusercontent.com/laylavish/uBlockOrigin-HUGE-AI-Blocklist/main/list.txt" + ]; + popupPanelSections = 15; + prefetchingDisabled = false; + }; + + selectedFilterLists = [ + "user-filters" + "ublock-filters" + "ublock-badware" + "ublock-privacy" + "ublock-quick-fixes" + "ublock-unbreak" + "easylist" + "adguard-generic" + "adguard-mobile" + "easyprivacy" + "adguard-spyware-url" + "block-lan" + "urlhaus-1" + "curben-phishing" + "plowe-0" + "dpollock-0" + "fanboy-cookiemonster" + "ublock-cookies-easylist" + "adguard-cookies" + "ublock-cookies-adguard" + "fanboy-social" + "adguard-social" + "fanboy-thirdparty_social" + "easylist-chat" + "easylist-newsletters" + "easylist-notifications" + "easylist-annoyances" + "adguard-mobile-app-banners" + "adguard-other-annoyances" + "adguard-popup-overlays" + "adguard-widgets" + "ublock-annoyances" + "SWE-1" + "https://filters.adtidy.org/extension/ublock/filters/3.txt" + "https://gitflic.ru/project/magnolia1234/bypass-paywalls-clean-filters/blob/raw?file=bpc-paywall-filter.txt" + "https://raw.githubusercontent.com/DetachHead/ublock-filters/refs/heads/master/list.txt" + "https://raw.githubusercontent.com/laylavish/uBlockOrigin-HUGE-AI-Blocklist/main/list.txt" + "https://abp.oisd.nl/" + ]; + + whitelist = [ + "chrome-extension-scheme" + "moz-extension-scheme" + ]; + + dynamicFilteringString = builtins.concatStringsSep "\n" [ + "behind-the-scene * * noop" + "behind-the-scene * inline-script noop" + "behind-the-scene * 1p-script noop" + "behind-the-scene * 3p-script noop" + "behind-the-scene * 3p-frame noop" + "behind-the-scene * image noop" + "behind-the-scene * 3p noop" + ]; + + hostnameSwitchesString = builtins.concatStringsSep "\n" [ + "no-large-media: behind-the-scene false" + "no-csp-reports: * true" + "no-scripting: arstechnica.com true" + "no-scripting: www.phoronix.com true" + "no-scripting: www.theatlantic.com true" + "no-scripting: wccftech.com true" + "no-remote-fonts: www.theverge.com true" + "no-scripting: www.theverge.com true" + "no-scripting: gamersnexus.net true" + ]; + + userFilters = builtins.concatStringsSep "\n" [ + # Annoying fonts warning because of localCDN + "docs.google.com##.jfk-butterBar-shown.jfk-butterBar-info.jfk-butterBar" + + # remove phoronix premium ad + "www.phoronix.com##aside:nth-of-type(3)" + "www.phoronix.com##aside.widget:nth-of-type(4)" + + # Remove instagram login screen + "www.instagram.com##.x1nhvcw1.x1oa3qoh.x1qjc9v5.xqjyukv.xdt5ytf.x2lah0s.x1c4vz4f.x1odjw0f.xw2csxc.x1n2onr6.xo71vjh.x5pf9jr.x13lgxp2.x168nmei.x78zum5.xjbqb8w.x9f619" + "www.instagram.com##.xl56j7k.x1iyjqo2.xdt5ytf.x78zum5.x9f619.x1qjc9v5" + "www.instagram.com##.x1jfb8zj.x1qrby5j.x1n2onr6.x7ja8zs.x1t2pt76.x1lytzrv.xedcshv.xarpa2k.x3igimt.x12ejxvf.xaigb6o.x1beo9mf.x1h91t0o.x4k7w5x.x1uvtmcs" + "www.instagram.com##.x1h0vfkc.x13vifvy.xixxii4.x17qophe.xds687c.x1ey2m1c" + "www.instagram.com##.x1n2onr6.xg6iff7.xippug5.xdt5ytf.x78zum5" + "www.instagram.com##.xzkaem6.x1n2onr6 > .xjx87ck.x1yqm8si.xfk6m8.xh8yej3.x13vifvy.x1rohswg.xixxii4.x1odjw0f.xw2csxc.x17qophe.x5yr21d.x1pq812k.x1ja2u2z.x9f619" + + # remove github dashboard copilot stuff + "github.com##copilot-dashboard-entrypoint" + "github.com##.hide-md.hide-sm.AppHeader-CopilotChat > react-partial-anchor" + "github.com##react-partial-anchor > .AppHeader-buttonLeft.AppHeader-button.Button--medium.Button--secondary.Button--iconOnly.Button" + "github.com##.Button.Button--medium.Button--secondary.AppHeader-button--dropdown.AppHeader-buttonRight.AppHeader-button" + "github.com##.tooltipped-sw.tooltipped.AppHeader-buttonRight.color-fg-muted.AppHeader-button.Button--medium.Button--secondary.Button--iconOnly.Button" + + # github sidebar stuff + ''github.com##.rounded-2.p-3.color-border-default.border.\ .mt-0.list-none.relative > .s\:rounded-2.bg-transparent.-outline-offset-1.py-2xs.cursor-pointer.hover\:no-underline.hover\:bg-neutral-background-hover.hover\:text-secondary-hover.text-secondary.gap-\[0\.5rem\].px-md.relative.justify-between.flex'' + + "www.quora.com##.qu-bg--raised.qu-mb--small.qu-boxShadow--small.qu-borderColor--raised.qu-borderAll.dom_annotate_question_answer_item_0.q-box > div > div > div > div > div.q-box" + + "discord.com##.contentCollapsedWrapper__5f897" + + "www.statista.com###pdfpremiumArrowModal > .vueModal__overlay" + + # The AI summary BS + ''www.reddit.com##.px-md.pb-\[22px\].pt-md.mt-md.rounded-4.bg-neutral-background-weak.xs\:block.hidden'' + + "www.sciencedirect.com##.gXjxP.sc-fHSyaj" + ]; + }; +} From 04496da4ba016ae2eb77db476852cafdf62424c4 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 21 Mar 2026 13:40:03 -0400 Subject: [PATCH 627/724] zen: search: kagi + ddg --- home-manager/progs/zen/default.nix | 20 ++++++++++++++++++++ home-manager/progs/zen/ublock.nix | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/home-manager/progs/zen/default.nix b/home-manager/progs/zen/default.nix index e1d5bfb..186ab20 100644 --- a/home-manager/progs/zen/default.nix +++ b/home-manager/progs/zen/default.nix @@ -60,6 +60,26 @@ in }; }; + search = { + force = true; + default = "kagi"; + privateDefault = "ddg"; + order = [ + "kagi" + "ddg" + "google" + ]; + engines = { + kagi = { + name = "Kagi"; + urls = [ { template = "https://kagi.com/search?q={searchTerms}"; } ]; + iconMapObj."16" = "https://kagi.com/favicon.ico"; + definedAliases = [ "@k" ]; + }; + google.metaData.alias = "@g"; + }; + }; + settings = { "identity.sync.tokenserver.uri" = "https://firefox-sync.sigkill.computer/1.0/sync/1.5"; # auto-enable extensions on install diff --git a/home-manager/progs/zen/ublock.nix b/home-manager/progs/zen/ublock.nix index 35f3eb1..6e8c217 100644 --- a/home-manager/progs/zen/ublock.nix +++ b/home-manager/progs/zen/ublock.nix @@ -92,7 +92,7 @@ "no-scripting: gamersnexus.net true" ]; - userFilters = builtins.concatStringsSep "\n" [ + "user-filters" = builtins.concatStringsSep "\n" [ # Annoying fonts warning because of localCDN "docs.google.com##.jfk-butterBar-shown.jfk-butterBar-info.jfk-butterBar" From e53cd2a74a7bba247807145505db6b1ed03e01dc Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 21 Mar 2026 13:45:21 -0400 Subject: [PATCH 628/724] zen: dark-reader: disable sync --- home-manager/progs/zen/dark-reader.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-manager/progs/zen/dark-reader.nix b/home-manager/progs/zen/dark-reader.nix index 4c6678c..2218adb 100644 --- a/home-manager/progs/zen/dark-reader.nix +++ b/home-manager/progs/zen/dark-reader.nix @@ -44,7 +44,7 @@ in settings = { enabled = true; fetchNews = true; - syncSettings = true; + syncSettings = false; syncSitesFixes = false; changeBrowserTheme = false; enabledByDefault = false; From 8d965f03145d88057aada123ba3c9286b155d68d Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 21 Mar 2026 13:58:10 -0400 Subject: [PATCH 629/724] zen: prevent sync from fighting! --- home-manager/progs/zen/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/home-manager/progs/zen/default.nix b/home-manager/progs/zen/default.nix index 186ab20..e1c2e5a 100644 --- a/home-manager/progs/zen/default.nix +++ b/home-manager/progs/zen/default.nix @@ -84,6 +84,11 @@ in "identity.sync.tokenserver.uri" = "https://firefox-sync.sigkill.computer/1.0/sync/1.5"; # auto-enable extensions on install "extensions.autoDisableScopes" = 0; + # don't sync prefs/addons β€” we manage them declaratively via nix + # syncing fights with the declarative config and can cause data loss + # https://github.com/nix-community/home-manager/issues/6083 + "services.sync.engine.prefs" = false; + "services.sync.engine.addons" = false; }; }; }; From a63fd81fdc8db2704aac57280ba0e8253151a07f Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 21 Mar 2026 13:58:32 -0400 Subject: [PATCH 630/724] zen: disable password manager (I use bitwarden) --- home-manager/progs/zen/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home-manager/progs/zen/default.nix b/home-manager/progs/zen/default.nix index e1c2e5a..5386a26 100644 --- a/home-manager/progs/zen/default.nix +++ b/home-manager/progs/zen/default.nix @@ -89,6 +89,10 @@ in # https://github.com/nix-community/home-manager/issues/6083 "services.sync.engine.prefs" = false; "services.sync.engine.addons" = false; + # disable built-in password manager β€” using bitwarden + "signon.rememberSignons" = false; + "signon.autofillForms" = false; + "signon.management.page.breach-alerts.enabled" = false; }; }; }; From 9e741072e8d83c0d8401bba332abee942f7578ad Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 21 Mar 2026 14:04:22 -0400 Subject: [PATCH 631/724] zen: disable more password manager stuff --- home-manager/progs/zen/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/home-manager/progs/zen/default.nix b/home-manager/progs/zen/default.nix index 5386a26..78a2adf 100644 --- a/home-manager/progs/zen/default.nix +++ b/home-manager/progs/zen/default.nix @@ -93,6 +93,13 @@ in "signon.rememberSignons" = false; "signon.autofillForms" = false; "signon.management.page.breach-alerts.enabled" = false; + "signon.formlessCapture.enabled" = false; + "signon.privateBrowsingCapture.enabled" = false; + # disable the autocomplete popup on login fields + "signon.firefoxRelay.feature" = ""; + "signon.generation.enabled" = false; + # disable passkey/webauthn prompts from the built-in manager + "security.webauthn.enable_conditional_mediation" = false; }; }; }; From 45e5bf0d9e17af2e6b620999a421e750e3d2db1b Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 21 Mar 2026 15:40:36 -0400 Subject: [PATCH 632/724] doom: disable jit and fix slowness and stale indexing --- home-manager/progs/doom.d/config.el | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/home-manager/progs/doom.d/config.el b/home-manager/progs/doom.d/config.el index dc99994..c19b0b3 100644 --- a/home-manager/progs/doom.d/config.el +++ b/home-manager/progs/doom.d/config.el @@ -82,5 +82,16 @@ (map! :map undo-fu-mode-map "C-?" #'undo-fu-only-redo)) +;; Fix SPC p p slowness +(after! projectile + (setq projectile-indexing-method 'alien + projectile-enable-caching nil + projectile-project-search-path '("~/projects/")) + (projectile-discover-projects-in-search-path)) + +;; Packages are already natively compiled by Nix; JIT recompilation +;; just wastes cycles (and the eln-cache is invalidated on every rebuild anyway) +(setq native-comp-jit-compilation nil) + ;; line wrapping (visual-line-mode t) From b5c7b15af3b96067690111c6ca8024bfb16fbea6 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 21 Mar 2026 16:03:29 -0400 Subject: [PATCH 633/724] update --- flake.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 18f42a0..81ddb90 100644 --- a/flake.lock +++ b/flake.lock @@ -65,11 +65,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1773961521, - "narHash": "sha256-enhjd1AcHHU+3RCRdSWVQj6TIqRXkJUbQSFVXzC6xLo=", + "lastModified": 1774106245, + "narHash": "sha256-gB3XhG900wWKDa/dbqgK0wFGRf8u9PQhqN/SvnTZlIM=", "owner": "sadjow", "repo": "claude-code-nix", - "rev": "1519be1f77ed017ae4a88916ac54529cef885573", + "rev": "0b01bf3b7cb403ef11f502183b6de55e2aaccf88", "type": "github" }, "original": { @@ -162,11 +162,11 @@ ] }, "locked": { - "lastModified": 1774025049, - "narHash": "sha256-mlXHmmL8lZibp/DytQuHjCfl0iU56qf4uJjlLZFY1Kc=", + "lastModified": 1774110692, + "narHash": "sha256-0JPH7CPdBCxx5IWNXZuqeiTwK8jS5ClT3xIO5brPNhI=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "2f30afcd2ca141e1cf9745439fffcf5fb044dfc8", + "rev": "e7876ebeff5bd7dcb1fcec5222f9f3a6f2ec7d89", "type": "github" }, "original": { @@ -445,11 +445,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1774017304, - "narHash": "sha256-4+MRnM772f76dpsXUxVp/2jW68C2wp4766pujWyqzx8=", + "lastModified": 1774104280, + "narHash": "sha256-kQeR1qqTFleJzMWsOttJMWUxMsykcKrUA2ttPIg2O4k=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "bbf9d11b64b8f42df45a8eb5829c9f64fe02cea8", + "rev": "4f6fca6b05c5b59b6bbb442a262596ddf86661e8", "type": "github" }, "original": { @@ -472,11 +472,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1773889880, - "narHash": "sha256-cu23CGP+mD2wKPKaoGM7evZ1dXfjd+cjryqqqx2HloE=", + "lastModified": 1774113359, + "narHash": "sha256-b7/LsPn5uZoFNjGVQ26q+6QPf8Q9IHHmRx+rGLZ8oyY=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "63767d4572eb2e3da5e68f68de77d8f2cdeca8dd", + "rev": "1c4a800bbe0c4cbcf99529fd88286a14450261a8", "type": "github" }, "original": { @@ -652,11 +652,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1774029401, - "narHash": "sha256-pM4U3rRPs+QUh/qfPFhcpmN2g9Nb91eIro1xcLdEYnA=", + "lastModified": 1774121595, + "narHash": "sha256-+NlTqaXbEwvL23RSCRiWn5jpRPeQPKWoPs753V3+WL4=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "56457b140047e96a7a1e3bae6cf00cb9485d49a1", + "rev": "6b30925fb400c493e21494fb82af92d5b0f6d210", "type": "github" }, "original": { @@ -675,11 +675,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1773842483, - "narHash": "sha256-oRqz+5AbNKfUWWwN5c83CsSOsUWVGITh0HZg+wX5Q/8=", + "lastModified": 1774059741, + "narHash": "sha256-ObYsrf7XLJDqWVbJ+GWH5JYV/EUc7SVdhGx5r5wWKno=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "3962ff1e0b59ef067c57199d31271ddbf23b29cd", + "rev": "c9beee5c634ec784af128b8e7c56db14012ab17f", "type": "github" }, "original": { @@ -741,11 +741,11 @@ ] }, "locked": { - "lastModified": 1773975983, - "narHash": "sha256-zrRVwdfhDdohANqEhzY/ydeza6EXEi8AG6cyMRNYT9Q=", + "lastModified": 1774062094, + "narHash": "sha256-ba3c+hS7KzEiwtZRGHagIAYdcmdY3rCSWVCyn64rx7s=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "cc80954a95f6f356c303ed9f08d0b63ca86216ac", + "rev": "c807e83cc2e32adc35f51138b3bdef722c0812ab", "type": "github" }, "original": { @@ -944,11 +944,11 @@ ] }, "locked": { - "lastModified": 1773737882, - "narHash": "sha256-P6k0BtT1/idYveVRdcwAZk8By9UjZW8XOMhSoS6wTBY=", + "lastModified": 1774103303, + "narHash": "sha256-ZKsQGY0D4DLe3071/RZSQHLqqmFvsA38PudjEvnPbZI=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "a7f1db35d74faf04e5189b3a32f890186ace5c28", + "rev": "ae52b215dd66f73cb131106b7588f3a983617cee", "type": "github" }, "original": { From e53e6f16d0aa996d1cb91c39196347ac65b0b61b Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 21 Mar 2026 19:43:35 -0400 Subject: [PATCH 634/724] AGENTS.md: init --- AGENTS.md | 166 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 166 insertions(+) create mode 100644 AGENTS.md diff --git a/AGENTS.md b/AGENTS.md new file mode 100644 index 0000000..ce5873b --- /dev/null +++ b/AGENTS.md @@ -0,0 +1,166 @@ +# AGENTS.md + +## Project Overview + +NixOS dotfiles for two hosts using Nix flakes + home-manager: +- **mreow** β€” Framework 13 AMD AI 300 laptop, niri WM, greetd, swaylock +- **yarn** β€” Desktop, Jovian-NixOS (Steam deck mode), impermanence, sddm, deploy-rs target + +Secrets in `system/secrets/` and `home-manager/secrets/` are encrypted with git-crypt. **Never read or write files in those directories.** + +## Build & Deploy Commands + +```sh +# Build and apply (default: boot, or pass switch/test/build) +./deploy.sh # nixos-rebuild boot --flake . --use-remote-sudo +./deploy.sh switch # apply immediately +./deploy.sh test # apply without adding boot entry +./deploy.sh build # build only, no activation + +# Build a specific host without deploying +nix build .#nixosConfigurations.mreow.config.system.build.toplevel -L +nix build .#nixosConfigurations.yarn.config.system.build.toplevel -L + +# Remote deploy to yarn via deploy-rs +deploy .#yarn + +# Format all Nix files (uses nixfmt-tree, declared in flake.nix) +nix fmt + +# Evaluate without building (quick syntax/type check) +nix eval .#nixosConfigurations.mreow.config.system.build.toplevel --no-build 2>&1 | head -5 +nix eval .#nixosConfigurations.yarn.config.system.build.toplevel --no-build 2>&1 | head -5 + +# Update flake inputs +nix flake update +nix flake update --input-name nixpkgs # update a single input +``` + +There are no tests. Validation is done by building the system configuration (`nix build -L`). +Always append `-L` to `nix build` for verbose build logs. +If nix complains a file isn't found, `git add` the file first β€” Nix flakes only see tracked files. + +## Repository Structure + +``` +flake.nix # Root flake: inputs, outputs, host definitions +deploy.sh # Wrapper around nixos-rebuild +system/ + common.nix # Shared system config (boot, audio, users, etc.) + system-mreow.nix # Laptop-specific system config + system-yarn.nix # Desktop-specific system config + networking.nix # NetworkManager, DNS + impermanence.nix # Ephemeral root for yarn + disk_mreow.nix / disk_yarn.nix # Disko disk layouts + vm.nix # Virtualization (libvirt, waydroid) + vr.nix / no-rgb.nix / steam.nix # Feature modules + secrets/ # git-crypt encrypted, DO NOT READ +home-manager/ + home-mreow.nix # Laptop home-manager entry point + home-yarn.nix # Desktop home-manager entry point + gui.nix # GUI packages + theming (imports no-gui.nix) + no-gui.nix # CLI tools, dev toolchains, git config + desktop.nix # Desktop environment (niri, dunst, swaylock, noctalia) + wallpaper.png # Shared wallpaper + progs/ # One file per program + fish.nix, alacritty.nix, emacs.nix, helix.nix, niri.nix, ... + zen/ # Zen Browser (multi-file: default.nix, ublock.nix, dark-reader.nix) + opencode.nix # AI coding tools config + util/ # Helper derivations (blur.nix, inverse_color.nix) + secrets/ # git-crypt encrypted, DO NOT READ +``` + +## Import Hierarchy + +``` +flake.nix + β”œβ”€ system/system-{host}.nix β†’ common.nix β†’ networking.nix, vm.nix, steam.nix + └─ home-manager/home-{host}.nix β†’ gui.nix β†’ no-gui.nix + β†’ desktop.nix β†’ niri.nix, dunst.nix, swaylock.nix, noctalia.nix +``` + +Adding a new program: create `home-manager/progs/myprog.nix`, import it from the appropriate layer (`gui.nix` for GUI apps, `no-gui.nix` for CLI tools, or `home-{host}.nix` for host-specific). + +## Nix Code Style + +**Formatter**: `nixfmt-tree` β€” run `nix fmt` before committing. All style below conforms to what nixfmt-tree produces. + +### Module Structure +```nix +# Function arguments: destructured attrset, alphabetical-ish, always end with `...` +{ pkgs, lib, inputs, config, ... }: + +# Optional let bindings for local values +let + myThing = "value"; +in +{ + imports = [ + ./other-module.nix + ]; + + # Configuration here +} +``` + +### Conventions +- **Indentation**: 2 spaces (enforced by nixfmt-tree) +- **Imports**: relative paths (`./progs/fish.nix`), one per line in a list +- **Package references**: use `lib.getExe pkgs.foo` for bin paths, not `${pkgs.foo}/bin/foo` +- **Package lists**: group thematically with comments, use `with pkgs;` or `lib.concatLists` for multiple groups +- **Unfree packages**: explicitly allowlisted per-file via `nixpkgs.config.allowUnfreePredicate` +- **Comments**: lowercase, informal, `#` style. Use `# BUG!` or `# TODO!` prefixes for known issues +- **No trailing commas**: Nix syntax does not support them +- **Attribute sets**: opening brace on same line, closing brace aligned with the key +- **Overlays**: imported inline within the module that needs them via `nixpkgs.overlays` +- **Special args**: passed through `specialArgs` (system) or `extraSpecialArgs` (home-manager) in flake.nix β€” includes `inputs`, `username`, `hostname`, `niri-package`, `homeDirectory`, `stateVersion` + +### Patterns Used + +```nix +# Package path references +lib.getExe pkgs.swaylock # preferred +"${pkgs.avizo}/bin/volumectl" # acceptable when lib.getExe doesn't work + +# Conditional/host-specific overrides +lib.mkForce false # override inherited values +lib.mkDefault "value" # set overridable defaults + +# Helper derivations (see home-manager/util/) +pkgs.callPackage ../util/blur.nix # for derivations that take { stdenv, ... }: + +# Combining package lists +home.packages = with pkgs; lib.concatLists [ + [ pkg1 pkg2 ] # group 1 + [ pkg3 pkg4 ] # group 2 + someList # from let binding +]; +``` + +### Naming +- **Host configs**: `system-{hostname}.nix`, `home-{hostname}.nix`, `disk_{hostname}.nix` +- **Program modules**: `progs/{program-name}.nix` (one program per file) +- **Utility derivations**: `util/{descriptive-name}.nix` +- **Variables**: `snake_case` or `camelCase` (no strict rule, follow local context) + +## Key Technical Details + +- **nixpkgs channel**: unstable (`nixos-unstable`) +- **Secure boot**: lanzaboote with keys extracted from `system/secrets/secureboot.tar` +- **Disk management**: disko +- **Privilege escalation**: doas (sudo is disabled), shim at `doas-sudo-shim` +- **Shell**: fish (bash redirects to fish via `programs.bash.interactiveShellInit`) +- **Wayland**: niri compositor, xwayland-satellite for X11 compat +- **Desktop shell**: noctalia-shell (bar, launcher, notifications) +- **Git**: GPG signing enabled (`signByDefault = true`), default branch `main` +- **Impermanence** (yarn only): root is ephemeral, `/persistent` holds state, home is bind-mounted + +## Agent-Specific Instructions + +- If instructed to commit, **disable GPG signing** (`git commit --no-gpg-sign`). +- Use `nix-shell -p ` if a tool is not available in the environment. +- For `nix build`, always append `-L` for verbose logs. +- If nix reports a missing file, run `git add ` first β€” flakes only see git-tracked files. +- Do not read files under `system/secrets/` or `home-manager/secrets/`. +- Run `nix fmt` after editing any `.nix` file. +- Validate changes with `nix build .#nixosConfigurations.{host}.config.system.build.toplevel -L`. From 7e1b478aec9a9592ee9eef681cb17cde8e305449 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 21 Mar 2026 19:56:39 -0400 Subject: [PATCH 635/724] geoclue2: allow zen-twilight --- system/common.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/system/common.nix b/system/common.nix index 8c477cf..35b9194 100644 --- a/system/common.nix +++ b/system/common.nix @@ -169,7 +169,13 @@ power-profiles-daemon.enable = true; # geolocation (uses beacondb.net by default) - geoclue2.enable = true; + geoclue2 = { + enable = true; + appConfig.zen-twilight = { + isAllowed = true; + isSystem = false; + }; + }; }; # EST From f65c1dd5c3f05b39e9cf5e089a6bf43b200a8550 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 22 Mar 2026 01:55:05 -0400 Subject: [PATCH 636/724] nix: enable weekly garbage collection of generations older than 30d --- system/common.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/system/common.nix b/system/common.nix index 35b9194..fd48359 100644 --- a/system/common.nix +++ b/system/common.nix @@ -70,6 +70,13 @@ # optimize the store optimise.automatic = true; + # auto garbage collect old generations + gc = { + automatic = true; + dates = "weekly"; + options = "--delete-older-than 30d"; + }; + # enable flakes! settings.experimental-features = [ "nix-command" From 83fecc3a2a2ac474b6a1a612d96f836c951a90d8 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 22 Mar 2026 01:55:11 -0400 Subject: [PATCH 637/724] amdgpu: disable cwsr to work around MES hangs/freezes --- system/common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/system/common.nix b/system/common.nix index fd48359..fac2609 100644 --- a/system/common.nix +++ b/system/common.nix @@ -134,6 +134,9 @@ # 1gb huge pages "hugepagesz=1G" "hugepages=3" + + # disable compute wave store and resume β€” workaround for amdgpu MES hangs/freezes + "amdgpu.cwsr_enable=0" ]; }; From 36dbe0fc9c9306e4dfb938d32ada90404a34c980 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 22 Mar 2026 13:02:12 -0400 Subject: [PATCH 638/724] noctalia: use nixpkgs package --- home-manager/progs/noctalia.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home-manager/progs/noctalia.nix b/home-manager/progs/noctalia.nix index 9bbd4f2..e62520c 100644 --- a/home-manager/progs/noctalia.nix +++ b/home-manager/progs/noctalia.nix @@ -12,6 +12,7 @@ programs.noctalia-shell = { enable = true; + package = pkgs.noctalia-shell; settings = { bar = { position = "top"; From e2dbe841c0874b58c46580effdc2ea13d5589c26 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 22 Mar 2026 16:30:12 -0700 Subject: [PATCH 639/724] timezone: EST -> PST --- system/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/common.nix b/system/common.nix index fac2609..fd05c5f 100644 --- a/system/common.nix +++ b/system/common.nix @@ -188,8 +188,8 @@ }; }; - # EST - time.timeZone = "America/New_York"; + # PST + time.timeZone = "America/Los_Angeles"; security = { # lets use doas and not sudo! From 577d93fd8d1974b6a69d7262e229ffadedc3e7a8 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 22 Mar 2026 21:09:00 -0700 Subject: [PATCH 640/724] opencode: opencode-claude-auth -> opencode-claude-bridge --- flake.lock | 17 +++++++++++++++++ flake.nix | 5 +++++ home-manager/progs/opencode.nix | 24 +++++++++++++++++++++++- 3 files changed, 45 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index 81ddb90..34a7811 100644 --- a/flake.lock +++ b/flake.lock @@ -688,6 +688,22 @@ "type": "github" } }, + "opencode-claude-bridge": { + "flake": false, + "locked": { + "lastModified": 1774233188, + "narHash": "sha256-Fs4/wK+jq8mEf818bXyO95rfFqAXPLMDJKtHbokxQwA=", + "owner": "dotCipher", + "repo": "opencode-claude-bridge", + "rev": "30fc53b9c4f0cc7b0d351e5744e819e015f7fb8b", + "type": "github" + }, + "original": { + "owner": "dotCipher", + "repo": "opencode-claude-bridge", + "type": "github" + } + }, "pre-commit": { "inputs": { "flake-compat": "flake-compat_2", @@ -730,6 +746,7 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", "noctalia": "noctalia", + "opencode-claude-bridge": "opencode-claude-bridge", "rust-overlay": "rust-overlay", "zen-browser": "zen-browser" } diff --git a/flake.nix b/flake.nix index 67720b7..7a15588 100644 --- a/flake.nix +++ b/flake.nix @@ -92,6 +92,11 @@ claude-code = { url = "github:sadjow/claude-code-nix"; }; + + opencode-claude-bridge = { + url = "github:dotCipher/opencode-claude-bridge"; + flake = false; + }; }; outputs = diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index a404b17..3882b4f 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -11,6 +11,25 @@ let opus-model = "anthropic/claude-opus-4-6"; + opencode-claude-bridge = pkgs.buildNpmPackage { + pname = "opencode-claude-bridge"; + version = "1.4.2"; + src = inputs.opencode-claude-bridge; + npmDepsHash = "sha256-ObXygd33J2PC9N3gKNtkv8mXQFKBm6Kayr37NpZQsgA="; + buildPhase = '' + runHook preBuild + npx tsc + runHook postBuild + ''; + # the plugin entry point is dist/index.js + installPhase = '' + runHook preInstall + mkdir -p $out/lib/opencode-claude-bridge + cp -r dist $out/lib/opencode-claude-bridge/ + runHook postInstall + ''; + }; + ohMyOpencodeConfig = { "$schema" = "https://raw.githubusercontent.com/code-yeongyu/oh-my-opencode/master/assets/oh-my-opencode.schema.json"; @@ -60,6 +79,9 @@ in xdg.configFile."opencode/plugins/oh-my-opencode.js".source = "${oh-my-opencode-pkg}/lib/oh-my-opencode/dist/index.js"; + xdg.configFile."opencode/plugins/opencode-claude-bridge.js".source = + "${opencode-claude-bridge}/lib/opencode-claude-bridge/dist/index.js"; + xdg.configFile."opencode/skills/playwright.md".text = let browsers = pkgs.playwright-driver.browsers; @@ -175,7 +197,7 @@ in autoshare = false; autoupdate = false; agent = { }; - plugin = [ "opencode-claude-auth" ]; + plugin = [ ]; provider = { openrouter = { models = { From c2720bcb1180a40e92d1aa6d668eca71230f49b1 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 22 Mar 2026 21:09:25 -0700 Subject: [PATCH 641/724] .gitignore: add result --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c4a847d --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/result From fcab26f20e8f15e12ee708e8a81f854bbad03bfa Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 23 Mar 2026 08:41:20 -0700 Subject: [PATCH 642/724] zen: add redirects to alternative front ends --- home-manager/progs/zen/default.nix | 3 ++ home-manager/progs/zen/redirector.nix | 75 +++++++++++++++++++++++++++ 2 files changed, 78 insertions(+) create mode 100644 home-manager/progs/zen/redirector.nix diff --git a/home-manager/progs/zen/default.nix b/home-manager/progs/zen/default.nix index 78a2adf..318264e 100644 --- a/home-manager/progs/zen/default.nix +++ b/home-manager/progs/zen/default.nix @@ -26,6 +26,7 @@ let ublockSettings = import ./ublock.nix { inherit lib; }; darkReaderSettings = import ./dark-reader.nix { inherit lib; }; + redirectorSettings = import ./redirector.nix { inherit lib; }; in { programs.zen-browser = { @@ -44,6 +45,7 @@ in darkreader fastforwardteam localcdn + redirector refined-github return-youtube-dislikes search-by-image # reverse image search @@ -57,6 +59,7 @@ in settings = { "uBlock0@raymondhill.net" = ublockSettings; "addon@darkreader.org" = darkReaderSettings; + "redirector@einaregilsson.com" = redirectorSettings; }; }; diff --git a/home-manager/progs/zen/redirector.nix b/home-manager/progs/zen/redirector.nix new file mode 100644 index 0000000..160bff4 --- /dev/null +++ b/home-manager/progs/zen/redirector.nix @@ -0,0 +1,75 @@ +# Redirector extension settings +# Addon ID: redirector@einaregilsson.com +# +# To add a new redirect, just add another mkRedirect call to the list: +# (mkRedirect { from = "youtube.com"; to = "invidious.example.com"; description = "YouTube to Invidious"; }) +{ lib }: +let + # helper to create a redirect rule from a simple domain mapping. + # handles www. subdomains automatically. for other subdomains + # (like old.reddit.com), create a separate rule with the full domain. + mkRedirect = + { + from, + to, + description, + }: + let + escapedFrom = builtins.replaceStrings [ "." ] [ "\\." ] from; + in + { + inherit description; + exampleUrl = "https://${from}/example"; + exampleResult = "https://${to}/example"; + error = null; + includePattern = "^https?://(www\\.)?${escapedFrom}(.*)$"; + excludePattern = ""; + patternDesc = ""; + redirectUrl = "https://${to}$2"; + patternType = "R"; + processMatches = "noProcessing"; + disabled = false; + grouped = false; + appliesTo = [ "main_frame" ]; + }; +in +{ + force = true; + settings = { + redirects = [ + (mkRedirect { + from = "x.com"; + to = "xcancel.com"; + description = "X to xcancel"; + }) + (mkRedirect { + from = "twitter.com"; + to = "xcancel.com"; + description = "Twitter to xcancel"; + }) + (mkRedirect { + from = "reddit.com"; + to = "safereddit.com"; + description = "Reddit to Redlib"; + }) + (mkRedirect { + from = "old.reddit.com"; + to = "safereddit.com"; + description = "Old Reddit to Redlib"; + }) + (mkRedirect { + from = "new.reddit.com"; + to = "safereddit.com"; + description = "New Reddit to Redlib"; + }) + (mkRedirect { + from = "np.reddit.com"; + to = "safereddit.com"; + description = "NP Reddit to Redlib"; + }) + ]; + disabled = false; + logging = false; + enableNotifications = false; + }; +} From 603445c6ed7ea1d5afa0ba93c8c7401946d9b9b4 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 24 Mar 2026 22:24:37 -0700 Subject: [PATCH 643/724] opencode: opencode-claude-bridge update --- flake.lock | 6 +++--- home-manager/progs/opencode.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 34a7811..3fe349a 100644 --- a/flake.lock +++ b/flake.lock @@ -691,11 +691,11 @@ "opencode-claude-bridge": { "flake": false, "locked": { - "lastModified": 1774233188, - "narHash": "sha256-Fs4/wK+jq8mEf818bXyO95rfFqAXPLMDJKtHbokxQwA=", + "lastModified": 1774295363, + "narHash": "sha256-l8IQjPA/TUdxN1O/qcLVIeZ2ev2PfEBOS5pQQIGZIW8=", "owner": "dotCipher", "repo": "opencode-claude-bridge", - "rev": "30fc53b9c4f0cc7b0d351e5744e819e015f7fb8b", + "rev": "fc3f8b1f11074fb0023d5a8c31223100e6f1b848", "type": "github" }, "original": { diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index 3882b4f..f62c86c 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -15,7 +15,7 @@ let pname = "opencode-claude-bridge"; version = "1.4.2"; src = inputs.opencode-claude-bridge; - npmDepsHash = "sha256-ObXygd33J2PC9N3gKNtkv8mXQFKBm6Kayr37NpZQsgA="; + npmDepsHash = "sha256-fPk1WuJsRjGp3J4oUeXSz5BV6ePAWOYNeDAYQDUQd2Y="; buildPhase = '' runHook preBuild npx tsc From 44813681ab50b9e95cd0916909aee07c94c181cd Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 25 Mar 2026 22:08:05 -0700 Subject: [PATCH 644/724] update --- flake.lock | 136 ++++++++++++++++++++++++----------------------------- 1 file changed, 62 insertions(+), 74 deletions(-) diff --git a/flake.lock b/flake.lock index 3fe349a..51bd56d 100644 --- a/flake.lock +++ b/flake.lock @@ -65,11 +65,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1774106245, - "narHash": "sha256-gB3XhG900wWKDa/dbqgK0wFGRf8u9PQhqN/SvnTZlIM=", + "lastModified": 1774488690, + "narHash": "sha256-r5yQpoa4AqDOkwKflMMFOviC39XzpqrG1D+1xejn77c=", "owner": "sadjow", "repo": "claude-code-nix", - "rev": "0b01bf3b7cb403ef11f502183b6de55e2aaccf88", + "rev": "61d07ce0f48f63f098ed7d4e23018c416ed37b90", "type": "github" }, "original": { @@ -80,11 +80,11 @@ }, "crane": { "locked": { - "lastModified": 1772080396, - "narHash": "sha256-84W9UNtSk9DNMh43WBkOjpkbfODlmg+RDi854PnNgLE=", + "lastModified": 1773189535, + "narHash": "sha256-E1G/Or6MWeP+L6mpQ0iTFLpzSzlpGrITfU2220Gq47g=", "owner": "ipetkov", "repo": "crane", - "rev": "8525580bc0316c39dbfa18bd09a1331e98c9e463", + "rev": "6fa2fb4cf4a89ba49fc9dd5a3eb6cde99d388269", "type": "github" }, "original": { @@ -139,11 +139,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1773987920, - "narHash": "sha256-iO4svl8iB3zo1GArQpiFg+IBi/mENxn+AOCgOlMuO4Q=", + "lastModified": 1774080407, + "narHash": "sha256-FYbalilgDFjIVwK+D6DjDos1IMmMGA20lRf8k6Ykm1Y=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "ebf77f71c43cf4ff2cef5fb7f29cb3e189f17647", + "rev": "d8d75443d39d95f3c5256504eb838e0acc62ef44", "type": "github" }, "original": { @@ -162,11 +162,11 @@ ] }, "locked": { - "lastModified": 1774110692, - "narHash": "sha256-0JPH7CPdBCxx5IWNXZuqeiTwK8jS5ClT3xIO5brPNhI=", + "lastModified": 1774496997, + "narHash": "sha256-8QxqyYSKbkWXtYjI8EGemmdDc3JKAOe5pk9As0NrGC8=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "e7876ebeff5bd7dcb1fcec5222f9f3a6f2ec7d89", + "rev": "aedc3813aa6452f5bc466bdbef7daa60ecae2bc5", "type": "github" }, "original": { @@ -183,11 +183,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1774065775, - "narHash": "sha256-anJXbdfZMhXWjHSfB5v6e8+yv1ASTHM4TwikH8tloMI=", + "lastModified": 1774497795, + "narHash": "sha256-tzgxKaCEMcU6XT0fjV/vEqDCM9yij6wBgPPBKiK8Dfk=", "owner": "rycee", "repo": "nur-expressions", - "rev": "4b3bbb9dc3c80d1b62228c9a2ca0bef74a24a192", + "rev": "11af6f465a038233b8123022dcb7e293f3229f11", "type": "gitlab" }, "original": { @@ -315,11 +315,11 @@ ] }, "locked": { - "lastModified": 1774007980, - "narHash": "sha256-FOnZjElEI8pqqCvB6K/1JRHTE8o4rer8driivTpq2uo=", + "lastModified": 1774379316, + "narHash": "sha256-0nGNxWDUH2Hzlj/R3Zf4FEK6fsFNB/dvewuboSRZqiI=", "owner": "nix-community", "repo": "home-manager", - "rev": "9670de2921812bc4e0452f6e3efd8c859696c183", + "rev": "1eb0549a1ab3fe3f5acf86668249be15fa0e64f7", "type": "github" }, "original": { @@ -374,11 +374,11 @@ ] }, "locked": { - "lastModified": 1773949806, - "narHash": "sha256-W25eg57cTQSwey9nEf1AhHy895Yiwq74PgyJl2EuY3Q=", + "lastModified": 1774333446, + "narHash": "sha256-jeAUd4mfLle7Zw8F3lDdXvw2cmeP3FgVphHq2XuEKbs=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "425b357e190632600ca2b2daea3bdf28d57e3047", + "rev": "79b45622eff2ae0437d7a712610044bbc7b87fa2", "type": "github" }, "original": { @@ -420,11 +420,11 @@ ] }, "locked": { - "lastModified": 1773344150, - "narHash": "sha256-JSsXufJy2zdg5XS5pRGlkwF1dqN+sWPmCgrvJsnhEzg=", + "lastModified": 1774433292, + "narHash": "sha256-wFeQPKZfSSVv7BAYpRK31UBy1V9/pPJ9/hLaLJIgIp0=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "d21013305ef39e1d9d2d06b161c3785ffad82281", + "rev": "1e7ee8915a87c0675aa4532d70eb1a26e9b94cd8", "type": "github" }, "original": { @@ -445,11 +445,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1774104280, - "narHash": "sha256-kQeR1qqTFleJzMWsOttJMWUxMsykcKrUA2ttPIg2O4k=", + "lastModified": 1774495900, + "narHash": "sha256-3nR7HKulLSib37PWcWrfELuSrikFLiTqAqX2HQ9dV7g=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "4f6fca6b05c5b59b6bbb442a262596ddf86661e8", + "rev": "3e06fd5f99381f8101c8e7b5a1473154dd0095cd", "type": "github" }, "original": { @@ -472,11 +472,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1774113359, - "narHash": "sha256-b7/LsPn5uZoFNjGVQ26q+6QPf8Q9IHHmRx+rGLZ8oyY=", + "lastModified": 1774489385, + "narHash": "sha256-xGyog2cPoxTo8O6vW0CiCCUhkt866qpI3PN2su9XjV0=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "1c4a800bbe0c4cbcf99529fd88286a14450261a8", + "rev": "11fe033ac3d0a97c1e62ffb33f9a6a1852fedab1", "type": "github" }, "original": { @@ -530,11 +530,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1773997252, - "narHash": "sha256-Yb3E25nkGye4YLc3in90mZp+qT5TgXWq3z5KQduAmoQ=", + "lastModified": 1774265710, + "narHash": "sha256-ar8pFUSAxXhV7DpVRjNvgviWuqOqWPAImb4MM7lSh5Y=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "f0ce2c9e437124550d7e138b49dceef12a3a3001", + "rev": "f6022b9192e034a817373692ede18a9319cf9730", "type": "github" }, "original": { @@ -582,11 +582,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1774018263, - "narHash": "sha256-HHYEwK1A22aSaxv2ibhMMkKvrDGKGlA/qObG4smrSqc=", + "lastModified": 1774465523, + "narHash": "sha256-4v7HPm63Q90nNn4fgkgKsjW1AH2Klw7XzPtHJr562nM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "2d4b4717b2534fad5c715968c1cece04a172b365", + "rev": "de895be946ad1d8aafa0bb6dfc7e7e0e9e466a29", "type": "github" }, "original": { @@ -598,11 +598,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1773628058, - "narHash": "sha256-hpXH0z3K9xv0fHaje136KY872VT2T5uwxtezlAskQgY=", + "lastModified": 1774273680, + "narHash": "sha256-a++tZ1RQsDb1I0NHrFwdGuRlR5TORvCEUksM459wKUA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f8573b9c935cfaa162dd62cc9e75ae2db86f85df", + "rev": "fdc7b8f7b30fdbedec91b71ed82f36e1637483ed", "type": "github" }, "original": { @@ -614,11 +614,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1773821835, - "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", + "lastModified": 1774386573, + "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0", + "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9", "type": "github" }, "original": { @@ -628,22 +628,6 @@ "type": "github" } }, - "nixpkgs_3": { - "locked": { - "lastModified": 1770107345, - "narHash": "sha256-tbS0Ebx2PiA1FRW8mt8oejR0qMXmziJmPaU1d4kYY9g=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "4533d9293756b63904b7238acb84ac8fe4c8c2c4", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "noctalia": { "inputs": { "nixpkgs": [ @@ -652,11 +636,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1774121595, - "narHash": "sha256-+NlTqaXbEwvL23RSCRiWn5jpRPeQPKWoPs753V3+WL4=", + "lastModified": 1774487699, + "narHash": "sha256-iML1zRJOue/KYoeChmgNBkzh24UMAT0PgIEEgcI/140=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "6b30925fb400c493e21494fb82af92d5b0f6d210", + "rev": "df62bb3212d474276e66c17986f2032362c0991d", "type": "github" }, "original": { @@ -675,11 +659,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1774059741, - "narHash": "sha256-ObYsrf7XLJDqWVbJ+GWH5JYV/EUc7SVdhGx5r5wWKno=", + "lastModified": 1774351986, + "narHash": "sha256-N131zILQ06ZNEvtgtjjFZ0N5qEI70rKKhCZsBcZoDH8=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "c9beee5c634ec784af128b8e7c56db14012ab17f", + "rev": "066835ebd5daeabc86df1e62fb5fe82a51407cc0", "type": "github" }, "original": { @@ -714,11 +698,11 @@ ] }, "locked": { - "lastModified": 1772024342, - "narHash": "sha256-+eXlIc4/7dE6EcPs9a2DaSY3fTA9AE526hGqkNID3Wg=", + "lastModified": 1772893680, + "narHash": "sha256-JDqZMgxUTCq85ObSaFw0HhE+lvdOre1lx9iI6vYyOEs=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "6e34e97ed9788b17796ee43ccdbaf871a5c2b476", + "rev": "8baab586afc9c9b57645a734c820e4ac0a604af9", "type": "github" }, "original": { @@ -758,11 +742,11 @@ ] }, "locked": { - "lastModified": 1774062094, - "narHash": "sha256-ba3c+hS7KzEiwtZRGHagIAYdcmdY3rCSWVCyn64rx7s=", + "lastModified": 1774494762, + "narHash": "sha256-lt22GCJZ6qBQLgNZZl3S/RUjTLXTlEy0Fn0sqMttLxQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c807e83cc2e32adc35f51138b3bdef722c0812ab", + "rev": "ce3b3a61ebf28670dfc8b97eb35ed9e24474a2cf", "type": "github" }, "original": { @@ -884,7 +868,11 @@ }, "treefmt-nix_2": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": [ + "noctalia", + "noctalia-qs", + "nixpkgs" + ] }, "locked": { "lastModified": 1772660329, @@ -961,11 +949,11 @@ ] }, "locked": { - "lastModified": 1774103303, - "narHash": "sha256-ZKsQGY0D4DLe3071/RZSQHLqqmFvsA38PudjEvnPbZI=", + "lastModified": 1774478219, + "narHash": "sha256-WyPQoYBde7TSCR45ZgofzBqvVo/MpH3Vkh8YMj9OZC0=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "ae52b215dd66f73cb131106b7588f3a983617cee", + "rev": "2e49c5278af6ef5f1e17e0fd27c2e22b1a7edc38", "type": "github" }, "original": { From 8cad7aa618fbf6bf7b62b342b836a50b80d8b679 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 26 Mar 2026 19:43:10 -0700 Subject: [PATCH 645/724] linux kernel: 6.19.9 -> 7.0-rc4 --- system/common.nix | 6 ++---- system/system-mreow.nix | 6 ------ 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/system/common.nix b/system/common.nix index fd05c5f..d6f97ed 100644 --- a/system/common.nix +++ b/system/common.nix @@ -86,8 +86,8 @@ # kernel options boot = { - kernelPackages = pkgs.linuxPackages_latest; - # kernelPackages = pkgs.linuxPackages; + kernelPackages = pkgs.linuxPackages_testing; + # kernelPackages = pkgs.linuxPackages_latest; lanzaboote = { enable = true; @@ -135,8 +135,6 @@ "hugepagesz=1G" "hugepages=3" - # disable compute wave store and resume β€” workaround for amdgpu MES hangs/freezes - "amdgpu.cwsr_enable=0" ]; }; diff --git a/system/system-mreow.nix b/system/system-mreow.nix index aadfc75..ecfc6ad 100644 --- a/system/system-mreow.nix +++ b/system/system-mreow.nix @@ -14,12 +14,6 @@ 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"; From 1c58f56f26e17a3ba042d2a8275cc94229ec351f Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 26 Mar 2026 19:45:46 -0700 Subject: [PATCH 646/724] disable gtk4 themeing --- home-manager/gui.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/home-manager/gui.nix b/home-manager/gui.nix index 40b5b94..4f067be 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -188,6 +188,8 @@ package = pkgs.adw-gtk3; name = "adw-gtk3-dark"; }; + # gtk4 apps use libadwaita natively, no theme package needed + gtk4.theme = null; iconTheme = { package = pkgs.adwaita-icon-theme; name = "Adwaita"; From e77f28900cbc29268dd01ded59544aa9b4e68c4e Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 26 Mar 2026 19:53:06 -0700 Subject: [PATCH 647/724] linux kernel: fix 7.0 build --- system/common.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/system/common.nix b/system/common.nix index d6f97ed..ac618c2 100644 --- a/system/common.nix +++ b/system/common.nix @@ -1,5 +1,6 @@ { config, + options, pkgs, lib, username, @@ -89,6 +90,11 @@ kernelPackages = pkgs.linuxPackages_testing; # kernelPackages = pkgs.linuxPackages_latest; + # aes_generic is built-in as of linux 7.0, no longer a loadable module + initrd.luks.cryptoModules = lib.mkForce ( + lib.filter (m: m != "aes_generic") options.boot.initrd.luks.cryptoModules.default + ); + lanzaboote = { enable = true; # TODO: proper secrets management so this is not stored in nix store From 9502abdb298f73be1716520ab28caf46f7db44eb Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 27 Mar 2026 10:57:27 -0700 Subject: [PATCH 648/724] update --- flake.lock | 88 +++++++++++++++++++++++++++--------------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/flake.lock b/flake.lock index 51bd56d..5282671 100644 --- a/flake.lock +++ b/flake.lock @@ -65,11 +65,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1774488690, - "narHash": "sha256-r5yQpoa4AqDOkwKflMMFOviC39XzpqrG1D+1xejn77c=", + "lastModified": 1774566314, + "narHash": "sha256-l54rvxjeMUBgEVbbwvV6pY+9m1kFuUxgF9THr8d/4YY=", "owner": "sadjow", "repo": "claude-code-nix", - "rev": "61d07ce0f48f63f098ed7d4e23018c416ed37b90", + "rev": "a55736b1b9d30357ba0aeb32ffe710dc929a235e", "type": "github" }, "original": { @@ -162,11 +162,11 @@ ] }, "locked": { - "lastModified": 1774496997, - "narHash": "sha256-8QxqyYSKbkWXtYjI8EGemmdDc3JKAOe5pk9As0NrGC8=", + "lastModified": 1774630573, + "narHash": "sha256-jnV/gb+Nt46BvByT0mYnNt0XnnVMsFzcUArX6O774sY=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "aedc3813aa6452f5bc466bdbef7daa60ecae2bc5", + "rev": "199a1fe2e47f7fb68cb7aa8616f3a1344355dbaf", "type": "github" }, "original": { @@ -183,11 +183,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1774497795, - "narHash": "sha256-tzgxKaCEMcU6XT0fjV/vEqDCM9yij6wBgPPBKiK8Dfk=", + "lastModified": 1774584175, + "narHash": "sha256-3g85c0I2xSgcAayR6tRYPovsF9eBosN6AwBcoFiL+GY=", "owner": "rycee", "repo": "nur-expressions", - "rev": "11af6f465a038233b8123022dcb7e293f3229f11", + "rev": "9e84571429d01fc3971f05ee3daa3316516b460f", "type": "gitlab" }, "original": { @@ -315,11 +315,11 @@ ] }, "locked": { - "lastModified": 1774379316, - "narHash": "sha256-0nGNxWDUH2Hzlj/R3Zf4FEK6fsFNB/dvewuboSRZqiI=", + "lastModified": 1774626137, + "narHash": "sha256-1WelwA45Xm4glTG8R9IX9jYeFKDG2HbR79jAauLezUE=", "owner": "nix-community", "repo": "home-manager", - "rev": "1eb0549a1ab3fe3f5acf86668249be15fa0e64f7", + "rev": "9df3a639007cfe0d074433f7fc225ea94f877d08", "type": "github" }, "original": { @@ -374,11 +374,11 @@ ] }, "locked": { - "lastModified": 1774333446, - "narHash": "sha256-jeAUd4mfLle7Zw8F3lDdXvw2cmeP3FgVphHq2XuEKbs=", + "lastModified": 1774614108, + "narHash": "sha256-7syLwVkCqf+uYeLK41e33TeeYArF6xUzveitVi0OLus=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "79b45622eff2ae0437d7a712610044bbc7b87fa2", + "rev": "4912ff360a2051f220842a94e9e803ff5ff26687", "type": "github" }, "original": { @@ -420,11 +420,11 @@ ] }, "locked": { - "lastModified": 1774433292, - "narHash": "sha256-wFeQPKZfSSVv7BAYpRK31UBy1V9/pPJ9/hLaLJIgIp0=", + "lastModified": 1774553602, + "narHash": "sha256-BWM5X4JYmHJm3zoS9MFaxjPsDdR1sUs46O3ySiRNGy4=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "1e7ee8915a87c0675aa4532d70eb1a26e9b94cd8", + "rev": "6afcbf17d051e244cdaf371bca0aa33c85e8cf0e", "type": "github" }, "original": { @@ -445,11 +445,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1774495900, - "narHash": "sha256-3nR7HKulLSib37PWcWrfELuSrikFLiTqAqX2HQ9dV7g=", + "lastModified": 1774623710, + "narHash": "sha256-UVVA1OCUeDm7fnH98G+Okfb6vUuA1in89LZGDgVWR/4=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "3e06fd5f99381f8101c8e7b5a1473154dd0095cd", + "rev": "4814adf48100a2138b02591e6a7e000c106887b1", "type": "github" }, "original": { @@ -472,11 +472,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1774489385, - "narHash": "sha256-xGyog2cPoxTo8O6vW0CiCCUhkt866qpI3PN2su9XjV0=", + "lastModified": 1774620721, + "narHash": "sha256-QucawBaJ6Rl5JWAXAbpouXM1MsvlzwCsPGl3zOwLtzw=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "11fe033ac3d0a97c1e62ffb33f9a6a1852fedab1", + "rev": "fb83d584532282f585cd02f3aa513e98b843e7e7", "type": "github" }, "original": { @@ -505,11 +505,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1773130184, - "narHash": "sha256-3bwx4WqCB06yfQIGB+OgIckOkEDyKxiTD5pOo4Xz2rI=", + "lastModified": 1774616418, + "narHash": "sha256-z+dLkAS4bqytIlOI4h2MnjBJrSP4d1Awx0n+IV5YA3Y=", "owner": "YaLTeR", "repo": "niri", - "rev": "b07bde3ee82dd73115e6b949e4f3f63695da35ea", + "rev": "8f48f56fe19918b5cfa02e5d68a47ebaf7bf3dee", "type": "github" }, "original": { @@ -582,11 +582,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1774465523, - "narHash": "sha256-4v7HPm63Q90nNn4fgkgKsjW1AH2Klw7XzPtHJr562nM=", + "lastModified": 1774567711, + "narHash": "sha256-uVlOHBvt6Vc/iYNJXLPa4c3cLXwMllOCVfAaLAcphIo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "de895be946ad1d8aafa0bb6dfc7e7e0e9e466a29", + "rev": "3f6f874dfc34d386d10e434c48ad966c4832243e", "type": "github" }, "original": { @@ -636,11 +636,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1774487699, - "narHash": "sha256-iML1zRJOue/KYoeChmgNBkzh24UMAT0PgIEEgcI/140=", + "lastModified": 1774621124, + "narHash": "sha256-VWUwuU2uRUtq0PWFYViu05fFiobs5uEDhqKUywpNJGk=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "df62bb3212d474276e66c17986f2032362c0991d", + "rev": "8a3aafc69f0f005a0a689b7d859d0ad32df3a639", "type": "github" }, "original": { @@ -659,11 +659,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1774351986, + "lastModified": 1774556355, "narHash": "sha256-N131zILQ06ZNEvtgtjjFZ0N5qEI70rKKhCZsBcZoDH8=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "066835ebd5daeabc86df1e62fb5fe82a51407cc0", + "rev": "070340934ca374bc770fd500a0fd7b3210f06b1c", "type": "github" }, "original": { @@ -675,11 +675,11 @@ "opencode-claude-bridge": { "flake": false, "locked": { - "lastModified": 1774295363, - "narHash": "sha256-l8IQjPA/TUdxN1O/qcLVIeZ2ev2PfEBOS5pQQIGZIW8=", + "lastModified": 1774537245, + "narHash": "sha256-G2/GOP6gUGM2NBfOeSsUDnSus/engduft5z3Y7GwtUE=", "owner": "dotCipher", "repo": "opencode-claude-bridge", - "rev": "fc3f8b1f11074fb0023d5a8c31223100e6f1b848", + "rev": "568ca15b5d2b772ebbad14b0b545fa7670272e79", "type": "github" }, "original": { @@ -742,11 +742,11 @@ ] }, "locked": { - "lastModified": 1774494762, - "narHash": "sha256-lt22GCJZ6qBQLgNZZl3S/RUjTLXTlEy0Fn0sqMttLxQ=", + "lastModified": 1774581174, + "narHash": "sha256-258qgkMkYPkJ9qpIg63Wk8GoIbVjszkGGPU1wbVHYTk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ce3b3a61ebf28670dfc8b97eb35ed9e24474a2cf", + "rev": "a313afc75b85fc77ac154bf0e62c36f68361fd0b", "type": "github" }, "original": { @@ -949,11 +949,11 @@ ] }, "locked": { - "lastModified": 1774478219, - "narHash": "sha256-WyPQoYBde7TSCR45ZgofzBqvVo/MpH3Vkh8YMj9OZC0=", + "lastModified": 1774605342, + "narHash": "sha256-VEcy7N8TExxCsDem0SUsqJJlTcUm0y4vaSPYCghe5W8=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "2e49c5278af6ef5f1e17e0fd27c2e22b1a7edc38", + "rev": "4916e4d7ab444c544c3f36cc9fafe58cdb0f7237", "type": "github" }, "original": { From 852700fa9954ff1dd659a5133cad3e99a4fe147d Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 27 Mar 2026 18:14:14 -0700 Subject: [PATCH 649/724] opencode: opencode-claude-bridge update --- home-manager/progs/opencode.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index f62c86c..7dbb774 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -13,9 +13,9 @@ let opencode-claude-bridge = pkgs.buildNpmPackage { pname = "opencode-claude-bridge"; - version = "1.4.2"; + version = "1.8.0"; src = inputs.opencode-claude-bridge; - npmDepsHash = "sha256-fPk1WuJsRjGp3J4oUeXSz5BV6ePAWOYNeDAYQDUQd2Y="; + npmDepsHash = "sha256-jH/UweuHqfeLxICxNRsBODWOBfVdE+ZgIinfW/ITSSc="; buildPhase = '' runHook preBuild npx tsc From 42de1a722f34a09d758ea2a785cc6f2e3fa4612e Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 27 Mar 2026 22:25:44 -0700 Subject: [PATCH 650/724] update --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 5282671..53393d4 100644 --- a/flake.lock +++ b/flake.lock @@ -65,11 +65,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1774566314, - "narHash": "sha256-l54rvxjeMUBgEVbbwvV6pY+9m1kFuUxgF9THr8d/4YY=", + "lastModified": 1774649084, + "narHash": "sha256-GNyQRoMJxxasuw2/cOYSU4KEwLVwFr81c2UpVM1vGko=", "owner": "sadjow", "repo": "claude-code-nix", - "rev": "a55736b1b9d30357ba0aeb32ffe710dc929a235e", + "rev": "f632b3d71e2dbebedeccb0a09a42f27a53af1a33", "type": "github" }, "original": { @@ -162,11 +162,11 @@ ] }, "locked": { - "lastModified": 1774630573, - "narHash": "sha256-jnV/gb+Nt46BvByT0mYnNt0XnnVMsFzcUArX6O774sY=", + "lastModified": 1774666427, + "narHash": "sha256-Z4WW5ezVa8tK1DgHSWrGs0neLD8Lek1Bm02UjiXNwPc=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "199a1fe2e47f7fb68cb7aa8616f3a1344355dbaf", + "rev": "5c303fb84c850ad232522a0c99f2c717fe2ce16a", "type": "github" }, "original": { @@ -183,11 +183,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1774584175, - "narHash": "sha256-3g85c0I2xSgcAayR6tRYPovsF9eBosN6AwBcoFiL+GY=", + "lastModified": 1774670586, + "narHash": "sha256-dmJj7XbSJjLUGDlyHxLK6ijGyl55jQyYafNOUrIFSZ8=", "owner": "rycee", "repo": "nur-expressions", - "rev": "9e84571429d01fc3971f05ee3daa3316516b460f", + "rev": "81ee38f72dbc9c06fb0a198819a8e934bbe82502", "type": "gitlab" }, "original": { @@ -315,11 +315,11 @@ ] }, "locked": { - "lastModified": 1774626137, - "narHash": "sha256-1WelwA45Xm4glTG8R9IX9jYeFKDG2HbR79jAauLezUE=", + "lastModified": 1774647770, + "narHash": "sha256-UNNi14XiqRWWjO8ykbFwA5wRwx7EscsC+GItOVpuGjc=", "owner": "nix-community", "repo": "home-manager", - "rev": "9df3a639007cfe0d074433f7fc225ea94f877d08", + "rev": "02371c05a04a2876cf92e2d67a259e8f87399068", "type": "github" }, "original": { @@ -445,11 +445,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1774623710, - "narHash": "sha256-UVVA1OCUeDm7fnH98G+Okfb6vUuA1in89LZGDgVWR/4=", + "lastModified": 1774668340, + "narHash": "sha256-ylJdC183ipwYKLZDWpPynZA4HKJ4oiav+JMbKE73X1U=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "4814adf48100a2138b02591e6a7e000c106887b1", + "rev": "9ab5add7450c178e21479619c6db52111d88d167", "type": "github" }, "original": { @@ -636,11 +636,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1774621124, - "narHash": "sha256-VWUwuU2uRUtq0PWFYViu05fFiobs5uEDhqKUywpNJGk=", + "lastModified": 1774660386, + "narHash": "sha256-gXsUqjhm7qiEq6bwnRMOTPxwuK+WmNp9BKaMO9VmmAE=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "8a3aafc69f0f005a0a689b7d859d0ad32df3a639", + "rev": "ed1a2b54de22f0841f61fbcb8c26f4959a1dc205", "type": "github" }, "original": { @@ -659,11 +659,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1774556355, - "narHash": "sha256-N131zILQ06ZNEvtgtjjFZ0N5qEI70rKKhCZsBcZoDH8=", + "lastModified": 1774625568, + "narHash": "sha256-k/1eM1e7IZo4qFXY6e8EEDaSR8DIHUoTVplxeiGfY24=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "070340934ca374bc770fd500a0fd7b3210f06b1c", + "rev": "c08a0c522371db506a9952da92593149a9341ddd", "type": "github" }, "original": { @@ -742,11 +742,11 @@ ] }, "locked": { - "lastModified": 1774581174, - "narHash": "sha256-258qgkMkYPkJ9qpIg63Wk8GoIbVjszkGGPU1wbVHYTk=", + "lastModified": 1774667365, + "narHash": "sha256-+JamhonkPyti+oqfl1ySAyF2L02adhCEcdZOzpSukq8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a313afc75b85fc77ac154bf0e62c36f68361fd0b", + "rev": "98caaa8cd1fbcc45913d1bb2b7fbabcf3e8d967a", "type": "github" }, "original": { @@ -949,11 +949,11 @@ ] }, "locked": { - "lastModified": 1774605342, - "narHash": "sha256-VEcy7N8TExxCsDem0SUsqJJlTcUm0y4vaSPYCghe5W8=", + "lastModified": 1774673612, + "narHash": "sha256-z4SWAbnq3KMBxKiUTJcvve7ZoPC3KaNCLUe30F67K+4=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "4916e4d7ab444c544c3f36cc9fafe58cdb0f7237", + "rev": "660cf61b157f014f4e09f316da150e9ab1f6ea6a", "type": "github" }, "original": { From 6c7159f09b1e5ccaf61ffa8c1a89bd28ca5f7da3 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 28 Mar 2026 07:11:33 -0700 Subject: [PATCH 651/724] Revert "timezone: EST -> PST" This reverts commit e2dbe841c0874b58c46580effdc2ea13d5589c26. --- system/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/common.nix b/system/common.nix index ac618c2..d8d152a 100644 --- a/system/common.nix +++ b/system/common.nix @@ -192,8 +192,8 @@ }; }; - # PST - time.timeZone = "America/Los_Angeles"; + # EST + time.timeZone = "America/New_York"; security = { # lets use doas and not sudo! From 5cfb9141e5b6158028acb710fbe8e537607dd326 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 29 Mar 2026 15:44:35 -0400 Subject: [PATCH 652/724] update --- flake.lock | 72 +++++++++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/flake.lock b/flake.lock index 53393d4..2dd2a2a 100644 --- a/flake.lock +++ b/flake.lock @@ -65,11 +65,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1774649084, - "narHash": "sha256-GNyQRoMJxxasuw2/cOYSU4KEwLVwFr81c2UpVM1vGko=", + "lastModified": 1774753128, + "narHash": "sha256-Knvqj+Bt5fW0aPfXKmOPknzVWdsIYXhC5faRolsqEcI=", "owner": "sadjow", "repo": "claude-code-nix", - "rev": "f632b3d71e2dbebedeccb0a09a42f27a53af1a33", + "rev": "cd6245f3f60bbbf18b9b963d463fcf6fcd5e90c6", "type": "github" }, "original": { @@ -162,11 +162,11 @@ ] }, "locked": { - "lastModified": 1774666427, - "narHash": "sha256-Z4WW5ezVa8tK1DgHSWrGs0neLD8Lek1Bm02UjiXNwPc=", + "lastModified": 1774802172, + "narHash": "sha256-6Hd6sww1nQMdRnu92/0vGNi/1SJ31Koc3jk76SKlXPY=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "5c303fb84c850ad232522a0c99f2c717fe2ce16a", + "rev": "0f54cda77a06e9e463eda02f8590495c7aeb3b05", "type": "github" }, "original": { @@ -183,11 +183,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1774670586, - "narHash": "sha256-dmJj7XbSJjLUGDlyHxLK6ijGyl55jQyYafNOUrIFSZ8=", + "lastModified": 1774773254, + "narHash": "sha256-WuLfXm6DEjtWDM4qgCS640B+5wjG12Jc57yWdAF7TPo=", "owner": "rycee", "repo": "nur-expressions", - "rev": "81ee38f72dbc9c06fb0a198819a8e934bbe82502", + "rev": "9b89055deea1bc61867e3280f3f2cce798436807", "type": "gitlab" }, "original": { @@ -315,11 +315,11 @@ ] }, "locked": { - "lastModified": 1774647770, - "narHash": "sha256-UNNi14XiqRWWjO8ykbFwA5wRwx7EscsC+GItOVpuGjc=", + "lastModified": 1774738535, + "narHash": "sha256-2jfBEZUC67IlnxO5KItFCAd7Oc+1TvyV/jQlR+2ykGQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "02371c05a04a2876cf92e2d67a259e8f87399068", + "rev": "769e07ef8f4cf7b1ec3b96ef015abec9bc6b1e2a", "type": "github" }, "original": { @@ -374,11 +374,11 @@ ] }, "locked": { - "lastModified": 1774614108, - "narHash": "sha256-7syLwVkCqf+uYeLK41e33TeeYArF6xUzveitVi0OLus=", + "lastModified": 1774679353, + "narHash": "sha256-N5L8U18JigqVqxMz1FuwbJVruCCa5lA6hgGeXLg8LI8=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "4912ff360a2051f220842a94e9e803ff5ff26687", + "rev": "8ffb6db9322542ec3cb541a232864084422f7e90", "type": "github" }, "original": { @@ -445,11 +445,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1774668340, - "narHash": "sha256-ylJdC183ipwYKLZDWpPynZA4HKJ4oiav+JMbKE73X1U=", + "lastModified": 1774807645, + "narHash": "sha256-jLUzPM+NXXwYXhAIv5yDvuMNZGqTLd6eAkBggyci5vM=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "9ab5add7450c178e21479619c6db52111d88d167", + "rev": "52905207de31ae586c8c17183bad9e717c76d8a8", "type": "github" }, "original": { @@ -582,11 +582,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1774567711, - "narHash": "sha256-uVlOHBvt6Vc/iYNJXLPa4c3cLXwMllOCVfAaLAcphIo=", + "lastModified": 1774777275, + "narHash": "sha256-qogBiYFq8hZusDPeeKRqzelBAhZvREc7Cl+qlewGUCg=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3f6f874dfc34d386d10e434c48ad966c4832243e", + "rev": "b8f81636927f1af0cca812d22c876bad0a883ccd", "type": "github" }, "original": { @@ -598,11 +598,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1774273680, - "narHash": "sha256-a++tZ1RQsDb1I0NHrFwdGuRlR5TORvCEUksM459wKUA=", + "lastModified": 1774610258, + "narHash": "sha256-HaThtroVD9wRdx7KQk0B75JmFcXlMUoEdDFNOMOlsOs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fdc7b8f7b30fdbedec91b71ed82f36e1637483ed", + "rev": "832efc09b4caf6b4569fbf9dc01bec3082a00611", "type": "github" }, "original": { @@ -636,11 +636,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1774660386, - "narHash": "sha256-gXsUqjhm7qiEq6bwnRMOTPxwuK+WmNp9BKaMO9VmmAE=", + "lastModified": 1774807148, + "narHash": "sha256-/2YNEHj/OVdp4iXMRNxLlfkABb6mBo0VmWwymInpwkI=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "ed1a2b54de22f0841f61fbcb8c26f4959a1dc205", + "rev": "e41c78e2facbbf4b03f34ea56eea922e546d77c8", "type": "github" }, "original": { @@ -659,11 +659,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1774625568, - "narHash": "sha256-k/1eM1e7IZo4qFXY6e8EEDaSR8DIHUoTVplxeiGfY24=", + "lastModified": 1774734782, + "narHash": "sha256-rq/8sJPI8wD4P3CXSyvW/dPuAa+qXGdqzAKM3eunZ+4=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "c08a0c522371db506a9952da92593149a9341ddd", + "rev": "8e216ba101d761b8a71f359246941d50e22bad3f", "type": "github" }, "original": { @@ -742,11 +742,11 @@ ] }, "locked": { - "lastModified": 1774667365, - "narHash": "sha256-+JamhonkPyti+oqfl1ySAyF2L02adhCEcdZOzpSukq8=", + "lastModified": 1774753967, + "narHash": "sha256-HpT5fE8JQSbAxolUnw3VgGAo3urVjcrgtB2rtoxURVw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "98caaa8cd1fbcc45913d1bb2b7fbabcf3e8d967a", + "rev": "405b9b4c2c6c5a2b1d390524ce8a240729f34a96", "type": "github" }, "original": { @@ -949,11 +949,11 @@ ] }, "locked": { - "lastModified": 1774673612, - "narHash": "sha256-z4SWAbnq3KMBxKiUTJcvve7ZoPC3KaNCLUe30F67K+4=", + "lastModified": 1774708879, + "narHash": "sha256-rTYvYkQL69/YkZB+MRA/IaX1qJ1lPx5KXoQS2/9+7Mw=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "660cf61b157f014f4e09f316da150e9ab1f6ea6a", + "rev": "d01d23c798cceef42307d5789bfbce70515e8800", "type": "github" }, "original": { From bbb18cb18b53c574aa6a39779ac11ac2005fd39d Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 29 Mar 2026 23:44:35 -0400 Subject: [PATCH 653/724] update --- flake.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 2dd2a2a..23dd02c 100644 --- a/flake.lock +++ b/flake.lock @@ -162,11 +162,11 @@ ] }, "locked": { - "lastModified": 1774802172, - "narHash": "sha256-6Hd6sww1nQMdRnu92/0vGNi/1SJ31Koc3jk76SKlXPY=", + "lastModified": 1774837725, + "narHash": "sha256-FNV0lVD0jukF17n4j2pezOHRJ9DnOJvRTiJmmDUXMcQ=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "0f54cda77a06e9e463eda02f8590495c7aeb3b05", + "rev": "ccfb636fcb4d94323df0d8169a6faae483861911", "type": "github" }, "original": { @@ -445,11 +445,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1774807645, - "narHash": "sha256-jLUzPM+NXXwYXhAIv5yDvuMNZGqTLd6eAkBggyci5vM=", + "lastModified": 1774841075, + "narHash": "sha256-+VuPFeU1RxcaAYRS7bgxxqCTYw43Eq2pm8sWJXPbfPU=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "52905207de31ae586c8c17183bad9e717c76d8a8", + "rev": "0e02e0e660bacd064c47e61a01cd59038792d0f3", "type": "github" }, "original": { @@ -472,11 +472,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1774620721, - "narHash": "sha256-QucawBaJ6Rl5JWAXAbpouXM1MsvlzwCsPGl3zOwLtzw=", + "lastModified": 1774840705, + "narHash": "sha256-qHQCPuNj3Rug8NzxK3YhCx8N2RJBNr6nyAS2tqaLYNo=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "fb83d584532282f585cd02f3aa513e98b843e7e7", + "rev": "622435f64df8f7294293f2dfd59852614edacda4", "type": "github" }, "original": { @@ -614,11 +614,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1774386573, - "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=", + "lastModified": 1774709303, + "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9", + "rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685", "type": "github" }, "original": { @@ -636,11 +636,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1774807148, - "narHash": "sha256-/2YNEHj/OVdp4iXMRNxLlfkABb6mBo0VmWwymInpwkI=", + "lastModified": 1774833510, + "narHash": "sha256-JjtjrIRwy/mCzpsSY8IKfD9ElWLK9MEQoL8/XEYD7Hs=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "e41c78e2facbbf4b03f34ea56eea922e546d77c8", + "rev": "07afddfafaf31fa2d4d76b30a694a2b74d1c9f3d", "type": "github" }, "original": { @@ -659,11 +659,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1774734782, - "narHash": "sha256-rq/8sJPI8wD4P3CXSyvW/dPuAa+qXGdqzAKM3eunZ+4=", + "lastModified": 1774829520, + "narHash": "sha256-m8cKHGBoOlu72/AIBQnq7hzGiGHqFndsu8fs1Cx+a6w=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "8e216ba101d761b8a71f359246941d50e22bad3f", + "rev": "ec3bf9e2f9f19ac9efa59b6b65ced2f9099de39b", "type": "github" }, "original": { @@ -742,11 +742,11 @@ ] }, "locked": { - "lastModified": 1774753967, - "narHash": "sha256-HpT5fE8JQSbAxolUnw3VgGAo3urVjcrgtB2rtoxURVw=", + "lastModified": 1774840424, + "narHash": "sha256-3Oi4mBKzOCFQYLUyEjyc0s5cnlNj1MzmhpVKoLptpe8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "405b9b4c2c6c5a2b1d390524ce8a240729f34a96", + "rev": "d9f52b51548e76ab8b6e7d647763047ebdec835c", "type": "github" }, "original": { @@ -875,11 +875,11 @@ ] }, "locked": { - "lastModified": 1772660329, - "narHash": "sha256-IjU1FxYqm+VDe5qIOxoW+pISBlGvVApRjiw/Y/ttJzY=", + "lastModified": 1773297127, + "narHash": "sha256-6E/yhXP7Oy/NbXtf1ktzmU8SdVqJQ09HC/48ebEGBpk=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "3710e0e1218041bbad640352a0440114b1e10428", + "rev": "71b125cd05fbfd78cab3e070b73544abe24c5016", "type": "github" }, "original": { From 9ee77c8e3f45ac1a15780b9dc97ac1bd03a69aae Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 30 Mar 2026 01:13:50 -0400 Subject: [PATCH 654/724] wivrn: remove defaultRuntime --- system/vr.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/system/vr.nix b/system/vr.nix index 7a15fa7..7bd713f 100644 --- a/system/vr.nix +++ b/system/vr.nix @@ -14,10 +14,6 @@ enable = true; openFirewall = true; - # Write information to /etc/xdg/openxr/1/active_runtime.json, VR applications - # will automatically read this and work with wivrn - defaultRuntime = true; - # Executing it through the systemd service executes WiVRn w/ CAP_SYS_NICE # Resulting in no stutters! autoStart = true; From 6221e57cabbf0320fb5c04fd2a8a9b9643c3e509 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 30 Mar 2026 01:50:09 -0400 Subject: [PATCH 655/724] oh-my-opencode: stop crediting self --- home-manager/progs/opencode.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index 7dbb774..9dd3d64 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -33,6 +33,10 @@ let ohMyOpencodeConfig = { "$schema" = "https://raw.githubusercontent.com/code-yeongyu/oh-my-opencode/master/assets/oh-my-opencode.schema.json"; + git_master = { + commit_footer = false; + include_co_authored_by = false; + }; agents = { sisyphus.model = opus-model; sisyphus-junior.model = opus-model; From 3d60eb121ffe45598a139d50e9f77ddf64af2885 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 30 Mar 2026 13:23:33 -0400 Subject: [PATCH 656/724] update --- flake.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 23dd02c..3f31e0d 100644 --- a/flake.lock +++ b/flake.lock @@ -162,11 +162,11 @@ ] }, "locked": { - "lastModified": 1774837725, - "narHash": "sha256-FNV0lVD0jukF17n4j2pezOHRJ9DnOJvRTiJmmDUXMcQ=", + "lastModified": 1774889817, + "narHash": "sha256-jTTsnHmkpP6Nls+zAeTkcXHYH5MQTwp9j0XojfhyRn4=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "ccfb636fcb4d94323df0d8169a6faae483861911", + "rev": "4627a115d6169feff1518ed0b243734f6cce717d", "type": "github" }, "original": { @@ -183,11 +183,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1774773254, - "narHash": "sha256-WuLfXm6DEjtWDM4qgCS640B+5wjG12Jc57yWdAF7TPo=", + "lastModified": 1774843378, + "narHash": "sha256-8QLbY8F7UdxeQaW0KUVgr1/YPIupe+1lGjS5joR+ZCw=", "owner": "rycee", "repo": "nur-expressions", - "rev": "9b89055deea1bc61867e3280f3f2cce798436807", + "rev": "0a31b668e3ebb599f95dc518076d709e8dddb57c", "type": "gitlab" }, "original": { @@ -315,11 +315,11 @@ ] }, "locked": { - "lastModified": 1774738535, - "narHash": "sha256-2jfBEZUC67IlnxO5KItFCAd7Oc+1TvyV/jQlR+2ykGQ=", + "lastModified": 1774875815, + "narHash": "sha256-PzqwM4njoB3aznqwPZUawD4uOcJeu7N6GBTJKg81EQ4=", "owner": "nix-community", "repo": "home-manager", - "rev": "769e07ef8f4cf7b1ec3b96ef015abec9bc6b1e2a", + "rev": "9340f51314713c83360bf72d75c8b404778ab5b1", "type": "github" }, "original": { @@ -420,11 +420,11 @@ ] }, "locked": { - "lastModified": 1774553602, - "narHash": "sha256-BWM5X4JYmHJm3zoS9MFaxjPsDdR1sUs46O3ySiRNGy4=", + "lastModified": 1774858933, + "narHash": "sha256-rgHUoE4QhOvK3Rcl9cbuIVdjPjFjfhcTm/uPs8Y7+2w=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "6afcbf17d051e244cdaf371bca0aa33c85e8cf0e", + "rev": "45338aab3013924c75305f5cb3543b9cda993183", "type": "github" }, "original": { @@ -445,11 +445,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1774841075, - "narHash": "sha256-+VuPFeU1RxcaAYRS7bgxxqCTYw43Eq2pm8sWJXPbfPU=", + "lastModified": 1774883035, + "narHash": "sha256-qDBsLwPwx2aCX9vsKxkL4Shkh/NfoXRiHS7wbbQUYRQ=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "0e02e0e660bacd064c47e61a01cd59038792d0f3", + "rev": "9faeb868fef42c7b5800b6f6ac642678d4d3e091", "type": "github" }, "original": { @@ -636,11 +636,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1774833510, - "narHash": "sha256-JjtjrIRwy/mCzpsSY8IKfD9ElWLK9MEQoL8/XEYD7Hs=", + "lastModified": 1774876857, + "narHash": "sha256-kz3MatQdWl/DLpDiwh9XaSRznZyggdnRkoQKHvOpBss=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "07afddfafaf31fa2d4d76b30a694a2b74d1c9f3d", + "rev": "6d3ca588965bab095c32db3f2b62759b48fd7c77", "type": "github" }, "original": { @@ -659,11 +659,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1774829520, - "narHash": "sha256-m8cKHGBoOlu72/AIBQnq7hzGiGHqFndsu8fs1Cx+a6w=", + "lastModified": 1774851834, + "narHash": "sha256-RAjED7vBf5qmvwZD5Btwq397zJep2s2nKBih63Wh43M=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "ec3bf9e2f9f19ac9efa59b6b65ced2f9099de39b", + "rev": "0dbcb65548445dba2a8b095a9cd322bbb925225a", "type": "github" }, "original": { @@ -949,11 +949,11 @@ ] }, "locked": { - "lastModified": 1774708879, - "narHash": "sha256-rTYvYkQL69/YkZB+MRA/IaX1qJ1lPx5KXoQS2/9+7Mw=", + "lastModified": 1774848370, + "narHash": "sha256-Esm+aiabP563BcUFfFUCIOlFaTxKUXPp6jw0LMAV7ik=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "d01d23c798cceef42307d5789bfbce70515e8800", + "rev": "712c476500e96df74276be99bb3fa9631f494f3a", "type": "github" }, "original": { From ffb69b4cbc292bf731e98a0a60ff27fa520608d4 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 30 Mar 2026 17:26:34 -0400 Subject: [PATCH 657/724] ci: add deploy workflow and authorize CI key for yarn - add gitea actions workflow to build and deploy on push to main - authorize CI deploy key for root SSH on desktop - workflow unlocks git-crypt, builds yarn config, deploys if desktop reachable --- .gitea/workflows/deploy.yml | 51 +++++++++++++++++++++++++++++++++++++ system/system-yarn.nix | 1 + 2 files changed, 52 insertions(+) create mode 100644 .gitea/workflows/deploy.yml diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml new file mode 100644 index 0000000..a4147d8 --- /dev/null +++ b/.gitea/workflows/deploy.yml @@ -0,0 +1,51 @@ +name: Build and Deploy Desktop +on: + push: + branches: [main] + +jobs: + deploy: + runs-on: nix + steps: + - uses: https://github.com/actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Unlock git-crypt + run: | + git-crypt unlock /run/agenix/git-crypt-key-dotfiles + + - name: Build NixOS configuration (yarn) + run: | + nix build .#nixosConfigurations.yarn.config.system.build.toplevel -L + + - name: Deploy to desktop + run: | + eval $(ssh-agent -s) + ssh-add /run/agenix/ci-deploy-key + if ssh -i /run/agenix/ci-deploy-key -o StrictHostKeyChecking=no -o ConnectTimeout=10 root@desktop "echo reachable" 2>/dev/null; then + nix run github:serokell/deploy-rs -- .#yarn --ssh-opts="-o StrictHostKeyChecking=no" + echo "Deploy to desktop succeeded" + else + echo "Desktop unreachable - skipping deploy. Build succeeded." + fi + + - name: Notify success + if: success() + run: | + curl -sf -X POST \ + "https://ntfy.sigkill.computer/deployments" \ + -H "Title: [yarn] Build succeeded" \ + -H "Priority: default" \ + -H "Tags: white_check_mark" \ + -d "dotfiles built from commit ${GITHUB_SHA::8}" + + - name: Notify failure + if: failure() + run: | + curl -sf -X POST \ + "https://ntfy.sigkill.computer/deployments" \ + -H "Title: [yarn] Build FAILED" \ + -H "Priority: urgent" \ + -H "Tags: rotating_light" \ + -d "dotfiles build failed at commit ${GITHUB_SHA::8}" diff --git a/system/system-yarn.nix b/system/system-yarn.nix index 40bbc33..549ddb7 100644 --- a/system/system-yarn.nix +++ b/system/system-yarn.nix @@ -64,6 +64,7 @@ users.users.root.openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO4jL6gYOunUlUtPvGdML0cpbKSsPNqQ1jit4E7U1RyH" # laptop + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC5ZYN6idL/w/mUIfPOH1i+Q/SQXuzAMQUEuWpipx1Pc ci-deploy@muffin" ]; programs.steam = { From 1f994ec56c02e2feb0d5dd7e2800118511add550 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 30 Mar 2026 21:50:13 -0400 Subject: [PATCH 658/724] update --- flake.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index 3f31e0d..80797c2 100644 --- a/flake.lock +++ b/flake.lock @@ -65,11 +65,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1774753128, - "narHash": "sha256-Knvqj+Bt5fW0aPfXKmOPknzVWdsIYXhC5faRolsqEcI=", + "lastModified": 1774915705, + "narHash": "sha256-2Kz/KdFU6NXtEALdmM1ypeFdKKK4Yk4O6qzLBksXLY4=", "owner": "sadjow", "repo": "claude-code-nix", - "rev": "cd6245f3f60bbbf18b9b963d463fcf6fcd5e90c6", + "rev": "9158d3e1292887ec13ddb69514179fe4fc6a7d2e", "type": "github" }, "original": { @@ -315,11 +315,11 @@ ] }, "locked": { - "lastModified": 1774875815, - "narHash": "sha256-PzqwM4njoB3aznqwPZUawD4uOcJeu7N6GBTJKg81EQ4=", + "lastModified": 1774898676, + "narHash": "sha256-0Utnqo+FbB+0CVUi0MI3oonF0Kuzy9VcgRkxl53Euvk=", "owner": "nix-community", "repo": "home-manager", - "rev": "9340f51314713c83360bf72d75c8b404778ab5b1", + "rev": "a184bd2f8426087bae93f203403cd4b86c99e57d", "type": "github" }, "original": { @@ -472,11 +472,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1774840705, - "narHash": "sha256-qHQCPuNj3Rug8NzxK3YhCx8N2RJBNr6nyAS2tqaLYNo=", + "lastModified": 1774921404, + "narHash": "sha256-oHqaEduwYqXx3itq7ckP+iuC9nU6DzfCVery4YhUjAU=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "622435f64df8f7294293f2dfd59852614edacda4", + "rev": "3d02f5c53d09af97a7d66065b8c058d0599bc547", "type": "github" }, "original": { @@ -598,11 +598,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1774610258, - "narHash": "sha256-HaThtroVD9wRdx7KQk0B75JmFcXlMUoEdDFNOMOlsOs=", + "lastModified": 1774701658, + "narHash": "sha256-CIS/4AMUSwUyC8X5g+5JsMRvIUL3YUfewe8K4VrbsSQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "832efc09b4caf6b4569fbf9dc01bec3082a00611", + "rev": "b63fe7f000adcfa269967eeff72c64cafecbbebe", "type": "github" }, "original": { @@ -636,11 +636,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1774876857, - "narHash": "sha256-kz3MatQdWl/DLpDiwh9XaSRznZyggdnRkoQKHvOpBss=", + "lastModified": 1774920276, + "narHash": "sha256-nynVyNuy8SDh2nZWfeov6RAhvsaTAeAQHZog7lBK+A0=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "6d3ca588965bab095c32db3f2b62759b48fd7c77", + "rev": "421ccc4c87228878b0eb29d3d1faead875c49c28", "type": "github" }, "original": { @@ -659,11 +659,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1774851834, - "narHash": "sha256-RAjED7vBf5qmvwZD5Btwq397zJep2s2nKBih63Wh43M=", + "lastModified": 1774902752, + "narHash": "sha256-WC3SgVJX+N78KnRf1v9Z2VowkJBc9SBKpaZsWxWm/Rs=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "0dbcb65548445dba2a8b095a9cd322bbb925225a", + "rev": "4f0ceff244748ec55cfccc4f674759a7a2941b18", "type": "github" }, "original": { From f77f59622245ac0433f8de62432a0dd120a9915c Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 31 Mar 2026 18:44:08 -0400 Subject: [PATCH 659/724] opencode: move android stuff to android-ui skill --- home-manager/progs/opencode.nix | 121 +++++++++++++++++++------------- 1 file changed, 71 insertions(+), 50 deletions(-) diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix index 9dd3d64..1a10479 100644 --- a/home-manager/progs/opencode.nix +++ b/home-manager/progs/opencode.nix @@ -86,6 +86,77 @@ in xdg.configFile."opencode/plugins/opencode-claude-bridge.js".source = "${opencode-claude-bridge}/lib/opencode-claude-bridge/dist/index.js"; + xdg.configFile."opencode/skills/android-ui.md".text = '' + --- + name: android-ui + description: "Android UI automation via ADB - use for any Android device interaction, UI testing, screenshot analysis, element coordinate lookup, and gesture automation." + --- + + # Android UI Interaction Workflow + + ## 1. Taking Screenshots + ``` + adb exec-out screencap -p > /tmp/screen.png + ``` + Captures the current screen state as a PNG image. + + ## 2. Analyzing Screenshots + 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: + ```sh + # 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 + ```sh + # 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 have changed. + 3. Calculate center coordinates from bounds + 4. Tap/interact + 5. Wait β†’ screenshot β†’ verify result + ''; + xdg.configFile."opencode/skills/playwright.md".text = let browsers = pkgs.playwright-driver.browsers; @@ -140,56 +211,6 @@ in ## 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"; From 302bb599db0ea0f76ccd333d182a901448eb6c0c Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 1 Apr 2026 13:25:53 -0400 Subject: [PATCH 660/724] update --- flake.lock | 78 +++++++++++++++++++++++++++--------------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/flake.lock b/flake.lock index 80797c2..bf3e3f1 100644 --- a/flake.lock +++ b/flake.lock @@ -65,11 +65,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1774915705, - "narHash": "sha256-2Kz/KdFU6NXtEALdmM1ypeFdKKK4Yk4O6qzLBksXLY4=", + "lastModified": 1775007163, + "narHash": "sha256-plS86OtgkWsAf/NtXc5iwxpBB+cOuyqjo5Xq2gEg8FQ=", "owner": "sadjow", "repo": "claude-code-nix", - "rev": "9158d3e1292887ec13ddb69514179fe4fc6a7d2e", + "rev": "335c96551a1650e0306b756039f15c3364d2e0ac", "type": "github" }, "original": { @@ -162,11 +162,11 @@ ] }, "locked": { - "lastModified": 1774889817, - "narHash": "sha256-jTTsnHmkpP6Nls+zAeTkcXHYH5MQTwp9j0XojfhyRn4=", + "lastModified": 1775062601, + "narHash": "sha256-/5+NrxyE/JmHmnsSEve/zE7sTgXxrNSi+S+vAanmSSc=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "4627a115d6169feff1518ed0b243734f6cce717d", + "rev": "120ce11560e7ce7c73b9977ca15fe9915b921e82", "type": "github" }, "original": { @@ -315,11 +315,11 @@ ] }, "locked": { - "lastModified": 1774898676, - "narHash": "sha256-0Utnqo+FbB+0CVUi0MI3oonF0Kuzy9VcgRkxl53Euvk=", + "lastModified": 1775047159, + "narHash": "sha256-UWM4VZvfKaPwA9FMu7iZha5YAE8vsEtUazk+rFxmbTY=", "owner": "nix-community", "repo": "home-manager", - "rev": "a184bd2f8426087bae93f203403cd4b86c99e57d", + "rev": "1ce9e62690dfdd7e76bd266ccb9a887778410eb2", "type": "github" }, "original": { @@ -374,11 +374,11 @@ ] }, "locked": { - "lastModified": 1774679353, - "narHash": "sha256-N5L8U18JigqVqxMz1FuwbJVruCCa5lA6hgGeXLg8LI8=", + "lastModified": 1775024665, + "narHash": "sha256-NKd88/dc+IZ7zYASBw1d0ofYvwRm/N546XGsYqi+oRc=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "8ffb6db9322542ec3cb541a232864084422f7e90", + "rev": "133e3ac905ee61a4366af18e7c1d34f1b7dd5f7a", "type": "github" }, "original": { @@ -445,11 +445,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1774883035, - "narHash": "sha256-qDBsLwPwx2aCX9vsKxkL4Shkh/NfoXRiHS7wbbQUYRQ=", + "lastModified": 1775055825, + "narHash": "sha256-nsUa0Ey0K/POaJhouRThrw5WlBi2n8L8eCJtqzJa1vw=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "9faeb868fef42c7b5800b6f6ac642678d4d3e091", + "rev": "4e7f647bcd93b3bd95395c7c23e6a8474459f430", "type": "github" }, "original": { @@ -472,11 +472,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1774921404, - "narHash": "sha256-oHqaEduwYqXx3itq7ckP+iuC9nU6DzfCVery4YhUjAU=", + "lastModified": 1775042939, + "narHash": "sha256-qcCBdnnKj8g/TiYmfDl3LmTdLYVPxr08yht9JaTXW00=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "3d02f5c53d09af97a7d66065b8c058d0599bc547", + "rev": "0e4df2c05361ed0f5e8738335369b304a0962b02", "type": "github" }, "original": { @@ -530,11 +530,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1774265710, - "narHash": "sha256-ar8pFUSAxXhV7DpVRjNvgviWuqOqWPAImb4MM7lSh5Y=", + "lastModified": 1774962120, + "narHash": "sha256-DMl2y+wfxnjPgjGjuH0i8+a33mhe9WCD4fR1WU68GM0=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "f6022b9192e034a817373692ede18a9319cf9730", + "rev": "7626225cbb0ef16baa88386ac59b123f6e2fb45b", "type": "github" }, "original": { @@ -582,11 +582,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1774777275, - "narHash": "sha256-qogBiYFq8hZusDPeeKRqzelBAhZvREc7Cl+qlewGUCg=", + "lastModified": 1774933469, + "narHash": "sha256-OrnCQeUO2bqaWUl0lkDWyGWjKsOhtCyd7JSfTedQNUE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "b8f81636927f1af0cca812d22c876bad0a883ccd", + "rev": "f4c4c2c0c923d7811ac2a63ccc154767e4195337", "type": "github" }, "original": { @@ -598,11 +598,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1774701658, - "narHash": "sha256-CIS/4AMUSwUyC8X5g+5JsMRvIUL3YUfewe8K4VrbsSQ=", + "lastModified": 1774855581, + "narHash": "sha256-YkreHeMgTCYvJ5fESV0YyqQK49bHGe2B51tH6claUh4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b63fe7f000adcfa269967eeff72c64cafecbbebe", + "rev": "15c6719d8c604779cf59e03c245ea61d3d7ab69b", "type": "github" }, "original": { @@ -636,11 +636,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1774920276, - "narHash": "sha256-nynVyNuy8SDh2nZWfeov6RAhvsaTAeAQHZog7lBK+A0=", + "lastModified": 1775039613, + "narHash": "sha256-5VzBe0SOXamABAbtjNF5Y7jaMbSeVtGQRhbICoJ6izo=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "421ccc4c87228878b0eb29d3d1faead875c49c28", + "rev": "7b29c11d7aaf476723af14865665cf04750f8d20", "type": "github" }, "original": { @@ -659,11 +659,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1774902752, - "narHash": "sha256-WC3SgVJX+N78KnRf1v9Z2VowkJBc9SBKpaZsWxWm/Rs=", + "lastModified": 1774994931, + "narHash": "sha256-WmXA8kyqvDA226DRPrXyR6bLO9VsRr4SUAYCVH6H6Ns=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "4f0ceff244748ec55cfccc4f674759a7a2941b18", + "rev": "b053facf8421df220d0bf2496a543b23dee3ca85", "type": "github" }, "original": { @@ -742,11 +742,11 @@ ] }, "locked": { - "lastModified": 1774840424, - "narHash": "sha256-3Oi4mBKzOCFQYLUyEjyc0s5cnlNj1MzmhpVKoLptpe8=", + "lastModified": 1775013181, + "narHash": "sha256-zPrt6oNM1r/RO5bWYaZ3hthfG9vzkr6kQdoqDd5x4Qw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "d9f52b51548e76ab8b6e7d647763047ebdec835c", + "rev": "e8046c1d9ccadd497c2344d8fa49dab62f22f7be", "type": "github" }, "original": { @@ -949,11 +949,11 @@ ] }, "locked": { - "lastModified": 1774848370, - "narHash": "sha256-Esm+aiabP563BcUFfFUCIOlFaTxKUXPp6jw0LMAV7ik=", + "lastModified": 1775021133, + "narHash": "sha256-JB0u0evfSlmNg9HdGDxtXjaCcdKUpFPdSAMGxvJo5Pw=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "712c476500e96df74276be99bb3fa9631f494f3a", + "rev": "4bf1a6837064486c4f573a9d500c4cf3c1c075c0", "type": "github" }, "original": { From 07a808271d6a270dff84cde14711848769a97e06 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 1 Apr 2026 14:33:44 -0400 Subject: [PATCH 661/724] Move from opencode to oh-my-pi --- home-manager/no-gui.nix | 2 +- home-manager/progs/opencode.nix | 240 -------------------------------- home-manager/progs/pi.nix | 169 ++++++++++++++++++++++ 3 files changed, 170 insertions(+), 241 deletions(-) delete mode 100644 home-manager/progs/opencode.nix create mode 100644 home-manager/progs/pi.nix diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 3805bea..a7211e8 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -119,7 +119,7 @@ in imports = [ ./progs/fish.nix ./progs/helix.nix - ./progs/opencode.nix + ./progs/pi.nix ( { ... }: { diff --git a/home-manager/progs/opencode.nix b/home-manager/progs/opencode.nix deleted file mode 100644 index 1a10479..0000000 --- a/home-manager/progs/opencode.nix +++ /dev/null @@ -1,240 +0,0 @@ -{ - config, - lib, - pkgs, - inputs, - ... -}: -let - # what model should be used in place of haiku? - haiku-model = "anthropic/claude-haiku-4-5"; - - opus-model = "anthropic/claude-opus-4-6"; - - opencode-claude-bridge = pkgs.buildNpmPackage { - pname = "opencode-claude-bridge"; - version = "1.8.0"; - src = inputs.opencode-claude-bridge; - npmDepsHash = "sha256-jH/UweuHqfeLxICxNRsBODWOBfVdE+ZgIinfW/ITSSc="; - buildPhase = '' - runHook preBuild - npx tsc - runHook postBuild - ''; - # the plugin entry point is dist/index.js - installPhase = '' - runHook preInstall - mkdir -p $out/lib/opencode-claude-bridge - cp -r dist $out/lib/opencode-claude-bridge/ - runHook postInstall - ''; - }; - - ohMyOpencodeConfig = { - "$schema" = - "https://raw.githubusercontent.com/code-yeongyu/oh-my-opencode/master/assets/oh-my-opencode.schema.json"; - git_master = { - commit_footer = false; - include_co_authored_by = false; - }; - agents = { - sisyphus.model = opus-model; - sisyphus-junior.model = opus-model; - oracle.model = opus-model; - librarian.model = haiku-model; - explore.model = haiku-model; - multimodal-looker.model = "anthropic/claude-opus-4-6"; - - prometheus.model = opus-model; - metis.model = opus-model; - momus.model = opus-model; - atlas.model = opus-model; - }; - categories = { - visual-engineering.model = "openrouter/google/gemini-3-pro"; - ultrabrain.model = 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"; - }; - }; - oh-my-opencode-pkg = inputs.llm-agents.packages.${pkgs.stdenv.hostPlatform.system}.oh-my-opencode; -in -{ - home.packages = [ - oh-my-opencode-pkg - pkgs.playwright-driver.browsers - inputs.claude-code.packages.${pkgs.stdenv.hostPlatform.system}.claude-code - ]; - - 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; - - # Plugins are placed directly in the plugins directory so opencode - # auto-discovers them instead of downloading them from npm at runtime. - xdg.configFile."opencode/plugins/oh-my-opencode.js".source = - "${oh-my-opencode-pkg}/lib/oh-my-opencode/dist/index.js"; - - xdg.configFile."opencode/plugins/opencode-claude-bridge.js".source = - "${opencode-claude-bridge}/lib/opencode-claude-bridge/dist/index.js"; - - xdg.configFile."opencode/skills/android-ui.md".text = '' - --- - name: android-ui - description: "Android UI automation via ADB - use for any Android device interaction, UI testing, screenshot analysis, element coordinate lookup, and gesture automation." - --- - - # Android UI Interaction Workflow - - ## 1. Taking Screenshots - ``` - adb exec-out screencap -p > /tmp/screen.png - ``` - Captures the current screen state as a PNG image. - - ## 2. Analyzing Screenshots - 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: - ```sh - # 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 - ```sh - # 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 have changed. - 3. Calculate center coordinates from bounds - 4. Tap/interact - 5. Wait β†’ screenshot β†’ verify result - ''; - - 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. - ''; - settings = { - theme = "opencode"; - - model = opus-model; - # small model used for titles - small_model = "openrouter/openai/gpt-oss-20b:free"; - - autoshare = false; - autoupdate = false; - agent = { }; - plugin = [ ]; - provider = { - openrouter = { - models = { - "openai/gpt-oss-20b:free" = { }; - "qwen/qwen3-vl-30b-a3b-thinking" = { }; - }; - options = { - # TODO! use agenix here instead - apiKey = "{file:${../secrets/openrouter_api_key}}"; - }; - }; - }; - }; - }; -} diff --git a/home-manager/progs/pi.nix b/home-manager/progs/pi.nix new file mode 100644 index 0000000..9b529b8 --- /dev/null +++ b/home-manager/progs/pi.nix @@ -0,0 +1,169 @@ +{ + config, + lib, + pkgs, + inputs, + ... +}: +let + # sisyphus/oracle/prometheus β†’ default/slow/plan = opus + # librarian/explore/quick β†’ smol/commit = haiku + ompSettings = { + modelRoles = { + default = "claude-opus-4-6:high"; + smol = "claude-haiku-4-5:low"; + slow = "claude-opus-4-6:xhigh"; + plan = "claude-opus-4-6:high"; + commit = "claude-haiku-4-5:low"; + }; + }; + + # provider config β€” openrouter API key read from secrets at runtime + ompModels = { + providers = { + openrouter = { + apiKey = "!cat ${../secrets/openrouter_api_key}"; + }; + }; + }; +in +{ + home.packages = [ + inputs.llm-agents.packages.${pkgs.stdenv.hostPlatform.system}.omp + ]; + + # main settings: ~/.omp/agent/config.yml (JSON is valid YAML) + home.file.".omp/agent/config.yml".text = builtins.toJSON ompSettings; + + # model/provider config: ~/.omp/agent/models.yml + home.file.".omp/agent/models.yml".text = builtins.toJSON ompModels; + + # global instructions loaded at startup + home.file.".omp/agent/AGENTS.md".text = '' + 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. + + ## 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. + ''; + + home.file.".omp/agent/skills/android-ui/SKILL.md".text = '' + --- + name: android-ui + description: Android UI automation via ADB. Use for any Android device interaction, UI testing, screenshot analysis, element coordinate lookup, and gesture automation. + --- + + # Android UI + + ## 1. Taking Screenshots + ``` + adb exec-out screencap -p > /tmp/screen.png + ``` + Captures the current screen state as a PNG image. + + ## 2. Analyzing Screenshots + Read the screenshot file to understand the current screen state and identify UI elements. + + ## 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: + ```sh + # 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 + ```sh + # 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 it (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 have changed. + 3. Calculate center coordinates from bounds + 4. Tap/interact + 5. Wait β†’ screenshot β†’ verify result + ''; + + # omp has a built-in browser tool with NixOS auto-detection, + # but this skill provides playwright MCP as a supplementary option + home.file.".omp/agent/skills/playwright/SKILL.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: Browser automation via Playwright MCP. Use as an alternative to the built-in browser tool for Playwright-specific workflows, testing, and web scraping. Chromium is provided by NixOS. + --- + + # Playwright + + ## Browser Setup + Chromium is provided by NixOS. Do NOT attempt to download browsers. + + - Chromium path: `${chromiumPath}` + - Browsers path: `${browsers}` + + ## Usage + Launch the Playwright MCP server for browser automation: + ```bash + npx @playwright/mcp@latest --executable-path "${chromiumPath}" --user-data-dir "${config.home.homeDirectory}/.cache/playwright-mcp" + ``` + + Set these environment variables if not already set: + ```bash + export PLAYWRIGHT_BROWSERS_PATH="${browsers}" + export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1 + ``` + ''; +} From 3768e032babdfb6535b70554c97e6eeaf337bd9f Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 2 Apr 2026 00:06:53 -0400 Subject: [PATCH 662/724] update --- flake.lock | 78 ++++++++++++++++++++--------------------- home-manager/no-gui.nix | 2 -- 2 files changed, 39 insertions(+), 41 deletions(-) diff --git a/flake.lock b/flake.lock index bf3e3f1..d952aff 100644 --- a/flake.lock +++ b/flake.lock @@ -65,11 +65,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1775007163, - "narHash": "sha256-plS86OtgkWsAf/NtXc5iwxpBB+cOuyqjo5Xq2gEg8FQ=", + "lastModified": 1775088444, + "narHash": "sha256-hGWixWAyE3YhUQdHh1fZao8C2r7Khokx5CwzTdZdgKY=", "owner": "sadjow", "repo": "claude-code-nix", - "rev": "335c96551a1650e0306b756039f15c3364d2e0ac", + "rev": "b46a627009fd58cd0b28d0ea20d503f7562bc90a", "type": "github" }, "original": { @@ -162,11 +162,11 @@ ] }, "locked": { - "lastModified": 1775062601, - "narHash": "sha256-/5+NrxyE/JmHmnsSEve/zE7sTgXxrNSi+S+vAanmSSc=", + "lastModified": 1775098716, + "narHash": "sha256-nuTLU220nDAUPsQLa9/zLQwWEbpqg9nl0IfgbBax3M0=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "120ce11560e7ce7c73b9977ca15fe9915b921e82", + "rev": "2a0acfc631795bcd717234dbda80ec6cbd309374", "type": "github" }, "original": { @@ -183,11 +183,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1774843378, - "narHash": "sha256-8QLbY8F7UdxeQaW0KUVgr1/YPIupe+1lGjS5joR+ZCw=", + "lastModified": 1775102584, + "narHash": "sha256-DMqFfnsbE6XYMG4xkO3ergr2mqxFEfmt3ePDB1V0M+0=", "owner": "rycee", "repo": "nur-expressions", - "rev": "0a31b668e3ebb599f95dc518076d709e8dddb57c", + "rev": "bda7b1b99e891711cacc68fac2fcdc06abc7fac9", "type": "gitlab" }, "original": { @@ -237,11 +237,11 @@ ] }, "locked": { - "lastModified": 1772408722, - "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", + "lastModified": 1775087534, + "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", + "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", "type": "github" }, "original": { @@ -315,11 +315,11 @@ ] }, "locked": { - "lastModified": 1775047159, - "narHash": "sha256-UWM4VZvfKaPwA9FMu7iZha5YAE8vsEtUazk+rFxmbTY=", + "lastModified": 1775080052, + "narHash": "sha256-jAB4ZZbx8ECu9GcE/PUUwT+wpooZ0Ssmn2imB8PVTdM=", "owner": "nix-community", "repo": "home-manager", - "rev": "1ce9e62690dfdd7e76bd266ccb9a887778410eb2", + "rev": "6267895e9898399f0ce2fe79b645e9ee4858aaff", "type": "github" }, "original": { @@ -374,11 +374,11 @@ ] }, "locked": { - "lastModified": 1775024665, - "narHash": "sha256-NKd88/dc+IZ7zYASBw1d0ofYvwRm/N546XGsYqi+oRc=", + "lastModified": 1775071677, + "narHash": "sha256-EkVrhsEVG8FVodTPduAFC+qnb9YnKboF0It29zGJx8U=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "133e3ac905ee61a4366af18e7c1d34f1b7dd5f7a", + "rev": "049bfbe4cc042e6003414d0875f0a70873fc4d6b", "type": "github" }, "original": { @@ -445,11 +445,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1775055825, - "narHash": "sha256-nsUa0Ey0K/POaJhouRThrw5WlBi2n8L8eCJtqzJa1vw=", + "lastModified": 1775100504, + "narHash": "sha256-pPN8RQzB/5wUCwJFac7JC4u3zgtyFrhd76kbvJmosUI=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "4e7f647bcd93b3bd95395c7c23e6a8474459f430", + "rev": "39ffaca2934a562d7702b95d01e9792401119dc5", "type": "github" }, "original": { @@ -472,11 +472,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1775042939, - "narHash": "sha256-qcCBdnnKj8g/TiYmfDl3LmTdLYVPxr08yht9JaTXW00=", + "lastModified": 1775089852, + "narHash": "sha256-zcX3hf2cTOQ06kRP+FCYbuaWhy+FLruLFp+D79Enjo4=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "0e4df2c05361ed0f5e8738335369b304a0962b02", + "rev": "cfa91d98691d91cc604ab8f4e224819524c496ad", "type": "github" }, "original": { @@ -598,11 +598,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1774855581, - "narHash": "sha256-YkreHeMgTCYvJ5fESV0YyqQK49bHGe2B51tH6claUh4=", + "lastModified": 1775034801, + "narHash": "sha256-tsecHNsWwr4wSaM2oW9GwafMwE24J+xD8bKDoto3exY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "15c6719d8c604779cf59e03c245ea61d3d7ab69b", + "rev": "8d029aa64915e54b7846873d9583af4c9fd21ea4", "type": "github" }, "original": { @@ -614,11 +614,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1774709303, - "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=", + "lastModified": 1775036866, + "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8110df5ad7abf5d4c0f6fb0f8f978390e77f9685", + "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e", "type": "github" }, "original": { @@ -636,11 +636,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1775039613, - "narHash": "sha256-5VzBe0SOXamABAbtjNF5Y7jaMbSeVtGQRhbICoJ6izo=", + "lastModified": 1775092367, + "narHash": "sha256-E4I6ZuZztZ0Q9hNKfVnGaKNiYuiO4NBPcRonKJhS5Ug=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "7b29c11d7aaf476723af14865665cf04750f8d20", + "rev": "75d67b32169738333b6647ab6a2e110587a0ff66", "type": "github" }, "original": { @@ -659,11 +659,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1774994931, - "narHash": "sha256-WmXA8kyqvDA226DRPrXyR6bLO9VsRr4SUAYCVH6H6Ns=", + "lastModified": 1775008123, + "narHash": "sha256-zsd/kbsgfX2YQAlbao40JxyeVDwsUmBGyUDZc/Vo1C4=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "b053facf8421df220d0bf2496a543b23dee3ca85", + "rev": "b87f41771c050d3c101d1528532de53293cba6da", "type": "github" }, "original": { @@ -742,11 +742,11 @@ ] }, "locked": { - "lastModified": 1775013181, - "narHash": "sha256-zPrt6oNM1r/RO5bWYaZ3hthfG9vzkr6kQdoqDd5x4Qw=", + "lastModified": 1775099554, + "narHash": "sha256-3xBsGnGDLOFtnPZ1D3j2LU19wpAlYefRKTlkv648rU0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "e8046c1d9ccadd497c2344d8fa49dab62f22f7be", + "rev": "8d6387ed6d8e6e6672fd3ed4b61b59d44b124d99", "type": "github" }, "original": { diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index a7211e8..5c16a98 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -211,8 +211,6 @@ in # power stuff powerstat - nodePackages_latest.nodejs - yt-dlp ] rust_pkgs From 84bb728633e35d7daeceef31b6155fd4e4ee6fae Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 2 Apr 2026 12:53:25 -0400 Subject: [PATCH 663/724] update --- flake.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index d952aff..e07636f 100644 --- a/flake.lock +++ b/flake.lock @@ -139,11 +139,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1774080407, - "narHash": "sha256-FYbalilgDFjIVwK+D6DjDos1IMmMGA20lRf8k6Ykm1Y=", + "lastModified": 1775116700, + "narHash": "sha256-gfX1Zh6EXXxbjkZBrpVHv4TGFuSTDDYlljQq3Sbxq+0=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "d8d75443d39d95f3c5256504eb838e0acc62ef44", + "rev": "598ee8ad81ea80e38514d04e3576666fa5011f18", "type": "github" }, "original": { @@ -162,11 +162,11 @@ ] }, "locked": { - "lastModified": 1775098716, - "narHash": "sha256-nuTLU220nDAUPsQLa9/zLQwWEbpqg9nl0IfgbBax3M0=", + "lastModified": 1775123075, + "narHash": "sha256-gFkm83VNB8zoN29Kb3KajDo/5aL49AwslUFt8d2R5Ho=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "2a0acfc631795bcd717234dbda80ec6cbd309374", + "rev": "0e315e6cbe18c6174a62f13f458e2077d8073fbf", "type": "github" }, "original": { @@ -315,11 +315,11 @@ ] }, "locked": { - "lastModified": 1775080052, - "narHash": "sha256-jAB4ZZbx8ECu9GcE/PUUwT+wpooZ0Ssmn2imB8PVTdM=", + "lastModified": 1775143651, + "narHash": "sha256-S0RqAyDPMTcv9vASMaE8eY1QexFysAOdnxUxFHIPOyE=", "owner": "nix-community", "repo": "home-manager", - "rev": "6267895e9898399f0ce2fe79b645e9ee4858aaff", + "rev": "d166a078541982a76f14d3e06e9665fa5c9ed85e", "type": "github" }, "original": { @@ -445,11 +445,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1775100504, - "narHash": "sha256-pPN8RQzB/5wUCwJFac7JC4u3zgtyFrhd76kbvJmosUI=", + "lastModified": 1775141156, + "narHash": "sha256-tNpLkiOtmxCxCch4zPLoEGyaZK16ryOpQuujtix0AqY=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "39ffaca2934a562d7702b95d01e9792401119dc5", + "rev": "09cd3ef62649bc47fa3eb34318bb6ef5096654dd", "type": "github" }, "original": { @@ -530,11 +530,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1774962120, - "narHash": "sha256-DMl2y+wfxnjPgjGjuH0i8+a33mhe9WCD4fR1WU68GM0=", + "lastModified": 1775121446, + "narHash": "sha256-ZAW4jS/50hZb5BGBP7SaBt87MQfRLEKZm3KDrrXy91I=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "7626225cbb0ef16baa88386ac59b123f6e2fb45b", + "rev": "c00c67450a53f73ca8f8473eed409ca8510dd162", "type": "github" }, "original": { @@ -636,11 +636,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1775092367, - "narHash": "sha256-E4I6ZuZztZ0Q9hNKfVnGaKNiYuiO4NBPcRonKJhS5Ug=", + "lastModified": 1775142904, + "narHash": "sha256-UGZq9V+sImNCZXJivXBtJJ1p5Ui24vRrXoDK1ulhyLE=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "75d67b32169738333b6647ab6a2e110587a0ff66", + "rev": "411a820f3cf210425f02306ed4d14a7e4ea75f9b", "type": "github" }, "original": { @@ -853,11 +853,11 @@ ] }, "locked": { - "lastModified": 1773297127, - "narHash": "sha256-6E/yhXP7Oy/NbXtf1ktzmU8SdVqJQ09HC/48ebEGBpk=", + "lastModified": 1775125835, + "narHash": "sha256-2qYcPgzFhnQWchHo0SlqLHrXpux5i6ay6UHA+v2iH4U=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "71b125cd05fbfd78cab3e070b73544abe24c5016", + "rev": "75925962939880974e3ab417879daffcba36c4a3", "type": "github" }, "original": { @@ -949,11 +949,11 @@ ] }, "locked": { - "lastModified": 1775021133, - "narHash": "sha256-JB0u0evfSlmNg9HdGDxtXjaCcdKUpFPdSAMGxvJo5Pw=", + "lastModified": 1775106234, + "narHash": "sha256-ZCHEj7dvqaguQy2yOHELkrkgPRAbnno+Lg9PAAiBv44=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "4bf1a6837064486c4f573a9d500c4cf3c1c075c0", + "rev": "0118405698718bd82343050d4419072fffd0df54", "type": "github" }, "original": { From 9a3ac53c50df2d3672a3db1a27fe5dc62ffabbf8 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 2 Apr 2026 13:06:59 -0400 Subject: [PATCH 664/724] mreow: power stuff --- system/system-mreow.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/system/system-mreow.nix b/system/system-mreow.nix index ecfc6ad..16d7902 100644 --- a/system/system-mreow.nix +++ b/system/system-mreow.nix @@ -24,6 +24,29 @@ # if I move to another lock screen program, i will have to replace `swaylock` security.pam.services.swaylock = { }; + # Kernel-level power tuning. These are boot-time / module-load-time settings + # that power-profiles-daemon (in common.nix) does not manage. ppd handles + # governor and EPP at runtime; these cover everything else. + boot.kernelParams = [ + # Disable NMI watchdog. Eliminates periodic perf-counter interrupts + # across all cores (~1 W). Kernel softlockup watchdog remains active. + "nmi_watchdog=0" + + # Route kernel work items to already-busy CPUs rather than waking idle + # ones. Reduces C-state exit frequency -- significant on battery where + # cores idle often. + "workqueue.power_efficient=1" + ]; + + boot.kernel.sysctl."kernel.nmi_watchdog" = 0; + + # Power-gate the HDA codec between audio activity. 1-second inactivity + # timeout; controller powers down fully. Wakes transparently on next + # audio event -- no audible artifacts on Framework 13 AMD. + boot.extraModprobeConfig = '' + options snd_hda_intel power_save=1 power_save_controller=Y + ''; + # Greetd display manager services.greetd = { enable = true; From 3e35fea1834af314fbe464137255d7c064c18e3f Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 2 Apr 2026 17:57:51 -0400 Subject: [PATCH 665/724] pi: fix openrouter apiKey, add llama.cpp provider openrouter was broken: !cat + nix store path is not valid omp config. Use builtins.readFile to inline the key at eval time. Add self-hosted llama.cpp provider at llm.sigkill.computer with Bearer token auth. --- home-manager/progs/pi.nix | 9 +++++++-- home-manager/secrets/llama_cpp_api_key | Bin 0 -> 87 bytes 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 home-manager/secrets/llama_cpp_api_key diff --git a/home-manager/progs/pi.nix b/home-manager/progs/pi.nix index 9b529b8..045498b 100644 --- a/home-manager/progs/pi.nix +++ b/home-manager/progs/pi.nix @@ -18,11 +18,16 @@ let }; }; - # provider config β€” openrouter API key read from secrets at runtime + # provider config β€” secrets read at eval time via builtins.readFile + # (omp treats apiKey as env-var-name-or-literal, not a shell command) ompModels = { providers = { openrouter = { - apiKey = "!cat ${../secrets/openrouter_api_key}"; + apiKey = lib.strings.trim (builtins.readFile ../secrets/openrouter_api_key); + }; + "llama.cpp" = { + baseUrl = "https://llm.sigkill.computer"; + apiKey = lib.strings.trim (builtins.readFile ../secrets/llama_cpp_api_key); }; }; }; diff --git a/home-manager/secrets/llama_cpp_api_key b/home-manager/secrets/llama_cpp_api_key new file mode 100644 index 0000000000000000000000000000000000000000..7aba54fa4620261b22d9ed57183ddd26cd7fbbc9 GIT binary patch literal 87 zcmZQ@_Y83kiVO&0_$#q+bN2PRwc^zRo3Go?k13py8O(5q?_pVOKuoRA>GadV0Ya;G t%CpU7b8akr3$&MbEa5F$|1!;FWlx8<001YfB$5CC literal 0 HcmV?d00001 From 5e9e6bcd405c41772baf8d5a715fff7046fd8ea0 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 2 Apr 2026 18:14:09 -0400 Subject: [PATCH 666/724] pi: fix llama.cpp provider discovery with auth Add api, authHeader, and discovery.type fields so omp can discover models via GET /v1/models with the Bearer token. --- home-manager/progs/pi.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home-manager/progs/pi.nix b/home-manager/progs/pi.nix index 045498b..8919ace 100644 --- a/home-manager/progs/pi.nix +++ b/home-manager/progs/pi.nix @@ -28,6 +28,9 @@ let "llama.cpp" = { baseUrl = "https://llm.sigkill.computer"; apiKey = lib.strings.trim (builtins.readFile ../secrets/llama_cpp_api_key); + api = "openai-responses"; + authHeader = true; + discovery.type = "llama.cpp"; }; }; }; From d7dd05e028f52fb980b0f80be525e36a056ccbd5 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 4 Apr 2026 01:52:24 -0400 Subject: [PATCH 667/724] remove claude-code and claude-code-bridge --- flake.lock | 100 ++++------------------------------------------------- flake.nix | 9 ----- 2 files changed, 7 insertions(+), 102 deletions(-) diff --git a/flake.lock b/flake.lock index e07636f..f82afa1 100644 --- a/flake.lock +++ b/flake.lock @@ -59,25 +59,6 @@ "type": "github" } }, - "claude-code": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1775088444, - "narHash": "sha256-hGWixWAyE3YhUQdHh1fZao8C2r7Khokx5CwzTdZdgKY=", - "owner": "sadjow", - "repo": "claude-code-nix", - "rev": "b46a627009fd58cd0b28d0ea20d503f7562bc90a", - "type": "github" - }, - "original": { - "owner": "sadjow", - "repo": "claude-code-nix", - "type": "github" - } - }, "crane": { "locked": { "lastModified": 1773189535, @@ -252,25 +233,7 @@ }, "flake-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" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1710146030, @@ -389,7 +352,7 @@ }, "json2steamshortcut": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" ] @@ -441,7 +404,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_4", + "systems": "systems_3", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -527,7 +490,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1775121446, @@ -597,22 +560,6 @@ } }, "nixpkgs": { - "locked": { - "lastModified": 1775034801, - "narHash": "sha256-tsecHNsWwr4wSaM2oW9GwafMwE24J+xD8bKDoto3exY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "8d029aa64915e54b7846873d9583af4c9fd21ea4", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { "locked": { "lastModified": 1775036866, "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=", @@ -655,7 +602,7 @@ "noctalia", "nixpkgs" ], - "systems": "systems_6", + "systems": "systems_5", "treefmt-nix": "treefmt-nix_2" }, "locked": { @@ -672,22 +619,6 @@ "type": "github" } }, - "opencode-claude-bridge": { - "flake": false, - "locked": { - "lastModified": 1774537245, - "narHash": "sha256-G2/GOP6gUGM2NBfOeSsUDnSus/engduft5z3Y7GwtUE=", - "owner": "dotCipher", - "repo": "opencode-claude-bridge", - "rev": "568ca15b5d2b772ebbad14b0b545fa7670272e79", - "type": "github" - }, - "original": { - "owner": "dotCipher", - "repo": "opencode-claude-bridge", - "type": "github" - } - }, "pre-commit": { "inputs": { "flake-compat": "flake-compat_2", @@ -713,7 +644,6 @@ }, "root": { "inputs": { - "claude-code": "claude-code", "deploy-rs": "deploy-rs", "disko": "disko", "emacs-overlay": "emacs-overlay", @@ -728,9 +658,8 @@ "nix-doom-emacs-unstraightened": "nix-doom-emacs-unstraightened", "nix-flatpak": "nix-flatpak", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "noctalia": "noctalia", - "opencode-claude-bridge": "opencode-claude-bridge", "rust-overlay": "rust-overlay", "zen-browser": "zen-browser" } @@ -816,21 +745,6 @@ } }, "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" - } - }, - "systems_6": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -890,7 +804,7 @@ }, "utils": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1731533236, diff --git a/flake.nix b/flake.nix index 7a15588..aaad4f1 100644 --- a/flake.nix +++ b/flake.nix @@ -88,15 +88,6 @@ url = "github:ChrisOboe/json2steamshortcut"; inputs.nixpkgs.follows = "nixpkgs"; }; - - claude-code = { - url = "github:sadjow/claude-code-nix"; - }; - - opencode-claude-bridge = { - url = "github:dotCipher/opencode-claude-bridge"; - flake = false; - }; }; outputs = From f96e99ff4defed98b1a1c2d4b2a21967ae54165c Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 4 Apr 2026 01:52:44 -0400 Subject: [PATCH 668/724] update --- flake.lock | 72 +++++++++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/flake.lock b/flake.lock index f82afa1..96fe4b4 100644 --- a/flake.lock +++ b/flake.lock @@ -120,11 +120,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1775116700, - "narHash": "sha256-gfX1Zh6EXXxbjkZBrpVHv4TGFuSTDDYlljQq3Sbxq+0=", + "lastModified": 1775183900, + "narHash": "sha256-2TK9bCb6nSj+iCMI3wGva3n9Egbn76AOnu+Dwrmb2wM=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "598ee8ad81ea80e38514d04e3576666fa5011f18", + "rev": "297b8d5788fdf6a1bae68d75937b01ba01f958f4", "type": "github" }, "original": { @@ -143,11 +143,11 @@ ] }, "locked": { - "lastModified": 1775123075, - "narHash": "sha256-gFkm83VNB8zoN29Kb3KajDo/5aL49AwslUFt8d2R5Ho=", + "lastModified": 1775268399, + "narHash": "sha256-g5RSRqGedQZrjC8lqxzrCj7ziG6Rjx4ZCflEt50GBWo=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "0e315e6cbe18c6174a62f13f458e2077d8073fbf", + "rev": "e4ea46a459d553fb654699ee65e64749763a70eb", "type": "github" }, "original": { @@ -164,11 +164,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1775102584, - "narHash": "sha256-DMqFfnsbE6XYMG4xkO3ergr2mqxFEfmt3ePDB1V0M+0=", + "lastModified": 1775275385, + "narHash": "sha256-ZaU7vo1E6oY+sG1HeEhtEWvRr3zYxkNWeWztSnbfgmc=", "owner": "rycee", "repo": "nur-expressions", - "rev": "bda7b1b99e891711cacc68fac2fcdc06abc7fac9", + "rev": "30a2e55fc20909b4b9e104e0254a2473184138a2", "type": "gitlab" }, "original": { @@ -278,11 +278,11 @@ ] }, "locked": { - "lastModified": 1775143651, - "narHash": "sha256-S0RqAyDPMTcv9vASMaE8eY1QexFysAOdnxUxFHIPOyE=", + "lastModified": 1775268934, + "narHash": "sha256-Sa5tW5kYPJornQEkFVD43F/0d4/WP+/GLTNktTFe2qU=", "owner": "nix-community", "repo": "home-manager", - "rev": "d166a078541982a76f14d3e06e9665fa5c9ed85e", + "rev": "9dc93220c1c9a410ef6277d6dc55c571d9e592d0", "type": "github" }, "original": { @@ -337,11 +337,11 @@ ] }, "locked": { - "lastModified": 1775071677, - "narHash": "sha256-EkVrhsEVG8FVodTPduAFC+qnb9YnKboF0It29zGJx8U=", + "lastModified": 1775203938, + "narHash": "sha256-huln34r9PztWS2OznILgbsIGZD0Y/zJQZXN+6MVV6X4=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "049bfbe4cc042e6003414d0875f0a70873fc4d6b", + "rev": "24f05f5e3b61dd4f5a4bdcbe5f2ecfa488d4109f", "type": "github" }, "original": { @@ -408,11 +408,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1775141156, - "narHash": "sha256-tNpLkiOtmxCxCch4zPLoEGyaZK16ryOpQuujtix0AqY=", + "lastModified": 1775272716, + "narHash": "sha256-GSeJgWngCp3j+32aBOyQujHpo87EqmTaBEyRRMc5nsg=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "09cd3ef62649bc47fa3eb34318bb6ef5096654dd", + "rev": "8945761bf8e462e15b3b76f1a38511f9b809619d", "type": "github" }, "original": { @@ -493,11 +493,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1775121446, - "narHash": "sha256-ZAW4jS/50hZb5BGBP7SaBt87MQfRLEKZm3KDrrXy91I=", + "lastModified": 1775219460, + "narHash": "sha256-WvNXHP/iLfnW2OSOiqfeoNYmQDiwPpVxiGgzdV7alU8=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "c00c67450a53f73ca8f8473eed409ca8510dd162", + "rev": "67c2891f55d3b7c8dabbac6f68eac503185869ae", "type": "github" }, "original": { @@ -545,11 +545,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1774933469, - "narHash": "sha256-OrnCQeUO2bqaWUl0lkDWyGWjKsOhtCyd7JSfTedQNUE=", + "lastModified": 1775203647, + "narHash": "sha256-6MWaMLXK9QMndI94CIxeiPafi3wuO+imCtK9tfhsZdw=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f4c4c2c0c923d7811ac2a63ccc154767e4195337", + "rev": "80afbd13eea0b7c4ac188de949e1711b31c2b5f0", "type": "github" }, "original": { @@ -583,11 +583,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1775142904, - "narHash": "sha256-UGZq9V+sImNCZXJivXBtJJ1p5Ui24vRrXoDK1ulhyLE=", + "lastModified": 1775210433, + "narHash": "sha256-tkue0Ed0CufUXjEBb51ojtyWY1ibK9h3ed+mVDHFGZA=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "411a820f3cf210425f02306ed4d14a7e4ea75f9b", + "rev": "759454d2d5bce9be7dea982818700140335ed047", "type": "github" }, "original": { @@ -606,11 +606,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1775008123, - "narHash": "sha256-zsd/kbsgfX2YQAlbao40JxyeVDwsUmBGyUDZc/Vo1C4=", + "lastModified": 1775135550, + "narHash": "sha256-79JP2QTdvp1jg7HGxAW+xzhzhLnlKUi8yGXq9nDCeH0=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "b87f41771c050d3c101d1528532de53293cba6da", + "rev": "e7224b756dcd10eec040df818a4c7a0fda5d6eff", "type": "github" }, "original": { @@ -671,11 +671,11 @@ ] }, "locked": { - "lastModified": 1775099554, - "narHash": "sha256-3xBsGnGDLOFtnPZ1D3j2LU19wpAlYefRKTlkv648rU0=", + "lastModified": 1775272153, + "narHash": "sha256-FwYb64ysv8J2TxaqsYYcDyHAHBUEaQlriPMWPMi1K7M=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "8d6387ed6d8e6e6672fd3ed4b61b59d44b124d99", + "rev": "740fb0203b2852917b909a72b948d34d0b171ec0", "type": "github" }, "original": { @@ -863,11 +863,11 @@ ] }, "locked": { - "lastModified": 1775106234, - "narHash": "sha256-ZCHEj7dvqaguQy2yOHELkrkgPRAbnno+Lg9PAAiBv44=", + "lastModified": 1775278263, + "narHash": "sha256-BgkUmlOuFaaZQCnlhXkQ3/Fng65aq00tJQkpoeTn7Mw=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "0118405698718bd82343050d4419072fffd0df54", + "rev": "bb051d7a0f04356d42528bbb65dc014adf2dab66", "type": "github" }, "original": { From 4b73e237cbefca28426d68eb38ef1fbcb7f32c31 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 6 Apr 2026 00:57:36 -0400 Subject: [PATCH 669/724] pi: specify anthropic for models --- home-manager/progs/pi.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/home-manager/progs/pi.nix b/home-manager/progs/pi.nix index 8919ace..c209510 100644 --- a/home-manager/progs/pi.nix +++ b/home-manager/progs/pi.nix @@ -10,11 +10,11 @@ let # librarian/explore/quick β†’ smol/commit = haiku ompSettings = { modelRoles = { - default = "claude-opus-4-6:high"; - smol = "claude-haiku-4-5:low"; - slow = "claude-opus-4-6:xhigh"; - plan = "claude-opus-4-6:high"; - commit = "claude-haiku-4-5:low"; + default = "anthropic/claude-opus-4-6:high"; + smol = "anthropic/claude-haiku-4-5:low"; + slow = "anthropic/claude-opus-4-6:xhigh"; + plan = "anthropic/claude-opus-4-6:high"; + commit = "anthropic/claude-haiku-4-5:low"; }; }; From 7e571f49861c732b9a822ece74cc7f8f24f4d32b Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 6 Apr 2026 13:07:19 -0400 Subject: [PATCH 670/724] update --- flake.lock | 96 +++++++++++++++++++++++++++--------------------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/flake.lock b/flake.lock index 96fe4b4..7f84a21 100644 --- a/flake.lock +++ b/flake.lock @@ -120,11 +120,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1775183900, - "narHash": "sha256-2TK9bCb6nSj+iCMI3wGva3n9Egbn76AOnu+Dwrmb2wM=", + "lastModified": 1775361441, + "narHash": "sha256-XaHk6Tyktb5BjO2l5OlU1yY0mI5BA/ymbdKEDzdlEsw=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "297b8d5788fdf6a1bae68d75937b01ba01f958f4", + "rev": "4a5046c4294f70e09609f7d7d62db399747edb58", "type": "github" }, "original": { @@ -143,11 +143,11 @@ ] }, "locked": { - "lastModified": 1775268399, - "narHash": "sha256-g5RSRqGedQZrjC8lqxzrCj7ziG6Rjx4ZCflEt50GBWo=", + "lastModified": 1775466626, + "narHash": "sha256-eCVux9FXJ3o9lAM4DxOdggG7NyRmJLZo3pbPO/1y8Xc=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "e4ea46a459d553fb654699ee65e64749763a70eb", + "rev": "e40238e6e0eb51e16341aad0c46109f3468324ee", "type": "github" }, "original": { @@ -164,11 +164,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1775275385, - "narHash": "sha256-ZaU7vo1E6oY+sG1HeEhtEWvRr3zYxkNWeWztSnbfgmc=", + "lastModified": 1775448173, + "narHash": "sha256-C6OJuD3A4KDNz4QaYedkYtXzKHPecG5YYyMGLq7UwY8=", "owner": "rycee", "repo": "nur-expressions", - "rev": "30a2e55fc20909b4b9e104e0254a2473184138a2", + "rev": "5b0fb7d54dea38c47e5c58058c166e790a0e0cf1", "type": "gitlab" }, "original": { @@ -278,11 +278,11 @@ ] }, "locked": { - "lastModified": 1775268934, - "narHash": "sha256-Sa5tW5kYPJornQEkFVD43F/0d4/WP+/GLTNktTFe2qU=", + "lastModified": 1775457580, + "narHash": "sha256-ikws/ssAmG20AGrEwBuwspwPlkubJu34mB+Uz2fJBJs=", "owner": "nix-community", "repo": "home-manager", - "rev": "9dc93220c1c9a410ef6277d6dc55c571d9e592d0", + "rev": "5de7dbd151b0bd65d45785553d4a22d832733ffc", "type": "github" }, "original": { @@ -337,11 +337,11 @@ ] }, "locked": { - "lastModified": 1775203938, - "narHash": "sha256-huln34r9PztWS2OznILgbsIGZD0Y/zJQZXN+6MVV6X4=", + "lastModified": 1775287496, + "narHash": "sha256-tCBlt+RP85MLrMYntro/YvG7NWktbmFiyItGBo85Tf8=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "24f05f5e3b61dd4f5a4bdcbe5f2ecfa488d4109f", + "rev": "0a7a3feb77606db451aa10287ad4c4c8f85922f8", "type": "github" }, "original": { @@ -383,11 +383,11 @@ ] }, "locked": { - "lastModified": 1774858933, - "narHash": "sha256-rgHUoE4QhOvK3Rcl9cbuIVdjPjFjfhcTm/uPs8Y7+2w=", + "lastModified": 1775494882, + "narHash": "sha256-bOUFAWjD95Au+K1LkEhV4u3ulsiVfIXbbOFPxnEgSv8=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "45338aab3013924c75305f5cb3543b9cda993183", + "rev": "40970afc8d8f1c122f3d282d3e7329d9faf65bec", "type": "github" }, "original": { @@ -408,11 +408,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1775272716, - "narHash": "sha256-GSeJgWngCp3j+32aBOyQujHpo87EqmTaBEyRRMc5nsg=", + "lastModified": 1775486894, + "narHash": "sha256-JPl4+i8DuzCtvyd5lsvO1HudGBF5OXlkNyJJ0GbB6uw=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "8945761bf8e462e15b3b76f1a38511f9b809619d", + "rev": "1d2eae174c96e2ba8504813e3a5b5fa93964a768", "type": "github" }, "original": { @@ -435,11 +435,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1775089852, - "narHash": "sha256-zcX3hf2cTOQ06kRP+FCYbuaWhy+FLruLFp+D79Enjo4=", + "lastModified": 1775457047, + "narHash": "sha256-HXWISaieWkm+zcZkBbqDgu6yxlFX3JHxnVRv7mBH8Og=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "cfa91d98691d91cc604ab8f4e224819524c496ad", + "rev": "b9f29e2ade937c5fc8ae2d3fe8c026698c32c044", "type": "github" }, "original": { @@ -468,11 +468,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1774616418, - "narHash": "sha256-z+dLkAS4bqytIlOI4h2MnjBJrSP4d1Awx0n+IV5YA3Y=", + "lastModified": 1775389417, + "narHash": "sha256-6hFJBpP31H97upBDHJVPsm++io+9pjgApbXfxD0dCFo=", "owner": "YaLTeR", "repo": "niri", - "rev": "8f48f56fe19918b5cfa02e5d68a47ebaf7bf3dee", + "rev": "d1a0380eed224363749f1704ca3ff2ab1690b7f2", "type": "github" }, "original": { @@ -493,11 +493,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1775219460, - "narHash": "sha256-WvNXHP/iLfnW2OSOiqfeoNYmQDiwPpVxiGgzdV7alU8=", + "lastModified": 1775468583, + "narHash": "sha256-nxr1sPuYiAs9ijP+XtMrigBlnRzEe2pdyrZMwvabFNo=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "67c2891f55d3b7c8dabbac6f68eac503185869ae", + "rev": "3bd859caace1a1ec3ef7f9d59c4561331bceef5c", "type": "github" }, "original": { @@ -545,11 +545,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1775203647, - "narHash": "sha256-6MWaMLXK9QMndI94CIxeiPafi3wuO+imCtK9tfhsZdw=", + "lastModified": 1775490113, + "narHash": "sha256-2ZBhDNZZwYkRmefK5XLOusCJHnoeKkoN95hoSGgMxWM=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "80afbd13eea0b7c4ac188de949e1711b31c2b5f0", + "rev": "c775c2772ba56e906cbeb4e0b2db19079ef11ff7", "type": "github" }, "original": { @@ -583,11 +583,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1775210433, - "narHash": "sha256-tkue0Ed0CufUXjEBb51ojtyWY1ibK9h3ed+mVDHFGZA=", + "lastModified": 1775477009, + "narHash": "sha256-419iM+ERLiqtkKucG+0PKkpfni6b4RCKDUpy7sgwQb0=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "759454d2d5bce9be7dea982818700140335ed047", + "rev": "40e98f1ad0ee1fb65726ce4b9fd0aa65a6efbe8a", "type": "github" }, "original": { @@ -606,11 +606,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1775135550, - "narHash": "sha256-79JP2QTdvp1jg7HGxAW+xzhzhLnlKUi8yGXq9nDCeH0=", + "lastModified": 1775352167, + "narHash": "sha256-5ytGzf6tWONKfgVG2JUZBa/lAHSArPYu/2l2z5lPsF0=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "e7224b756dcd10eec040df818a4c7a0fda5d6eff", + "rev": "736ceb63476597b1dea14fa053d5acf9070c6c4b", "type": "github" }, "original": { @@ -671,11 +671,11 @@ ] }, "locked": { - "lastModified": 1775272153, - "narHash": "sha256-FwYb64ysv8J2TxaqsYYcDyHAHBUEaQlriPMWPMi1K7M=", + "lastModified": 1775445266, + "narHash": "sha256-3fgIj85WHQbOamrpIw9WY3ZL1PoEvjPOjmzMYNsEQJo=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "740fb0203b2852917b909a72b948d34d0b171ec0", + "rev": "61747bc3cf2da179b9af356ae9e70f3b895b0c24", "type": "github" }, "original": { @@ -789,11 +789,11 @@ ] }, "locked": { - "lastModified": 1773297127, - "narHash": "sha256-6E/yhXP7Oy/NbXtf1ktzmU8SdVqJQ09HC/48ebEGBpk=", + "lastModified": 1775125835, + "narHash": "sha256-2qYcPgzFhnQWchHo0SlqLHrXpux5i6ay6UHA+v2iH4U=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "71b125cd05fbfd78cab3e070b73544abe24c5016", + "rev": "75925962939880974e3ab417879daffcba36c4a3", "type": "github" }, "original": { @@ -863,11 +863,11 @@ ] }, "locked": { - "lastModified": 1775278263, - "narHash": "sha256-BgkUmlOuFaaZQCnlhXkQ3/Fng65aq00tJQkpoeTn7Mw=", + "lastModified": 1775453133, + "narHash": "sha256-VIlMG985ONqVqF+OnPuS5Shbz5k6tqbOWnDL7EH+IT4=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "bb051d7a0f04356d42528bbb65dc014adf2dab66", + "rev": "8d0508ffceba8ad785ae442591dd115080a55142", "type": "github" }, "original": { From 4c04e5b0a28407d1dceab9d1f63f0757e3185457 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 6 Apr 2026 14:21:43 -0400 Subject: [PATCH 671/724] use my own nix cache --- system/common.nix | 17 ++++++++++++----- system/secrets/nix-cache-netrc | Bin 0 -> 127 bytes 2 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 system/secrets/nix-cache-netrc diff --git a/system/common.nix b/system/common.nix index d8d152a..4e7f839 100644 --- a/system/common.nix +++ b/system/common.nix @@ -78,11 +78,18 @@ options = "--delete-older-than 30d"; }; - # enable flakes! - settings.experimental-features = [ - "nix-command" - "flakes" - ]; + settings = { + # enable flakes! + experimental-features = [ + "nix-command" + "flakes" + ]; + + # Use muffin server as a binary cache + substituters = [ "https://nix-cache.sigkill.computer" ]; + trusted-public-keys = [ "nix-cache.sigkill.computer-1:ONtQC9gUjL+2yNgMWB68NudPySXhyzJ7I3ra56/NPgk=" ]; + netrc-file = "${./secrets/nix-cache-netrc}"; + }; }; # kernel options diff --git a/system/secrets/nix-cache-netrc b/system/secrets/nix-cache-netrc new file mode 100644 index 0000000000000000000000000000000000000000..cee0ea5fb9488f82241c9de40bb4c5f4afc9dd61 GIT binary patch literal 127 zcmZQ@_Y83kiVO&0kUV)+@-=h#J4<8tjLxoU&lw#Z^NKG!Dd$XZR$VFb@98xGA?N#w z+ZHUejZlc6yg%WIpy`>EbB|7^ZIP;2^K$0DU!Fc^&sMJP;cu4l&h1^mom}_irP@{g kclQJjhi7!ZQ~9vZ?t10)%SUFWi3qEfJ1`q{?E0h$02o#~lK=n! literal 0 HcmV?d00001 From 08486e25e6b97ea7056919d58f6c7867386719e7 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 6 Apr 2026 14:38:21 -0400 Subject: [PATCH 672/724] gitea: also build laptop --- .gitea/workflows/deploy.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index a4147d8..5905d63 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -1,4 +1,4 @@ -name: Build and Deploy Desktop +name: Build and Deploy on: push: branches: [main] @@ -19,6 +19,10 @@ jobs: run: | nix build .#nixosConfigurations.yarn.config.system.build.toplevel -L + - name: Build NixOS configuration (mreow) + run: | + nix build .#nixosConfigurations.mreow.config.system.build.toplevel -L + - name: Deploy to desktop run: | eval $(ssh-agent -s) @@ -35,7 +39,7 @@ jobs: run: | curl -sf -X POST \ "https://ntfy.sigkill.computer/deployments" \ - -H "Title: [yarn] Build succeeded" \ + -H "Title: [dotfiles] Build succeeded" \ -H "Priority: default" \ -H "Tags: white_check_mark" \ -d "dotfiles built from commit ${GITHUB_SHA::8}" @@ -45,7 +49,7 @@ jobs: run: | curl -sf -X POST \ "https://ntfy.sigkill.computer/deployments" \ - -H "Title: [yarn] Build FAILED" \ + -H "Title: [dotfiles] Build FAILED" \ -H "Priority: urgent" \ -H "Tags: rotating_light" \ -d "dotfiles build failed at commit ${GITHUB_SHA::8}" From 269a0c4d2796a583d34b8f8ed9562e588cbbc9c2 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 7 Apr 2026 13:45:43 -0400 Subject: [PATCH 673/724] update --- flake.lock | 72 +++++++++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/flake.lock b/flake.lock index 7f84a21..a5bde74 100644 --- a/flake.lock +++ b/flake.lock @@ -143,11 +143,11 @@ ] }, "locked": { - "lastModified": 1775466626, - "narHash": "sha256-eCVux9FXJ3o9lAM4DxOdggG7NyRmJLZo3pbPO/1y8Xc=", + "lastModified": 1775581188, + "narHash": "sha256-3zC5iNv9l6a595dYomfesWr30t6YZxv5Jzf5zLtpPAM=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "e40238e6e0eb51e16341aad0c46109f3468324ee", + "rev": "6877822fc1855f248077d7833f25432e21940543", "type": "github" }, "original": { @@ -164,11 +164,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1775448173, - "narHash": "sha256-C6OJuD3A4KDNz4QaYedkYtXzKHPecG5YYyMGLq7UwY8=", + "lastModified": 1775534587, + "narHash": "sha256-OLAoGTTwPVTH13C1e2Vcdff4WigTsk6hO5Y3sEcwl/s=", "owner": "rycee", "repo": "nur-expressions", - "rev": "5b0fb7d54dea38c47e5c58058c166e790a0e0cf1", + "rev": "9f1e4b7f5443c50cb4ccc2a376ba1058231e64b4", "type": "gitlab" }, "original": { @@ -278,11 +278,11 @@ ] }, "locked": { - "lastModified": 1775457580, - "narHash": "sha256-ikws/ssAmG20AGrEwBuwspwPlkubJu34mB+Uz2fJBJs=", + "lastModified": 1775556024, + "narHash": "sha256-j1u/859OVS54rGlsvFqJdwKPEnFYCI+4pyfTiSfv1Xc=", "owner": "nix-community", "repo": "home-manager", - "rev": "5de7dbd151b0bd65d45785553d4a22d832733ffc", + "rev": "4bdfeff1d9b7473e6e58f73f5809576e8a69e406", "type": "github" }, "original": { @@ -383,11 +383,11 @@ ] }, "locked": { - "lastModified": 1775494882, - "narHash": "sha256-bOUFAWjD95Au+K1LkEhV4u3ulsiVfIXbbOFPxnEgSv8=", + "lastModified": 1775510693, + "narHash": "sha256-gZfJ07j/oOciDi8mF/V8QTm7YCeDcusNSMZzBFi8OUM=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "40970afc8d8f1c122f3d282d3e7329d9faf65bec", + "rev": "3fe0ae8cb285e0ad101a9675f4190d455fb05e85", "type": "github" }, "original": { @@ -408,11 +408,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1775486894, - "narHash": "sha256-JPl4+i8DuzCtvyd5lsvO1HudGBF5OXlkNyJJ0GbB6uw=", + "lastModified": 1775574328, + "narHash": "sha256-tP3lX6AFBIrQbusqlZ9ZuDwmSdxGb4wNoExlQJu/5iA=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "1d2eae174c96e2ba8504813e3a5b5fa93964a768", + "rev": "c2295fea15e066efc8d21996e9f5d4e9c41e271b", "type": "github" }, "original": { @@ -435,11 +435,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1775457047, - "narHash": "sha256-HXWISaieWkm+zcZkBbqDgu6yxlFX3JHxnVRv7mBH8Og=", + "lastModified": 1775566751, + "narHash": "sha256-5Xkx4NQvl2azAQe3lCZCMUx4FiwGOlEb+I4kyycQYw8=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "b9f29e2ade937c5fc8ae2d3fe8c026698c32c044", + "rev": "6aa49a9c5b82911459e230db5bd64289082d4354", "type": "github" }, "original": { @@ -468,11 +468,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1775389417, - "narHash": "sha256-6hFJBpP31H97upBDHJVPsm++io+9pjgApbXfxD0dCFo=", + "lastModified": 1775561155, + "narHash": "sha256-TK2IrqQivRcwqJa0suZMbcsN17CtA8Uu0v7CDnLATb0=", "owner": "YaLTeR", "repo": "niri", - "rev": "d1a0380eed224363749f1704ca3ff2ab1690b7f2", + "rev": "599db847f857b8a7ff78ce02f15acab5d5d9fee1", "type": "github" }, "original": { @@ -493,11 +493,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1775468583, - "narHash": "sha256-nxr1sPuYiAs9ijP+XtMrigBlnRzEe2pdyrZMwvabFNo=", + "lastModified": 1775559092, + "narHash": "sha256-Xm3XmkDw+59B9pCOmauWMNoFmOMC1giMzxkOOAk9JmY=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "3bd859caace1a1ec3ef7f9d59c4561331bceef5c", + "rev": "a75f733dc11e31d60f8c8e63ca4c8fe0654fd98a", "type": "github" }, "original": { @@ -561,11 +561,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1775036866, - "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=", + "lastModified": 1775423009, + "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e", + "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9", "type": "github" }, "original": { @@ -583,11 +583,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1775477009, - "narHash": "sha256-419iM+ERLiqtkKucG+0PKkpfni6b4RCKDUpy7sgwQb0=", + "lastModified": 1775569376, + "narHash": "sha256-Gge4uDqbcl5kl3fNaRRc6PuOv7YMOqWbX6tRcYwayok=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "40e98f1ad0ee1fb65726ce4b9fd0aa65a6efbe8a", + "rev": "91d0bb83aefa2d238df31e2a96098a2ef75aa238", "type": "github" }, "original": { @@ -606,11 +606,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1775352167, - "narHash": "sha256-5ytGzf6tWONKfgVG2JUZBa/lAHSArPYu/2l2z5lPsF0=", + "lastModified": 1775491791, + "narHash": "sha256-elzmRpudiwtYQNCKk9TAEhlYQV0+yUM81poo01Z7FfQ=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "736ceb63476597b1dea14fa053d5acf9070c6c4b", + "rev": "9e2736531ef7a1a336abf7ec72255d0b192273b6", "type": "github" }, "original": { @@ -671,11 +671,11 @@ ] }, "locked": { - "lastModified": 1775445266, - "narHash": "sha256-3fgIj85WHQbOamrpIw9WY3ZL1PoEvjPOjmzMYNsEQJo=", + "lastModified": 1775531562, + "narHash": "sha256-G83GDxQo6lqO5aeTSD5RFLhnh2g6DzJpSvSju2EjjrQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "61747bc3cf2da179b9af356ae9e70f3b895b0c24", + "rev": "d8b1b209203665924c81eabf750492530754f27e", "type": "github" }, "original": { From 841195425d87c274c1a08195b1cf104995141ce8 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 7 Apr 2026 13:54:29 -0400 Subject: [PATCH 674/724] README.md: remove old TODO --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index e747f5c..97f0b80 100644 --- a/README.md +++ b/README.md @@ -18,5 +18,4 @@ There is more that I'm using, but those are the main ones! Read my configs to ge - 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) From 325e2720ec3d1b8fb775fbfe5fe3637672220d5f Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 7 Apr 2026 14:31:09 -0400 Subject: [PATCH 675/724] borg: remove signal and zen backups (handled by other means --- home-manager/progs/borg.nix | 13 ------------- system/common.nix | 4 +++- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/home-manager/progs/borg.nix b/home-manager/progs/borg.nix index 83cc8b3..ad336fa 100644 --- a/home-manager/progs/borg.nix +++ b/home-manager/progs/borg.nix @@ -8,7 +8,6 @@ location = { sourceDirectories = ( map (f: "${homeDirectory}/${f}") [ - ".zen" ".local/share/fish" ".ssh" "Documents" @@ -16,18 +15,6 @@ "Pictures" "school" ] - ++ (map (f: ".config/Signal/${f}") [ - "stickers.noindex" - "attachments.noindex" - "downloads.noindex" - "drafts.noindex" - "sql" - "IndexedDB" - "Local Storage" - "SharedStorage" - "config.json" - "Preferences" - ]) ); excludeHomeManagerSymlinks = true; diff --git a/system/common.nix b/system/common.nix index 4e7f839..6fb0436 100644 --- a/system/common.nix +++ b/system/common.nix @@ -87,7 +87,9 @@ # Use muffin server as a binary cache substituters = [ "https://nix-cache.sigkill.computer" ]; - trusted-public-keys = [ "nix-cache.sigkill.computer-1:ONtQC9gUjL+2yNgMWB68NudPySXhyzJ7I3ra56/NPgk=" ]; + trusted-public-keys = [ + "nix-cache.sigkill.computer-1:ONtQC9gUjL+2yNgMWB68NudPySXhyzJ7I3ra56/NPgk=" + ]; netrc-file = "${./secrets/nix-cache-netrc}"; }; }; From 3cee862bd089dac28009c037d88360529fa39a2a Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 7 Apr 2026 20:53:53 -0400 Subject: [PATCH 676/724] re-enable rtkit --- system/common.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/system/common.nix b/system/common.nix index 6fb0436..0004c80 100644 --- a/system/common.nix +++ b/system/common.nix @@ -235,8 +235,7 @@ # Enable sound with pipewire. services.pulseaudio.enable = false; # pipewire >>>>>>> pulseaudio - # BUG! disable rtkit in order to fix mumble: https://github.com/NixOS/nixpkgs/issues/392992#issuecomment-2799867278 - security.rtkit.enable = false; + security.rtkit.enable = true; services.pipewire = { enable = true; alsa.enable = true; From 8485f07c8d8efce5196d88327ee3b23e6395509e Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 7 Apr 2026 23:46:50 -0400 Subject: [PATCH 677/724] zen: add consumer-rights-wiki addon --- home-manager/progs/zen/default.nix | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/home-manager/progs/zen/default.nix b/home-manager/progs/zen/default.nix index 318264e..797673a 100644 --- a/home-manager/progs/zen/default.nix +++ b/home-manager/progs/zen/default.nix @@ -24,6 +24,20 @@ let }; }; + consumer-rights-wiki = buildFirefoxXpiAddon { + pname = "consumer-rights-wiki"; + version = "1.0.34"; + addonId = "@crw-extension-firefox"; + url = "https://addons.mozilla.org/firefox/downloads/file/4730448/consumer_rights_wiki-1.0.34.xpi"; + sha256 = "732969ed4d5c7965b6254a1190a82ce4ab0ff44bda2295264eb8a22c452899ea"; + meta = with lib; { + homepage = "https://github.com/FULU-Foundation/CRW-Extension"; + description = "Shows a popup when the site you're viewing has an article on the Consumer Rights Wiki"; + license = licenses.mit; + platforms = platforms.all; + }; + }; + ublockSettings = import ./ublock.nix { inherit lib; }; darkReaderSettings = import ./dark-reader.nix { inherit lib; }; redirectorSettings = import ./redirector.nix { inherit lib; }; @@ -54,7 +68,10 @@ in steam-database ublock-origin ]) - ++ [ hacker-smacker ]; + ++ [ + hacker-smacker + consumer-rights-wiki + ]; settings = { "uBlock0@raymondhill.net" = ublockSettings; From 0f0429b4b2798bdb5312dc27a3b75a2191c510aa Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 8 Apr 2026 13:04:30 -0400 Subject: [PATCH 678/724] llm-agents.nix: use fork that compiles omp from source --- flake.lock | 35 +++++++++++++++++++++++++++++------ flake.nix | 2 +- 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index a5bde74..14c1274 100644 --- a/flake.lock +++ b/flake.lock @@ -404,19 +404,21 @@ "nixpkgs": [ "nixpkgs" ], + "rust-overlay": "rust-overlay", "systems": "systems_3", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1775574328, - "narHash": "sha256-tP3lX6AFBIrQbusqlZ9ZuDwmSdxGb4wNoExlQJu/5iA=", - "owner": "numtide", + "lastModified": 1775663139, + "narHash": "sha256-mFmUbE2OLNl0YA1RACprVObeBjK8Qv9aV/V6fmn3mUU=", + "owner": "titaniumtown", "repo": "llm-agents.nix", - "rev": "c2295fea15e066efc8d21996e9f5d4e9c41e271b", + "rev": "a507240bd404b28dbfc7e8d98bdf6c265e2ad51a", "type": "github" }, "original": { - "owner": "numtide", + "owner": "titaniumtown", + "ref": "pr/omp-build-from-source", "repo": "llm-agents.nix", "type": "github" } @@ -660,11 +662,32 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "noctalia": "noctalia", - "rust-overlay": "rust-overlay", + "rust-overlay": "rust-overlay_2", "zen-browser": "zen-browser" } }, "rust-overlay": { + "inputs": { + "nixpkgs": [ + "llm-agents", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1775617983, + "narHash": "sha256-2NWGA/I4j/qlx6qbg86QvJiK1/GyH9gnf0hFiARWVwE=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "d98b91b1feae7ef07fa2ccb3aa3f83f11abfae54", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_2": { "inputs": { "nixpkgs": [ "nixpkgs" diff --git a/flake.nix b/flake.nix index aaad4f1..231a1ee 100644 --- a/flake.nix +++ b/flake.nix @@ -80,7 +80,7 @@ }; llm-agents = { - url = "github:numtide/llm-agents.nix"; + url = "github:titaniumtown/llm-agents.nix/pr/omp-build-from-source"; inputs.nixpkgs.follows = "nixpkgs"; }; From 3627cb19c6b660391f70b3b223c80fa2bba72af5 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 8 Apr 2026 13:08:30 -0400 Subject: [PATCH 679/724] omp: add fix auth patch (to test) --- home-manager/progs/pi.nix | 4 +- patches/omp-fix-auth.patch | 293 +++++++++++++++++++++++++++++++++++++ 2 files changed, 296 insertions(+), 1 deletion(-) create mode 100644 patches/omp-fix-auth.patch diff --git a/home-manager/progs/pi.nix b/home-manager/progs/pi.nix index c209510..334dff4 100644 --- a/home-manager/progs/pi.nix +++ b/home-manager/progs/pi.nix @@ -37,7 +37,9 @@ let in { home.packages = [ - inputs.llm-agents.packages.${pkgs.stdenv.hostPlatform.system}.omp + (inputs.llm-agents.packages.${pkgs.stdenv.hostPlatform.system}.omp.overrideAttrs (old: { + patches = (old.patches or [ ]) ++ [ ../../patches/omp-fix-auth.patch ]; + })) ]; # main settings: ~/.omp/agent/config.yml (JSON is valid YAML) diff --git a/patches/omp-fix-auth.patch b/patches/omp-fix-auth.patch new file mode 100644 index 0000000..d6b2472 --- /dev/null +++ b/patches/omp-fix-auth.patch @@ -0,0 +1,293 @@ +commit 31d537735d3c5e25a2b620d63ebbfea4cf84f57e +Author: Simon Gardling +Date: Wed Apr 8 13:05:09 2026 -0400 + + Fix key reauth with parallel sessions + +diff --git a/packages/ai/CHANGELOG.md b/packages/ai/CHANGELOG.md +index 3f50b7bd4..248dacbff 100644 +--- a/packages/ai/CHANGELOG.md ++++ b/packages/ai/CHANGELOG.md +@@ -5,6 +5,10 @@ + + - Removed `coerceNullStrings` function and its automatic null-string coercion behavior from JSON parsing + ++### Fixed ++ ++- Fixed concurrent OAuth refresh token rotation race: when multiple instances share the same credential DB, one instance refreshing a token no longer causes other instances to permanently disable the credential on `invalid_grant` ([#607](https://github.com/can1357/oh-my-pi/issues/607)) ++ + ## [13.19.0] - 2026-04-05 + + ### Fixed +diff --git a/packages/ai/src/auth-storage.ts b/packages/ai/src/auth-storage.ts +index 9fdb4473b..fac936dad 100644 +--- a/packages/ai/src/auth-storage.ts ++++ b/packages/ai/src/auth-storage.ts +@@ -1865,7 +1865,30 @@ export class AuthStorage { + }); + + if (isDefinitiveFailure) { +- // Permanently disable invalid credentials with an explicit cause for inspection/debugging ++ // Before permanently disabling, check if another instance already refreshed ++ // the token in the shared DB. Concurrent instances hold stale in-memory ++ // copies; refresh token rotation by one instance invalidates the token ++ // that other instances still hold. Re-read from DB before giving up. ++ if (/invalid_grant/i.test(errorMsg)) { ++ const entries = this.#getStoredCredentials(provider); ++ const entry = entries[selection.index]; ++ if (entry) { ++ const dbCredentials = this.#store.listAuthCredentials(provider); ++ const dbEntry = dbCredentials.find(row => row.id === entry.id); ++ if ( ++ dbEntry?.credential.type === "oauth" && ++ dbEntry.credential.refresh !== selection.credential.refresh ++ ) { ++ // DB has a newer refresh token β€” another instance refreshed. ++ // Update in-memory state and retry with the fresh credential. ++ const updated = [...entries]; ++ updated[selection.index] = { id: entry.id, credential: dbEntry.credential }; ++ this.#setStoredCredentials(provider, updated); ++ return this.getApiKey(provider, sessionId, options); ++ } ++ } ++ } ++ // Genuinely invalid β€” disable the credential + this.#disableCredentialAt(provider, selection.index, `oauth refresh failed: ${errorMsg}`); + if (this.#getCredentialsForProvider(provider).some(credential => credential.type === "oauth")) { + return this.getApiKey(provider, sessionId, options); +diff --git a/packages/ai/test/auth-storage-refresh-race.test.ts b/packages/ai/test/auth-storage-refresh-race.test.ts +new file mode 100644 +index 000000000..5a8098a18 +--- /dev/null ++++ b/packages/ai/test/auth-storage-refresh-race.test.ts +@@ -0,0 +1,230 @@ ++import { Database } from "bun:sqlite"; ++import { afterEach, beforeEach, describe, expect, test, vi } from "bun:test"; ++import * as fs from "node:fs/promises"; ++import * as os from "node:os"; ++import * as path from "node:path"; ++import { AuthCredentialStore, AuthStorage, type OAuthCredential } from "../src/auth-storage"; ++import * as oauthUtils from "../src/utils/oauth"; ++import type { OAuthCredentials } from "../src/utils/oauth/types"; ++ ++/** ++ * Tests for the concurrent OAuth refresh token rotation race condition. ++ * ++ * When multiple omp instances share the same SQLite credential DB but hold ++ * independent in-memory caches, refresh token rotation by one instance ++ * invalidates the token that other instances still hold. Without the fix, ++ * the stale instance permanently disables the credential on `invalid_grant` ++ * even though a valid refresh token exists in the DB. ++ */ ++ ++function readDisabledCauses(dbPath: string, provider: string): string[] { ++ const db = new Database(dbPath, { readonly: true }); ++ try { ++ const rows = db ++ .prepare( ++ "SELECT disabled_cause FROM auth_credentials WHERE provider = ? AND disabled_cause IS NOT NULL ORDER BY id ASC", ++ ) ++ .all(provider) as Array<{ disabled_cause?: string | null }>; ++ return rows.flatMap(row => (typeof row.disabled_cause === "string" ? [row.disabled_cause] : [])); ++ } finally { ++ db.close(); ++ } ++} ++ ++function countActiveCredentials(dbPath: string, provider: string): number { ++ const db = new Database(dbPath, { readonly: true }); ++ try { ++ const row = db ++ .prepare("SELECT COUNT(*) AS count FROM auth_credentials WHERE provider = ? AND disabled_cause IS NULL") ++ .get(provider) as { count?: number } | undefined; ++ return row?.count ?? 0; ++ } finally { ++ db.close(); ++ } ++} ++ ++const EXPIRED_TOKEN_EXPIRES = Date.now() - 60_000; ++const FRESH_TOKEN_EXPIRES = Date.now() + 3_600_000; ++ ++function makeOAuthCredential(suffix: string, opts?: { expires?: number }): OAuthCredential { ++ return { ++ type: "oauth", ++ access: `access-${suffix}`, ++ refresh: `refresh-${suffix}`, ++ expires: opts?.expires ?? FRESH_TOKEN_EXPIRES, ++ accountId: "acct-shared", ++ email: "user@example.com", ++ }; ++} ++ ++describe("AuthStorage concurrent OAuth refresh token rotation race", () => { ++ let tempDir = ""; ++ let dbPath = ""; ++ let storeA: AuthCredentialStore | null = null; ++ let storeB: AuthCredentialStore | null = null; ++ let authStorageA: AuthStorage | null = null; ++ let authStorageB: AuthStorage | null = null; ++ ++ beforeEach(async () => { ++ tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "pi-ai-auth-refresh-race-")); ++ dbPath = path.join(tempDir, "agent.db"); ++ ++ // Both stores point at the same SQLite DB β€” simulates two omp instances ++ storeA = await AuthCredentialStore.open(dbPath); ++ storeB = await AuthCredentialStore.open(dbPath); ++ }); ++ ++ afterEach(async () => { ++ vi.restoreAllMocks(); ++ storeA?.close(); ++ storeB?.close(); ++ storeA = null; ++ storeB = null; ++ authStorageA = null; ++ authStorageB = null; ++ if (tempDir) { ++ await fs.rm(tempDir, { recursive: true, force: true }); ++ tempDir = ""; ++ } ++ }); ++ ++ test("instance B recovers from invalid_grant when instance A already refreshed", async () => { ++ if (!storeA || !storeB) throw new Error("test setup failed"); ++ ++ // Store an expired OAuth credential β€” both instances will need to refresh ++ const staleCredential = makeOAuthCredential("v1", { expires: EXPIRED_TOKEN_EXPIRES }); ++ authStorageA = new AuthStorage(storeA); ++ await authStorageA.set("anthropic", [staleCredential]); ++ ++ // Instance B loads same credential from DB into its own in-memory cache ++ authStorageB = new AuthStorage(storeB); ++ await authStorageB.reload(); ++ ++ // The refreshed credential that instance A will produce ++ const refreshedCredential: OAuthCredentials = { ++ access: "access-v2", ++ refresh: "refresh-v2", ++ expires: FRESH_TOKEN_EXPIRES, ++ accountId: "acct-shared", ++ email: "user@example.com", ++ }; ++ ++ // Mock both refresh paths: ++ // - refreshOAuthToken: called by pre-refresh in #resolveOAuthApiKey for expired tokens ++ // - getOAuthApiKey: called by #tryOAuthCredential for the actual token exchange ++ const refreshSpy = vi.spyOn(oauthUtils, "refreshOAuthToken"); ++ const getApiKeySpy = vi.spyOn(oauthUtils, "getOAuthApiKey"); ++ ++ // Step 1: Instance A refreshes successfully ++ refreshSpy.mockImplementation(async (_provider, credential) => { ++ return { ...credential, ...refreshedCredential }; ++ }); ++ getApiKeySpy.mockImplementation(async (_provider, credentials) => { ++ const cred = credentials.anthropic as OAuthCredentials | undefined; ++ if (!cred) return null; ++ return { newCredentials: refreshedCredential, apiKey: "sk-ant-new-key" }; ++ }); ++ ++ const keyA = await authStorageA.getApiKey("anthropic", "session-a"); ++ expect(keyA).toBe("sk-ant-new-key"); ++ ++ // DB now has refreshed credential from instance A. ++ // Instance B still has stale refresh-v1 in memory. ++ ++ // Step 2: Instance B tries to refresh with stale token. ++ // The pre-refresh (refreshOAuthToken) runs first, then #tryOAuthCredential calls getOAuthApiKey. ++ // Both throw invalid_grant for stale tokens. After DB re-read, retry with fresh token succeeds. ++ let getApiKeyCallCount = 0; ++ refreshSpy.mockImplementation(async (_provider, credential) => { ++ if (credential.refresh === "refresh-v1") { ++ throw new Error("invalid_grant: Refresh token not found or invalid"); ++ } ++ return { ...credential, ...refreshedCredential }; ++ }); ++ getApiKeySpy.mockImplementation(async (_provider, credentials) => { ++ const cred = credentials.anthropic as OAuthCredentials | undefined; ++ if (!cred) return null; ++ getApiKeyCallCount++; ++ ++ if (cred.refresh === "refresh-v1") { ++ // Stale token β€” Anthropic would return invalid_grant ++ throw new Error("invalid_grant: Refresh token not found or invalid"); ++ } ++ if (cred.refresh === "refresh-v2") { ++ // Fresh token from instance A β€” success ++ return { newCredentials: refreshedCredential, apiKey: "sk-ant-new-key-b" }; ++ } ++ return null; ++ }); ++ ++ const keyB = await authStorageB.getApiKey("anthropic", "session-b"); ++ ++ // The credential must NOT be disabled β€” instance B should have recovered ++ expect(keyB).toBeDefined(); ++ expect(typeof keyB).toBe("string"); ++ ++ // DB should still have exactly 1 active credential, none disabled ++ expect(countActiveCredentials(dbPath, "anthropic")).toBe(1); ++ expect(readDisabledCauses(dbPath, "anthropic")).toEqual([]); ++ // The getOAuthApiKey mock must have been called at least twice: once with stale, once with fresh ++ expect(getApiKeyCallCount).toBeGreaterThanOrEqual(2); ++ }); ++ ++ test("credential is still disabled when DB has same stale token (genuine failure)", async () => { ++ if (!storeA || !storeB) throw new Error("test setup failed"); ++ ++ // Store an expired credential β€” only one instance, no concurrent refresh ++ const staleCredential = makeOAuthCredential("v1", { expires: EXPIRED_TOKEN_EXPIRES }); ++ authStorageA = new AuthStorage(storeA); ++ await authStorageA.set("anthropic", [staleCredential]); ++ ++ // Mock: always fail with invalid_grant (genuinely revoked token) ++ vi.spyOn(oauthUtils, "refreshOAuthToken").mockImplementation(async () => { ++ throw new Error("invalid_grant: Refresh token not found or invalid"); ++ }); ++ vi.spyOn(oauthUtils, "getOAuthApiKey").mockImplementation(async () => { ++ throw new Error("invalid_grant: Refresh token not found or invalid"); ++ }); ++ ++ const key = await authStorageA.getApiKey("anthropic", "session-a"); ++ ++ // Should return undefined β€” no valid credentials ++ expect(key).toBeUndefined(); ++ ++ // Credential should be disabled in DB ++ const causes = readDisabledCauses(dbPath, "anthropic"); ++ expect(causes.length).toBe(1); ++ expect(causes[0]).toContain("invalid_grant"); ++ }); ++ ++ test("terminates when DB token matches stale token (no concurrent refresh)", async () => { ++ if (!storeA || !storeB) throw new Error("test setup failed"); ++ ++ // Both instances share the same stale credential β€” nobody refreshed ++ const staleCredential = makeOAuthCredential("v1", { expires: EXPIRED_TOKEN_EXPIRES }); ++ authStorageA = new AuthStorage(storeA); ++ await authStorageA.set("anthropic", [staleCredential]); ++ ++ // Instance B loads same stale credential ++ authStorageB = new AuthStorage(storeB); ++ await authStorageB.reload(); ++ ++ // Mock: always fail β€” the token is genuinely revoked, nobody refreshed ++ vi.spyOn(oauthUtils, "refreshOAuthToken").mockImplementation(async () => { ++ throw new Error("invalid_grant: Refresh token not found or invalid"); ++ }); ++ vi.spyOn(oauthUtils, "getOAuthApiKey").mockImplementation(async () => { ++ throw new Error("invalid_grant: Refresh token not found or invalid"); ++ }); ++ ++ // Instance B fails. DB has the same token (nobody refreshed), so the ++ // fix correctly falls through to disable instead of retrying forever. ++ const keyB = await authStorageB.getApiKey("anthropic", "session-b"); ++ expect(keyB).toBeUndefined(); ++ ++ // Credential should be disabled β€” the fix did not prevent a genuine failure ++ const causes = readDisabledCauses(dbPath, "anthropic"); ++ expect(causes.length).toBe(1); ++ expect(causes[0]).toContain("invalid_grant"); ++ }); ++}); From 27096b17be4ad63fdb259b00c487cabc86c74954 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 8 Apr 2026 18:11:37 -0400 Subject: [PATCH 680/724] a --- patches/omp-fix-auth.patch | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/patches/omp-fix-auth.patch b/patches/omp-fix-auth.patch index d6b2472..0864a4d 100644 --- a/patches/omp-fix-auth.patch +++ b/patches/omp-fix-auth.patch @@ -1,4 +1,4 @@ -commit 31d537735d3c5e25a2b620d63ebbfea4cf84f57e +commit 02b80dd74e2f962fffc9b0076bb7966eea4e45ff Author: Simon Gardling Date: Wed Apr 8 13:05:09 2026 -0400 @@ -20,10 +20,10 @@ index 3f50b7bd4..248dacbff 100644 ### Fixed diff --git a/packages/ai/src/auth-storage.ts b/packages/ai/src/auth-storage.ts -index 9fdb4473b..fac936dad 100644 +index 9fdb4473b..fc81a6f3b 100644 --- a/packages/ai/src/auth-storage.ts +++ b/packages/ai/src/auth-storage.ts -@@ -1865,7 +1865,30 @@ export class AuthStorage { +@@ -1865,7 +1865,35 @@ export class AuthStorage { }); if (isDefinitiveFailure) { @@ -44,6 +44,11 @@ index 9fdb4473b..fac936dad 100644 + ) { + // DB has a newer refresh token β€” another instance refreshed. + // Update in-memory state and retry with the fresh credential. ++ logger.warn("Concurrent refresh detected, syncing from DB and retrying", { ++ provider, ++ index: selection.index, ++ rowId: entry.id, ++ }); + const updated = [...entries]; + updated[selection.index] = { id: entry.id, credential: dbEntry.credential }; + this.#setStoredCredentials(provider, updated); From 0a7c24da4e80a1ebdac4778add4a2166f76d325f Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 8 Apr 2026 18:11:52 -0400 Subject: [PATCH 681/724] llm-agents.nix: change was upstreamed --- flake.lock | 41 +++++++++-------------------------------- flake.nix | 2 +- 2 files changed, 10 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index 14c1274..672ecd8 100644 --- a/flake.lock +++ b/flake.lock @@ -404,21 +404,19 @@ "nixpkgs": [ "nixpkgs" ], - "rust-overlay": "rust-overlay", "systems": "systems_3", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1775663139, - "narHash": "sha256-mFmUbE2OLNl0YA1RACprVObeBjK8Qv9aV/V6fmn3mUU=", - "owner": "titaniumtown", + "lastModified": 1775686143, + "narHash": "sha256-i1hPhsXzqxDm3AozQaBWjjEyeY0WjEetLxJQTKO3cmM=", + "owner": "numtide", "repo": "llm-agents.nix", - "rev": "a507240bd404b28dbfc7e8d98bdf6c265e2ad51a", + "rev": "64bb5ca22da91a804fe559dbc04a7b3fe6711555", "type": "github" }, "original": { - "owner": "titaniumtown", - "ref": "pr/omp-build-from-source", + "owner": "numtide", "repo": "llm-agents.nix", "type": "github" } @@ -662,32 +660,11 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "noctalia": "noctalia", - "rust-overlay": "rust-overlay_2", + "rust-overlay": "rust-overlay", "zen-browser": "zen-browser" } }, "rust-overlay": { - "inputs": { - "nixpkgs": [ - "llm-agents", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1775617983, - "narHash": "sha256-2NWGA/I4j/qlx6qbg86QvJiK1/GyH9gnf0hFiARWVwE=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "d98b91b1feae7ef07fa2ccb3aa3f83f11abfae54", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_2": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -790,11 +767,11 @@ ] }, "locked": { - "lastModified": 1775125835, - "narHash": "sha256-2qYcPgzFhnQWchHo0SlqLHrXpux5i6ay6UHA+v2iH4U=", + "lastModified": 1775636079, + "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "75925962939880974e3ab417879daffcba36c4a3", + "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 231a1ee..aaad4f1 100644 --- a/flake.nix +++ b/flake.nix @@ -80,7 +80,7 @@ }; llm-agents = { - url = "github:titaniumtown/llm-agents.nix/pr/omp-build-from-source"; + url = "github:numtide/llm-agents.nix"; inputs.nixpkgs.follows = "nixpkgs"; }; From a13a7e8887b48a956e949c8c8885911175495e7f Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 9 Apr 2026 21:49:52 -0400 Subject: [PATCH 682/724] update --- flake.lock | 66 +++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index 672ecd8..480a232 100644 --- a/flake.lock +++ b/flake.lock @@ -120,11 +120,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1775361441, - "narHash": "sha256-XaHk6Tyktb5BjO2l5OlU1yY0mI5BA/ymbdKEDzdlEsw=", + "lastModified": 1775625754, + "narHash": "sha256-NWn6nWh2XewfogT/MNXTmoKHV7YiT+OKn6ujka4QyP4=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "4a5046c4294f70e09609f7d7d62db399747edb58", + "rev": "cfb5aef1e9422dc02ac16da99919294d58e687e5", "type": "github" }, "original": { @@ -143,11 +143,11 @@ ] }, "locked": { - "lastModified": 1775581188, - "narHash": "sha256-3zC5iNv9l6a595dYomfesWr30t6YZxv5Jzf5zLtpPAM=", + "lastModified": 1775757351, + "narHash": "sha256-FnUAX7svRdqFSw7sRHxIlKyj/o6GBtnULnG+0lVuf8U=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "6877822fc1855f248077d7833f25432e21940543", + "rev": "6727826cfa556a7b79afc2e30ad52acb6ce6e53c", "type": "github" }, "original": { @@ -164,11 +164,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1775534587, - "narHash": "sha256-OLAoGTTwPVTH13C1e2Vcdff4WigTsk6hO5Y3sEcwl/s=", + "lastModified": 1775707386, + "narHash": "sha256-1tNzciseW4+JQTSUxCVz1UhW//LuosLb9f3liFOhrL8=", "owner": "rycee", "repo": "nur-expressions", - "rev": "9f1e4b7f5443c50cb4ccc2a376ba1058231e64b4", + "rev": "c1db0626fa993fe4e773d4c83df4cbb9684e434f", "type": "gitlab" }, "original": { @@ -278,11 +278,11 @@ ] }, "locked": { - "lastModified": 1775556024, - "narHash": "sha256-j1u/859OVS54rGlsvFqJdwKPEnFYCI+4pyfTiSfv1Xc=", + "lastModified": 1775781825, + "narHash": "sha256-L5yKTpR+alrZU2XYYvIxCeCP4LBHU5jhwSj7H1VAavg=", "owner": "nix-community", "repo": "home-manager", - "rev": "4bdfeff1d9b7473e6e58f73f5809576e8a69e406", + "rev": "e35c39fca04fee829cecdf839a50eb9b54d8a701", "type": "github" }, "original": { @@ -383,11 +383,11 @@ ] }, "locked": { - "lastModified": 1775510693, - "narHash": "sha256-gZfJ07j/oOciDi8mF/V8QTm7YCeDcusNSMZzBFi8OUM=", + "lastModified": 1775754862, + "narHash": "sha256-8y9cz8+cyeA7KtA7+Q3bXjyFJV5nM38Fc0E4qPw7WDk=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "3fe0ae8cb285e0ad101a9675f4190d455fb05e85", + "rev": "bea51aaee00688794a877f308007590a6cc8e378", "type": "github" }, "original": { @@ -408,11 +408,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1775686143, - "narHash": "sha256-i1hPhsXzqxDm3AozQaBWjjEyeY0WjEetLxJQTKO3cmM=", + "lastModified": 1775746837, + "narHash": "sha256-WrZCxhx82aBBQb6CMJwXimgOIcv9Eytl1zFsjfxiWSc=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "64bb5ca22da91a804fe559dbc04a7b3fe6711555", + "rev": "b91b0e1583091847cf4f8a8fcaad92d66227abfb", "type": "github" }, "original": { @@ -435,11 +435,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1775566751, - "narHash": "sha256-5Xkx4NQvl2azAQe3lCZCMUx4FiwGOlEb+I4kyycQYw8=", + "lastModified": 1775710668, + "narHash": "sha256-pi2TWoWZR22vzr5RBAgIdl1LDwgLX+fh+Hqngt/Kkt8=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "6aa49a9c5b82911459e230db5bd64289082d4354", + "rev": "bef414577a6a745543989716df478afec96486bd", "type": "github" }, "original": { @@ -493,11 +493,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1775559092, - "narHash": "sha256-Xm3XmkDw+59B9pCOmauWMNoFmOMC1giMzxkOOAk9JmY=", + "lastModified": 1775727734, + "narHash": "sha256-QYWCFkNypxIBFVehRhAxHqsVwmAqL7mWGWKrRLViMMo=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "a75f733dc11e31d60f8c8e63ca4c8fe0654fd98a", + "rev": "3e97e0b8f92f9d28fe364e54cccdbd8ed764e541", "type": "github" }, "original": { @@ -583,11 +583,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1775569376, - "narHash": "sha256-Gge4uDqbcl5kl3fNaRRc6PuOv7YMOqWbX6tRcYwayok=", + "lastModified": 1775771202, + "narHash": "sha256-nV0BDaByz4qhvgQ8KuTvVXIKwphiQWA4gvK2kc+xp8k=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "91d0bb83aefa2d238df31e2a96098a2ef75aa238", + "rev": "e85ce902cb5336ca2ab68bbb919d9a9f6670aec4", "type": "github" }, "original": { @@ -671,11 +671,11 @@ ] }, "locked": { - "lastModified": 1775531562, - "narHash": "sha256-G83GDxQo6lqO5aeTSD5RFLhnh2g6DzJpSvSju2EjjrQ=", + "lastModified": 1775704356, + "narHash": "sha256-A9JX65WofIF8OKrkMsjznSYNj/A4hfJfEGonsEQ9kxA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "d8b1b209203665924c81eabf750492530754f27e", + "rev": "55660228072f38c64c4d2fd227944334dc3f4326", "type": "github" }, "original": { @@ -863,11 +863,11 @@ ] }, "locked": { - "lastModified": 1775453133, - "narHash": "sha256-VIlMG985ONqVqF+OnPuS5Shbz5k6tqbOWnDL7EH+IT4=", + "lastModified": 1775744672, + "narHash": "sha256-Qg3Wnn3WYiiii35CE9kE+XX4ooSFzupAnGC1/NjI5C8=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "8d0508ffceba8ad785ae442591dd115080a55142", + "rev": "14a238beb0621977e9bf04cba68919d5650deea9", "type": "github" }, "original": { From 100f8d6328cfb72cef95c71af468154c1f021fe6 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 11 Apr 2026 10:27:17 -0400 Subject: [PATCH 683/724] update --- flake.lock | 72 +++++++++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/flake.lock b/flake.lock index 480a232..f321918 100644 --- a/flake.lock +++ b/flake.lock @@ -120,11 +120,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1775625754, - "narHash": "sha256-NWn6nWh2XewfogT/MNXTmoKHV7YiT+OKn6ujka4QyP4=", + "lastModified": 1775788706, + "narHash": "sha256-hpqgoL4RoMiHW7kzHtHdbobvrFd89PHi3XRGtM+OTEc=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "cfb5aef1e9422dc02ac16da99919294d58e687e5", + "rev": "91864558b0ba07fefb9c31d643e31190f33a3a6f", "type": "github" }, "original": { @@ -143,11 +143,11 @@ ] }, "locked": { - "lastModified": 1775757351, - "narHash": "sha256-FnUAX7svRdqFSw7sRHxIlKyj/o6GBtnULnG+0lVuf8U=", + "lastModified": 1775899816, + "narHash": "sha256-p9QdOtlRj0lMnaSrJiolte/KdtdqpqnS3MWDAbKYfEo=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "6727826cfa556a7b79afc2e30ad52acb6ce6e53c", + "rev": "d563e40d245fb24f0f3017a3c8eb573322eeacde", "type": "github" }, "original": { @@ -164,11 +164,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1775707386, - "narHash": "sha256-1tNzciseW4+JQTSUxCVz1UhW//LuosLb9f3liFOhrL8=", + "lastModified": 1775880170, + "narHash": "sha256-63PLZ7lspPAqpV/+d0oNtDHLCWQf1MVFRG2DOeDK+nU=", "owner": "rycee", "repo": "nur-expressions", - "rev": "c1db0626fa993fe4e773d4c83df4cbb9684e434f", + "rev": "28b164d30b5ab6820ef7e17281ae55c539ae9ff5", "type": "gitlab" }, "original": { @@ -278,11 +278,11 @@ ] }, "locked": { - "lastModified": 1775781825, - "narHash": "sha256-L5yKTpR+alrZU2XYYvIxCeCP4LBHU5jhwSj7H1VAavg=", + "lastModified": 1775900011, + "narHash": "sha256-QUGu6CJYFQ5AWVV0n3/FsJyV+1/gj7HSDx68/SX9pwM=", "owner": "nix-community", "repo": "home-manager", - "rev": "e35c39fca04fee829cecdf839a50eb9b54d8a701", + "rev": "b0569dc6ec1e6e7fefd8f6897184e4c191cd768e", "type": "github" }, "original": { @@ -337,11 +337,11 @@ ] }, "locked": { - "lastModified": 1775287496, - "narHash": "sha256-tCBlt+RP85MLrMYntro/YvG7NWktbmFiyItGBo85Tf8=", + "lastModified": 1775841957, + "narHash": "sha256-oHxj9I82v+axW1lj+jUj2t8V++E6A9x54K5lq+liNAk=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "0a7a3feb77606db451aa10287ad4c4c8f85922f8", + "rev": "67d55e61fe5e4d88d3fb90c0888cfced04a0589d", "type": "github" }, "original": { @@ -383,11 +383,11 @@ ] }, "locked": { - "lastModified": 1775754862, - "narHash": "sha256-8y9cz8+cyeA7KtA7+Q3bXjyFJV5nM38Fc0E4qPw7WDk=", + "lastModified": 1775866084, + "narHash": "sha256-mWn8D/oXXAaqeFFFRorKHvTLw5V9M8eYzAWRr4iffag=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "bea51aaee00688794a877f308007590a6cc8e378", + "rev": "29d2cca7fc3841708c1d48e2d1272f79db1538b6", "type": "github" }, "original": { @@ -408,11 +408,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1775746837, - "narHash": "sha256-WrZCxhx82aBBQb6CMJwXimgOIcv9Eytl1zFsjfxiWSc=", + "lastModified": 1775917357, + "narHash": "sha256-uSiWgXTbsxGIx6ejwyQ9Eo9i+CGm8Mn+sEQupWhXrLA=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "b91b0e1583091847cf4f8a8fcaad92d66227abfb", + "rev": "7e28481415857cc860158f49f1d1df35e948944f", "type": "github" }, "original": { @@ -435,11 +435,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1775710668, - "narHash": "sha256-pi2TWoWZR22vzr5RBAgIdl1LDwgLX+fh+Hqngt/Kkt8=", + "lastModified": 1775877135, + "narHash": "sha256-nAqtUMy22olwyiOJB0CASVrbu5XB5+43GjlbIJ1KuvQ=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "bef414577a6a745543989716df478afec96486bd", + "rev": "f943da038fd668d435c2d17916577f295faa8839", "type": "github" }, "original": { @@ -493,11 +493,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1775727734, - "narHash": "sha256-QYWCFkNypxIBFVehRhAxHqsVwmAqL7mWGWKrRLViMMo=", + "lastModified": 1775814030, + "narHash": "sha256-wmEjIx3pLYHAdPYsj9PMxGUDm9aYMBhmSLlUqS7KbNw=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "3e97e0b8f92f9d28fe364e54cccdbd8ed764e541", + "rev": "add92ba47598e620fadd205ca8ff84a7a66887cd", "type": "github" }, "original": { @@ -561,11 +561,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1775423009, - "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=", + "lastModified": 1775710090, + "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9", + "rev": "4c1018dae018162ec878d42fec712642d214fdfa", "type": "github" }, "original": { @@ -583,11 +583,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1775771202, - "narHash": "sha256-nV0BDaByz4qhvgQ8KuTvVXIKwphiQWA4gvK2kc+xp8k=", + "lastModified": 1775869975, + "narHash": "sha256-vtgk4Dj/jvUK3QlQ9kQ2kuq2HWdAQvvuC/euLXt84Jg=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "e85ce902cb5336ca2ab68bbb919d9a9f6670aec4", + "rev": "40dd5f54a0597b77ff78ac6a3a6d2ef42f04d544", "type": "github" }, "original": { @@ -671,11 +671,11 @@ ] }, "locked": { - "lastModified": 1775704356, - "narHash": "sha256-A9JX65WofIF8OKrkMsjznSYNj/A4hfJfEGonsEQ9kxA=", + "lastModified": 1775877051, + "narHash": "sha256-wpSQm2PD/w4uRo2wb8utk0b5hOBkkg/CZ1xICY+qB7M=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "55660228072f38c64c4d2fd227944334dc3f4326", + "rev": "08b4f3633471874c8894632ade1b78d75dbda002", "type": "github" }, "original": { From c50e056e2a1aa0edb1ed212b690fe0c53c96469f Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 12 Apr 2026 22:15:34 -0400 Subject: [PATCH 684/724] update --- flake.lock | 66 +++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index f321918..628f677 100644 --- a/flake.lock +++ b/flake.lock @@ -120,11 +120,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1775788706, - "narHash": "sha256-hpqgoL4RoMiHW7kzHtHdbobvrFd89PHi3XRGtM+OTEc=", + "lastModified": 1775892210, + "narHash": "sha256-a7SeM0ZWxki5L4zqLBhrys0nt2m+rtzBBFS8G8vief8=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "91864558b0ba07fefb9c31d643e31190f33a3a6f", + "rev": "5fc96adc17943590b6a5662aeaf24769eb1e2bb0", "type": "github" }, "original": { @@ -143,11 +143,11 @@ ] }, "locked": { - "lastModified": 1775899816, - "narHash": "sha256-p9QdOtlRj0lMnaSrJiolte/KdtdqpqnS3MWDAbKYfEo=", + "lastModified": 1776014811, + "narHash": "sha256-2xD1VETAjB4IwzfcPDvyt3W7yl7bxOLY1h/7SCA1Q4M=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "d563e40d245fb24f0f3017a3c8eb573322eeacde", + "rev": "f850dc2a2f7c3086a3dbea79b8bfd03680b0b745", "type": "github" }, "original": { @@ -164,11 +164,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1775880170, - "narHash": "sha256-63PLZ7lspPAqpV/+d0oNtDHLCWQf1MVFRG2DOeDK+nU=", + "lastModified": 1775966594, + "narHash": "sha256-pnRtaqTr7ut8dz8b04OWAanUM4tGhDUJz8SWmeTRp7U=", "owner": "rycee", "repo": "nur-expressions", - "rev": "28b164d30b5ab6820ef7e17281ae55c539ae9ff5", + "rev": "000d1d2322d28fa0a51b8db9f85a227aa5413b52", "type": "gitlab" }, "original": { @@ -278,11 +278,11 @@ ] }, "locked": { - "lastModified": 1775900011, - "narHash": "sha256-QUGu6CJYFQ5AWVV0n3/FsJyV+1/gj7HSDx68/SX9pwM=", + "lastModified": 1776046499, + "narHash": "sha256-Wzc4nn07/0RL21ypPHRzNDQZcjhIC8LaYo7QJQjM5T4=", "owner": "nix-community", "repo": "home-manager", - "rev": "b0569dc6ec1e6e7fefd8f6897184e4c191cd768e", + "rev": "287f84846c1eb3b72c986f5f6bebcff0bd67440d", "type": "github" }, "original": { @@ -408,11 +408,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1775917357, - "narHash": "sha256-uSiWgXTbsxGIx6ejwyQ9Eo9i+CGm8Mn+sEQupWhXrLA=", + "lastModified": 1776010706, + "narHash": "sha256-mUBSsyEQigQQKA+K/F3K8b3bJaZcFxJiQo2KvoHKPwc=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "7e28481415857cc860158f49f1d1df35e948944f", + "rev": "e20e7ebdbf8b4d342bd343a630af8e900a55a48a", "type": "github" }, "original": { @@ -493,11 +493,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1775814030, - "narHash": "sha256-wmEjIx3pLYHAdPYsj9PMxGUDm9aYMBhmSLlUqS7KbNw=", + "lastModified": 1775984832, + "narHash": "sha256-mKNgDphJrOmVadJP/sG2AGTyxoAY1gpz80MvqdDZsCg=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "add92ba47598e620fadd205ca8ff84a7a66887cd", + "rev": "056622f88069afe5c347ce228cfdfdc4c11cd794", "type": "github" }, "original": { @@ -583,11 +583,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1775869975, - "narHash": "sha256-vtgk4Dj/jvUK3QlQ9kQ2kuq2HWdAQvvuC/euLXt84Jg=", + "lastModified": 1776043445, + "narHash": "sha256-ie3vFwg0eZTTHBDCRm+ee/PecbtdPn/pyL6hlotAfeQ=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "40dd5f54a0597b77ff78ac6a3a6d2ef42f04d544", + "rev": "e56a9db57ed61ea248f109edd60965faf56d3da2", "type": "github" }, "original": { @@ -606,11 +606,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1775491791, - "narHash": "sha256-elzmRpudiwtYQNCKk9TAEhlYQV0+yUM81poo01Z7FfQ=", + "lastModified": 1775957204, + "narHash": "sha256-d4CVRtAty2GzDYXx4xYQmR+nlOjjKovyprQfZhgLckU=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "9e2736531ef7a1a336abf7ec72255d0b192273b6", + "rev": "68e82fe34c68ee839a9c37e3466820e266af0c86", "type": "github" }, "original": { @@ -671,11 +671,11 @@ ] }, "locked": { - "lastModified": 1775877051, - "narHash": "sha256-wpSQm2PD/w4uRo2wb8utk0b5hOBkkg/CZ1xICY+qB7M=", + "lastModified": 1775963625, + "narHash": "sha256-OmwF0Rd/HDbEGC0ZcBS2jPMvmCcn3HDqUypjXrR7KfM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "08b4f3633471874c8894632ade1b78d75dbda002", + "rev": "573a61faa8ec910a6b8576cc3c145844245574f3", "type": "github" }, "original": { @@ -789,11 +789,11 @@ ] }, "locked": { - "lastModified": 1775125835, - "narHash": "sha256-2qYcPgzFhnQWchHo0SlqLHrXpux5i6ay6UHA+v2iH4U=", + "lastModified": 1775636079, + "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "75925962939880974e3ab417879daffcba36c4a3", + "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba", "type": "github" }, "original": { @@ -863,11 +863,11 @@ ] }, "locked": { - "lastModified": 1775744672, - "narHash": "sha256-Qg3Wnn3WYiiii35CE9kE+XX4ooSFzupAnGC1/NjI5C8=", + "lastModified": 1775961625, + "narHash": "sha256-8SjilptVv9dSTvn0Z5j65vHHu+flmPXeyrGaSyRJm7U=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "14a238beb0621977e9bf04cba68919d5650deea9", + "rev": "0eaab249f5ca1c55921e99cfe07187410758c9fa", "type": "github" }, "original": { From ca4e0d42b331710ef9445cc954a7f3fe6700ed7b Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 13 Apr 2026 21:23:42 -0400 Subject: [PATCH 685/724] update --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 628f677..8f618f9 100644 --- a/flake.lock +++ b/flake.lock @@ -120,11 +120,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1775892210, - "narHash": "sha256-a7SeM0ZWxki5L4zqLBhrys0nt2m+rtzBBFS8G8vief8=", + "lastModified": 1776049930, + "narHash": "sha256-6nuelk+8qSRsh5Ryj9EpWOWXeeh/g3lI5mZsBfiFZQI=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "5fc96adc17943590b6a5662aeaf24769eb1e2bb0", + "rev": "5eb006f455f0558c97210ba7579880aacb045b67", "type": "github" }, "original": { @@ -143,11 +143,11 @@ ] }, "locked": { - "lastModified": 1776014811, - "narHash": "sha256-2xD1VETAjB4IwzfcPDvyt3W7yl7bxOLY1h/7SCA1Q4M=", + "lastModified": 1776074175, + "narHash": "sha256-8e7+uLslLDZRD8p5QyJV8QSivpB2qMy2XuAcVYbW1f4=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "f850dc2a2f7c3086a3dbea79b8bfd03680b0b745", + "rev": "000ca2cd866f7c37a8c0cc96dd2aff457ee4c865", "type": "github" }, "original": { @@ -164,11 +164,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1775966594, - "narHash": "sha256-pnRtaqTr7ut8dz8b04OWAanUM4tGhDUJz8SWmeTRp7U=", + "lastModified": 1776052978, + "narHash": "sha256-WR0Svwg/JreBNW006qjHET6RRRmmjWCMfrkS5JmDZK8=", "owner": "rycee", "repo": "nur-expressions", - "rev": "000d1d2322d28fa0a51b8db9f85a227aa5413b52", + "rev": "6c0e7f01d9315f4806a187c2ec58d0f3b6961876", "type": "gitlab" }, "original": { @@ -278,11 +278,11 @@ ] }, "locked": { - "lastModified": 1776046499, - "narHash": "sha256-Wzc4nn07/0RL21ypPHRzNDQZcjhIC8LaYo7QJQjM5T4=", + "lastModified": 1776114641, + "narHash": "sha256-VJMt3n9zGRzupzvlhcKIz4SpWflKh0rWfYTgmkmun0Q=", "owner": "nix-community", "repo": "home-manager", - "rev": "287f84846c1eb3b72c986f5f6bebcff0bd67440d", + "rev": "2de7205ce6e10b031151033e69b7ef89708dc282", "type": "github" }, "original": { @@ -408,11 +408,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1776010706, - "narHash": "sha256-mUBSsyEQigQQKA+K/F3K8b3bJaZcFxJiQo2KvoHKPwc=", + "lastModified": 1776092696, + "narHash": "sha256-4MQq9lP6b9nBHozK1LHQNXPv72XAgGt8Drb4mQPqd7s=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "e20e7ebdbf8b4d342bd343a630af8e900a55a48a", + "rev": "215193474714ad712668bda23eef596c2656af6b", "type": "github" }, "original": { @@ -435,11 +435,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1775877135, - "narHash": "sha256-nAqtUMy22olwyiOJB0CASVrbu5XB5+43GjlbIJ1KuvQ=", + "lastModified": 1776109195, + "narHash": "sha256-yug5v5OI5ixCYyAiqCbNrxfiyfvxvlsMr/tj3uyH51c=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "f943da038fd668d435c2d17916577f295faa8839", + "rev": "8fcfcef0fc05ee826adf66225b27716131ed74af", "type": "github" }, "original": { @@ -493,11 +493,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1775984832, - "narHash": "sha256-mKNgDphJrOmVadJP/sG2AGTyxoAY1gpz80MvqdDZsCg=", + "lastModified": 1776078956, + "narHash": "sha256-+JCa+VodMqySrmSBWwNxuUcgLFSDvFA8rR0sY6YC7t0=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "056622f88069afe5c347ce228cfdfdc4c11cd794", + "rev": "f4abf68bf74d506ff56af64e7a0b29e1a72d8b57", "type": "github" }, "original": { @@ -671,11 +671,11 @@ ] }, "locked": { - "lastModified": 1775963625, - "narHash": "sha256-OmwF0Rd/HDbEGC0ZcBS2jPMvmCcn3HDqUypjXrR7KfM=", + "lastModified": 1776050130, + "narHash": "sha256-/f/6/1WOfBJaGMfqV3VxWD9lpFRbPpF+Cx4MO+0mGok=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "573a61faa8ec910a6b8576cc3c145844245574f3", + "rev": "3c27f4c92a7d977556dd2c10bb564d9c61b375e9", "type": "github" }, "original": { @@ -863,11 +863,11 @@ ] }, "locked": { - "lastModified": 1775961625, - "narHash": "sha256-8SjilptVv9dSTvn0Z5j65vHHu+flmPXeyrGaSyRJm7U=", + "lastModified": 1776091817, + "narHash": "sha256-Vwmi3P4LAUmOrE2zc9JpnRrNxNwamDN46hqcXpWTkp0=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "0eaab249f5ca1c55921e99cfe07187410758c9fa", + "rev": "4f2e98c1125ab4be758cd1b51b526ad998e9618f", "type": "github" }, "original": { From abb762604d6120c6667f91b27f4b03a0497539d2 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 13 Apr 2026 22:58:29 -0400 Subject: [PATCH 686/724] cachyos kernel --- flake.lock | 107 ++++++++++++++++++++++++++++++++++++++++ flake.nix | 4 ++ system/common.nix | 5 +- system/system-mreow.nix | 11 +++++ system/system-yarn.nix | 16 ++++++ 5 files changed, 141 insertions(+), 2 deletions(-) diff --git a/flake.lock b/flake.lock index 8f618f9..762dfa9 100644 --- a/flake.lock +++ b/flake.lock @@ -59,6 +59,38 @@ "type": "github" } }, + "cachyos-kernel": { + "flake": false, + "locked": { + "lastModified": 1775145950, + "narHash": "sha256-AfVja9nvYHm0BHbuTvn+K8rKfLmPl5QjoiNecp9HOJU=", + "owner": "CachyOS", + "repo": "linux-cachyos", + "rev": "b91624f68ceaf5394ef1571f60290dca6ba22b45", + "type": "github" + }, + "original": { + "owner": "CachyOS", + "repo": "linux-cachyos", + "type": "github" + } + }, + "cachyos-kernel-patches": { + "flake": false, + "locked": { + "lastModified": 1775157685, + "narHash": "sha256-g8HgH7gADoEnrBN30BK3pz7+M2pT/p3xtfRFEuEov5w=", + "owner": "CachyOS", + "repo": "kernel-patches", + "rev": "c1ba300617a12d257b5721572b9bbe28efae182f", + "type": "github" + }, + "original": { + "owner": "CachyOS", + "repo": "kernel-patches", + "type": "github" + } + }, "crane": { "locked": { "lastModified": 1773189535, @@ -210,6 +242,22 @@ "type": "github" } }, + "flake-compat_3": { + "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-parts": { "inputs": { "nixpkgs-lib": [ @@ -231,6 +279,24 @@ "type": "github" } }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1775087534, + "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems_2" @@ -481,6 +547,31 @@ "type": "github" } }, + "nix-cachyos-kernel": { + "inputs": { + "cachyos-kernel": "cachyos-kernel", + "cachyos-kernel-patches": "cachyos-kernel-patches", + "flake-compat": "flake-compat_3", + "flake-parts": "flake-parts_2", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1775239578, + "narHash": "sha256-MKJmDHlaxwBcnfCUEA89AwKOOONjOjbjHNNWdSdg5RA=", + "owner": "xddxdd", + "repo": "nix-cachyos-kernel", + "rev": "beaf7a533ae106c2681de2624da94707f9857f1f", + "type": "github" + }, + "original": { + "owner": "xddxdd", + "ref": "release", + "repo": "nix-cachyos-kernel", + "type": "github" + } + }, "nix-doom-emacs-unstraightened": { "inputs": { "doomemacs": "doomemacs", @@ -575,6 +666,21 @@ "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1774748309, + "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "333c4e0545a6da976206c74db8773a1645b5870a", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "noctalia": { "inputs": { "nixpkgs": [ @@ -655,6 +761,7 @@ "lanzaboote": "lanzaboote", "llm-agents": "llm-agents", "niri": "niri", + "nix-cachyos-kernel": "nix-cachyos-kernel", "nix-doom-emacs-unstraightened": "nix-doom-emacs-unstraightened", "nix-flatpak": "nix-flatpak", "nixos-hardware": "nixos-hardware", diff --git a/flake.nix b/flake.nix index aaad4f1..9ad3e0b 100644 --- a/flake.nix +++ b/flake.nix @@ -79,6 +79,10 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + nix-cachyos-kernel = { + url = "github:xddxdd/nix-cachyos-kernel/release"; + inputs.nixpkgs.follows = "nixpkgs"; + }; llm-agents = { url = "github:numtide/llm-agents.nix"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/system/common.nix b/system/common.nix index 0004c80..74189a4 100644 --- a/system/common.nix +++ b/system/common.nix @@ -94,10 +94,11 @@ }; }; + # cachyos kernel overlay + nixpkgs.overlays = [ inputs.nix-cachyos-kernel.overlays.default ]; + # kernel options boot = { - kernelPackages = pkgs.linuxPackages_testing; - # kernelPackages = pkgs.linuxPackages_latest; # aes_generic is built-in as of linux 7.0, no longer a loadable module initrd.luks.cryptoModules = lib.mkForce ( diff --git a/system/system-mreow.nix b/system/system-mreow.nix index 16d7902..eddf970 100644 --- a/system/system-mreow.nix +++ b/system/system-mreow.nix @@ -14,6 +14,17 @@ inputs.nixos-hardware.nixosModules.framework-amd-ai-300-series ]; + # cachyos kernel: bore scheduler, full lto, zen 4 (amd ai 340) + boot.kernelPackages = + let + helpers = pkgs.callPackage "${inputs.nix-cachyos-kernel}/helpers.nix" { }; + kernel = pkgs.cachyosKernels.linux-cachyos-bore-lto.override { + lto = "full"; + processorOpt = "zen4"; + }; + in + helpers.kernelModuleLLVMOverride (pkgs.linuxKernel.packagesFor kernel); + hardware.framework.laptop13.audioEnhancement.rawDeviceName = lib.mkDefault "alsa_output.pci-0000_c1_00.6.analog-stereo"; diff --git a/system/system-yarn.nix b/system/system-yarn.nix index 549ddb7..8b0f064 100644 --- a/system/system-yarn.nix +++ b/system/system-yarn.nix @@ -18,6 +18,22 @@ inputs.jovian-nixos.nixosModules.default ]; + # cachyos kernel: bore scheduler, full lto, zen 3 (5800x) + boot.kernelPackages = + let + helpers = pkgs.callPackage "${inputs.nix-cachyos-kernel}/helpers.nix" { }; + kernel = pkgs.cachyosKernels.linux-cachyos-bore-lto.override { + lto = "full"; + processorOpt = "x86_64-v3"; + structuredExtraConfig = with lib.kernel; { + # x86_64-v3 is the ISA level; pin to zen 3 for microarch tuning + GENERIC_CPU = lib.mkForce no; + MZEN3 = lib.mkForce yes; + }; + }; + in + helpers.kernelModuleLLVMOverride (pkgs.linuxKernel.packagesFor kernel); + fileSystems."/media/games" = { device = "/dev/disk/by-uuid/1878136e-765d-4784-b204-3536ab4fdac8"; fsType = "f2fs"; From d5bfbf83be5266b67b0b8fac78ca3bedde27f0d3 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 14 Apr 2026 13:24:52 -0400 Subject: [PATCH 687/724] kernel: strip out some things I won't use --- system/common.nix | 60 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/system/common.nix b/system/common.nix index 74189a4..af1638f 100644 --- a/system/common.nix +++ b/system/common.nix @@ -100,6 +100,66 @@ # kernel options boot = { + # disable legacy subsystems neither host will ever use + kernelPatches = [ + { + name = "disable-legacy-subsystems"; + patch = null; + structuredExtraConfig = with lib.kernel; { + # ancient bus/card standards + PCMCIA = lib.mkForce no; + PCCARD = lib.mkForce no; + PARPORT = lib.mkForce no; + GAMEPORT = lib.mkForce no; + FIREWIRE = lib.mkForce no; + AGP = lib.mkForce no; + + # legacy networking + ATM = lib.mkForce no; + FDDI = lib.mkForce no; + ISDN = lib.mkForce no; + CAN = lib.mkForce no; + NFC = lib.mkForce no; + INFINIBAND = lib.mkForce no; + + # amateur radio (HAMRADIO is the umbrella but these are separate symbols) + HAMRADIO = lib.mkForce no; + AX25 = lib.mkForce no; + NETROM = lib.mkForce no; + ROSE = lib.mkForce no; + + # dead protocols + PHONET = lib.mkForce no; + IEEE802154 = lib.mkForce no; + "6LOWPAN" = lib.mkForce no; + + # tv tuners / digital video broadcasting + MEDIA_ANALOG_TV_SUPPORT = lib.mkForce no; + MEDIA_DIGITAL_TV_SUPPORT = lib.mkForce no; + DVB_CORE = lib.mkForce no; + + # hypervisor guest support (bare metal only) + HYPERV = lib.mkForce no; + VMWARE_VMCI = lib.mkForce no; + + # staging drivers (experimental/unmaintained) + STAGING = lib.mkForce no; + + # misc legacy + MOST = lib.mkForce no; + PPDEV = lib.mkForce no; + PHANTOM = lib.mkForce no; + W1 = lib.mkForce no; + X86_ANDROID_TABLETS = lib.mkForce no; + + # deprecated userland compat + SGETMASK_SYSCALL = lib.mkForce no; + UID16 = lib.mkForce no; + X86_X32_ABI = lib.mkForce no; + }; + } + ]; + # aes_generic is built-in as of linux 7.0, no longer a loadable module initrd.luks.cryptoModules = lib.mkForce ( lib.filter (m: m != "aes_generic") options.boot.initrd.luks.cryptoModules.default From 502ae492a8b883e6c414ec6c265a20342f7d518c Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 14 Apr 2026 13:25:08 -0400 Subject: [PATCH 688/724] zen: fix private window search engine --- home-manager/progs/zen/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/home-manager/progs/zen/default.nix b/home-manager/progs/zen/default.nix index 797673a..ba616e0 100644 --- a/home-manager/progs/zen/default.nix +++ b/home-manager/progs/zen/default.nix @@ -109,6 +109,9 @@ in # https://github.com/nix-community/home-manager/issues/6083 "services.sync.engine.prefs" = false; "services.sync.engine.addons" = false; + # use a separate default search engine in private windows + "browser.search.separatePrivateDefault.ui.enabled" = true; + "browser.search.separatePrivateDefault" = true; # disable built-in password manager β€” using bitwarden "signon.rememberSignons" = false; "signon.autofillForms" = false; From 928eb5ef0af799153bb1872eb23d800f1ca1a8e8 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 14 Apr 2026 13:25:58 -0400 Subject: [PATCH 689/724] kernel: disable chromeos platforms --- system/common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/system/common.nix b/system/common.nix index af1638f..d297b69 100644 --- a/system/common.nix +++ b/system/common.nix @@ -151,6 +151,7 @@ PHANTOM = lib.mkForce no; W1 = lib.mkForce no; X86_ANDROID_TABLETS = lib.mkForce no; + CHROME_PLATFORMS = lib.mkForce no; # deprecated userland compat SGETMASK_SYSCALL = lib.mkForce no; From 711b55a04210ac92b1f4baab11860e46a3635cdf Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 14 Apr 2026 13:32:15 -0400 Subject: [PATCH 690/724] kernel: fix gameport option --- system/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/common.nix b/system/common.nix index d297b69..ad828ca 100644 --- a/system/common.nix +++ b/system/common.nix @@ -110,7 +110,7 @@ PCMCIA = lib.mkForce no; PCCARD = lib.mkForce no; PARPORT = lib.mkForce no; - GAMEPORT = lib.mkForce no; + GAMEPORT = lib.mkForce module; FIREWIRE = lib.mkForce no; AGP = lib.mkForce no; From 95af71b0d80d9145b0c3b9f5f9b5b47c6dc5adb1 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 14 Apr 2026 13:38:30 -0400 Subject: [PATCH 691/724] kernel: disable selecting modules --- system/common.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/system/common.nix b/system/common.nix index ad828ca..bb4f25d 100644 --- a/system/common.nix +++ b/system/common.nix @@ -149,6 +149,8 @@ MOST = lib.mkForce no; PPDEV = lib.mkForce no; PHANTOM = lib.mkForce no; + BATTERY_DS2780 = lib.mkForce no; + BATTERY_DS2781 = lib.mkForce no; W1 = lib.mkForce no; X86_ANDROID_TABLETS = lib.mkForce no; CHROME_PLATFORMS = lib.mkForce no; From 5529c66e5f4b066661108ae8f4d356f9af52b93b Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 14 Apr 2026 13:44:11 -0400 Subject: [PATCH 692/724] kernel: fix? --- system/common.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/system/common.nix b/system/common.nix index bb4f25d..0a00280 100644 --- a/system/common.nix +++ b/system/common.nix @@ -149,9 +149,6 @@ MOST = lib.mkForce no; PPDEV = lib.mkForce no; PHANTOM = lib.mkForce no; - BATTERY_DS2780 = lib.mkForce no; - BATTERY_DS2781 = lib.mkForce no; - W1 = lib.mkForce no; X86_ANDROID_TABLETS = lib.mkForce no; CHROME_PLATFORMS = lib.mkForce no; From d722329803f4581523caa1045faaa846d2bf3907 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 14 Apr 2026 14:10:04 -0400 Subject: [PATCH 693/724] kernel: things --- system/common.nix | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/system/common.nix b/system/common.nix index 0a00280..19037da 100644 --- a/system/common.nix +++ b/system/common.nix @@ -132,6 +132,8 @@ PHONET = lib.mkForce no; IEEE802154 = lib.mkForce no; "6LOWPAN" = lib.mkForce no; + NET_9P = lib.mkForce no; + BATMAN_ADV = lib.mkForce no; # tv tuners / digital video broadcasting MEDIA_ANALOG_TV_SUPPORT = lib.mkForce no; @@ -141,16 +143,58 @@ # hypervisor guest support (bare metal only) HYPERV = lib.mkForce no; VMWARE_VMCI = lib.mkForce no; + XEN = lib.mkForce no; # staging drivers (experimental/unmaintained) STAGING = lib.mkForce no; + # legacy storage (AHCI for modern SATA is independent) + ATA_SFF = lib.mkForce no; + # misc legacy MOST = lib.mkForce no; PPDEV = lib.mkForce no; PHANTOM = lib.mkForce no; X86_ANDROID_TABLETS = lib.mkForce no; CHROME_PLATFORMS = lib.mkForce no; + SURFACE_PLATFORMS = lib.mkForce no; + MCTP = lib.mkForce no; + + # nvidia gpu + DRM_NOUVEAU = lib.mkForce no; + + # intel gpu + DRM_I915 = lib.mkForce no; + DRM_XE = lib.mkForce no; + + # intel cpu + INTEL_IOMMU = lib.mkForce no; + INTEL_IDLE = lib.mkForce no; + INTEL_HFI_THERMAL = lib.mkForce no; + INTEL_TCC_COOLING = lib.mkForce no; + INTEL_SOC_DTS_THERMAL = lib.mkForce no; + INTEL_PCH_THERMAL = lib.mkForce no; + INTEL_POWERCLAMP = lib.mkForce no; + X86_PKG_TEMP_THERMAL = lib.mkForce no; + X86_INTEL_LPSS = lib.mkForce no; + + # mellanox networking + MLX4_CORE = lib.mkForce no; + MLX5_CORE = lib.mkForce no; + MLXSW_CORE = lib.mkForce no; + MLX_PLATFORM = lib.mkForce no; + + # fpga + FPGA = lib.mkForce no; + + # old x86 cpufreq / platform (both systems are modern Zen) + AMD_NUMA = lib.mkForce no; + X86_POWERNOW_K8 = lib.mkForce no; + X86_P4_CLOCKMOD = lib.mkForce no; + X86_SPEEDSTEP_LIB = lib.mkForce no; + + # cxl (datacenter memory expansion) + CXL_BUS = lib.mkForce no; # deprecated userland compat SGETMASK_SYSCALL = lib.mkForce no; From 09fdd39b00069a01e8fc005388d25f04f6ebabb3 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 14 Apr 2026 20:51:50 -0400 Subject: [PATCH 694/724] kernel: remove more things --- system/common.nix | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/system/common.nix b/system/common.nix index 19037da..13d533e 100644 --- a/system/common.nix +++ b/system/common.nix @@ -142,14 +142,23 @@ # hypervisor guest support (bare metal only) HYPERV = lib.mkForce no; - VMWARE_VMCI = lib.mkForce no; XEN = lib.mkForce no; + VMWARE_VMCI = lib.mkForce no; + VMWARE_BALLOON = lib.mkForce no; + VMWARE_PVSCSI = lib.mkForce no; + VMWARE_VMCI_VSOCKETS = lib.mkForce no; + VMXNET3 = lib.mkForce no; + DRM_VMWGFX = lib.mkForce no; + VBOXGUEST = lib.mkForce no; + VBOXSF_FS = lib.mkForce no; # staging drivers (experimental/unmaintained) STAGING = lib.mkForce no; # legacy storage (AHCI for modern SATA is independent) ATA_SFF = lib.mkForce no; + SCSI_LOWLEVEL = lib.mkForce no; + FUSION = lib.mkForce no; # misc legacy MOST = lib.mkForce no; @@ -159,15 +168,27 @@ CHROME_PLATFORMS = lib.mkForce no; SURFACE_PLATFORMS = lib.mkForce no; MCTP = lib.mkForce no; + GPIB = lib.mkForce no; + SIOX = lib.mkForce no; + SLIMBUS = lib.mkForce no; + WWAN = lib.mkForce no; # nvidia gpu DRM_NOUVEAU = lib.mkForce no; + # other gpus not present + DRM_RADEON = lib.mkForce no; + DRM_GMA500 = lib.mkForce no; + DRM_AST = lib.mkForce no; + DRM_MGAG200 = lib.mkForce no; + DRM_HISI_HIBMC = lib.mkForce no; + DRM_APPLETBDRM = lib.mkForce no; + # intel gpu DRM_I915 = lib.mkForce no; DRM_XE = lib.mkForce no; - # intel cpu + # intel cpu / platform INTEL_IOMMU = lib.mkForce no; INTEL_IDLE = lib.mkForce no; INTEL_HFI_THERMAL = lib.mkForce no; @@ -177,6 +198,15 @@ INTEL_POWERCLAMP = lib.mkForce no; X86_PKG_TEMP_THERMAL = lib.mkForce no; X86_INTEL_LPSS = lib.mkForce no; + INTEL_MEI = lib.mkForce no; + INTEL_TH = lib.mkForce no; + INTEL_VSEC = lib.mkForce no; + INTEL_IDXD = lib.mkForce no; + INTEL_IOATDMA = lib.mkForce no; + + # intel audio + SND_SOC_SOF_INTEL_TOPLEVEL = lib.mkForce no; + SND_SOC_INTEL_SST_TOPLEVEL = lib.mkForce no; # mellanox networking MLX4_CORE = lib.mkForce no; @@ -196,6 +226,13 @@ # cxl (datacenter memory expansion) CXL_BUS = lib.mkForce no; + # embedded SoC peripherals (not present on desktop/laptop) + INPUT_TOUCHSCREEN = lib.mkForce no; + INPUT_TABLET = lib.mkForce no; + INPUT_JOYSTICK = lib.mkForce no; + MEDIA_PLATFORM_DRIVERS = lib.mkForce no; + MEDIA_TEST_SUPPORT = lib.mkForce no; + # deprecated userland compat SGETMASK_SYSCALL = lib.mkForce no; UID16 = lib.mkForce no; From 6254f98ca75d55949abbfc0ba19bd26399d8e4a6 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 14 Apr 2026 20:56:24 -0400 Subject: [PATCH 695/724] kernel: remove more more things --- system/common.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/system/common.nix b/system/common.nix index 13d533e..f53d13e 100644 --- a/system/common.nix +++ b/system/common.nix @@ -154,6 +154,10 @@ # staging drivers (experimental/unmaintained) STAGING = lib.mkForce no; + SND_PCI = lib.mkForce no; + ACCESSIBILITY = lib.mkForce no; + MTD = lib.mkForce no; + MEDIA_RC_SUPPORT = lib.mkForce no; # legacy storage (AHCI for modern SATA is independent) ATA_SFF = lib.mkForce no; @@ -203,6 +207,22 @@ INTEL_VSEC = lib.mkForce no; INTEL_IDXD = lib.mkForce no; INTEL_IOATDMA = lib.mkForce no; + EDAC_E752X = lib.mkForce no; + EDAC_I82975X = lib.mkForce no; + EDAC_I3000 = lib.mkForce no; + EDAC_I3200 = lib.mkForce no; + EDAC_IE31200 = lib.mkForce no; + EDAC_X38 = lib.mkForce no; + EDAC_I5400 = lib.mkForce no; + EDAC_I7CORE = lib.mkForce no; + EDAC_I5100 = lib.mkForce no; + EDAC_I7300 = lib.mkForce no; + EDAC_SBRIDGE = lib.mkForce no; + EDAC_SKX = lib.mkForce no; + EDAC_I10NM = lib.mkForce no; + EDAC_IMH = lib.mkForce no; + EDAC_PND2 = lib.mkForce no; + EDAC_IGEN6 = lib.mkForce no; # intel audio SND_SOC_SOF_INTEL_TOPLEVEL = lib.mkForce no; From d2032e517baebda129f6d0ffc5fd20f547cf3e15 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Tue, 14 Apr 2026 20:56:35 -0400 Subject: [PATCH 696/724] yarn: rely on server for updates --- .gitea/workflows/deploy.yml | 18 ++------ AGENTS.md | 8 ++-- flake.lock | 86 +++---------------------------------- flake.nix | 16 ------- system/pull-update.nix | 44 +++++++++++++++++++ system/system-yarn.nix | 1 + 6 files changed, 61 insertions(+), 112 deletions(-) create mode 100644 system/pull-update.nix diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 5905d63..b0f7ae3 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -1,10 +1,10 @@ -name: Build and Deploy +name: Build on: push: branches: [main] jobs: - deploy: + build: runs-on: nix steps: - uses: https://github.com/actions/checkout@v4 @@ -18,22 +18,12 @@ jobs: - name: Build NixOS configuration (yarn) run: | nix build .#nixosConfigurations.yarn.config.system.build.toplevel -L + mkdir -p /var/lib/dotfiles-deploy + readlink -f result > /var/lib/dotfiles-deploy/yarn - name: Build NixOS configuration (mreow) run: | nix build .#nixosConfigurations.mreow.config.system.build.toplevel -L - - - name: Deploy to desktop - run: | - eval $(ssh-agent -s) - ssh-add /run/agenix/ci-deploy-key - if ssh -i /run/agenix/ci-deploy-key -o StrictHostKeyChecking=no -o ConnectTimeout=10 root@desktop "echo reachable" 2>/dev/null; then - nix run github:serokell/deploy-rs -- .#yarn --ssh-opts="-o StrictHostKeyChecking=no" - echo "Deploy to desktop succeeded" - else - echo "Desktop unreachable - skipping deploy. Build succeeded." - fi - - name: Notify success if: success() run: | diff --git a/AGENTS.md b/AGENTS.md index ce5873b..b069751 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -4,7 +4,7 @@ NixOS dotfiles for two hosts using Nix flakes + home-manager: - **mreow** β€” Framework 13 AMD AI 300 laptop, niri WM, greetd, swaylock -- **yarn** β€” Desktop, Jovian-NixOS (Steam deck mode), impermanence, sddm, deploy-rs target +- **yarn** β€” Desktop, Jovian-NixOS (Steam deck mode), impermanence, sddm, pull-based updates from CI Secrets in `system/secrets/` and `home-manager/secrets/` are encrypted with git-crypt. **Never read or write files in those directories.** @@ -21,8 +21,10 @@ Secrets in `system/secrets/` and `home-manager/secrets/` are encrypted with git- nix build .#nixosConfigurations.mreow.config.system.build.toplevel -L nix build .#nixosConfigurations.yarn.config.system.build.toplevel -L -# Remote deploy to yarn via deploy-rs -deploy .#yarn +# yarn pulls updates automatically on boot from the binary cache. +# CI builds the yarn closure, records the store path, and Harmonia serves it. +# To manually trigger the pull on yarn: +systemctl start pull-update # Format all Nix files (uses nixfmt-tree, declared in flake.nix) nix fmt diff --git a/flake.lock b/flake.lock index 762dfa9..50fc7d7 100644 --- a/flake.lock +++ b/flake.lock @@ -106,28 +106,6 @@ "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": [ @@ -211,22 +189,6 @@ } }, "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, @@ -242,7 +204,7 @@ "type": "github" } }, - "flake-compat_3": { + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1767039857, @@ -299,7 +261,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1710146030, @@ -470,7 +432,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_3", + "systems": "systems_2", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -551,7 +513,7 @@ "inputs": { "cachyos-kernel": "cachyos-kernel", "cachyos-kernel-patches": "cachyos-kernel-patches", - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "flake-parts": "flake-parts_2", "nixpkgs": [ "nixpkgs" @@ -581,7 +543,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1776078956, @@ -708,7 +670,7 @@ "noctalia", "nixpkgs" ], - "systems": "systems_5", + "systems": "systems_4", "treefmt-nix": "treefmt-nix_2" }, "locked": { @@ -727,7 +689,7 @@ }, "pre-commit": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "gitignore": "gitignore", "nixpkgs": [ "lanzaboote", @@ -750,7 +712,6 @@ }, "root": { "inputs": { - "deploy-rs": "deploy-rs", "disko": "disko", "emacs-overlay": "emacs-overlay", "firefox-addons": "firefox-addons", @@ -837,21 +798,6 @@ } }, "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": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -909,24 +855,6 @@ "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": { diff --git a/flake.nix b/flake.nix index 9ad3e0b..16f4aa3 100644 --- a/flake.nix +++ b/flake.nix @@ -63,12 +63,6 @@ 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:Jovian-Experiments/Jovian-NixOS"; inputs.nixpkgs.follows = "nixpkgs"; @@ -101,7 +95,6 @@ lanzaboote, nixos-hardware, home-manager, - deploy-rs, jovian-nixos, ... }@inputs: @@ -158,14 +151,5 @@ }; } ) { } 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; - }; - }; }; } diff --git a/system/pull-update.nix b/system/pull-update.nix new file mode 100644 index 0000000..c73ceb8 --- /dev/null +++ b/system/pull-update.nix @@ -0,0 +1,44 @@ +# Pull-based NixOS updates for hosts that can't be pushed to reliably. +# CI builds the system closure on muffin (which Harmonia serves), then +# records the output store path at /deploy/. On boot this +# service fetches that path, pulls the closure from the binary cache, +# and activates it. +{ pkgs, hostname, ... }: +let + deploy-url = "https://nix-cache.sigkill.computer/deploy/${hostname}"; + + pull-update = pkgs.writeShellScript "pull-update" '' + set -euo pipefail + + STORE_PATH=$(${pkgs.lib.getExe pkgs.curl} -sf --max-time 30 "${deploy-url}" || true) + + if [ -z "$STORE_PATH" ]; then + echo "Server unreachable or no deployment available, skipping" + exit 0 + fi + + CURRENT=$(readlink -f /nix/var/nix/profiles/system) + if [ "$CURRENT" = "$STORE_PATH" ]; then + echo "Already on latest configuration" + exit 0 + fi + + echo "Pulling update: $CURRENT -> $STORE_PATH" + nix-store -r "$STORE_PATH" + nix-env -p /nix/var/nix/profiles/system --set "$STORE_PATH" + "$STORE_PATH/bin/switch-to-configuration" switch + echo "Update applied" + ''; +in +{ + systemd.services.pull-update = { + description = "Pull latest NixOS configuration from binary cache"; + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "oneshot"; + ExecStart = pull-update; + }; + }; +} diff --git a/system/system-yarn.nix b/system/system-yarn.nix index 8b0f064..2be8e6a 100644 --- a/system/system-yarn.nix +++ b/system/system-yarn.nix @@ -11,6 +11,7 @@ ./disk_yarn.nix ./common.nix ./impermanence.nix + ./pull-update.nix ./no-rgb.nix ./vr.nix From b050ecc5bf6cfdcf327f6991c40606acb8ee7d11 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 15 Apr 2026 09:30:51 -0400 Subject: [PATCH 697/724] kernel: enable CHROME_PLATFORMS for framework laptop --- system/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/common.nix b/system/common.nix index f53d13e..b8455df 100644 --- a/system/common.nix +++ b/system/common.nix @@ -169,7 +169,7 @@ PPDEV = lib.mkForce no; PHANTOM = lib.mkForce no; X86_ANDROID_TABLETS = lib.mkForce no; - CHROME_PLATFORMS = lib.mkForce no; + # CHROME_PLATFORMS stays β€” Framework laptops use CrOS EC SURFACE_PLATFORMS = lib.mkForce no; MCTP = lib.mkForce no; GPIB = lib.mkForce no; From ec42b906d66e6ff3e5ad766c4f820626db43447f Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 15 Apr 2026 09:31:15 -0400 Subject: [PATCH 698/724] update --- flake.lock | 89 +++++++++++++++++++++++++++--------------------------- 1 file changed, 45 insertions(+), 44 deletions(-) diff --git a/flake.lock b/flake.lock index 50fc7d7..31d5f07 100644 --- a/flake.lock +++ b/flake.lock @@ -12,11 +12,11 @@ ] }, "locked": { - "lastModified": 1771437256, - "narHash": "sha256-bLqwib+rtyBRRVBWhMuBXPCL/OThfokA+j6+uH7jDGU=", + "lastModified": 1776249299, + "narHash": "sha256-Dt9t1TGRmJFc0xVYhttNBD6QsAgHOHCArqGa0AyjrJY=", "owner": "numtide", "repo": "blueprint", - "rev": "06ee7190dc2620ea98af9eb225aa9627b68b0e33", + "rev": "56131e8628f173d24a27f6d27c0215eff57e40dd", "type": "github" }, "original": { @@ -46,15 +46,16 @@ ] }, "locked": { - "lastModified": 1770895533, - "narHash": "sha256-v3QaK9ugy9bN9RXDnjw0i2OifKmz2NnKM82agtqm/UY=", - "owner": "nix-community", + "lastModified": 1776182890, + "narHash": "sha256-+/VOe8XGq5klpU+I19D+3TcaR7o+Cwbq67KNF7mcFak=", + "owner": "Mic92", "repo": "bun2nix", - "rev": "c843f477b15f51151f8c6bcc886954699440a6e1", + "rev": "648d293c51e981aec9cb07ba4268bc19e7a8c575", "type": "github" }, "original": { - "owner": "nix-community", + "owner": "Mic92", + "ref": "catalog-support", "repo": "bun2nix", "type": "github" } @@ -153,11 +154,11 @@ ] }, "locked": { - "lastModified": 1776074175, - "narHash": "sha256-8e7+uLslLDZRD8p5QyJV8QSivpB2qMy2XuAcVYbW1f4=", + "lastModified": 1776244836, + "narHash": "sha256-UJr7TUHtud7OK+yGnyoYILrEPE3xPrJGG1M30MHxY88=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "000ca2cd866f7c37a8c0cc96dd2aff457ee4c865", + "rev": "fff5dfce2dc5f132d07a8092e14a4362442a1a3f", "type": "github" }, "original": { @@ -174,11 +175,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1776052978, - "narHash": "sha256-WR0Svwg/JreBNW006qjHET6RRRmmjWCMfrkS5JmDZK8=", + "lastModified": 1776225785, + "narHash": "sha256-yrRZkEEtTwJcIXzxL/nCFpyGsz7VmkOJSoyx/AX6Ri8=", "owner": "rycee", "repo": "nur-expressions", - "rev": "6c0e7f01d9315f4806a187c2ec58d0f3b6961876", + "rev": "c09a1a34c147aefac0ff10017644ca17a3230e8c", "type": "gitlab" }, "original": { @@ -306,11 +307,11 @@ ] }, "locked": { - "lastModified": 1776114641, - "narHash": "sha256-VJMt3n9zGRzupzvlhcKIz4SpWflKh0rWfYTgmkmun0Q=", + "lastModified": 1776184304, + "narHash": "sha256-No6QGBmIv5ChiwKCcbkxjdEQ/RO2ZS1gD7SFy6EZ7rc=", "owner": "nix-community", "repo": "home-manager", - "rev": "2de7205ce6e10b031151033e69b7ef89708dc282", + "rev": "3c7524c68348ef79ce48308e0978611a050089b2", "type": "github" }, "original": { @@ -365,11 +366,11 @@ ] }, "locked": { - "lastModified": 1775841957, - "narHash": "sha256-oHxj9I82v+axW1lj+jUj2t8V++E6A9x54K5lq+liNAk=", + "lastModified": 1776243263, + "narHash": "sha256-5GN5o5NG9P08N+p4vn88ydvlsiyogClaBugtp4o7txw=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "67d55e61fe5e4d88d3fb90c0888cfced04a0589d", + "rev": "c05685d0c40ce74a50181e7167bc7dde48d182d0", "type": "github" }, "original": { @@ -411,11 +412,11 @@ ] }, "locked": { - "lastModified": 1775866084, - "narHash": "sha256-mWn8D/oXXAaqeFFFRorKHvTLw5V9M8eYzAWRr4iffag=", + "lastModified": 1776248416, + "narHash": "sha256-TC6yzbCAex1pDfqUZv9u8fVm8e17ft5fNrcZ0JRDOIQ=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "29d2cca7fc3841708c1d48e2d1272f79db1538b6", + "rev": "18e9e64bae15b828c092658335599122a6db939b", "type": "github" }, "original": { @@ -436,11 +437,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1776092696, - "narHash": "sha256-4MQq9lP6b9nBHozK1LHQNXPv72XAgGt8Drb4mQPqd7s=", + "lastModified": 1776251337, + "narHash": "sha256-GttxCVipjiQ/cdu3wNXYZbAKfrq8IU9zBTiyYTuw3mw=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "215193474714ad712668bda23eef596c2656af6b", + "rev": "78aa3103939b8f6ba98d9c6e71a1907fad743bdb", "type": "github" }, "original": { @@ -463,11 +464,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1776109195, - "narHash": "sha256-yug5v5OI5ixCYyAiqCbNrxfiyfvxvlsMr/tj3uyH51c=", + "lastModified": 1776258200, + "narHash": "sha256-M7TFT253unhJDWWVbw1u0rQkdqNn6elEYFBe4hRnq6Q=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "8fcfcef0fc05ee826adf66225b27716131ed74af", + "rev": "2f31997736b672a833a3fdc37c04facf0d836da4", "type": "github" }, "original": { @@ -496,11 +497,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1775561155, - "narHash": "sha256-TK2IrqQivRcwqJa0suZMbcsN17CtA8Uu0v7CDnLATb0=", + "lastModified": 1776252914, + "narHash": "sha256-251qX0g75KcVtwCckXiOiqc+4VleJBDfiHiZ9v1c8Ro=", "owner": "YaLTeR", "repo": "niri", - "rev": "599db847f857b8a7ff78ce02f15acab5d5d9fee1", + "rev": "4d214891017fa7b893df1140d24f76defba0eb88", "type": "github" }, "original": { @@ -546,11 +547,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1776078956, - "narHash": "sha256-+JCa+VodMqySrmSBWwNxuUcgLFSDvFA8rR0sY6YC7t0=", + "lastModified": 1776246724, + "narHash": "sha256-iP9og5pHDrG1H4S9BrPa0XzGUAm24l/RD0Yzybvxwhk=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "f4abf68bf74d506ff56af64e7a0b29e1a72d8b57", + "rev": "53b888e67651606a4720c9adf8c824d171d5a664", "type": "github" }, "original": { @@ -651,11 +652,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1776043445, - "narHash": "sha256-ie3vFwg0eZTTHBDCRm+ee/PecbtdPn/pyL6hlotAfeQ=", + "lastModified": 1776240823, + "narHash": "sha256-QAdipw26rtLJWKY7EWX7k+pyvCQwF4+PObggxWbiT74=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "e56a9db57ed61ea248f109edd60965faf56d3da2", + "rev": "76b03be48965cb01faabe167f80a8995fb76a92e", "type": "github" }, "original": { @@ -739,11 +740,11 @@ ] }, "locked": { - "lastModified": 1776050130, - "narHash": "sha256-/f/6/1WOfBJaGMfqV3VxWD9lpFRbPpF+Cx4MO+0mGok=", + "lastModified": 1776222810, + "narHash": "sha256-5TD8MYqLMcJi9yV/9jq2dVUPtnu/lKZPD61esQCgvqs=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "3c27f4c92a7d977556dd2c10bb564d9c61b375e9", + "rev": "4d6fee71fea68418a48992409b47f1183d0dd111", "type": "github" }, "original": { @@ -898,11 +899,11 @@ ] }, "locked": { - "lastModified": 1776091817, - "narHash": "sha256-Vwmi3P4LAUmOrE2zc9JpnRrNxNwamDN46hqcXpWTkp0=", + "lastModified": 1776144279, + "narHash": "sha256-eX3u6wJ34+qu7ZR1qWOaToGWmudYQSOEStZZm6goP+8=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "4f2e98c1125ab4be758cd1b51b526ad998e9618f", + "rev": "727de8a44c85e90f899c540cf3ffa0d5d3344f9c", "type": "github" }, "original": { From da1bfbb778f5cf99b115f52525f7775c201b5371 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 15 Apr 2026 13:32:34 -0400 Subject: [PATCH 699/724] update --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 31d5f07..58efd13 100644 --- a/flake.lock +++ b/flake.lock @@ -154,11 +154,11 @@ ] }, "locked": { - "lastModified": 1776244836, - "narHash": "sha256-UJr7TUHtud7OK+yGnyoYILrEPE3xPrJGG1M30MHxY88=", + "lastModified": 1776272737, + "narHash": "sha256-u7jnm35wKp9TUZJI9xRjvURkQSo8EabaHrF/dymNoeY=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "fff5dfce2dc5f132d07a8092e14a4362442a1a3f", + "rev": "68166ba63f8ef81b2e5ca71b8e6e3387b9a6ff2e", "type": "github" }, "original": { @@ -437,11 +437,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1776251337, - "narHash": "sha256-GttxCVipjiQ/cdu3wNXYZbAKfrq8IU9zBTiyYTuw3mw=", + "lastModified": 1776269462, + "narHash": "sha256-9WA/wWlzYaJ2/X2y5YYk80ckhyLmhT5BjUVVR/8H5UY=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "78aa3103939b8f6ba98d9c6e71a1907fad743bdb", + "rev": "9419738cb8576d342fe830b3c317791a200de771", "type": "github" }, "original": { From 7ab17f132e77c9cd2d7adec77e98d3d277136e6e Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 15 Apr 2026 17:33:21 -0400 Subject: [PATCH 700/724] kernel: compile for x86_64-v3 (common target) --- system/common.nix | 11 +++++++++++ system/system-mreow.nix | 11 ----------- system/system-yarn.nix | 16 ---------------- 3 files changed, 11 insertions(+), 27 deletions(-) diff --git a/system/common.nix b/system/common.nix index b8455df..5c5657e 100644 --- a/system/common.nix +++ b/system/common.nix @@ -100,6 +100,17 @@ # kernel options boot = { + # cachyos kernel: bore scheduler, full lto, x86_64-v3 (common to zen 3 + zen 5) + kernelPackages = + let + helpers = pkgs.callPackage "${inputs.nix-cachyos-kernel}/helpers.nix" { }; + kernel = pkgs.cachyosKernels.linux-cachyos-bore-lto.override { + lto = "full"; + processorOpt = "x86_64-v3"; + }; + in + helpers.kernelModuleLLVMOverride (pkgs.linuxKernel.packagesFor kernel); + # disable legacy subsystems neither host will ever use kernelPatches = [ { diff --git a/system/system-mreow.nix b/system/system-mreow.nix index eddf970..16d7902 100644 --- a/system/system-mreow.nix +++ b/system/system-mreow.nix @@ -14,17 +14,6 @@ inputs.nixos-hardware.nixosModules.framework-amd-ai-300-series ]; - # cachyos kernel: bore scheduler, full lto, zen 4 (amd ai 340) - boot.kernelPackages = - let - helpers = pkgs.callPackage "${inputs.nix-cachyos-kernel}/helpers.nix" { }; - kernel = pkgs.cachyosKernels.linux-cachyos-bore-lto.override { - lto = "full"; - processorOpt = "zen4"; - }; - in - helpers.kernelModuleLLVMOverride (pkgs.linuxKernel.packagesFor kernel); - hardware.framework.laptop13.audioEnhancement.rawDeviceName = lib.mkDefault "alsa_output.pci-0000_c1_00.6.analog-stereo"; diff --git a/system/system-yarn.nix b/system/system-yarn.nix index 2be8e6a..6a0f0c7 100644 --- a/system/system-yarn.nix +++ b/system/system-yarn.nix @@ -19,22 +19,6 @@ inputs.jovian-nixos.nixosModules.default ]; - # cachyos kernel: bore scheduler, full lto, zen 3 (5800x) - boot.kernelPackages = - let - helpers = pkgs.callPackage "${inputs.nix-cachyos-kernel}/helpers.nix" { }; - kernel = pkgs.cachyosKernels.linux-cachyos-bore-lto.override { - lto = "full"; - processorOpt = "x86_64-v3"; - structuredExtraConfig = with lib.kernel; { - # x86_64-v3 is the ISA level; pin to zen 3 for microarch tuning - GENERIC_CPU = lib.mkForce no; - MZEN3 = lib.mkForce yes; - }; - }; - in - helpers.kernelModuleLLVMOverride (pkgs.linuxKernel.packagesFor kernel); - fileSystems."/media/games" = { device = "/dev/disk/by-uuid/1878136e-765d-4784-b204-3536ab4fdac8"; fsType = "f2fs"; From 194c66feb42cc9863ffc742b6cf1f3ad5313b9ed Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 15 Apr 2026 21:57:04 -0400 Subject: [PATCH 701/724] fix initrd build --- system/common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/system/common.nix b/system/common.nix index 5c5657e..064ead3 100644 --- a/system/common.nix +++ b/system/common.nix @@ -277,6 +277,9 @@ lib.filter (m: m != "aes_generic") options.boot.initrd.luks.cryptoModules.default ); + # don't pull legacy ATA modules into initrd (ATA_SFF=n) + initrd.includeDefaultModules = false; + lanzaboote = { enable = true; # TODO: proper secrets management so this is not stored in nix store From 56cda525cd3e644ba919069d9279d36f3e847302 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 15 Apr 2026 22:06:22 -0400 Subject: [PATCH 702/724] fix gitea workflow --- .gitea/workflows/deploy.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index b0f7ae3..905c6af 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -18,12 +18,17 @@ jobs: - name: Build NixOS configuration (yarn) run: | nix build .#nixosConfigurations.yarn.config.system.build.toplevel -L + + - name: Record yarn store path for pull-update + continue-on-error: true + run: | mkdir -p /var/lib/dotfiles-deploy readlink -f result > /var/lib/dotfiles-deploy/yarn - name: Build NixOS configuration (mreow) run: | nix build .#nixosConfigurations.mreow.config.system.build.toplevel -L + - name: Notify success if: success() run: | From 21658b7bc04540e44b8ef4352a4a2941f2cf45a4 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 15 Apr 2026 22:08:59 -0400 Subject: [PATCH 703/724] update --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 58efd13..29c50c3 100644 --- a/flake.lock +++ b/flake.lock @@ -154,11 +154,11 @@ ] }, "locked": { - "lastModified": 1776272737, - "narHash": "sha256-u7jnm35wKp9TUZJI9xRjvURkQSo8EabaHrF/dymNoeY=", + "lastModified": 1776275529, + "narHash": "sha256-RIj67eEEDiDJNQ8zJk/QbDnB0rOQzHxFMrnKDJ7fC+E=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "68166ba63f8ef81b2e5ca71b8e6e3387b9a6ff2e", + "rev": "71ed8b0b4028730d51155cd042f40f0426ad7ffe", "type": "github" }, "original": { @@ -464,11 +464,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1776258200, - "narHash": "sha256-M7TFT253unhJDWWVbw1u0rQkdqNn6elEYFBe4hRnq6Q=", + "lastModified": 1776283911, + "narHash": "sha256-oMy/D/2nzd33YXS+1atsBbmQ7W5K2sKm9X3qYVEpuYU=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "2f31997736b672a833a3fdc37c04facf0d836da4", + "rev": "e64a8f7f8f904f8371a3b925037bf2b0f9f9cb82", "type": "github" }, "original": { @@ -497,11 +497,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1776252914, - "narHash": "sha256-251qX0g75KcVtwCckXiOiqc+4VleJBDfiHiZ9v1c8Ro=", + "lastModified": 1776278128, + "narHash": "sha256-D5ME/gcvzCqr2pqd8iw3Nx7v31CBdQLt5iFfF0PZKDw=", "owner": "YaLTeR", "repo": "niri", - "rev": "4d214891017fa7b893df1140d24f76defba0eb88", + "rev": "71d7fa9a61ef56d2afa1fd5523089b96c1c5fc0f", "type": "github" }, "original": { @@ -615,11 +615,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1775710090, - "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=", + "lastModified": 1776169885, + "narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4c1018dae018162ec878d42fec712642d214fdfa", + "rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9", "type": "github" }, "original": { @@ -652,11 +652,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1776240823, - "narHash": "sha256-QAdipw26rtLJWKY7EWX7k+pyvCQwF4+PObggxWbiT74=", + "lastModified": 1776302695, + "narHash": "sha256-xZc9o1JLQpmWn2Dqui323+Tq2Ai4sSdtdvbFZCs4qLo=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "76b03be48965cb01faabe167f80a8995fb76a92e", + "rev": "a7c724181fca5d1aff2d47b18fa733504cfdbda2", "type": "github" }, "original": { From d0d8d5b9d24536849a9e51901b7226962b6d8a0c Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Wed, 15 Apr 2026 23:25:45 -0400 Subject: [PATCH 704/724] ci: prevent gc from deleting --- .gitea/workflows/deploy.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 905c6af..a6fe01f 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -24,11 +24,19 @@ jobs: run: | mkdir -p /var/lib/dotfiles-deploy readlink -f result > /var/lib/dotfiles-deploy/yarn + nix-store --add-root /var/lib/dotfiles-deploy/yarn-gcroot -r "$(readlink -f result)" - name: Build NixOS configuration (mreow) run: | nix build .#nixosConfigurations.mreow.config.system.build.toplevel -L + - name: Record mreow store path + continue-on-error: true + run: | + mkdir -p /var/lib/dotfiles-deploy + readlink -f result > /var/lib/dotfiles-deploy/mreow + nix-store --add-root /var/lib/dotfiles-deploy/mreow-gcroot -r "$(readlink -f result)" + - name: Notify success if: success() run: | From 4542a5002c155ac17ad0e010443e1b93627a108a Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 16 Apr 2026 00:04:10 -0400 Subject: [PATCH 705/724] fix pull-update --- system/pull-update.nix | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/system/pull-update.nix b/system/pull-update.nix index c73ceb8..638e06f 100644 --- a/system/pull-update.nix +++ b/system/pull-update.nix @@ -9,8 +9,24 @@ let pull-update = pkgs.writeShellScript "pull-update" '' set -euo pipefail + export PATH=${ + pkgs.lib.makeBinPath [ + pkgs.curl + pkgs.coreutils + pkgs.nix + ] + } - STORE_PATH=$(${pkgs.lib.getExe pkgs.curl} -sf --max-time 30 "${deploy-url}" || true) + # wait for actual connectivity, not just networkd "up" + for i in $(seq 1 30); do + if curl -sf --max-time 5 "${deploy-url}" >/dev/null; then + break + fi + echo "Waiting for network... ($i/30)" + sleep 2 + done + + STORE_PATH=$(curl -sf --max-time 30 "${deploy-url}" || true) if [ -z "$STORE_PATH" ]; then echo "Server unreachable or no deployment available, skipping" @@ -25,7 +41,10 @@ let echo "Pulling update: $CURRENT -> $STORE_PATH" nix-store -r "$STORE_PATH" - nix-env -p /nix/var/nix/profiles/system --set "$STORE_PATH" + if ! nix-env -p /nix/var/nix/profiles/system --set "$STORE_PATH"; then + echo "Profile locked (concurrent switch?), skipping" + exit 0 + fi "$STORE_PATH/bin/switch-to-configuration" switch echo "Update applied" ''; @@ -36,6 +55,8 @@ in after = [ "network-online.target" ]; wants = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; + # don't restart when deploying a new config via nixos-rebuild + restartIfChanged = false; serviceConfig = { Type = "oneshot"; ExecStart = pull-update; From 20df895312f9a05a8eb86c95f7353f798d2092c4 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 16 Apr 2026 00:50:13 -0400 Subject: [PATCH 706/724] pull-update: update and reboot --- system/pull-update.nix | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/system/pull-update.nix b/system/pull-update.nix index 638e06f..f7b108e 100644 --- a/system/pull-update.nix +++ b/system/pull-update.nix @@ -2,18 +2,20 @@ # CI builds the system closure on muffin (which Harmonia serves), then # records the output store path at /deploy/. On boot this # service fetches that path, pulls the closure from the binary cache, -# and activates it. +# sets it as the boot profile, and reboots into it. { pkgs, hostname, ... }: let deploy-url = "https://nix-cache.sigkill.computer/deploy/${hostname}"; pull-update = pkgs.writeShellScript "pull-update" '' - set -euo pipefail + set -uo pipefail export PATH=${ pkgs.lib.makeBinPath [ pkgs.curl pkgs.coreutils pkgs.nix + pkgs.systemd + pkgs.util-linux ] } @@ -39,14 +41,15 @@ let exit 0 fi - echo "Pulling update: $CURRENT -> $STORE_PATH" - nix-store -r "$STORE_PATH" - if ! nix-env -p /nix/var/nix/profiles/system --set "$STORE_PATH"; then - echo "Profile locked (concurrent switch?), skipping" - exit 0 - fi - "$STORE_PATH/bin/switch-to-configuration" switch - echo "Update applied" + echo "Update available: $CURRENT -> $STORE_PATH" + + nix-store -r "$STORE_PATH" || { echo "Failed to fetch closure"; exit 1; } + nix-env -p /nix/var/nix/profiles/system --set "$STORE_PATH" || { echo "Failed to set profile"; exit 1; } + "$STORE_PATH/bin/switch-to-configuration" boot || { echo "Failed to install boot entry"; exit 1; } + + wall "System update installed. Rebooting in 10 seconds..." + sleep 10 + systemctl reboot ''; in { @@ -55,7 +58,6 @@ in after = [ "network-online.target" ]; wants = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; - # don't restart when deploying a new config via nixos-rebuild restartIfChanged = false; serviceConfig = { Type = "oneshot"; From 13f16fe775e745db4bae8cc66db1c82c029c1659 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 16 Apr 2026 11:15:13 -0400 Subject: [PATCH 707/724] update --- flake.lock | 72 +++++++++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/flake.lock b/flake.lock index 29c50c3..cdf3ee2 100644 --- a/flake.lock +++ b/flake.lock @@ -63,11 +63,11 @@ "cachyos-kernel": { "flake": false, "locked": { - "lastModified": 1775145950, - "narHash": "sha256-AfVja9nvYHm0BHbuTvn+K8rKfLmPl5QjoiNecp9HOJU=", + "lastModified": 1776183001, + "narHash": "sha256-lvLKB5dTqjO1S/YonS9ZyWemEjO6QXtN4D76rYEYy4s=", "owner": "CachyOS", "repo": "linux-cachyos", - "rev": "b91624f68ceaf5394ef1571f60290dca6ba22b45", + "rev": "4224303b6d7a50dd1cc3ffa78864050cc9536eec", "type": "github" }, "original": { @@ -79,11 +79,11 @@ "cachyos-kernel-patches": { "flake": false, "locked": { - "lastModified": 1775157685, - "narHash": "sha256-g8HgH7gADoEnrBN30BK3pz7+M2pT/p3xtfRFEuEov5w=", + "lastModified": 1776181525, + "narHash": "sha256-g07GhYlAOH0agNE8dIOT33vZ0eviF/HY5xgAQRwLytk=", "owner": "CachyOS", "repo": "kernel-patches", - "rev": "c1ba300617a12d257b5721572b9bbe28efae182f", + "rev": "fcd21edaf0ff9b69f9d32ea8590002d6acd1c503", "type": "github" }, "original": { @@ -154,11 +154,11 @@ ] }, "locked": { - "lastModified": 1776275529, - "narHash": "sha256-RIj67eEEDiDJNQ8zJk/QbDnB0rOQzHxFMrnKDJ7fC+E=", + "lastModified": 1776331221, + "narHash": "sha256-I9HJO6ceghosCSraLRdAzz7f8pm+1zBo7sRVSvJbqUU=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "71ed8b0b4028730d51155cd042f40f0426ad7ffe", + "rev": "23055e4c66f6b873d6d6299bf5a7fdfe6012be5c", "type": "github" }, "original": { @@ -175,11 +175,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1776225785, - "narHash": "sha256-yrRZkEEtTwJcIXzxL/nCFpyGsz7VmkOJSoyx/AX6Ri8=", + "lastModified": 1776312172, + "narHash": "sha256-jxZfeRd9mxqrLlsFc9+MLcqTy1eN1hQMLWhX0MJMno8=", "owner": "rycee", "repo": "nur-expressions", - "rev": "c09a1a34c147aefac0ff10017644ca17a3230e8c", + "rev": "501d3ee969edad2167e57a1499312cd4fdfdbc78", "type": "gitlab" }, "original": { @@ -366,11 +366,11 @@ ] }, "locked": { - "lastModified": 1776243263, - "narHash": "sha256-5GN5o5NG9P08N+p4vn88ydvlsiyogClaBugtp4o7txw=", + "lastModified": 1776335039, + "narHash": "sha256-2lkQhrv6YUCeMlC/lclzq9vkTALv/ptv7d0jIhZnrPQ=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "c05685d0c40ce74a50181e7167bc7dde48d182d0", + "rev": "cbdf76c063b48d5d755fb26540367b8c2457c2ca", "type": "github" }, "original": { @@ -437,11 +437,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1776269462, - "narHash": "sha256-9WA/wWlzYaJ2/X2y5YYk80ckhyLmhT5BjUVVR/8H5UY=", + "lastModified": 1776351423, + "narHash": "sha256-JySMZu8hLD8kV2HerIZ6uZyrijc7SUaGhRAKH63X6R4=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "9419738cb8576d342fe830b3c317791a200de771", + "rev": "1fb51dbe453f1c8ec5b7133df561512e43dc7cc2", "type": "github" }, "original": { @@ -464,11 +464,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1776283911, - "narHash": "sha256-oMy/D/2nzd33YXS+1atsBbmQ7W5K2sKm9X3qYVEpuYU=", + "lastModified": 1776337800, + "narHash": "sha256-yZvCnzf0NDL1vfMGRBkKthRmg8V93FzQ4CQNXhxh0Wg=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "e64a8f7f8f904f8371a3b925037bf2b0f9f9cb82", + "rev": "3877b9fd1f78e831b3ea223f9e992c758d13df0f", "type": "github" }, "original": { @@ -497,11 +497,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1776278128, - "narHash": "sha256-D5ME/gcvzCqr2pqd8iw3Nx7v31CBdQLt5iFfF0PZKDw=", + "lastModified": 1776332135, + "narHash": "sha256-7cKy5sGmN4Yt47Op0+A/b3iEMk/E2Ru+UiI42KfiEPc=", "owner": "YaLTeR", "repo": "niri", - "rev": "71d7fa9a61ef56d2afa1fd5523089b96c1c5fc0f", + "rev": "892470afd3dce5396828dd9b211b19210a16eaeb", "type": "github" }, "original": { @@ -521,11 +521,11 @@ ] }, "locked": { - "lastModified": 1775239578, - "narHash": "sha256-MKJmDHlaxwBcnfCUEA89AwKOOONjOjbjHNNWdSdg5RA=", + "lastModified": 1776278748, + "narHash": "sha256-mLvw1+fa6vr0C87XfX0ja8yZMx0H+HWL0ena2SBMdp8=", "owner": "xddxdd", "repo": "nix-cachyos-kernel", - "rev": "beaf7a533ae106c2681de2624da94707f9857f1f", + "rev": "65eaf1492a6f0850ef2f08943c6bfc59b144e72a", "type": "github" }, "original": { @@ -547,11 +547,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1776246724, - "narHash": "sha256-iP9og5pHDrG1H4S9BrPa0XzGUAm24l/RD0Yzybvxwhk=", + "lastModified": 1776333106, + "narHash": "sha256-RR8gh+adHxFzpDm0yqKOtJAao8zqRyBcj8O5N1iIuoc=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "53b888e67651606a4720c9adf8c824d171d5a664", + "rev": "191a0107f4863132f723fdc0bf43b322fe849a0a", "type": "github" }, "original": { @@ -740,11 +740,11 @@ ] }, "locked": { - "lastModified": 1776222810, - "narHash": "sha256-5TD8MYqLMcJi9yV/9jq2dVUPtnu/lKZPD61esQCgvqs=", + "lastModified": 1776350315, + "narHash": "sha256-ijD4bgb5Iyap9F3MX73vLAZF/SYu+q7Gd7Ux4cbfCWw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "4d6fee71fea68418a48992409b47f1183d0dd111", + "rev": "62e3b8aedabc240e5b0cc9fae003bc9edfebbc9b", "type": "github" }, "original": { @@ -899,11 +899,11 @@ ] }, "locked": { - "lastModified": 1776144279, - "narHash": "sha256-eX3u6wJ34+qu7ZR1qWOaToGWmudYQSOEStZZm6goP+8=", + "lastModified": 1776317517, + "narHash": "sha256-JP1XVRabZquf7pnXvRUjp7DV+EBrB6Qmp3+vG3HMy/k=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "727de8a44c85e90f899c540cf3ffa0d5d3344f9c", + "rev": "0a7be59e988bb2cb452080f59aaabae70bc415ae", "type": "github" }, "original": { From 0be90ace43a7d4b998b868c8abb0e6653e1d3479 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 16 Apr 2026 13:04:22 -0400 Subject: [PATCH 708/724] initrd: fix module loading --- system/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/common.nix b/system/common.nix index 064ead3..eb283ed 100644 --- a/system/common.nix +++ b/system/common.nix @@ -277,8 +277,8 @@ lib.filter (m: m != "aes_generic") options.boot.initrd.luks.cryptoModules.default ); - # don't pull legacy ATA modules into initrd (ATA_SFF=n) - initrd.includeDefaultModules = false; + # some default initrd modules (ata_piix etc) don't exist with ATA_SFF=n + initrd.allowMissingModules = true; lanzaboote = { enable = true; From 76cdd535c854cca0898e2b94ba95ae83d413ab36 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 16 Apr 2026 13:35:26 -0400 Subject: [PATCH 709/724] gitea workflow: remove notifications --- .gitea/workflows/deploy.yml | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index a6fe01f..d4d76ca 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -36,23 +36,3 @@ jobs: mkdir -p /var/lib/dotfiles-deploy readlink -f result > /var/lib/dotfiles-deploy/mreow nix-store --add-root /var/lib/dotfiles-deploy/mreow-gcroot -r "$(readlink -f result)" - - - name: Notify success - if: success() - run: | - curl -sf -X POST \ - "https://ntfy.sigkill.computer/deployments" \ - -H "Title: [dotfiles] Build succeeded" \ - -H "Priority: default" \ - -H "Tags: white_check_mark" \ - -d "dotfiles built from commit ${GITHUB_SHA::8}" - - - name: Notify failure - if: failure() - run: | - curl -sf -X POST \ - "https://ntfy.sigkill.computer/deployments" \ - -H "Title: [dotfiles] Build FAILED" \ - -H "Priority: urgent" \ - -H "Tags: rotating_light" \ - -d "dotfiles build failed at commit ${GITHUB_SHA::8}" From d2d25bbdfef9f7c85e96fc49d9d67442ce812dae Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 16 Apr 2026 14:52:51 -0400 Subject: [PATCH 710/724] omp: remove patch that didn't work --- home-manager/progs/pi.nix | 2 +- patches/omp-fix-auth.patch | 298 ------------------------------------- 2 files changed, 1 insertion(+), 299 deletions(-) delete mode 100644 patches/omp-fix-auth.patch diff --git a/home-manager/progs/pi.nix b/home-manager/progs/pi.nix index 334dff4..7f63280 100644 --- a/home-manager/progs/pi.nix +++ b/home-manager/progs/pi.nix @@ -38,7 +38,7 @@ in { home.packages = [ (inputs.llm-agents.packages.${pkgs.stdenv.hostPlatform.system}.omp.overrideAttrs (old: { - patches = (old.patches or [ ]) ++ [ ../../patches/omp-fix-auth.patch ]; + patches = (old.patches or [ ]) ++ [ ]; })) ]; diff --git a/patches/omp-fix-auth.patch b/patches/omp-fix-auth.patch deleted file mode 100644 index 0864a4d..0000000 --- a/patches/omp-fix-auth.patch +++ /dev/null @@ -1,298 +0,0 @@ -commit 02b80dd74e2f962fffc9b0076bb7966eea4e45ff -Author: Simon Gardling -Date: Wed Apr 8 13:05:09 2026 -0400 - - Fix key reauth with parallel sessions - -diff --git a/packages/ai/CHANGELOG.md b/packages/ai/CHANGELOG.md -index 3f50b7bd4..248dacbff 100644 ---- a/packages/ai/CHANGELOG.md -+++ b/packages/ai/CHANGELOG.md -@@ -5,6 +5,10 @@ - - - Removed `coerceNullStrings` function and its automatic null-string coercion behavior from JSON parsing - -+### Fixed -+ -+- Fixed concurrent OAuth refresh token rotation race: when multiple instances share the same credential DB, one instance refreshing a token no longer causes other instances to permanently disable the credential on `invalid_grant` ([#607](https://github.com/can1357/oh-my-pi/issues/607)) -+ - ## [13.19.0] - 2026-04-05 - - ### Fixed -diff --git a/packages/ai/src/auth-storage.ts b/packages/ai/src/auth-storage.ts -index 9fdb4473b..fc81a6f3b 100644 ---- a/packages/ai/src/auth-storage.ts -+++ b/packages/ai/src/auth-storage.ts -@@ -1865,7 +1865,35 @@ export class AuthStorage { - }); - - if (isDefinitiveFailure) { -- // Permanently disable invalid credentials with an explicit cause for inspection/debugging -+ // Before permanently disabling, check if another instance already refreshed -+ // the token in the shared DB. Concurrent instances hold stale in-memory -+ // copies; refresh token rotation by one instance invalidates the token -+ // that other instances still hold. Re-read from DB before giving up. -+ if (/invalid_grant/i.test(errorMsg)) { -+ const entries = this.#getStoredCredentials(provider); -+ const entry = entries[selection.index]; -+ if (entry) { -+ const dbCredentials = this.#store.listAuthCredentials(provider); -+ const dbEntry = dbCredentials.find(row => row.id === entry.id); -+ if ( -+ dbEntry?.credential.type === "oauth" && -+ dbEntry.credential.refresh !== selection.credential.refresh -+ ) { -+ // DB has a newer refresh token β€” another instance refreshed. -+ // Update in-memory state and retry with the fresh credential. -+ logger.warn("Concurrent refresh detected, syncing from DB and retrying", { -+ provider, -+ index: selection.index, -+ rowId: entry.id, -+ }); -+ const updated = [...entries]; -+ updated[selection.index] = { id: entry.id, credential: dbEntry.credential }; -+ this.#setStoredCredentials(provider, updated); -+ return this.getApiKey(provider, sessionId, options); -+ } -+ } -+ } -+ // Genuinely invalid β€” disable the credential - this.#disableCredentialAt(provider, selection.index, `oauth refresh failed: ${errorMsg}`); - if (this.#getCredentialsForProvider(provider).some(credential => credential.type === "oauth")) { - return this.getApiKey(provider, sessionId, options); -diff --git a/packages/ai/test/auth-storage-refresh-race.test.ts b/packages/ai/test/auth-storage-refresh-race.test.ts -new file mode 100644 -index 000000000..5a8098a18 ---- /dev/null -+++ b/packages/ai/test/auth-storage-refresh-race.test.ts -@@ -0,0 +1,230 @@ -+import { Database } from "bun:sqlite"; -+import { afterEach, beforeEach, describe, expect, test, vi } from "bun:test"; -+import * as fs from "node:fs/promises"; -+import * as os from "node:os"; -+import * as path from "node:path"; -+import { AuthCredentialStore, AuthStorage, type OAuthCredential } from "../src/auth-storage"; -+import * as oauthUtils from "../src/utils/oauth"; -+import type { OAuthCredentials } from "../src/utils/oauth/types"; -+ -+/** -+ * Tests for the concurrent OAuth refresh token rotation race condition. -+ * -+ * When multiple omp instances share the same SQLite credential DB but hold -+ * independent in-memory caches, refresh token rotation by one instance -+ * invalidates the token that other instances still hold. Without the fix, -+ * the stale instance permanently disables the credential on `invalid_grant` -+ * even though a valid refresh token exists in the DB. -+ */ -+ -+function readDisabledCauses(dbPath: string, provider: string): string[] { -+ const db = new Database(dbPath, { readonly: true }); -+ try { -+ const rows = db -+ .prepare( -+ "SELECT disabled_cause FROM auth_credentials WHERE provider = ? AND disabled_cause IS NOT NULL ORDER BY id ASC", -+ ) -+ .all(provider) as Array<{ disabled_cause?: string | null }>; -+ return rows.flatMap(row => (typeof row.disabled_cause === "string" ? [row.disabled_cause] : [])); -+ } finally { -+ db.close(); -+ } -+} -+ -+function countActiveCredentials(dbPath: string, provider: string): number { -+ const db = new Database(dbPath, { readonly: true }); -+ try { -+ const row = db -+ .prepare("SELECT COUNT(*) AS count FROM auth_credentials WHERE provider = ? AND disabled_cause IS NULL") -+ .get(provider) as { count?: number } | undefined; -+ return row?.count ?? 0; -+ } finally { -+ db.close(); -+ } -+} -+ -+const EXPIRED_TOKEN_EXPIRES = Date.now() - 60_000; -+const FRESH_TOKEN_EXPIRES = Date.now() + 3_600_000; -+ -+function makeOAuthCredential(suffix: string, opts?: { expires?: number }): OAuthCredential { -+ return { -+ type: "oauth", -+ access: `access-${suffix}`, -+ refresh: `refresh-${suffix}`, -+ expires: opts?.expires ?? FRESH_TOKEN_EXPIRES, -+ accountId: "acct-shared", -+ email: "user@example.com", -+ }; -+} -+ -+describe("AuthStorage concurrent OAuth refresh token rotation race", () => { -+ let tempDir = ""; -+ let dbPath = ""; -+ let storeA: AuthCredentialStore | null = null; -+ let storeB: AuthCredentialStore | null = null; -+ let authStorageA: AuthStorage | null = null; -+ let authStorageB: AuthStorage | null = null; -+ -+ beforeEach(async () => { -+ tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "pi-ai-auth-refresh-race-")); -+ dbPath = path.join(tempDir, "agent.db"); -+ -+ // Both stores point at the same SQLite DB β€” simulates two omp instances -+ storeA = await AuthCredentialStore.open(dbPath); -+ storeB = await AuthCredentialStore.open(dbPath); -+ }); -+ -+ afterEach(async () => { -+ vi.restoreAllMocks(); -+ storeA?.close(); -+ storeB?.close(); -+ storeA = null; -+ storeB = null; -+ authStorageA = null; -+ authStorageB = null; -+ if (tempDir) { -+ await fs.rm(tempDir, { recursive: true, force: true }); -+ tempDir = ""; -+ } -+ }); -+ -+ test("instance B recovers from invalid_grant when instance A already refreshed", async () => { -+ if (!storeA || !storeB) throw new Error("test setup failed"); -+ -+ // Store an expired OAuth credential β€” both instances will need to refresh -+ const staleCredential = makeOAuthCredential("v1", { expires: EXPIRED_TOKEN_EXPIRES }); -+ authStorageA = new AuthStorage(storeA); -+ await authStorageA.set("anthropic", [staleCredential]); -+ -+ // Instance B loads same credential from DB into its own in-memory cache -+ authStorageB = new AuthStorage(storeB); -+ await authStorageB.reload(); -+ -+ // The refreshed credential that instance A will produce -+ const refreshedCredential: OAuthCredentials = { -+ access: "access-v2", -+ refresh: "refresh-v2", -+ expires: FRESH_TOKEN_EXPIRES, -+ accountId: "acct-shared", -+ email: "user@example.com", -+ }; -+ -+ // Mock both refresh paths: -+ // - refreshOAuthToken: called by pre-refresh in #resolveOAuthApiKey for expired tokens -+ // - getOAuthApiKey: called by #tryOAuthCredential for the actual token exchange -+ const refreshSpy = vi.spyOn(oauthUtils, "refreshOAuthToken"); -+ const getApiKeySpy = vi.spyOn(oauthUtils, "getOAuthApiKey"); -+ -+ // Step 1: Instance A refreshes successfully -+ refreshSpy.mockImplementation(async (_provider, credential) => { -+ return { ...credential, ...refreshedCredential }; -+ }); -+ getApiKeySpy.mockImplementation(async (_provider, credentials) => { -+ const cred = credentials.anthropic as OAuthCredentials | undefined; -+ if (!cred) return null; -+ return { newCredentials: refreshedCredential, apiKey: "sk-ant-new-key" }; -+ }); -+ -+ const keyA = await authStorageA.getApiKey("anthropic", "session-a"); -+ expect(keyA).toBe("sk-ant-new-key"); -+ -+ // DB now has refreshed credential from instance A. -+ // Instance B still has stale refresh-v1 in memory. -+ -+ // Step 2: Instance B tries to refresh with stale token. -+ // The pre-refresh (refreshOAuthToken) runs first, then #tryOAuthCredential calls getOAuthApiKey. -+ // Both throw invalid_grant for stale tokens. After DB re-read, retry with fresh token succeeds. -+ let getApiKeyCallCount = 0; -+ refreshSpy.mockImplementation(async (_provider, credential) => { -+ if (credential.refresh === "refresh-v1") { -+ throw new Error("invalid_grant: Refresh token not found or invalid"); -+ } -+ return { ...credential, ...refreshedCredential }; -+ }); -+ getApiKeySpy.mockImplementation(async (_provider, credentials) => { -+ const cred = credentials.anthropic as OAuthCredentials | undefined; -+ if (!cred) return null; -+ getApiKeyCallCount++; -+ -+ if (cred.refresh === "refresh-v1") { -+ // Stale token β€” Anthropic would return invalid_grant -+ throw new Error("invalid_grant: Refresh token not found or invalid"); -+ } -+ if (cred.refresh === "refresh-v2") { -+ // Fresh token from instance A β€” success -+ return { newCredentials: refreshedCredential, apiKey: "sk-ant-new-key-b" }; -+ } -+ return null; -+ }); -+ -+ const keyB = await authStorageB.getApiKey("anthropic", "session-b"); -+ -+ // The credential must NOT be disabled β€” instance B should have recovered -+ expect(keyB).toBeDefined(); -+ expect(typeof keyB).toBe("string"); -+ -+ // DB should still have exactly 1 active credential, none disabled -+ expect(countActiveCredentials(dbPath, "anthropic")).toBe(1); -+ expect(readDisabledCauses(dbPath, "anthropic")).toEqual([]); -+ // The getOAuthApiKey mock must have been called at least twice: once with stale, once with fresh -+ expect(getApiKeyCallCount).toBeGreaterThanOrEqual(2); -+ }); -+ -+ test("credential is still disabled when DB has same stale token (genuine failure)", async () => { -+ if (!storeA || !storeB) throw new Error("test setup failed"); -+ -+ // Store an expired credential β€” only one instance, no concurrent refresh -+ const staleCredential = makeOAuthCredential("v1", { expires: EXPIRED_TOKEN_EXPIRES }); -+ authStorageA = new AuthStorage(storeA); -+ await authStorageA.set("anthropic", [staleCredential]); -+ -+ // Mock: always fail with invalid_grant (genuinely revoked token) -+ vi.spyOn(oauthUtils, "refreshOAuthToken").mockImplementation(async () => { -+ throw new Error("invalid_grant: Refresh token not found or invalid"); -+ }); -+ vi.spyOn(oauthUtils, "getOAuthApiKey").mockImplementation(async () => { -+ throw new Error("invalid_grant: Refresh token not found or invalid"); -+ }); -+ -+ const key = await authStorageA.getApiKey("anthropic", "session-a"); -+ -+ // Should return undefined β€” no valid credentials -+ expect(key).toBeUndefined(); -+ -+ // Credential should be disabled in DB -+ const causes = readDisabledCauses(dbPath, "anthropic"); -+ expect(causes.length).toBe(1); -+ expect(causes[0]).toContain("invalid_grant"); -+ }); -+ -+ test("terminates when DB token matches stale token (no concurrent refresh)", async () => { -+ if (!storeA || !storeB) throw new Error("test setup failed"); -+ -+ // Both instances share the same stale credential β€” nobody refreshed -+ const staleCredential = makeOAuthCredential("v1", { expires: EXPIRED_TOKEN_EXPIRES }); -+ authStorageA = new AuthStorage(storeA); -+ await authStorageA.set("anthropic", [staleCredential]); -+ -+ // Instance B loads same stale credential -+ authStorageB = new AuthStorage(storeB); -+ await authStorageB.reload(); -+ -+ // Mock: always fail β€” the token is genuinely revoked, nobody refreshed -+ vi.spyOn(oauthUtils, "refreshOAuthToken").mockImplementation(async () => { -+ throw new Error("invalid_grant: Refresh token not found or invalid"); -+ }); -+ vi.spyOn(oauthUtils, "getOAuthApiKey").mockImplementation(async () => { -+ throw new Error("invalid_grant: Refresh token not found or invalid"); -+ }); -+ -+ // Instance B fails. DB has the same token (nobody refreshed), so the -+ // fix correctly falls through to disable instead of retrying forever. -+ const keyB = await authStorageB.getApiKey("anthropic", "session-b"); -+ expect(keyB).toBeUndefined(); -+ -+ // Credential should be disabled β€” the fix did not prevent a genuine failure -+ const causes = readDisabledCauses(dbPath, "anthropic"); -+ expect(causes.length).toBe(1); -+ expect(causes[0]).toContain("invalid_grant"); -+ }); -+}); From 982cc4aebc06b35b7a7cbb155635790709f54a28 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 16 Apr 2026 15:02:08 -0400 Subject: [PATCH 711/724] pull-update: use `writeShellApplication` instead --- system/pull-update.nix | 79 ++++++++++++++++++++++-------------------- 1 file changed, 41 insertions(+), 38 deletions(-) diff --git a/system/pull-update.nix b/system/pull-update.nix index f7b108e..3c3e100 100644 --- a/system/pull-update.nix +++ b/system/pull-update.nix @@ -7,50 +7,53 @@ let deploy-url = "https://nix-cache.sigkill.computer/deploy/${hostname}"; - pull-update = pkgs.writeShellScript "pull-update" '' - set -uo pipefail - export PATH=${ - pkgs.lib.makeBinPath [ - pkgs.curl - pkgs.coreutils - pkgs.nix - pkgs.systemd - pkgs.util-linux - ] - } + pull-update = pkgs.writeShellApplication { + name = "pull-update"; - # wait for actual connectivity, not just networkd "up" - for i in $(seq 1 30); do - if curl -sf --max-time 5 "${deploy-url}" >/dev/null; then - break + runtimeInputs = with pkgs; [ + pkgs.curl + pkgs.coreutils + pkgs.nix + pkgs.systemd + pkgs.util-linux + ]; + + text = '' + set -uo pipefail + + # wait for actual connectivity, not just networkd "up" + for i in $(seq 1 30); do + if curl -sf --max-time 5 "${deploy-url}" >/dev/null; then + break + fi + echo "Waiting for network... ($i/30)" + sleep 2 + done + + STORE_PATH=$(curl -sf --max-time 30 "${deploy-url}" || true) + + if [ -z "$STORE_PATH" ]; then + echo "Server unreachable or no deployment available, skipping" + exit 0 fi - echo "Waiting for network... ($i/30)" - sleep 2 - done - STORE_PATH=$(curl -sf --max-time 30 "${deploy-url}" || true) + CURRENT=$(readlink -f /nix/var/nix/profiles/system) + if [ "$CURRENT" = "$STORE_PATH" ]; then + echo "Already on latest configuration" + exit 0 + fi - if [ -z "$STORE_PATH" ]; then - echo "Server unreachable or no deployment available, skipping" - exit 0 - fi + echo "Update available: $CURRENT -> $STORE_PATH" - CURRENT=$(readlink -f /nix/var/nix/profiles/system) - if [ "$CURRENT" = "$STORE_PATH" ]; then - echo "Already on latest configuration" - exit 0 - fi + nix-store -r "$STORE_PATH" || { echo "Failed to fetch closure"; exit 1; } + nix-env -p /nix/var/nix/profiles/system --set "$STORE_PATH" || { echo "Failed to set profile"; exit 1; } + "$STORE_PATH/bin/switch-to-configuration" boot || { echo "Failed to install boot entry"; exit 1; } - echo "Update available: $CURRENT -> $STORE_PATH" - - nix-store -r "$STORE_PATH" || { echo "Failed to fetch closure"; exit 1; } - nix-env -p /nix/var/nix/profiles/system --set "$STORE_PATH" || { echo "Failed to set profile"; exit 1; } - "$STORE_PATH/bin/switch-to-configuration" boot || { echo "Failed to install boot entry"; exit 1; } - - wall "System update installed. Rebooting in 10 seconds..." - sleep 10 - systemctl reboot - ''; + wall "System update installed. Rebooting in 10 seconds..." + sleep 10 + systemctl reboot + ''; + }; in { systemd.services.pull-update = { From 0718568bec59dd38ace62ab16f8ede633b772763 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 16 Apr 2026 15:03:06 -0400 Subject: [PATCH 712/724] pull-update: forgot lib.getExe --- system/pull-update.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system/pull-update.nix b/system/pull-update.nix index 3c3e100..07c53fa 100644 --- a/system/pull-update.nix +++ b/system/pull-update.nix @@ -3,7 +3,7 @@ # records the output store path at /deploy/. On boot this # service fetches that path, pulls the closure from the binary cache, # sets it as the boot profile, and reboots into it. -{ pkgs, hostname, ... }: +{ pkgs, hostname, lib, ... }: let deploy-url = "https://nix-cache.sigkill.computer/deploy/${hostname}"; @@ -64,7 +64,7 @@ in restartIfChanged = false; serviceConfig = { Type = "oneshot"; - ExecStart = pull-update; + ExecStart = lib.getExe pull-update; }; }; } From 72d37f57ac237b59b86c7e96a8e5a9a0aa596a85 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 16 Apr 2026 16:31:49 -0400 Subject: [PATCH 713/724] update --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index cdf3ee2..6aabcd7 100644 --- a/flake.lock +++ b/flake.lock @@ -154,11 +154,11 @@ ] }, "locked": { - "lastModified": 1776331221, - "narHash": "sha256-I9HJO6ceghosCSraLRdAzz7f8pm+1zBo7sRVSvJbqUU=", + "lastModified": 1776362623, + "narHash": "sha256-GT9GB1EWzAS9sVxeqL8zEdXpBJFFp/qoklaVeLzL76o=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "23055e4c66f6b873d6d6299bf5a7fdfe6012be5c", + "rev": "1a0129b355cbc765ae868529997175a5af59959d", "type": "github" }, "original": { @@ -464,11 +464,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1776337800, - "narHash": "sha256-yZvCnzf0NDL1vfMGRBkKthRmg8V93FzQ4CQNXhxh0Wg=", + "lastModified": 1776368615, + "narHash": "sha256-JGGdvn645wseAbRzwT/Zz2Y0na7v2FZ7FogIyKIFkk8=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "3877b9fd1f78e831b3ea223f9e992c758d13df0f", + "rev": "7d67b9d0857c7efc7a6f9fc70982bdcb1e3d9a88", "type": "github" }, "original": { @@ -497,11 +497,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1776332135, - "narHash": "sha256-7cKy5sGmN4Yt47Op0+A/b3iEMk/E2Ru+UiI42KfiEPc=", + "lastModified": 1776363469, + "narHash": "sha256-MH7ieeYawsCAjGkoHFZfUDZXplEOiFgSpx2pGr5RK3c=", "owner": "YaLTeR", "repo": "niri", - "rev": "892470afd3dce5396828dd9b211b19210a16eaeb", + "rev": "82d4c7569e731379284e0653dcdadb8f17cceec7", "type": "github" }, "original": { From 5997c886f609dc6f0211f4e9d2dab558ac3a5483 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 16 Apr 2026 17:43:35 -0400 Subject: [PATCH 714/724] pull-update: improvement --- system/pull-update.nix | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/system/pull-update.nix b/system/pull-update.nix index 07c53fa..5bf03ed 100644 --- a/system/pull-update.nix +++ b/system/pull-update.nix @@ -3,7 +3,15 @@ # records the output store path at /deploy/. On boot this # service fetches that path, pulls the closure from the binary cache, # sets it as the boot profile, and reboots into it. -{ pkgs, hostname, lib, ... }: +# +# Runs before the display manager so the user sees progress on the +# console instead of staring at a frozen Steam loading screen. +{ + pkgs, + hostname, + lib, + ... +}: let deploy-url = "https://nix-cache.sigkill.computer/deploy/${hostname}"; @@ -43,14 +51,19 @@ let exit 0 fi - echo "Update available: $CURRENT -> $STORE_PATH" + echo "" + echo "=====================================" + echo " System update available. Installing." + echo "=====================================" + echo "" nix-store -r "$STORE_PATH" || { echo "Failed to fetch closure"; exit 1; } nix-env -p /nix/var/nix/profiles/system --set "$STORE_PATH" || { echo "Failed to set profile"; exit 1; } "$STORE_PATH/bin/switch-to-configuration" boot || { echo "Failed to install boot entry"; exit 1; } - wall "System update installed. Rebooting in 10 seconds..." - sleep 10 + echo "" + echo "Update installed. Rebooting..." + echo "" systemctl reboot ''; }; @@ -60,11 +73,15 @@ in description = "Pull latest NixOS configuration from binary cache"; after = [ "network-online.target" ]; wants = [ "network-online.target" ]; + # run before the display manager so the message is visible on the console + before = [ "display-manager.service" ]; wantedBy = [ "multi-user.target" ]; restartIfChanged = false; serviceConfig = { Type = "oneshot"; ExecStart = lib.getExe pull-update; + StandardOutput = "journal+console"; + StandardError = "journal+console"; }; }; } From e40929018fcec00b9b3cf7e7cacacf6ad162f2c5 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 16 Apr 2026 18:02:02 -0400 Subject: [PATCH 715/724] eww: remove --- home-manager/desktop.nix | 4 - home-manager/progs/eww/config/eww.scss | 109 --------------- home-manager/progs/eww/config/eww.yuck | 1 - .../progs/eww/config/scripts/currentWindow.sh | 17 --- .../eww/config/scripts/currentWorkspace.sh | 3 - .../progs/eww/config/scripts/power_bat.rs | 58 -------- .../progs/eww/config/scripts/sound/getSink.sh | 2 - .../eww/config/scripts/sound/getVolume.sh | 22 --- .../progs/eww/config/scripts/wifiInfo.zsh | 23 ---- home-manager/progs/eww/config/statusbar.yuck | 130 ------------------ home-manager/progs/eww/eww.nix | 40 ------ home-manager/progs/eww/power_bat.nix | 4 - 12 files changed, 413 deletions(-) delete mode 100644 home-manager/progs/eww/config/eww.scss delete mode 100644 home-manager/progs/eww/config/eww.yuck delete mode 100755 home-manager/progs/eww/config/scripts/currentWindow.sh delete mode 100755 home-manager/progs/eww/config/scripts/currentWorkspace.sh delete mode 100755 home-manager/progs/eww/config/scripts/power_bat.rs delete mode 100755 home-manager/progs/eww/config/scripts/sound/getSink.sh delete mode 100755 home-manager/progs/eww/config/scripts/sound/getVolume.sh delete mode 100755 home-manager/progs/eww/config/scripts/wifiInfo.zsh delete mode 100644 home-manager/progs/eww/config/statusbar.yuck delete mode 100644 home-manager/progs/eww/eww.nix delete mode 100644 home-manager/progs/eww/power_bat.nix diff --git a/home-manager/desktop.nix b/home-manager/desktop.nix index 1aa044a..ab2b5a1 100644 --- a/home-manager/desktop.nix +++ b/home-manager/desktop.nix @@ -9,9 +9,6 @@ # niri wayland compositor ./progs/niri.nix - # statusbar - # ./progs/eww/eww.nix - # lockscreen ./progs/swaylock.nix @@ -29,5 +26,4 @@ # used by /etc/nixos logic to launch niri config.programs.niri.package ]; - } diff --git a/home-manager/progs/eww/config/eww.scss b/home-manager/progs/eww/config/eww.scss deleted file mode 100644 index 5f01ceb..0000000 --- a/home-manager/progs/eww/config/eww.scss +++ /dev/null @@ -1,109 +0,0 @@ -$background: #1e1e2e; -$pink: #f5c2e7; -$lavendar: #b4befe; -$red: #f38ba8; -$maroon: #eba0ac; -$peach: #fab387; -$yellow: #f9e2af; -$green: #a6e3a1; -$text: #cdd6f4; -$subtext: #a6adc8; -$surface: #585b70; - -* { - color: $text; - font-family: CaskaydiaCove Nerd Font Mono; - font-weight: 600; - font-size: 10pt; - padding: 0 1px; -} - -.red { - color: $red; -} - -.maroon { - color: $maroon; -} - -.peach { - color: $peach; -} - -.yellow { - color: $yellow; -} - -.green { - color: $green; -} - -.lavendar { - color: $lavendar; -} - -.symbol { - color: $lavendar; - font-size: 20px; -} - -.button { - * { - all: unset; - margin: 0 5px; - font-size: 14pt; - transition: color 0.2s ease-in-out; - } - - &:hover * { - color: $pink; - } -} - -.bluetooth * { - font-size: 10pt; - padding: 0 0.3em; -} - -.padded>*:not(:last-child) { - padding: 0 10px; - border-right: 1px solid $surface; -} - -.background { - border: 1px solid $pink; - background-color: $background; - border-radius: 12px; - opacity: 0.8; -} - -scale trough { - margin: 0 10px; - border: none; - background-color: #FFF; - min-height: 3px; - min-width: 100px; - - & slider { - box-shadow: none; - background-image: none; - border: none; - background-color: $pink; - min-width: 5pt; - min-height: 5pt; - margin: -5pt; - } - - & highlight { - border: none; - background-color: $lavendar; - } -} - -.clipboard { - color: $subtext; -} - -.time { - padding-right: 10px; -} \ No newline at end of file diff --git a/home-manager/progs/eww/config/eww.yuck b/home-manager/progs/eww/config/eww.yuck deleted file mode 100644 index 6ba5e8b..0000000 --- a/home-manager/progs/eww/config/eww.yuck +++ /dev/null @@ -1 +0,0 @@ -(include "./statusbar.yuck") diff --git a/home-manager/progs/eww/config/scripts/currentWindow.sh b/home-manager/progs/eww/config/scripts/currentWindow.sh deleted file mode 100755 index c57e8f0..0000000 --- a/home-manager/progs/eww/config/scripts/currentWindow.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/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" diff --git a/home-manager/progs/eww/config/scripts/currentWorkspace.sh b/home-manager/progs/eww/config/scripts/currentWorkspace.sh deleted file mode 100755 index 2ceab6c..0000000 --- a/home-manager/progs/eww/config/scripts/currentWorkspace.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env fish - -niri msg --json workspaces | jq -r '.[] | select(.is_focused == true) | .["id"]' diff --git a/home-manager/progs/eww/config/scripts/power_bat.rs b/home-manager/progs/eww/config/scripts/power_bat.rs deleted file mode 100755 index 77da27a..0000000 --- a/home-manager/progs/eww/config/scripts/power_bat.rs +++ /dev/null @@ -1,58 +0,0 @@ -#!/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 { - 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>(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 - ); -} \ No newline at end of file diff --git a/home-manager/progs/eww/config/scripts/sound/getSink.sh b/home-manager/progs/eww/config/scripts/sound/getSink.sh deleted file mode 100755 index b27a089..0000000 --- a/home-manager/progs/eww/config/scripts/sound/getSink.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env sh -wpctl inspect @DEFAULT_SINK@ | grep -E "^ +\* node\.description" | cut -d' ' -f6- | tr -d '"' diff --git a/home-manager/progs/eww/config/scripts/sound/getVolume.sh b/home-manager/progs/eww/config/scripts/sound/getVolume.sh deleted file mode 100755 index 13c42de..0000000 --- a/home-manager/progs/eww/config/scripts/sound/getVolume.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env bash -output=$(wpctl get-volume @DEFAULT_SINK@ | cut -d' ' -f2- | sed -E 's/\.//g' | sed 's/^0*//g') -count=$(echo "$output" | awk -F, '{print $1+0}') -muted=$(echo "$output" | cut -d'[' -f2 | cut -d ']' -f1) - -# if not muted, set to empty string -if [ "$muted" == "$count" ]; then - muted="" -fi - -color="green" -if ((count > 75)); then color="yellow"; fi -if ((count > 90)); then color="peach"; fi -if ((count > 100)); then color="maroon"; fi -if ((count > 110)); then color="red"; fi - -output="${count}%" -if [ "$muted" != "" ]; then - output="${output} [${muted}]" -fi - -echo "{\"count\":\"${output}\", \"color\":\"${color}\"}" diff --git a/home-manager/progs/eww/config/scripts/wifiInfo.zsh b/home-manager/progs/eww/config/scripts/wifiInfo.zsh deleted file mode 100755 index 4fa41e3..0000000 --- a/home-manager/progs/eww/config/scripts/wifiInfo.zsh +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env zsh -export CHARSET=ASCII -case $1 in - name) - nmcli -f IN-USE,SSID d w | grep '*' | sed 's/[\* ]//g' | cat - exit 0;; - strength) - str=$(nmcli -f ACTIVE,BARS d w | grep 'yes' | tr -d ' yesno') - case ${str: 0:-1} in - '****') - icon="󰀨"; colour="green";; - '***') - icon="σ°€₯"; colour="yellow";; - '**') - icon="σ°€’"; colour="peach";; - '*') - icon="󰀟"; colour="maroon";; - *) - icon="σ°€―"; colour="red";; - esac - echo "{\"icon\":\"$icon\",\"colour\":\"$colour\"}" - exit 0;; -esac diff --git a/home-manager/progs/eww/config/statusbar.yuck b/home-manager/progs/eww/config/statusbar.yuck deleted file mode 100644 index d570301..0000000 --- a/home-manager/progs/eww/config/statusbar.yuck +++ /dev/null @@ -1,130 +0,0 @@ -(defwindow 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) - (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))) - -(defpoll windowtitle :interval "1s" `scripts/currentWindow.sh`) - -(defwidget window-title [] - (label - :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" - }))) - - -(defpoll brightness :interval "1s" :run-while brightnessctl-open `brightnessctl -m | awk -F, '{print $4+0}'`) - - -(defvar brightnessctl-open false) -(defwidget brightness-ctl-opener [] - (eventbox :class "button" - (button - :onclick `${EWW_CMD} update brightnessctl-open=${!brightnessctl-open}` - "σ°ƒ "))) - -(defwidget wifi [] - (eventbox - :class "button ${wifi-strength.colour}" - (label - :text {wifi-strength.icon} - :tooltip "Connected To: ${wifi-name}"))) - -(defpoll wifi-strength :interval "10s" `scripts/wifiInfo.zsh strength`) -(defpoll wifi-name :interval "1m" `scripts/wifiInfo.zsh name`) - -(defwidget bluetooth [] - (eventbox - :class "bluetooth button ${ bluetooth-name != "" ? "green" : "lavendar" }" - :onclick `blueman-manager &` - (label - :text "${bluetooth-name} σ°‚―"))) - -; `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 - :space-evenly false - :class "time" - :tooltip {time.long} - (label :class "yellow" :text {time.hour}) - (label :text ":") - (label :class "yellow" :text {time.minute}))) - -(defpoll time :interval "1s" `date +'{"long":"%a %b %e %H:%M:%S %Z %Y","hour":"%H","minute":"%M"}'`) - -(defpoll powerstats :interval "2s" `power_bat`) - -(defwidget battery [] - (box :space-evenly false - :tooltip powerstats - (label - :text {EWW_BATTERY.BAT1.status == "Charging" ? "σ°‚„" : - EWW_BATTERY.BAT1.capacity >= 90 ? "󰁹" : - EWW_BATTERY.BAT1.capacity >= 80 ? "σ°‚‚" : - EWW_BATTERY.BAT1.capacity >= 70 ? "󰂁" : - EWW_BATTERY.BAT1.capacity >= 60 ? "σ°‚€" : - EWW_BATTERY.BAT1.capacity >= 50 ? "󰁿" : - EWW_BATTERY.BAT1.capacity >= 40 ? "󰁾" : - EWW_BATTERY.BAT1.capacity >= 30 ? "󰁽" : - EWW_BATTERY.BAT1.capacity >= 20 ? "󰁼" : - EWW_BATTERY.BAT1.capacity >= 10 ? "󰁻" : "󰁺" - } - :class { - EWW_BATTERY.BAT1.capacity >= 80 ? "green" : - EWW_BATTERY.BAT1.capacity >= 50 ? "yellow" : - EWW_BATTERY.BAT1.capacity >= 30 ? "peach" : - EWW_BATTERY.BAT1.capacity >= 10 ? "maroon" : "red" - }) - (label :text "${EWW_BATTERY.BAT1.capacity}%" :class "yellow"))) - - -(defpoll volumevalue :interval "1s" `scripts/sound/getVolume.sh`) -(defpoll volumesink :interval "1s" `scripts/sound/getSink.sh`) - -(defwidget volume [] - (eventbox :tooltip volumesink - :onclick `pwvucontrol &` - (label :text "${volumevalue.count}" :class {volumevalue.color}))) - - -(defpoll currentworkspace :interval "1s" `scripts/currentWorkspace.sh`) diff --git a/home-manager/progs/eww/eww.nix b/home-manager/progs/eww/eww.nix deleted file mode 100644 index 62f8f2b..0000000 --- a/home-manager/progs/eww/eww.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - 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}" - ]; - } - ]; -} diff --git a/home-manager/progs/eww/power_bat.nix b/home-manager/progs/eww/power_bat.nix deleted file mode 100644 index ec9f886..0000000 --- a/home-manager/progs/eww/power_bat.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ pkgs, lib, ... }: -pkgs.writeShellScriptBin "power_bat" '' - exec ${lib.getExe pkgs.rust-script} ${./config/scripts/power_bat.rs} "$@" -'' From c23240c5299216c2c0893f76c8b6f3334ce3eab7 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 16 Apr 2026 22:28:49 -0400 Subject: [PATCH 716/724] yarn: move pull-update into steamos-update script --- system/pull-update.nix | 87 -------------------------- system/system-yarn.nix | 138 ++++++++++++++++++++++++++--------------- 2 files changed, 87 insertions(+), 138 deletions(-) delete mode 100644 system/pull-update.nix diff --git a/system/pull-update.nix b/system/pull-update.nix deleted file mode 100644 index 5bf03ed..0000000 --- a/system/pull-update.nix +++ /dev/null @@ -1,87 +0,0 @@ -# Pull-based NixOS updates for hosts that can't be pushed to reliably. -# CI builds the system closure on muffin (which Harmonia serves), then -# records the output store path at /deploy/. On boot this -# service fetches that path, pulls the closure from the binary cache, -# sets it as the boot profile, and reboots into it. -# -# Runs before the display manager so the user sees progress on the -# console instead of staring at a frozen Steam loading screen. -{ - pkgs, - hostname, - lib, - ... -}: -let - deploy-url = "https://nix-cache.sigkill.computer/deploy/${hostname}"; - - pull-update = pkgs.writeShellApplication { - name = "pull-update"; - - runtimeInputs = with pkgs; [ - pkgs.curl - pkgs.coreutils - pkgs.nix - pkgs.systemd - pkgs.util-linux - ]; - - text = '' - set -uo pipefail - - # wait for actual connectivity, not just networkd "up" - for i in $(seq 1 30); do - if curl -sf --max-time 5 "${deploy-url}" >/dev/null; then - break - fi - echo "Waiting for network... ($i/30)" - sleep 2 - done - - STORE_PATH=$(curl -sf --max-time 30 "${deploy-url}" || true) - - if [ -z "$STORE_PATH" ]; then - echo "Server unreachable or no deployment available, skipping" - exit 0 - fi - - CURRENT=$(readlink -f /nix/var/nix/profiles/system) - if [ "$CURRENT" = "$STORE_PATH" ]; then - echo "Already on latest configuration" - exit 0 - fi - - echo "" - echo "=====================================" - echo " System update available. Installing." - echo "=====================================" - echo "" - - nix-store -r "$STORE_PATH" || { echo "Failed to fetch closure"; exit 1; } - nix-env -p /nix/var/nix/profiles/system --set "$STORE_PATH" || { echo "Failed to set profile"; exit 1; } - "$STORE_PATH/bin/switch-to-configuration" boot || { echo "Failed to install boot entry"; exit 1; } - - echo "" - echo "Update installed. Rebooting..." - echo "" - systemctl reboot - ''; - }; -in -{ - systemd.services.pull-update = { - description = "Pull latest NixOS configuration from binary cache"; - after = [ "network-online.target" ]; - wants = [ "network-online.target" ]; - # run before the display manager so the message is visible on the console - before = [ "display-manager.service" ]; - wantedBy = [ "multi-user.target" ]; - restartIfChanged = false; - serviceConfig = { - Type = "oneshot"; - ExecStart = lib.getExe pull-update; - StandardOutput = "journal+console"; - StandardError = "journal+console"; - }; - }; -} diff --git a/system/system-yarn.nix b/system/system-yarn.nix index 6a0f0c7..58e661d 100644 --- a/system/system-yarn.nix +++ b/system/system-yarn.nix @@ -11,7 +11,6 @@ ./disk_yarn.nix ./common.nix ./impermanence.nix - ./pull-update.nix ./no-rgb.nix ./vr.nix @@ -97,65 +96,102 @@ # 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 + ( + final: prev: + let + deploy-url = "https://nix-cache.sigkill.computer/deploy/yarn"; - # 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-update-script = final.writeShellScript "steamos-update" '' + export PATH=${ + final.lib.makeBinPath [ + final.curl + final.coreutils + final.nix + ] + } - # steamos-reboot: reboot the system - cat > $out/bin/steamos-reboot << 'STUB' - #!/bin/sh - >&2 echo "[JOVIAN] $0: stub called with: $*" - systemctl reboot - STUB + STORE_PATH=$(curl -sf --max-time 30 "${deploy-url}" || true) - # 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 + if [ -z "$STORE_PATH" ]; then + >&2 echo "[steamos-update] server unreachable" + exit 7 + fi - # 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 + CURRENT=$(readlink -f /nix/var/nix/profiles/system) + if [ "$CURRENT" = "$STORE_PATH" ]; then + >&2 echo "[steamos-update] no update available" + exit 7 + fi - # 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 + # check-only mode: just report that an update exists + if [ "''${1:-}" = "check" ] || [ "''${1:-}" = "--check-only" ]; then + >&2 echo "[steamos-update] update available" + exit 0 + fi - # pkexec: pass through to real pkexec - cat > $out/bin/pkexec << 'STUB' - #!/bin/sh - exec /run/wrappers/bin/pkexec "$@" - STUB + >&2 echo "[steamos-update] downloading update..." + nix-store -r "$STORE_PATH" || { >&2 echo "[steamos-update] fetch failed"; exit 1; } - # sudo: pass through to doas - cat > $out/bin/sudo << 'STUB' - #!/bin/sh - exec /run/wrappers/bin/doas "$@" - STUB + >&2 echo "[steamos-update] installing update..." + nix-env -p /nix/var/nix/profiles/system --set "$STORE_PATH" || { >&2 echo "[steamos-update] profile set failed"; exit 1; } + "$STORE_PATH/bin/switch-to-configuration" boot || { >&2 echo "[steamos-update] boot entry failed"; exit 1; } - chmod 755 $out/bin/* + >&2 echo "[steamos-update] update installed, reboot to apply" ''; - }; - }) + in + { + jovian-stubs = prev.stdenv.mkDerivation { + name = "jovian-stubs"; + dontUnpack = true; + installPhase = '' + mkdir -p $out/bin + ln -s ${steamos-update-script} $out/bin/steamos-update + + # 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 = { From 0b457b83d301ad495100cf1e3f9e6b2ffd5e3c2e Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 16 Apr 2026 22:53:11 -0400 Subject: [PATCH 717/724] fix build --- system/system-yarn.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/system-yarn.nix b/system/system-yarn.nix index 58e661d..5558048 100644 --- a/system/system-yarn.nix +++ b/system/system-yarn.nix @@ -187,7 +187,7 @@ exec /run/wrappers/bin/doas "$@" STUB - chmod 755 $out/bin/* + find $out/bin -type f -exec chmod 755 {} + ''; }; } From ff94c3b0279c168b6c4571d720cf62f1bcc1cb4a Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 16 Apr 2026 23:05:24 -0400 Subject: [PATCH 718/724] steamos-update: exit 0 not 7 --- system/system-yarn.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/system-yarn.nix b/system/system-yarn.nix index 5558048..4c34027 100644 --- a/system/system-yarn.nix +++ b/system/system-yarn.nix @@ -120,7 +120,7 @@ CURRENT=$(readlink -f /nix/var/nix/profiles/system) if [ "$CURRENT" = "$STORE_PATH" ]; then >&2 echo "[steamos-update] no update available" - exit 7 + exit 0 fi # check-only mode: just report that an update exists From 29e71fb1270d0ab905b8c649cc1c02012dfd7e77 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 16 Apr 2026 23:46:13 -0400 Subject: [PATCH 719/724] ??!?!?!??! --- system/system-yarn.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/system/system-yarn.nix b/system/system-yarn.nix index 4c34027..f74be6c 100644 --- a/system/system-yarn.nix +++ b/system/system-yarn.nix @@ -146,6 +146,13 @@ installPhase = '' mkdir -p $out/bin ln -s ${steamos-update-script} $out/bin/steamos-update + ln -s ${steamos-update-script} $out/bin/steamos-mandatory-update + + # jupiter-initial-firmware-update: no-op (not a real steam deck) + cat > $out/bin/jupiter-initial-firmware-update << 'STUB' + #!/bin/sh + exit 0 + STUB # steamos-reboot: reboot the system cat > $out/bin/steamos-reboot << 'STUB' From 91aba32afbebb47188cc5162e685b0fe86b42e7c Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 17 Apr 2026 00:25:38 -0400 Subject: [PATCH 720/724] pi: update to claude opus 4.7 --- home-manager/progs/pi.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home-manager/progs/pi.nix b/home-manager/progs/pi.nix index 7f63280..da89c87 100644 --- a/home-manager/progs/pi.nix +++ b/home-manager/progs/pi.nix @@ -10,10 +10,10 @@ let # librarian/explore/quick β†’ smol/commit = haiku ompSettings = { modelRoles = { - default = "anthropic/claude-opus-4-6:high"; + default = "anthropic/claude-opus-4-7:high"; smol = "anthropic/claude-haiku-4-5:low"; - slow = "anthropic/claude-opus-4-6:xhigh"; - plan = "anthropic/claude-opus-4-6:high"; + slow = "anthropic/claude-opus-4-7:xhigh"; + plan = "anthropic/claude-opus-4-7:high"; commit = "anthropic/claude-haiku-4-5:low"; }; }; From 577b5eeb77fead8934dc6e0781a1a837258647e9 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 17 Apr 2026 12:33:33 -0400 Subject: [PATCH 721/724] update --- flake.lock | 78 +++++++++++++++++++++++++++--------------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/flake.lock b/flake.lock index 6aabcd7..4ce8a7b 100644 --- a/flake.lock +++ b/flake.lock @@ -79,11 +79,11 @@ "cachyos-kernel-patches": { "flake": false, "locked": { - "lastModified": 1776181525, - "narHash": "sha256-g07GhYlAOH0agNE8dIOT33vZ0eviF/HY5xgAQRwLytk=", + "lastModified": 1776355454, + "narHash": "sha256-b9Hc0sTxjEzDbphzS9yQqxVha/7bsPIs2cQQQvaG45E=", "owner": "CachyOS", "repo": "kernel-patches", - "rev": "fcd21edaf0ff9b69f9d32ea8590002d6acd1c503", + "rev": "b5e029226df5cc30c103651072d49a7af2878202", "type": "github" }, "original": { @@ -131,11 +131,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1776049930, - "narHash": "sha256-6nuelk+8qSRsh5Ryj9EpWOWXeeh/g3lI5mZsBfiFZQI=", + "lastModified": 1776400245, + "narHash": "sha256-RuQB1PxazI4DOw3O+rEVU2FPT0vP0Xb+Gp/M6Yqer20=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "5eb006f455f0558c97210ba7579880aacb045b67", + "rev": "860a91aaac235701f30b70fdc74259d438818968", "type": "github" }, "original": { @@ -154,11 +154,11 @@ ] }, "locked": { - "lastModified": 1776362623, - "narHash": "sha256-GT9GB1EWzAS9sVxeqL8zEdXpBJFFp/qoklaVeLzL76o=", + "lastModified": 1776417523, + "narHash": "sha256-ZkPxUTluK1R3us7wPk2cgg1orqEF6XijBPSupJQboEM=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "1a0129b355cbc765ae868529997175a5af59959d", + "rev": "f1d0032f0b9a95efab99f1be99c6054e18ed5039", "type": "github" }, "original": { @@ -175,11 +175,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1776312172, - "narHash": "sha256-jxZfeRd9mxqrLlsFc9+MLcqTy1eN1hQMLWhX0MJMno8=", + "lastModified": 1776398575, + "narHash": "sha256-WArU6WOdWxzbzGqYk4w1Mucg+bw/SCl6MoSp+/cZMio=", "owner": "rycee", "repo": "nur-expressions", - "rev": "501d3ee969edad2167e57a1499312cd4fdfdbc78", + "rev": "05815686caf4e3678f5aeb5fd36e567886ab0d30", "type": "gitlab" }, "original": { @@ -307,11 +307,11 @@ ] }, "locked": { - "lastModified": 1776184304, - "narHash": "sha256-No6QGBmIv5ChiwKCcbkxjdEQ/RO2ZS1gD7SFy6EZ7rc=", + "lastModified": 1776373306, + "narHash": "sha256-iAJIzHngGZeLIkjzuuWI6VBsYJ1n89a/Esq0m8R1vjs=", "owner": "nix-community", "repo": "home-manager", - "rev": "3c7524c68348ef79ce48308e0978611a050089b2", + "rev": "d401492e2acd4fea42f7705a3c266cea739c9c36", "type": "github" }, "original": { @@ -366,11 +366,11 @@ ] }, "locked": { - "lastModified": 1776335039, - "narHash": "sha256-2lkQhrv6YUCeMlC/lclzq9vkTALv/ptv7d0jIhZnrPQ=", + "lastModified": 1776428236, + "narHash": "sha256-+0SyQglnT2xUiyY07155G+O7aUWISELwqtTnfURufRU=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "cbdf76c063b48d5d755fb26540367b8c2457c2ca", + "rev": "eac78fc379ca47f7e21be8539c405e5fb489a857", "type": "github" }, "original": { @@ -437,11 +437,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1776351423, - "narHash": "sha256-JySMZu8hLD8kV2HerIZ6uZyrijc7SUaGhRAKH63X6R4=", + "lastModified": 1776437995, + "narHash": "sha256-wcV5CIe5s2IsSCGJdPqy/Q+gcBSR76JMaIQDNpLXZAk=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "1fb51dbe453f1c8ec5b7133df561512e43dc7cc2", + "rev": "c4a2f76e29485eaafc90eebec5ef12b50f4dc8a1", "type": "github" }, "original": { @@ -464,11 +464,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1776368615, - "narHash": "sha256-JGGdvn645wseAbRzwT/Zz2Y0na7v2FZ7FogIyKIFkk8=", + "lastModified": 1776435348, + "narHash": "sha256-qsZnMThxTqxCJZ7DEKu3DD3KjIPcuUBvZ0C9a2uIvaQ=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "7d67b9d0857c7efc7a6f9fc70982bdcb1e3d9a88", + "rev": "55b5b1fc9481ab267603a1099e5d4b4ebc7394d7", "type": "github" }, "original": { @@ -497,11 +497,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1776363469, - "narHash": "sha256-MH7ieeYawsCAjGkoHFZfUDZXplEOiFgSpx2pGr5RK3c=", + "lastModified": 1776432730, + "narHash": "sha256-Pq1ZVvRGq/IFiFH6vkNwMfZEpWk23NjgGdX50COdj/c=", "owner": "YaLTeR", "repo": "niri", - "rev": "82d4c7569e731379284e0653dcdadb8f17cceec7", + "rev": "c814c656c53ea9d69f5afb45c88f4dc4d25338cd", "type": "github" }, "original": { @@ -521,11 +521,11 @@ ] }, "locked": { - "lastModified": 1776278748, - "narHash": "sha256-mLvw1+fa6vr0C87XfX0ja8yZMx0H+HWL0ena2SBMdp8=", + "lastModified": 1776386586, + "narHash": "sha256-eVAUaL/6n8mnmBiPpEVW1NDNVSKLWhYVfycG+P0SvWU=", "owner": "xddxdd", "repo": "nix-cachyos-kernel", - "rev": "65eaf1492a6f0850ef2f08943c6bfc59b144e72a", + "rev": "c65c3faf90ae07bae101c15ef502f0bcb06c5d74", "type": "github" }, "original": { @@ -547,11 +547,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1776333106, - "narHash": "sha256-RR8gh+adHxFzpDm0yqKOtJAao8zqRyBcj8O5N1iIuoc=", + "lastModified": 1776419397, + "narHash": "sha256-vmWJwNYtQFexLG6r/v8Dlou/5z8FbFCLo3QqZ/stLYQ=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "191a0107f4863132f723fdc0bf43b322fe849a0a", + "rev": "7623dd4adbdf5f8a8464ecc5fd089e5c5cb5dada", "type": "github" }, "original": { @@ -740,11 +740,11 @@ ] }, "locked": { - "lastModified": 1776350315, - "narHash": "sha256-ijD4bgb5Iyap9F3MX73vLAZF/SYu+q7Gd7Ux4cbfCWw=", + "lastModified": 1776395632, + "narHash": "sha256-Mi1uF5f2FsdBIvy+v7MtsqxD3Xjhd0ARJdwoqqqPtJo=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "62e3b8aedabc240e5b0cc9fae003bc9edfebbc9b", + "rev": "8087ff1f47fff983a1fba70fa88b759f2fd8ae97", "type": "github" }, "original": { @@ -899,11 +899,11 @@ ] }, "locked": { - "lastModified": 1776317517, - "narHash": "sha256-JP1XVRabZquf7pnXvRUjp7DV+EBrB6Qmp3+vG3HMy/k=", + "lastModified": 1776403742, + "narHash": "sha256-ZmGY9XiOsuMS/THsSNkgp2fnc3asXQX/xRrQpWnY9nA=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "0a7be59e988bb2cb452080f59aaabae70bc415ae", + "rev": "ca7077bea5c830470437ea878da2a1940773324c", "type": "github" }, "original": { From 7f375e857488e040c8dda1764d82e47e998fd73f Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 17 Apr 2026 18:26:21 -0400 Subject: [PATCH 722/724] kernel: re-enable SND_PCI --- system/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/common.nix b/system/common.nix index eb283ed..a056908 100644 --- a/system/common.nix +++ b/system/common.nix @@ -165,7 +165,7 @@ # staging drivers (experimental/unmaintained) STAGING = lib.mkForce no; - SND_PCI = lib.mkForce no; + # SND_PCI stays β€” SND_HDA_INTEL (AMD HDA audio) lives under it ACCESSIBILITY = lib.mkForce no; MTD = lib.mkForce no; MEDIA_RC_SUPPORT = lib.mkForce no; From 0c881602e96abd16e1db14deffce823de39ef61f Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 17 Apr 2026 23:26:15 -0400 Subject: [PATCH 723/724] yarn: fix steamos update flow --- system/system-yarn.nix | 78 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 67 insertions(+), 11 deletions(-) diff --git a/system/system-yarn.nix b/system/system-yarn.nix index f74be6c..3698c01 100644 --- a/system/system-yarn.nix +++ b/system/system-yarn.nix @@ -75,12 +75,54 @@ # LACT (Linux AMDGPU Configuration Tool): https://github.com/ilya-zlobintsev/LACT environment.systemPackages = with pkgs; [ lact + jovian-stubs ]; systemd.packages = with pkgs; [ lact ]; systemd.services.lactd.wantedBy = [ "multi-user.target" ]; systemd.services.lactd.serviceConfig.ExecStartPre = "${lib.getExe pkgs.bash} -c \"sleep 3s\""; + # root-level service that applies a pending update. Triggered by + # steamos-update (via systemctl start) when the user accepts an update. + # Runs as root so it can write the system profile and boot entry. + systemd.services.pull-update-apply = { + description = "Apply pending NixOS update pulled from binary cache"; + serviceConfig = { + Type = "oneshot"; + ExecStart = pkgs.writeShellScript "pull-update-apply" '' + set -uo pipefail + export PATH=${ + pkgs.lib.makeBinPath [ + pkgs.curl + pkgs.coreutils + pkgs.nix + ] + } + STORE_PATH=$(curl -sf --max-time 30 "https://nix-cache.sigkill.computer/deploy/yarn" || true) + if [ -z "$STORE_PATH" ]; then + echo "server unreachable" + exit 1 + fi + echo "applying $STORE_PATH" + nix-store -r "$STORE_PATH" || { echo "fetch failed"; exit 1; } + nix-env -p /nix/var/nix/profiles/system --set "$STORE_PATH" || { echo "profile set failed"; exit 1; } + "$STORE_PATH/bin/switch-to-configuration" boot || { echo "boot entry failed"; exit 1; } + echo "update applied; reboot required" + ''; + }; + }; + + # Allow primary user to start pull-update-apply.service without a password + security.polkit.extraConfig = '' + polkit.addRule(function(action, subject) { + if (action.id == "org.freedesktop.systemd1.manage-units" && + action.lookup("unit") == "pull-update-apply.service" && + subject.user == "${username}") { + return polkit.Result.YES; + } + }); + ''; + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ @@ -106,7 +148,7 @@ final.lib.makeBinPath [ final.curl final.coreutils - final.nix + final.systemd ] } @@ -129,14 +171,15 @@ exit 0 fi - >&2 echo "[steamos-update] downloading update..." - nix-store -r "$STORE_PATH" || { >&2 echo "[steamos-update] fetch failed"; exit 1; } - - >&2 echo "[steamos-update] installing update..." - nix-env -p /nix/var/nix/profiles/system --set "$STORE_PATH" || { >&2 echo "[steamos-update] profile set failed"; exit 1; } - "$STORE_PATH/bin/switch-to-configuration" boot || { >&2 echo "[steamos-update] boot entry failed"; exit 1; } - - >&2 echo "[steamos-update] update installed, reboot to apply" + # apply: trigger the root-running systemd service to install the update + >&2 echo "[steamos-update] applying update..." + if systemctl start --wait pull-update-apply.service; then + >&2 echo "[steamos-update] update installed, reboot to apply" + exit 0 + else + >&2 echo "[steamos-update] apply failed; see 'journalctl -u pull-update-apply'" + exit 1 + fi ''; in { @@ -154,6 +197,12 @@ exit 0 STUB + # jupiter-biosupdate: no-op (not a real steam deck) + cat > $out/bin/jupiter-biosupdate << 'STUB' + #!/bin/sh + exit 0 + STUB + # steamos-reboot: reboot the system cat > $out/bin/steamos-reboot << 'STUB' #!/bin/sh @@ -188,10 +237,17 @@ exec /run/wrappers/bin/pkexec "$@" STUB - # sudo: pass through to doas + # sudo: strip flags and run the command directly (no escalation). + # privileged ops are delegated to root systemd services via systemctl. cat > $out/bin/sudo << 'STUB' #!/bin/sh - exec /run/wrappers/bin/doas "$@" + while [ $# -gt 0 ]; do + case "$1" in + -*) shift ;; + *) break ;; + esac + done + exec "$@" STUB find $out/bin -type f -exec chmod 755 {} + From e9a44f677d2852fd5856cecc49ecb984efeba66c Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 17 Apr 2026 23:26:43 -0400 Subject: [PATCH 724/724] update --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 4ce8a7b..1a1fb5c 100644 --- a/flake.lock +++ b/flake.lock @@ -154,11 +154,11 @@ ] }, "locked": { - "lastModified": 1776417523, - "narHash": "sha256-ZkPxUTluK1R3us7wPk2cgg1orqEF6XijBPSupJQboEM=", + "lastModified": 1776478519, + "narHash": "sha256-4TWCOVYe0iWEKuW7OH93nRI4Z7u68wNT6k9UJn0FZ5w=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "f1d0032f0b9a95efab99f1be99c6054e18ed5039", + "rev": "513e332b074507e1b46992952e7d83f329f2c22c", "type": "github" }, "original": { @@ -307,11 +307,11 @@ ] }, "locked": { - "lastModified": 1776373306, - "narHash": "sha256-iAJIzHngGZeLIkjzuuWI6VBsYJ1n89a/Esq0m8R1vjs=", + "lastModified": 1776454077, + "narHash": "sha256-7zSUFWsU0+jlD7WB3YAxQ84Z/iJurA5hKPm8EfEyGJk=", "owner": "nix-community", "repo": "home-manager", - "rev": "d401492e2acd4fea42f7705a3c266cea739c9c36", + "rev": "565e5349208fe7d0831ef959103c9bafbeac0681", "type": "github" }, "original": { @@ -437,11 +437,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1776437995, - "narHash": "sha256-wcV5CIe5s2IsSCGJdPqy/Q+gcBSR76JMaIQDNpLXZAk=", + "lastModified": 1776482297, + "narHash": "sha256-KmsWPwtbO8vrlH/R9stIun0LKZ4PFSCCEdqWDeLgbTE=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "c4a2f76e29485eaafc90eebec5ef12b50f4dc8a1", + "rev": "66c76393570f8fc4730caa2dc2d2c470fe33a3c9", "type": "github" }, "original": { @@ -740,11 +740,11 @@ ] }, "locked": { - "lastModified": 1776395632, - "narHash": "sha256-Mi1uF5f2FsdBIvy+v7MtsqxD3Xjhd0ARJdwoqqqPtJo=", + "lastModified": 1776481912, + "narHash": "sha256-Xq7p+Ex3YHFAd+fFFLOYw2Wv67582X7SAmrEDtIDZQ4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "8087ff1f47fff983a1fba70fa88b759f2fd8ae97", + "rev": "e611106c527e8ab0adbb641183cda284411d575c", "type": "github" }, "original": {