AtaraxiaDev/nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

upgrade

Browse Source
This commit is contained in:
Dmitriy Kholkin 2023-08-04 02:37:47 +03:00
parent ab988216b1
commit 80b82381f2
15 changed files with 197 additions and 246 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

285
flake.lock generated
View File

@ -3,16 +3,14 @@
"aagl": {
"inputs": {
"flake-compat": "flake-compat",
"nixpkgs": [
"nixpkgs"
]
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1686500461,
"narHash": "sha256-r06ks/3dmCCOyBTqedp5LOgsFsqTmpNMyhWxH0tUKoM=",
"lastModified": 1690857210,
"narHash": "sha256-bErcYz5Inngw7qaKRdywuX5uY62OFl/7izdjtFILhyU=",
"owner": "ezKEa",
"repo": "aagl-gtk-on-nix",
"rev": "18145e8cd922ea0816c8a7abe492cfb70dda5828",
"rev": "4a27e6b2311df108458dca510a84e1a32fda0791",
"type": "github"
},
"original": {
@ -24,11 +22,11 @@
"arkenfox-userjs": {
"flake": false,
"locked": {
"lastModified": 1683284168,
"narHash": "sha256-EWa9vkzprNuBFV+HpO6yBrClVtMTI5QmChErISW/SZY=",
"lastModified": 1690346220,
"narHash": "sha256-knJa1zI27NsKGwpps3MMrG9K7HDGCDnoRfm16pNR/yM=",
"owner": "arkenfox",
"repo": "user.js",
"rev": "04e6e77439bfa6e3f6b7b9c5e0afac7f74f0586a",
"rev": "4d78abf2bfafbbcb03f8f6d6aaaf7e69b7cfee4e",
"type": "github"
},
"original": {
@ -42,15 +40,15 @@
"crane": "crane",
"flake-compat": "flake-compat_2",
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs",
"nixpkgs": "nixpkgs_2",
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1686620679,
"narHash": "sha256-Ck/r3f+W9mOn3cHn5ii/fogBiJtosFnDaOQveaJ0zVU=",
"lastModified": 1689457600,
"narHash": "sha256-1XLn2ZZMaqQx+Ys3eel5hQRkgUn3DeHcVb2JT8WYU0A=",
"owner": "zhaofengli",
"repo": "attic",
"rev": "4fedffe6a1020edfcfa7bef18d21321d4983b3a7",
"rev": "4902d57f5dae8ec660ee9ee14c45c2192f9fe8b1",
"type": "github"
},
"original": {
@ -62,7 +60,7 @@
"base16": {
"inputs": {
"flake-utils-plus": "flake-utils-plus",
"nixpkgs": "nixpkgs_2"
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1665506760,
@ -163,7 +161,7 @@
"deploy-rs": {
"inputs": {
"flake-compat": "flake-compat_3",
"nixpkgs": "nixpkgs_3",
"nixpkgs": "nixpkgs_4",
"utils": "utils"
},
"locked": {
@ -187,11 +185,11 @@
]
},
"locked": {
"lastModified": 1687134796,
"narHash": "sha256-gjBAkEtNPMQzqK4IHjTQBUv3VhggszOHLJbhXZy0OVQ=",
"lastModified": 1690739034,
"narHash": "sha256-roW02IaiQ3gnEEDMCDWL5YyN+C4nBf/te6vfL7rG0jk=",
"owner": "nix-community",
"repo": "disko",
"rev": "4823509bb3b014dc85abefc13efcfa076d36338a",
"rev": "4015740375676402a2ee6adebc3c30ea625b9a94",
"type": "github"
},
"original": {
@ -365,11 +363,11 @@
"flake-registry": {
"flake": false,
"locked": {
"lastModified": 1682423975,
"narHash": "sha256-zvOBrH3hwCedgpaWiOSHYSt+fgF/RhaJs8R5qOX6AYc=",
"lastModified": 1689333397,
"narHash": "sha256-g1Nn0sgH/hR/gEAQ1q6bloU+Q+V+Y4HlBBH6CBxC0HM=",
"owner": "nixos",
"repo": "flake-registry",
"rev": "8054bfa00d60437297d670ab3296a117e7059a10",
"rev": "5d8dc3eb692809ffd9a2f22cdb8015aa11972905",
"type": "github"
},
"original": {
@ -479,11 +477,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1685518550,
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
"lastModified": 1689068808,
"narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
"rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
"type": "github"
},
"original": {
@ -497,11 +495,11 @@
"systems": "systems_2"
},
"locked": {
"lastModified": 1685518550,
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
"lastModified": 1689068808,
"narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
"rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
"type": "github"
},
"original": {
@ -590,11 +588,11 @@
]
},
"locked": {
"lastModified": 1686852570,
"narHash": "sha256-Hzufya/HxjSliCwpuLJCGY0WCQajzcpsnhFGa+TCkCM=",
"lastModified": 1690846837,
"narHash": "sha256-ZZ8YPOEdZG0zz61U4sfUAx28oEdqLdtG1iWTTH/98uc=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "4e09c83255c5b23d58714d56672d3946faf1bcef",
"rev": "4fd794d3df88735dcf9662155d77b08a2e2dde29",
"type": "github"
},
"original": {
@ -603,39 +601,19 @@
"type": "github"
}
},
"hoyolab-daily-bot": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1683056534,
"narHash": "sha256-KS6tyrZUrtyMFY5tI0EDcagjwErHY/I1GDSecxbQ3jc=",
"owner": "AtaraxiaSjel",
"repo": "hoyolab-daily-bot",
"rev": "184e85c286e7049014f0ce47016afb49426b2f16",
"type": "github"
},
"original": {
"owner": "AtaraxiaSjel",
"repo": "hoyolab-daily-bot",
"type": "github"
}
},
"hyprland": {
"inputs": {
"hyprland-protocols": "hyprland-protocols",
"nixpkgs": "nixpkgs_4",
"nixpkgs": "nixpkgs_5",
"wlroots": "wlroots",
"xdph": "xdph"
},
"locked": {
"lastModified": 1686859678,
"narHash": "sha256-I9+z7lVqGvQVa9L8LBZ1ka7fdpyuzBDUUYsJGeN1jCw=",
"lastModified": 1690728397,
"narHash": "sha256-jq6iXkZDWWOloyr1RoEZUXSZthfm5fRMOTR6plfQ0zE=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "302ec1372c40cd4130101920c2f6c38cad6fc9dc",
"rev": "08651736ada39f62b246c44c1d8a81e2787f23d5",
"type": "github"
},
"original": {
@ -672,11 +650,11 @@
]
},
"locked": {
"lastModified": 1685950944,
"narHash": "sha256-59by/hDMxPhq2KLRdjL5n5HoQjbfLdpykOa7BG6gEYw=",
"lastModified": 1690361100,
"narHash": "sha256-e3V2avzF3yY+OBWr5fZ5jTHq6Jm2olnmd95E2jAkyCY=",
"owner": "hyprwm",
"repo": "hyprpaper",
"rev": "64d0ebd66652a5614b645b1ffb4d592ba50d532a",
"rev": "9261356bd74fadbc544bec22c16aec62ebba13bd",
"type": "github"
},
"original": {
@ -753,7 +731,7 @@
"flake-compat": "flake-compat_4",
"flake-utils": "flake-utils_4",
"nix": "nix",
"nixpkgs": "nixpkgs_6"
"nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1669478601,
@ -793,7 +771,7 @@
"nix": {
"inputs": {
"lowdown-src": "lowdown-src",
"nixpkgs": "nixpkgs_5",
"nixpkgs": "nixpkgs_6",
"nixpkgs-regression": "nixpkgs-regression"
},
"locked": {
@ -820,11 +798,11 @@
]
},
"locked": {
"lastModified": 1686821103,
"narHash": "sha256-oR351MnEaWRg27r1aF+qBoimbIMPzhjpc2w3M7p7MeM=",
"lastModified": 1689420272,
"narHash": "sha256-n2gIdoXreY1tHfoGZLg3I/aW544DU6hMaJHblrOiFpY=",
"owner": "thiagokokada",
"repo": "nix-alien",
"rev": "f01de15b12e4270b567999a94aee2335e4e84ca9",
"rev": "7ab7239f3751be944b7cd39095b10585ae688525",
"type": "github"
},
"original": {
@ -836,14 +814,14 @@
"nix-direnv": {
"inputs": {
"flake-utils": "flake-utils_6",
"nixpkgs": "nixpkgs_8"
"nixpkgs": "nixpkgs_9"
},
"locked": {
"lastModified": 1686544557,
"narHash": "sha256-HoNDdVvvuS+X4JQuRXu5VcXOKCERrocuPL7ACeulU2o=",
"lastModified": 1690444557,
"narHash": "sha256-jCpEcbdgC1CnCFOXIUnNGgCTMCIHLnMR3oeFLf4FQLo=",
"owner": "nix-community",
"repo": "nix-direnv",
"rev": "73c4546a80eedb90d29d23b902c41b7cdce91ebe",
"rev": "ed2cb75553b4864e3c931a48e3a2cd43b93152c5",
"type": "github"
},
"original": {
@ -860,11 +838,11 @@
]
},
"locked": {
"lastModified": 1686740472,
"narHash": "sha256-b668DY2qGdBCUwIkk6Z32bcpCsUISQJrEEvhtn1gGgY=",
"lastModified": 1688874465,
"narHash": "sha256-BUwl+tq40EjkufTZkqf3lWFzxOA/mYBTHz+p5uJtjaY=",
"owner": "Mic92",
"repo": "nix-index-database",
"rev": "e11c61073b777e025993c5ef63ddbf776a9cca15",
"rev": "757114749d4613cf71f3748e780a1be8a67a5d3c",
"type": "github"
},
"original": {
@ -882,11 +860,11 @@
]
},
"locked": {
"lastModified": 1686792204,
"narHash": "sha256-nuNalSaeb77kb1M1p9UnWE2/ckE6z25zLyKBb62Ykhs=",
"lastModified": 1690853837,
"narHash": "sha256-Tt/+WBJ6tCQxZ038fX7TmffcNEN1InRKgeh/fu0FUrs=",
"owner": "nix-community",
"repo": "nix-vscode-extensions",
"rev": "b03bae8a54cd3a92d1458bd3a34132582539cd05",
"rev": "acecc7629e0f7ab444f38369f972ba57a5e59e32",
"type": "github"
},
"original": {
@ -899,30 +877,31 @@
"inputs": {
"flake-compat": "flake-compat_5",
"lowdown-src": "lowdown-src_2",
"nixpkgs": "nixpkgs_7",
"nixpkgs": "nixpkgs_8",
"nixpkgs-regression": "nixpkgs-regression_2"
},
"locked": {
"lastModified": 1686829784,
"narHash": "sha256-szRWXTvKIeWquR4MM35MMGLbn17/csXrKdVY5YQWZfo=",
"lastModified": 1690219894,
"narHash": "sha256-QMYAkdtU+g9HlZKtoJ+AI6TbWzzovKGnPZJHfZdclc8=",
"owner": "nixos",
"repo": "nix",
"rev": "e672d52f7caae591e4d07747a312f2bef538bbea",
"rev": "a212300a1d9f9c7b0daf19c00c87fc50480f54f4",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "2.17.0",
"repo": "nix",
"type": "github"
}
},
"nixlib": {
"locked": {
"lastModified": 1685840432,
"narHash": "sha256-VJIbiKsY7Xy4E4WcgwUt/UiwYDmN5BAk8tngAjcWsqY=",
"lastModified": 1689469483,
"narHash": "sha256-2SBhY7rZQ/iNCxe04Eqxlz9YK9KgbaTMBssq3/BgdWY=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "961e99baaaa57f5f7042fe7ce089a88786c839f4",
"rev": "02fea408f27186f139153e1ae88f8ab2abd9c22c",
"type": "github"
},
"original": {
@ -939,11 +918,11 @@
]
},
"locked": {
"lastModified": 1686644215,
"narHash": "sha256-FYa25w7gt8FqzWLl4UuwLLG7BiKZiAW/PFGbXWW6UAc=",
"lastModified": 1690133435,
"narHash": "sha256-YNZiefETggroaTLsLJG2M+wpF0pJPwiauKG4q48ddNU=",
"owner": "nix-community",
"repo": "nixos-generators",
"rev": "f17fb67fc81a9f3b166cee711089466ba6617154",
"rev": "b1171de4d362c022130c92d7c8adc4bf2b83d586",
"type": "github"
},
"original": {
@ -954,16 +933,16 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1686519857,
"narHash": "sha256-VkBhuq67aXXiCoEmicziuDLUPPjeOTLQoj6OeVai5zM=",
"owner": "NixOS",
"lastModified": 1691006197,
"narHash": "sha256-DbtxVWPt+ZP5W0Usg7jAyTomIM//c3Jtfa59Ht7AV8s=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "6b1b72c0f887a478a5aac355674ff6df0fc44f44",
"rev": "66aedfd010204949cb225cf749be08cb13ce1813",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
@ -983,6 +962,21 @@
"type": "indirect"
}
},
"nixpkgs-23_05": {
"locked": {
"lastModified": 1684782344,
"narHash": "sha256-SHN8hPYYSX0thDrMLMWPWYulK3YFgASOrCsIL3AJ78g=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8966c43feba2c701ed624302b6a935f97bcbdf88",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-23.05",
"type": "indirect"
}
},
"nixpkgs-lib": {
"locked": {
"dir": "lib",
@ -1003,11 +997,11 @@
},
"nixpkgs-master": {
"locked": {
"lastModified": 1686858960,
"narHash": "sha256-YO8CVbKQPOUZcpbNHVF2WWKrs+AByCbdggUYc6qAvzs=",
"lastModified": 1690858292,
"narHash": "sha256-BtXTL2KdJ084aZB+UuHj+6j/jpAbsKkV06KAeXCJqfU=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "95c729c030b3011c5c89107ac9fa30f7249135fe",
"rev": "7cf96f8ebb562afa7bf2f40f0d5d06cb7fe096dd",
"type": "github"
},
"original": {
@ -1067,11 +1061,11 @@
},
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1686921029,
"narHash": "sha256-J1bX9plPCFhTSh6E3TWn9XSxggBh/zDD4xigyaIQBy8=",
"lastModified": 1690726002,
"narHash": "sha256-cACz6jCJZtsZHGCJAN4vMobxzH5s6FCOTZHMrh/Hu0M=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "c7ff1b9b95620ce8728c0d7bd501c458e6da9e04",
"rev": "391e8db1f06c3f74c2d313a73135515023af3993",
"type": "github"
},
"original": {
@ -1082,6 +1076,22 @@
}
},
"nixpkgs_10": {
"locked": {
"lastModified": 1690789960,
"narHash": "sha256-3K+2HuyGTiJUSZNJxXXvc0qj4xFx1FHC/ItYtEa7/Xs=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "fb942492b7accdee4e6d17f5447091c65897dde4",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_11": {
"locked": {
"lastModified": 1685012353,
"narHash": "sha256-U3oOge4cHnav8OLGdRVhL45xoRj4Ppd+It6nPC9nNIU=",
@ -1098,6 +1108,22 @@
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1686519857,
"narHash": "sha256-VkBhuq67aXXiCoEmicziuDLUPPjeOTLQoj6OeVai5zM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "6b1b72c0f887a478a5aac355674ff6df0fc44f44",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1665466769,
"narHash": "sha256-L+qcHpb4Ac3PipMXJY/Ktbu1+KXy23WCZ8pXWmsf7zY=",
@ -1113,7 +1139,7 @@
"type": "github"
}
},
"nixpkgs_3": {
"nixpkgs_4": {
"locked": {
"lastModified": 1671417167,
"narHash": "sha256-JkHam6WQOwZN1t2C2sbp1TqMv3TVRjzrdoejqfefwrM=",
@ -1129,13 +1155,13 @@
"type": "github"
}
},
"nixpkgs_4": {
"nixpkgs_5": {
"locked": {
"lastModified": 1686592866,
"narHash": "sha256-riGg89eWhXJcPNrQGcSwTEEm7CGxWC06oSX44hajeMw=",
"lastModified": 1690179384,
"narHash": "sha256-+arbgqFTAtoeKtepW9wCnA0njCOyoiDFyl0Q0SBSOtE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0eeebd64de89e4163f4d3cf34ffe925a5cf67a05",
"rev": "b12803b6d90e2e583429bb79b859ca53c348b39a",
"type": "github"
},
"original": {
@ -1145,7 +1171,7 @@
"type": "github"
}
},
"nixpkgs_5": {
"nixpkgs_6": {
"locked": {
"lastModified": 1657693803,
"narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=",
@ -1161,7 +1187,7 @@
"type": "github"
}
},
"nixpkgs_6": {
"nixpkgs_7": {
"locked": {
"lastModified": 1669378442,
"narHash": "sha256-nm+4PN0A4SnV0SzEchxrMyKPvI3Ld/aoom4PnHeHucs=",
@ -1177,7 +1203,7 @@
"type": "github"
}
},
"nixpkgs_7": {
"nixpkgs_8": {
"locked": {
"lastModified": 1670461440,
"narHash": "sha256-jy1LB8HOMKGJEGXgzFRLDU1CBGL0/LlkolgnqIsF0D8=",
@ -1193,13 +1219,13 @@
"type": "github"
}
},
"nixpkgs_8": {
"nixpkgs_9": {
"locked": {
"lastModified": 1686488075,
"narHash": "sha256-2otSBt2hbeD+5yY25NF3RhWx7l5SDt1aeU3cJ/9My4M=",
"lastModified": 1690327932,
"narHash": "sha256-Fv7PYZxN4eo0K6zXhHG/vOc+e2iuqQ5ywDrh0yeRjP0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9401a0c780b49faf6c28adf55764f230301d0dce",
"rev": "a9b47d85504bdd199e90846622c76aa0bfeabfac",
"type": "github"
},
"original": {
@ -1209,29 +1235,13 @@
"type": "github"
}
},
"nixpkgs_9": {
"locked": {
"lastModified": 1686592866,
"narHash": "sha256-riGg89eWhXJcPNrQGcSwTEEm7CGxWC06oSX44hajeMw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "0eeebd64de89e4163f4d3cf34ffe925a5cf67a05",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nur": {
"locked": {
"lastModified": 1688546999,
"narHash": "sha256-fW0BKoMIsukWt0C/K47gHuVe2M+UyqfOS/pmZUqCmYs=",
"lastModified": 1691012695,
"narHash": "sha256-hn9KSrnnhMhQfGIPXXiYPXP9Yk/qNsAlmlrK2pwO84s=",
"owner": "nix-community",
"repo": "NUR",
"rev": "3d4890e8ed7d295a88d0e8951916a45bc19d2f7f",
"rev": "71c5a740795a69675156fda522844766bd382421",
"type": "github"
},
"original": {
@ -1276,7 +1286,7 @@
"flake-compat": "flake-compat_8",
"flake-parts": "flake-parts",
"libnbtplusplus": "libnbtplusplus",
"nixpkgs": "nixpkgs_10",
"nixpkgs": "nixpkgs_11",
"pre-commit-hooks": "pre-commit-hooks"
},
"locked": {
@ -1329,7 +1339,6 @@
"flake-registry": "flake-registry",
"flake-utils-plus": "flake-utils-plus_2",
"home-manager": "home-manager",
"hoyolab-daily-bot": "hoyolab-daily-bot",
"hyprland": "hyprland",
"hyprpaper": "hyprpaper",
"impermanence": "impermanence",
@ -1339,7 +1348,7 @@
"nix-direnv": "nix-direnv",
"nix-vscode-marketplace": "nix-vscode-marketplace",
"nixos-generators": "nixos-generators",
"nixpkgs": "nixpkgs_9",
"nixpkgs": "nixpkgs_10",
"nixpkgs-master": "nixpkgs-master",
"nixpkgs-stable": "nixpkgs-stable_2",
"nur": "nur",
@ -1380,11 +1389,11 @@
"rycee": {
"flake": false,
"locked": {
"lastModified": 1686838518,
"narHash": "sha256-MqwA95DbSSCmk1mgL12TEdc1rQ7uyqxUDGLikrfj9yw=",
"lastModified": 1690846992,
"narHash": "sha256-984kCqfp5yzJRuVjP8878jHG2U2wBNmgEzJ6pzS58oY=",
"owner": "rycee",
"repo": "nur-expressions",
"rev": "c063e239e617477b89a320349bfbf6c1a243c642",
"rev": "dfabae8b63af61b48f5bb8a208a37b1cb1f7c985",
"type": "gitlab"
},
"original": {
@ -1401,14 +1410,15 @@
"nixpkgs"
],
"nixpkgs-22_11": "nixpkgs-22_11",
"nixpkgs-23_05": "nixpkgs-23_05",
"utils": "utils_3"
},
"locked": {
"lastModified": 1686468558,
"narHash": "sha256-K69Ojlx3N8I6tRTZsrKFMIqK4yrnJ6/PjfKZi3wchYg=",
"lastModified": 1689976554,
"narHash": "sha256-uWJq3sIhkqfzPmfB2RWd5XFVooGFfSuJH9ER/r302xQ=",
"owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver",
"rev": "290d00f6db4e80467013728819ad73dd4a394d9a",
"rev": "c63f6e7b053c18325194ff0e274dba44e8d2271e",
"type": "gitlab"
},
"original": {
@ -1547,17 +1557,18 @@
"flake": false,
"locked": {
"host": "gitlab.freedesktop.org",
"lastModified": 1686753331,
"narHash": "sha256-KovjVFwcuoUO0eu/UiWrnD3+m/K+SHSAVIz4xF9K1XA=",
"lastModified": 1690165843,
"narHash": "sha256-gv5kjss6REeQG0BmvK2gTx7jHLRdCnP25po6It6I6N8=",
"owner": "wlroots",
"repo": "wlroots",
"rev": "7e7633abf09b362d0bad9e3fc650fd692369291d",
"rev": "e8d545a9770a2473db32e0a0bfa757b05d2af4f3",
"type": "gitlab"
},
"original": {
"host": "gitlab.freedesktop.org",
"owner": "wlroots",
"repo": "wlroots",
"rev": "e8d545a9770a2473db32e0a0bfa757b05d2af4f3",
"type": "gitlab"
}
},

10
flake.nix
View File

@ -6,7 +6,7 @@
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-master.url = "github:nixos/nixpkgs/master";
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.05";
nix.url = "github:nixos/nix";
nix.url = "github:nixos/nix/2.17.0";
flake-registry = {
url = "github:nixos/flake-registry";
flake = false;
@ -18,7 +18,7 @@
impermanence.url = "github:AtaraxiaSjel/impermanence";
aagl = {
url = "github:ezKEa/aagl-gtk-on-nix";
inputs.nixpkgs.follows = "nixpkgs";
# inputs.nixpkgs.follows = "nixpkgs";
};
arkenfox-userjs = {
url = "github:arkenfox/user.js";
@ -39,10 +39,6 @@
url = "github:nix-community/disko";
inputs.nixpkgs.follows = "nixpkgs";
};
hoyolab-daily-bot = {
url = "github:AtaraxiaSjel/hoyolab-daily-bot";
inputs.nixpkgs.follows = "nixpkgs";
};
hyprland.url = "github:hyprwm/Hyprland";
hyprpaper = {
url = "github:hyprwm/hyprpaper";
@ -113,7 +109,7 @@
nixosRoles = import ./roles;
sharedPatches = patchesPath [
"gitea-208605.patch"
"gitea-241497.patch"
"ivpn.patch"
"mullvad-exclude-containers.patch"
"vaultwarden.patch"

4
machines/Arch-Builder-VM/default.nix
View File

@ -22,8 +22,8 @@
services.udisks2.enable = lib.mkForce false;
nix.optimise.automatic = false;
fonts.enableDefaultFonts = lib.mkForce false;
fonts.fonts = [ (pkgs.nerdfonts.override { fonts = [ "FiraCode" "VictorMono" ]; }) ];
fonts.enableDefaultPackages = lib.mkForce false;
fonts.packages = [ (pkgs.nerdfonts.override { fonts = [ "FiraCode" "VictorMono" ]; }) ];
security.polkit.enable = true;

4
machines/Home-Hypervisor/default.nix
View File

@ -106,8 +106,8 @@ in {
xdg.sounds.enable = lib.mkForce false;
services.udisks2.enable = lib.mkForce false;
fonts.enableDefaultFonts = lib.mkForce false;
fonts.fonts =
fonts.enableDefaultPackages = lib.mkForce false;
fonts.packages =
[ (pkgs.nerdfonts.override { fonts = [ "FiraCode" "VictorMono" ]; }) ];
security.polkit.enable = true;

2
machines/Home-Hypervisor/virtualisation.nix
View File

@ -41,7 +41,7 @@
ovmf.enable = true;
ovmf.packages = [
pkgs.OVMFFull.fd
pkgs.pkgsCross.aarch64-multiplatform.OVMF.fd
# pkgs.pkgsCross.aarch64-multiplatform.OVMF.fd
];
runAsRoot = false;
};

36
patches/gitea-208605.patch
View File

@ -1,36 +0,0 @@
diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix
index 014c5b16097..c559edc6978 100644
--- a/nixos/modules/services/misc/gitea.nix
+++ b/nixos/modules/services/misc/gitea.nix
@@ -569,7 +569,10 @@ in
Restart = "always";
# Runtime directory and mode
RuntimeDirectory = "gitea";
- RuntimeDirectoryMode = "0755";
+ RuntimeDirectoryMode = "0750";
+ # Proc filesystem
+ ProcSubset = "pid";
+ ProtectProc = "invisible";
# Access write directories
ReadWritePaths = [ cfg.dump.backupDir cfg.repositoryRoot cfg.stateDir cfg.lfs.contentDir ];
UMask = "0027";
@@ -589,15 +592,17 @@ in
ProtectKernelModules = true;
ProtectKernelLogs = true;
ProtectControlGroups = true;
- RestrictAddressFamilies = [ "AF_UNIX AF_INET AF_INET6" ];
+ RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ];
+ RestrictNamespaces = true;
LockPersonality = true;
MemoryDenyWriteExecute = true;
+ RemoveIPC = true;
RestrictRealtime = true;
RestrictSUIDSGID = true;
PrivateMounts = true;
# System Call Filtering
SystemCallArchitectures = "native";
- SystemCallFilter = "~@clock @cpu-emulation @debug @keyring @module @mount @obsolete @raw-io @reboot @setuid @swap";
+ SystemCallFilter = [ "~@clock ~@cpu-emulation @debug @keyring @module @mount @obsolete @privileged @setuid" "setrlimit" ];
};
environment = {

22
patches/gitea-241497.patch Normal file
View File

@ -0,0 +1,22 @@
From 5205c73d9311bcf458ed0fe1f4ce381bf3842b3d Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Thu, 29 Jun 2023 18:26:51 +0200
Subject: [PATCH] nixos/gitea: add WORK_PATH to config
this is in preparation for 1.20, which needs this option set
---
nixos/modules/services/misc/gitea.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix
index 72fad73bae509..7e7ac355edda9 100644
--- a/nixos/modules/services/misc/gitea.nix
+++ b/nixos/modules/services/misc/gitea.nix
@@ -15,6 +15,7 @@ let
APP_NAME = ${cfg.appName}
RUN_USER = ${cfg.user}
RUN_MODE = prod
+ WORK_PATH = ${cfg.stateDir}
${generators.toINI {} cfg.settings}

13
patches/zen-kernels.patch
View File

@ -1,16 +1,17 @@
diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix
index 2e0a9cf..a4421eb 100644
index 9455f88..54cec49 100644
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -11,9 +11,9 @@ let
};
# ./update-zen.py lqx
lqxVariant = {
- version = "6.3.4"; #lqx
+ version = "6.3.8"; #lqx
suffix = "lqx1"; #lqx
- sha256 = "06xkcrd4wjpj23dnrfbyxyx1699vxzswb3r6p2xjwmpy44j5wjgf"; #lqx
+ sha256 = "1slqnqnfpws1m3l716lvw87kdf3mb87ka3iyjsyrzn9d4ysjd7m7"; #lqx
- version = "6.4.2"; #lqx
- suffix = "lqx1"; #lqx
- sha256 = "14hr88lbwm2pz3knw6nxlahdk4pwwb4ya63mrd7zg7g1x2xhfb59"; #lqx
+ version = "6.3.11"; #lqx
+ suffix = "lqx2"; #lqx
+ sha256 = "0hpzafw2zwy25ss4cwj6mm8pr1nnv680m8bfcal29f7gaxbm96k8"; #lqx
isLqx = true;
};
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {

9
profiles/applications/games/hoyo.nix
View File

@ -1,12 +1,9 @@
{ inputs, config, lib, pkgs, ... }: {
imports = [ inputs.aagl.nixosModules.default ];
# programs.honkers-railway-launcher.enable = true;
networking.mihoyo-telemetry.block = true;
home-manager.users.${config.mainuser}.home.packages = [
inputs.aagl.packages.${pkgs.hostPlatform.system}.honkers-railway-launcher
];
nix.settings = inputs.aagl.nixConfig;
programs.honkers-railway-launcher.enable = true;
networking.mihoyo-telemetry.block = lib.mkForce true;
persist.state.homeDirectories = [
".local/share/honkers-railway-launcher"

2
profiles/applications/vscode/default.nix
View File

@ -37,7 +37,6 @@ in
vscode.alefragnani.bookmarks
vscode.alefragnani.project-manager
vscode.alexisvt.flutter-snippets
vscode.bungcip.better-toml
vscode.catppuccin.catppuccin-vsc
vscode.christian-kohler.path-intellisense
vscode.codezombiech.gitignore
@ -61,6 +60,7 @@ in
nixpkgs.ms-vscode-remote.remote-ssh #FIX later
vscode.pkief.material-icon-theme
nixpkgs.rust-lang.rust-analyzer
vscode.tamasfe.even-better-toml
vscode.ultram4rine.vscode-choosealicense
# Django
nixpkgs.ms-python.python

13
profiles/network.nix
View File

@ -28,23 +28,10 @@ with config.deviceSpecific;
firewall = {
enable = true;
allowPing = true;
# allowedTCPPorts = lib.mkIf isGaming [ 25565 ];
# allowedTCPPorts = [ 80 443 9443 8080 8081 ];
# allowedUDPPorts = [ 80 443 9443 8080 8081 ];
};
usePredictableInterfaceNames = true;
hostName = config.device;
extraHosts = lib.mkIf isGaming ''
0.0.0.0 log-upload-os.mihoyo.com
0.0.0.0 overseauspider.yuanshen.com
0.0.0.0 prd-lender.cdp.internal.unity3d.com
0.0.0.0 thind-prd-knob.data.ie.unity3d.com
0.0.0.0 thind-gke-usc.prd.data.corp.unity3d.com
0.0.0.0 cdp.cloud.unity3d.com
0.0.0.0 remote-config-proxy-prd.uca.cloud.unity3d.com
'';
};
persist.state.directories = lib.mkIf config.networking.networkmanager.enable [

7
profiles/overlay.nix
View File

@ -26,7 +26,6 @@ with lib; {
attic-static = inputs.attic.packages.${system}.attic-static;
cassowary-py = inputs.cassowary.packages.${system}.cassowary;
dhcpcd = prev.dhcpcd.override { enablePrivSep = false; };
hoyolab-daily-bot = inputs.hoyolab-daily-bot.packages.${system}.default;
nix-alien = inputs.nix-alien.packages.${system}.nix-alien;
nix-index-update = inputs.nix-alien.packages.${system}.nix-index-update;
prismlauncher = inputs.prismlauncher.packages.${system}.default;
@ -39,10 +38,12 @@ with lib; {
extraPkgs = pkgs: with pkgs; [ mono libkrb5 keyutils ];
};
# for some reason, it tries to compile webkit
# I don't want to compile all of this
webkitgtk = stable.webkitgtk;
webkitgtk_6_0 = stable.webkitgtk_6_0;
webkitgtk_4_1 = stable.webkitgtk_4_1;
nixos-option = stable.nixos-option;
nil = stable.nil;
nix = inputs.nix.packages.${system}.default.overrideAttrs (oa: {
doInstallCheck = false;
@ -85,7 +86,7 @@ with lib; {
android_sdk.accept_license = true;
# vscode-server requires nodejs_16
permittedInsecurePackages = [
"nodejs-16.20.0"
"nodejs-16.20.1"
];
};
}

14
profiles/servers/gitea.nix
View File

@ -17,7 +17,7 @@ in {
# TODO: backups! gitea.dump setting
services.gitea = {
enable = true;
package = pkgs.forgejo;
package = pkgs.gitea;
appName = "AtaraxiaDev's Gitea Instance";
database = {
type = "postgres";
@ -54,15 +54,11 @@ in {
};
migrations = {
ALLOW_LOCALNETWORKS = true;
# ALLOWED_DOMAINS = "github.com, *.github.com, gitlab.com, *.gitlab.com, notabug.com, *.notabug.com";
ALLOWED_DOMAINS = "";
};
packages = {
ENABLED = false;
};
# repository = {
# DISABLE_HTTP_GIT = true;
# };
"repository.upload" = {
FILE_MAX_SIZE = 100;
MAX_FILES = 10;
@ -73,22 +69,14 @@ in {
DISABLE_WEBHOOKS = false;
IMPORT_LOCAL_PATHS = false;
PASSWORD_HASH_ALGO = "argon2";
SECRET_KEY_URI = "file:${config.secrets.gitea-secretkey.decrypted}";
INTERNAL_TOKEN_URI = "file:${config.secrets.gitea-internaltoken.decrypted}";
SECRET_KEY = lib.mkForce "";
INTERNAL_TOKEN = lib.mkForce "";
};
oauth2 = {
JWT_SIGNING_ALGORITHM = "ES256";
JWT_SECRET = lib.mkForce "";
};
service = {
DISABLE_REGISTRATION = true;
DEFAULT_ALLOW_CREATE_ORGANIZATION = false;
DEFAULT_USER_IS_RESTRICTED = true;
# REGISTER_EMAIL_CONFIRM = true;
REGISTER_EMAIL_CONFIRM = false;
REGISTER_MANUAL_CONFIRM = true;
};

18
profiles/virtualisation.nix
View File

@ -38,11 +38,6 @@ with config.deviceSpecific; {
lxc.bdev.zfs.root = rpool/persistent/lxd
'' else ""}
'';
# defaultConfig = ''
# lxc.idmap = u 0 100000 65535
# lxc.idmap = g 0 100000 65535
# lxc.include = ${pkgs.lxcfs}/share/lxc/config/common.conf.d/00-lxcfs.conf
# '';
};
libvirtd = {
enable = true;
@ -53,7 +48,7 @@ with config.deviceSpecific; {
secureBoot = true;
tpmSupport = true;
}).fd
pkgs.pkgsCross.aarch64-multiplatform.OVMF.fd
# pkgs.pkgsCross.aarch64-multiplatform.OVMF.fd
];
runAsRoot = false;
swtpm.enable = true;
@ -88,17 +83,6 @@ with config.deviceSpecific; {
];
};
# users.users.${config.mainuser} = {
# subUidRanges = [{
# count = 1000;
# startUid = 10000;
# }];
# subGidRanges = [{
# count = 1000;
# startGid = 10000;
# }];
# };
programs.extra-container.enable = true;
persist.state.homeDirectories = [

4
profiles/workspace/fonts.nix
View File

@ -4,7 +4,7 @@ let
in
{
fonts = {
fonts = with pkgs; [
packages = with pkgs; [
ibm-plex
(nerdfonts.override { fonts = [ "FiraCode" "VictorMono" ]; })
# Icons
@ -19,6 +19,6 @@ in
serif = [ "${thm.fonts.serif.family} ${thm.fontSizes.normal.str}" ];
};
};
enableDefaultFonts = true;
enableDefaultPackages = true;
};
}