Compare commits

...

17 Commits

39 changed files with 371 additions and 350 deletions

418
flake.lock generated
View File

@ -8,11 +8,11 @@
]
},
"locked": {
"lastModified": 1713629865,
"narHash": "sha256-fsSuh5ZYGYninYR68obMaSqKxnxEnCHIJJFc6igjHGw=",
"lastModified": 1717970544,
"narHash": "sha256-YX43aaegfqjXaZ3S+z0JI7SKOEE1Afqm/I9FBIezJ7A=",
"owner": "ezKEa",
"repo": "aagl-gtk-on-nix",
"rev": "b6c28cf87a7a055ffaad410f36852a7b2a9161ff",
"rev": "85c380e4e80fbc21d25165626ad2897cbb11af4d",
"type": "github"
},
"original": {
@ -24,11 +24,11 @@
"arkenfox-userjs": {
"flake": false,
"locked": {
"lastModified": 1707077370,
"narHash": "sha256-624Giuo1TfeXQGzcGK9ETW86esNFhFZ5a46DCjT6K5I=",
"lastModified": 1717796213,
"narHash": "sha256-Ex+eSb7tZ428MMJDIF/nqUOtnzjqEIPNaDXJPm9FvuY=",
"owner": "arkenfox",
"repo": "user.js",
"rev": "33a84b608c8a1f871c6ce9c4d2b932dc57078fae",
"rev": "47cbf5b9740ef59ed866874346d3fee3379f8da3",
"type": "github"
},
"original": {
@ -42,11 +42,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1712846731,
"narHash": "sha256-psRAPHgYC6qa+SNVdpD+ZViRBPu6/cqbi92smS6+pQI=",
"lastModified": 1718525922,
"narHash": "sha256-hBXj+7nqwTQt1yMyy7SQhGlOTBII63rESvLE2kTI92M=",
"owner": "AtaraxiaSjel",
"repo": "nur",
"rev": "2de167b89f40c69b0d4e7297a9ec777a286bc74e",
"rev": "dc3604665992f4cb4f96d3729d5775d1af895207",
"type": "github"
},
"original": {
@ -64,11 +64,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1711742460,
"narHash": "sha256-0O4v6e4a1toxXZ2gf5INhg4WPE5C5T+SVvsBt+45Mcc=",
"lastModified": 1717279440,
"narHash": "sha256-kH04ReTjxOpQumgWnqy40vvQLSnLGxWP6RF3nq5Esrk=",
"owner": "zhaofengli",
"repo": "attic",
"rev": "4dbdbee45728d8ce5788db6461aaaa89d98081f0",
"rev": "717cc95983cdc357bc347d70be20ced21f935843",
"type": "github"
},
"original": {
@ -83,11 +83,11 @@
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1665506760,
"narHash": "sha256-Rs3LH5qw91S8pCXBNqT2P+Nl4gI/5OqBJvA6WGun2n4=",
"lastModified": 1714424971,
"narHash": "sha256-FjTfWEMTF1CdjvcoRRGnAthAdykkdyffaFf38xAwk2Y=",
"owner": "AtaraxiaSjel",
"repo": "base16-nix",
"rev": "96b0826d8baf22873a2e8562a4cfc037e8182486",
"rev": "0b5eb7f6ec966c81ace3481e8b806f859c7566c4",
"type": "github"
},
"original": {
@ -162,6 +162,21 @@
"type": "github"
}
},
"catppuccin": {
"locked": {
"lastModified": 1718339789,
"narHash": "sha256-Q3fgY7huFE+uaw7BNsAl1x+FvjDAi3EDWPnlALJt5pM=",
"owner": "catppuccin",
"repo": "nix",
"rev": "73e06d5bd7ed34bdd0168030893ef8364fdc1d4a",
"type": "github"
},
"original": {
"owner": "catppuccin",
"repo": "nix",
"type": "github"
}
},
"crane": {
"inputs": {
"nixpkgs": [
@ -170,11 +185,11 @@
]
},
"locked": {
"lastModified": 1702918879,
"narHash": "sha256-tWJqzajIvYcaRWxn+cLUB9L9Pv4dQ3Bfit/YjU5ze3g=",
"lastModified": 1717025063,
"narHash": "sha256-dIubLa56W9sNNz0e8jGxrX3CAkPXsq7snuFA/Ie6dn8=",
"owner": "ipetkov",
"repo": "crane",
"rev": "7195c00c272fdd92fc74e7d5a0a2844b9fadb2fb",
"rev": "480dff0be03dac0e51a8dfc26e882b0d123a450e",
"type": "github"
},
"original": {
@ -190,11 +205,11 @@
"utils": "utils"
},
"locked": {
"lastModified": 1711973905,
"narHash": "sha256-UFKME/N1pbUtn+2Aqnk+agUt8CekbpuqwzljivfIme8=",
"lastModified": 1718194053,
"narHash": "sha256-FaGrf7qwZ99ehPJCAwgvNY5sLCqQ3GDiE/6uLhxxwSY=",
"owner": "serokell",
"repo": "deploy-rs",
"rev": "88b3059b020da69cbe16526b8d639bd5e0b51c8b",
"rev": "3867348fa92bc892eba5d9ddb2d7a97b9e127a8a",
"type": "github"
},
"original": {
@ -212,11 +227,11 @@
"pre-commit-hooks": "pre-commit-hooks"
},
"locked": {
"lastModified": 1713632052,
"narHash": "sha256-kPlYLnGx8k6zOtzxws/Eb2OrFJWk6TwvMWiUDfw+nl8=",
"lastModified": 1718297307,
"narHash": "sha256-itCqNMgHdfhL7z+7viDaiSyb1sJ36xKRPpZGoYKMVAc=",
"owner": "cachix",
"repo": "devenv",
"rev": "9c134f73b11b298674317b84292fa126744a65fb",
"rev": "24b3e5dd32e85ab6bd234ff3eed1fc3670bea583",
"type": "github"
},
"original": {
@ -263,11 +278,11 @@
]
},
"locked": {
"lastModified": 1713406758,
"narHash": "sha256-kwZvhmx+hSZvjzemKxsAqzEqWmXZS47VVwQhNrINORQ=",
"lastModified": 1718242063,
"narHash": "sha256-n3AWItJ4a94GT0cray/eUV7tt3mulQ52L+lWJN9d1E8=",
"owner": "nix-community",
"repo": "disko",
"rev": "1efd500e9805a9efbce401ed5999006d397b9f11",
"rev": "832a9f2c81ff3485404bd63952eadc17bf7ccef2",
"type": "github"
},
"original": {
@ -427,11 +442,11 @@
]
},
"locked": {
"lastModified": 1709336216,
"narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=",
"lastModified": 1717285511,
"narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2",
"rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
"type": "github"
},
"original": {
@ -445,11 +460,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1698882062,
"narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=",
"lastModified": 1714641030,
"narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "8c9fa2545007b49a5db5f650ae91f227672c3877",
"rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e",
"type": "github"
},
"original": {
@ -466,11 +481,11 @@
]
},
"locked": {
"lastModified": 1712014858,
"narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
"lastModified": 1717285511,
"narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
"rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
"type": "github"
},
"original": {
@ -482,11 +497,11 @@
"flake-registry": {
"flake": false,
"locked": {
"lastModified": 1705308826,
"narHash": "sha256-Z3xTYZ9EcRIqZAufZbci912MUKB0sD+qxi/KTGMFVwY=",
"lastModified": 1717415742,
"narHash": "sha256-HKvoLGZUsBpjkxWkdtctGYj6RH0bl6vcw0OjTOqyzJk=",
"owner": "nixos",
"repo": "flake-registry",
"rev": "9c69f7bd2363e71fe5cd7f608113290c7614dcdd",
"rev": "895a65f8d5acf848136ee8fe8e8f736f0d27df96",
"type": "github"
},
"original": {
@ -547,24 +562,6 @@
"type": "github"
}
},
"flake-utils_10": {
"inputs": {
"systems": "systems_11"
},
"locked": {
"lastModified": 1681202837,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"locked": {
"lastModified": 1644229661,
@ -690,11 +687,11 @@
"systems": "systems_10"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"lastModified": 1681202837,
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
"type": "github"
},
"original": {
@ -754,11 +751,11 @@
]
},
"locked": {
"lastModified": 1713713092,
"narHash": "sha256-rvyr6BBtn3cq5B/48rhJlbIOpxprwlO/71663sd9Gik=",
"lastModified": 1718243258,
"narHash": "sha256-abBpj2VU8p6qlRzTU8o22q68MmOaZ4v8zZ4UlYl5YRU=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "2846d5230a3c3923618eabb367deaf8885df580f",
"rev": "8d5e27b4807d25308dfe369d5a923d87e7dbfda3",
"type": "github"
},
"original": {
@ -783,11 +780,11 @@
]
},
"locked": {
"lastModified": 1713612213,
"narHash": "sha256-zJboXgWNpNhKyNF8H/3UYzWkx7w00TOCGKi3cwi+tsw=",
"lastModified": 1717181720,
"narHash": "sha256-yv+QZWsusu/NWjydkxixHC2g+tIJ9v+xkE2EiVpJj6g=",
"owner": "hyprwm",
"repo": "hyprcursor",
"rev": "cab4746180f210a3c1dd3d53e45c510e309e90e1",
"rev": "9e27a2c2ceb1e0b85bd55b0afefad196056fe87c",
"type": "github"
},
"original": {
@ -799,22 +796,21 @@
"hyprland": {
"inputs": {
"hyprcursor": "hyprcursor",
"hyprland-protocols": "hyprland-protocols",
"hyprlang": "hyprlang",
"hyprutils": "hyprutils",
"hyprwayland-scanner": "hyprwayland-scanner",
"nixpkgs": [
"nixpkgs"
],
"systems": "systems_5",
"wlroots": "wlroots",
"xdph": "xdph"
},
"locked": {
"lastModified": 1713724223,
"narHash": "sha256-yTWdX9aKKoY8s/BBsNY++t0W/0idIp2N4g7nGX+F9cc=",
"lastModified": 1718313803,
"narHash": "sha256-OpXugBH3tF9Jc3Vt0gnqhdQvlNmte7Km1SmyIDo1G3Y=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "4954dcbbb352a72d41b43a6ab107388c17a0b21b",
"rev": "8055b1c00a102f5419e40f5eddfb6ee8be693f33",
"type": "github"
},
"original": {
@ -827,10 +823,12 @@
"inputs": {
"nixpkgs": [
"hyprland",
"xdph",
"nixpkgs"
],
"systems": [
"hyprland",
"xdph",
"systems"
]
},
@ -850,6 +848,10 @@
},
"hyprlang": {
"inputs": {
"hyprutils": [
"hyprland",
"hyprutils"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
@ -860,11 +862,11 @@
]
},
"locked": {
"lastModified": 1713121246,
"narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=",
"lastModified": 1717881852,
"narHash": "sha256-XeeVoKHQgfKuXoP6q90sUqKyl7EYy3ol2dVZGM+Jj94=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706",
"rev": "ec6938c66253429192274d612912649a0cfe4d28",
"type": "github"
},
"original": {
@ -879,11 +881,11 @@
"systems": "systems_6"
},
"locked": {
"lastModified": 1711250455,
"narHash": "sha256-LSq1ZsTpeD7xsqvlsepDEelWRDtAhqwetp6PusHXJRo=",
"lastModified": 1713121246,
"narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "b3e430f81f3364c5dd1a3cc9995706a4799eb3fa",
"rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706",
"type": "github"
},
"original": {
@ -901,11 +903,11 @@
"systems": "systems_7"
},
"locked": {
"lastModified": 1712919696,
"narHash": "sha256-93zNQy4LGFP5h/GrQJctd8cPE0VdCDsWigTOx2effrE=",
"lastModified": 1717919427,
"narHash": "sha256-50HWM67p81v+dhvcOS0UFQiPGh8McUHs40UGqkz6s9I=",
"owner": "hyprwm",
"repo": "hyprpaper",
"rev": "02ee7ff3bbd9cba72f26be7b09dde4a89fc31c21",
"rev": "f4abf5902f3f0c51d2aab8a521f7c1b1b08afd64",
"type": "github"
},
"original": {
@ -914,6 +916,31 @@
"type": "github"
}
},
"hyprutils": {
"inputs": {
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1717881334,
"narHash": "sha256-a0inRgJhPL6v9v7RPM/rx1kbXdfe3xJA1c9z0ZkYnh4=",
"owner": "hyprwm",
"repo": "hyprutils",
"rev": "0693f9398ab693d89c9a0aa3b3d062dd61b7a60e",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprutils",
"type": "github"
}
},
"hyprwayland-scanner": {
"inputs": {
"nixpkgs": [
@ -926,11 +953,11 @@
]
},
"locked": {
"lastModified": 1713619586,
"narHash": "sha256-fIhNlYhPhG5AJ8DxX3LaitnccnQ+X2MCL39W2Abp7mM=",
"lastModified": 1717784906,
"narHash": "sha256-YxmfxHfWed1fosaa7fC1u7XoKp1anEZU+7Lh/ojRKoM=",
"owner": "hyprwm",
"repo": "hyprwayland-scanner",
"rev": "9e13e0915273959bfd98a10662f678c15ac71c77",
"rev": "0f30f9eca6e404130988554accbb64d1c9ec877d",
"type": "github"
},
"original": {
@ -941,11 +968,11 @@
},
"impermanence": {
"locked": {
"lastModified": 1708968331,
"narHash": "sha256-VUXLaPusCBvwM3zhGbRIJVeYluh2uWuqtj4WirQ1L9Y=",
"lastModified": 1717932370,
"narHash": "sha256-7C5lCpiWiyPoIACOcu2mukn/1JRtz6HC/1aEMhUdcw0=",
"owner": "nix-community",
"repo": "impermanence",
"rev": "a33ef102a02ce77d3e39c25197664b7a636f9c30",
"rev": "27979f1c3a0d3b9617a3563e2839114ba7d48d3f",
"type": "github"
},
"original": {
@ -1019,11 +1046,11 @@
"nixpkgs-regression": "nixpkgs-regression"
},
"locked": {
"lastModified": 1708577783,
"narHash": "sha256-92xq7eXlxIT5zFNccLpjiP7sdQqQI30Gyui2p/PfKZM=",
"lastModified": 1712911606,
"narHash": "sha256-BGvBhepCufsjcUkXnEEXhEVjwdJAwPglCC2+bInc794=",
"owner": "domenkozar",
"repo": "nix",
"rev": "ecd0af0c1f56de32cbad14daa1d82a132bf298f8",
"rev": "b24a9318ea3f3600c1e24b4a00691ee912d4de12",
"type": "github"
},
"original": {
@ -1044,11 +1071,11 @@
]
},
"locked": {
"lastModified": 1713164845,
"narHash": "sha256-6X0H56qGmN/LoEdcBcwm3+apHLEe7r4caO719q1/KMI=",
"lastModified": 1715754082,
"narHash": "sha256-2hAydsdMk6QmDar+16ryyn+pVksxudwC5vRiatJbysM=",
"owner": "thiagokokada",
"repo": "nix-alien",
"rev": "db5d6107d3c72d5eb0b7a02a30b87b1f0076fcc5",
"rev": "ea6ebda03c5537eebbb93af57ca6f2c2979981be",
"type": "github"
},
"original": {
@ -1064,11 +1091,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1711950913,
"narHash": "sha256-r750/UygoC2mS3tEVHEXMaitLgLKkH+VKRRHmcZVGmk=",
"lastModified": 1717994481,
"narHash": "sha256-sm2Dd21dT0g7akjySmMN0X3jT0/vN0wvBEjcJE/HzwU=",
"owner": "nix-community",
"repo": "nix-direnv",
"rev": "57f831e2e43c6d8a6b11511e40e18eb59ca1f471",
"rev": "40db0380eb86cf8479ce8eef63b68b47c77e66c5",
"type": "github"
},
"original": {
@ -1086,11 +1113,11 @@
"treefmt-nix": "treefmt-nix_2"
},
"locked": {
"lastModified": 1709911523,
"narHash": "sha256-XNutwbRI6h57ybeKy0yYupfngWYcfcIqE0b0LgXnyxs=",
"lastModified": 1715803356,
"narHash": "sha256-wvsg/UMM/jekzgbggH56KLZJzRmwrB9ErevaXXyWyqc=",
"owner": "Mic92",
"repo": "nix-fast-build",
"rev": "692fe3e98f36b60c678d637235271b57910a7f80",
"rev": "cfff239d93716e92f6467f8953d8f8c12da1892a",
"type": "github"
},
"original": {
@ -1143,11 +1170,11 @@
"nixpkgs": "nixpkgs_10"
},
"locked": {
"lastModified": 1713067146,
"narHash": "sha256-9D20xjblGKEVRVCnM3qWhiizEa9i6OpK6xQJajwcwOQ=",
"lastModified": 1715483403,
"narHash": "sha256-WMDuQj7J5jbpXI/X/E6FZRKgBFGcaSTvYyVxPnKE6KU=",
"owner": "nix-community",
"repo": "nix-index-database",
"rev": "93aed67288be60c9ef6133ba2f8de128f4ef265c",
"rev": "f9027322f48b427da23746aa359a6510dfcd0228",
"type": "github"
},
"original": {
@ -1165,11 +1192,11 @@
]
},
"locked": {
"lastModified": 1713662650,
"narHash": "sha256-pAAXTH3bUBELrXFGgRjzy/67Lm5trkFB2SXp6epMxX0=",
"lastModified": 1718328588,
"narHash": "sha256-dTuHdsZkPJg2YS7S/04d5gLpLqCmKEGuJkRO0yHklgo=",
"owner": "nix-community",
"repo": "nix-vscode-extensions",
"rev": "03c7d19b4fbf7dd0f9890c310e809ca04da76c4e",
"rev": "ae25cb00075c72a2a91497814a11a00f567f5f75",
"type": "github"
},
"original": {
@ -1248,11 +1275,11 @@
]
},
"locked": {
"lastModified": 1712537332,
"narHash": "sha256-yYlxv1sg/TNl6hghjAe0ct+/p5PwXiT1mpuaExjhR88=",
"lastModified": 1718025593,
"narHash": "sha256-WZ1gdKq/9u1Ns/oXuNsDm+W0salonVA0VY1amw8urJ4=",
"owner": "nix-community",
"repo": "nixos-generators",
"rev": "d942db8df8ee860556a38754f15b8d03bf7e6933",
"rev": "35c20ba421dfa5059e20e0ef2343c875372bdcf3",
"type": "github"
},
"original": {
@ -1263,11 +1290,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1711333969,
"narHash": "sha256-5PiWGn10DQjMZee5NXzeA6ccsv60iLu+Xtw+mfvkUAs=",
"owner": "NixOS",
"lastModified": 1716948383,
"narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "57e6b3a9e4ebec5aa121188301f04a6b8c354c9b",
"rev": "ad57eef4ef0659193044870c731987a6df5cf56b",
"type": "github"
},
"original": {
@ -1279,29 +1306,23 @@
},
"nixpkgs-lib": {
"locked": {
"dir": "lib",
"lastModified": 1698611440,
"narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735",
"type": "github"
"lastModified": 1714640452,
"narHash": "sha256-QBx10+k6JWz6u7VsohfSw8g8hjdBZEf8CFzXH1/1Z94=",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz"
},
"original": {
"dir": "lib",
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/50eb7ecf4cd0a5756d7275c8ba36790e5bd53e33.tar.gz"
}
},
"nixpkgs-master": {
"locked": {
"lastModified": 1713724621,
"narHash": "sha256-1D3L/QuZx78MrXgHDkLHGQ9JyO+tUJMovcad6z6GT80=",
"lastModified": 1718334394,
"narHash": "sha256-eDQUMwMfrv/vxSCcgPL4THGG9k5rRy2k2U9cNJk9nzE=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "19081514c247fbe95d0cd9094e530cafd43dbe7f",
"rev": "8dbf10c3c93d97ac91bdfe248b5cd7173481c5b6",
"type": "github"
},
"original": {
@ -1393,27 +1414,27 @@
},
"nixpkgs-stable_3": {
"locked": {
"lastModified": 1713564160,
"narHash": "sha256-YguPZpiejgzLEcO36/SZULjJQ55iWcjAmf3lYiyV1Fo=",
"lastModified": 1718208800,
"narHash": "sha256-US1tAChvPxT52RV8GksWZS415tTS7PV42KTc2PNDBmc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "bc194f70731cc5d2b046a6c1b3b15f170f05999c",
"rev": "cc54fb41d13736e92229c21627ea4f22199fee6b",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-23.11",
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable_4": {
"locked": {
"lastModified": 1713638189,
"narHash": "sha256-q7APLfB6FmmSMI1Su5ihW9IwntBsk2hWNXh8XtSdSIk=",
"lastModified": 1717880976,
"narHash": "sha256-BRvSCsKtDUr83NEtbGfHLUOdDK0Cgbezj2PtcHnz+sQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "74574c38577914733b4f7a775dd77d24245081dd",
"rev": "4913a7c3d8b8d00cb9476a6bd730ff57777f740c",
"type": "github"
},
"original": {
@ -1425,11 +1446,11 @@
},
"nixpkgs_10": {
"locked": {
"lastModified": 1712791164,
"narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=",
"lastModified": 1715266358,
"narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5",
"rev": "f1010e0469db743d14519a1efd37e23f8513d714",
"type": "github"
},
"original": {
@ -1441,11 +1462,11 @@
},
"nixpkgs_11": {
"locked": {
"lastModified": 1711715736,
"narHash": "sha256-9slQ609YqT9bT/MNX9+5k5jltL9zgpn36DpFB7TkttM=",
"lastModified": 1717868076,
"narHash": "sha256-c83Y9t815Wa34khrux81j8K8ET94ESmCuwORSKm2bQY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "807c549feabce7eddbf259dbdcec9e0600a0660d",
"rev": "cd18e2ae9ab8e2a0a8d715b60c91b54c0ac35ff9",
"type": "github"
},
"original": {
@ -1457,11 +1478,11 @@
},
"nixpkgs_12": {
"locked": {
"lastModified": 1713537308,
"narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=",
"lastModified": 1718160348,
"narHash": "sha256-9YrUjdztqi4Gz8n3mBuqvCkMo4ojrA6nASwyIKWMpus=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "5c24cf2f0a12ad855f444c30b2421d044120c66f",
"rev": "57d6973abba7ea108bac64ae7629e7431e0199b6",
"type": "github"
},
"original": {
@ -1473,11 +1494,11 @@
},
"nixpkgs_13": {
"locked": {
"lastModified": 1712883908,
"narHash": "sha256-icE1IJE9fHcbDfJ0+qWoDdcBXUoZCcIJxME4lMHwvSM=",
"lastModified": 1717112898,
"narHash": "sha256-7R2ZvOnvd9h8fDd65p0JnB7wXfUvreox3xFdYWd1BnY=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "a0c9e3aee1000ac2bfb0e5b98c94c946a5d180a9",
"rev": "6132b0f6e344ce2fe34fc051b72fb46e34f668e0",
"type": "github"
},
"original": {
@ -1505,11 +1526,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1665466769,
"narHash": "sha256-L+qcHpb4Ac3PipMXJY/Ktbu1+KXy23WCZ8pXWmsf7zY=",
"lastModified": 1713537308,
"narHash": "sha256-XtTSSIB2DA6tOv+l0FhvfDMiyCmhoRbNB+0SeInZkbk=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "0b20bf89e0035b6d62ad58f9db8fdbc99c2b01e8",
"rev": "5c24cf2f0a12ad855f444c30b2421d044120c66f",
"type": "github"
},
"original": {
@ -1553,11 +1574,11 @@
},
"nixpkgs_6": {
"locked": {
"lastModified": 1710796454,
"narHash": "sha256-lQlICw60RhH8sHTDD/tJiiJrlAfNn8FDI9c+7G2F0SE=",
"lastModified": 1713361204,
"narHash": "sha256-TA6EDunWTkc5FvDCqU3W2T3SFn0gRZqh6D/hJnM02MM=",
"owner": "cachix",
"repo": "devenv-nixpkgs",
"rev": "06fb0f1c643aee3ae6838dda3b37ef0abc3c763b",
"rev": "285676e87ad9f0ca23d8714a6ab61e7e027020c6",
"type": "github"
},
"original": {
@ -1655,11 +1676,11 @@
"nixpkgs-stable": "nixpkgs-stable_2"
},
"locked": {
"lastModified": 1712897695,
"narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=",
"lastModified": 1713775815,
"narHash": "sha256-Wu9cdYTnGQQwtT20QQMg7jzkANKQjwBD9iccfGKkfls=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8",
"rev": "2ac4dcbf55ed43f3be0bae15e181f08a57af24a4",
"type": "github"
},
"original": {
@ -1674,7 +1695,6 @@
"prismlauncher",
"flake-compat"
],
"flake-utils": "flake-utils_9",
"gitignore": "gitignore_2",
"nixpkgs": [
"prismlauncher",
@ -1686,11 +1706,11 @@
]
},
"locked": {
"lastModified": 1712897695,
"narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=",
"lastModified": 1716213921,
"narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8",
"rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0",
"type": "github"
},
"original": {
@ -1708,11 +1728,11 @@
"pre-commit-hooks": "pre-commit-hooks_2"
},
"locked": {
"lastModified": 1713582705,
"narHash": "sha256-Tx1XV4HC7KECHRsrAAmFpkmr0oAkEMouocrirh35sf8=",
"lastModified": 1717816313,
"narHash": "sha256-GCNM9mlbHML1uISUuZquyPbrPfvHT+ZBM+M1u4H5JfM=",
"owner": "AtaraxiaSjel",
"repo": "PrismLauncher",
"rev": "908704caa63e21322390d5aa0361da2ce344da9e",
"rev": "6b48bb6b93f5fdbd2a96fa07f29f5da9f7a3c4f0",
"type": "github"
},
"original": {
@ -1731,6 +1751,7 @@
"base16": "base16",
"base16-tokyonight-scheme": "base16-tokyonight-scheme",
"cassowary": "cassowary",
"catppuccin": "catppuccin",
"deploy-rs": "deploy-rs",
"devenv": "devenv",
"disko": "disko",
@ -1758,11 +1779,11 @@
"rycee": {
"flake": false,
"locked": {
"lastModified": 1713714397,
"narHash": "sha256-lgV7sFIITCN6JHLDqMAt0n9cCEKe836yi9tYy33XXXw=",
"lastModified": 1718251401,
"narHash": "sha256-enzmGqA0Cjwoh3ptVvbFh+ZUxwavM0awYJPK/KnLH3E=",
"owner": "rycee",
"repo": "nur-expressions",
"rev": "d804052ce9c82e7bf5a66052c4d2c1a406a8d169",
"rev": "89accb69b1fd641dbafba9619a30b50af318820b",
"type": "gitlab"
},
"original": {
@ -1779,11 +1800,11 @@
"nixpkgs-stable": "nixpkgs-stable_4"
},
"locked": {
"lastModified": 1713668495,
"narHash": "sha256-4BvlfPfyUmB1U0r/oOF6jGEW/pG59c5yv6PJwgucTNM=",
"lastModified": 1718137936,
"narHash": "sha256-psA+1Q5fPaK6yI3vzlLINNtb6EeXj111zQWnZYyJS9c=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "09f1bc8ba3277c0f052f7887ec92721501541938",
"rev": "c279dec105dd53df13a5e57525da97905cc0f0d6",
"type": "github"
},
"original": {
@ -1822,21 +1843,6 @@
"type": "github"
}
},
"systems_11": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
@ -1965,11 +1971,11 @@
]
},
"locked": {
"lastModified": 1711803027,
"narHash": "sha256-Qic3OvsVLpetchzaIe2hJqgliWXACq2Oee6mBXa/IZQ=",
"lastModified": 1717850719,
"narHash": "sha256-npYqVg+Wk4oxnWrnVG7416fpfrlRhp/lQ6wQ4DHI8YE=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "1810d51a015c1730f2fe05a255258649799df416",
"rev": "4fc1c45a5f50169f9f29f6a98a438fb910b834ed",
"type": "github"
},
"original": {
@ -1986,11 +1992,11 @@
]
},
"locked": {
"lastModified": 1698438538,
"narHash": "sha256-AWxaKTDL3MtxaVTVU5lYBvSnlspOS0Fjt8GxBgnU0Do=",
"lastModified": 1714058656,
"narHash": "sha256-Qv4RBm4LKuO4fNOfx9wl40W2rBbv5u5m+whxRYUMiaA=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "5deb8dc125a9f83b65ca86cf0c8167c46593e0b1",
"rev": "c6aaf729f34a36c445618580a9f95a48f5e4e03f",
"type": "github"
},
"original": {
@ -2019,17 +2025,17 @@
},
"vscode-server": {
"inputs": {
"flake-utils": "flake-utils_10",
"flake-utils": "flake-utils_9",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1709622318,
"narHash": "sha256-bTscF0366xtoIXgH7Zq+Mn0mpX3w4h/2xKpHiYMyLNc=",
"lastModified": 1713958148,
"narHash": "sha256-8PDNi/dgoI2kyM7uSiU4eoLBqUKoA+3TXuz+VWmuCOc=",
"owner": "msteen",
"repo": "nixos-vscode-server",
"rev": "d0ed9b8cf1f0a71f110df9119489ab047e0726bd",
"rev": "fc900c16efc6a5ed972fb6be87df018bcf3035bc",
"type": "github"
},
"original": {
@ -2038,29 +2044,9 @@
"type": "github"
}
},
"wlroots": {
"flake": false,
"locked": {
"lastModified": 1713699467,
"narHash": "sha256-wQ18I2j/lUEz6FELuSphPBgROHx1POz/R2fjLA+QP8A=",
"owner": "hyprwm",
"repo": "wlroots-hyprland",
"rev": "b9063af512a2326d5c519edc6a759da875deab21",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "wlroots-hyprland",
"rev": "b9063af512a2326d5c519edc6a759da875deab21",
"type": "github"
}
},
"xdph": {
"inputs": {
"hyprland-protocols": [
"hyprland",
"hyprland-protocols"
],
"hyprland-protocols": "hyprland-protocols",
"hyprlang": [
"hyprland",
"hyprlang"
@ -2075,11 +2061,11 @@
]
},
"locked": {
"lastModified": 1713214484,
"narHash": "sha256-h1bSIsDuPk1FGgvTuSHJyiU2Glu7oAyoPMJutKZmLQ8=",
"lastModified": 1717918856,
"narHash": "sha256-I38bmPLqamvOfVSArd1hhZtkVRAYBK38fOHZCU1P9Qg=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "bb44921534a9cee9635304fdb876c1b3ec3a8f61",
"rev": "72907822c19afc0983c69d59d299204381623725",
"type": "github"
},
"original": {

View File

@ -5,7 +5,7 @@
flake-utils-plus.url = "github:gytis-ivaskevicius/flake-utils-plus/v1.4.0";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-master.url = "github:nixos/nixpkgs/master";
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.11";
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05";
flake-registry = {
url = "github:nixos/flake-registry";
flake = false;
@ -35,6 +35,7 @@
url = "github:AtaraxiaSjel/cassowary";
inputs.nixpkgs.follows = "nixpkgs";
};
catppuccin.url = "github:catppuccin/nix";
deploy-rs.url = "github:serokell/deploy-rs";
devenv.url = "github:cachix/devenv";
disko = {
@ -124,7 +125,7 @@
# permittedInsecurePackages = [ "electron-25.9.0" ];
};
channels.unstable.input = nixpkgs;
channels.unstable.patches = patchesPath [ "zen-kernels.patch" "ydotoold.patch" ] ++ sharedPatches;
channels.unstable.patches = patchesPath [ "zen-kernels.patch" ] ++ sharedPatches;
channels.stable.input = inputs.nixpkgs-stable;
channels.stable.patches = sharedPatches;

View File

@ -3,7 +3,7 @@ let
zfs_arc_max = toString (6 * 1024 * 1024 * 1024);
in {
boot = {
zfs.package = pkgs.zfs_unstable;
# zfs.package = pkgs.zfs_unstable;
kernelPackages = pkgs.linuxPackages_lqx;
initrd = {

View File

@ -101,7 +101,7 @@
# pkgs.nix-init
pkgs.nixpkgs-review
pkgs.anydesk
pkgs.winbox
# pkgs.winbox
pkgs.devenv
pkgs.radeontop
pkgs.wayvnc
@ -109,21 +109,56 @@
pkgs.nix-fast-build
pkgs.mitmproxy
pkgs.exercism
pkgs.packwiz
];
xdg.configFile."distrobox/distrobox.conf".text = ''
container_always_pull="1"
container_manager="podman"
'';
home.stateVersion = "23.05";
home.stateVersion = "24.05";
};
persist.state.homeDirectories = [
services.ollama = {
enable = true;
host = "127.0.0.1";
port = 11434;
acceleration = "rocm";
openFirewall = false;
environmentVariables = {
HSA_OVERRIDE_GFX_VERSION = "10.3.0";
OLLAMA_KEEP_ALIVE = "-1";
# OLLAMA_LLM_LIBRARY = "";
};
};
services.open-webui = {
enable = true;
host = "127.0.0.1";
port = 8081;
openFirewall = false;
environment = {
ANONYMIZED_TELEMETRY = "False";
DO_NOT_TRACK = "True";
SCARF_NO_ANALYTICS = "True";
OLLAMA_API_BASE_URL = "http://127.0.0.1:11434";
# Disable authentication
WEBUI_AUTH = "False";
};
};
persist.state = {
directories = [
"/var/lib/ollama"
"/var/lib/open-webui"
];
homeDirectories = [
".local/share/winbox"
".local/share/PrismLauncher"
".local/share/distrobox"
".mitmproxy"
".config/exercism"
".llama"
];
};
system.stateVersion = "23.05";
}

View File

@ -66,7 +66,6 @@
</disk>
<disk type="file" device="cdrom">
<driver name="qemu" type="raw"/>
<source file="/media/libvirt/iso/virtio-win-0.1.240.iso"/>
<target dev="sda" bus="sata"/>
<readonly/>
<address type="drive" controller="0" bus="0" target="0" unit="0"/>

View File

@ -3,7 +3,7 @@ let
zfs_arc_max = toString (2 * 1024 * 1024 * 1024);
in {
boot = {
zfs.package = pkgs.zfs_unstable;
# zfs.package = pkgs.zfs_unstable;
kernelPackages = pkgs.linuxPackages_lqx;
initrd = {

View File

@ -47,7 +47,7 @@
pkgs.moonlight-qt
];
home.stateVersion = "23.05";
home.stateVersion = "24.05";
};
system.stateVersion = "23.05";
}

View File

@ -57,7 +57,7 @@
maxJobs = 8;
sshUser = "ataraxia";
sshKey = "/home/nixos/ssh-builder";
systems = [ "x86_64-linux" "i686-linux" "aarch64-linux" ];
systems = [ "x86_64-linux" "aarch64-linux" ];
supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
}];
distributedBuilds = true;

View File

@ -65,7 +65,7 @@ in {
"vm.dirty_background_ratio" = 1;
"vm.dirty_ratio" = 40;
"vm.page-cluster" = 0;
"vm.overcommit_memory" = 1;
"vm.overcommit_memory" = lib.mkForce 1;
"net.ipv4.tcp_congestion_control" = "bbr";
"net.core.default_qdisc" = "fq";

View File

@ -151,6 +151,7 @@ in {
127.0.0.1 s3.ataraxiadev.com
127.0.0.1 wg.ataraxiadev.com
127.0.0.1 vault.ataraxiadev.com
127.0.0.1 matrix.ataraxiadev.com
'';
nix.optimise.automatic = false;
@ -186,7 +187,7 @@ in {
smartmontools
];
xdg.mime.enable = false;
home.stateVersion = "22.11";
home.stateVersion = "24.05";
};
system.stateVersion = "22.11";
system.stateVersion = "24.05";
}

View File

@ -69,5 +69,5 @@
}];
};
networking.firewall.interfaces."podman+".allowedUDPPorts = [ 53 ];
networking.firewall.interfaces."podman+".allowedUDPPorts = [ 53 5353 ];
}

View File

@ -2,7 +2,7 @@
with lib;
{
options.services.headscale-auth = mkOption {
description = mdDoc ''
description = ''
Request headscale auth key.
'';
type = types.attrsOf (types.submodule ({ ... }: {
@ -10,32 +10,32 @@ with lib;
autoStart = mkOption {
type = types.bool;
default = false;
description = mdDoc "Request auth key on startup.";
description = "Request auth key on startup.";
};
ephemeral = mkOption {
type = types.bool;
default = false;
description = mdDoc "Request ephemeral auth key.";
description = "Request ephemeral auth key.";
};
expire = mkOption {
type = types.str;
default = "1h";
description = mdDoc "Auth key expiration time.";
description = "Auth key expiration time.";
};
user = mkOption {
type = types.str;
default = "ataraxiadev";
description = mdDoc "Auth key user.";
description = "Auth key user.";
};
outPath = mkOption {
type = types.str;
default = "/tmp/auth-key";
description = mdDoc "Where to write down the auth key.";
description = "Where to write down the auth key.";
};
before = mkOption {
type = with types; listOf str;
default = [ ];
description = mdDoc "Start service before this services.";
description = "Start service before this services.";
};
};
}));

View File

@ -15,27 +15,27 @@ in
type = types.package;
default = pkgs.kiwix-tools;
defaultText = literalExpression "pkgs.kiwix-tools";
description = lib.mdDoc "The package that provides `bin/kiwix-serve`";
description = "The package that provides `bin/kiwix-serve`";
};
port = mkOption {
type = types.port;
default = 80;
description = lib.mdDoc "Port number to listen on";
description = "Port number to listen on";
};
listenAddress = mkOption {
type = types.str;
default = "127.0.0.1";
description = lib.mdDoc "IP address to listen on";
description = "IP address to listen on";
};
zimPaths = mkOption {
default = null;
type = types.nullOr (types.nonEmptyListOf (types.either types.str types.path));
description = lib.mdDoc "ZIM file path(s)";
description = "ZIM file path(s)";
};
zimDir = mkOption {
default = null;
type = types.nullOr (types.either types.str types.path);
description = lib.mdDoc "ZIM directory";
description = "ZIM directory";
};
};
};

View File

@ -2,7 +2,7 @@
with lib;
{
options.backups.postgresql = mkOption {
description = mdDoc ''
description = ''
Periodic backups of postgresql database to create with Rustic.
'';
type = types.attrsOf (types.submodule ({ name, ... }: {

View File

@ -4,7 +4,7 @@ let
inherit (utils.systemdUtils.unitOptions) unitOption;
in {
options.backups.rclone-sync = mkOption {
description = mdDoc ''
description = ''
Sync buckets beetween two storages.
'';
type = types.attrsOf (types.submodule ({ ... }: {
@ -12,7 +12,7 @@ in {
rcloneConfigFile = mkOption {
type = with types; nullOr path;
default = null;
description = mdDoc ''
description = ''
Path to the file containing rclone configuration. This file
must contain configuration for the remotes specified in this backup
set and also must be readable by root.
@ -21,7 +21,7 @@ in {
syncOpts = mkOption {
type = with types; listOf str;
default = [ "--checksum" "--fast-list" ];
description = mdDoc ''
description = ''
A list of options for 'rclone sync'.
'';
};
@ -31,17 +31,17 @@ in {
source = mkOption {
type = types.str;
default = "";
description = mdDoc "Source to sync.";
description = "Source to sync.";
};
target = mkOption {
type = types.str;
default = "";
description = mdDoc "Target to sync.";
description = "Target to sync.";
};
};
});
default = { };
description = mdDoc ''
description = ''
List of sync targets.
'';
};
@ -52,7 +52,7 @@ in {
RandomizedDelaySec = "15m";
Persistent = true;
};
description = lib.mdDoc ''
description = ''
When to run the backup. See {manpage}`systemd.timer(5)` for details.
'';
};

View File

@ -1,58 +0,0 @@
From e0f8aaa755eda1fd65dbe5f330c3cdffacf97cc7 Mon Sep 17 00:00:00 2001
From: kraem <ebrin.ronnie@protonmail.com>
Date: Sun, 18 Sep 2022 22:53:08 +0200
Subject: [PATCH] nixos/ydotool: module init
---
nixos/modules/module-list.nix | 1 +
nixos/modules/programs/ydotool.nix | 29 +++++++++++++++++++
4 files changed, 39 insertions(+)
create mode 100644 nixos/modules/programs/ydotool.nix
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index dce6e878540d5..580d938030685 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -280,6 +280,7 @@
./programs/xwayland.nix
./programs/yabar.nix
./programs/yazi.nix
+ ./programs/ydotool.nix
./programs/yubikey-touch-detector.nix
./programs/zsh/zmap.nix
./programs/zsh/oh-my-zsh.nix
diff --git a/nixos/modules/programs/ydotool.nix b/nixos/modules/programs/ydotool.nix
new file mode 100644
index 0000000000000..f5996059a4c36
--- /dev/null
+++ b/nixos/modules/programs/ydotool.nix
@@ -0,0 +1,29 @@
+{ config, lib, pkgs, ... }:
+
+let
+ cfg = config.programs.ydotool;
+in
+
+{
+
+ options = {
+ programs.ydotool = {
+ enable = lib.mkEnableOption (lib.mdDoc "ydotool, a generic Linux command-line automation tool");
+ };
+ };
+
+ config = lib.mkIf cfg.enable {
+
+ environment.systemPackages = [ pkgs.ydotool ];
+
+ systemd.user.services.ydotoold = {
+ description = "Starts ydotoold service";
+ wantedBy = [ "multi-user.target" ];
+ serviceConfig = {
+ ExecStart = "${pkgs.ydotool}/bin/ydotoold -p $XDG_RUNTIME_DIR/ydotoold.sock";
+ Restart = "always";
+ };
+ };
+ };
+}
+

View File

@ -1,17 +1,25 @@
diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix
index 1f36e36..0e4e1ae 100644
index 072416007e72..89c776e611e5 100644
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -11,9 +11,9 @@ let
@@ -4,16 +4,16 @@ let
# comments with variant added for update script
# ./update-zen.py zen
zenVariant = {
- version = "6.9.3"; #zen
+ version = "6.9.2"; #zen
suffix = "zen1"; #zen
- sha256 = "0vgy249zrzm6kn8wqisnbgbq8h6sffmk1zs6cx57annab9w0sb57"; #zen
+ sha256 = "1fsmpryk7an6xqppvilcf3bmxs41mqpc3v4f4c81jgrikg21gxbb"; #zen
isLqx = false;
};
# ./update-zen.py lqx
lqxVariant = {
- version = "6.8.6"; #lqx
- suffix = "lqx2"; #lqx
- sha256 = "0mxbl0h8s021m0ab12yy778qyhdlb5789qjbn66l8qxsw0dv4ags"; #lqx
+ version = "6.7.12"; #lqx
+ suffix = "lqx1"; #lqx
+ sha256 = "1kcw2jmqmwb1mfqgiwms8i30sqdqzs8qvjfslyc9bcidpyg6qrqf"; #lqx
- version = "6.9.3"; #lqx
+ version = "6.8.11"; #lqx
suffix = "lqx1"; #lqx
- sha256 = "1wfjw5fq7myvhfb6srina0b7b76a08ib9x8hd8bdfr4zr6al8zq8"; #lqx
+ sha256 = "1dj4znir4wp6jqs680dcxn8z6p02d518993rmrx54ch04jyy5brj"; #lqx
isLqx = true;
};
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {

View File

@ -1,4 +1,4 @@
{ pkgs, ... }: {
{ config, pkgs, ... }: {
programs.steam.enable = true;
programs.steam.extraCompatPackages = [
pkgs.proton-ge-bin
@ -6,6 +6,10 @@
programs.gamescope.enable = true;
programs.gamescope.capSysNice = false;
home-manager.users.${config.mainuser} = {
home.packages = with pkgs; [ ckan ];
};
startupApplications = [ "${pkgs.steam}/bin/steam" ];
persist.state.homeDirectories = [
@ -15,6 +19,7 @@
# Native games config
".config/WarThunder"
".local/share/BeamNG.drive"
".local/share/CKAN"
".local/share/Transistor"
".local/share/Paradox\ Interactive"
".paradoxlauncher"

View File

@ -71,8 +71,8 @@ with config.deviceSpecific; {
protonhax
protontricks
vkBasalt
wine
winetricks
# wine
# winetricks
];
};

View File

@ -1,5 +1,6 @@
{ config, lib, inputs, ... }: {
{ config, lib, pkgs, inputs, ... }: {
nix = {
package = pkgs.nixVersions.latest;
nixPath = lib.mkForce [ "self=/etc/self/compat" "nixpkgs=/etc/nixpkgs" ];
registry.self.flake = inputs.self;

View File

@ -20,7 +20,6 @@ with lib; {
inputs.ataraxiasjel-nur.overlays.default
inputs.ataraxiasjel-nur.overlays.grub2-argon2
inputs.deploy-rs.overlay
inputs.hyprland.overlays.default
(final: prev:
{
attic = inputs.attic.packages.${system}.attic;
@ -30,8 +29,9 @@ with lib; {
nix-alien = inputs.nix-alien.packages.${system}.nix-alien;
nix-fast-build = inputs.nix-fast-build.packages.${system}.default;
nix-index-update = inputs.nix-alien.packages.${system}.nix-index-update;
prismlauncher = inputs.prismlauncher.packages.${system}.default;
wine = prev.wineWowPackages.staging;
prismlauncher = inputs.prismlauncher.packages.${system}.prismlauncher.override {
jdks = [ pkgs.temurin-bin ];
};
xray = master.xray;
youtube-to-mpv = prev.callPackage ./packages/youtube-to-mpv.nix { term = config.defaultApplications.term.cmd; };
yt-dlp = master.yt-dlp;
@ -72,6 +72,33 @@ with lib; {
yandex-taxi-py = prev.writers.writePython3 "yandex-taxi.py" {
libraries = with prev.python3Packages; [ requests ];
} ./packages/yandex-taxi-py.nix;
spotify-spotx = let
spotx = with prev; stdenv.mkDerivation {
pname = "spotx-bash";
version = "unstable-2023-12-15";
src = fetchFromGitHub {
owner = "SpotX-Official";
repo = "SpotX-Bash";
rev = "a0823cb2f7495f9eaf0c94194abe6d2f0ff1b58c";
hash = "sha256-qgG5m4ajlbq0G6D1Fx2x+yqxcz+OGN1zsfVDO2/koG4=";
};
dontBuild = true;
nativeBuildInputs = [ makeBinaryWrapper ];
installPhase = ''
install -Dm 755 spotx.sh $out/bin/spotx
sed -i 's/sxbLive=.\+/sxbLive=$buildVer/' $out/bin/spotx
patchShebangs $out/bin/spotx
wrapProgram $out/bin/spotx --prefix PATH : ${lib.makeBinPath [ perl unzip zip util-linux ]}
'';
};
in prev.spotify.overrideAttrs (_oa: {
postInstall = ''
${spotx}/bin/spotx -h -P "$out/share/spotify"
rm -f "$out/share/spotify/Apps/xpui.bak" "$out/share/spotify/spotify.bak"
'';
});
spotifywm = prev.spotifywm.override { spotify = final.spotify-spotx; };
}
)
];

View File

@ -1,7 +1,7 @@
{ ... }: {
virtualisation.oci-containers.containers.it-tools = {
autoStart = true;
image = "docker.io/corentinth/it-tools:2023.12.21-5ed3693";
image = "docker.io/corentinth/it-tools:2024.5.13-a0bc346";
ports = [ "127.0.0.1:8070:80/tcp" ];
};
}

View File

@ -11,7 +11,7 @@ in {
TZ = "Europe/Moscow";
};
extraOptions = [ "--pod=media-stack" ];
image = "docker.io/linuxserver/jackett:0.21.1712";
image = "docker.io/linuxserver/jackett:0.21.2606";
volumes = [
"${nas-path}/configs/jackett:/config"
];

View File

@ -1,13 +1,17 @@
{ config, ... }:
{ config, pkgs, ... }:
let
nas-path = "/media/nas/media-stack";
renderGid = toString config.users.groups.render.gid;
videoGid = toString config.users.groups.video.gid;
inputGid = toString config.users.groups.input.gid;
intro-skipper-fix = pkgs.writeText "intro-skipper-fix" ''
#!/bin/bash
chown abc /usr/share/jellyfin/web/index.html
'';
in {
virtualisation.oci-containers.containers.jellyfin = {
autoStart = true;
image = "docker.io/linuxserver/jellyfin:10.8.13";
image = "docker.io/linuxserver/jellyfin:10.9.6";
environment = {
PUID = "1000";
PGID = "100";
@ -25,6 +29,7 @@ in {
volumes = [
"${nas-path}/configs/jellyfin:/config"
"${nas-path}/media:/data/media"
"${intro-skipper-fix}:/custom-cont-init.d/intro-skipper-fix:ro"
];
};
}

View File

@ -4,7 +4,7 @@ let
in {
virtualisation.oci-containers.containers.kavita = {
autoStart = true;
image = "docker.io/jvmilazz0/kavita:0.7.14";
image = "docker.io/jvmilazz0/kavita:0.8.1";
environment = {
PUID = "1000";
PGID = "100";

View File

@ -10,7 +10,7 @@ in {
TZ = "Europe/Moscow";
};
extraOptions = [ "--pod=media-stack" ];
image = "docker.io/linuxserver/lidarr:2.0.7";
image = "docker.io/linuxserver/lidarr:2.3.3";
volumes = [
"${nas-path}/configs/lidarr/config:/config"
"${nas-path}/configs/lidarr/custom-services.d:/custom-services.d"

View File

@ -4,7 +4,7 @@ let
in {
virtualisation.oci-containers.containers.medusa = {
autoStart = true;
image = "docker.io/linuxserver/medusa:1.0.19";
image = "docker.io/linuxserver/medusa:1.0.21";
environment = {
PUID = "1000";
PGID = "100";

View File

@ -4,7 +4,7 @@ let
in {
virtualisation.oci-containers.containers.qbittorrent = {
autoStart = true;
image = "docker.io/linuxserver/qbittorrent:4.6.3";
image = "docker.io/linuxserver/qbittorrent:4.6.4";
environment = {
PUID = "1000";
PGID = "100";

View File

@ -11,7 +11,7 @@ in {
TZ = "Europe/Moscow";
};
extraOptions = [ "--pod=media-stack" ];
image = "docker.io/linuxserver/radarr:5.2.6";
image = "docker.io/linuxserver/radarr:5.6.0";
volumes = [
"${nas-path}/configs/radarr:/config"
"${nas-path}:/data"

View File

@ -9,7 +9,7 @@ in {
TZ = "Europe/Moscow";
};
extraOptions = [ "--pod=media-stack" ];
image = "ghcr.io/recyclarr/recyclarr:6.0.2";
image = "ghcr.io/recyclarr/recyclarr:6.0.3-dev.65";
volumes = [
"${nas-path}/configs/recyclarr:/config"
];

View File

@ -11,7 +11,7 @@ in {
TZ = "Europe/Moscow";
};
extraOptions = [ "--pod=media-stack" ];
image = "docker.io/linuxserver/sonarr:version-4.0.1.929";
image = "docker.io/linuxserver/sonarr:version-4.0.4.1491";
volumes = [
"${nas-path}/configs/sonarr:/config"
"${nas-path}:/data"

View File

@ -11,7 +11,7 @@
services.ocis = {
enable = true;
package = pkgs.ocis-next-bin;
package = pkgs.ocis-bin;
configDir = "/var/lib/ocis/config";
baseDataPath = "/var/lib/ocis/data";
settings = {

View File

@ -3,7 +3,7 @@
in {
virtualisation.oci-containers.containers.spdf = {
autoStart = true;
image = "docker.io/frooodle/s-pdf:0.20.2";
image = "docker.io/frooodle/s-pdf:0.23.1";
environment = {
PUID = "1000";
PGID = "100";

View File

@ -28,7 +28,7 @@
rejectPackets = false;
};
};
system.stateVersion = "22.11";
system.stateVersion = "24.11";
};
};
}

View File

@ -4,14 +4,28 @@ let
name = "blog-hook";
runtimeInputs = with pkgs; [ git hugo openssh go ];
text = ''
git pull
if [ ! -d ".git" ]; then
git init -b master && \
git remote add origin https://code.ataraxiadev.com/AtaraxiaDev/ataraxiadev-blog.git && \
git fetch && \
git symbolic-ref refs/remotes/origin/HEAD refs/remotes/origin/master && \
git reset --hard origin/master && \
git branch --set-upstream-to=origin/master
else
git fetch origin master
git reset --hard origin/master
fi
hugo -d ../docroot
'';
};
in {
sops.secrets.webhook-blog.sopsFile = inputs.self.secretsDir + /home-hypervisor/webhooks.yaml;
sops.secrets.webhook-blog.owner = "webhook";
sops.secrets.webhook-blog.restartUnits = [ "webhook.service" ];
sops.secrets.webhook-env.sopsFile = inputs.self.secretsDir + /home-hypervisor/webhooks.yaml;
sops.secrets.webhook-env.owner = "webhook";
sops.secrets.webhook-env.restartUnits = [ "webhook.service" ];
systemd.tmpfiles.rules = [
"d /srv/http/ataraxiadev.com/gitrepo 0755 webhook acme -"
];
persist.state.directories = [ "/var/lib/webhook" ];
@ -23,7 +37,7 @@ in {
home = "/var/lib/webhook";
};
systemd.services.webhook.serviceConfig.EnvironmentFile = config.sops.secrets.webhook-blog.path;
systemd.services.webhook.serviceConfig.EnvironmentFile = config.sops.secrets.webhook-env.path;
services.webhook = {
enable = true;
port = 9510;

View File

@ -93,7 +93,7 @@ with config.deviceSpecific; {
"/var/lib/lxd"
];
networking.firewall.interfaces."podman+".allowedUDPPorts = [ 53 ];
networking.firewall.interfaces."podman+".allowedUDPPorts = [ 53 5353 ];
# cross compilation of aarch64 uefi currently broken
# link existing extracted from fedora package

View File

@ -23,12 +23,9 @@ let
hyprpaper-pkg = inputs.hyprpaper.packages.${pkgs.hostPlatform.system}.hyprpaper;
in with config.deviceSpecific; with lib; {
imports = [ inputs.hyprland.nixosModules.default ];
programs.ydotool.enable = true;
programs.hyprland.enable = true;
home-manager.users.${config.mainuser} = {
imports = [ inputs.hyprland.homeManagerModules.default ];
services.udiskie.enable = !isServer;
services.gammastep = {
enable = !isServer;

View File

@ -44,7 +44,7 @@ with config.deviceSpecific; {
"/var/lib/nixos"
"/var/lib/systemd"
] ++ lib.optionals config.services.postgresql.enable [
config.services.postgresql.dataDir
"/var/lib/postgresql"
] ++ lib.optionals config.services.mysql.enable [
config.services.mysql.dataDir
];

View File

@ -1,12 +1,12 @@
webhook-blog: ENC[AES256_GCM,data:0y0fdUR4Ci/TIYhpRMpz6PGWi0UDka1m6z4/SnGU3ln9WpreOVvvuQMIA2bzohDwAV1BI00jXR+llH/3lFOSbSgVGY9th5uNWivGSewvjqZm,iv:lMX32BcOdZXft51IMSETQodFlYak1jqDchuVEPPxU1o=,tag:c73y1Vd61K0Vqiep3siVhw==,type:str]
webhook-env: ENC[AES256_GCM,data:memezKRp3paJLFQdjx4GVy8Kp3+W2SGKvu7TWMJyi6WNKdxXPEYi2dvH6w/5jwWQfua6SI6MzjPJ6uVMJYBgzUedzEV8T6I/htJDAXiPXPBz/feSQAOMZvsecxAMA6XHP5C0I0Yy+ehILXa3rpBNsF4eV69bzS5kJZ2oDQBB5BH4vb/RRHJUgoIR1+BRVDI9mEQ3AzX7+Tdix+hLhXVtYVJ/JPo=,iv:9BcKyFJOzXTyQ0RNeYjKnpZKLbDn8fMPmpJOCuSwiY4=,tag:i6iGl8I6oaMArGgsMNeJPw==,type:str]
sops:
kms: []
gcp_kms: []
azure_kv: []
hc_vault: []
age: []
lastmodified: "2024-01-21T19:26:05Z"
mac: ENC[AES256_GCM,data:iRKh4faThFId7VBi1D2k0oUjmSDMA1BWGiVcRUWyknzT1rbZJ1Tk/sT6LgQciiDU/wKLOJG0VMB3A4bRZgJ/HebCFqox2iPWtConQ8GMhOLSp/zrLuzvrrtsJKX8LGcp2fukCS0/yWeDS/ZkSBqgzxNA/VZsTTM3Lzf2ExYAito=,iv:Jgtdr2h1rK34X4nJVr0YJG31WXO9hh0TS994T4TWMFQ=,tag:MtjgZsJB8lGzXwhFz/7rtQ==,type:str]
lastmodified: "2024-04-23T22:22:42Z"
mac: ENC[AES256_GCM,data:qUbprUKUZz9sLWzoIKTl0DRlCCBnIGpzUxHuqviyUMLItK1OY33nQzl71OcAol/bQ1YTvlrw6i1oHANGyMy4I2VySPGfhSnkAt+6mIgu2Zzx4ZpVr9iNZzt7sGkFw/EU+bJ2tfYMXf1Rk/te/P/gSbEDBavaohJxPh0tXJ/28LQ=,iv:FtwuC5NRWG0AoTdUUonEiVjeD8v/EJNENWX8k8Qdl3A=,tag:V2ovIMSH+pNbuPvTjSfAKg==,type:str]
pgp:
- created_at: "2024-01-21T19:25:51Z"
enc: |-