zenix: update, switch back to hyprland

zenix: resolve warnings
framework: update to 25.11
2026-01-02 14:01:12 +00:00 · 2026-01-02 13:29:25 +00:00 · 2025-12-03 11:35:37 +00:00 · 2025-11-03 15:39:47 +00:00 · 2025-10-24 15:30:00 +01:00 · 2025-10-24 10:51:32 +01:00
30 changed files with 291 additions and 270 deletions
--- a/flake.lock
+++ b/flake.lock
@ -5,11 +5,11 @@
        "fromYaml": "fromYaml"
      },
      "locked": {
-        "lastModified": 1746562888,
-        "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=",
+        "lastModified": 1755819240,
+        "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=",
        "owner": "SenchoPens",
        "repo": "base16.nix",
-        "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89",
+        "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6",
        "type": "github"
      },
      "original": {
@ -21,28 +21,28 @@
    "base16-fish": {
      "flake": false,
      "locked": {
-        "lastModified": 1754405784,
-        "narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=",
+        "lastModified": 1765809053,
+        "narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=",
        "owner": "tomyun",
        "repo": "base16-fish",
-        "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
+        "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782",
        "type": "github"
      },
      "original": {
        "owner": "tomyun",
        "repo": "base16-fish",
-        "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
+        "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782",
        "type": "github"
      }
    },
    "base16-helix": {
      "flake": false,
      "locked": {
-        "lastModified": 1748408240,
-        "narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=",
+        "lastModified": 1760703920,
+        "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=",
        "owner": "tinted-theming",
        "repo": "base16-helix",
-        "rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e",
+        "rev": "d646af9b7d14bff08824538164af99d0c521b185",
        "type": "github"
      },
      "original": {
@ -79,11 +79,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1760299432,
-        "narHash": "sha256-OEsLiZvC+WOssGIzUx0miuKsODlp7IGax8XVhNCw8wY=",
+        "lastModified": 1765831383,
+        "narHash": "sha256-P5F/VPjjGw7s0AOTPb3z3gxqtH0YkAnd/c9P6QdWrEU=",
        "owner": "HeitorAugustoLN",
        "repo": "cosmic-manager",
-        "rev": "a61b25313a83d32de4769fbb4026d93bde00b256",
+        "rev": "819d4d21fb90460dd11416d81d2cff65a53b8a59",
        "type": "github"
      },
      "original": {
@ -95,11 +95,11 @@
    "firefox-gnome-theme": {
      "flake": false,
      "locked": {
-        "lastModified": 1748383148,
-        "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=",
+        "lastModified": 1764724327,
+        "narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=",
        "owner": "rafaelmardojai",
        "repo": "firefox-gnome-theme",
-        "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf",
+        "rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047",
        "type": "github"
      },
      "original": {
@ -137,11 +137,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1759362264,
-        "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=",
+        "lastModified": 1765835352,
+        "narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "758cf7296bee11f1706a574c77d072b8a7baa881",
+        "rev": "a34fae9c08a15ad73f295041fec82323541400a9",
        "type": "github"
      },
      "original": {
@ -158,11 +158,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1749398372,
-        "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=",
+        "lastModified": 1763759067,
+        "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569",
+        "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
        "type": "github"
      },
      "original": {
@ -208,18 +208,20 @@
    "gnome-shell": {
      "flake": false,
      "locked": {
-        "lastModified": 1744584021,
-        "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=",
+        "host": "gitlab.gnome.org",
+        "lastModified": 1764524476,
+        "narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=",
        "owner": "GNOME",
        "repo": "gnome-shell",
-        "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae",
-        "type": "github"
+        "rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22",
+        "type": "gitlab"
      },
      "original": {
+        "host": "gitlab.gnome.org",
        "owner": "GNOME",
-        "ref": "48.1",
+        "ref": "gnome-49",
        "repo": "gnome-shell",
-        "type": "github"
+        "type": "gitlab"
      }
    },
    "home-manager": {
@ -229,16 +231,16 @@
        ]
      },
      "locked": {
-        "lastModified": 1758463745,
-        "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=",
+        "lastModified": 1767280655,
+        "narHash": "sha256-YmaYMduV5ko8zURUT1VLGDbVC1L/bxHS0NsiPoZ6bBM=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3",
+        "rev": "d49d2543f02dbd789ed032188c84570d929223cb",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "release-25.05",
+        "ref": "release-25.11",
        "repo": "home-manager",
        "type": "github"
      }
@ -276,11 +278,11 @@
        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1756852730,
-        "narHash": "sha256-qPere4RBHoZxiEGl8zXU8gjroZg4gkYGEwaAbKmL4vE=",
+        "lastModified": 1764554060,
+        "narHash": "sha256-vewrwjGqublgja1bvlIybRnlltKHLNlnP7WYDg+9h1Y=",
        "owner": "musnix",
        "repo": "musnix",
-        "rev": "7ccc92050e43dc92309396c6f2fe1f542214a242",
+        "rev": "599562080b2901046829ca69e0d1461041d27b32",
        "type": "github"
      },
      "original": {
@ -301,11 +303,11 @@
        "xwayland-satellite-unstable": "xwayland-satellite-unstable"
      },
      "locked": {
-        "lastModified": 1761187190,
-        "narHash": "sha256-5ln16iOeWpEX5MO7M3jzFEBNFE42gpFsCvSvPjtF6tQ=",
+        "lastModified": 1767257541,
+        "narHash": "sha256-eAZD0o5eC85jES3k8S0e1NlJJv+rTgofhl0QajhFjyM=",
        "owner": "sodiboo",
        "repo": "niri-flake",
-        "rev": "77a07f5d3b775fba67550c38122ebb8d3ee3ba1c",
+        "rev": "0eb70f38f02923ff59743a0978fed88f04c98c7d",
        "type": "github"
      },
      "original": {
@ -334,11 +336,11 @@
    "niri-unstable": {
      "flake": false,
      "locked": {
-        "lastModified": 1760940149,
-        "narHash": "sha256-KbM47vD6E0cx+v4jYQZ8mD5N186AKm2CQlyh34TW58U=",
+        "lastModified": 1767160009,
+        "narHash": "sha256-aTj88rDBdhmzaGXoFPOsHjXYM2OjNttixsGftT/X0dI=",
        "owner": "YaLTeR",
        "repo": "niri",
-        "rev": "b3245b81a6ed8edfaf5388a74d2e0a23c24941e5",
+        "rev": "cf0b4bc0ca93ab5c18b562ada1d8609b67b3c4e3",
        "type": "github"
      },
      "original": {
@ -349,11 +351,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1756542300,
-        "narHash": "sha256-tlOn88coG5fzdyqz6R93SQL5Gpq+m/DsWpekNFhqPQk=",
+        "lastModified": 1764242076,
+        "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "d7600c775f877cd87b4f5a831c28aa94137377aa",
+        "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4",
        "type": "github"
      },
      "original": {
@ -365,42 +367,42 @@
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1761016216,
-        "narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=",
+        "lastModified": 1767047869,
+        "narHash": "sha256-tzYsEzXEVa7op1LTnrLSiPGrcCY6948iD0EcNLWcmzo=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "481cf557888e05d3128a76f14c76397b7d7cc869",
+        "rev": "89dbf01df72eb5ebe3b24a86334b12c27d68016a",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "nixos-25.05",
+        "ref": "nixos-25.11",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1761016216,
-        "narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=",
+        "lastModified": 1767047869,
+        "narHash": "sha256-tzYsEzXEVa7op1LTnrLSiPGrcCY6948iD0EcNLWcmzo=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "481cf557888e05d3128a76f14c76397b7d7cc869",
+        "rev": "89dbf01df72eb5ebe3b24a86334b12c27d68016a",
        "type": "github"
      },
      "original": {
        "id": "nixpkgs",
-        "ref": "nixos-25.05",
+        "ref": "nixos-25.11",
        "type": "indirect"
      }
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1761114652,
-        "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=",
+        "lastModified": 1766070988,
+        "narHash": "sha256-G/WVghka6c4bAzMhTwT2vjLccg/awmHkdKSd2JrycLc=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c",
+        "rev": "c6245e83d836d0433170a16eb185cefe0572f8b8",
        "type": "github"
      },
      "original": {
@ -420,16 +422,16 @@
        "systems": "systems_2"
      },
      "locked": {
-        "lastModified": 1760795571,
-        "narHash": "sha256-gi+tWWAknKuTNso3yMeKsT9nj0jx+tuYF7g7nmLUWT8=",
+        "lastModified": 1766849711,
+        "narHash": "sha256-gtLBwhgjERca1UCzGkFplD5epIVRiNkePHVVtyFr73g=",
        "owner": "nix-community",
        "repo": "nixvim",
-        "rev": "6c945865ba5de87fa2d0dd8a0e66ca572ddf9043",
+        "rev": "cae79c48e93bd61e478dfc12456bf68b1ce66074",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "nixos-25.05",
+        "ref": "nixos-25.11",
        "repo": "nixvim",
        "type": "github"
      }
@ -443,15 +445,14 @@
        "nixpkgs": [
          "stylix",
          "nixpkgs"
-        ],
-        "treefmt-nix": "treefmt-nix"
+        ]
      },
      "locked": {
-        "lastModified": 1751320053,
-        "narHash": "sha256-3m6RMw0FbbaUUa01PNaMLoO7D99aBClmY5ed9V3vz+0=",
+        "lastModified": 1764773531,
+        "narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "cbde1735782f9c2bb2c63d5e05fba171a14a4670",
+        "rev": "1d9616689e98beded059ad0384b9951e967a17fa",
        "type": "github"
      },
      "original": {
@ -470,11 +471,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1760652422,
-        "narHash": "sha256-C88Pgz38QIl9JxQceexqL2G7sw9vodHWx1Uaq+NRJrw=",
+        "lastModified": 1761730856,
+        "narHash": "sha256-t1i5p/vSWwueZSC0Z2BImxx3BjoUDNKyC2mk24krcMY=",
        "owner": "NuschtOS",
        "repo": "search",
-        "rev": "3ebeebe8b6a49dfb11f771f761e0310f7c48d726",
+        "rev": "e29de6db0cb3182e9aee75a3b1fd1919d995d85b",
        "type": "github"
      },
      "original": {
@ -503,11 +504,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1760998189,
-        "narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=",
+        "lastModified": 1766894905,
+        "narHash": "sha256-pn8AxxfajqyR/Dmr1wnZYdUXHgM3u6z9x0Z1Ijmz2UQ=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3",
+        "rev": "61b39c7b657081c2adc91b75dd3ad8a91d6f07a7",
        "type": "github"
      },
      "original": {
@ -537,16 +538,16 @@
        "tinted-zed": "tinted-zed"
      },
      "locked": {
-        "lastModified": 1760478648,
-        "narHash": "sha256-Y4l+Y3zUvqIDbyLrtOrzNvp1o50Fp9TYK+iwtwweFU4=",
+        "lastModified": 1766603740,
+        "narHash": "sha256-F0BovrhzY/siRQYBRUFn2sZH7TJEuwetOJiGgKtITjk=",
        "owner": "danth",
        "repo": "stylix",
-        "rev": "1ec254101285777db13922303cc47ded06e10bb3",
+        "rev": "cfe89cabaae6ea1bbf80709bd53181494566a1b0",
        "type": "github"
      },
      "original": {
        "owner": "danth",
-        "ref": "release-25.05",
+        "ref": "release-25.11",
        "repo": "stylix",
        "type": "github"
      }
@ -632,11 +633,11 @@
    "tinted-schemes": {
      "flake": false,
      "locked": {
-        "lastModified": 1750770351,
-        "narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=",
+        "lastModified": 1763914658,
+        "narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=",
        "owner": "tinted-theming",
        "repo": "schemes",
-        "rev": "5a775c6ffd6e6125947b393872cde95867d85a2a",
+        "rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c",
        "type": "github"
      },
      "original": {
@ -648,11 +649,11 @@
    "tinted-tmux": {
      "flake": false,
      "locked": {
-        "lastModified": 1751159871,
-        "narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=",
+        "lastModified": 1764465359,
+        "narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=",
        "owner": "tinted-theming",
        "repo": "tinted-tmux",
-        "rev": "bded5e24407cec9d01bd47a317d15b9223a1546c",
+        "rev": "edf89a780e239263cc691a987721f786ddc4f6aa",
        "type": "github"
      },
      "original": {
@ -664,11 +665,11 @@
    "tinted-zed": {
      "flake": false,
      "locked": {
-        "lastModified": 1751158968,
-        "narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=",
+        "lastModified": 1764464512,
+        "narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=",
        "owner": "tinted-theming",
        "repo": "base16-zed",
-        "rev": "86a470d94204f7652b906ab0d378e4231a5b3384",
+        "rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a",
        "type": "github"
      },
      "original": {
@ -677,28 +678,6 @@
        "type": "github"
      }
    },
-    "treefmt-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "stylix",
-          "nur",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1733222881,
-        "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "49717b5af6f80172275d47a418c9719a31a78b53",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "type": "github"
-      }
-    },
    "xwayland-satellite-stable": {
      "flake": false,
      "locked": {
@ -719,11 +698,11 @@
    "xwayland-satellite-unstable": {
      "flake": false,
      "locked": {
-        "lastModified": 1761173223,
-        "narHash": "sha256-FumZh+fPRaKXkl9Y1uTh5KV7Io/AyOZso+UkqLhLArs=",
+        "lastModified": 1766429945,
+        "narHash": "sha256-9Kv4gWagx/u4RfZJzBMAoagW9ava5waxd+XoTkzqF7E=",
        "owner": "Supreeeme",
        "repo": "xwayland-satellite",
-        "rev": "bf745144acda1343934e9a094cf9458a54d57889",
+        "rev": "0dde7ca1d3a8e8c5082533d76084e2aa02bef70e",
        "type": "github"
      },
      "original": {
@ -737,11 +716,11 @@
        "nixpkgs": "nixpkgs_3"
      },
      "locked": {
-        "lastModified": 1761192367,
-        "narHash": "sha256-HdAtNWms1rrswlfuX5NUR9RYCMLUJHEzF986hQ0tUCw=",
+        "lastModified": 1767307876,
+        "narHash": "sha256-d5EKvUnfr6tdhymIThz0WGG0JHT2cCZzbZK4t2CwYuc=",
        "owner": "youwen5",
        "repo": "zen-browser-flake",
-        "rev": "1ce32754f78d1d7d6bf9cb44a48a06dac8bb6785",
+        "rev": "c5bffaf433e6137fe80cd1930584836f11119b26",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -1,14 +1,14 @@
 {
  description = "A flake using my config";
  inputs = {
-    nixpkgs.url = "nixpkgs/nixos-25.05";
+    nixpkgs.url = "nixpkgs/nixos-25.11";
    musnix.url = "github:musnix/musnix";
    home-manager = {
-      url = "github:nix-community/home-manager/release-25.05";
+      url = "github:nix-community/home-manager/release-25.11";
      inputs.nixpkgs.follows = "nixpkgs";
    };
    stylix = {
-      url = "github:danth/stylix/release-25.05";
+      url = "github:danth/stylix/release-25.11";
      inputs.nixpkgs.follows = "nixpkgs";
    };
    sops-nix = {
@ -16,7 +16,7 @@
      inputs.nixpkgs.follows = "nixpkgs";
    };
    nixvim = {
-      url = "github:nix-community/nixvim/nixos-25.05";
+      url = "github:nix-community/nixvim/nixos-25.11";
      inputs.nixpkgs.follows = "nixpkgs";
    };
    zen-browser = {
@ -49,7 +49,7 @@
      zenix = mkConf {
        nixos-modules = [
          ./hardware/zenix.nix
-          ./nixos/programs/niri.nix
+          ./nixos/programs/hyprland.nix
          ./nixos/programs/gamer.nix
          ./nixos/programs/personal.nix
          ./nixos/services/musnix.nix
@ -67,13 +67,11 @@
          ./hardware/framework-13.nix
          ./nixos/workstation.nix
          ./nixos/modules/work.nix
-          ./nixos/programs/cosmic.nix
          ./nixos/programs/niri.nix
        ];
        home-modules = [
          ./home/programs/work.nix
          ./home/programs/graphical.nix
-          ./home/desktop/cosmic/.
        ];
      };

--- a/hardware/framework-13.nix
+++ b/hardware/framework-13.nix
@ -57,6 +57,8 @@

  networking.hostName = "framework-13";

+  services.hardware.bolt.enable = true;
+
  system.stateVersion = "24.11"; # do not change
  home-manager.users.${config.user}.imports = [
    {
@ -77,6 +79,41 @@
          }
        '';
      };
+
+      programs.niri.settings.outputs = {
+        # Laptop display
+        "eDP-1" = {
+          mode = {
+            width = 2256;
+            height = 1504;
+            refresh = 59.999;
+          };
+        };
+        "HP Inc. HP 24x 1CR9500W9Q" = {
+          mode = {
+            width = 1920;
+            height = 1080;
+            refresh = 144.001;
+          };
+          scale = 1.0;
+          position = {
+            x = 2256;
+            y = 0;
+          };
+        };
+        "Ancor Communications Inc ASUS VS228 F3LMTF154813" = {
+          mode = {
+            width = 1920;
+            height = 1080;
+            refresh = 60.0;
+          };
+          scale = 1.0;
+          position = {
+            x = 2256 + 1920;
+            y = 0;
+          };
+        };
+      };
    }
  ];

--- a/hardware/zenix.nix
+++ b/hardware/zenix.nix
@ -68,10 +68,6 @@

  hardware.amdgpu = {
    opencl.enable = true;
-    amdvlk = {
-      enable = true;
-      support32Bit.enable = true;
-    };
  };

  networking.hostName = "zenix";
@ -85,26 +81,26 @@
  home-manager.users.${user}.imports = [
    {
      home.stateVersion = "22.05";
-      programs.niri.settings = {
-        outputs."HP Inc. HP 24x 1CR9500W9Q" = {
-          mode = {
-            width = 1920;
-            height = 1080;
-            refresh = 143.855;
-          };
-          variable-refresh-rate = true;
-          scale = 1.0;
-        };
-        outputs."HDMI-A-1" = {
-          mode = {
-            width = 3840;
-            height = 2160;
-            refresh = 120.0;
-          };
-          variable-refresh-rate = true;
-          scale = 2.5;
-        };
-      };
+      # programs.niri.settings = {
+      #   outputs."HP Inc. HP 24x 1CR9500W9Q" = {
+      #     mode = {
+      #       width = 1920;
+      #       height = 1080;
+      #       refresh = 143.855;
+      #     };
+      #     variable-refresh-rate = true;
+      #     scale = 1.0;
+      #   };
+      #   outputs."HDMI-A-1" = {
+      #     mode = {
+      #       width = 3840;
+      #       height = 2160;
+      #       refresh = 120.0;
+      #     };
+      #     variable-refresh-rate = true;
+      #     scale = 2.5;
+      #   };
+      # };
    }
  ];
 }
--- a/home/default.nix
+++ b/home/default.nix
@ -29,7 +29,7 @@
    mosh
    ripgrep
    usbutils
-    du-dust
+    dust
    htop
    btop
    libsixel
--- a/home/desktop/hyprland/default.nix
+++ b/home/desktop/hyprland/default.nix
@ -33,11 +33,10 @@ in {
          scroll_factor = 0.5;
        };
        kb_options = lib.mkDefault "caps:escape";
-        kb_layout = lib.mkDefault "gb";
+        kb_layout = lib.mkDefault "us";
+        kb_variant = lib.mkDefault "dvorak";
        numlock_by_default = true;
-      };
-      gestures = {
-        workspace_swipe = true;
+        accel_profile = "flat";
      };
      decoration = {
        rounding = 0;
--- a/home/desktop/utils/waybar.nix
+++ b/home/desktop/utils/waybar.nix
@ -42,17 +42,12 @@
          on-click = "pwvucontrol";
        };
        mpris = {
-          format = "{player_icon} {title}";
-          format-paused = "⏸️ {player_icon} {title}";
-          player-icons = {
-            default = "▶️";
-            mpd = "🎵";
-            kdeconnect = "☎️";
-          };
+          format = "▶️ {title}";
+          format-paused = "⏸️ {title}";
        };
        battery = {
          format = "{icon} {capacity}%";
-          format-icons = ["🤏" "🪫" "🔋" "🔋"];
+          format-icons = ["🪫" "🔋" "🔋"];
          format-charging = "🔌 {capacity}%";
          states = {
            warning = 30;
--- a/home/modules/email.nix
+++ b/home/modules/email.nix
@ -35,9 +35,9 @@ in {
      }
    ];

-    programs.git = {
-      userName = config.home.userFullname;
-      userEmail = cfg.email;
+    programs.git.settings.user = {
+      name = config.home.userFullname;
+      email = cfg.email;
    };

    accounts.email.accounts.${cfg.email} = lib.mkIf cfg.terminal {
--- a/home/programs/gamer.nix
+++ b/home/programs/gamer.nix
@ -2,7 +2,7 @@
  home.packages = with pkgs; [
    # Games
    airshipper
-    minetest
+    luanti
    superTuxKart
    xonotic

--- a/home/programs/git.nix
+++ b/home/programs/git.nix
@ -6,11 +6,11 @@
 }: {
  programs.git = {
    enable = true;
-    extraConfig = {
+    settings = {
      rerere.enabled = true;
      rebase.updateRefs = true;
    };
-    aliases = {
+    settings.aliases = {
      ui = "!lazygit";
      graph = "log --oneline --all --graph";
      amend = "commit --amend --no-edit";
@ -44,10 +44,8 @@
        git fetch origin $opts
      ''}/bin/bare-clone";
    };
-    difftastic = {
-      enable = true;
-    };
  };
+  programs.difftastic = {enable = true;};

  programs.lazygit = {
    enable = true;
--- a/home/programs/graphical.nix
+++ b/home/programs/graphical.nix
@ -28,7 +28,7 @@

    # other
    element-desktop
-    bitwarden
+    bitwarden-desktop

    inputs.zen-browser.packages.x86_64-linux.default
  ];
@ -67,12 +67,4 @@
    ];
  };

-  programs.zed-editor = {
-    enable = true;
-    extensions = ["tsgo" "nix" "ansible" "helm"];
-    userSettings = {
-      vim_mode = true;
-    };
-    extraPackages = [pkgs.nixd pkgs.vtsls];
-  };
 }
--- a/home/programs/personal/default.nix
+++ b/home/programs/personal/default.nix
@ -38,7 +38,6 @@
    krita
    organicmaps
    anki
-    bookworm
    jellyfin-mpv-shim
  ];
 }
--- a/home/programs/work.nix
+++ b/home/programs/work.nix
@ -1,6 +1,7 @@
 {
  config,
  pkgs,
+  lib,
  ...
 }: let
  modifier = config.windowManager.modifierKey;
@ -13,7 +14,7 @@ in {
    email = "tristan.beedell@cryoserver.com";
    terminal = false;
  };
-  programs.git.extraConfig = {
+  programs.git.settings.extraConfig = {
    "includeIf \"gitdir:~/Documents/personal/\"" = {
      path = "~/Documents/personal/.gitconfig";
    };
@ -43,13 +44,8 @@ in {
  home.sessionVariables = {
    CYPRESS_INSTALL_BINARY = 0;
    CYPRESS_RUN_BINARY = "${pkgs.cypress}/bin/Cypress";
-    MONGOMS_SYSTEM_BINARY = "${pkgs.callPackage ../../pkgs/mongodb.nix pkgs}/bin/mongod";
  };

-  gtk.gtk3.bookmarks = [
-    "file:///home/tristan/OneDrive/ OneDrive"
-  ];
-
  programs.vscode = {
    package = pkgs.vscode;
    profiles.default.extensions = with pkgs; [
--- a/home/programs/zsh.nix
+++ b/home/programs/zsh.nix
@ -7,7 +7,7 @@
  programs.starship.enable = true;
  programs.zsh = {
    enable = true;
-    dotDir = ".config/zsh";
+    dotDir = "${config.xdg.configHome}/zsh";
    history = {
      path = "${config.xdg.dataHome}/zsh/zsh_history";
    };
--- a/home/workstation.nix
+++ b/home/workstation.nix
@ -28,7 +28,6 @@
    playerctl
    quickemu
    devenv
-    bottles
  ];

  services.udiskie = {
--- a/lib/mkconf.nix
+++ b/lib/mkconf.nix
@ -30,7 +30,7 @@ in
            users.${user}.imports =
              home-modules
              ++ [
-                nixvim.homeManagerModules.nixvim
+                nixvim.homeModules.nixvim
                ../home/.
                {
                  options.home.userFullname = nixpkgs.lib.mkOption {default = userFullname;};
--- a/lib/nixvim.nix
+++ b/lib/nixvim.nix
@ -294,7 +294,6 @@ in {
        };
        yamlls.enable = true;
        gopls.enable = true;
-        ansiblels.enable = true;
      };
      keymaps = {
        lspBuf = {
@ -359,27 +358,6 @@ in {
      enable = true;
      folding = true;
    };
-    treesitter-textobjects = {
-      enable = true;
-      select = {
-        enable = true;
-        lookahead = true;
-        keymaps = {
-          "af" = {
-            query = "@function.outer";
-            desc = "Function Outer";
-          };
-          "ac" = {
-            query = "@comment.outer";
-            desc = "Comment Outer";
-          };
-          "if" = {
-            query = "@function.inner";
-            desc = "Function Inner";
-          };
-        };
-      };
-    };

    oil = {
      enable = true;
--- a/nixos/modules/work.nix
+++ b/nixos/modules/work.nix
@ -11,11 +11,10 @@ in {
    "vscode"
    "steam-run"
    "postman"
-    "drawio" # the creator had a hissyfit over a negative review: https://github.com/jgraph/drawio/discussions/4623
+    "drawio"
  ];

  nixpkgs.config.permittedInsecurePackages = [
-    "openssl-1.1.1w" # required for mongodb
    "electron-27.3.11"
  ];

@ -30,8 +29,6 @@ in {

  nixpkgs.overlays = [(import ../../lib/cypress.nix)];

-  services.onedrive.enable = true;
-
  users.users.${user}.extraGroups = ["docker"];
  virtualisation.docker = {
    enable = true;
--- a/nixos/programs/gamer.nix
+++ b/nixos/programs/gamer.nix
@ -1,4 +1,4 @@
-{...}: {
+{pkgs, ...}: {
  allowUnfreePkgNames = [
    "steam"
    "steam-unwrapped"
@ -27,4 +27,15 @@
    capSysNice = true;
  };
  programs.gamemode.enable = true;
+  nixpkgs.config.permittedInsecurePackages = [
+    "mbedtls-2.28.10"
+  ];
+  services.xserver.desktopManager.retroarch = {
+    enable = true;
+    package = pkgs.retroarch.withCores (cores:
+      with cores; [
+        bsnes
+        beetle-psx-hw
+      ]);
+  };
 }
--- a/nixos/programs/personal.nix
+++ b/nixos/programs/personal.nix
@ -1,4 +1,4 @@
-{...}: {
+{pkgs, ...}: {
  i18n.supportedLocales = [
    "eo/UTF-8"
    "en_GB.UTF-8/UTF-8"
@ -9,4 +9,8 @@
      enable = true;
    };
  };
+  environment.systemPackages = with pkgs; [
+    warpinator
+  ];
+  networking.firewall.allowedTCPPorts = [42000 42001];
 }
--- a/nixos/services/authentik.nix
+++ b/nixos/services/authentik.nix
@ -10,7 +10,7 @@
  };
  authentik-config = {
    autoStart = true;
-    image = "ghcr.io/goauthentik/server:2025.6.3";
+    image = "ghcr.io/goauthentik/server:2025.8.4";
    volumes = ["/home/tristan/pods/authentik/media:/media"];
    environment = {
      AUTHENTIK_POSTGRESQL__USER = postgres.user;
--- a/nixos/services/grafana.nix
+++ b/nixos/services/grafana.nix
@ -1,11 +1,23 @@
-{config, lib, pkgs, ...}: let
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
  cfg = config.services.grafana;
  secrets = config.sops.secrets;
-  mkDashboards = dashboards: pkgs.symlinkJoin {
+  mkDashboards = dashboards:
+    pkgs.symlinkJoin {
      name = "dashboards";
      paths = map mkDashboard dashboards;
    };
-  mkDashboard = {name, url, sha256, patch ? lib.id}: pkgs.writeTextFile {
+  mkDashboard = {
+    name,
+    url,
+    sha256,
+    patch ? lib.id,
+  }:
+    pkgs.writeTextFile {
      inherit name;
      text = patch (builtins.readFile (builtins.fetchurl {inherit url sha256;}));
      destination = "/dash/${name}.json";
@ -34,7 +46,8 @@ in {
        role_attribute_path = "contains(groups[*], 'Grafana Admins') && 'Admin' || contains(groups[*], 'Grafana Editors') && 'Editor' || 'Viewer'";
      };
    };
-    provision.dashboards.settings.providers = [{
+    provision.dashboards.settings.providers = [
+      {
        name = "Node Exporter";
        type = "file";
        options.path = mkDashboards [
@ -48,10 +61,11 @@ in {
          {
            name = "synapse";
            url = "https://raw.githubusercontent.com/element-hq/synapse/refs/heads/master/contrib/grafana/synapse.json";
-        sha256 = "sha256:16fl81sx1by0wldw4vda0zr1pvbq1dpih1fikzwlvmk63mpc80kb";
+            sha256 = "sha256:0yzj1i4zbjy9cms75ip6ad8qyjgv9kka42gxsbzyzr2syznsmqw0";
+          }
+        ];
      }
    ];
-    }];
  };
  services.nginx.virtualHosts = {
    ${cfg.settings.server.domain} = {
--- a/nixos/services/jellyfin.nix
+++ b/nixos/services/jellyfin.nix
@ -1,10 +1,11 @@
-{
+{pkgs, ...}: {
  users.groups.media = {};
  services.jellyfin = {
    enable = true;
    group = "media"; # access to user stuff
    openFirewall = true;
  };
+  environment.variables.JELLYFIN_FFMPEG = "${pkgs.jellyfin-ffmpeg}/bin/ffmpeg";
  services.nginx.virtualHosts."movies.tristans.cloud" = {
    forceSSL = true;
    enableACME = true;
--- a/nixos/services/mautrix/signal.nix
+++ b/nixos/services/mautrix/signal.nix
@ -1,10 +1,13 @@
-{config, lib, ...}: let
+{
+  config,
+  lib,
+  ...
+}: let
  inherit (import ./lib.nix) toAppRegistration;
  inherit (config.sops) templates placeholder;
 in {
-
  virtualisation.oci-containers.containers.mautrix-signal = {
-    image = "dock.mau.dev/mautrix/signal:v0.8.3";
+    image = "dock.mau.dev/mautrix/signal:v25.10";
    dependsOn = ["mautrix-signal-psql"];
    volumes = [
      "/home/tristan/pods/signal-bridge/mautrix-signal:/data:z"
@ -22,7 +25,6 @@ in {
  # 4. migrate db to local
  virtualisation.oci-containers.containers.mautrix-signal-psql = {
    image = "docker.io/postgres:14-alpine";
-    # ports = [ "127.0.0.1:5435:5432" ];
    ports = ["5435:5432"];
    volumes = ["/home/tristan/pods/signal-bridge/db:/var/lib/postgresql/data"];
    environmentFiles = [templates."mautrix-signal/psql.env".path];
@ -58,5 +60,4 @@ in {
  services.matrix-synapse.settings.app_service_config_files = [
    templates."mautrix-signal/appservice.yaml".path
  ];
-
 }
--- a/nixos/services/mautrix/whatsapp.nix
+++ b/nixos/services/mautrix/whatsapp.nix
@ -1,5 +1,4 @@
-{config, ...}:
-{
+{config, ...}: {
  nixpkgs.config.permittedInsecurePackages = [
    "olm-3.2.16"
  ];
@ -7,9 +6,9 @@
    enable = true;
    registerToSynapse = true;
    settings = {
-      appservice.database = {
-        type = "sqlite3";
-        uri = "/var/lib/mautrix-whatsapp/mautrix-whatsapp.db";
+      database = {
+        type = "sqlite3-fk-wal";
+        uri = "file:/var/lib/mautrix-whatsapp/mautrix-whatsapp.db?_txlock=immediate";
      };
      homeserver = {
        address = "http://localhost:8008";
@ -20,11 +19,12 @@
          "tristans.cloud" = "user";
          "@tristan:tristans.cloud" = "admin";
        };
+        personal_filtering_spaces = true;
+      };
      encryption = {
        allow = true;
        appservice = false;
-        };
-        personal_filtering_spaces = true;
+        pickle_key = "maunium.net/go/mautrix-whatsapp";
      };
    };
  };
--- a/nixos/services/monero.nix
+++ b/nixos/services/monero.nix
@ -8,9 +8,13 @@
    extraConfig = ''
      prune-blockchain=1
      confirm-external-bind=1
-      out-peers=64              # This will enable much faster sync and tx awareness; the default 8 is suboptimal nowadays
-      in-peers=1024             # The default is unlimited; we prefer to put a cap on this
+      out-peers=8
+      in-peers=16
      zmq-pub=tcp://localhost:18083
+      add-priority-node=p2pmd.xmrvsbeast.com:18080
+      add-priority-node=nodes.hashvault.pro:18080
+      enable-dns-blocklist=1
+      enforce-dns-checkpointing=1
    '';
  };
 }
--- a/nixos/services/prometheus.nix
+++ b/nixos/services/prometheus.nix
@ -3,7 +3,7 @@
  nodes = [
    "alpine"
    "100.106.49.128" # laptop
-    "100.65.29.110" # gaming pc
+    "100.78.76.10" # gaming pc
  ];
  addPort = ip: "${ip}:${toString prometheus.exporters.node.port}";
 in {
@ -68,11 +68,13 @@ in {
      configuration = {
        route = {
          receiver = "alertmanager-ntfy";
-          routes = [{
+          routes = [
+            {
              matchers = [
                ''node_filesystem_device_error != 0''
              ];
-          }];
+            }
+          ];
        };
      };
    };
--- a/nixos/services/synapse/default.nix
+++ b/nixos/services/synapse/default.nix
@ -36,6 +36,11 @@ in {
    "synapse/secrets.yaml" = {
      owner = "matrix-synapse";
      content = builtins.toJSON {
+        jwt_config = {
+          enabled = true;
+          secret = sops.placeholder."synapse/oidc_client_secret";
+          algorithm = "RS256";
+        };
        oidc_providers = [
          {
            idp_id = "authentik";
@ -84,6 +89,21 @@ in {
          ];
        }
      ];
+      # log_config = pkgs.writeTextFile {
+      #   name = "synapse-logging.json";
+      #   text = builtins.toJSON {
+      #     version = 1;
+      #     root = {
+      #       level = "INFO";
+      #       handlers = ["console"];
+      #     };
+      #     formatters.precise.format = "%(levelname)s - %(name)s - %(message)s";
+      #     handlers.console = {
+      #       class = "logging.StreamHandler";
+      #       formatter = "precise";
+      #     };
+      #   };
+      # };
    };
  };

--- a/nixos/workstation.nix
+++ b/nixos/workstation.nix
@ -22,6 +22,7 @@

  hardware.bluetooth.enable = true;
  services.blueman.enable = true;
+  services.power-profiles-daemon.enable = true;

  services.gnome.gnome-keyring.enable = true;

@ -68,7 +69,7 @@
      };

      emoji = {
-        package = pkgs.noto-fonts-emoji;
+        package = pkgs.noto-fonts-color-emoji;
        name = "Noto Color Emoji";
      };
    };
--- a/pkgs/mpv-skipsilence.nix
+++ b/pkgs/mpv-skipsilence.nix
@ -10,7 +10,7 @@ buildLua {

  src = fetchgit {
    url = "https://codeberg.org/ferreum/mpv-skipsilence.git";
-    hash = "sha256-+sOMWFFumJUk5gFE1iCTvWub3PWzYOkulXJLCGS4fYA=";
+    hash = "sha256-XmrVZRJAQctIiuznw/fQzs+9+QKOyTnJI2JOEWBWnVA=";
  };
  passthru.updateScript = gitUpdater {};
Author	SHA1	Message	Date
Tristan	c358881432	zenix: update, switch back to hyprland	2026-01-02 14:01:12 +00:00
Tristan	981cfea419	zenix: resolve warnings	2026-01-02 13:29:25 +00:00
Tristan	8a4b37e7ed	framework: update to 25.11	2025-12-03 11:35:37 +00:00
Tristan	ba4d4bba1b	zenix: add retroarch and warpinator	2025-11-03 15:39:47 +00:00
Tristan	ce966f0782	alpine: update authentik and mautrix	2025-10-24 15:30:00 +01:00
Tristan	e8ebe67ad1	merge zenix onto alpine	2025-10-24 10:51:32 +01:00
Tristan	b99aaf35bc	alpine: reconfig monero	2025-10-24 10:29:18 +01:00
Tristan	3ba1aecdb4	framework: merged updates	2025-09-08 16:27:09 +01:00
Tristan	893ff02339	framework: add thunderbolt dock	2025-09-05 08:46:35 +01:00
Tristan	7b6e53ea99	alpine: add jellyfin-ffmpeg (still manual config)	2025-08-30 15:32:49 +01:00