Compare commits
9 commits
3ba1aecdb4
...
8a4b37e7ed
| Author | SHA1 | Date | |
|---|---|---|---|
| 8a4b37e7ed | |||
| ce966f0782 | |||
| e8ebe67ad1 | |||
| b99aaf35bc | |||
| ece1abdd3e | |||
| dd63b17877 | |||
| 6c4eb248c4 | |||
| 9771065326 | |||
| 6b5f57c703 |
23 changed files with 240 additions and 236 deletions
220
flake.lock
generated
220
flake.lock
generated
|
|
@ -5,11 +5,11 @@
|
||||||
"fromYaml": "fromYaml"
|
"fromYaml": "fromYaml"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1746562888,
|
"lastModified": 1755819240,
|
||||||
"narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=",
|
"narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=",
|
||||||
"owner": "SenchoPens",
|
"owner": "SenchoPens",
|
||||||
"repo": "base16.nix",
|
"repo": "base16.nix",
|
||||||
"rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89",
|
"rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -21,27 +21,28 @@
|
||||||
"base16-fish": {
|
"base16-fish": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1622559957,
|
"lastModified": 1754405784,
|
||||||
"narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=",
|
"narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=",
|
||||||
"owner": "tomyun",
|
"owner": "tomyun",
|
||||||
"repo": "base16-fish",
|
"repo": "base16-fish",
|
||||||
"rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe",
|
"rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "tomyun",
|
"owner": "tomyun",
|
||||||
"repo": "base16-fish",
|
"repo": "base16-fish",
|
||||||
|
"rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"base16-helix": {
|
"base16-helix": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1748408240,
|
"lastModified": 1752979451,
|
||||||
"narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=",
|
"narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=",
|
||||||
"owner": "tinted-theming",
|
"owner": "tinted-theming",
|
||||||
"repo": "base16-helix",
|
"repo": "base16-helix",
|
||||||
"rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e",
|
"rev": "27cf1e66e50abc622fb76a3019012dc07c678fac",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -78,11 +79,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1744387566,
|
"lastModified": 1762776565,
|
||||||
"narHash": "sha256-O39zTv7LdRgr4Hw38d+eQG2LYpP75rw2XKqTGV5qzgs=",
|
"narHash": "sha256-Trd4uVhg9OggkxBMn3qUv74z9rNZE/s7iT7llTYQ0ZU=",
|
||||||
"owner": "HeitorAugustoLN",
|
"owner": "HeitorAugustoLN",
|
||||||
"repo": "cosmic-manager",
|
"repo": "cosmic-manager",
|
||||||
"rev": "52d3fdd080a9dd4639948687682a68282fbf0314",
|
"rev": "f26cdfef90b8db37db913f7c72a609c997700e59",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -94,11 +95,11 @@
|
||||||
"firefox-gnome-theme": {
|
"firefox-gnome-theme": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1748383148,
|
"lastModified": 1758112371,
|
||||||
"narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=",
|
"narHash": "sha256-lizRM2pj6PHrR25yimjyFn04OS4wcdbc38DCdBVa2rk=",
|
||||||
"owner": "rafaelmardojai",
|
"owner": "rafaelmardojai",
|
||||||
"repo": "firefox-gnome-theme",
|
"repo": "firefox-gnome-theme",
|
||||||
"rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf",
|
"rev": "0909cfe4a2af8d358ad13b20246a350e14c2473d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -115,11 +116,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1738453229,
|
"lastModified": 1759362264,
|
||||||
"narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
|
"narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
|
"rev": "758cf7296bee11f1706a574c77d072b8a7baa881",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -136,11 +137,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1754091436,
|
"lastModified": 1763759067,
|
||||||
"narHash": "sha256-XKqDMN1/Qj1DKivQvscI4vmHfDfvYR2pfuFOJiCeewM=",
|
"narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "67df8c627c2c39c41dbec76a1f201929929ab0bd",
|
"rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -157,11 +158,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1749398372,
|
"lastModified": 1756770412,
|
||||||
"narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=",
|
"narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569",
|
"rev": "4524271976b625a4a605beefd893f270620fd751",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -207,18 +208,20 @@
|
||||||
"gnome-shell": {
|
"gnome-shell": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1744584021,
|
"host": "gitlab.gnome.org",
|
||||||
"narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=",
|
"lastModified": 1762869044,
|
||||||
|
"narHash": "sha256-nwm/GJ2Syigf7VccLAZ66mFC8mZJFqpJmIxSGKl7+Ds=",
|
||||||
"owner": "GNOME",
|
"owner": "GNOME",
|
||||||
"repo": "gnome-shell",
|
"repo": "gnome-shell",
|
||||||
"rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae",
|
"rev": "680e3d195a92203f28d4bf8c6e8bb537cc3ed4ad",
|
||||||
"type": "github"
|
"type": "gitlab"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
"host": "gitlab.gnome.org",
|
||||||
"owner": "GNOME",
|
"owner": "GNOME",
|
||||||
"ref": "48.1",
|
"ref": "gnome-49",
|
||||||
"repo": "gnome-shell",
|
"repo": "gnome-shell",
|
||||||
"type": "github"
|
"type": "gitlab"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"home-manager": {
|
"home-manager": {
|
||||||
|
|
@ -228,16 +231,16 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756245065,
|
"lastModified": 1764736872,
|
||||||
"narHash": "sha256-aAZNbGcWrVRZgWgkQbkabSGcDVRDMgON4BipMy69gvI=",
|
"narHash": "sha256-4mqLegNQeD54X7enm6EI9aNWl6CaIfyhl5PaYoGYwqk=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "54b2879ce622d44415e727905925e21b8f833a98",
|
"rev": "3366918730bb6b699395a9d237397f1d710a94b3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"ref": "release-25.05",
|
"ref": "release-25.11",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|
@ -256,16 +259,16 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1748294338,
|
"lastModified": 1754860581,
|
||||||
"narHash": "sha256-FVO01jdmUNArzBS7NmaktLdGA5qA3lUMJ4B7a05Iynw=",
|
"narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=",
|
||||||
"owner": "NuschtOS",
|
"owner": "NuschtOS",
|
||||||
"repo": "ixx",
|
"repo": "ixx",
|
||||||
"rev": "cc5f390f7caf265461d4aab37e98d2292ebbdb85",
|
"rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NuschtOS",
|
"owner": "NuschtOS",
|
||||||
"ref": "v0.0.8",
|
"ref": "v0.1.1",
|
||||||
"repo": "ixx",
|
"repo": "ixx",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|
@ -275,11 +278,11 @@
|
||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": "nixpkgs"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1741303672,
|
"lastModified": 1764554060,
|
||||||
"narHash": "sha256-eRKbKccBu3PK/oJpmUuLo+0v45d0SEjosE8tVsHbpeA=",
|
"narHash": "sha256-vewrwjGqublgja1bvlIybRnlltKHLNlnP7WYDg+9h1Y=",
|
||||||
"owner": "musnix",
|
"owner": "musnix",
|
||||||
"repo": "musnix",
|
"repo": "musnix",
|
||||||
"rev": "d56a15f30329f304151e4e05fa82264d127da934",
|
"rev": "599562080b2901046829ca69e0d1461041d27b32",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -300,11 +303,11 @@
|
||||||
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
|
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756451209,
|
"lastModified": 1764721873,
|
||||||
"narHash": "sha256-zrFKbXArvNjUKYYd1I48cnvlgB6cGA/mFoRvgp/wRHc=",
|
"narHash": "sha256-EHMH54iI7MYYb7mUBE6JUtbbVhHTF7jtkuZ0Lo1bkBg=",
|
||||||
"owner": "sodiboo",
|
"owner": "sodiboo",
|
||||||
"repo": "niri-flake",
|
"repo": "niri-flake",
|
||||||
"rev": "cdfffe0b009582f5161dcd030a5549236287767b",
|
"rev": "f3935696628433007c582fc323730ba18f137a1d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -316,16 +319,16 @@
|
||||||
"niri-stable": {
|
"niri-stable": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1748151941,
|
"lastModified": 1756556321,
|
||||||
"narHash": "sha256-z4viQZLgC2bIJ3VrzQnR+q2F3gAOEQpU1H5xHtX/2fs=",
|
"narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=",
|
||||||
"owner": "YaLTeR",
|
"owner": "YaLTeR",
|
||||||
"repo": "niri",
|
"repo": "niri",
|
||||||
"rev": "8ba57fcf25d2fc9565131684a839d58703f1dae7",
|
"rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "YaLTeR",
|
"owner": "YaLTeR",
|
||||||
"ref": "v25.05.1",
|
"ref": "v25.08",
|
||||||
"repo": "niri",
|
"repo": "niri",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|
@ -333,11 +336,11 @@
|
||||||
"niri-unstable": {
|
"niri-unstable": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756448032,
|
"lastModified": 1764678181,
|
||||||
"narHash": "sha256-ZIRj8dt8FmJdQeJjNvyK1RirYBmun+e/K3TMG8Qdodc=",
|
"narHash": "sha256-TMs2Px19UAG06zITXAH7efl7X8G7BDyMCy1ilX/8wy0=",
|
||||||
"owner": "YaLTeR",
|
"owner": "YaLTeR",
|
||||||
"repo": "niri",
|
"repo": "niri",
|
||||||
"rev": "dfe463ed7dcf36cc706f5540c5d0804775b5c86b",
|
"rev": "f874b2fce50e0f7ba21e270c86cfa168a1506b82",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -348,11 +351,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1740695751,
|
"lastModified": 1764242076,
|
||||||
"narHash": "sha256-D+R+kFxy1KsheiIzkkx/6L63wEHBYX21OIwlFV8JvDs=",
|
"narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "6313551cd05425cd5b3e63fe47dbc324eabb15e4",
|
"rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -364,11 +367,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756217674,
|
"lastModified": 1764560356,
|
||||||
"narHash": "sha256-TH1SfSP523QI7kcPiNtMAEuwZR3Jdz0MCDXPs7TS8uo=",
|
"narHash": "sha256-M5aFEFPppI4UhdOxwdmceJ9bDJC4T6C6CzCK1E2FZyo=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "4e7667a90c167f7a81d906e5a75cba4ad8bee620",
|
"rev": "6c8f0cca84510cc79e09ea99a299c9bc17d03cb6",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -380,26 +383,26 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756469547,
|
"lastModified": 1764522689,
|
||||||
"narHash": "sha256-YvtD2E7MYsQ3r7K9K2G7nCslCKMPShoSEAtbjHLtH0k=",
|
"narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "41d292bfc37309790f70f4c120b79280ce40af16",
|
"rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"id": "nixpkgs",
|
"id": "nixpkgs",
|
||||||
"ref": "nixos-25.05",
|
"ref": "nixos-25.11",
|
||||||
"type": "indirect"
|
"type": "indirect"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756386758,
|
"lastModified": 1764517877,
|
||||||
"narHash": "sha256-1wxxznpW2CKvI9VdniaUnTT2Os6rdRJcRUf65ZK9OtE=",
|
"narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "dfb2f12e899db4876308eba6d93455ab7da304cd",
|
"rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -419,16 +422,16 @@
|
||||||
"systems": "systems_2"
|
"systems": "systems_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1755727480,
|
"lastModified": 1764755396,
|
||||||
"narHash": "sha256-eb9N7XFj1zirk+D2KV+rn/CjmVHDISlxhtZCWZEVpkM=",
|
"narHash": "sha256-f6UrlGdwg+TIxxyDjeq1M7WGNZH/vpbOm0yzPgkMy9c=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixvim",
|
"repo": "nixvim",
|
||||||
"rev": "6df0b97b39baa1c0b3002b051f307aed68e17d1b",
|
"rev": "64d9e2616f4ee2acee380d61ccf1f3d610e7e969",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"ref": "nixos-25.05",
|
"ref": "nixos-25.11",
|
||||||
"repo": "nixvim",
|
"repo": "nixvim",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|
@ -442,15 +445,14 @@
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"stylix",
|
"stylix",
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
],
|
]
|
||||||
"treefmt-nix": "treefmt-nix"
|
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1751320053,
|
"lastModified": 1758998580,
|
||||||
"narHash": "sha256-3m6RMw0FbbaUUa01PNaMLoO7D99aBClmY5ed9V3vz+0=",
|
"narHash": "sha256-VLx0z396gDCGSiowLMFz5XRO/XuNV+4EnDYjdJhHvUk=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NUR",
|
"repo": "NUR",
|
||||||
"rev": "cbde1735782f9c2bb2c63d5e05fba171a14a4670",
|
"rev": "ba8d9c98f5f4630bcb0e815ab456afd90c930728",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -469,11 +471,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1753771532,
|
"lastModified": 1761730856,
|
||||||
"narHash": "sha256-Pmpke0JtLRzgdlwDC5a+aiLVZ11JPUO5Bcqkj0nHE/k=",
|
"narHash": "sha256-t1i5p/vSWwueZSC0Z2BImxx3BjoUDNKyC2mk24krcMY=",
|
||||||
"owner": "NuschtOS",
|
"owner": "NuschtOS",
|
||||||
"repo": "search",
|
"repo": "search",
|
||||||
"rev": "2a65adaf2c0c428efb0f4a2bc406aab466e96a06",
|
"rev": "e29de6db0cb3182e9aee75a3b1fd1919d995d85b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -502,11 +504,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1754988908,
|
"lastModified": 1764483358,
|
||||||
"narHash": "sha256-t+voe2961vCgrzPFtZxha0/kmFSHFobzF00sT8p9h0U=",
|
"narHash": "sha256-EyyvCzXoHrbL467YSsQBTWWg4sR96MH1sPpKoSOelB4=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "3223c7a92724b5d804e9988c6b447a0d09017d48",
|
"rev": "5aca6ff67264321d47856a2ed183729271107c9c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -536,16 +538,16 @@
|
||||||
"tinted-zed": "tinted-zed"
|
"tinted-zed": "tinted-zed"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1755710103,
|
"lastModified": 1764695017,
|
||||||
"narHash": "sha256-VmheUy4UzWDy/u0TvCCHptgF30peL7wRxkHy7EVpDrQ=",
|
"narHash": "sha256-hJVPGt8MqRL0WHkNRclT4J1rJMurYsPw7dL8UwlFoaI=",
|
||||||
"owner": "danth",
|
"owner": "danth",
|
||||||
"repo": "stylix",
|
"repo": "stylix",
|
||||||
"rev": "79be65b20d7b8fb7e8f39ba8121cfe41b7f46808",
|
"rev": "a1e741dbce6e846129777c2a017e1354bc87b92b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "danth",
|
"owner": "danth",
|
||||||
"ref": "release-25.05",
|
"ref": "release-25.11",
|
||||||
"repo": "stylix",
|
"repo": "stylix",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|
@ -631,11 +633,11 @@
|
||||||
"tinted-schemes": {
|
"tinted-schemes": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1750770351,
|
"lastModified": 1757716333,
|
||||||
"narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=",
|
"narHash": "sha256-d4km8W7w2zCUEmPAPUoLk1NlYrGODuVa3P7St+UrqkM=",
|
||||||
"owner": "tinted-theming",
|
"owner": "tinted-theming",
|
||||||
"repo": "schemes",
|
"repo": "schemes",
|
||||||
"rev": "5a775c6ffd6e6125947b393872cde95867d85a2a",
|
"rev": "317a5e10c35825a6c905d912e480dfe8e71c7559",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -647,11 +649,11 @@
|
||||||
"tinted-tmux": {
|
"tinted-tmux": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1751159871,
|
"lastModified": 1757811970,
|
||||||
"narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=",
|
"narHash": "sha256-n5ZJgmzGZXOD9pZdAl1OnBu3PIqD+X3vEBUGbTi4JiI=",
|
||||||
"owner": "tinted-theming",
|
"owner": "tinted-theming",
|
||||||
"repo": "tinted-tmux",
|
"repo": "tinted-tmux",
|
||||||
"rev": "bded5e24407cec9d01bd47a317d15b9223a1546c",
|
"rev": "d217ba31c846006e9e0ae70775b0ee0f00aa6b1e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -663,11 +665,11 @@
|
||||||
"tinted-zed": {
|
"tinted-zed": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1751158968,
|
"lastModified": 1757811247,
|
||||||
"narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=",
|
"narHash": "sha256-4EFOUyLj85NRL3OacHoLGEo0wjiRJzfsXtR4CZWAn6w=",
|
||||||
"owner": "tinted-theming",
|
"owner": "tinted-theming",
|
||||||
"repo": "base16-zed",
|
"repo": "base16-zed",
|
||||||
"rev": "86a470d94204f7652b906ab0d378e4231a5b3384",
|
"rev": "824fe0aacf82b3c26690d14e8d2cedd56e18404e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -676,28 +678,6 @@
|
||||||
"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": {
|
||||||
|
|
@ -718,11 +698,11 @@
|
||||||
"xwayland-satellite-unstable": {
|
"xwayland-satellite-unstable": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756260173,
|
"lastModified": 1764721075,
|
||||||
"narHash": "sha256-wcf04fl5ncbOqAK7OCWIgILERIbMfL/eeM3UThqgErI=",
|
"narHash": "sha256-ChH4nq0cMEEkzkHqKlQt5Z7wxrk8ybcEHuA1YKAYmV0=",
|
||||||
"owner": "Supreeeme",
|
"owner": "Supreeeme",
|
||||||
"repo": "xwayland-satellite",
|
"repo": "xwayland-satellite",
|
||||||
"rev": "af33f7eb124b51ff6d9cdf9b428643e2246c8cbb",
|
"rev": "1b918e29b419e89910014054e8b71d54c9235ea5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -736,11 +716,11 @@
|
||||||
"nixpkgs": "nixpkgs_3"
|
"nixpkgs": "nixpkgs_3"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1756526767,
|
"lastModified": 1764648680,
|
||||||
"narHash": "sha256-aMcUT5QOgVghB+x89xf9+Phc/BTIQfoitVIcQ66ZQWk=",
|
"narHash": "sha256-B/nmawJ75/951Xs9ludSxDVd/txFY+odmcbinySqMQo=",
|
||||||
"owner": "youwen5",
|
"owner": "youwen5",
|
||||||
"repo": "zen-browser-flake",
|
"repo": "zen-browser-flake",
|
||||||
"rev": "3cef1d4a0b597c1746d399cc46ef98a53af9a732",
|
"rev": "897df2f2ad4880563ce801fa29f348a4e98f0a20",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,14 @@
|
||||||
{
|
{
|
||||||
description = "A flake using my config";
|
description = "A flake using my config";
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "nixpkgs/nixos-25.05";
|
nixpkgs.url = "nixpkgs/nixos-25.11";
|
||||||
musnix.url = "github:musnix/musnix";
|
musnix.url = "github:musnix/musnix";
|
||||||
home-manager = {
|
home-manager = {
|
||||||
url = "github:nix-community/home-manager/release-25.05";
|
url = "github:nix-community/home-manager/release-25.11";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
stylix = {
|
stylix = {
|
||||||
url = "github:danth/stylix/release-25.05";
|
url = "github:danth/stylix/release-25.11";
|
||||||
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.05";
|
url = "github:nix-community/nixvim/nixos-25.11";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
zen-browser = {
|
zen-browser = {
|
||||||
|
|
|
||||||
|
|
@ -66,6 +66,14 @@
|
||||||
hardware.cpu.amd.updateMicrocode = true;
|
hardware.cpu.amd.updateMicrocode = true;
|
||||||
hardware.cpu.x86.msr.enable = true;
|
hardware.cpu.x86.msr.enable = true;
|
||||||
|
|
||||||
|
hardware.amdgpu = {
|
||||||
|
opencl.enable = true;
|
||||||
|
amdvlk = {
|
||||||
|
enable = true;
|
||||||
|
support32Bit.enable = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
networking.hostName = "zenix";
|
networking.hostName = "zenix";
|
||||||
|
|
||||||
services.openssh.enable = true;
|
services.openssh.enable = true;
|
||||||
|
|
@ -77,8 +85,8 @@
|
||||||
home-manager.users.${user}.imports = [
|
home-manager.users.${user}.imports = [
|
||||||
{
|
{
|
||||||
home.stateVersion = "22.05";
|
home.stateVersion = "22.05";
|
||||||
programs.niri.settings.outputs = {
|
programs.niri.settings = {
|
||||||
"DP-3" = {
|
outputs."HP Inc. HP 24x 1CR9500W9Q" = {
|
||||||
mode = {
|
mode = {
|
||||||
width = 1920;
|
width = 1920;
|
||||||
height = 1080;
|
height = 1080;
|
||||||
|
|
@ -87,7 +95,7 @@
|
||||||
variable-refresh-rate = true;
|
variable-refresh-rate = true;
|
||||||
scale = 1.0;
|
scale = 1.0;
|
||||||
};
|
};
|
||||||
"HDMI-A-1" = {
|
outputs."HDMI-A-1" = {
|
||||||
mode = {
|
mode = {
|
||||||
width = 3840;
|
width = 3840;
|
||||||
height = 2160;
|
height = 2160;
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,7 @@
|
||||||
mosh
|
mosh
|
||||||
ripgrep
|
ripgrep
|
||||||
usbutils
|
usbutils
|
||||||
du-dust
|
dust
|
||||||
htop
|
htop
|
||||||
btop
|
btop
|
||||||
libsixel
|
libsixel
|
||||||
|
|
|
||||||
|
|
@ -35,7 +35,7 @@
|
||||||
input.keyboard = {
|
input.keyboard = {
|
||||||
xkb.layout = "us,gb";
|
xkb.layout = "us,gb";
|
||||||
xkb.variant = "dvorak,";
|
xkb.variant = "dvorak,";
|
||||||
xkb.options = "caps:escape";
|
xkb.options = "caps:escape,esperanto:qwerty,lv3:ralt_switch";
|
||||||
};
|
};
|
||||||
input.mouse = {
|
input.mouse = {
|
||||||
accel-profile = "flat";
|
accel-profile = "flat";
|
||||||
|
|
@ -47,9 +47,9 @@
|
||||||
dwt = true; # disable when typing
|
dwt = true; # disable when typing
|
||||||
};
|
};
|
||||||
prefer-no-csd = true;
|
prefer-no-csd = true;
|
||||||
spawn-at-startup = [
|
xwayland-satellite = {
|
||||||
{command = [(lib.getExe pkgs.xwayland-satellite)];}
|
path = lib.getExe pkgs.xwayland-satellite;
|
||||||
];
|
};
|
||||||
layout = {
|
layout = {
|
||||||
preset-column-widths = [
|
preset-column-widths = [
|
||||||
{proportion = 1.0;}
|
{proportion = 1.0;}
|
||||||
|
|
@ -58,7 +58,6 @@
|
||||||
};
|
};
|
||||||
environment = {
|
environment = {
|
||||||
NIXOS_OZONE_WL = "1";
|
NIXOS_OZONE_WL = "1";
|
||||||
DISPLAY = ":0";
|
|
||||||
};
|
};
|
||||||
binds = with config.lib.niri.actions; {
|
binds = with config.lib.niri.actions; {
|
||||||
"Mod+Return".action.spawn = [(lib.getExe config.programs.terminal)];
|
"Mod+Return".action.spawn = [(lib.getExe config.programs.terminal)];
|
||||||
|
|
@ -113,7 +112,7 @@
|
||||||
"Mod+G".action = toggle-window-floating;
|
"Mod+G".action = toggle-window-floating;
|
||||||
"Mod+Shift+Ctrl+Alt+Space".action = switch-layout "next";
|
"Mod+Shift+Ctrl+Alt+Space".action = switch-layout "next";
|
||||||
|
|
||||||
"Print".action = screenshot;
|
"Print".action.screenshot = [];
|
||||||
|
|
||||||
"XF86AudioRaiseVolume".action.spawn = ["raise-volume"];
|
"XF86AudioRaiseVolume".action.spawn = ["raise-volume"];
|
||||||
"XF86AudioLowerVolume".action.spawn = ["lower-volume"];
|
"XF86AudioLowerVolume".action.spawn = ["lower-volume"];
|
||||||
|
|
|
||||||
|
|
@ -35,9 +35,9 @@ in {
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
programs.git = {
|
programs.git.settings.user = {
|
||||||
userName = config.home.userFullname;
|
name = config.home.userFullname;
|
||||||
userEmail = cfg.email;
|
email = cfg.email;
|
||||||
};
|
};
|
||||||
|
|
||||||
accounts.email.accounts.${cfg.email} = lib.mkIf cfg.terminal {
|
accounts.email.accounts.${cfg.email} = lib.mkIf cfg.terminal {
|
||||||
|
|
@ -71,7 +71,6 @@ in {
|
||||||
sidebar.enable = true;
|
sidebar.enable = true;
|
||||||
};
|
};
|
||||||
programs.mbsync.enable = cfg.terminal;
|
programs.mbsync.enable = cfg.terminal;
|
||||||
services.mbsync.enable = cfg.terminal;
|
|
||||||
|
|
||||||
programs.aerc = {
|
programs.aerc = {
|
||||||
enable = cfg.terminal;
|
enable = cfg.terminal;
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,6 @@
|
||||||
|
|
||||||
# Helpers
|
# Helpers
|
||||||
heroic
|
heroic
|
||||||
lutris
|
|
||||||
gamescope
|
gamescope
|
||||||
gamemode
|
gamemode
|
||||||
mangohud
|
mangohud
|
||||||
|
|
|
||||||
|
|
@ -6,11 +6,11 @@
|
||||||
}: {
|
}: {
|
||||||
programs.git = {
|
programs.git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
extraConfig = {
|
settings = {
|
||||||
rerere.enabled = true;
|
rerere.enabled = true;
|
||||||
rebase.updateRefs = true;
|
rebase.updateRefs = true;
|
||||||
};
|
};
|
||||||
aliases = {
|
settings.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,10 +44,8 @@
|
||||||
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;
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@
|
||||||
|
|
||||||
# other
|
# other
|
||||||
element-desktop
|
element-desktop
|
||||||
bitwarden
|
bitwarden-desktop
|
||||||
|
|
||||||
inputs.zen-browser.packages.x86_64-linux.default
|
inputs.zen-browser.packages.x86_64-linux.default
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@ in {
|
||||||
email = "tristan.beedell@cryoserver.com";
|
email = "tristan.beedell@cryoserver.com";
|
||||||
terminal = false;
|
terminal = false;
|
||||||
};
|
};
|
||||||
programs.git.extraConfig = {
|
programs.git.settings.extraConfig = {
|
||||||
"includeIf \"gitdir:~/Documents/personal/\"" = {
|
"includeIf \"gitdir:~/Documents/personal/\"" = {
|
||||||
path = "~/Documents/personal/.gitconfig";
|
path = "~/Documents/personal/.gitconfig";
|
||||||
};
|
};
|
||||||
|
|
@ -44,13 +44,8 @@ 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; [
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@
|
||||||
programs.starship.enable = true;
|
programs.starship.enable = true;
|
||||||
programs.zsh = {
|
programs.zsh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
dotDir = ".config/zsh";
|
dotDir = "${config.xdg.configHome}/zsh";
|
||||||
history = {
|
history = {
|
||||||
path = "${config.xdg.dataHome}/zsh/zsh_history";
|
path = "${config.xdg.dataHome}/zsh/zsh_history";
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@ in
|
||||||
users.${user}.imports =
|
users.${user}.imports =
|
||||||
home-modules
|
home-modules
|
||||||
++ [
|
++ [
|
||||||
nixvim.homeManagerModules.nixvim
|
nixvim.homeModules.nixvim
|
||||||
../home/.
|
../home/.
|
||||||
{
|
{
|
||||||
options.home.userFullname = nixpkgs.lib.mkOption {default = userFullname;};
|
options.home.userFullname = nixpkgs.lib.mkOption {default = userFullname;};
|
||||||
|
|
|
||||||
|
|
@ -294,7 +294,6 @@ in {
|
||||||
};
|
};
|
||||||
yamlls.enable = true;
|
yamlls.enable = true;
|
||||||
gopls.enable = true;
|
gopls.enable = true;
|
||||||
ansiblels.enable = true;
|
|
||||||
};
|
};
|
||||||
keymaps = {
|
keymaps = {
|
||||||
lspBuf = {
|
lspBuf = {
|
||||||
|
|
@ -359,27 +358,6 @@ 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;
|
||||||
|
|
|
||||||
|
|
@ -11,12 +11,10 @@ in {
|
||||||
"vscode"
|
"vscode"
|
||||||
"steam-run"
|
"steam-run"
|
||||||
"postman"
|
"postman"
|
||||||
"drawio" # the creator had a hissyfit over a negative review: https://github.com/jgraph/drawio/discussions/4623
|
"drawio"
|
||||||
"mongodb"
|
|
||||||
];
|
];
|
||||||
|
|
||||||
nixpkgs.config.permittedInsecurePackages = [
|
nixpkgs.config.permittedInsecurePackages = [
|
||||||
"openssl-1.1.1w" # required for mongodb
|
|
||||||
"electron-27.3.11"
|
"electron-27.3.11"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
@ -31,8 +29,6 @@ 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;
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@
|
||||||
};
|
};
|
||||||
authentik-config = {
|
authentik-config = {
|
||||||
autoStart = true;
|
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"];
|
volumes = ["/home/tristan/pods/authentik/media:/media"];
|
||||||
environment = {
|
environment = {
|
||||||
AUTHENTIK_POSTGRESQL__USER = postgres.user;
|
AUTHENTIK_POSTGRESQL__USER = postgres.user;
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,25 @@
|
||||||
{config, lib, pkgs, ...}: let
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
cfg = config.services.grafana;
|
cfg = config.services.grafana;
|
||||||
secrets = config.sops.secrets;
|
secrets = config.sops.secrets;
|
||||||
mkDashboards = dashboards: pkgs.symlinkJoin {
|
mkDashboards = dashboards:
|
||||||
|
pkgs.symlinkJoin {
|
||||||
name = "dashboards";
|
name = "dashboards";
|
||||||
paths = map mkDashboard 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;
|
inherit name;
|
||||||
text = patch (builtins.readFile ( builtins.fetchurl {inherit url sha256;} ));
|
text = patch (builtins.readFile (builtins.fetchurl {inherit url sha256;}));
|
||||||
destination = "/dash/${name}.json";
|
destination = "/dash/${name}.json";
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
|
|
@ -34,7 +46,8 @@ in {
|
||||||
role_attribute_path = "contains(groups[*], 'Grafana Admins') && 'Admin' || contains(groups[*], 'Grafana Editors') && 'Editor' || 'Viewer'";
|
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";
|
name = "Node Exporter";
|
||||||
type = "file";
|
type = "file";
|
||||||
options.path = mkDashboards [
|
options.path = mkDashboards [
|
||||||
|
|
@ -48,10 +61,11 @@ 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:16fl81sx1by0wldw4vda0zr1pvbq1dpih1fikzwlvmk63mpc80kb";
|
sha256 = "sha256:0yzj1i4zbjy9cms75ip6ad8qyjgv9kka42gxsbzyzr2syznsmqw0";
|
||||||
|
}
|
||||||
|
];
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
}];
|
|
||||||
};
|
};
|
||||||
services.nginx.virtualHosts = {
|
services.nginx.virtualHosts = {
|
||||||
${cfg.settings.server.domain} = {
|
${cfg.settings.server.domain} = {
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,13 @@
|
||||||
{config, lib, ...}: let
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}: let
|
||||||
inherit (import ./lib.nix) toAppRegistration;
|
inherit (import ./lib.nix) toAppRegistration;
|
||||||
inherit (config.sops) templates placeholder;
|
inherit (config.sops) templates placeholder;
|
||||||
in {
|
in {
|
||||||
|
|
||||||
virtualisation.oci-containers.containers.mautrix-signal = {
|
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"];
|
dependsOn = ["mautrix-signal-psql"];
|
||||||
volumes = [
|
volumes = [
|
||||||
"/home/tristan/pods/signal-bridge/mautrix-signal:/data:z"
|
"/home/tristan/pods/signal-bridge/mautrix-signal:/data:z"
|
||||||
|
|
@ -15,16 +18,15 @@ in {
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
# when you get around to backing this up
|
# when you get around to backing this up
|
||||||
# 1. stop the server.
|
# 1. stop the server.
|
||||||
# 2. backup the db.
|
# 2. backup the db.
|
||||||
# 3. migrate to newer version of postgres
|
# 3. migrate to newer version of postgres
|
||||||
# 4. migrate db to local
|
# 4. migrate db to local
|
||||||
virtualisation.oci-containers.containers.mautrix-signal-psql = {
|
virtualisation.oci-containers.containers.mautrix-signal-psql = {
|
||||||
image = "docker.io/postgres:14-alpine";
|
image = "docker.io/postgres:14-alpine";
|
||||||
# ports = [ "127.0.0.1:5435:5432" ];
|
ports = ["5435:5432"];
|
||||||
ports = [ "5435:5432" ];
|
volumes = ["/home/tristan/pods/signal-bridge/db:/var/lib/postgresql/data"];
|
||||||
volumes = [ "/home/tristan/pods/signal-bridge/db:/var/lib/postgresql/data" ];
|
|
||||||
environmentFiles = [templates."mautrix-signal/psql.env".path];
|
environmentFiles = [templates."mautrix-signal/psql.env".path];
|
||||||
};
|
};
|
||||||
sops.templates = {
|
sops.templates = {
|
||||||
|
|
@ -58,5 +60,4 @@ in {
|
||||||
services.matrix-synapse.settings.app_service_config_files = [
|
services.matrix-synapse.settings.app_service_config_files = [
|
||||||
templates."mautrix-signal/appservice.yaml".path
|
templates."mautrix-signal/appservice.yaml".path
|
||||||
];
|
];
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
{config, ...}:
|
{config, ...}: {
|
||||||
{
|
|
||||||
nixpkgs.config.permittedInsecurePackages = [
|
nixpkgs.config.permittedInsecurePackages = [
|
||||||
"olm-3.2.16"
|
"olm-3.2.16"
|
||||||
];
|
];
|
||||||
|
|
@ -7,9 +6,9 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
registerToSynapse = true;
|
registerToSynapse = true;
|
||||||
settings = {
|
settings = {
|
||||||
appservice.database = {
|
database = {
|
||||||
type = "sqlite3";
|
type = "sqlite3-fk-wal";
|
||||||
uri = "/var/lib/mautrix-whatsapp/mautrix-whatsapp.db";
|
uri = "file:/var/lib/mautrix-whatsapp/mautrix-whatsapp.db?_txlock=immediate";
|
||||||
};
|
};
|
||||||
homeserver = {
|
homeserver = {
|
||||||
address = "http://localhost:8008";
|
address = "http://localhost:8008";
|
||||||
|
|
@ -20,11 +19,12 @@
|
||||||
"tristans.cloud" = "user";
|
"tristans.cloud" = "user";
|
||||||
"@tristan:tristans.cloud" = "admin";
|
"@tristan:tristans.cloud" = "admin";
|
||||||
};
|
};
|
||||||
|
personal_filtering_spaces = true;
|
||||||
|
};
|
||||||
encryption = {
|
encryption = {
|
||||||
allow = true;
|
allow = true;
|
||||||
appservice = false;
|
appservice = false;
|
||||||
};
|
pickle_key = "maunium.net/go/mautrix-whatsapp";
|
||||||
personal_filtering_spaces = true;
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -8,9 +8,13 @@
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
prune-blockchain=1
|
prune-blockchain=1
|
||||||
confirm-external-bind=1
|
confirm-external-bind=1
|
||||||
out-peers=64 # This will enable much faster sync and tx awareness; the default 8 is suboptimal nowadays
|
out-peers=8
|
||||||
in-peers=1024 # The default is unlimited; we prefer to put a cap on this
|
in-peers=16
|
||||||
zmq-pub=tcp://localhost:18083
|
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
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -25,5 +25,22 @@
|
||||||
carla
|
carla
|
||||||
drumgizmo
|
drumgizmo
|
||||||
distrho-ports
|
distrho-ports
|
||||||
|
surge
|
||||||
|
surge-XT
|
||||||
|
guitarix
|
||||||
|
gxplugins-lv2
|
||||||
|
airwindows-lv2
|
||||||
|
mod-distortion
|
||||||
|
mod-arpeggiator-lv2
|
||||||
|
aether-lv2
|
||||||
|
neural-amp-modeler-lv2
|
||||||
|
bchoppr
|
||||||
|
bshapr
|
||||||
|
chow-tape-model
|
||||||
|
chow-kick
|
||||||
|
chow-phaser
|
||||||
|
chow-centaur
|
||||||
|
quadrafuzz
|
||||||
|
fire
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -36,6 +36,11 @@ in {
|
||||||
"synapse/secrets.yaml" = {
|
"synapse/secrets.yaml" = {
|
||||||
owner = "matrix-synapse";
|
owner = "matrix-synapse";
|
||||||
content = builtins.toJSON {
|
content = builtins.toJSON {
|
||||||
|
jwt_config = {
|
||||||
|
enabled = true;
|
||||||
|
secret = sops.placeholder."synapse/oidc_client_secret";
|
||||||
|
algorithm = "RS256";
|
||||||
|
};
|
||||||
oidc_providers = [
|
oidc_providers = [
|
||||||
{
|
{
|
||||||
idp_id = "authentik";
|
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";
|
||||||
|
# };
|
||||||
|
# };
|
||||||
|
# };
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -26,10 +26,6 @@
|
||||||
|
|
||||||
services.gnome.gnome-keyring.enable = true;
|
services.gnome.gnome-keyring.enable = true;
|
||||||
|
|
||||||
programs.kdeconnect.enable = true;
|
|
||||||
|
|
||||||
virtualisation.waydroid.enable = true;
|
|
||||||
|
|
||||||
services.displayManager.cosmic-greeter.enable = true;
|
services.displayManager.cosmic-greeter.enable = true;
|
||||||
|
|
||||||
networking.stevenblack = {
|
networking.stevenblack = {
|
||||||
|
|
@ -73,7 +69,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
emoji = {
|
emoji = {
|
||||||
package = pkgs.noto-fonts-emoji;
|
package = pkgs.noto-fonts-color-emoji;
|
||||||
name = "Noto Color Emoji";
|
name = "Noto Color Emoji";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -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-+sOMWFFumJUk5gFE1iCTvWub3PWzYOkulXJLCGS4fYA=";
|
hash = "sha256-XmrVZRJAQctIiuznw/fQzs+9+QKOyTnJI2JOEWBWnVA=";
|
||||||
};
|
};
|
||||||
passthru.updateScript = gitUpdater {};
|
passthru.updateScript = gitUpdater {};
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue