Compare commits
8 Commits
da23016c32
...
24.11
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5943dbccbc | ||
|
|
c62872d94c | ||
|
|
ddc6897d80 | ||
|
|
44d9a9aa84 | ||
|
|
5b374ef972 | ||
|
|
0fc6034632 | ||
|
|
1243f93092 | ||
|
|
7b85076c99 |
414
flake.lock
generated
414
flake.lock
generated
@@ -42,17 +42,74 @@
|
|||||||
"url": "https://git.dodsorf.as/Dandellion/NUR.git"
|
"url": "https://git.dodsorf.as/Dandellion/NUR.git"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"dan_3": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"wack-server-conf",
|
||||||
|
"dandellion",
|
||||||
|
"wack-server-conf",
|
||||||
|
"dandellion",
|
||||||
|
"unstable"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1656687988,
|
||||||
|
"narHash": "sha256-2ywoy3wUvFAyxDTw7VPlz5TGh9mk/um2AWOjhJqJxNQ=",
|
||||||
|
"ref": "refs/heads/master",
|
||||||
|
"rev": "7e85f62e40cd585ce81fa1f3debd5385bb0cad03",
|
||||||
|
"revCount": 160,
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://git.dodsorf.as/Dandellion/NUR.git"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://git.dodsorf.as/Dandellion/NUR.git"
|
||||||
|
}
|
||||||
|
},
|
||||||
"dandellion": {
|
"dandellion": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"dan": "dan_2",
|
"dan": "dan_2",
|
||||||
|
"greg-clients": "greg-clients_2",
|
||||||
"home-manager": "home-manager_2",
|
"home-manager": "home-manager_2",
|
||||||
"nixgl": "nixgl_2",
|
"nixgl": "nixgl_2",
|
||||||
|
"nixos-hardware": "nixos-hardware_2",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"wack-server-conf",
|
"wack-server-conf",
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
],
|
],
|
||||||
"nur": "nur_2",
|
"nur": "nur_2",
|
||||||
"unstable": "unstable_2"
|
"unstable": "unstable_2",
|
||||||
|
"wack-ctf": "wack-ctf_2",
|
||||||
|
"wack-server-conf": "wack-server-conf_2"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1730452853,
|
||||||
|
"narHash": "sha256-rTdzP+D3Xu0ld2aThcih7G0Qnvbi01Tx9aFPGS+sE2k=",
|
||||||
|
"ref": "master",
|
||||||
|
"rev": "7b85076c992eba955038f180d51b563c967175b7",
|
||||||
|
"revCount": 266,
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://git.dodsorf.as/Dandellion/dotfiles.git"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"ref": "master",
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://git.dodsorf.as/Dandellion/dotfiles.git"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"dandellion_2": {
|
||||||
|
"inputs": {
|
||||||
|
"dan": "dan_3",
|
||||||
|
"home-manager": "home-manager_3",
|
||||||
|
"nixgl": "nixgl_3",
|
||||||
|
"nixpkgs": [
|
||||||
|
"wack-server-conf",
|
||||||
|
"dandellion",
|
||||||
|
"wack-server-conf",
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
|
"nur": "nur_3",
|
||||||
|
"unstable": "unstable_3"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1699137267,
|
"lastModified": 1699137267,
|
||||||
@@ -99,6 +156,21 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"flake-utils_3": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1659877975,
|
||||||
|
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"greg-clients": {
|
"greg-clients": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
@@ -119,12 +191,57 @@
|
|||||||
"url": "https://git.pvv.ntnu.no/Projects/grzegorz-clients"
|
"url": "https://git.pvv.ntnu.no/Projects/grzegorz-clients"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"greg-clients_2": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"wack-server-conf",
|
||||||
|
"dandellion",
|
||||||
|
"unstable"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1726861934,
|
||||||
|
"narHash": "sha256-lOzPDwktd+pwszUTbpUdQg6iCzInS11fHLfkjmnvJrM=",
|
||||||
|
"ref": "refs/heads/master",
|
||||||
|
"rev": "546d921ec46735dbf876e36f4af8df1064d09432",
|
||||||
|
"revCount": 78,
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://git.pvv.ntnu.no/Projects/grzegorz-clients"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://git.pvv.ntnu.no/Projects/grzegorz-clients"
|
||||||
|
}
|
||||||
|
},
|
||||||
"home-manager": {
|
"home-manager": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1733050161,
|
||||||
|
"narHash": "sha256-lYnT+EYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20=",
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "home-manager",
|
||||||
|
"rev": "62d536255879be574ebfe9b87c4ac194febf47c5",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-community",
|
||||||
|
"ref": "release-24.11",
|
||||||
|
"repo": "home-manager",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"home-manager_2": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"wack-server-conf",
|
||||||
|
"dandellion",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1726989464,
|
"lastModified": 1726989464,
|
||||||
"narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
|
"narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
|
||||||
@@ -140,9 +257,11 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"home-manager_2": {
|
"home-manager_3": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
"wack-server-conf",
|
||||||
|
"dandellion",
|
||||||
"wack-server-conf",
|
"wack-server-conf",
|
||||||
"dandellion",
|
"dandellion",
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
@@ -163,9 +282,11 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"home-manager_3": {
|
"home-manager_4": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
"wack-server-conf",
|
||||||
|
"dandellion",
|
||||||
"wack-server-conf",
|
"wack-server-conf",
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
]
|
||||||
@@ -185,6 +306,28 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"home-manager_5": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"wack-server-conf",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1726989464,
|
||||||
|
"narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "home-manager",
|
||||||
|
"rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-community",
|
||||||
|
"ref": "release-24.05",
|
||||||
|
"repo": "home-manager",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nixgl": {
|
"nixgl": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils",
|
"flake-utils": "flake-utils",
|
||||||
@@ -215,6 +358,31 @@
|
|||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1713543440,
|
||||||
|
"narHash": "sha256-lnzZQYG0+EXl/6NkGpyIz+FEOc/DSEG57AP1VsdeNrM=",
|
||||||
|
"owner": "guibou",
|
||||||
|
"repo": "nixGL",
|
||||||
|
"rev": "310f8e49a149e4c9ea52f1adf70cdc768ec53f8a",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "guibou",
|
||||||
|
"repo": "nixGL",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixgl_3": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-utils": "flake-utils_3",
|
||||||
|
"nixpkgs": [
|
||||||
|
"wack-server-conf",
|
||||||
|
"dandellion",
|
||||||
|
"wack-server-conf",
|
||||||
|
"dandellion",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1685908677,
|
"lastModified": 1685908677,
|
||||||
"narHash": "sha256-E4zUPEUFyVWjVm45zICaHRpfGepfkE9Z2OECV9HXfA4=",
|
"narHash": "sha256-E4zUPEUFyVWjVm45zICaHRpfGepfkE9Z2OECV9HXfA4=",
|
||||||
@@ -231,11 +399,27 @@
|
|||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1729455275,
|
"lastModified": 1733217105,
|
||||||
"narHash": "sha256-THqzn/7um3oMHUEGXyq+1CJQE7EogwR3HjLMNOlhFBE=",
|
"narHash": "sha256-fc6jTzIwCIVWTX50FtW6AZpuukuQWSEbPiyg6ZRGWFY=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "9fcf30fccf8435f6390efec4a4d38e69c2268a36",
|
"rev": "cceee0a31d2f01bcc98b2fbd591327c06a4ea4f9",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "master",
|
||||||
|
"repo": "nixos-hardware",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixos-hardware_2": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1730368399,
|
||||||
|
"narHash": "sha256-F8vJtG389i9fp3k2/UDYHMed3PLCJYfxCqwiVP7b9ig=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixos-hardware",
|
||||||
|
"rev": "da14839ac5f38ee6adbdb4e6db09b5eef6d6ccdc",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -247,16 +431,16 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1729181673,
|
"lastModified": 1733261153,
|
||||||
"narHash": "sha256-LDiPhQ3l+fBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I=",
|
"narHash": "sha256-eq51hyiaIwtWo19fPEeE0Zr2s83DYMKJoukNLgGGpek=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3",
|
"rev": "b681065d0919f7eb5309a93cea2cfa84dec9aa88",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"ref": "nixos-24.05",
|
"ref": "nixos-24.11",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
@@ -277,13 +461,59 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixpkgs-stable_2": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1729973466,
|
||||||
|
"narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "cd3e8833d70618c4eea8df06f95b364b016d4950",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "release-24.05",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs-unstable": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1699099776,
|
||||||
|
"narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"id": "nixpkgs",
|
||||||
|
"ref": "nixos-unstable",
|
||||||
|
"type": "indirect"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs-unstable_2": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1699099776,
|
||||||
|
"narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"id": "nixpkgs",
|
||||||
|
"ref": "nixos-unstable",
|
||||||
|
"type": "indirect"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nur": {
|
"nur": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1729471037,
|
"lastModified": 1733417713,
|
||||||
"narHash": "sha256-aWGGu8XhKVR1FZ8nH8LVdvFwHX65byd8ZOJLi1gVCQA=",
|
"narHash": "sha256-/3foD2ePFtms/swS2J77CbAepo1nQ4CHlRBpj1IR8t0=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NUR",
|
"repo": "NUR",
|
||||||
"rev": "b1f97f5db3a6309affd80e412aee8cce747a1489",
|
"rev": "6e671d63e6b1e29f31781b8dfef69b147b69ab77",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -293,6 +523,21 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nur_2": {
|
"nur_2": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1730450711,
|
||||||
|
"narHash": "sha256-quBA0X4kODNac/4ZF/urYD99PFC789rDC4Vi8ASKn6s=",
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "NUR",
|
||||||
|
"rev": "1c95a10940bc0ce0d6b28dd092a3d6a1c45555cb",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "NUR",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nur_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1699131694,
|
"lastModified": 1699131694,
|
||||||
"narHash": "sha256-dKWORPD0ODREKihqCZqEqc1zJ3wACmoMmuf2BGg3DbE=",
|
"narHash": "sha256-dKWORPD0ODREKihqCZqEqc1zJ3wACmoMmuf2BGg3DbE=",
|
||||||
@@ -317,12 +562,15 @@
|
|||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs",
|
||||||
"nur": "nur",
|
"nur": "nur",
|
||||||
"unstable": "unstable",
|
"unstable": "unstable",
|
||||||
|
"wack-ctf": "wack-ctf",
|
||||||
"wack-server-conf": "wack-server-conf"
|
"wack-server-conf": "wack-server-conf"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"sops-nix": {
|
"sops-nix": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
"wack-server-conf",
|
||||||
|
"dandellion",
|
||||||
"wack-server-conf",
|
"wack-server-conf",
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
],
|
],
|
||||||
@@ -342,13 +590,35 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"sops-nix_2": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"wack-server-conf",
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
|
"nixpkgs-stable": "nixpkgs-stable_2"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1729999681,
|
||||||
|
"narHash": "sha256-qm0uCtM9bg97LeJTKQ8dqV/FvqRN+ompyW4GIJruLuw=",
|
||||||
|
"owner": "Mic92",
|
||||||
|
"repo": "sops-nix",
|
||||||
|
"rev": "1666d16426abe79af5c47b7c0efa82fd31bf4c56",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "Mic92",
|
||||||
|
"repo": "sops-nix",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"unstable": {
|
"unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1729265718,
|
"lastModified": 1733229606,
|
||||||
"narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=",
|
"narHash": "sha256-FLYY5M0rpa5C2QAE3CKLYAM6TwbKicdRK6qNrSHlNrE=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "ccc0c2126893dd20963580b6478d1a10a4512185",
|
"rev": "566e53c2ad750c84f6d31f9ccb9d00f823165550",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -359,6 +629,22 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"unstable_2": {
|
"unstable_2": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1730272153,
|
||||||
|
"narHash": "sha256-B5WRZYsRlJgwVHIV6DvidFN7VX7Fg9uuwkRW9Ha8z+w=",
|
||||||
|
"owner": "nixos",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nixos",
|
||||||
|
"ref": "nixpkgs-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"unstable_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1699094435,
|
"lastModified": 1699094435,
|
||||||
"narHash": "sha256-YLZ5/KKZ1PyLrm2MO8UxRe4H3M0/oaYqNhSlq6FDeeA=",
|
"narHash": "sha256-YLZ5/KKZ1PyLrm2MO8UxRe4H3M0/oaYqNhSlq6FDeeA=",
|
||||||
@@ -374,7 +660,7 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"unstable_3": {
|
"unstable_4": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1698924604,
|
"lastModified": 1698924604,
|
||||||
"narHash": "sha256-GCFbkl2tj8fEZBZCw3Tc0AkGo0v+YrQlohhEGJ/X4s0=",
|
"narHash": "sha256-GCFbkl2tj8fEZBZCw3Tc0AkGo0v+YrQlohhEGJ/X4s0=",
|
||||||
@@ -390,15 +676,101 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"wack-server-conf": {
|
"unstable_5": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1730200266,
|
||||||
|
"narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "nixos-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"wack-ctf": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"dandellion": "dandellion",
|
|
||||||
"home-manager": "home-manager_3",
|
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
],
|
],
|
||||||
|
"nixpkgs-unstable": "nixpkgs-unstable"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1730403744,
|
||||||
|
"narHash": "sha256-SSMFSlxl96mOYAFl/mzwmsmokTAglRhRqWIMCR5NPa0=",
|
||||||
|
"owner": "WackAttackCTF",
|
||||||
|
"repo": "wack-ctf-flake",
|
||||||
|
"rev": "0e9aa8f5962b90a5516ef6de4d0f1abdcc67f7d5",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "WackAttackCTF",
|
||||||
|
"repo": "wack-ctf-flake",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"wack-ctf_2": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"wack-server-conf",
|
||||||
|
"dandellion",
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
|
"nixpkgs-unstable": "nixpkgs-unstable_2"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1730344946,
|
||||||
|
"narHash": "sha256-oc/0nVxNfOp+tIOj0F1SVvYVzFGFO3geKpDsD2cAGbE=",
|
||||||
|
"owner": "WackAttackCTF",
|
||||||
|
"repo": "wack-ctf-flake",
|
||||||
|
"rev": "7128fa8b1f7ae284ae093b5fc80df0da788efa6f",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "WackAttackCTF",
|
||||||
|
"repo": "wack-ctf-flake",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"wack-server-conf": {
|
||||||
|
"inputs": {
|
||||||
|
"dandellion": "dandellion",
|
||||||
|
"home-manager": "home-manager_5",
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
|
"sops-nix": "sops-nix_2",
|
||||||
|
"unstable": "unstable_5"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1730460041,
|
||||||
|
"narHash": "sha256-03CwZdZVD4yLvi3wtbnyk6Ual3toeb4lQGfAVWlEEEY=",
|
||||||
|
"owner": "WackAttackCTF",
|
||||||
|
"repo": "wack-server-conf",
|
||||||
|
"rev": "aaf2f1dbf97d951d94b543a2518fa71ddc2d4296",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "WackAttackCTF",
|
||||||
|
"repo": "wack-server-conf",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"wack-server-conf_2": {
|
||||||
|
"inputs": {
|
||||||
|
"dandellion": "dandellion_2",
|
||||||
|
"home-manager": "home-manager_4",
|
||||||
|
"nixpkgs": [
|
||||||
|
"wack-server-conf",
|
||||||
|
"dandellion",
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
"sops-nix": "sops-nix",
|
"sops-nix": "sops-nix",
|
||||||
"unstable": "unstable_3"
|
"unstable": "unstable_4"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1699656973,
|
"lastModified": 1699656973,
|
||||||
|
|||||||
12
flake.nix
12
flake.nix
@@ -5,9 +5,9 @@
|
|||||||
# nixConfig.exta-trusted-public-keys = "cache.dodsorf.as:FYKGadXTyI2ax8mirBTOjEqS/8PZKAWxiJVOBjESQXc=";
|
# nixConfig.exta-trusted-public-keys = "cache.dodsorf.as:FYKGadXTyI2ax8mirBTOjEqS/8PZKAWxiJVOBjESQXc=";
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
|
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
|
||||||
|
|
||||||
home-manager.url = "github:nix-community/home-manager/release-24.05";
|
home-manager.url = "github:nix-community/home-manager/release-24.11";
|
||||||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
|
||||||
unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
|
unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
|
||||||
@@ -22,6 +22,9 @@
|
|||||||
wack-server-conf.url = "github:WackAttackCTF/wack-server-conf";
|
wack-server-conf.url = "github:WackAttackCTF/wack-server-conf";
|
||||||
wack-server-conf.inputs.nixpkgs.follows = "nixpkgs";
|
wack-server-conf.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
|
||||||
|
wack-ctf.url = "github:WackAttackCTF/wack-ctf-flake";
|
||||||
|
wack-ctf.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
|
||||||
greg-clients.url = "git+https://git.pvv.ntnu.no/Projects/grzegorz-clients";
|
greg-clients.url = "git+https://git.pvv.ntnu.no/Projects/grzegorz-clients";
|
||||||
greg-clients.inputs.nixpkgs.follows = "unstable";
|
greg-clients.inputs.nixpkgs.follows = "unstable";
|
||||||
|
|
||||||
@@ -45,6 +48,7 @@
|
|||||||
grzegorz-clients = inputs.greg-clients.packages.${prev.system}.grzegorz-clients;
|
grzegorz-clients = inputs.greg-clients.packages.${prev.system}.grzegorz-clients;
|
||||||
gregctl = inputs.greg-clients.packages.${prev.system}.grzegorzctl;
|
gregctl = inputs.greg-clients.packages.${prev.system}.grzegorzctl;
|
||||||
# helix = inputs.helix.packages.${prev.system}.helix;
|
# helix = inputs.helix.packages.${prev.system}.helix;
|
||||||
|
wack = inputs.wack-ctf.packages.${prev.system}.wack;
|
||||||
})
|
})
|
||||||
nur.overlay
|
nur.overlay
|
||||||
nixgl.overlay
|
nixgl.overlay
|
||||||
@@ -57,7 +61,7 @@
|
|||||||
, username ? "daniel"
|
, username ? "daniel"
|
||||||
, homeDirectory ? "/home/${username}"
|
, homeDirectory ? "/home/${username}"
|
||||||
, stateVersion ? "22.05"
|
, stateVersion ? "22.05"
|
||||||
, extraSpecialArgs ? { inherit (self) defaultOverlays; }
|
, extraSpecialArgs ? { overlays = defaultOverlays; }
|
||||||
}:
|
}:
|
||||||
home-manager.lib.homeManagerConfiguration {
|
home-manager.lib.homeManagerConfiguration {
|
||||||
pkgs = nixpkgs.legacyPackages.${system};
|
pkgs = nixpkgs.legacyPackages.${system};
|
||||||
@@ -115,6 +119,8 @@
|
|||||||
type = "app";
|
type = "app";
|
||||||
program = "${self.homeActivations.${machine}}/activate";
|
program = "${self.homeActivations.${machine}}/activate";
|
||||||
});
|
});
|
||||||
|
|
||||||
|
inherit defaultOverlays;
|
||||||
|
|
||||||
# hydraJobs = {
|
# hydraJobs = {
|
||||||
# laptop.x86_64-linux = self.homeActivations.laptop;
|
# laptop.x86_64-linux = self.homeActivations.laptop;
|
||||||
|
|||||||
@@ -21,6 +21,6 @@
|
|||||||
profiles.games.enable = true;
|
profiles.games.enable = true;
|
||||||
|
|
||||||
home.packages = [
|
home.packages = [
|
||||||
pkgs.unstable.osu-lazer
|
pkgs.unstable.osu-lazer-bin
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -81,12 +81,13 @@ in
|
|||||||
ripgrep
|
ripgrep
|
||||||
|
|
||||||
gregctl
|
gregctl
|
||||||
|
wack
|
||||||
] ++ lib.optionals cfg.plus [
|
] ++ lib.optionals cfg.plus [
|
||||||
ffmpeg-full
|
ffmpeg-full
|
||||||
] ++ lib.optionals config.profiles.gui.enable [
|
] ++ lib.optionals config.profiles.gui.enable [
|
||||||
mpv
|
mpv
|
||||||
sxiv
|
sxiv
|
||||||
gnome3.eog
|
eog
|
||||||
|
|
||||||
dolphin
|
dolphin
|
||||||
plasma5Packages.dolphin-plugins
|
plasma5Packages.dolphin-plugins
|
||||||
@@ -204,7 +205,7 @@ in
|
|||||||
extensions = with pkgs.vscode-extensions; [
|
extensions = with pkgs.vscode-extensions; [
|
||||||
bbenoist.nix
|
bbenoist.nix
|
||||||
|
|
||||||
matklad.rust-analyzer
|
rust-lang.rust-analyzer
|
||||||
vadimcn.vscode-lldb
|
vadimcn.vscode-lldb
|
||||||
] ++ lib.optionals config.nixpkgs.config.allowUnfree [
|
] ++ lib.optionals config.nixpkgs.config.allowUnfree [
|
||||||
ms-vsliveshare.vsliveshare
|
ms-vsliveshare.vsliveshare
|
||||||
@@ -261,27 +262,32 @@ in
|
|||||||
enable = true;
|
enable = true;
|
||||||
matchBlocks = {
|
matchBlocks = {
|
||||||
"lilith" = {
|
"lilith" = {
|
||||||
hostname = "lilith.daniel";
|
hostname = "lilith.tn.dodsorf.as";
|
||||||
user = "dandellion";
|
user = "dandellion";
|
||||||
};
|
};
|
||||||
"desktop" = {
|
"desktop" = {
|
||||||
hostname = "desktop.daniel";
|
hostname = "soryu.tn.dodsorf.as";
|
||||||
user = "dan";
|
user = "dan";
|
||||||
};
|
};
|
||||||
"ubuntu-ai" = {
|
"ubuntu-ai" = {
|
||||||
hostname = "100.64.0.2";
|
hostname = "soryu.tn.dodsorf.as";
|
||||||
port = 2222;
|
port = 2222;
|
||||||
user = "daniel";
|
user = "daniel";
|
||||||
};
|
};
|
||||||
"laptop" = {
|
"laptop" = {
|
||||||
hostname = "laptop.daniel";
|
hostname = "ayanami.tn.dodsorf.as";
|
||||||
user = "daniel";
|
user = "daniel";
|
||||||
};
|
};
|
||||||
|
"login.pvv.ntnu.no" = {
|
||||||
|
user = "danio";
|
||||||
|
};
|
||||||
"pvv.ntnu.no" = {
|
"pvv.ntnu.no" = {
|
||||||
user = "danio";
|
user = "danio";
|
||||||
|
proxyJump = "login.pvv.ntnu.no";
|
||||||
};
|
};
|
||||||
"*.pvv.ntnu.no" = {
|
"*.pvv.ntnu.no !login.pvv.ntnu.no" = {
|
||||||
user = "danio";
|
user = "danio";
|
||||||
|
proxyJump = "login.pvv.ntnu.no";
|
||||||
};
|
};
|
||||||
"pascal" = {
|
"pascal" = {
|
||||||
hostname = "wiki.wackattack.eu";
|
hostname = "wiki.wackattack.eu";
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 210 KiB |
@@ -19,8 +19,10 @@
|
|||||||
options = [ "subvol=root" ];
|
options = [ "subvol=root" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
boot.initrd.luks.devices."enc".device = "/dev/disk/by-uuid/27c2e6ae-d9ec-4bbd-9ebe-6ec2e63dd139";
|
boot.initrd.luks.devices."enc" = {
|
||||||
|
allowDiscards = true;
|
||||||
|
device = "/dev/disk/by-uuid/27c2e6ae-d9ec-4bbd-9ebe-6ec2e63dd139";
|
||||||
|
};
|
||||||
fileSystems."/home" =
|
fileSystems."/home" =
|
||||||
{ device = "/dev/disk/by-uuid/276d0801-34f7-4d40-aa24-bfc43ea4ff51";
|
{ device = "/dev/disk/by-uuid/276d0801-34f7-4d40-aa24-bfc43ea4ff51";
|
||||||
fsType = "btrfs";
|
fsType = "btrfs";
|
||||||
|
|||||||
@@ -29,7 +29,7 @@
|
|||||||
CPUQuota = "300%";
|
CPUQuota = "300%";
|
||||||
MemoryHigh = "29G";
|
MemoryHigh = "29G";
|
||||||
MemoryMax = "30G";
|
MemoryMax = "30G";
|
||||||
MemorySwapMax = "25G";
|
MemorySwapMax = "50G";
|
||||||
ExecStart = "systemd-nspawn --quiet --keep-unit --boot --link-journal=try-guest --network-veth -U --settings=override --machine=%i -D /mnt/human/machines/ubuntu-ai";
|
ExecStart = "systemd-nspawn --quiet --keep-unit --boot --link-journal=try-guest --network-veth -U --settings=override --machine=%i -D /mnt/human/machines/ubuntu-ai";
|
||||||
};
|
};
|
||||||
# overrideStrategy = "asDropin";
|
# overrideStrategy = "asDropin";
|
||||||
|
|||||||
@@ -29,6 +29,10 @@
|
|||||||
"fs.file-max" = 524288;
|
"fs.file-max" = 524288;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
zramSwap = {
|
||||||
|
enable = true;
|
||||||
|
memoryMax = 32 * 1024 * 1024 * 1024; # 16 GB ZRAM
|
||||||
|
};
|
||||||
|
|
||||||
disabledModules = [
|
disabledModules = [
|
||||||
"services/network-filesystems/tahoe.nix"
|
"services/network-filesystems/tahoe.nix"
|
||||||
@@ -174,17 +178,16 @@
|
|||||||
# "L+ /opt/rocm/hip - - - - ${pkgs.hip}"
|
# "L+ /opt/rocm/hip - - - - ${pkgs.hip}"
|
||||||
# ];
|
# ];
|
||||||
|
|
||||||
|
hardware.graphics.enable = true;
|
||||||
hardware.opengl.driSupport = true;
|
hardware.graphics.enable32Bit = true;
|
||||||
hardware.opengl.driSupport32Bit = true;
|
hardware.graphics.extraPackages = with pkgs; [
|
||||||
hardware.opengl.extraPackages = with pkgs; [
|
|
||||||
libva
|
libva
|
||||||
rocmPackages.clr.icd
|
|
||||||
];
|
];
|
||||||
|
hardware.amdgpu.opencl.enable = true;
|
||||||
|
|
||||||
# Enable the X11 windowing system.
|
# Enable the X11 windowing system.
|
||||||
services.xserver.enable = true;
|
services.xserver.enable = true;
|
||||||
services.xserver.layout = "no";
|
services.xserver.xkb.layout = "no";
|
||||||
# services.xserver.xkbOptions = "eurosign:e";
|
# services.xserver.xkbOptions = "eurosign:e";
|
||||||
|
|
||||||
services.xserver.displayManager.lightdm.enable = true;
|
services.xserver.displayManager.lightdm.enable = true;
|
||||||
@@ -196,6 +199,7 @@
|
|||||||
|
|
||||||
virtualisation.docker.enable = true;
|
virtualisation.docker.enable = true;
|
||||||
virtualisation.libvirtd.enable = true;
|
virtualisation.libvirtd.enable = true;
|
||||||
|
virtualisation.spiceUSBRedirection.enable = true;
|
||||||
|
|
||||||
|
|
||||||
# networking.nameservers = lib.mkForce [ "192.168.0.25" ];
|
# networking.nameservers = lib.mkForce [ "192.168.0.25" ];
|
||||||
|
|||||||
Reference in New Issue
Block a user