feat(flake): Recreate using flake-parts
This commit is contained in:
parent
eb2504157e
commit
5716aa16be
375
flake.lock
375
flake.lock
|
|
@ -205,13 +205,16 @@
|
|||
}
|
||||
},
|
||||
"devshell_2": {
|
||||
"flake": false,
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_3",
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1663445644,
|
||||
"narHash": "sha256-+xVlcK60x7VY1vRJbNUEAHi17ZuoQxAIH4S4iUFUGBA=",
|
||||
"lastModified": 1678957337,
|
||||
"narHash": "sha256-Gw4nVbuKRdTwPngeOZQOzH/IFowmz4LryMPDiJN/ah4=",
|
||||
"owner": "numtide",
|
||||
"repo": "devshell",
|
||||
"rev": "e3dc3e21594fe07bdb24bdf1c8657acaa4cb8f66",
|
||||
"rev": "3e0e60ab37cd0bf7ab59888f5c32499d851edb47",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -221,25 +224,6 @@
|
|||
}
|
||||
},
|
||||
"devshell_3": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_4",
|
||||
"nixpkgs": "nixpkgs_5"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1678957337,
|
||||
"narHash": "sha256-Gw4nVbuKRdTwPngeOZQOzH/IFowmz4LryMPDiJN/ah4=",
|
||||
"owner": "numtide",
|
||||
"repo": "devshell",
|
||||
"rev": "3e0e60ab37cd0bf7ab59888f5c32499d851edb47",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "devshell",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"devshell_4": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1663445644,
|
||||
|
|
@ -255,10 +239,10 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"devshell_5": {
|
||||
"devshell_4": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_6",
|
||||
"nixpkgs": "nixpkgs_9"
|
||||
"flake-utils": "flake-utils_5",
|
||||
"nixpkgs": "nixpkgs_6"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1678957337,
|
||||
|
|
@ -274,7 +258,42 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"devshell_5": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1663445644,
|
||||
"narHash": "sha256-+xVlcK60x7VY1vRJbNUEAHi17ZuoQxAIH4S4iUFUGBA=",
|
||||
"owner": "numtide",
|
||||
"repo": "devshell",
|
||||
"rev": "e3dc3e21594fe07bdb24bdf1c8657acaa4cb8f66",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "devshell",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"devshell_6": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_7",
|
||||
"nixpkgs": "nixpkgs_10"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1678957337,
|
||||
"narHash": "sha256-Gw4nVbuKRdTwPngeOZQOzH/IFowmz4LryMPDiJN/ah4=",
|
||||
"owner": "numtide",
|
||||
"repo": "devshell",
|
||||
"rev": "3e0e60ab37cd0bf7ab59888f5c32499d851edb47",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "devshell",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"devshell_7": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1663445644,
|
||||
|
|
@ -294,7 +313,7 @@
|
|||
"inputs": {
|
||||
"all-cabal-json": "all-cabal-json",
|
||||
"crane": "crane",
|
||||
"devshell": "devshell_2",
|
||||
"devshell": "devshell_3",
|
||||
"drv-parts": "drv-parts",
|
||||
"flake-compat": "flake-compat_2",
|
||||
"flake-parts": "flake-parts",
|
||||
|
|
@ -303,7 +322,7 @@
|
|||
"gomod2nix": "gomod2nix",
|
||||
"mach-nix": "mach-nix",
|
||||
"nix-pypi-fetcher": "nix-pypi-fetcher",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"nixpkgsV1": "nixpkgsV1",
|
||||
"poetry2nix": "poetry2nix",
|
||||
"pre-commit-hooks": "pre-commit-hooks",
|
||||
|
|
@ -327,7 +346,7 @@
|
|||
"inputs": {
|
||||
"all-cabal-json": "all-cabal-json_2",
|
||||
"crane": "crane_2",
|
||||
"devshell": "devshell_4",
|
||||
"devshell": "devshell_5",
|
||||
"drv-parts": "drv-parts_2",
|
||||
"flake-compat": "flake-compat_4",
|
||||
"flake-parts": "flake-parts_3",
|
||||
|
|
@ -336,7 +355,7 @@
|
|||
"gomod2nix": "gomod2nix_2",
|
||||
"mach-nix": "mach-nix_2",
|
||||
"nix-pypi-fetcher": "nix-pypi-fetcher_2",
|
||||
"nixpkgs": "nixpkgs_6",
|
||||
"nixpkgs": "nixpkgs_7",
|
||||
"nixpkgsV1": "nixpkgsV1_2",
|
||||
"poetry2nix": "poetry2nix_2",
|
||||
"pre-commit-hooks": "pre-commit-hooks_2",
|
||||
|
|
@ -360,16 +379,16 @@
|
|||
"inputs": {
|
||||
"all-cabal-json": "all-cabal-json_3",
|
||||
"crane": "crane_3",
|
||||
"devshell": "devshell_6",
|
||||
"devshell": "devshell_7",
|
||||
"drv-parts": "drv-parts_3",
|
||||
"flake-compat": "flake-compat_6",
|
||||
"flake-parts": "flake-parts_5",
|
||||
"flake-parts": "flake-parts_6",
|
||||
"flake-utils-pre-commit": "flake-utils-pre-commit_3",
|
||||
"ghc-utils": "ghc-utils_3",
|
||||
"gomod2nix": "gomod2nix_3",
|
||||
"mach-nix": "mach-nix_3",
|
||||
"nix-pypi-fetcher": "nix-pypi-fetcher_3",
|
||||
"nixpkgs": "nixpkgs_10",
|
||||
"nixpkgs": "nixpkgs_11",
|
||||
"nixpkgsV1": "nixpkgsV1_3",
|
||||
"poetry2nix": "poetry2nix_3",
|
||||
"pre-commit-hooks": "pre-commit-hooks_3",
|
||||
|
|
@ -487,7 +506,7 @@
|
|||
},
|
||||
"emulator-2a": {
|
||||
"inputs": {
|
||||
"devshell": "devshell",
|
||||
"devshell": "devshell_2",
|
||||
"dream2nix": "dream2nix",
|
||||
"flake-parts": "flake-parts_2",
|
||||
"nixpkgs": [
|
||||
|
|
@ -513,7 +532,7 @@
|
|||
},
|
||||
"fend": {
|
||||
"inputs": {
|
||||
"devshell": "devshell_3",
|
||||
"devshell": "devshell_4",
|
||||
"dream2nix": "dream2nix_2",
|
||||
"flake-parts": "flake-parts_4",
|
||||
"nixpkgs": [
|
||||
|
|
@ -766,6 +785,24 @@
|
|||
}
|
||||
},
|
||||
"flake-parts_5": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": "nixpkgs-lib_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1680392223,
|
||||
"narHash": "sha256-n3g7QFr85lDODKt250rkZj2IFS3i4/8HBU2yKHO3tqw=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "dcc36e45d054d7bb554c9cdab69093debd91a0b5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts_6": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": [
|
||||
"mensa",
|
||||
|
|
@ -787,9 +824,9 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts_6": {
|
||||
"flake-parts_7": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": "nixpkgs-lib_3"
|
||||
"nixpkgs-lib": "nixpkgs-lib_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1680392223,
|
||||
|
|
@ -805,7 +842,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts_7": {
|
||||
"flake-parts_8": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": [
|
||||
"nixpkgs-wayland",
|
||||
|
|
@ -904,11 +941,11 @@
|
|||
},
|
||||
"flake-utils_3": {
|
||||
"locked": {
|
||||
"lastModified": 1667395993,
|
||||
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
|
||||
"lastModified": 1642700792,
|
||||
"narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
|
||||
"rev": "846b2ae0fc4cc943637d3d1def4454213e203cba",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -919,11 +956,11 @@
|
|||
},
|
||||
"flake-utils_4": {
|
||||
"locked": {
|
||||
"lastModified": 1642700792,
|
||||
"narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=",
|
||||
"lastModified": 1667395993,
|
||||
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "846b2ae0fc4cc943637d3d1def4454213e203cba",
|
||||
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -933,6 +970,21 @@
|
|||
}
|
||||
},
|
||||
"flake-utils_5": {
|
||||
"locked": {
|
||||
"lastModified": 1642700792,
|
||||
"narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "846b2ae0fc4cc943637d3d1def4454213e203cba",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_6": {
|
||||
"locked": {
|
||||
"lastModified": 1667395993,
|
||||
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
|
||||
|
|
@ -947,7 +999,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_6": {
|
||||
"flake-utils_7": {
|
||||
"locked": {
|
||||
"lastModified": 1642700792,
|
||||
"narHash": "sha256-XqHrk7hFb+zBvRg6Ghl+AZDq03ov6OshJLiSWOoX5es=",
|
||||
|
|
@ -962,7 +1014,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_7": {
|
||||
"flake-utils_8": {
|
||||
"locked": {
|
||||
"lastModified": 1667395993,
|
||||
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
|
||||
|
|
@ -977,7 +1029,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_8": {
|
||||
"flake-utils_9": {
|
||||
"inputs": {
|
||||
"systems": "systems"
|
||||
},
|
||||
|
|
@ -995,21 +1047,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_9": {
|
||||
"locked": {
|
||||
"lastModified": 1644229661,
|
||||
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"ghc-utils": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
@ -1300,8 +1337,8 @@
|
|||
},
|
||||
"lib-aggregate": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_8",
|
||||
"nixpkgs-lib": "nixpkgs-lib_5"
|
||||
"flake-utils": "flake-utils_9",
|
||||
"nixpkgs-lib": "nixpkgs-lib_6"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1681214977,
|
||||
|
|
@ -1380,9 +1417,9 @@
|
|||
},
|
||||
"mensa": {
|
||||
"inputs": {
|
||||
"devshell": "devshell_5",
|
||||
"devshell": "devshell_6",
|
||||
"dream2nix": "dream2nix_3",
|
||||
"flake-parts": "flake-parts_6",
|
||||
"flake-parts": "flake-parts_7",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
|
|
@ -1407,7 +1444,7 @@
|
|||
"nix-colors": {
|
||||
"inputs": {
|
||||
"base16-schemes": "base16-schemes",
|
||||
"nixpkgs-lib": "nixpkgs-lib_4"
|
||||
"nixpkgs-lib": "nixpkgs-lib_5"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1680875144,
|
||||
|
|
@ -1425,8 +1462,8 @@
|
|||
},
|
||||
"nix-eval-jobs": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts_7",
|
||||
"nixpkgs": "nixpkgs_14"
|
||||
"flake-parts": "flake-parts_8",
|
||||
"nixpkgs": "nixpkgs_15"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1681421147,
|
||||
|
|
@ -1599,6 +1636,24 @@
|
|||
}
|
||||
},
|
||||
"nixpkgs-lib_4": {
|
||||
"locked": {
|
||||
"dir": "lib",
|
||||
"lastModified": 1680213900,
|
||||
"narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "e3652e0735fbec227f342712f180f4f21f0594f2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"dir": "lib",
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-lib_5": {
|
||||
"locked": {
|
||||
"lastModified": 1680397293,
|
||||
"narHash": "sha256-wBpJ73+tJ8fZSWb4tzNbAVahC4HSo2QG3nICDy4ExBQ=",
|
||||
|
|
@ -1613,7 +1668,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-lib_5": {
|
||||
"nixpkgs-lib_6": {
|
||||
"locked": {
|
||||
"lastModified": 1681001314,
|
||||
"narHash": "sha256-5sDnCLdrKZqxLPK4KA8+f4A3YKO/u6ElpMILvX0g72c=",
|
||||
|
|
@ -1713,7 +1768,7 @@
|
|||
"flake-compat": "flake-compat_8",
|
||||
"lib-aggregate": "lib-aggregate",
|
||||
"nix-eval-jobs": "nix-eval-jobs",
|
||||
"nixpkgs": "nixpkgs_15"
|
||||
"nixpkgs": "nixpkgs_16"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1681461427,
|
||||
|
|
@ -1791,6 +1846,22 @@
|
|||
}
|
||||
},
|
||||
"nixpkgs_10": {
|
||||
"locked": {
|
||||
"lastModified": 1677383253,
|
||||
"narHash": "sha256-UfpzWfSxkfXHnb4boXZNaKsAcUrZT9Hw+tao1oZxd08=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "9952d6bc395f5841262b006fbace8dd7e143b634",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_11": {
|
||||
"locked": {
|
||||
"lastModified": 1665580254,
|
||||
"narHash": "sha256-hO61XPkp1Hphl4HGNzj1VvDH5URt7LI6LaY/385Eul4=",
|
||||
|
|
@ -1805,7 +1876,7 @@
|
|||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nixpkgs_11": {
|
||||
"nixpkgs_12": {
|
||||
"locked": {
|
||||
"lastModified": 1681303793,
|
||||
"narHash": "sha256-JEdQHsYuCfRL2PICHlOiH/2ue3DwoxUX7DJ6zZxZXFk=",
|
||||
|
|
@ -1821,7 +1892,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_12": {
|
||||
"nixpkgs_13": {
|
||||
"locked": {
|
||||
"lastModified": 1680945546,
|
||||
"narHash": "sha256-8FuaH5t/aVi/pR1XxnF0qi4WwMYC+YxlfdsA0V+TEuQ=",
|
||||
|
|
@ -1837,7 +1908,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_13": {
|
||||
"nixpkgs_14": {
|
||||
"locked": {
|
||||
"lastModified": 1681303793,
|
||||
"narHash": "sha256-JEdQHsYuCfRL2PICHlOiH/2ue3DwoxUX7DJ6zZxZXFk=",
|
||||
|
|
@ -1852,7 +1923,7 @@
|
|||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nixpkgs_14": {
|
||||
"nixpkgs_15": {
|
||||
"locked": {
|
||||
"lastModified": 1681347147,
|
||||
"narHash": "sha256-B+hTioRc3Jdf4SJyeCiO0fW5ShIznJk2OTiW2vOV+mc=",
|
||||
|
|
@ -1868,7 +1939,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_15": {
|
||||
"nixpkgs_16": {
|
||||
"locked": {
|
||||
"lastModified": 1681303793,
|
||||
"narHash": "sha256-JEdQHsYuCfRL2PICHlOiH/2ue3DwoxUX7DJ6zZxZXFk=",
|
||||
|
|
@ -1884,7 +1955,23 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_16": {
|
||||
"nixpkgs_17": {
|
||||
"locked": {
|
||||
"lastModified": 1680945546,
|
||||
"narHash": "sha256-8FuaH5t/aVi/pR1XxnF0qi4WwMYC+YxlfdsA0V+TEuQ=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "d9f759f2ea8d265d974a6e1259bd510ac5844c5d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_18": {
|
||||
"locked": {
|
||||
"lastModified": 1680945546,
|
||||
"narHash": "sha256-8FuaH5t/aVi/pR1XxnF0qi4WwMYC+YxlfdsA0V+TEuQ=",
|
||||
|
|
@ -1901,6 +1988,22 @@
|
|||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1677383253,
|
||||
"narHash": "sha256-UfpzWfSxkfXHnb4boXZNaKsAcUrZT9Hw+tao1oZxd08=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "9952d6bc395f5841262b006fbace8dd7e143b634",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1665580254,
|
||||
"narHash": "sha256-hO61XPkp1Hphl4HGNzj1VvDH5URt7LI6LaY/385Eul4=",
|
||||
|
|
@ -1915,7 +2018,7 @@
|
|||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1681303793,
|
||||
"narHash": "sha256-JEdQHsYuCfRL2PICHlOiH/2ue3DwoxUX7DJ6zZxZXFk=",
|
||||
|
|
@ -1931,23 +2034,23 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1680945546,
|
||||
"narHash": "sha256-8FuaH5t/aVi/pR1XxnF0qi4WwMYC+YxlfdsA0V+TEuQ=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "d9f759f2ea8d265d974a6e1259bd510ac5844c5d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1680945546,
|
||||
"narHash": "sha256-8FuaH5t/aVi/pR1XxnF0qi4WwMYC+YxlfdsA0V+TEuQ=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "d9f759f2ea8d265d974a6e1259bd510ac5844c5d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_6": {
|
||||
"locked": {
|
||||
"lastModified": 1677383253,
|
||||
"narHash": "sha256-UfpzWfSxkfXHnb4boXZNaKsAcUrZT9Hw+tao1oZxd08=",
|
||||
|
|
@ -1963,7 +2066,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_6": {
|
||||
"nixpkgs_7": {
|
||||
"locked": {
|
||||
"lastModified": 1665580254,
|
||||
"narHash": "sha256-hO61XPkp1Hphl4HGNzj1VvDH5URt7LI6LaY/385Eul4=",
|
||||
|
|
@ -1978,7 +2081,7 @@
|
|||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nixpkgs_7": {
|
||||
"nixpkgs_8": {
|
||||
"locked": {
|
||||
"lastModified": 1681303793,
|
||||
"narHash": "sha256-JEdQHsYuCfRL2PICHlOiH/2ue3DwoxUX7DJ6zZxZXFk=",
|
||||
|
|
@ -1994,7 +2097,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_8": {
|
||||
"nixpkgs_9": {
|
||||
"locked": {
|
||||
"lastModified": 1680945546,
|
||||
"narHash": "sha256-8FuaH5t/aVi/pR1XxnF0qi4WwMYC+YxlfdsA0V+TEuQ=",
|
||||
|
|
@ -2010,22 +2113,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_9": {
|
||||
"locked": {
|
||||
"lastModified": 1677383253,
|
||||
"narHash": "sha256-UfpzWfSxkfXHnb4boXZNaKsAcUrZT9Hw+tao1oZxd08=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "9952d6bc395f5841262b006fbace8dd7e143b634",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"poetry2nix": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
@ -2107,9 +2194,9 @@
|
|||
"pre-commit-hooks-nix": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_3",
|
||||
"flake-utils": "flake-utils_3",
|
||||
"flake-utils": "flake-utils_4",
|
||||
"gitignore": "gitignore",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
},
|
||||
"locked": {
|
||||
|
|
@ -2129,9 +2216,9 @@
|
|||
"pre-commit-hooks-nix_2": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_5",
|
||||
"flake-utils": "flake-utils_5",
|
||||
"flake-utils": "flake-utils_6",
|
||||
"gitignore": "gitignore_2",
|
||||
"nixpkgs": "nixpkgs_7",
|
||||
"nixpkgs": "nixpkgs_8",
|
||||
"nixpkgs-stable": "nixpkgs-stable_2"
|
||||
},
|
||||
"locked": {
|
||||
|
|
@ -2151,9 +2238,9 @@
|
|||
"pre-commit-hooks-nix_3": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_7",
|
||||
"flake-utils": "flake-utils_7",
|
||||
"flake-utils": "flake-utils_8",
|
||||
"gitignore": "gitignore_3",
|
||||
"nixpkgs": "nixpkgs_11",
|
||||
"nixpkgs": "nixpkgs_12",
|
||||
"nixpkgs-stable": "nixpkgs-stable_3"
|
||||
},
|
||||
"locked": {
|
||||
|
|
@ -2329,9 +2416,11 @@
|
|||
"cataclysm-dda": "cataclysm-dda",
|
||||
"colmena": "colmena",
|
||||
"custom-udev-rules": "custom-udev-rules",
|
||||
"devshell": "devshell",
|
||||
"emulator-2a": "emulator-2a",
|
||||
"fend": "fend",
|
||||
"fenix": "fenix",
|
||||
"flake-parts": "flake-parts_5",
|
||||
"home-manager": "home-manager",
|
||||
"hydra": "hydra",
|
||||
"hyprland": "hyprland",
|
||||
|
|
@ -2340,14 +2429,14 @@
|
|||
"nix-colors": "nix-colors",
|
||||
"nixForHydra": "nixForHydra",
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
"nixpkgs": "nixpkgs_13",
|
||||
"nixpkgs": "nixpkgs_14",
|
||||
"nixpkgs-wayland": "nixpkgs-wayland",
|
||||
"nixpkgsForNixForHydra": "nixpkgsForNixForHydra",
|
||||
"qmk-udev-rules": "qmk-udev-rules",
|
||||
"radicale_infcloud": "radicale_infcloud",
|
||||
"rip": "rip",
|
||||
"sops-nix": "sops-nix",
|
||||
"utils": "utils_2",
|
||||
"treefmt-nix": "treefmt-nix_4",
|
||||
"xdg-desktop-portal-hyprland": "xdg-desktop-portal-hyprland"
|
||||
}
|
||||
},
|
||||
|
|
@ -2422,7 +2511,7 @@
|
|||
},
|
||||
"treefmt-nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_4"
|
||||
"nixpkgs": "nixpkgs_5"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1681486253,
|
||||
|
|
@ -2440,7 +2529,7 @@
|
|||
},
|
||||
"treefmt-nix_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_8"
|
||||
"nixpkgs": "nixpkgs_9"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1681486253,
|
||||
|
|
@ -2458,7 +2547,25 @@
|
|||
},
|
||||
"treefmt-nix_3": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_12"
|
||||
"nixpkgs": "nixpkgs_13"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1681486253,
|
||||
"narHash": "sha256-EjiQZvXQH9tUPCyLC6lQpfGnoq4+kI9v59bDJWPicYo=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "b25d1a3c2c7554d0462ab1dfddf2f13128638b90",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"treefmt-nix_4": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_17"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1681486253,
|
||||
|
|
@ -2489,24 +2596,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"utils_2": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_9"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1657226504,
|
||||
"narHash": "sha256-GIYNjuq4mJlFgqKsZ+YrgzWm0IpA4axA3MCrdKYj7gs=",
|
||||
"owner": "gytis-ivaskevicius",
|
||||
"repo": "flake-utils-plus",
|
||||
"rev": "2bf0f91643c2e5ae38c1b26893ac2927ac9bd82a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "gytis-ivaskevicius",
|
||||
"repo": "flake-utils-plus",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"wlroots": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
@ -2528,7 +2617,7 @@
|
|||
"xdg-desktop-portal-hyprland": {
|
||||
"inputs": {
|
||||
"hyprland-protocols": "hyprland-protocols_2",
|
||||
"nixpkgs": "nixpkgs_16"
|
||||
"nixpkgs": "nixpkgs_18"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1681416853,
|
||||
|
|
|
|||
335
flake.nix
335
flake.nix
|
|
@ -2,9 +2,12 @@
|
|||
description = "Malte Tammena's system configuration";
|
||||
|
||||
inputs = {
|
||||
flake-parts.url = "github:hercules-ci/flake-parts";
|
||||
devshell.url = "github:numtide/devshell";
|
||||
treefmt-nix.url = "github:numtide/treefmt-nix";
|
||||
|
||||
nixpkgs.url = "nixpkgs/nixos-unstable";
|
||||
nixos-hardware.url = "github:NixOS/nixos-hardware";
|
||||
utils.url = "github:gytis-ivaskevicius/flake-utils-plus";
|
||||
custom-udev-rules.url = "github:MalteT/custom-udev-rules";
|
||||
nix-colors.url = "github:Misterio77/nix-colors";
|
||||
|
||||
|
|
@ -86,51 +89,16 @@
|
|||
};
|
||||
|
||||
nixConfig = {
|
||||
# Only usefull if you're part of my VPN
|
||||
extra-substituters = ["http://cache.home"];
|
||||
};
|
||||
|
||||
outputs = {
|
||||
self,
|
||||
utils,
|
||||
nixpkgs,
|
||||
nixos-hardware,
|
||||
...
|
||||
} @ inputs: let
|
||||
pkgs = self.pkgs.x86_64-linux.nixpkgs;
|
||||
|
||||
hosts = [
|
||||
"helix-texta"
|
||||
"murex-pecten"
|
||||
"cornu-aspersum"
|
||||
"granodomus-lima"
|
||||
"trochulus-hispidus"
|
||||
"radix-balthica"
|
||||
"faunus-ater"
|
||||
"polymita-picta"
|
||||
];
|
||||
|
||||
defaultModules = [
|
||||
inputs.home-manager.nixosModules.home-manager
|
||||
self.nixosModules.home-manager-config
|
||||
inputs.custom-udev-rules.nixosModule
|
||||
inputs.sops-nix.nixosModules.sops
|
||||
self.nixosModules.nixUnstable
|
||||
./modules/base-system.nix
|
||||
{config._module.args.flake = self;}
|
||||
];
|
||||
in
|
||||
utils.lib.mkFlake {
|
||||
inherit self inputs;
|
||||
|
||||
supportedSystems = ["x86_64-linux"];
|
||||
nix.generateRegistryFromInputs = true;
|
||||
nix.linkInputs = true;
|
||||
|
||||
sharedOverlays = [
|
||||
outputs = inputs @ {flake-parts, ...}: let
|
||||
# Overlays useful to most of my systems
|
||||
overlaysSharedByAll = [
|
||||
inputs.fenix.overlays.default
|
||||
inputs.colmena.overlay
|
||||
inputs.xdg-desktop-portal-hyprland.overlays.default
|
||||
utils.overlay
|
||||
(self: super: {
|
||||
# Add fonts
|
||||
hackNerdLigatures = super.callPackage ./pkgs/hack.nix {};
|
||||
|
|
@ -156,212 +124,117 @@
|
|||
(import ./overlays/prometheus-fritzbox-exporter.nix)
|
||||
(import ./overlays/waybar-hypr.nix)
|
||||
];
|
||||
|
||||
hostDefaults.system = "x86_64-linux";
|
||||
hostDefaults.modules = defaultModules;
|
||||
|
||||
hosts = builtins.listToAttrs (map (host: {
|
||||
name = host;
|
||||
value = {modules = [self.nixosModules.${host}];};
|
||||
})
|
||||
hosts);
|
||||
|
||||
nixosModules = {
|
||||
home-manager-config = _: {
|
||||
# Modules useful to most of my systems
|
||||
modulesSharedByAllSystems = [
|
||||
inputs.sops-nix.nixosModules.sops
|
||||
inputs.self.nixosModules.nixUnstable
|
||||
inputs.home-manager.nixosModules.home-manager
|
||||
./modules/base-system.nix
|
||||
];
|
||||
# The list of all hosts known to me
|
||||
listOfHosts = let
|
||||
removeSuffix = builtins.replaceStrings [".nix"] [""];
|
||||
hostDir = builtins.readDir ./hosts;
|
||||
hostFileNames = builtins.attrNames hostDir;
|
||||
in
|
||||
map removeSuffix hostFileNames;
|
||||
in
|
||||
flake-parts.lib.mkFlake {inherit inputs;} {
|
||||
# Flake-parts modules to use
|
||||
imports = [
|
||||
inputs.devshell.flakeModule
|
||||
inputs.treefmt-nix.flakeModule
|
||||
];
|
||||
# Available systems, only x86 for now
|
||||
systems = ["x86_64-linux"];
|
||||
perSystem = {
|
||||
config,
|
||||
self',
|
||||
inputs',
|
||||
pkgs,
|
||||
system,
|
||||
...
|
||||
}: {
|
||||
# Configure treefmt
|
||||
treefmt.projectRootFile = "flake.nix";
|
||||
treefmt.programs = {
|
||||
alejandra.enable = true;
|
||||
shellcheck.enable = true;
|
||||
shfmt.enable = true;
|
||||
};
|
||||
# Load all packages from ./pkgs
|
||||
packages = let
|
||||
pkgFiles = builtins.attrNames (builtins.readDir ./pkgs);
|
||||
toPackage = file: {
|
||||
name = builtins.replaceStrings [".nix"] [""] file;
|
||||
value = pkgs.callPackage ./pkgs/${file} {};
|
||||
};
|
||||
in
|
||||
builtins.listToAttrs (builtins.map toPackage pkgFiles);
|
||||
# Create a useable devshell for me
|
||||
devshells.default = {
|
||||
name = "dev";
|
||||
packages = [
|
||||
pkgs.nil
|
||||
self'.packages.rebuild
|
||||
self'.packages.personal-cache
|
||||
self'.packages.all-hosts
|
||||
self'.packages.option
|
||||
self'.packages.test-config
|
||||
];
|
||||
};
|
||||
};
|
||||
# Useful modules and all those from ./modules
|
||||
flake.nixosModules =
|
||||
{
|
||||
homeManagerConfig = _: {
|
||||
home-manager.verbose = true;
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.extraSpecialArgs = {inherit (inputs) nix-colors;};
|
||||
};
|
||||
|
||||
nixUnstable = {pkgs, ...}: {
|
||||
nix.registry.nixpkgs.flake = nixpkgs;
|
||||
nix.registry.nixpkgs.flake = inputs.nixpkgs;
|
||||
nix.package = pkgs.nixUnstable;
|
||||
nix.extraOptions = ''
|
||||
experimental-features = nix-command flakes
|
||||
'';
|
||||
};
|
||||
|
||||
helix-texta = {
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
./hosts/helix-texta.nix
|
||||
./modules/light-actkbd.nix
|
||||
self.nixosModules.thinkpad-p1-gen3
|
||||
];
|
||||
};
|
||||
murex-pecten = {...}: {
|
||||
imports = [
|
||||
nixos-hardware.nixosModules.common-pc
|
||||
nixos-hardware.nixosModules.common-pc-ssd
|
||||
nixos-hardware.nixosModules.common-cpu-amd
|
||||
nixos-hardware.nixosModules.common-gpu-amd
|
||||
./hosts/murex-pecten.nix
|
||||
./hardware/aorus.nix
|
||||
];
|
||||
};
|
||||
cornu-aspersum = {...}: {
|
||||
imports = [
|
||||
./hosts/cornu-aspersum.nix
|
||||
./hardware/netcup-rs-2000-g9.nix
|
||||
./modules/nginx-reverse-proxy.nix
|
||||
];
|
||||
};
|
||||
granodomus-lima = {...}: {
|
||||
imports = [
|
||||
./hosts/granodomus-lima.nix
|
||||
./hardware/netcup-vps-200-g10.nix
|
||||
./modules/nginx-reverse-proxy.nix
|
||||
];
|
||||
};
|
||||
trochulus-hispidus = {pkgs, ...}: {
|
||||
imports = [
|
||||
./hosts/trochulus-hispidus.nix
|
||||
./hardware/latitude-e7440.nix
|
||||
nixos-hardware.nixosModules.common-cpu-intel
|
||||
nixos-hardware.nixosModules.common-pc-laptop
|
||||
nixos-hardware.nixosModules.common-pc-laptop-ssd
|
||||
];
|
||||
};
|
||||
thinkpad-p1-gen3 = {...}: {
|
||||
imports = [
|
||||
nixos-hardware.nixosModules.common-cpu-intel
|
||||
nixos-hardware.nixosModules.common-gpu-nvidia
|
||||
nixos-hardware.nixosModules.common-pc-laptop
|
||||
nixos-hardware.nixosModules.common-pc-laptop-ssd
|
||||
nixos-hardware.nixosModules.common-pc-laptop-acpi_call
|
||||
./hardware/thinkpad-p1-gen3.nix
|
||||
];
|
||||
};
|
||||
radix-balthica = {...}: {
|
||||
imports = [
|
||||
./hosts/radix-balthica.nix
|
||||
];
|
||||
};
|
||||
faunus-ater = {...}: {
|
||||
imports = [
|
||||
nixos-hardware.nixosModules.common-cpu-intel #-cpu-only
|
||||
./modules/nginx-reverse-proxy.nix
|
||||
./hosts/faunus-ater.nix
|
||||
./hardware/asrock-z370-i3-black-box.nix
|
||||
];
|
||||
};
|
||||
polymita-picta = {...}: {
|
||||
imports = [
|
||||
./hosts/polymita-picta.nix
|
||||
./hardware/steam-deck.nix
|
||||
(inputs.jovian-nixos + "/modules")
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
colmena =
|
||||
{
|
||||
meta = {nixpkgs = pkgs;};
|
||||
defaults = {...}: {imports = defaultModules;};
|
||||
}
|
||||
// (builtins.listToAttrs (map (
|
||||
host: {
|
||||
name = host;
|
||||
value = {
|
||||
imports = [self.nixosModules.${host}];
|
||||
config.deployment = {
|
||||
targetHost = host;
|
||||
targetUser = "root";
|
||||
// (let
|
||||
removeSuffix = builtins.replaceStrings [".nix"] [""];
|
||||
moduleFiles = builtins.attrNames (builtins.readDir ./modules);
|
||||
listOfModules = builtins.map removeSuffix moduleFiles;
|
||||
toModule = name: {
|
||||
inherit name;
|
||||
value = builtins.readFile ./modules/${name};
|
||||
};
|
||||
};
|
||||
}
|
||||
)
|
||||
hosts));
|
||||
|
||||
hydraJobs = {
|
||||
shell.x86_64-linux = self.devShell.x86_64-linux;
|
||||
packages = self.packages;
|
||||
nixosConfigurations.x86_64-linux = builtins.listToAttrs (map (host: {
|
||||
name = host;
|
||||
value = self.nixosConfigurations.${host}.config.system.build.toplevel;
|
||||
})
|
||||
hosts);
|
||||
};
|
||||
|
||||
packages.x86_64-linux.iso = self.nixosConfigurations.radix-balthica.config.system.build.isoImage;
|
||||
packages.x86_64-linux.vm = self.nixosConfigurations.radix-balthica.config.system.build.vm;
|
||||
|
||||
outputsBuilder = channels: {
|
||||
devShell = channels.nixpkgs.mkShell {
|
||||
name = "system config devshell";
|
||||
packages = let
|
||||
personalCache = pkgs.writeShellApplication {
|
||||
name = "personal-cache";
|
||||
runtimeInputs = with pkgs; [
|
||||
coreutils
|
||||
nix
|
||||
];
|
||||
text = builtins.readFile ./scripts/personal-cache.sh;
|
||||
};
|
||||
|
||||
rebuild = pkgs.writeShellApplication {
|
||||
name = "rebuild";
|
||||
runtimeInputs = with pkgs; [
|
||||
coreutils
|
||||
git
|
||||
personalCache
|
||||
nixos-rebuild
|
||||
];
|
||||
text = builtins.readFile ./scripts/rebuild.sh;
|
||||
};
|
||||
|
||||
allHosts = pkgs.writeShellApplication {
|
||||
name = "all-hosts";
|
||||
runtimeInputs = with pkgs; [
|
||||
jq
|
||||
nix
|
||||
];
|
||||
text = ''
|
||||
nix eval --json .#nixosConfigurations --apply builtins.attrNames 2>/dev/null | jq -r .[]
|
||||
'';
|
||||
};
|
||||
|
||||
option = pkgs.writeShellApplication {
|
||||
name = "option";
|
||||
runtimeInputs = with pkgs; [
|
||||
coreutils
|
||||
nix
|
||||
];
|
||||
text = builtins.readFile ./scripts/option.sh;
|
||||
};
|
||||
|
||||
testConfig = pkgs.writeShellApplication {
|
||||
name = "test-config";
|
||||
runtimeInputs = with pkgs; [
|
||||
coreutils
|
||||
nix
|
||||
allHosts
|
||||
nixos-rebuild
|
||||
bat
|
||||
];
|
||||
text = builtins.readFile ./scripts/test-config.sh;
|
||||
};
|
||||
|
||||
git = "${pkgs.git}/bin/git";
|
||||
nixos-rebuild = "${pkgs.nixos-rebuild}/bin/nixos-rebuild";
|
||||
bat = "${pkgs.bat}/bin/bat";
|
||||
in
|
||||
with pkgs; [
|
||||
rebuild
|
||||
personalCache
|
||||
allHosts
|
||||
option
|
||||
testConfig
|
||||
inputs.colmena.packages.x86_64-linux.colmena
|
||||
fup-repl
|
||||
alejandra
|
||||
nil
|
||||
];
|
||||
builtins.listToAttrs (builtins.map toModule listOfModules));
|
||||
# All my system's configurations
|
||||
flake.nixosConfigurations = let
|
||||
genSystem = name: {
|
||||
inherit name;
|
||||
value = inputs.nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
specialArgs = {inherit inputs;};
|
||||
modules = modulesSharedByAllSystems ++ [{nixpkgs.overlays = overlaysSharedByAll;} ./hosts/${name}.nix];
|
||||
};
|
||||
};
|
||||
in
|
||||
builtins.listToAttrs (builtins.map genSystem listOfHosts);
|
||||
# Iso for USB
|
||||
flake.packages.x86_64-linux.iso = inputs.self.nixosConfigurations.radix-balthica.config.system.build.isoImage;
|
||||
# VM for testing
|
||||
flake.packages.x86_64-linux.vm = inputs.self.nixosConfigurations.radix-balthica.config.system.build.vm;
|
||||
# Copy most things to hydraJobs so hydra evaluates and builds them
|
||||
flake.hydraJobs = {
|
||||
inherit (inputs.self) packages devShells;
|
||||
nixosConfigurations.x86_64-linux = builtins.listToAttrs (builtins.map (name: {
|
||||
inherit name;
|
||||
value = inputs.self.nixosConfigurations.${name}.config.system.build.toplevel;
|
||||
})
|
||||
listOfHosts);
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,15 @@
|
|||
{pkgs, ...}: {
|
||||
{
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
inputs.self.nixosModules.homeManagerConfig
|
||||
../hardware/netcup-rs-2000-g9.nix
|
||||
../modules/nginx-reverse-proxy.nix
|
||||
];
|
||||
|
||||
config = {
|
||||
boot.loader.grub.enable = true;
|
||||
boot.loader.grub.version = 2;
|
||||
boot.loader.grub.device = "/dev/sda";
|
||||
|
|
@ -77,4 +88,5 @@
|
|||
# Before changing this value read the documentation for this option
|
||||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
||||
system.stateVersion = "21.05"; # Did you read the comment?
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
inputs,
|
||||
...
|
||||
}: let
|
||||
sopsPath = key: config.sops.secrets.${key}.path;
|
||||
|
|
@ -25,6 +26,12 @@
|
|||
vpnIPv4 = "100.108.135.4";
|
||||
vpnIPv6 = "fd7a:115c:a1e0:ab12:4843:cd96:626c:8704";
|
||||
in {
|
||||
imports = [
|
||||
inputs.nixos-hardware.nixosModules.common-cpu-intel #-cpu-only
|
||||
../modules/nginx-reverse-proxy.nix
|
||||
../hardware/asrock-z370-i3-black-box.nix
|
||||
];
|
||||
config = {
|
||||
networking.hostName = "faunus-ater";
|
||||
networking.hostId = "a4d7bec4";
|
||||
networking.interfaces.eno1.useDHCP = true;
|
||||
|
|
@ -512,4 +519,5 @@ in {
|
|||
# Before changing this value read the documentation for this option
|
||||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
||||
system.stateVersion = "22.05"; # Did you read the comment?
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
{pkgs, ...}: {
|
||||
imports = [
|
||||
../hardware/netcup-vps-200-g10.nix
|
||||
../modules/nginx-reverse-proxy.nix
|
||||
];
|
||||
config = {
|
||||
boot.loader.grub.enable = true;
|
||||
boot.loader.grub.version = 2;
|
||||
boot.loader.grub.device = "/dev/sda";
|
||||
|
|
@ -86,4 +87,5 @@
|
|||
# Before changing this value read the documentation for this option
|
||||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
||||
system.stateVersion = "21.05"; # Did you read the comment?
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,21 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
options,
|
||||
flake,
|
||||
inputs,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
inputs.nixos-hardware.nixosModules.common-cpu-intel
|
||||
inputs.nixos-hardware.nixosModules.common-gpu-nvidia
|
||||
inputs.nixos-hardware.nixosModules.common-pc-laptop
|
||||
inputs.nixos-hardware.nixosModules.common-pc-laptop-ssd
|
||||
inputs.nixos-hardware.nixosModules.common-pc-laptop-acpi_call
|
||||
inputs.self.nixosModules.homeManagerConfig
|
||||
inputs.custom-udev-rules.nixosModule
|
||||
../hardware/thinkpad-p1-gen3.nix
|
||||
../modules/light-actkbd.nix
|
||||
];
|
||||
|
||||
config = {
|
||||
boot = {
|
||||
# Use the systemd-boot EFI boot loader.
|
||||
loader = {
|
||||
|
|
@ -20,7 +30,7 @@
|
|||
};
|
||||
|
||||
nixpkgs.overlays = [
|
||||
flake.inputs.nixpkgs-wayland.overlay
|
||||
inputs.nixpkgs-wayland.overlay
|
||||
];
|
||||
|
||||
system.fsPackages = [pkgs.sshfs];
|
||||
|
|
@ -163,4 +173,5 @@
|
|||
# Before changing this value read the documentation for this option
|
||||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
||||
system.stateVersion = "20.09"; # Did you read the comment?
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,19 @@
|
|||
{
|
||||
pkgs,
|
||||
flake,
|
||||
inputs,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
inputs.nixos-hardware.nixosModules.common-pc
|
||||
inputs.nixos-hardware.nixosModules.common-pc-ssd
|
||||
inputs.nixos-hardware.nixosModules.common-cpu-amd
|
||||
inputs.nixos-hardware.nixosModules.common-gpu-amd
|
||||
inputs.self.nixosModules.homeManagerConfig
|
||||
inputs.custom-udev-rules.nixosModule
|
||||
../hardware/aorus.nix
|
||||
];
|
||||
|
||||
config = {
|
||||
# Use the systemd-boot EFI boot loader.
|
||||
boot.loader = {
|
||||
systemd-boot.enable = true;
|
||||
|
|
@ -17,7 +28,7 @@
|
|||
system.fsPackages = [pkgs.sshfs];
|
||||
|
||||
nixpkgs.overlays = [
|
||||
flake.inputs.nixpkgs-wayland.overlay
|
||||
inputs.nixpkgs-wayland.overlay
|
||||
];
|
||||
|
||||
settings.minimalGnome.enable = true;
|
||||
|
|
@ -171,4 +182,5 @@
|
|||
# Before changing this value read the documentation for this option
|
||||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
||||
system.stateVersion = "21.11"; # Did you read the comment?
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,14 @@
|
|||
{pkgs, ...}: {
|
||||
{
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
inputs.self.nixosModules.homeManagerConfig
|
||||
(inputs.jovian-nixos + "/modules")
|
||||
../hardware/steam-deck.nix
|
||||
];
|
||||
config = {
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = false;
|
||||
networking.hostName = "polymita-picta";
|
||||
|
|
@ -61,4 +71,5 @@
|
|||
# Before changing this value read the documentation for this option
|
||||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
||||
system.stateVersion = "22.11"; # Did you read the comment?
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,16 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
inputs.nixos-hardware.nixosModules.common-cpu-intel
|
||||
inputs.nixos-hardware.nixosModules.common-pc-laptop
|
||||
inputs.nixos-hardware.nixosModules.common-pc-laptop-ssd
|
||||
inputs.self.nixosModules.homeManagerConfig
|
||||
../hardware/latitude-e7440.nix
|
||||
];
|
||||
config = {
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
|
||||
|
|
@ -93,4 +101,5 @@
|
|||
# Before changing this value read the documentation for this option
|
||||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
||||
system.stateVersion = "21.11"; # Did you read the comment?
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
flake,
|
||||
inputs,
|
||||
...
|
||||
}: let
|
||||
cfg = config.users.custom.malte;
|
||||
|
|
@ -38,7 +38,7 @@ in {
|
|||
openssh.authorizedKeys.keyFiles = [../users/malte/yubikey.pub];
|
||||
};
|
||||
|
||||
home-manager.users.malte.imports = [../users/malte/home.nix flake.inputs.nix-colors.homeManagerModule flake.inputs.hyprland.homeManagerModules.default];
|
||||
home-manager.users.malte.imports = [../users/malte/home.nix inputs.nix-colors.homeManagerModule inputs.hyprland.homeManagerModules.default];
|
||||
programs.fish.enable = true;
|
||||
services.darkman.enable = !cfg.steamDeck;
|
||||
|
||||
|
|
|
|||
16
pkgs/all-hosts.nix
Normal file
16
pkgs/all-hosts.nix
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
{
|
||||
writeShellApplication,
|
||||
jq,
|
||||
nix,
|
||||
...
|
||||
}:
|
||||
writeShellApplication {
|
||||
name = "all-hosts";
|
||||
runtimeInputs = [
|
||||
jq
|
||||
nix
|
||||
];
|
||||
text = ''
|
||||
nix eval --json .#nixosConfigurations --apply builtins.attrNames 2>/dev/null | jq -r .[]
|
||||
'';
|
||||
}
|
||||
14
pkgs/option.nix
Normal file
14
pkgs/option.nix
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
{
|
||||
writeShellApplication,
|
||||
coreutils,
|
||||
nix,
|
||||
...
|
||||
}:
|
||||
writeShellApplication {
|
||||
name = "option";
|
||||
runtimeInputs = [
|
||||
coreutils
|
||||
nix
|
||||
];
|
||||
text = builtins.readFile ../scripts/option.sh;
|
||||
}
|
||||
14
pkgs/personal-cache.nix
Normal file
14
pkgs/personal-cache.nix
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
{
|
||||
writeShellApplication,
|
||||
coreutils,
|
||||
nix,
|
||||
...
|
||||
}:
|
||||
writeShellApplication {
|
||||
name = "personal-cache";
|
||||
runtimeInputs = [
|
||||
coreutils
|
||||
nix
|
||||
];
|
||||
text = builtins.readFile ../scripts/personal-cache.sh;
|
||||
}
|
||||
18
pkgs/rebuild.nix
Normal file
18
pkgs/rebuild.nix
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
{
|
||||
writeShellApplication,
|
||||
coreutils,
|
||||
git,
|
||||
nixos-rebuild,
|
||||
callPackage,
|
||||
...
|
||||
}:
|
||||
writeShellApplication {
|
||||
name = "rebuild";
|
||||
runtimeInputs = [
|
||||
coreutils
|
||||
git
|
||||
(callPackage ./personal-cache.nix {})
|
||||
nixos-rebuild
|
||||
];
|
||||
text = builtins.readFile ../scripts/rebuild.sh;
|
||||
}
|
||||
20
pkgs/test-config.nix
Normal file
20
pkgs/test-config.nix
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
{
|
||||
writeShellApplication,
|
||||
coreutils,
|
||||
nix,
|
||||
nixos-rebuild,
|
||||
bat,
|
||||
callPackage,
|
||||
...
|
||||
}:
|
||||
writeShellApplication {
|
||||
name = "test-config";
|
||||
runtimeInputs = [
|
||||
coreutils
|
||||
nix
|
||||
(callPackage ./all-hosts.nix {})
|
||||
nixos-rebuild
|
||||
bat
|
||||
];
|
||||
text = builtins.readFile ../scripts/test-config.sh;
|
||||
}
|
||||
|
|
@ -1,3 +1,5 @@
|
|||
#!/bin/sh
|
||||
|
||||
# Script to be run after mailboxes have been synchronized
|
||||
# Expects `notmuch` in the PATH
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
#!/bin/bash
|
||||
|
||||
function print_help() {
|
||||
printf "Usage:"
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
#!/bin/bash
|
||||
|
||||
store="http://cache.home"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
#!/bin/bash
|
||||
|
||||
function print_help() {
|
||||
printf "Usage:"
|
||||
|
|
@ -20,10 +21,10 @@ case "$action" in
|
|||
;;
|
||||
esac
|
||||
|
||||
ARGS=( "$action" )
|
||||
ARGS=("$action")
|
||||
|
||||
if personal-cache --ping; then
|
||||
ARGS+=( "--option" "extra-substituters" "$(personal-cache --url)" )
|
||||
ARGS+=("--option" "extra-substituters" "$(personal-cache --url)")
|
||||
printf "Cache is up and running!\n"
|
||||
else
|
||||
printf "Cache is down!\n"
|
||||
|
|
@ -31,10 +32,10 @@ fi
|
|||
|
||||
if [ -n "${2+x}" ]; then
|
||||
host=$2
|
||||
ARGS+=( "--build-host" "root@$host" "--target-host" "root@$host" "--flake" ".#${host}" )
|
||||
ARGS+=("--build-host" "root@$host" "--target-host" "root@$host" "--flake" ".#${host}")
|
||||
printf "Building on %s!\n" "$host"
|
||||
else
|
||||
ARGS+=( "--flake" "." )
|
||||
ARGS+=("--flake" "." "--show-trace")
|
||||
printf "Building on localhost!\n"
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
#!/bin/bash
|
||||
|
||||
for host in $(all-hosts); do
|
||||
printf -- "-> Checking %s.. " "$host"
|
||||
|
||||
if nixos-rebuild --flake ".#$host" dry-build 2> /tmp/build-output; then
|
||||
if nixos-rebuild --show-trace --flake ".#$host" dry-build 2>/tmp/build-output; then
|
||||
printf "ok\n"
|
||||
else
|
||||
printf "failed!\n"
|
||||
|
|
|
|||
Loading…
Reference in a new issue