tristan/nix
1
0
Fork 0
Code Projects Releases Packages Activity

Compare commits

base: tristan:2e06f18f306487f9d0434829522392637671622f
Branches Tags
tristan:zenix/master
tristan:framework/master
tristan:alpine/master
..
compare: tristan:ce966f07827cd6bec7dc69bc7fc0a3e1d0fc8304
Branches Tags
tristan:framework/master
tristan:zenix/master
tristan:alpine/master

No commits in common. "2e06f18f306487f9d0434829522392637671622f" and "ce966f07827cd6bec7dc69bc7fc0a3e1d0fc8304" have entirely different histories.
2e06f18f30 ... ce966f0782

22 changed files with 210 additions and 163 deletions
Download patch file Download diff file Expand all files Collapse all files

201
flake.lock generated
View file

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

10
flake.nix
View file

@ -1,14 +1,14 @@
{ {
description = "A flake using my config"; description = "A flake using my config";
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-25.11"; nixpkgs.url = "nixpkgs/nixos-25.05";
musnix.url = "github:musnix/musnix"; musnix.url = "github:musnix/musnix";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-25.11"; url = "github:nix-community/home-manager/release-25.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
stylix = { stylix = {
url = "github:danth/stylix/release-25.11"; url = "github:danth/stylix/release-25.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
sops-nix = { sops-nix = {
@ -16,7 +16,7 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nixvim = { nixvim = {
url = "github:nix-community/nixvim/nixos-25.11"; url = "github:nix-community/nixvim/nixos-25.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
zen-browser = { zen-browser = {
@ -49,7 +49,7 @@
zenix = mkConf { zenix = mkConf {
nixos-modules = [ nixos-modules = [
./hardware/zenix.nix ./hardware/zenix.nix
./nixos/programs/hyprland.nix ./nixos/programs/niri.nix
./nixos/programs/gamer.nix ./nixos/programs/gamer.nix
./nixos/programs/personal.nix ./nixos/programs/personal.nix
./nixos/services/musnix.nix ./nixos/services/musnix.nix

44
hardware/zenix.nix
View file

@ -68,6 +68,10 @@
hardware.amdgpu = { hardware.amdgpu = {
opencl.enable = true; opencl.enable = true;
amdvlk = {
enable = true;
support32Bit.enable = true;
};
}; };
networking.hostName = "zenix"; networking.hostName = "zenix";
@ -81,26 +85,26 @@
home-manager.users.${user}.imports = [ home-manager.users.${user}.imports = [
{ {
home.stateVersion = "22.05"; home.stateVersion = "22.05";
# programs.niri.settings = { programs.niri.settings = {
# outputs."HP Inc. HP 24x 1CR9500W9Q" = { outputs."HP Inc. HP 24x 1CR9500W9Q" = {
# mode = { mode = {
# width = 1920; width = 1920;
# height = 1080; height = 1080;
# refresh = 143.855; refresh = 143.855;
# }; };
# variable-refresh-rate = true; variable-refresh-rate = true;
# scale = 1.0; scale = 1.0;
# }; };
# outputs."HDMI-A-1" = { outputs."HDMI-A-1" = {
# mode = { mode = {
# width = 3840; width = 3840;
# height = 2160; height = 2160;
# refresh = 120.0; refresh = 120.0;
# }; };
# variable-refresh-rate = true; variable-refresh-rate = true;
# scale = 2.5; scale = 2.5;
# }; };
# }; };
} }
]; ];
} }

2
home/default.nix
View file

@ -29,7 +29,7 @@
mosh mosh
ripgrep ripgrep
usbutils usbutils
dust du-dust
htop htop
btop btop
libsixel libsixel

7
home/desktop/hyprland/default.nix
View file

@ -33,10 +33,11 @@ in {
scroll_factor = 0.5; scroll_factor = 0.5;
}; };
kb_options = lib.mkDefault "caps:escape"; kb_options = lib.mkDefault "caps:escape";
kb_layout = lib.mkDefault "us"; kb_layout = lib.mkDefault "gb";
kb_variant = lib.mkDefault "dvorak";
numlock_by_default = true; numlock_by_default = true;
accel_profile = "flat"; };
gestures = {
workspace_swipe = true;
}; };
decoration = { decoration = {
rounding = 0; rounding = 0;

6
home/modules/email.nix
View file

@ -35,9 +35,9 @@ in {
} }
]; ];
programs.git.settings.user = { programs.git = {
name = config.home.userFullname; userName = config.home.userFullname;
email = cfg.email; userEmail = cfg.email;
}; };
accounts.email.accounts.${cfg.email} = lib.mkIf cfg.terminal { accounts.email.accounts.${cfg.email} = lib.mkIf cfg.terminal {

2
home/programs/gamer.nix
View file

@ -2,7 +2,7 @@
home.packages = with pkgs; [ home.packages = with pkgs; [
# Games # Games
airshipper airshipper
luanti minetest
superTuxKart superTuxKart
xonotic xonotic

8
home/programs/git.nix
View file

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

10
home/programs/graphical.nix
View file

@ -28,7 +28,7 @@
# other # other
element-desktop element-desktop
bitwarden-desktop bitwarden
inputs.zen-browser.packages.x86_64-linux.default inputs.zen-browser.packages.x86_64-linux.default
]; ];
@ -67,4 +67,12 @@
]; ];
}; };
programs.zed-editor = {
enable = true;
extensions = ["tsgo" "nix" "ansible" "helm"];
userSettings = {
vim_mode = true;
};
extraPackages = [pkgs.nixd pkgs.vtsls];
};
} }

1
home/programs/personal/default.nix
View file

@ -38,6 +38,7 @@
krita krita
organicmaps organicmaps
anki anki
bookworm
jellyfin-mpv-shim jellyfin-mpv-shim
]; ];
} }

7
home/programs/work.nix
View file

@ -14,7 +14,7 @@ in {
email = "tristan.beedell@cryoserver.com"; email = "tristan.beedell@cryoserver.com";
terminal = false; terminal = false;
}; };
programs.git.settings.extraConfig = { programs.git.extraConfig = {
"includeIf \"gitdir:~/Documents/personal/\"" = { "includeIf \"gitdir:~/Documents/personal/\"" = {
path = "~/Documents/personal/.gitconfig"; path = "~/Documents/personal/.gitconfig";
}; };
@ -44,8 +44,13 @@ in {
home.sessionVariables = { home.sessionVariables = {
CYPRESS_INSTALL_BINARY = 0; CYPRESS_INSTALL_BINARY = 0;
CYPRESS_RUN_BINARY = "${pkgs.cypress}/bin/Cypress"; CYPRESS_RUN_BINARY = "${pkgs.cypress}/bin/Cypress";
MONGOMS_SYSTEM_BINARY = lib.getExe' pkgs.mongodb-7_0 "mongod";
}; };
gtk.gtk3.bookmarks = [
"file:///home/tristan/OneDrive/ OneDrive"
];
programs.vscode = { programs.vscode = {
package = pkgs.vscode; package = pkgs.vscode;
profiles.default.extensions = with pkgs; [ profiles.default.extensions = with pkgs; [

2
home/programs/zsh.nix
View file

@ -7,7 +7,7 @@
programs.starship.enable = true; programs.starship.enable = true;
programs.zsh = { programs.zsh = {
enable = true; enable = true;
dotDir = "${config.xdg.configHome}/zsh"; dotDir = ".config/zsh";
history = { history = {
path = "${config.xdg.dataHome}/zsh/zsh_history"; path = "${config.xdg.dataHome}/zsh/zsh_history";
}; };

2
lib/mkconf.nix
View file

@ -30,7 +30,7 @@ in
users.${user}.imports = users.${user}.imports =
home-modules home-modules
++ [ ++ [
nixvim.homeModules.nixvim nixvim.homeManagerModules.nixvim
../home/. ../home/.
{ {
options.home.userFullname = nixpkgs.lib.mkOption {default = userFullname;}; options.home.userFullname = nixpkgs.lib.mkOption {default = userFullname;};

22
lib/nixvim.nix
View file

@ -294,6 +294,7 @@ in {
}; };
yamlls.enable = true; yamlls.enable = true;
gopls.enable = true; gopls.enable = true;
ansiblels.enable = true;
}; };
keymaps = { keymaps = {
lspBuf = { lspBuf = {
@ -358,6 +359,27 @@ in {
enable = true; enable = true;
folding = 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 = { oil = {
enable = true; enable = true;

6
nixos/modules/work.nix
View file

@ -11,10 +11,12 @@ in {
"vscode" "vscode"
"steam-run" "steam-run"
"postman" "postman"
"drawio" "drawio" # the creator had a hissyfit over a negative review: https://github.com/jgraph/drawio/discussions/4623
"mongodb"
]; ];
nixpkgs.config.permittedInsecurePackages = [ nixpkgs.config.permittedInsecurePackages = [
"openssl-1.1.1w" # required for mongodb
"electron-27.3.11" "electron-27.3.11"
]; ];
@ -29,6 +31,8 @@ in {
nixpkgs.overlays = [(import ../../lib/cypress.nix)]; nixpkgs.overlays = [(import ../../lib/cypress.nix)];
services.onedrive.enable = true;
users.users.${user}.extraGroups = ["docker"]; users.users.${user}.extraGroups = ["docker"];
virtualisation.docker = { virtualisation.docker = {
enable = true; enable = true;

13
nixos/programs/gamer.nix
View file

@ -1,4 +1,4 @@
{pkgs, ...}: { {...}: {
allowUnfreePkgNames = [ allowUnfreePkgNames = [
"steam" "steam"
"steam-unwrapped" "steam-unwrapped"
@ -27,15 +27,4 @@
capSysNice = true; capSysNice = true;
}; };
programs.gamemode.enable = 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
]);
};
} }

6
nixos/programs/personal.nix
View file

@ -1,4 +1,4 @@
{pkgs, ...}: { {...}: {
i18n.supportedLocales = [ i18n.supportedLocales = [
"eo/UTF-8" "eo/UTF-8"
"en_GB.UTF-8/UTF-8" "en_GB.UTF-8/UTF-8"
@ -9,8 +9,4 @@
enable = true; enable = true;
}; };
}; };
environment.systemPackages = with pkgs; [
warpinator
];
networking.firewall.allowedTCPPorts = [42000 42001];
} }

2
nixos/services/grafana.nix
View file

@ -61,7 +61,7 @@ in {
{ {
name = "synapse"; name = "synapse";
url = "https://raw.githubusercontent.com/element-hq/synapse/refs/heads/master/contrib/grafana/synapse.json"; url = "https://raw.githubusercontent.com/element-hq/synapse/refs/heads/master/contrib/grafana/synapse.json";
sha256 = "sha256:1lhhhzjm1rj25gg6dnmgwaxr05f8p2ndrlygdnjqzam7s6y75db3"; sha256 = "sha256:0yzj1i4zbjy9cms75ip6ad8qyjgv9kka42gxsbzyzr2syznsmqw0";
} }
]; ];
} }

14
nixos/services/prometheus.nix
View file

@ -3,7 +3,7 @@
nodes = [ nodes = [
"alpine" "alpine"
"100.106.49.128" # laptop "100.106.49.128" # laptop
"100.78.76.10" # gaming pc "100.65.29.110" # gaming pc
]; ];
addPort = ip: "${ip}:${toString prometheus.exporters.node.port}"; addPort = ip: "${ip}:${toString prometheus.exporters.node.port}";
in { in {
@ -68,13 +68,11 @@ in {
configuration = { configuration = {
route = { route = {
receiver = "alertmanager-ntfy"; receiver = "alertmanager-ntfy";
routes = [ routes = [{
{ matchers = [
matchers = [ ''node_filesystem_device_error != 0''
''node_filesystem_device_error != 0'' ];
]; }];
}
];
}; };
}; };
}; };

4
nixos/services/vaultwarden.nix
View file

@ -5,10 +5,6 @@ in {
services.vaultwarden = { services.vaultwarden = {
enable = true; enable = true;
backupDir = "/mnt/storage/backups/vaultwarden"; backupDir = "/mnt/storage/backups/vaultwarden";
config = {
ROCKET_ADDRESS = "::1";
ROCKET_PORT = 8222;
};
}; };
services.nginx.virtualHosts.${domain} = { services.nginx.virtualHosts.${domain} = {
forceSSL = true; forceSSL = true;

2
nixos/workstation.nix
View file

@ -69,7 +69,7 @@
}; };
emoji = { emoji = {
package = pkgs.noto-fonts-color-emoji; package = pkgs.noto-fonts-emoji;
name = "Noto Color Emoji"; name = "Noto Color Emoji";
}; };
}; };

2
pkgs/mpv-skipsilence.nix
View file

@ -10,7 +10,7 @@ buildLua {
src = fetchgit { src = fetchgit {
url = "https://codeberg.org/ferreum/mpv-skipsilence.git"; url = "https://codeberg.org/ferreum/mpv-skipsilence.git";
hash = "sha256-XmrVZRJAQctIiuznw/fQzs+9+QKOyTnJI2JOEWBWnVA="; hash = "sha256-+sOMWFFumJUk5gFE1iCTvWub3PWzYOkulXJLCGS4fYA=";
}; };
passthru.updateScript = gitUpdater {}; passthru.updateScript = gitUpdater {};