Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
7b72adab7f |
777
flake.lock
generated
777
flake.lock
generated
@@ -6,29 +6,6 @@
|
|||||||
"unstable"
|
"unstable"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
|
||||||
"lastModified": 1656687988,
|
|
||||||
"narHash": "sha256-2ywoy3wUvFAyxDTw7VPlz5TGh9mk/um2AWOjhJqJxNQ=",
|
|
||||||
"ref": "master",
|
|
||||||
"rev": "7e85f62e40cd585ce81fa1f3debd5385bb0cad03",
|
|
||||||
"revCount": 160,
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://git.dodsorf.as/Dandellion/NUR.git"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"ref": "master",
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://git.dodsorf.as/Dandellion/NUR.git"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"dan_2": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"wack-server-conf",
|
|
||||||
"dandellion",
|
|
||||||
"unstable"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1656687988,
|
"lastModified": 1656687988,
|
||||||
"narHash": "sha256-2ywoy3wUvFAyxDTw7VPlz5TGh9mk/um2AWOjhJqJxNQ=",
|
"narHash": "sha256-2ywoy3wUvFAyxDTw7VPlz5TGh9mk/um2AWOjhJqJxNQ=",
|
||||||
@@ -43,130 +20,7 @@
|
|||||||
"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": {
|
|
||||||
"inputs": {
|
|
||||||
"dan": "dan_2",
|
|
||||||
"greg-clients": "greg-clients_2",
|
|
||||||
"home-manager": "home-manager_2",
|
|
||||||
"nixgl": "nixgl_2",
|
|
||||||
"nixos-hardware": "nixos-hardware_2",
|
|
||||||
"nixpkgs": [
|
|
||||||
"wack-server-conf",
|
|
||||||
"nixpkgs"
|
|
||||||
],
|
|
||||||
"nur": "nur_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": {
|
|
||||||
"lastModified": 1699137267,
|
|
||||||
"narHash": "sha256-cBusl45B1nj9vpwYVLZamNYmSbHeama1IdWMlBl14Jo=",
|
|
||||||
"ref": "23.05",
|
|
||||||
"rev": "760228bcc60e27c94bb295106b7d470b0ebd9feb",
|
|
||||||
"revCount": 241,
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://git.dodsorf.as/Dandellion/dotfiles.git"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"ref": "23.05",
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://git.dodsorf.as/Dandellion/dotfiles.git"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-parts": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs-lib": [
|
|
||||||
"nur",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1733312601,
|
|
||||||
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
|
|
||||||
"owner": "hercules-ci",
|
|
||||||
"repo": "flake-parts",
|
|
||||||
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "hercules-ci",
|
|
||||||
"repo": "flake-parts",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-utils": {
|
"flake-utils": {
|
||||||
"inputs": {
|
|
||||||
"systems": "systems"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1731533236,
|
|
||||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-utils_2": {
|
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1659877975,
|
"lastModified": 1659877975,
|
||||||
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
|
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
|
||||||
@@ -181,117 +35,12 @@
|
|||||||
"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": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"unstable"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1736178795,
|
|
||||||
"narHash": "sha256-mPdi8cgvIDYcgG3FRG7A4BOIMu2Jef96TPMnV00uXlM=",
|
|
||||||
"ref": "refs/heads/master",
|
|
||||||
"rev": "fde738910de1fd8293535a6382c2f0c2749dd7c1",
|
|
||||||
"revCount": 79,
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://git.pvv.ntnu.no/grzegorz/grzegorz-clients"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://git.pvv.ntnu.no/grzegorz/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": 1765605144,
|
|
||||||
"narHash": "sha256-RM2xs+1HdHxesjOelxoA3eSvXShC8pmBvtyTke4Ango=",
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "home-manager",
|
|
||||||
"rev": "90b62096f099b73043a747348c11dbfcfbdea949",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-community",
|
|
||||||
"ref": "release-25.11",
|
|
||||||
"repo": "home-manager",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"home-manager_2": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"wack-server-conf",
|
|
||||||
"dandellion",
|
|
||||||
"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"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"home-manager_3": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"wack-server-conf",
|
|
||||||
"dandellion",
|
|
||||||
"wack-server-conf",
|
|
||||||
"dandellion",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1695108154,
|
"lastModified": 1695108154,
|
||||||
"narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=",
|
"narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=",
|
||||||
@@ -307,52 +56,6 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"home-manager_4": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"wack-server-conf",
|
|
||||||
"dandellion",
|
|
||||||
"wack-server-conf",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1695108154,
|
|
||||||
"narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=",
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "home-manager",
|
|
||||||
"rev": "07682fff75d41f18327a871088d20af2710d4744",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-community",
|
|
||||||
"ref": "release-23.05",
|
|
||||||
"repo": "home-manager",
|
|
||||||
"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",
|
||||||
@@ -360,54 +63,6 @@
|
|||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
|
||||||
"lastModified": 1752054764,
|
|
||||||
"narHash": "sha256-Ob/HuUhANoDs+nvYqyTKrkcPXf4ZgXoqMTQoCK0RFgQ=",
|
|
||||||
"owner": "guibou",
|
|
||||||
"repo": "nixGL",
|
|
||||||
"rev": "a8e1ce7d49a149ed70df676785b07f63288f53c5",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "guibou",
|
|
||||||
"repo": "nixGL",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixgl_2": {
|
|
||||||
"inputs": {
|
|
||||||
"flake-utils": "flake-utils_2",
|
|
||||||
"nixpkgs": [
|
|
||||||
"wack-server-conf",
|
|
||||||
"dandellion",
|
|
||||||
"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=",
|
||||||
@@ -422,182 +77,23 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixos-hardware": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1762463231,
|
|
||||||
"narHash": "sha256-hv1mG5j5PTbnWbtHHomzTus77pIxsc4x8VrMjc7+/YE=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixos-hardware",
|
|
||||||
"rev": "52113c4f5cfd1e823001310e56d9c8d0699a6226",
|
|
||||||
"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"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "master",
|
|
||||||
"repo": "nixos-hardware",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1765762245,
|
"lastModified": 1698942558,
|
||||||
"narHash": "sha256-3iXM/zTqEskWtmZs3gqNiVtRTsEjYAedIaLL0mSBsrk=",
|
"narHash": "sha256-/UmnB+mEd6Eg3mJBrAgqRcyZX//RSjHphcCO7Ig9Bpk=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "c8cfcd6ccd422e41cc631a0b73ed4d5a925c393d",
|
"rev": "621f51253edffa1d6f08d5fce4f08614c852d17e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"ref": "nixos-25.11",
|
"ref": "nixos-23.05",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1698544399,
|
|
||||||
"narHash": "sha256-vhRmPyEyoPkrXF2iykBsWHA05MIaOSmMRLMF7Hul6+s=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "d87c5d8c41c9b3b39592563242f3a448b5cc4bc9",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "release-23.05",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"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"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs_2": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1751011381,
|
|
||||||
"narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=",
|
|
||||||
"owner": "nixos",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "30e2e2857ba47844aa71991daa6ed1fc678bcbb7",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nixos",
|
|
||||||
"ref": "nixos-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs_3": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1762361079,
|
|
||||||
"narHash": "sha256-lz718rr1BDpZBYk7+G8cE6wee3PiBUpn8aomG/vLLiY=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "ffcdcf99d65c61956d882df249a9be53e5902ea5",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"id": "nixpkgs",
|
|
||||||
"type": "indirect"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nur": {
|
"nur": {
|
||||||
"inputs": {
|
|
||||||
"flake-parts": "flake-parts",
|
|
||||||
"nixpkgs": "nixpkgs_2",
|
|
||||||
"treefmt-nix": "treefmt-nix"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1751281595,
|
|
||||||
"narHash": "sha256-y0fShu8oxqjP+LNNZWvxQGdlLkZmnK75nNCe8jfIfN0=",
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "NUR",
|
|
||||||
"rev": "f73c91ffeff4282beb786e4e3de0db037fe07969",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "NUR",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"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=",
|
||||||
@@ -615,133 +111,14 @@
|
|||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"dan": "dan",
|
"dan": "dan",
|
||||||
"greg-clients": "greg-clients",
|
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"nixgl": "nixgl",
|
"nixgl": "nixgl",
|
||||||
"nixos-hardware": "nixos-hardware",
|
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs",
|
||||||
"nur": "nur",
|
"nur": "nur",
|
||||||
"unstable": "unstable",
|
"unstable": "unstable"
|
||||||
"wack-ctf": "wack-ctf",
|
|
||||||
"wack-server-conf": "wack-server-conf",
|
|
||||||
"warez": "warez"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"sops-nix": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"wack-server-conf",
|
|
||||||
"dandellion",
|
|
||||||
"wack-server-conf",
|
|
||||||
"nixpkgs"
|
|
||||||
],
|
|
||||||
"nixpkgs-stable": "nixpkgs-stable"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1699021419,
|
|
||||||
"narHash": "sha256-oy2j2OHXYcckifASMeZzpmbDLSvobMGt0V/RvoDotF4=",
|
|
||||||
"owner": "Mic92",
|
|
||||||
"repo": "sops-nix",
|
|
||||||
"rev": "275b28593ef3a1b9d05b6eeda3ddce2f45f5c06f",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "Mic92",
|
|
||||||
"repo": "sops-nix",
|
|
||||||
"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"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"systems": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1681028828,
|
|
||||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
|
||||||
"owner": "nix-systems",
|
|
||||||
"repo": "default",
|
|
||||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-systems",
|
|
||||||
"repo": "default",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"treefmt-nix": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"nur",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1733222881,
|
|
||||||
"narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "treefmt-nix",
|
|
||||||
"rev": "49717b5af6f80172275d47a418c9719a31a78b53",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "treefmt-nix",
|
|
||||||
"type": "github"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"unstable": {
|
"unstable": {
|
||||||
"locked": {
|
|
||||||
"lastModified": 1765644376,
|
|
||||||
"narHash": "sha256-yqHBL2wYGwjGL2GUF2w3tofWl8qO9tZEuI4wSqbCrtE=",
|
|
||||||
"owner": "nixos",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "23735a82a828372c4ef92c660864e82fbe2f5fbe",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nixos",
|
|
||||||
"ref": "nixpkgs-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"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=",
|
||||||
@@ -756,150 +133,6 @@
|
|||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"unstable_4": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1698924604,
|
|
||||||
"narHash": "sha256-GCFbkl2tj8fEZBZCw3Tc0AkGo0v+YrQlohhEGJ/X4s0=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "fa804edfb7869c9fb230e174182a8a1a7e512c40",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "nixos-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"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": {
|
|
||||||
"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",
|
|
||||||
"unstable": "unstable_4"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1699656973,
|
|
||||||
"narHash": "sha256-csFw6I3dhPR9seG+mRnonlWCYm32mfLYb3Ga+vjS9Ak=",
|
|
||||||
"owner": "WackAttackCTF",
|
|
||||||
"repo": "wack-server-conf",
|
|
||||||
"rev": "77551a8f183a503653db3118a97f856af5301ec5",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "WackAttackCTF",
|
|
||||||
"repo": "wack-server-conf",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"warez": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": "nixpkgs_3"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1738103614,
|
|
||||||
"narHash": "sha256-EvaKn0vfvvX/rtRGFXim+JOQLLAr/1Y4igQrmnLI1CE=",
|
|
||||||
"ref": "refs/heads/master",
|
|
||||||
"rev": "c3bb59ee5cc6d700f6edf98c65a853efa09993ef",
|
|
||||||
"revCount": 6,
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://git.pvv.ntnu.no/tnug/nix-warez"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://git.pvv.ntnu.no/tnug/nix-warez"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": "root",
|
"root": "root",
|
||||||
|
|||||||
143
flake.nix
143
flake.nix
@@ -1,56 +1,33 @@
|
|||||||
{
|
{
|
||||||
description = "dandellion's home-manager profiles";
|
description = "dandellion's home-manager profiles";
|
||||||
|
|
||||||
inputs = {
|
# nixConfig.extra-substituters = ["https://cache.dodsorf.as"];
|
||||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
|
# nixConfig.exta-trusted-public-keys = "cache.dodsorf.as:FYKGadXTyI2ax8mirBTOjEqS/8PZKAWxiJVOBjESQXc=";
|
||||||
|
|
||||||
home-manager.url = "github:nix-community/home-manager/release-25.11";
|
inputs = {
|
||||||
|
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
|
||||||
|
|
||||||
|
home-manager.url = "github:nix-community/home-manager/release-23.05";
|
||||||
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";
|
||||||
|
|
||||||
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
|
||||||
|
|
||||||
nur.url = "github:nix-community/NUR";
|
nur.url = "github:nix-community/NUR";
|
||||||
|
|
||||||
dan.url = "git+https://git.dodsorf.as/Dandellion/NUR.git?ref=master"; #"git+https://git.dodsorf.as/Dandellion/NUR";
|
dan.url = "git+https://git.dodsorf.as/Dandellion/NUR.git"; #"git+https://git.dodsorf.as/Dandellion/NUR";
|
||||||
dan.inputs.nixpkgs.follows = "unstable";
|
dan.inputs.nixpkgs.follows = "unstable";
|
||||||
|
|
||||||
wack-server-conf.url = "github:WackAttackCTF/wack-server-conf";
|
# helix.url = "github:helix-editor/helix";
|
||||||
wack-server-conf.inputs.nixpkgs.follows = "nixpkgs";
|
# helix.inputs.nixpkgs.follows = "unstable";
|
||||||
|
|
||||||
wack-ctf.url = "github:WackAttackCTF/wack-ctf-flake";
|
|
||||||
wack-ctf.inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
|
|
||||||
greg-clients.url = "git+https://git.pvv.ntnu.no/grzegorz/grzegorz-clients";
|
|
||||||
greg-clients.inputs.nixpkgs.follows = "unstable";
|
|
||||||
|
|
||||||
warez.url = "git+https://git.pvv.ntnu.no/tnug/nix-warez";
|
|
||||||
|
|
||||||
nixgl.url = "github:guibou/nixGL";
|
nixgl.url = "github:guibou/nixGL";
|
||||||
nixgl.inputs.nixpkgs.follows = "nixpkgs";
|
nixgl.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = {self, nixpkgs, home-manager, unstable, nixos-hardware, nur, dan, nixgl, ... }@inputs:
|
outputs = {self, nixpkgs, home-manager, unstable, nur, dan, nixgl, ... }@inputs:
|
||||||
let
|
let
|
||||||
nixlib = unstable.lib;
|
nixlib = unstable.lib;
|
||||||
|
|
||||||
defaultOverlays = [
|
|
||||||
(final: prev: {
|
|
||||||
unstable = import unstable {
|
|
||||||
inherit (prev) system config;
|
|
||||||
};
|
|
||||||
dan = dan.packages.${prev.system};
|
|
||||||
grzegorz-clients = inputs.greg-clients.packages.${prev.system}.grzegorz-clients;
|
|
||||||
gregctl = inputs.greg-clients.packages.${prev.system}.grzegorzctl;
|
|
||||||
# helix = inputs.helix.packages.${prev.system}.helix;
|
|
||||||
wack = inputs.wack-ctf.packages.${prev.system}.wack;
|
|
||||||
})
|
|
||||||
nur.overlays.default
|
|
||||||
nixgl.overlays.default
|
|
||||||
inputs.warez.overlays.default
|
|
||||||
];
|
|
||||||
|
|
||||||
mkHome =
|
mkHome =
|
||||||
{ machine
|
{ machine
|
||||||
, configuration ? self.nixosModules.home-manager.${machine}
|
, configuration ? self.nixosModules.home-manager.${machine}
|
||||||
@@ -58,7 +35,7 @@
|
|||||||
, username ? "daniel"
|
, username ? "daniel"
|
||||||
, homeDirectory ? "/home/${username}"
|
, homeDirectory ? "/home/${username}"
|
||||||
, stateVersion ? "22.05"
|
, stateVersion ? "22.05"
|
||||||
, extraSpecialArgs ? { overlays = defaultOverlays; }
|
, extraSpecialArgs ? { inherit (self) overlays; }
|
||||||
}:
|
}:
|
||||||
home-manager.lib.homeManagerConfiguration {
|
home-manager.lib.homeManagerConfiguration {
|
||||||
pkgs = nixpkgs.legacyPackages.${system};
|
pkgs = nixpkgs.legacyPackages.${system};
|
||||||
@@ -75,88 +52,30 @@
|
|||||||
|
|
||||||
mkHomes = machines: extraArgs: nixlib.genAttrs machines (machine: mkHome ({inherit machine; } // extraArgs));
|
mkHomes = machines: extraArgs: nixlib.genAttrs machines (machine: mkHome ({inherit machine; } // extraArgs));
|
||||||
|
|
||||||
allMachines = [ "ayanami" "desktop" "headless" "pvv-terminal" "ikari" ];
|
allMachines = [ "laptop" "desktop" "headless" "pvv-terminal" ];
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
|
||||||
homeConfigurations = mkHomes [ "ayanami" "headless" "ikari" ] { }
|
homeConfigurations = mkHomes [ "laptop" "headless" ] { }
|
||||||
// mkHomes [ "desktop" ] { username = "dan"; }
|
// mkHomes [ "desktop" ] { username = "dan"; }
|
||||||
// mkHomes [ "pvv-terminal" ] { username = "danio"; homeDirectory = "/home/pvv/d/danio"; };
|
// mkHomes [ "pvv-terminal" ] { username = "danio"; homeDirectory = "/home/pvv/d/danio"; };
|
||||||
|
|
||||||
nixosConfigurations = {
|
|
||||||
ayanami = nixpkgs.lib.nixosSystem {
|
|
||||||
system = "x86_64-linux";
|
|
||||||
specialArgs = {
|
|
||||||
inherit inputs;
|
|
||||||
};
|
|
||||||
modules = [
|
|
||||||
home-manager.nixosModules.home-manager
|
|
||||||
{
|
|
||||||
home-manager.useGlobalPkgs = false;
|
|
||||||
home-manager.useUserPackages = true;
|
|
||||||
home-manager.users.daniel = import ./home/machines/ayanami.nix;
|
|
||||||
home-manager.extraSpecialArgs = {
|
|
||||||
overlays = defaultOverlays;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
./hosts/ayanami/configuration.nix
|
|
||||||
nixos-hardware.nixosModules.lenovo-thinkpad-p14s-amd-gen2
|
|
||||||
];
|
|
||||||
};
|
|
||||||
soryu-old = nixpkgs.lib.nixosSystem {
|
|
||||||
system = "x86_64-linux";
|
|
||||||
specialArgs = {
|
|
||||||
inherit inputs;
|
|
||||||
};
|
|
||||||
modules = [
|
|
||||||
./hosts/asuka/soryu-old/configuration.nix
|
|
||||||
];
|
|
||||||
};
|
|
||||||
soryu = nixpkgs.lib.nixosSystem {
|
|
||||||
system = "x86_64-linux";
|
|
||||||
specialArgs = {
|
|
||||||
inherit inputs;
|
|
||||||
};
|
|
||||||
modules = [
|
|
||||||
home-manager.nixosModules.home-manager
|
|
||||||
{
|
|
||||||
home-manager.useGlobalPkgs = false;
|
|
||||||
home-manager.useUserPackages = true;
|
|
||||||
home-manager.users.daniel = import ./home/machines/soryu.nix;
|
|
||||||
home-manager.extraSpecialArgs = {
|
|
||||||
overlays = defaultOverlays;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
./hosts/asuka/soryu/configuration.nix
|
|
||||||
];
|
|
||||||
};
|
|
||||||
# langley = nixpkgs.lib.nixosSystem {
|
|
||||||
# system = "x86_64-linux";
|
|
||||||
# specialArgs = {
|
|
||||||
# inherit inputs;
|
|
||||||
# };
|
|
||||||
# modules = [
|
|
||||||
# ./hosts/asuka/langley/configuration.nix
|
|
||||||
# ];
|
|
||||||
# };
|
|
||||||
|
|
||||||
ikari = nixpkgs.lib.nixosSystem {
|
|
||||||
system = "x86_64-linux";
|
|
||||||
specialArgs = {
|
|
||||||
inherit inputs;
|
|
||||||
};
|
|
||||||
modules = [
|
|
||||||
./hosts/ikari/configuration.nix
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
nixosModules = {
|
nixosModules = {
|
||||||
home-manager = nixlib.genAttrs allMachines (machine: import ./home/machines/${machine}.nix);
|
home-manager = nixlib.genAttrs allMachines (machine: import ./machines/${machine}.nix);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
overlays = [
|
||||||
|
(final: prev: {
|
||||||
|
unstable = import unstable {
|
||||||
|
inherit (prev) system config;
|
||||||
|
};
|
||||||
|
dan = dan.packages.${prev.system};
|
||||||
|
# helix = inputs.helix.packages.${prev.system}.helix;
|
||||||
|
})
|
||||||
|
nur.overlay
|
||||||
|
nixgl.overlay
|
||||||
|
];
|
||||||
|
|
||||||
homeActivations = nixlib.genAttrs allMachines (machine: self.homeConfigurations.${machine}.activationPackage);
|
homeActivations = nixlib.genAttrs allMachines (machine: self.homeConfigurations.${machine}.activationPackage);
|
||||||
|
|
||||||
apps.x86_64-linux = nixlib.genAttrs allMachines (machine: {
|
apps.x86_64-linux = nixlib.genAttrs allMachines (machine: {
|
||||||
@@ -164,11 +83,9 @@
|
|||||||
program = "${self.homeActivations.${machine}}/activate";
|
program = "${self.homeActivations.${machine}}/activate";
|
||||||
});
|
});
|
||||||
|
|
||||||
inherit defaultOverlays;
|
hydraJobs = {
|
||||||
|
laptop.x86_64-linux = self.homeActivations.laptop;
|
||||||
# hydraJobs = {
|
desktop.x86_64-linux = self.homeActivations.desktop;
|
||||||
# laptop.x86_64-linux = self.homeActivations.laptop;
|
};
|
||||||
# desktop.x86_64-linux = self.homeActivations.desktop;
|
|
||||||
# };
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,31 +0,0 @@
|
|||||||
{ config, lib, pkgs, overlays, ... }:
|
|
||||||
{
|
|
||||||
nixpkgs.overlays = overlays;
|
|
||||||
nixpkgs.config.allowUnfreePredicate = (pkg: true);
|
|
||||||
nixpkgs.config.allowUnfree = true;
|
|
||||||
|
|
||||||
imports = [ ../profiles ];
|
|
||||||
|
|
||||||
machine = {
|
|
||||||
name = "Ayanami";
|
|
||||||
eth = "enp5s0";
|
|
||||||
wlan = "wlp3s0";
|
|
||||||
secondary-fs = null;
|
|
||||||
};
|
|
||||||
|
|
||||||
profiles.base.enable = true;
|
|
||||||
profiles.base.plus = true;
|
|
||||||
profiles.xsession.enable = true;
|
|
||||||
profiles.audio.fancy = true;
|
|
||||||
profiles.zsh.enable = true;
|
|
||||||
|
|
||||||
profiles.games.enable = true;
|
|
||||||
|
|
||||||
profiles.timetracking.enable = true;
|
|
||||||
|
|
||||||
home.packages = [
|
|
||||||
pkgs.unstable.osu-lazer-bin
|
|
||||||
];
|
|
||||||
|
|
||||||
home.stateVersion = "24.11";
|
|
||||||
}
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
{ config, lib, pkgs, overlays, ... }:
|
|
||||||
{
|
|
||||||
nixpkgs.overlays = overlays;
|
|
||||||
nixpkgs.config.allowUnfreePredicate = (pkg: true);
|
|
||||||
nixpkgs.config.allowUnfree = true;
|
|
||||||
|
|
||||||
imports = [ ../profiles ];
|
|
||||||
|
|
||||||
machine = {
|
|
||||||
name = "ikari";
|
|
||||||
eth = "eno1";
|
|
||||||
wlan = null;
|
|
||||||
};
|
|
||||||
profiles.base.enable = true;
|
|
||||||
profiles.base.plus = true;
|
|
||||||
profiles.xsession.enable = true;
|
|
||||||
profiles.audio.fancy = true;
|
|
||||||
profiles.zsh.enable = true;
|
|
||||||
|
|
||||||
profiles.games.enable = true;
|
|
||||||
|
|
||||||
home.packages = [
|
|
||||||
pkgs.unstable.osu-lazer
|
|
||||||
];
|
|
||||||
}
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
{ config, lib, pkgs, overlays, ... }:
|
|
||||||
{
|
|
||||||
nixpkgs.overlays = overlays;
|
|
||||||
nixpkgs.config.allowUnfreePredicate = (pkg: true);
|
|
||||||
nixpkgs.config.allowUnfree = true;
|
|
||||||
|
|
||||||
imports = [ ../profiles ];
|
|
||||||
|
|
||||||
machine = {
|
|
||||||
name = "Soryu";
|
|
||||||
eth = "enp9s0";
|
|
||||||
wlan = null;
|
|
||||||
secondary-fs = null;
|
|
||||||
};
|
|
||||||
|
|
||||||
profiles.base.enable = true;
|
|
||||||
profiles.base.plus = true;
|
|
||||||
profiles.xsession.enable = true;
|
|
||||||
profiles.audio.fancy = true;
|
|
||||||
profiles.zsh.enable = true;
|
|
||||||
|
|
||||||
profiles.games.enable = true;
|
|
||||||
|
|
||||||
profiles.timetracking.enable = true;
|
|
||||||
|
|
||||||
home.packages = [
|
|
||||||
pkgs.unstable.osu-lazer-bin
|
|
||||||
];
|
|
||||||
|
|
||||||
home.stateVersion = "24.11";
|
|
||||||
}
|
|
||||||
@@ -1,30 +0,0 @@
|
|||||||
{ config, lib, pkgs, overlays, ... }:
|
|
||||||
let
|
|
||||||
cfg = config.profiles.timetracking;
|
|
||||||
in {
|
|
||||||
options.profiles.timetracking = {
|
|
||||||
enable = lib.mkEnableOption "doin timetracking";
|
|
||||||
};
|
|
||||||
|
|
||||||
config = lib.mkIf cfg.enable {
|
|
||||||
services.activitywatch = {
|
|
||||||
enable = true;
|
|
||||||
watchers = {
|
|
||||||
aw-watcher-afk = {
|
|
||||||
package = pkgs.activitywatch;
|
|
||||||
settings = {
|
|
||||||
timeout = 300;
|
|
||||||
poll_time = 2;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
aw-watcher-window = {
|
|
||||||
package = pkgs.activitywatch;
|
|
||||||
settings = {
|
|
||||||
poll_time = 1;
|
|
||||||
# exclude_title = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
{ pkgs, config, lib, ...}:
|
|
||||||
{
|
|
||||||
|
|
||||||
config = lib.mkIf config.profiles.xsession.enable {
|
|
||||||
|
|
||||||
programs.kitty = {
|
|
||||||
enable = true;
|
|
||||||
font.name = "MesloLGS NF";
|
|
||||||
font.size = 12;
|
|
||||||
keybindings = {
|
|
||||||
"ctrl+shift+c" = "copy_to_clipboard";
|
|
||||||
"ctrl+shift+v" = "paste_from_clipboard";
|
|
||||||
|
|
||||||
"ctrl+plus" = "change_font_size all +2.0";
|
|
||||||
"ctrl+shift+plus" = "change_font_size all -2.0";
|
|
||||||
};
|
|
||||||
settings = {
|
|
||||||
"background_opacity" = 0.7;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
home.packages = [
|
|
||||||
pkgs.ncurses.dev
|
|
||||||
];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
diff --git a/src/fs/gnunet-service-fs.c b/src/fs/gnunet-service-fs.c
|
|
||||||
index 597e89e..aaade99 100644
|
|
||||||
--- a/src/fs/gnunet-service-fs.c
|
|
||||||
+++ b/src/fs/gnunet-service-fs.c
|
|
||||||
@@ -1234,7 +1234,8 @@ peer_init_handler (void *cls,
|
|
||||||
my_identity))
|
|
||||||
{
|
|
||||||
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
|
|
||||||
- "Peer identity mismatch, refusing to start!\n");
|
|
||||||
+ "Peer identity mismatch, refusing to start! Core delivered %s.\n",
|
|
||||||
+ GNUNET_i2s (my_identity));
|
|
||||||
GNUNET_SCHEDULER_shutdown ();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,40 +0,0 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
systemd.nspawn.ubuntu-ai = {
|
|
||||||
execConfig = {
|
|
||||||
Boot = true;
|
|
||||||
};
|
|
||||||
networkConfig = {
|
|
||||||
Private = false;
|
|
||||||
};
|
|
||||||
filesConfig = {
|
|
||||||
BindReadOnly = [
|
|
||||||
"/etc/resolv.conf:/etc/resolv.conf"
|
|
||||||
];
|
|
||||||
Bind = [
|
|
||||||
"/dev/dri:/dev/dri"
|
|
||||||
"/dev/kfd:/dev/kfd"
|
|
||||||
"/mnt/human/llama:/llama:idmap"
|
|
||||||
"/mnt/human/sd:/sd:idmap"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.services."systemd-nspawn@ubuntu-ai" = {
|
|
||||||
environment = {
|
|
||||||
SYSTEMD_NSPAWN_TMPFS_TMP = "0";
|
|
||||||
};
|
|
||||||
serviceConfig = {
|
|
||||||
CPUQuota = "1400%";
|
|
||||||
MemoryHigh = "90G";
|
|
||||||
MemoryMax = "94G";
|
|
||||||
MemorySwapMax = "40G";
|
|
||||||
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";
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,235 +0,0 @@
|
|||||||
# Edit this configuration file to define what should be installed on
|
|
||||||
# your system. Help is available in the configuration.nix(5) man page
|
|
||||||
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
|
||||||
|
|
||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
imports =
|
|
||||||
[ # Include the results of the hardware scan.
|
|
||||||
./hardware-configuration.nix
|
|
||||||
./tahoe.nix
|
|
||||||
./gnunet-module.nix
|
|
||||||
./wack.nix
|
|
||||||
./ai.nix
|
|
||||||
];
|
|
||||||
|
|
||||||
# programs.adb.enable = true;
|
|
||||||
|
|
||||||
systemd.enableEmergencyMode = false;
|
|
||||||
|
|
||||||
networking.hostName = "soryu";
|
|
||||||
networking.extraHosts = ''
|
|
||||||
127.0.0.1 modules-cdn.eac-prod.on.epicgames.com #Star Citizen EAC workaround
|
|
||||||
'';
|
|
||||||
|
|
||||||
# Star Citizen resource limits
|
|
||||||
boot.kernel.sysctl = {
|
|
||||||
"vm.max_map_count" = 16777216;
|
|
||||||
"fs.file-max" = 524288;
|
|
||||||
};
|
|
||||||
|
|
||||||
zramSwap = {
|
|
||||||
enable = true;
|
|
||||||
memoryMax = 96 * 1024 * 1024 * 1024; # 96 GB ZRAM
|
|
||||||
};
|
|
||||||
|
|
||||||
disabledModules = [
|
|
||||||
"services/network-filesystems/tahoe.nix"
|
|
||||||
"services/networking/gnunet.nix"
|
|
||||||
];
|
|
||||||
|
|
||||||
services.resolved.enable = true;
|
|
||||||
services.resolved.dnssec = "false";
|
|
||||||
|
|
||||||
services.gnome.gnome-keyring.enable = true;
|
|
||||||
|
|
||||||
# services.tahoe.nodes.pvv-danio-desktop = {
|
|
||||||
# settings = {
|
|
||||||
# storage.enabled = true;
|
|
||||||
# storage.storage_dir = "/mnt/human/tahoe-lafs/pvv";
|
|
||||||
# client."shares.total" = 10;
|
|
||||||
# client."shares.needed" = 4;
|
|
||||||
# client."shares.happy" = 1;
|
|
||||||
# };
|
|
||||||
# };
|
|
||||||
|
|
||||||
|
|
||||||
# services.gnunet = {
|
|
||||||
# enable = true;
|
|
||||||
# package = pkgs.callPackage ./gnunet.nix { };
|
|
||||||
# settings = {
|
|
||||||
# hostlist = {
|
|
||||||
# OPTIONS = "-b -e";
|
|
||||||
# SERVERS = "http://v15.gnunet.org/hostlist https://gnunet.io/hostlist";
|
|
||||||
# };
|
|
||||||
## nat = {
|
|
||||||
## BEHIND_NAT = "YES";
|
|
||||||
## ENABLE_UPNP = "NO";
|
|
||||||
## DISABLEV6 = "YES";
|
|
||||||
## };
|
|
||||||
# ats = {
|
|
||||||
# WAN_QUOTA_IN = "unlimited";
|
|
||||||
# WAN_QUOTA_OUT = "unlimited";
|
|
||||||
# };
|
|
||||||
# };
|
|
||||||
# };
|
|
||||||
|
|
||||||
ids.gids.gnunetdns = 327;
|
|
||||||
|
|
||||||
|
|
||||||
# services.gnunet = {
|
|
||||||
# enable = true;
|
|
||||||
# extraOptions = ''
|
|
||||||
# [hostlist]
|
|
||||||
# OPTIONS = -b -e
|
|
||||||
# SERVERS = http://v11.gnunet.org:58080/
|
|
||||||
# HTTPPORT = 8080
|
|
||||||
# HOSTLISTFILE = $SERVICEHOME/hostlists.file
|
|
||||||
# [arm]
|
|
||||||
# START_SYSTEM_SERVICES = YES
|
|
||||||
# START_USER_SERVICES = NO
|
|
||||||
# '';
|
|
||||||
# };
|
|
||||||
|
|
||||||
|
|
||||||
services.murmur = {
|
|
||||||
enable = true;
|
|
||||||
# registerName = "DODSORFAS";
|
|
||||||
welcometext = "Dans PC at singsaker smh backup mumble server";
|
|
||||||
};
|
|
||||||
|
|
||||||
# Use the systemd-boot EFI boot loader.
|
|
||||||
boot.loader.systemd-boot.enable = true;
|
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
|
||||||
|
|
||||||
#boot.kernelParams = ["radeon.cik_support=0" "amdgpu.cik_support=1"];
|
|
||||||
boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
|
|
||||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
|
||||||
boot.kernelModules = [ "kvm-intel" ];
|
|
||||||
|
|
||||||
|
|
||||||
programs.steam = {
|
|
||||||
enable = true;
|
|
||||||
remotePlay.openFirewall = false; # Open ports in the firewall for Steam Remote Play
|
|
||||||
dedicatedServer.openFirewall = false; # Open ports in the firewall for Source Dedicated Server
|
|
||||||
};
|
|
||||||
|
|
||||||
nixpkgs.config = {
|
|
||||||
allowUnfree = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
services.tailscale.enable = true;
|
|
||||||
|
|
||||||
networking.firewall.interfaces."tailscale0" = let
|
|
||||||
all = { from = 0; to = 65535; };
|
|
||||||
in {
|
|
||||||
allowedUDPPortRanges = [ all ];
|
|
||||||
allowedTCPPortRanges = [ all ];
|
|
||||||
};
|
|
||||||
|
|
||||||
# Select internationalisation properties.
|
|
||||||
console.keyMap = "no-latin1";
|
|
||||||
|
|
||||||
time.timeZone = "Europe/Oslo";
|
|
||||||
|
|
||||||
# List packages installed in system profile. To search, run:
|
|
||||||
# $ nix search wget
|
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
wget vim git
|
|
||||||
];
|
|
||||||
|
|
||||||
# Some programs need SUID wrappers, can be configured further or are
|
|
||||||
# started in user sessions.
|
|
||||||
# programs.mtr.enable = true;
|
|
||||||
# programs.gnupg.agent = { enable = true; enableSSHSupport = true; };
|
|
||||||
|
|
||||||
# List services that you want to enable:
|
|
||||||
|
|
||||||
# Enable the OpenSSH daemon.
|
|
||||||
services.openssh.enable = true;
|
|
||||||
|
|
||||||
# Open ports in the firewall.
|
|
||||||
# networking.firewall.allowedTCPPorts = [ ... ];
|
|
||||||
# networking.firewall.allowedUDPPorts = [ ... ];
|
|
||||||
# Or disable the firewall altogether.
|
|
||||||
networking.firewall.enable = true;
|
|
||||||
networking.firewall.allowedTCPPorts = [ 8000 6007 5001 config.services.murmur.port ];
|
|
||||||
networking.firewall.allowedUDPPorts = [ 5001 21977 config.services.murmur.port ];
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Enable CUPS to print documents.
|
|
||||||
# services.printing.enable = true;
|
|
||||||
|
|
||||||
|
|
||||||
security.rtkit.enable = true;
|
|
||||||
services.pipewire = {
|
|
||||||
enable = true;
|
|
||||||
alsa.enable = true;
|
|
||||||
alsa.support32Bit = true;
|
|
||||||
pulse.enable = true;
|
|
||||||
jack.enable = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# systemd.tmpfiles.rules = [
|
|
||||||
# "L+ /opt/rocm/hip - - - - ${pkgs.hip}"
|
|
||||||
# ];
|
|
||||||
|
|
||||||
hardware.graphics.enable = true;
|
|
||||||
hardware.graphics.enable32Bit = true;
|
|
||||||
hardware.graphics.extraPackages = with pkgs; [
|
|
||||||
libva
|
|
||||||
];
|
|
||||||
hardware.amdgpu.opencl.enable = true;
|
|
||||||
|
|
||||||
# Enable the X11 windowing system.
|
|
||||||
services.xserver.enable = true;
|
|
||||||
services.xserver.xkb.layout = "no";
|
|
||||||
# services.xserver.xkbOptions = "eurosign:e";
|
|
||||||
|
|
||||||
services.xserver.displayManager.lightdm.enable = true;
|
|
||||||
services.xserver.videoDrivers = ["amdgpu"];
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
programs.zsh.enable = true;
|
|
||||||
|
|
||||||
virtualisation.docker.enable = true;
|
|
||||||
virtualisation.libvirtd.enable = true;
|
|
||||||
virtualisation.spiceUSBRedirection.enable = true;
|
|
||||||
|
|
||||||
|
|
||||||
# networking.nameservers = lib.mkForce [ "192.168.0.25" ];
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# services.ipfs.enable = true;
|
|
||||||
# services.ipfs.gatewayAddress = "/ip4/127.0.0.1/tcp/5002";
|
|
||||||
|
|
||||||
nix.trustedUsers = [ "dan" ];
|
|
||||||
nix.extraOptions = ''
|
|
||||||
experimental-features = nix-command flakes
|
|
||||||
'';
|
|
||||||
|
|
||||||
users.users.dan = {
|
|
||||||
isNormalUser = true;
|
|
||||||
uid = 1001;
|
|
||||||
shell = pkgs.zsh;
|
|
||||||
extraGroups = [ "wheel" "networkmanager" "docker" "video" "gnunet" "libvirtd" ];
|
|
||||||
initialPassword = "Abc123";
|
|
||||||
};
|
|
||||||
|
|
||||||
programs.dconf.enable = true;
|
|
||||||
services.dbus.packages = with pkgs; [ dconf ];
|
|
||||||
|
|
||||||
# This value determines the NixOS release with which your system is to be
|
|
||||||
# compatible, in order to avoid breaking some software such as database
|
|
||||||
# servers. You should change this only after NixOS release notes say you
|
|
||||||
# should.
|
|
||||||
system.stateVersion = "19.03"; # Did you read the comment?
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,109 +0,0 @@
|
|||||||
{config, lib, pkgs, ...}:
|
|
||||||
let
|
|
||||||
cfg = config.services.gnunet;
|
|
||||||
format = pkgs.formats.ini { };
|
|
||||||
|
|
||||||
configFile = format.generate "gnunet-config.conf" cfg.settings;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
options = {
|
|
||||||
services.gnunet = {
|
|
||||||
enable = lib.mkEnableOption "GNUnet daemon";
|
|
||||||
package = lib.mkPackageOption pkgs "gnunet" { };
|
|
||||||
settings = lib.mkOption {
|
|
||||||
type = lib.types.submodule {
|
|
||||||
freeformType = format.type;
|
|
||||||
options = {
|
|
||||||
transport-udp.PORT = lib.mkOption {
|
|
||||||
default = 2086;
|
|
||||||
type = lib.types.port;
|
|
||||||
description = "The UDP port for use by GNUnet.";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
config = lib.mkIf cfg.enable {
|
|
||||||
users.users.gnunet = {
|
|
||||||
group = "gnunet";
|
|
||||||
description = "GNUnet User";
|
|
||||||
uid = config.ids.uids.gnunet;
|
|
||||||
};
|
|
||||||
users.groups.gnunet.gid = config.ids.gids.gnunet;
|
|
||||||
users.groups.gnunetdns.gid = config.ids.gids.gnunetdns;
|
|
||||||
|
|
||||||
# TODO: Avoid putting these in $PATH
|
|
||||||
security.wrappers = let
|
|
||||||
mkGnunetSuid = source: {
|
|
||||||
setuid = true;
|
|
||||||
owner = "root";
|
|
||||||
group = "gnunet";
|
|
||||||
permissions = "o+rx,o-w,g+rx,g-w,o-rwx";
|
|
||||||
inherit source;
|
|
||||||
};
|
|
||||||
helpers = b: "${cfg.package}/lib/gnunet/libexec/${b}";
|
|
||||||
in {
|
|
||||||
gnunet-helper-vpn = mkGnunetSuid (helpers "gnunet-helper-vpn");
|
|
||||||
# These don't exist
|
|
||||||
#gnunet-helper-transport-wlan = mkGnunetSuid (helpers "gnunet-helper-transport-wlan");
|
|
||||||
#gnunet-helper-transport-bluetooth = mkGnunetSuid (helpers "gnunet-helper-transport-bluetooth");
|
|
||||||
gnunet-helper-exit = mkGnunetSuid (helpers "gnunet-helper-exit");
|
|
||||||
gnunet-helper-nat-server = mkGnunetSuid (helpers "gnunet-helper-nat-server");
|
|
||||||
gnunet-helper-nat-client = mkGnunetSuid (helpers "gnunet-helper-nat-client");
|
|
||||||
# > The binary should then be owned by root and be in group "gnunetdns"
|
|
||||||
# > and be installed SUID and only be group-executable (2750).
|
|
||||||
# But logically it should be 4750
|
|
||||||
gnunet-helper-dns = {
|
|
||||||
setuid = true;
|
|
||||||
owner = "root";
|
|
||||||
group = "gnunetdns";
|
|
||||||
permissions = "o+rx,o-w,g+rx,g-w,o-rwx";
|
|
||||||
source = (helpers "gnunet-helper-dns");
|
|
||||||
};
|
|
||||||
gnunet-service-dns = {
|
|
||||||
setgid = true;
|
|
||||||
owner = "root";
|
|
||||||
group = "gnunetdns";
|
|
||||||
permissions = "o+rx,o-w,g-rwx,o-rwx";
|
|
||||||
source = (helpers "gnunet-service-dns");
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
services.gnunet.settings = {
|
|
||||||
arm = {
|
|
||||||
START_SYSTEM_SERVICES = lib.mkDefault "YES";
|
|
||||||
START_USER_SERVICES = lib.mkDefault "NO";
|
|
||||||
};
|
|
||||||
dns = {
|
|
||||||
BINARY = lib.mkDefault "/run/wrappers/bin/gnunet-service-dns";
|
|
||||||
};
|
|
||||||
PATHS = {
|
|
||||||
SUID_BINARY_PATH = lib.mkDefault "/run/wrappers/bin";
|
|
||||||
GNUNET_HOME = lib.mkDefault "/var/lib/gnunet";
|
|
||||||
GNUNET_RUNTIME_DIR = lib.mkDefault "/run/gnunet";
|
|
||||||
GNUNET_USER_RUNTIME_DIR = lib.mkDefault "/run/gnunet";
|
|
||||||
GNUNET_DATA_HOME = lib.mkDefault "/var/lib/gnunet/data";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.services.gnunet = {
|
|
||||||
description = "GNUnet system deamon";
|
|
||||||
after = [ "network.target" ];
|
|
||||||
wantedBy = [ "multi-user.target" ];
|
|
||||||
path = [ cfg.package pkgs.miniupnpc ];
|
|
||||||
serviceConfig = {
|
|
||||||
ExecStart = "${cfg.package}/lib/gnunet/libexec/gnunet-service-arm -c ${configFile}";
|
|
||||||
User = "gnunet";
|
|
||||||
Group = "gnunet";
|
|
||||||
StateDirectory = "gnunet";
|
|
||||||
StateDirectoryMode = "0700";
|
|
||||||
WorkingDirectory = "/var/lib/gnunet";
|
|
||||||
RuntimeDirectory = "gnunet";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
environment.systemPackages = [ cfg.package ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,82 +0,0 @@
|
|||||||
{ lib, stdenv, fetchurl, adns, curlWithGnuTls, gettext, gmp, gnutls, libextractor
|
|
||||||
, libgcrypt, libgnurl, libidn, libmicrohttpd, libtool, libunistring
|
|
||||||
, makeWrapper, ncurses, pkg-config, libxml2, sqlite, zlib
|
|
||||||
, libpulseaudio, libopus, libogg, jansson, libsodium
|
|
||||||
|
|
||||||
, postgresqlSupport ? true, postgresql }:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
pname = "gnunet";
|
|
||||||
version = "0.19.4";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://gnu/gnunet/${pname}-${version}.tar.gz";
|
|
||||||
sha256 = "sha256-AKY99AjVmH9bqaUEQfKncYK9n7MvHjAq5WOslOesAJs=";
|
|
||||||
};
|
|
||||||
|
|
||||||
patches = [
|
|
||||||
./0001-gnunet-fs-log.patch
|
|
||||||
];
|
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
|
||||||
|
|
||||||
nativeBuildInputs = [ pkg-config libtool makeWrapper ];
|
|
||||||
buildInputs = [
|
|
||||||
adns curlWithGnuTls gmp gnutls libextractor libgcrypt libgnurl libidn
|
|
||||||
libmicrohttpd libunistring libxml2 ncurses gettext libsodium
|
|
||||||
sqlite zlib libpulseaudio libopus libogg jansson
|
|
||||||
] ++ lib.optional postgresqlSupport postgresql;
|
|
||||||
|
|
||||||
|
|
||||||
configureFlags = ["--enable-logging=verbose"];
|
|
||||||
|
|
||||||
preConfigure = ''
|
|
||||||
# Brute force: since nix-worker chroots don't provide
|
|
||||||
# /etc/{resolv.conf,hosts}, replace all references to `localhost'
|
|
||||||
# by their IPv4 equivalent.
|
|
||||||
find . \( -name \*.c -or -name \*.conf \) | \
|
|
||||||
xargs sed -ie 's|\<localhost\>|127.0.0.1|g'
|
|
||||||
|
|
||||||
# Make sure the tests don't rely on `/tmp', for the sake of chroot
|
|
||||||
# builds.
|
|
||||||
find . \( -iname \*test\*.c -or -name \*.conf \) | \
|
|
||||||
xargs sed -ie "s|/tmp|$TMPDIR|g"
|
|
||||||
|
|
||||||
sed -ie 's|@LDFLAGS@|@LDFLAGS@ $(Z_LIBS)|g' \
|
|
||||||
src/regex/Makefile.in \
|
|
||||||
src/fs/Makefile.in
|
|
||||||
'';
|
|
||||||
|
|
||||||
# unfortunately, there's still a few failures with impure tests
|
|
||||||
doCheck = false;
|
|
||||||
checkPhase = ''
|
|
||||||
export GNUNET_PREFIX="$out"
|
|
||||||
export PATH="$out/bin:$PATH"
|
|
||||||
make -k check
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = with lib; {
|
|
||||||
description = "GNU's decentralized anonymous and censorship-resistant P2P framework";
|
|
||||||
|
|
||||||
longDescription = ''
|
|
||||||
GNUnet is a framework for secure peer-to-peer networking that
|
|
||||||
does not use any centralized or otherwise trusted services. A
|
|
||||||
first service implemented on top of the networking layer
|
|
||||||
allows anonymous censorship-resistant file-sharing. Anonymity
|
|
||||||
is provided by making messages originating from a peer
|
|
||||||
indistinguishable from messages that the peer is routing. All
|
|
||||||
peers act as routers and use link-encrypted connections with
|
|
||||||
stable bandwidth utilization to communicate with each other.
|
|
||||||
GNUnet uses a simple, excess-based economic model to allocate
|
|
||||||
resources. Peers in GNUnet monitor each others behavior with
|
|
||||||
respect to resource usage; peers that contribute to the
|
|
||||||
network are rewarded with better service.
|
|
||||||
'';
|
|
||||||
|
|
||||||
homepage = "https://gnunet.org/";
|
|
||||||
license = licenses.agpl3Plus;
|
|
||||||
maintainers = with maintainers; [ pstn vrthra ];
|
|
||||||
platforms = platforms.gnu ++ platforms.linux;
|
|
||||||
changelog = "https://git.gnunet.org/gnunet.git/tree/ChangeLog?h=v${version}";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,53 +0,0 @@
|
|||||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
|
||||||
# and may be overwritten by future invocations. Please make changes
|
|
||||||
# to /etc/nixos/configuration.nix instead.
|
|
||||||
{ config, lib, pkgs, modulesPath, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
imports =
|
|
||||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
|
||||||
];
|
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "sd_mod" ];
|
|
||||||
boot.initrd.kernelModules = [ ];
|
|
||||||
boot.kernelModules = [ "kvm-intel" ];
|
|
||||||
boot.extraModulePackages = [ ];
|
|
||||||
|
|
||||||
fileSystems."/" =
|
|
||||||
{ device = "/dev/disk/by-uuid/ea6aa4dc-47bd-499c-8b51-c5d99a5a5a5e";
|
|
||||||
fsType = "ext4";
|
|
||||||
};
|
|
||||||
|
|
||||||
fileSystems."/boot" =
|
|
||||||
{ device = "/dev/disk/by-uuid/EE37-4B85";
|
|
||||||
fsType = "vfat";
|
|
||||||
};
|
|
||||||
|
|
||||||
fileSystems."/mnt/henning" =
|
|
||||||
{ device = "/dev/disk/by-uuid/0c16a107-fe7a-472e-881d-a28bc305988b";
|
|
||||||
fsType = "ext4";
|
|
||||||
};
|
|
||||||
|
|
||||||
fileSystems."/mnt/human" =
|
|
||||||
{ device = "/dev/disk/by-uuid/2d2b84b2-58b4-47a9-b328-cd4984927e48";
|
|
||||||
fsType = "ext4";
|
|
||||||
};
|
|
||||||
|
|
||||||
swapDevices =
|
|
||||||
[ { device = "/dev/disk/by-uuid/9969ac13-32c6-4f44-a706-cc810fe8339b"; }
|
|
||||||
];
|
|
||||||
|
|
||||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
|
||||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
|
||||||
# still possible to use this option, but it's recommended to use it in conjunction
|
|
||||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
|
||||||
networking.useDHCP = lib.mkDefault true;
|
|
||||||
# networking.interfaces.docker0.useDHCP = lib.mkDefault true;
|
|
||||||
# networking.interfaces.eno1.useDHCP = lib.mkDefault true;
|
|
||||||
# networking.interfaces.tailscale0.useDHCP = lib.mkDefault true;
|
|
||||||
|
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
|
||||||
powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
|
|
||||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
|
||||||
# high-resolution display
|
|
||||||
}
|
|
||||||
@@ -1,293 +0,0 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
with lib;
|
|
||||||
let
|
|
||||||
cfg = config.services.tahoe;
|
|
||||||
format = pkgs.formats.ini { };
|
|
||||||
in
|
|
||||||
{
|
|
||||||
options.services.tahoe = {
|
|
||||||
introducers = mkOption {
|
|
||||||
default = {};
|
|
||||||
type = with types; attrsOf (submodule {
|
|
||||||
options = {
|
|
||||||
settings = mkOption {
|
|
||||||
type = types.submodule {
|
|
||||||
freeformType = format.type;
|
|
||||||
options = {
|
|
||||||
node.nickname = mkOption {
|
|
||||||
type = types.str;
|
|
||||||
description = "The nickname of this Tahoe introducer.";
|
|
||||||
};
|
|
||||||
node."tub.port" = mkOption {
|
|
||||||
default = 3458;
|
|
||||||
type = types.port;
|
|
||||||
description = "The port on which the introducer will listen.";
|
|
||||||
};
|
|
||||||
node."tub.location" = mkOption {
|
|
||||||
type = types.nullOr types.str;
|
|
||||||
description = ''
|
|
||||||
The external location that the introducer should listen on.
|
|
||||||
If specified, the port should be included.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
description = "Freeform settings for the introducer";
|
|
||||||
};
|
|
||||||
package = mkOption {
|
|
||||||
default = pkgs.tahoe-lafs;
|
|
||||||
defaultText = literalExpression "pkgs.tahoe-lafs";
|
|
||||||
type = types.package;
|
|
||||||
description = "The package to use for the Tahoe LAFS daemon.";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
});
|
|
||||||
description = lib.mdDoc "The Tahoe introducers.";
|
|
||||||
};
|
|
||||||
nodes = mkOption {
|
|
||||||
default = {};
|
|
||||||
type = with types; attrsOf (submodule ({name, config, ...}: {
|
|
||||||
options = {
|
|
||||||
settings = mkOption {
|
|
||||||
type = types.submodule {
|
|
||||||
freeformType = format.type;
|
|
||||||
options = {
|
|
||||||
node.nickname = mkOption {
|
|
||||||
type = types.str;
|
|
||||||
description = "Value to display in management tools.";
|
|
||||||
default = name;
|
|
||||||
};
|
|
||||||
node."tub.port" = mkOption {
|
|
||||||
type = types.oneOf [ types.str types.port (types.enum [ "disabled" null ]) ];
|
|
||||||
description = "A twisted server endpoint specification for receiving connections from other nodes.";
|
|
||||||
example = "tcp:12345:interface=127.0.0.1";
|
|
||||||
default = 3457;
|
|
||||||
};
|
|
||||||
node."tub.location" = mkOption {
|
|
||||||
type = types.either types.str (types.enum [ "disabled" null ]);
|
|
||||||
description = "comma separated connection strings that can be reached publically.";
|
|
||||||
example = "tcp:mynode.example.com:3457,AUTO";
|
|
||||||
default = "AUTO";
|
|
||||||
};
|
|
||||||
node."web.port" = mkOption {
|
|
||||||
type = types.nullOr (types.either types.str types.port);
|
|
||||||
description = "Twisted strport specification for webui and REST-api.";
|
|
||||||
example = "tcp:3456:interface=127.0.0.1";
|
|
||||||
default = 3456;
|
|
||||||
};
|
|
||||||
client."shares.needed" = mkOption {
|
|
||||||
type = types.ints.between 1 256;
|
|
||||||
description = "Default amount of shares needed to reconstruct an uploaded file.";
|
|
||||||
default = 3;
|
|
||||||
};
|
|
||||||
client."shares.total" = mkOption {
|
|
||||||
type = types.ints.between 1 256;
|
|
||||||
description = "Default amount of shares a file is split into.";
|
|
||||||
default = 10;
|
|
||||||
};
|
|
||||||
client."shares.happy" = mkOption {
|
|
||||||
type = types.ints.positive;
|
|
||||||
description = ''
|
|
||||||
How spread out should your shares be.
|
|
||||||
Can be smaller than needed, but not more than amount of servers available.";
|
|
||||||
'';
|
|
||||||
default = 7;
|
|
||||||
};
|
|
||||||
client."mutable.format" = mkOption {
|
|
||||||
type = types.enum [ "sdmf" "mdmf" ];
|
|
||||||
description = ''
|
|
||||||
What format to save mutable files in.
|
|
||||||
SDMF is useful when some nodes on your network run an older version of Tahoe-LAFS.
|
|
||||||
MDMF supports inplace modification and streaming downloads.
|
|
||||||
'';
|
|
||||||
default = "sdmf";
|
|
||||||
};
|
|
||||||
storage.enabled = mkEnableOption "storage service";
|
|
||||||
storage.anonymous = mkOption {
|
|
||||||
type = types.bool;
|
|
||||||
description = "Whether to expose storage with just the FURL and no other authentication.";
|
|
||||||
default = true;
|
|
||||||
};
|
|
||||||
storage.reserved_space = mkOption {
|
|
||||||
type = types.str;
|
|
||||||
description = "The minimum amount of free disk space to keep.";
|
|
||||||
default = "1G";
|
|
||||||
};
|
|
||||||
helper.enabled = mkEnableOption "helper service";
|
|
||||||
sftpd.enabled = mkEnableOption "sftpd service";
|
|
||||||
sftpd.port = mkOption {
|
|
||||||
type = types.nullOr types.str;
|
|
||||||
description = "A twisted connection string to listen on for the sftpd service.";
|
|
||||||
example = "tcp:8022:interface=127.0.0.1";
|
|
||||||
default = null;
|
|
||||||
};
|
|
||||||
sftpd.host_pubkey_file = mkOption {
|
|
||||||
type = types.nullOr types.path;
|
|
||||||
description = "Path to ssh public key to use for the service.";
|
|
||||||
default = null;
|
|
||||||
};
|
|
||||||
sftpd.host_privkey_file = mkOption {
|
|
||||||
type = types.nullOr types.path;
|
|
||||||
description = "Path to ssh private key to use for the service.";
|
|
||||||
default = null;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
description = "freeform options for a normal tahoe-lafs node";
|
|
||||||
};
|
|
||||||
client.introducersFile = mkOption {
|
|
||||||
type = types.nullOr types.path;
|
|
||||||
description = "Path to a secret file containing introducers, will be placed in private/introducers.yaml";
|
|
||||||
default = null;
|
|
||||||
};
|
|
||||||
client.helperFile = mkOption {
|
|
||||||
type = types.nullOr types.path;
|
|
||||||
description = "Secret file containing a furl to use as a helper.";
|
|
||||||
default = null;
|
|
||||||
};
|
|
||||||
sftpd.accountsFile = mkOption {
|
|
||||||
type = types.nullOr types.path;
|
|
||||||
description = "Path to the accounts file. Will be copied to private/accounts";
|
|
||||||
default = null;
|
|
||||||
};
|
|
||||||
package = mkOption {
|
|
||||||
default = pkgs.tahoe-lafs;
|
|
||||||
defaultText = literalExpression "pkgs.tahoelafs";
|
|
||||||
type = types.package;
|
|
||||||
description = lib.mdDoc ''
|
|
||||||
The package to use for the Tahoe LAFS daemon.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}));
|
|
||||||
description = "The Tahoe nodes.";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
config = mkMerge [
|
|
||||||
(mkIf (cfg.introducers != {}) {
|
|
||||||
environment = {
|
|
||||||
etc = flip mapAttrs' cfg.introducers (node: settings:
|
|
||||||
nameValuePair "tahoe-lafs/introducer-${node}.cfg" {
|
|
||||||
mode = "0444";
|
|
||||||
source = format.generate "tahoe-lafs-introducer" settings.settings;
|
|
||||||
});
|
|
||||||
# Actually require Tahoe, so that we will have it installed.
|
|
||||||
systemPackages = flip mapAttrsToList cfg.introducers (node: settings:
|
|
||||||
settings.package
|
|
||||||
);
|
|
||||||
};
|
|
||||||
systemd.services = flip mapAttrs' cfg.introducers (node: settings:
|
|
||||||
let
|
|
||||||
pidfile = "/run/tahoe.introducer-${node}.pid";
|
|
||||||
# This is a directory, but it has no trailing slash. Tahoe commands
|
|
||||||
# get antsy when there's a trailing slash.
|
|
||||||
nodedir = "/var/db/tahoe-lafs/introducer-${node}";
|
|
||||||
in nameValuePair "tahoe.introducer-${node}" {
|
|
||||||
description = "Tahoe LAFS node ${node}";
|
|
||||||
wantedBy = [ "multi-user.target" ];
|
|
||||||
path = [ settings.package ];
|
|
||||||
restartTriggers = [
|
|
||||||
config.environment.etc."tahoe-lafs/introducer-${node}.cfg".source ];
|
|
||||||
serviceConfig = {
|
|
||||||
Type = "simple";
|
|
||||||
PIDFile = pidfile;
|
|
||||||
# Believe it or not, Tahoe is very brittle about the order of
|
|
||||||
# arguments to $(tahoe run). The node directory must come first,
|
|
||||||
# and arguments which alter Twisted's behavior come afterwards.
|
|
||||||
ExecStart = ''
|
|
||||||
${settings.package}/bin/tahoe run ${lib.escapeShellArg nodedir} --pidfile=${lib.escapeShellArg pidfile}
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
preStart = ''
|
|
||||||
if [ ! -d ${lib.escapeShellArg nodedir} ]; then
|
|
||||||
mkdir -p /var/db/tahoe-lafs
|
|
||||||
# See https://github.com/NixOS/nixpkgs/issues/25273
|
|
||||||
tahoe create-introducer \
|
|
||||||
--hostname="${config.networking.hostName}" \
|
|
||||||
${lib.escapeShellArg nodedir}
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Tahoe has created a predefined tahoe.cfg which we must now
|
|
||||||
# scribble over.
|
|
||||||
# XXX I thought that a symlink would work here, but it doesn't, so
|
|
||||||
# we must do this on every prestart. Fixes welcome.
|
|
||||||
# rm ${nodedir}/tahoe.cfg
|
|
||||||
# ln -s /etc/tahoe-lafs/introducer-${node}.cfg ${nodedir}/tahoe.cfg
|
|
||||||
cp /etc/tahoe-lafs/introducer-"${node}".cfg ${lib.escapeShellArg nodedir}/tahoe.cfg
|
|
||||||
'';
|
|
||||||
});
|
|
||||||
users.users = flip mapAttrs' cfg.introducers (node: _:
|
|
||||||
nameValuePair "tahoe.introducer-${node}" {
|
|
||||||
description = "Tahoe node user for introducer ${node}";
|
|
||||||
isSystemUser = true;
|
|
||||||
group = "tahoe.introducer-${node}";
|
|
||||||
});
|
|
||||||
users.groups = flip mapAttrs' cfg.nodes (node: _:
|
|
||||||
nameValuePair "tahoe.introducer-${node}" { });
|
|
||||||
})
|
|
||||||
(mkIf (cfg.nodes != {}) {
|
|
||||||
environment = {
|
|
||||||
etc = flip mapAttrs' cfg.nodes (node: settings:
|
|
||||||
nameValuePair "tahoe-lafs/${node}.cfg" {
|
|
||||||
mode = "0444";
|
|
||||||
source = let placeholderFile = lib.pipe settings.settings [
|
|
||||||
(s: lib.recursiveUpdate
|
|
||||||
(lib.optionalAttrs (settings.client.helperFile != null) { client."helper.furl" = "@CLIENT_HELPER_FURL@"; })
|
|
||||||
s)
|
|
||||||
];
|
|
||||||
in format.generate "tahoe-lafs-node" placeholderFile;
|
|
||||||
});
|
|
||||||
# Actually require Tahoe, so that we will have it installed.
|
|
||||||
# systemPackages = flip mapAttrsToList cfg.nodes (node: settings:
|
|
||||||
# settings.package
|
|
||||||
# );
|
|
||||||
};
|
|
||||||
systemd.services = flip mapAttrs' cfg.nodes (node: settings:
|
|
||||||
let
|
|
||||||
pidfile = "/run/tahoe.${node}.pid";
|
|
||||||
# This is a directory, but it has no trailing slash. Tahoe commands
|
|
||||||
# get antsy when there's a trailing slash.
|
|
||||||
nodedir = "/var/db/tahoe-lafs/${node}";
|
|
||||||
in nameValuePair "tahoe.${node}" {
|
|
||||||
description = "Tahoe LAFS node ${node}";
|
|
||||||
wantedBy = [ "multi-user.target" ];
|
|
||||||
path = [ settings.package ];
|
|
||||||
restartTriggers = [
|
|
||||||
config.environment.etc."tahoe-lafs/${node}.cfg".source ];
|
|
||||||
serviceConfig = {
|
|
||||||
Type = "simple";
|
|
||||||
PIDFile = pidfile;
|
|
||||||
# Believe it or not, Tahoe is very brittle about the order of
|
|
||||||
# arguments to $(tahoe run). The node directory must come first,
|
|
||||||
# and arguments which alter Twisted's behavior come afterwards.
|
|
||||||
ExecStart = ''
|
|
||||||
${settings.package}/bin/tahoe run ${lib.escapeShellArg nodedir} --pidfile=${lib.escapeShellArg pidfile}
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
preStart = ''
|
|
||||||
if [ ! -d ${lib.escapeShellArg nodedir} ]; then
|
|
||||||
mkdir -p /var/db/tahoe-lafs
|
|
||||||
tahoe create-node --hostname=localhost ${lib.escapeShellArg nodedir}
|
|
||||||
fi
|
|
||||||
|
|
||||||
cp /etc/tahoe-lafs/${lib.escapeShellArg node}.cfg ${lib.escapeShellArg nodedir}/tahoe.cfg
|
|
||||||
'' + lib.optionalString (settings.client.helperFile != null) ''
|
|
||||||
${pkgs.replace-secret}/bin/replace-secret '@CLIENT_HELPER_FURL@' ${settings.client.helperFile} ${lib.escapeShellArg nodedir}/tahoe.cfg
|
|
||||||
'' + lib.optionalString (settings.client.introducersFile != null) ''
|
|
||||||
cp "${config.settings.client.introducersFile}" ${lib.escapeShellArg nodedir}/private/introducers.yaml
|
|
||||||
'' + lib.optionalString (settings.sftpd.accountsFile != null) ''
|
|
||||||
cp "${config.settings.client.introducersFile}" ${lib.escapeShellArg nodedir}/private/accounts
|
|
||||||
'';
|
|
||||||
});
|
|
||||||
users.users = flip mapAttrs' cfg.nodes (node: _:
|
|
||||||
nameValuePair "tahoe.${node}" {
|
|
||||||
description = "Tahoe node user for node ${node}";
|
|
||||||
isSystemUser = true;
|
|
||||||
group = "tahoe.${node}";
|
|
||||||
});
|
|
||||||
users.groups = flip mapAttrs' cfg.nodes (node: _:
|
|
||||||
nameValuePair "tahoe.${node}" { });
|
|
||||||
})
|
|
||||||
];
|
|
||||||
}
|
|
||||||
@@ -1,71 +0,0 @@
|
|||||||
{ config, lib, pkgs, inputs, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
|
|
||||||
networking.firewall.allowedTCPPorts = [ 1337 ];
|
|
||||||
|
|
||||||
networking.nat.forwardPorts = [
|
|
||||||
{
|
|
||||||
destination = "${config.containers.ireul.hostAddress}:1337";
|
|
||||||
proto = "tcp";
|
|
||||||
sourcePort = 1337;
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
containers.ireul = {
|
|
||||||
bindMounts."/wordlists" = {
|
|
||||||
hostPath = "/mnt/human/wordlists";
|
|
||||||
isReadOnly = false;
|
|
||||||
};
|
|
||||||
privateNetwork = true;
|
|
||||||
hostAddress = "192.168.10.1";
|
|
||||||
localAddress = "192.168.10.2";
|
|
||||||
forwardPorts = [
|
|
||||||
{ containerPort = 1337;
|
|
||||||
hostPort = 1337;
|
|
||||||
protocol = "tcp";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
bindMounts."/dev/dri" = {
|
|
||||||
hostPath = "/dev/dri";
|
|
||||||
isReadOnly = false;
|
|
||||||
};
|
|
||||||
bindMounts."/dev/kfd" = {
|
|
||||||
hostPath = "/dev/kfd";
|
|
||||||
isReadOnly = false;
|
|
||||||
};
|
|
||||||
bindMounts."/run/opengl-driver" = {
|
|
||||||
hostPath = "/run/opengl-driver";
|
|
||||||
isReadOnly = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
allowedDevices = [
|
|
||||||
{ node = "/dev/dri/card0"; modifier = "rw"; }
|
|
||||||
{ node = "/dev/dri/renderD128"; modifier = "rw"; }
|
|
||||||
{ node = "/dev/kfd"; modifier = "rw"; }
|
|
||||||
];
|
|
||||||
|
|
||||||
config = { config, pkgs, ... }: {
|
|
||||||
services.openssh.enable = true;
|
|
||||||
services.openssh.ports = [ 1337 ];
|
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
hashcat
|
|
||||||
hashcat-utils
|
|
||||||
john
|
|
||||||
|
|
||||||
kitty.terminfo
|
|
||||||
];
|
|
||||||
|
|
||||||
users.groups.video.members = builtins.attrNames config.users.users;
|
|
||||||
|
|
||||||
|
|
||||||
programs.zsh.enable = true;
|
|
||||||
imports = [ (inputs.wack-server-conf + /users/default.nix) ];
|
|
||||||
|
|
||||||
system.stateVersion = "24.11";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,36 +0,0 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
systemd.nspawn.ubuntu-ai = {
|
|
||||||
execConfig = {
|
|
||||||
Boot = true;
|
|
||||||
};
|
|
||||||
networkConfig = {
|
|
||||||
Private = false;
|
|
||||||
};
|
|
||||||
filesConfig = {
|
|
||||||
BindReadOnly = [
|
|
||||||
"/etc/resolv.conf:/etc/resolv.conf"
|
|
||||||
];
|
|
||||||
Bind = [
|
|
||||||
"/dev/dri:/dev/dri"
|
|
||||||
"/dev/kfd:/dev/kfd"
|
|
||||||
"/mnt/human/sd:/sd:idmap"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.services."systemd-nspawn@ubuntu-ai" = {
|
|
||||||
environment = {
|
|
||||||
SYSTEMD_NSPAWN_TMPFS_TMP = "0";
|
|
||||||
};
|
|
||||||
serviceConfig = {
|
|
||||||
CPUQuota = "1400%";
|
|
||||||
MemoryHigh = "90G";
|
|
||||||
MemoryMax = "94G";
|
|
||||||
MemorySwapMax = "40G";
|
|
||||||
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";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,226 +0,0 @@
|
|||||||
# Edit this configuration file to define what should be installed on
|
|
||||||
# your system. Help is available in the configuration.nix(5) man page
|
|
||||||
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
|
||||||
|
|
||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
imports =
|
|
||||||
[ # Include the results of the hardware scan.
|
|
||||||
./hardware-configuration.nix
|
|
||||||
# ./wack.nix
|
|
||||||
./ollama.nix
|
|
||||||
./ai-container.nix
|
|
||||||
../../common/builder.nix
|
|
||||||
];
|
|
||||||
|
|
||||||
nixpkgs.config = {
|
|
||||||
allowUnfree = true;
|
|
||||||
rocmSupport = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
# Use the systemd-boot EFI boot loader.
|
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
|
||||||
boot.loader.systemd-boot = {
|
|
||||||
enable = true;
|
|
||||||
netbootxyz = { enable = true; sortKey = "y_netbootxyz"; };
|
|
||||||
edk2-uefi-shell = { enable = true; sortKey = "z_edk2-uefi-shell"; };
|
|
||||||
extraEntries = {
|
|
||||||
"old-soryuu.conf" = ''
|
|
||||||
title Old Soryuu;
|
|
||||||
efi /efi/edk2-uefi-shell/shell.efi
|
|
||||||
options -nointerrupt -nomap -noversion HD1b65535a:\EFI\systemd\systemd-bootx64.efi
|
|
||||||
sort-key o_soryuu-old
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
boot.kernelParams = [ "ip=dhcp" ];
|
|
||||||
boot.initrd.availableKernelModules = [ "r8169" ];
|
|
||||||
boot.initrd.network.enable = true;
|
|
||||||
boot.initrd.network.ssh = {
|
|
||||||
enable = true;
|
|
||||||
port = 22;
|
|
||||||
authorizedKeys = [
|
|
||||||
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCp8iMOx3eTiG5AmDh2KjKcigf7xdRKn9M7iZQ4RqP0np0UN2NUbu+VAMJmkWFyi3JpxmLuhszU0F1xY+3qM3ARduy1cs89B/bBE85xlOeYhcYVmpcgPR5xduS+TuHTBzFAgp+IU7/lgxdjcJ3PH4K0ruGRcX1xrytmk/vdY8IeSk3GVWDRrRbH6brO4cCCFjX0zJ7G6hBQueTPQoOy3jrUvgpRkzZY4ZCuljXtxbuX5X/2qWAkp8ca0iTQ5FzNA5JUyj+DWeEzjIEz6GrckOdV2LjWpT9+CtOqoPZOUudE1J9mJk4snNlMQjE06It7Kr50bpwoPqnxjo7ZjlHFLezl"
|
|
||||||
];
|
|
||||||
hostKeys = [
|
|
||||||
"/etc/secrets/initrd/ssh_host_rsa_key"
|
|
||||||
"/etc/secrets/initrd/ssh_host_ed25519_key"
|
|
||||||
];
|
|
||||||
shell = "/bin/cryptsetup-askpass";
|
|
||||||
};
|
|
||||||
|
|
||||||
hardware.bluetooth.enable = true;
|
|
||||||
|
|
||||||
boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
|
|
||||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
|
||||||
|
|
||||||
# programs.adb.enable = true;
|
|
||||||
|
|
||||||
systemd.enableEmergencyMode = false;
|
|
||||||
|
|
||||||
networking.hostName = "soryu";
|
|
||||||
networking.extraHosts = ''
|
|
||||||
127.0.0.1 modules-cdn.eac-prod.on.epicgames.com #Star Citizen EAC workaround
|
|
||||||
'';
|
|
||||||
|
|
||||||
# Star Citizen resource limits
|
|
||||||
boot.kernel.sysctl = {
|
|
||||||
"vm.max_map_count" = 16777216;
|
|
||||||
"fs.file-max" = 524288;
|
|
||||||
};
|
|
||||||
|
|
||||||
zramSwap = {
|
|
||||||
enable = true;
|
|
||||||
memoryMax = 96 * 1024 * 1024 * 1024; # 96 GB ZRAM
|
|
||||||
};
|
|
||||||
|
|
||||||
services.resolved.enable = true;
|
|
||||||
services.resolved.dnssec = "false";
|
|
||||||
|
|
||||||
services.gnome.gnome-keyring.enable = true;
|
|
||||||
|
|
||||||
services.murmur = {
|
|
||||||
enable = true;
|
|
||||||
# registerName = "DODSORFAS";
|
|
||||||
welcometext = "Dans PC at singsaker smh backup mumble server";
|
|
||||||
};
|
|
||||||
|
|
||||||
programs.steam = {
|
|
||||||
enable = true;
|
|
||||||
remotePlay.openFirewall = false;
|
|
||||||
dedicatedServer.openFirewall = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
services.tailscale.enable = true;
|
|
||||||
|
|
||||||
networking.firewall.interfaces."tailscale0" = let
|
|
||||||
all = { from = 0; to = 65535; };
|
|
||||||
in {
|
|
||||||
allowedUDPPortRanges = [ all ];
|
|
||||||
allowedTCPPortRanges = [ all ];
|
|
||||||
};
|
|
||||||
|
|
||||||
# Select internationalisation properties.
|
|
||||||
console.keyMap = "no-latin1";
|
|
||||||
|
|
||||||
time.timeZone = "Europe/Oslo";
|
|
||||||
|
|
||||||
# List packages installed in system profile. To search, run:
|
|
||||||
# $ nix search wget
|
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
wget vim git
|
|
||||||
];
|
|
||||||
|
|
||||||
# Some programs need SUID wrappers, can be configured further or are
|
|
||||||
# started in user sessions.
|
|
||||||
# programs.mtr.enable = true;
|
|
||||||
# programs.gnupg.agent = { enable = true; enableSSHSupport = true; };
|
|
||||||
|
|
||||||
# List services that you want to enable:
|
|
||||||
|
|
||||||
# Enable the OpenSSH daemon.
|
|
||||||
services.openssh.enable = true;
|
|
||||||
|
|
||||||
# Open ports in the firewall.
|
|
||||||
# networking.firewall.allowedTCPPorts = [ ... ];
|
|
||||||
# networking.firewall.allowedUDPPorts = [ ... ];
|
|
||||||
# Or disable the firewall altogether.
|
|
||||||
networking.firewall.enable = true;
|
|
||||||
networking.firewall.allowedTCPPorts = [ config.services.murmur.port ];
|
|
||||||
networking.firewall.allowedUDPPorts = [ config.services.murmur.port ];
|
|
||||||
|
|
||||||
|
|
||||||
security.rtkit.enable = false; # Enable again when mumble is fixed
|
|
||||||
services.pipewire = {
|
|
||||||
enable = true;
|
|
||||||
extraLv2Packages = [ pkgs.rnnoise-plugin.lv2 ];
|
|
||||||
alsa.enable = true;
|
|
||||||
alsa.support32Bit = true;
|
|
||||||
pulse.enable = true;
|
|
||||||
jack.enable = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
hardware.graphics.enable = true;
|
|
||||||
hardware.graphics.enable32Bit = true;
|
|
||||||
hardware.graphics.extraPackages = with pkgs; [
|
|
||||||
libva rocmPackages.clr.icd
|
|
||||||
];
|
|
||||||
hardware.amdgpu.opencl.enable = true;
|
|
||||||
|
|
||||||
systemd.tmpfiles.rules =
|
|
||||||
let
|
|
||||||
rocmEnv = pkgs.symlinkJoin {
|
|
||||||
name = "rocm-combined";
|
|
||||||
paths = with pkgs.rocmPackages; [
|
|
||||||
rocblas
|
|
||||||
hipblas
|
|
||||||
clr
|
|
||||||
];
|
|
||||||
};
|
|
||||||
in [
|
|
||||||
"L+ /opt/rocm - - - - ${rocmEnv}"
|
|
||||||
];
|
|
||||||
|
|
||||||
|
|
||||||
# Enable the X11 windowing system.
|
|
||||||
services.xserver.enable = true;
|
|
||||||
services.xserver.displayManager = {
|
|
||||||
defaultSession = "xsession";
|
|
||||||
session = [
|
|
||||||
{ manage = "desktop";
|
|
||||||
name = "xsession";
|
|
||||||
start = "exec $HOME/.xsession";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
services.xserver.xkb.layout = "no";
|
|
||||||
# services.xserver.xkbOptions = "eurosign:e";
|
|
||||||
|
|
||||||
i18n = {
|
|
||||||
defaultLocale = "nb_NO.UTF-8";
|
|
||||||
extraLocales = [ "en_US.UTF-8/UTF-8" "nn_NO.UTF-8/UTF-8" ];
|
|
||||||
extraLocaleSettings = {
|
|
||||||
LC_COLLATE = "nb_NO.UTF-8";
|
|
||||||
LC_MESSAGES = "en_US.UTF-8";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
services.xserver.displayManager.lightdm.enable = true;
|
|
||||||
services.xserver.videoDrivers = ["amdgpu"];
|
|
||||||
|
|
||||||
programs.zsh.enable = true;
|
|
||||||
|
|
||||||
virtualisation.docker.enable = true;
|
|
||||||
virtualisation.libvirtd.enable = true;
|
|
||||||
virtualisation.spiceUSBRedirection.enable = true;
|
|
||||||
|
|
||||||
|
|
||||||
# networking.nameservers = lib.mkForce [ "192.168.0.25" ];
|
|
||||||
|
|
||||||
# services.ipfs.enable = true;
|
|
||||||
# services.ipfs.gatewayAddress = "/ip4/127.0.0.1/tcp/5002";
|
|
||||||
|
|
||||||
nix.trustedUsers = [ "daniel" ];
|
|
||||||
nix.extraOptions = ''
|
|
||||||
experimental-features = nix-command flakes
|
|
||||||
'';
|
|
||||||
|
|
||||||
users.users.daniel = {
|
|
||||||
isNormalUser = true;
|
|
||||||
uid = 1000;
|
|
||||||
shell = pkgs.zsh;
|
|
||||||
extraGroups = [ "wheel" "networkmanager" "docker" "video" "libvirtd" ];
|
|
||||||
initialPassword = "Abc123";
|
|
||||||
};
|
|
||||||
|
|
||||||
programs.dconf.enable = true;
|
|
||||||
services.dbus.packages = with pkgs; [ dconf ];
|
|
||||||
|
|
||||||
# This value determines the NixOS release with which your system is to be
|
|
||||||
# compatible, in order to avoid breaking some software such as database
|
|
||||||
# servers. You should change this only after NixOS release notes say you
|
|
||||||
# should.
|
|
||||||
system.stateVersion = "24.11"; # Did you read the comment?
|
|
||||||
}
|
|
||||||
@@ -1,56 +0,0 @@
|
|||||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
|
||||||
# and may be overwritten by future invocations. Please make changes
|
|
||||||
# to /etc/nixos/configuration.nix instead.
|
|
||||||
{ config, lib, pkgs, modulesPath, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
imports =
|
|
||||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
|
||||||
];
|
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "thunderbolt" "usbhid" "sd_mod" ];
|
|
||||||
boot.initrd.kernelModules = [ ];
|
|
||||||
boot.kernelModules = [ "kvm-amd" ];
|
|
||||||
boot.extraModulePackages = [ ];
|
|
||||||
|
|
||||||
boot.initrd.luks.devices."crypted-main".device = "/dev/disk/by-uuid/2f59c91a-6765-439a-bc8d-6a84d662ba0c";
|
|
||||||
|
|
||||||
fileSystems."/" =
|
|
||||||
{ device = "/dev/disk/by-uuid/a1aec49d-4455-44e6-b69a-2576598b8749";
|
|
||||||
fsType = "btrfs";
|
|
||||||
options = [ "subvol=root" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
fileSystems."/home" =
|
|
||||||
{ device = "/dev/disk/by-uuid/a1aec49d-4455-44e6-b69a-2576598b8749";
|
|
||||||
fsType = "btrfs";
|
|
||||||
options = [ "subvol=home" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
fileSystems."/nix" =
|
|
||||||
{ device = "/dev/disk/by-uuid/a1aec49d-4455-44e6-b69a-2576598b8749";
|
|
||||||
fsType = "btrfs";
|
|
||||||
options = [ "subvol=nix" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
fileSystems."/boot" =
|
|
||||||
{ device = "/dev/disk/by-uuid/2285-60E9";
|
|
||||||
fsType = "vfat";
|
|
||||||
options = [ "fmask=0022" "dmask=0022" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
swapDevices = [ { device = "/dev/disk/by-partlabel/swap"; randomEncryption.enable = true; } ];
|
|
||||||
|
|
||||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
|
||||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
|
||||||
# still possible to use this option, but it's recommended to use it in conjunction
|
|
||||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
|
||||||
networking.useDHCP = lib.mkDefault true;
|
|
||||||
# networking.interfaces.docker0.useDHCP = lib.mkDefault true;
|
|
||||||
# networking.interfaces.enp9s0.useDHCP = lib.mkDefault true;
|
|
||||||
# networking.interfaces.tailscale0.useDHCP = lib.mkDefault true;
|
|
||||||
# networking.interfaces.wlp10s0.useDHCP = lib.mkDefault true;
|
|
||||||
|
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
|
||||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
|
||||||
}
|
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
{ config, lib, pkgs, inputs, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
services.ollama = {
|
|
||||||
enable = true;
|
|
||||||
acceleration = "rocm";
|
|
||||||
package = inputs.unstable.legacyPackages.x86_64-linux.ollama;
|
|
||||||
rocmOverrideGfx = "10.3.0";
|
|
||||||
environmentVariables = {
|
|
||||||
ROCR_VISIBLE_DEVICES = "GPU-5ecd14c0d670740b";
|
|
||||||
};
|
|
||||||
host = "100.64.0.19";
|
|
||||||
loadModels = [
|
|
||||||
"gemma3:4b"
|
|
||||||
"gemma3:12b"
|
|
||||||
"gemma3:27b"
|
|
||||||
"deepseek-r1:7b"
|
|
||||||
"deepseek-r1:14b"
|
|
||||||
"qwq:32b"
|
|
||||||
"codestral:22b"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.services.ollama = {
|
|
||||||
serviceConfig = {
|
|
||||||
SupplementaryGroups = [ "video" ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,72 +0,0 @@
|
|||||||
{ config, lib, pkgs, inputs, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
|
|
||||||
networking.firewall.allowedTCPPorts = [ 1337 ];
|
|
||||||
|
|
||||||
networking.nat.forwardPorts = [
|
|
||||||
{
|
|
||||||
destination = "${config.containers.ireul.hostAddress}:1337";
|
|
||||||
proto = "tcp";
|
|
||||||
sourcePort = 1337;
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
containers.ireul = {
|
|
||||||
bindMounts."/wordlists" = {
|
|
||||||
hostPath = "/mnt/human/wordlists";
|
|
||||||
isReadOnly = false;
|
|
||||||
};
|
|
||||||
privateNetwork = true;
|
|
||||||
hostAddress = "192.168.10.1";
|
|
||||||
localAddress = "192.168.10.2";
|
|
||||||
forwardPorts = [
|
|
||||||
{ containerPort = 1337;
|
|
||||||
hostPort = 1337;
|
|
||||||
protocol = "tcp";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
bindMounts."/dev/dri" = {
|
|
||||||
hostPath = "/dev/dri";
|
|
||||||
isReadOnly = false;
|
|
||||||
};
|
|
||||||
bindMounts."/dev/kfd" = {
|
|
||||||
hostPath = "/dev/kfd";
|
|
||||||
isReadOnly = false;
|
|
||||||
};
|
|
||||||
bindMounts."/run/opengl-driver" = {
|
|
||||||
hostPath = "/run/opengl-driver";
|
|
||||||
isReadOnly = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
allowedDevices = [
|
|
||||||
{ node = "/dev/dri/card0"; modifier = "rw"; }
|
|
||||||
{ node = "/dev/dri/renderD128"; modifier = "rw"; }
|
|
||||||
{ node = "/dev/kfd"; modifier = "rw"; }
|
|
||||||
];
|
|
||||||
|
|
||||||
config = { config, pkgs, ... }: {
|
|
||||||
services.openssh.enable = true;
|
|
||||||
services.openssh.ports = [ 1337 ];
|
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
hashcat
|
|
||||||
hashcat-utils
|
|
||||||
john
|
|
||||||
|
|
||||||
kitty.terminfo
|
|
||||||
];
|
|
||||||
|
|
||||||
users.groups.video.members = builtins.attrNames config.users.users;
|
|
||||||
|
|
||||||
|
|
||||||
programs.zsh.enable = true;
|
|
||||||
imports = [ (inputs.wack-server-conf + /users/default.nix) ];
|
|
||||||
|
|
||||||
system.stateVersion = "23.05";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,261 +0,0 @@
|
|||||||
#n Edit this configuration file to define what should be installed on your system.
|
|
||||||
# Help is available in the configuration.nix(5) man page and in the NixOS manual
|
|
||||||
# (accessible by running ‘nixos-help’).
|
|
||||||
|
|
||||||
{ config, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
imports =
|
|
||||||
[
|
|
||||||
./hardware-configuration.nix
|
|
||||||
];
|
|
||||||
|
|
||||||
networking.hosts = {
|
|
||||||
# "10.10.111.103" = [ "snowbell.htb" "legacy.snowbell.htb" "management.snowbell.htb" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
services.restic.backups."main" = {
|
|
||||||
repositoryFile = "/root/restic-main-repo";
|
|
||||||
passwordFile = "/root/restic-main-password";
|
|
||||||
pruneOpts = [
|
|
||||||
"--keep-last 2"
|
|
||||||
"--keep-within 3d"
|
|
||||||
"--keep-daily 7"
|
|
||||||
"--keep-weekly 5"
|
|
||||||
"--keep-monthly 12"
|
|
||||||
"--keep-yearly 5"
|
|
||||||
];
|
|
||||||
paths = [
|
|
||||||
"/home/daniel"
|
|
||||||
"/var/lib"
|
|
||||||
];
|
|
||||||
exclude = [
|
|
||||||
"/home/*/.cache"
|
|
||||||
|
|
||||||
"/home/*/.local/share/Trash"
|
|
||||||
|
|
||||||
"/home/*/.cargo"
|
|
||||||
|
|
||||||
"/home/*/.local/share/Steam/*"
|
|
||||||
"!/home/*/.local/share/Steam/compatdata"
|
|
||||||
|
|
||||||
"/home/*/mnt"
|
|
||||||
];
|
|
||||||
extraBackupArgs = [
|
|
||||||
"--one-file-system"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
|
|
||||||
|
|
||||||
virtualisation.podman.enable = true;
|
|
||||||
virtualisation.libvirtd.enable = true;
|
|
||||||
programs.dconf.enable = true;
|
|
||||||
|
|
||||||
programs.wireshark.enable = true;
|
|
||||||
programs.wireshark.package = pkgs.wireshark;
|
|
||||||
|
|
||||||
services.mysql.enable = true;
|
|
||||||
services.mysql.package = pkgs.mariadb;
|
|
||||||
services.mysql.settings.mysqld = {
|
|
||||||
bind-address = "127.0.0.1";
|
|
||||||
port = 3306;
|
|
||||||
};
|
|
||||||
services.mysql.ensureUsers = [
|
|
||||||
{
|
|
||||||
name = "daniel";
|
|
||||||
ensurePermissions = {
|
|
||||||
"lab1.*" = "ALL PRIVILEGES";
|
|
||||||
"lab2.*" = "ALL PRIVILEGES";
|
|
||||||
"lab3.*" = "ALL PRIVILEGES";
|
|
||||||
"lab4.*" = "ALL PRIVILEGES";
|
|
||||||
"lab5.*" = "ALL PRIVILEGES";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
# services.create_ap.enable = false;
|
|
||||||
# services.create_ap.settings = {
|
|
||||||
# INTERNET_IFACE = "enp0s31f6";
|
|
||||||
# PASSPHRASE = "12345678";
|
|
||||||
# SSID = "DOTA2ERBEST";
|
|
||||||
# WIFI_IFACE = "wlp5s0";
|
|
||||||
# MAC_FILTER = 0;
|
|
||||||
# HIDDEN = 0;
|
|
||||||
# };
|
|
||||||
|
|
||||||
boot.kernelModules = [ "v4l2loopback" ];
|
|
||||||
|
|
||||||
# Use the systemd-boot EFI boot loader.
|
|
||||||
boot.loader.systemd-boot.enable = true;
|
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
|
||||||
|
|
||||||
networking.hostName = "ayanami"; # Define your hostname.
|
|
||||||
networking.networkmanager.enable = true;
|
|
||||||
|
|
||||||
hardware.bluetooth.enable = true;
|
|
||||||
services.blueman.enable = true;
|
|
||||||
|
|
||||||
# Set your time zone.
|
|
||||||
time.timeZone = "Europe/Oslo";
|
|
||||||
|
|
||||||
services.tailscale.enable = true;
|
|
||||||
|
|
||||||
# The global useDHCP flag is deprecated, therefore explicitly set to false here.
|
|
||||||
# Per-interface useDHCP will be mandatory in the future, so this generated config
|
|
||||||
# replicates the default behaviour.
|
|
||||||
networking.useDHCP = false;
|
|
||||||
networking.interfaces.enp0s31f6.useDHCP = false;
|
|
||||||
networking.interfaces.wlp5s0.useDHCP = false;
|
|
||||||
|
|
||||||
services.avahi.enable = false;
|
|
||||||
|
|
||||||
# services.atftpd = {
|
|
||||||
# enable = false;
|
|
||||||
# };
|
|
||||||
|
|
||||||
# Select internationalisation properties.
|
|
||||||
i18n.supportedLocales = [ "en_US.UTF-8/UTF-8" "nb_NO.UTF-8/UTF-8" ];
|
|
||||||
i18n.defaultLocale = "en_US.UTF-8";
|
|
||||||
i18n.extraLocaleSettings = {
|
|
||||||
LC_TIME = "nb_NO.UTF-8";
|
|
||||||
LC_PAPER = "nb_NO.UTF-8";
|
|
||||||
LC_NAME = "nb_NO.UTF-8";
|
|
||||||
LC_ADDRESS = "nb_NO.UTF-8";
|
|
||||||
LC_TELEPHONE = "nb_NO.UTF-8";
|
|
||||||
LC_MEASUREMENT = "nb_NO.UTF-8";
|
|
||||||
LC_IDENTIFICATION = "nb_NO.UTF-8";
|
|
||||||
};
|
|
||||||
console = {
|
|
||||||
font = "Lat2-Terminus16";
|
|
||||||
keyMap = "no-latin1";
|
|
||||||
};
|
|
||||||
|
|
||||||
services.xserver.displayManager.lightdm.enable = true;
|
|
||||||
services.displayManager.defaultSession = "xsession";
|
|
||||||
# Enable the X11 windowing system.
|
|
||||||
services.xserver.enable = true;
|
|
||||||
services.xserver.displayManager = {
|
|
||||||
session = [
|
|
||||||
{
|
|
||||||
manage = "desktop";
|
|
||||||
name = "xsession";
|
|
||||||
start = "exec $HOME/.xsession";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
# Disable cups we will just not print anything :))
|
|
||||||
services.printing.enable = false;
|
|
||||||
|
|
||||||
security.rtkit.enable = true;
|
|
||||||
services.pipewire = {
|
|
||||||
enable = true;
|
|
||||||
alsa.enable = true;
|
|
||||||
alsa.support32Bit = true;
|
|
||||||
pulse.enable = true;
|
|
||||||
jack.enable = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
hardware.opengl.driSupport32Bit = true;
|
|
||||||
hardware.opengl.extraPackages = with pkgs; [ libva ];
|
|
||||||
|
|
||||||
# Enable touchpad support (enabled default in most desktopManager).
|
|
||||||
services.libinput.enable = true;
|
|
||||||
services.xserver.xkb.layout = "no";
|
|
||||||
|
|
||||||
|
|
||||||
programs.zsh.enable = true;
|
|
||||||
|
|
||||||
|
|
||||||
# Define a user account. Don't forget to set a password with ‘passwd’.
|
|
||||||
users.users.daniel = {
|
|
||||||
isNormalUser = true;
|
|
||||||
shell = pkgs.zsh;
|
|
||||||
extraGroups = [ "wheel" "networkmanager" "wireshark" "libvirtd" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
vim
|
|
||||||
git
|
|
||||||
wget
|
|
||||||
virt-manager
|
|
||||||
podman-compose
|
|
||||||
];
|
|
||||||
|
|
||||||
|
|
||||||
services.dbus.packages = with pkgs; [ pkgs.dconf ];
|
|
||||||
|
|
||||||
services.openssh.enable = true;
|
|
||||||
services.openssh.openFirewall = false;
|
|
||||||
|
|
||||||
networking.firewall.interfaces."tailscale0" = let
|
|
||||||
all = { from = 0; to = 65535; };
|
|
||||||
in {
|
|
||||||
allowedUDPPortRanges = [ all ];
|
|
||||||
allowedTCPPortRanges = [ all ];
|
|
||||||
};
|
|
||||||
|
|
||||||
# Open ports in the firewall.
|
|
||||||
networking.firewall.allowedTCPPorts = [ 69 8010 9090 ];
|
|
||||||
networking.firewall.allowedUDPPorts = [ 69 8010 9090 ];
|
|
||||||
# Or disable the firewall altogether.
|
|
||||||
# networking.firewall.enable = false;
|
|
||||||
|
|
||||||
nix.settings.trusted-users = [ "daniel" ];
|
|
||||||
|
|
||||||
nix.buildMachines = [
|
|
||||||
{ hostName = "soryu";
|
|
||||||
system = "x86_64-linux";
|
|
||||||
maxJobs = 16;
|
|
||||||
supportedFeatures = [ "big-parallel" ];
|
|
||||||
speedFactor = 66317;
|
|
||||||
}
|
|
||||||
# { hostName = "bob.pvv.ntnu.no";
|
|
||||||
# system = "x86_64-linux";
|
|
||||||
# maxJobs = 12;
|
|
||||||
# supportedFeatures = [ "big-parallel" ];
|
|
||||||
# speedFactor = 129270;
|
|
||||||
# }
|
|
||||||
# { hostName = "bolle.pbsds.net";
|
|
||||||
# system = "x86_64-linux";
|
|
||||||
# maxJobs = 6;
|
|
||||||
# speedFactor = 12857;
|
|
||||||
# }
|
|
||||||
# { hostName = "garp.pbsds.net";
|
|
||||||
# system = "x86_64-linux";
|
|
||||||
# maxJobs = 4;
|
|
||||||
# # i7-6700
|
|
||||||
# speedFactor = 8088;
|
|
||||||
# }
|
|
||||||
# { hostName = "lilith";
|
|
||||||
# system = "x86_64-linux";
|
|
||||||
# maxJobs = 6;
|
|
||||||
# #speedFactor = 13199;
|
|
||||||
# speedFactor = 6000;
|
|
||||||
# }
|
|
||||||
# {
|
|
||||||
# hostName = "isvegg.pvv.ntnu.no";
|
|
||||||
# system = "x86_64-linux";
|
|
||||||
# maxJobs = 4;
|
|
||||||
# speedFactor = 4961;
|
|
||||||
# supportedFeatures = [ "big-parallel" ];
|
|
||||||
# mandatoryFeatures = [ ];
|
|
||||||
# }
|
|
||||||
];
|
|
||||||
nix.distributedBuilds = true;
|
|
||||||
nix.extraOptions = ''
|
|
||||||
builders-use-substitutes = true
|
|
||||||
experimental-features = nix-command flakes impure-derivations ca-derivations
|
|
||||||
'';
|
|
||||||
|
|
||||||
# This value determines the NixOS release from which the default
|
|
||||||
# settings for stateful data, like file locations and database versions
|
|
||||||
# on your system were taken. It‘s perfectly fine and recommended to leave
|
|
||||||
# this value at the release version of the first install of this system.
|
|
||||||
# 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 = "23.11"; # Did you read the comment?
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,61 +0,0 @@
|
|||||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
|
||||||
# and may be overwritten by future invocations. Please make changes
|
|
||||||
# to /etc/nixos/configuration.nix instead.
|
|
||||||
{ config, lib, pkgs, modulesPath, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
imports =
|
|
||||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
|
||||||
];
|
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ];
|
|
||||||
boot.initrd.kernelModules = [ ];
|
|
||||||
boot.kernelModules = [ "kvm-intel" ];
|
|
||||||
boot.extraModulePackages = [ ];
|
|
||||||
|
|
||||||
fileSystems."/" =
|
|
||||||
{ device = "/dev/disk/by-uuid/276d0801-34f7-4d40-aa24-bfc43ea4ff51";
|
|
||||||
fsType = "btrfs";
|
|
||||||
options = [ "subvol=root" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
boot.initrd.luks.devices."enc" = {
|
|
||||||
allowDiscards = true;
|
|
||||||
device = "/dev/disk/by-uuid/27c2e6ae-d9ec-4bbd-9ebe-6ec2e63dd139";
|
|
||||||
};
|
|
||||||
fileSystems."/home" =
|
|
||||||
{ device = "/dev/disk/by-uuid/276d0801-34f7-4d40-aa24-bfc43ea4ff51";
|
|
||||||
fsType = "btrfs";
|
|
||||||
options = [ "subvol=home" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
fileSystems."/nix" =
|
|
||||||
{ device = "/dev/disk/by-uuid/276d0801-34f7-4d40-aa24-bfc43ea4ff51";
|
|
||||||
fsType = "btrfs";
|
|
||||||
options = [ "subvol=nix" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
fileSystems."/persist" =
|
|
||||||
{ device = "/dev/disk/by-uuid/276d0801-34f7-4d40-aa24-bfc43ea4ff51";
|
|
||||||
fsType = "btrfs";
|
|
||||||
options = [ "subvol=persist" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
fileSystems."/var/log" =
|
|
||||||
{ device = "/dev/disk/by-uuid/276d0801-34f7-4d40-aa24-bfc43ea4ff51";
|
|
||||||
fsType = "btrfs";
|
|
||||||
options = [ "subvol=log" ];
|
|
||||||
neededForBoot = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
fileSystems."/boot" =
|
|
||||||
{ device = "/dev/disk/by-uuid/503B-1BC9";
|
|
||||||
fsType = "vfat";
|
|
||||||
};
|
|
||||||
|
|
||||||
swapDevices =
|
|
||||||
[ { device = "/dev/disk/by-uuid/28c04c57-b026-471f-a7bf-366cbc102b78"; }
|
|
||||||
];
|
|
||||||
|
|
||||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
|
||||||
}
|
|
||||||
@@ -1,244 +0,0 @@
|
|||||||
# Edit this configuration file to define what should be installed on
|
|
||||||
# your system. Help is available in the configuration.nix(5) man page
|
|
||||||
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
|
||||||
|
|
||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
imports =
|
|
||||||
[ # Include the results of the hardware scan.
|
|
||||||
./hardware-configuration.nix
|
|
||||||
];
|
|
||||||
|
|
||||||
|
|
||||||
services.restic.backups."main" = {
|
|
||||||
repositoryFile = "/root/restic-main-repo";
|
|
||||||
passwordFile = "/root/restic-main-password";
|
|
||||||
pruneOpts = [
|
|
||||||
"-keep-tag keep"
|
|
||||||
"--keep-last 2"
|
|
||||||
"--keep-within 3d"
|
|
||||||
"--keep-daily 7"
|
|
||||||
"--keep-weekly 5"
|
|
||||||
"--keep-monthly 12"
|
|
||||||
"--keep-yearly 5"
|
|
||||||
];
|
|
||||||
paths = [
|
|
||||||
"/home/daniel"
|
|
||||||
"/var/lib"
|
|
||||||
];
|
|
||||||
exclude = [
|
|
||||||
"/home/*/.cache"
|
|
||||||
|
|
||||||
"/home/*/.local/share/Trash"
|
|
||||||
|
|
||||||
"/home/*/.cargo"
|
|
||||||
|
|
||||||
"!/home/*/.local/share/Steam/compatdata"
|
|
||||||
"/home/*/.local/share/Steam/*"
|
|
||||||
|
|
||||||
"/home/*/mnt"
|
|
||||||
];
|
|
||||||
extraBackupArgs = [
|
|
||||||
"--one-file-system"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
|
|
||||||
|
|
||||||
nixpkgs.config = {
|
|
||||||
allowUnfree = true;
|
|
||||||
rocmSupport = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
# Use the systemd-boot EFI boot loader.
|
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
|
||||||
boot.loader.systemd-boot = {
|
|
||||||
enable = true;
|
|
||||||
netbootxyz = { enable = true; sortKey = "y_netbootxyz"; };
|
|
||||||
edk2-uefi-shell = { enable = true; sortKey = "z_edk2-uefi-shell"; };
|
|
||||||
};
|
|
||||||
|
|
||||||
boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
|
|
||||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
|
||||||
|
|
||||||
services.fwupd.enable = true;
|
|
||||||
|
|
||||||
# programs.adb.enable = true;
|
|
||||||
|
|
||||||
systemd.enableEmergencyMode = false;
|
|
||||||
|
|
||||||
networking.hostName = "ayanami";
|
|
||||||
networking.networkmanager.enable = true;
|
|
||||||
networking.useDHCP = false;
|
|
||||||
|
|
||||||
hardware.bluetooth.enable = true;
|
|
||||||
|
|
||||||
zramSwap = {
|
|
||||||
enable = true;
|
|
||||||
memoryMax = 24 * 1024 * 1024 * 1024; # 24 GB ZRAM
|
|
||||||
};
|
|
||||||
|
|
||||||
services.resolved.enable = true;
|
|
||||||
services.resolved.dnssec = "false";
|
|
||||||
|
|
||||||
services.gnome.gnome-keyring.enable = true;
|
|
||||||
|
|
||||||
programs.steam = {
|
|
||||||
enable = true;
|
|
||||||
remotePlay.openFirewall = false;
|
|
||||||
dedicatedServer.openFirewall = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
services.tailscale.enable = true;
|
|
||||||
|
|
||||||
networking.firewall.interfaces."tailscale0" = let
|
|
||||||
all = { from = 0; to = 65535; };
|
|
||||||
in {
|
|
||||||
allowedUDPPortRanges = [ all ];
|
|
||||||
allowedTCPPortRanges = [ all ];
|
|
||||||
};
|
|
||||||
|
|
||||||
# Select internationalisation properties.
|
|
||||||
console.keyMap = "no-latin1";
|
|
||||||
|
|
||||||
time.timeZone = "Europe/Oslo";
|
|
||||||
|
|
||||||
# List packages installed in system profile. To search, run:
|
|
||||||
# $ nix search wget
|
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
wget vim git
|
|
||||||
];
|
|
||||||
|
|
||||||
# Some programs need SUID wrappers, can be configured further or are
|
|
||||||
# started in user sessions.
|
|
||||||
# programs.mtr.enable = true;
|
|
||||||
# programs.gnupg.agent = { enable = true; enableSSHSupport = true; };
|
|
||||||
|
|
||||||
# List services that you want to enable:
|
|
||||||
|
|
||||||
# Enable the OpenSSH daemon.
|
|
||||||
services.openssh.enable = true;
|
|
||||||
services.openssh.openFirewall = false;
|
|
||||||
|
|
||||||
# Open ports in the firewall.
|
|
||||||
# networking.firewall.allowedTCPPorts = [ ... ];
|
|
||||||
# networking.firewall.allowedUDPPorts = [ ... ];
|
|
||||||
# Or disable the firewall altogether.
|
|
||||||
networking.firewall.enable = true;
|
|
||||||
networking.firewall.allowedTCPPorts = [ ];
|
|
||||||
networking.firewall.allowedUDPPorts = [ ];
|
|
||||||
|
|
||||||
|
|
||||||
security.rtkit.enable = false; # Enable again when mumble is fixed
|
|
||||||
services.pipewire = {
|
|
||||||
enable = true;
|
|
||||||
extraLv2Packages = [ pkgs.rnnoise-plugin.lv2 ];
|
|
||||||
alsa.enable = true;
|
|
||||||
alsa.support32Bit = true;
|
|
||||||
pulse.enable = true;
|
|
||||||
jack.enable = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
hardware.graphics.enable = true;
|
|
||||||
hardware.graphics.enable32Bit = true;
|
|
||||||
hardware.graphics.extraPackages = with pkgs; [
|
|
||||||
libva rocmPackages.clr.icd
|
|
||||||
];
|
|
||||||
hardware.amdgpu.opencl.enable = true;
|
|
||||||
|
|
||||||
systemd.tmpfiles.rules =
|
|
||||||
let
|
|
||||||
rocmEnv = pkgs.symlinkJoin {
|
|
||||||
name = "rocm-combined";
|
|
||||||
paths = with pkgs.rocmPackages; [
|
|
||||||
rocblas
|
|
||||||
hipblas
|
|
||||||
clr
|
|
||||||
];
|
|
||||||
};
|
|
||||||
in [
|
|
||||||
"L+ /opt/rocm - - - - ${rocmEnv}"
|
|
||||||
];
|
|
||||||
|
|
||||||
|
|
||||||
# Enable the X11 windowing system.
|
|
||||||
services.xserver.enable = true;
|
|
||||||
services.xserver.displayManager = {
|
|
||||||
defaultSession = "xsession";
|
|
||||||
session = [
|
|
||||||
{ manage = "desktop";
|
|
||||||
name = "xsession";
|
|
||||||
start = "exec $HOME/.xsession";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
services.xserver.xkb.layout = "no";
|
|
||||||
# services.xserver.xkbOptions = "eurosign:e";
|
|
||||||
|
|
||||||
i18n = {
|
|
||||||
defaultLocale = "nb_NO.UTF-8";
|
|
||||||
extraLocales = [ "en_US.UTF-8/UTF-8" "nn_NO.UTF-8/UTF-8" ];
|
|
||||||
extraLocaleSettings = {
|
|
||||||
LC_COLLATE = "nb_NO.UTF-8";
|
|
||||||
LC_MESSAGES = "en_US.UTF-8";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
services.xserver.displayManager.lightdm.enable = true;
|
|
||||||
services.xserver.videoDrivers = ["amdgpu"];
|
|
||||||
|
|
||||||
programs.zsh.enable = true;
|
|
||||||
|
|
||||||
virtualisation.docker.enable = true;
|
|
||||||
virtualisation.libvirtd.enable = true;
|
|
||||||
virtualisation.spiceUSBRedirection.enable = true;
|
|
||||||
|
|
||||||
|
|
||||||
# networking.nameservers = lib.mkForce [ "192.168.0.25" ];
|
|
||||||
|
|
||||||
# services.ipfs.enable = true;
|
|
||||||
# services.ipfs.gatewayAddress = "/ip4/127.0.0.1/tcp/5002";
|
|
||||||
|
|
||||||
nix.distributedBuilds = true;
|
|
||||||
nix.buildMachines = [
|
|
||||||
{ hostName = "soryu";
|
|
||||||
system = "x86_64-linux";
|
|
||||||
maxJobs = 16;
|
|
||||||
supportedFeatures = [ "big-parallel" ];
|
|
||||||
speedFactor = 66317;
|
|
||||||
}
|
|
||||||
# { hostName = "bolle.pbsds.net";
|
|
||||||
# system = "x86_64-linux";
|
|
||||||
# maxJobs = 6;
|
|
||||||
# speedFactor = 12857;
|
|
||||||
# }
|
|
||||||
# { hostName = "garp.pbsds.net";
|
|
||||||
# system = "x86_64-linux";
|
|
||||||
# maxJobs = 4;
|
|
||||||
# # i7-6700
|
|
||||||
# speedFactor = 8088;
|
|
||||||
# }
|
|
||||||
];
|
|
||||||
nix.trustedUsers = [ "daniel" ];
|
|
||||||
nix.extraOptions = ''
|
|
||||||
experimental-features = nix-command flakes
|
|
||||||
'';
|
|
||||||
|
|
||||||
users.users.daniel = {
|
|
||||||
isNormalUser = true;
|
|
||||||
uid = 1000;
|
|
||||||
shell = pkgs.zsh;
|
|
||||||
extraGroups = [ "wheel" "networkmanager" "docker" "video" "libvirtd" ];
|
|
||||||
initialPassword = "Abc123";
|
|
||||||
};
|
|
||||||
|
|
||||||
programs.dconf.enable = true;
|
|
||||||
services.dbus.packages = with pkgs; [ dconf ];
|
|
||||||
|
|
||||||
# This value determines the NixOS release with which your system is to be
|
|
||||||
# compatible, in order to avoid breaking some software such as database
|
|
||||||
# servers. You should change this only after NixOS release notes say you
|
|
||||||
# should.
|
|
||||||
system.stateVersion = "25.05"; # Did you read the comment?
|
|
||||||
}
|
|
||||||
@@ -1,57 +0,0 @@
|
|||||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
|
||||||
# and may be overwritten by future invocations. Please make changes
|
|
||||||
# to /etc/nixos/configuration.nix instead.
|
|
||||||
{ config, lib, pkgs, modulesPath, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
imports =
|
|
||||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
|
||||||
];
|
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci_renesas" "xhci_pci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
|
|
||||||
boot.initrd.kernelModules = [ ];
|
|
||||||
boot.kernelModules = [ "kvm-amd" ];
|
|
||||||
boot.extraModulePackages = [ ];
|
|
||||||
|
|
||||||
fileSystems."/" =
|
|
||||||
{ device = "/dev/disk/by-uuid/65fda346-b80f-410d-9577-891cdbf3e4b2";
|
|
||||||
fsType = "btrfs";
|
|
||||||
options = [ "subvol=root" "compress=zstd" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/5ec9c954-9862-4d1d-bd61-bda34caf504b";
|
|
||||||
|
|
||||||
fileSystems."/home" =
|
|
||||||
{ device = "/dev/disk/by-uuid/65fda346-b80f-410d-9577-891cdbf3e4b2";
|
|
||||||
fsType = "btrfs";
|
|
||||||
options = [ "subvol=home" "compress=zstd" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
fileSystems."/nix" =
|
|
||||||
{ device = "/dev/disk/by-uuid/65fda346-b80f-410d-9577-891cdbf3e4b2";
|
|
||||||
fsType = "btrfs";
|
|
||||||
options = [ "subvol=nix" "noatime" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
fileSystems."/boot" =
|
|
||||||
{ device = "/dev/disk/by-uuid/ED9D-8221";
|
|
||||||
fsType = "vfat";
|
|
||||||
options = [ "fmask=0077" "dmask=0077" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
swapDevices =
|
|
||||||
[ { device = "/dev/disk/by-uuid/6f23c4a2-2936-4d44-b5c0-03132b720742"; }
|
|
||||||
];
|
|
||||||
|
|
||||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
|
||||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
|
||||||
# still possible to use this option, but it's recommended to use it in conjunction
|
|
||||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
|
||||||
networking.useDHCP = lib.mkDefault true;
|
|
||||||
# networking.interfaces.enp2s0f0.useDHCP = lib.mkDefault true;
|
|
||||||
# networking.interfaces.enp5s0.useDHCP = lib.mkDefault true;
|
|
||||||
# networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
|
|
||||||
|
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
|
||||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
|
||||||
}
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
users.users.nixbuilder = {
|
|
||||||
group = "nixbuilder";
|
|
||||||
isSystemUser = true;
|
|
||||||
useDefaultShell = true;
|
|
||||||
openssh.authorizedKeys.keys = [
|
|
||||||
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDpGSDczzDOhTETCj+uB5e3/9QbOCaVW1knM+n1ey0n6LXH7uiPPmzuZiqfzmfbB1z4bjM2zpn3D6Et6zRCrBUjhTZqf/5GoNlvhVA6QYmBmBp98b8oY7juj5cmu55voxD0S5rC1mQMnWAAf8e8OPbkhs9Lt0XlOYdotLNIZQubzWqE2DK45g/h17ELJs+jkNXoalFjLvLXWzE/C+3pYoeNJVGHfVMTIwt7o64E6JXhxuYTYdSIuzd+BjntkSCXzcAzBFMRwkdlFVoBtLUMMcMQl39kcXv7lAQ8pv+8b1j1N9WuQVf1qEAcZguaimI1ifbXP5d841pZPApCj5KXectIEldfTrcwg8rZpd2UfYS/3XCcOuidBGprY7XsU/jz8wHbH68UjUrsLyaOMnG2ChYztnf63vm3gRs3Fc6FqTycpgYOPDeZBVTcMyPGgtiZvhnTeY20xFS5lK6M+dmgaDqH24kPLiwYSpUF2NK+Rg/2bZxvt/GaSr4U6fJGi3FCJOM= root@DanixLaptop"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
users.groups.nixbuilder = {};
|
|
||||||
|
|
||||||
nix.settings.trusted-users = [ "nixbuilder" ];
|
|
||||||
|
|
||||||
boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
|
|
||||||
}
|
|
||||||
@@ -1,199 +0,0 @@
|
|||||||
# Edit this configuration file to define what should be installed on
|
|
||||||
# your system. Help is available in the configuration.nix(5) man page, on
|
|
||||||
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
|
|
||||||
|
|
||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
imports = [ # Include the results of the hardware scan.
|
|
||||||
./hardware-configuration.nix
|
|
||||||
];
|
|
||||||
|
|
||||||
|
|
||||||
services.restic.backups."main" = {
|
|
||||||
repositoryFile = "/root/restic-main-repo";
|
|
||||||
passwordFile = "/root/restic-main-password";
|
|
||||||
pruneOpts = [
|
|
||||||
"--keep-daily 7"
|
|
||||||
"--keep-weekly 5"
|
|
||||||
"--keep-monthly 12"
|
|
||||||
"--keep-yearly 2"
|
|
||||||
];
|
|
||||||
paths = [
|
|
||||||
"/var/lib"
|
|
||||||
"/home/daniel"
|
|
||||||
];
|
|
||||||
exclude = [
|
|
||||||
"/home/*/.cache"
|
|
||||||
|
|
||||||
"/home/*/.local/Trash"
|
|
||||||
|
|
||||||
"/home/*/.local/share/Steam/*"
|
|
||||||
"!/home/*/.local/share/Steam/steamapps/compatdata"
|
|
||||||
|
|
||||||
"/home/*/.cargo"
|
|
||||||
"/home/*/**/target"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
services.postgresql.enable = true;
|
|
||||||
services.postgresql.package = pkgs.postgresql_15;
|
|
||||||
services.postgresql.authentication = ''
|
|
||||||
host all all 192.168.10.0/24 md5
|
|
||||||
'';
|
|
||||||
|
|
||||||
nixpkgs.config.allowUnfreePredicate = pkg:
|
|
||||||
builtins.elem (lib.getName pkg) [
|
|
||||||
# Add additional package names here
|
|
||||||
"nvidia-x11"
|
|
||||||
"nvidia-settings"
|
|
||||||
"nvidia-persistenced"
|
|
||||||
|
|
||||||
"steam"
|
|
||||||
"steam-original"
|
|
||||||
"steam-run"
|
|
||||||
"steam-unwrapped"
|
|
||||||
];
|
|
||||||
|
|
||||||
|
|
||||||
services.xserver.videoDrivers = ["nvidia"];
|
|
||||||
hardware.nvidia = {
|
|
||||||
package = config.boot.kernelPackages.nvidiaPackages.stable;
|
|
||||||
modesetting.enable = true;
|
|
||||||
nvidiaSettings = true;
|
|
||||||
powerManagement.finegrained = false;
|
|
||||||
open = false;
|
|
||||||
};
|
|
||||||
#hardware.graphics.enable = true;
|
|
||||||
hardware.opengl.driSupport32Bit = true;
|
|
||||||
|
|
||||||
|
|
||||||
programs.steam = {
|
|
||||||
enable = true;
|
|
||||||
remotePlay.openFirewall = false;
|
|
||||||
dedicatedServer.openFirewall = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
# Use the systemd-boot EFI boot loader.
|
|
||||||
boot.loader.systemd-boot.enable = true;
|
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
|
||||||
|
|
||||||
networking.hostName = "ikari"; # Define your hostname.
|
|
||||||
# Pick only one of the below networking options.
|
|
||||||
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
|
|
||||||
# networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.
|
|
||||||
|
|
||||||
services.tailscale.enable = true;
|
|
||||||
|
|
||||||
# Set your time zone.
|
|
||||||
time.timeZone = "Europe/Oslo";
|
|
||||||
|
|
||||||
# Configure network proxy if necessary
|
|
||||||
# networking.proxy.default = "http://user:password@proxy:port/";
|
|
||||||
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
|
|
||||||
|
|
||||||
# Select internationalisation properties.
|
|
||||||
i18n.supportedLocales = [ "en_US.UTF-8/UTF-8" "nb_NO.UTF-8/UTF-8" ];
|
|
||||||
i18n.defaultLocale = "en_US.UTF-8";
|
|
||||||
i18n.extraLocaleSettings = {
|
|
||||||
LC_TIME = "nb_NO.UTF-8";
|
|
||||||
LC_PAPER = "nb_NO.UTF-8";
|
|
||||||
LC_NAME = "nb_NO.UTF-8";
|
|
||||||
LC_ADDRESS = "nb_NO.UTF-8";
|
|
||||||
LC_TELEPHONE = "nb_NO.UTF-8";
|
|
||||||
LC_MEASUREMENT = "nb_NO.UTF-8";
|
|
||||||
LC_IDENTIFICATION = "nb_NO.UTF-8";
|
|
||||||
};
|
|
||||||
console = {
|
|
||||||
font = "Lat2-Terminus16";
|
|
||||||
useXkbConfig = true; # use xkb.options in tty.
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
services.displayManager.defaultSession = "xsession";
|
|
||||||
# Enable the X11 windowing system.
|
|
||||||
services.xserver.enable = true;
|
|
||||||
services.xserver.displayManager = {
|
|
||||||
session = [
|
|
||||||
{
|
|
||||||
manage = "desktop";
|
|
||||||
name = "xsession";
|
|
||||||
start = "exec $HOME/.xsession";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
services.dbus.packages = with pkgs; [ pkgs.dconf ];
|
|
||||||
programs.dconf.enable = true;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Configure keymap in X11
|
|
||||||
services.xserver.xkb.layout = "no";
|
|
||||||
|
|
||||||
# Enable CUPS to print documents.
|
|
||||||
# services.printing.enable = true;
|
|
||||||
|
|
||||||
# Enable sound.
|
|
||||||
security.rtkit.enable = true;
|
|
||||||
services.pipewire = {
|
|
||||||
enable = true;
|
|
||||||
pulse.enable = true;
|
|
||||||
alsa.enable = true;
|
|
||||||
alsa.support32Bit = true;
|
|
||||||
jack.enable = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
programs.zsh.enable = true;
|
|
||||||
|
|
||||||
# Define a user account. Don't forget to set a password with ‘passwd’.
|
|
||||||
users.users.daniel = {
|
|
||||||
isNormalUser = true;
|
|
||||||
extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
|
|
||||||
shell = pkgs.zsh;
|
|
||||||
openssh.authorizedKeys.keys = [
|
|
||||||
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCp8iMOx3eTiG5AmDh2KjKcigf7xdRKn9M7iZQ4RqP0np0UN2NUbu+VAMJmkWFyi3JpxmLuhszU0F1xY+3qM3ARduy1cs89B/bBE85xlOeYhcYVmpcgPR5xduS+TuHTBzFAgp+IU7/lgxdjcJ3PH4K0ruGRcX1xrytmk/vdY8IeSk3GVWDRrRbH6brO4cCCFjX0zJ7G6hBQueTPQoOy3jrUvgpRkzZY4ZCuljXtxbuX5X/2qWAkp8ca0iTQ5FzNA5JUyj+DWeEzjIEz6GrckOdV2LjWpT9+CtOqoPZOUudE1J9mJk4snNlMQjE06It7Kr50bpwoPqnxjo7ZjlHFLezl"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
# List packages installed in system profile. To search, run:
|
|
||||||
# $ nix search wget
|
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
|
|
||||||
wget
|
|
||||||
git
|
|
||||||
];
|
|
||||||
|
|
||||||
# Some programs need SUID wrappers, can be configured further or are
|
|
||||||
# started in user sessions.
|
|
||||||
# programs.mtr.enable = true;
|
|
||||||
# programs.gnupg.agent = {
|
|
||||||
# enable = true;
|
|
||||||
# enableSSHSupport = true;
|
|
||||||
# };
|
|
||||||
|
|
||||||
# List services that you want to enable:
|
|
||||||
|
|
||||||
# Enable the OpenSSH daemon.
|
|
||||||
services.openssh.enable = true;
|
|
||||||
services.openssh.openFirewall = false;
|
|
||||||
|
|
||||||
networking.firewall.interfaces."tailscale0" = let
|
|
||||||
all = { from = 0; to = 65535; };
|
|
||||||
in {
|
|
||||||
allowedUDPPortRanges = [ all ];
|
|
||||||
allowedTCPPortRanges = [ all ];
|
|
||||||
};
|
|
||||||
|
|
||||||
networking.firewall.trustedInterfaces = [ "eno1" ];
|
|
||||||
|
|
||||||
nix.settings.trusted-users = [ "daniel" ];
|
|
||||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
system.stateVersion = "24.05"; # Did you read the comment?
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,38 +0,0 @@
|
|||||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
|
||||||
# and may be overwritten by future invocations. Please make changes
|
|
||||||
# to /etc/nixos/configuration.nix instead.
|
|
||||||
{ config, lib, pkgs, modulesPath, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
imports =
|
|
||||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
|
||||||
];
|
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
|
|
||||||
boot.initrd.kernelModules = [ ];
|
|
||||||
boot.kernelModules = [ ];
|
|
||||||
boot.extraModulePackages = [ ];
|
|
||||||
|
|
||||||
fileSystems."/" =
|
|
||||||
{ device = "/dev/disk/by-uuid/92bec2f5-9ae6-40c1-9c7b-a7b03ef8b79f";
|
|
||||||
fsType = "ext4";
|
|
||||||
};
|
|
||||||
|
|
||||||
fileSystems."/boot" =
|
|
||||||
{ device = "/dev/disk/by-uuid/8FB1-1C05";
|
|
||||||
fsType = "vfat";
|
|
||||||
options = [ "fmask=0077" "dmask=0077" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
swapDevices = [ ];
|
|
||||||
|
|
||||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
|
||||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
|
||||||
# still possible to use this option, but it's recommended to use it in conjunction
|
|
||||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
|
||||||
networking.useDHCP = lib.mkDefault true;
|
|
||||||
# networking.interfaces.eno1.useDHCP = lib.mkDefault true;
|
|
||||||
|
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
|
||||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
|
||||||
}
|
|
||||||
@@ -19,10 +19,4 @@
|
|||||||
profiles.zsh.enable = true;
|
profiles.zsh.enable = true;
|
||||||
|
|
||||||
profiles.games.enable = true;
|
profiles.games.enable = true;
|
||||||
|
|
||||||
profiles.timetracking.enable = true;
|
|
||||||
|
|
||||||
home.packages = [
|
|
||||||
pkgs.unstable.osu-lazer-bin
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
@@ -18,14 +18,11 @@
|
|||||||
profiles.xsession.enable = true;
|
profiles.xsession.enable = true;
|
||||||
profiles.zsh.enable = true;
|
profiles.zsh.enable = true;
|
||||||
|
|
||||||
profiles.games.enable = true;
|
|
||||||
|
|
||||||
profiles.timetracking.enable = true;
|
|
||||||
|
|
||||||
services.gammastep = {
|
services.gammastep = {
|
||||||
enable = true;
|
enable = true;
|
||||||
dawnTime = "7:00-8:15";
|
dawnTime = "7:00-8:15";
|
||||||
duskTime = "21:30-22:30";
|
duskTime = "21:30-22:30";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
profiles.games.enable = true;
|
||||||
}
|
}
|
||||||
6
overlays/mumble.nix
Normal file
6
overlays/mumble.nix
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
self: super:
|
||||||
|
{
|
||||||
|
mumble = super.mumble.override (OldAttr: {
|
||||||
|
pulseSupport = true;
|
||||||
|
});
|
||||||
|
}
|
||||||
@@ -1,25 +1,7 @@
|
|||||||
{pkgs, config, lib, ...}:
|
{pkgs, config, lib, ...}:
|
||||||
let
|
let
|
||||||
cfg = config.profiles.audio;
|
cfg = config.profiles.audio;
|
||||||
# audio-plugins = pkgs.symlinkJoin {
|
audio-plugins = pkgs.symlinkJoin { name = "audio-plugins"; paths = [ pkgs.lsp-plugins pkgs.speech-denoiser ];};
|
||||||
# name = "audio-plugins";
|
|
||||||
# stripPrefix = "/lib";
|
|
||||||
# paths = [
|
|
||||||
# pkgs.lsp-plugins
|
|
||||||
# pkgs.rnnoise-plugin
|
|
||||||
# ];
|
|
||||||
# };
|
|
||||||
audio-plugins = pkgs.buildEnv {
|
|
||||||
name = "audio-plugins";
|
|
||||||
paths = [
|
|
||||||
pkgs.lsp-plugins
|
|
||||||
# pkgs.calf
|
|
||||||
# pkgs.tal-plugins
|
|
||||||
pkgs.rnnoise-plugin
|
|
||||||
];
|
|
||||||
# pathsToLink = [ "/lib/lv2" "/lib/ladspa" "/lib/clap" "/lib/vst" "/lib/vst3" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
options.profiles.audio = {
|
options.profiles.audio = {
|
||||||
@@ -38,12 +38,13 @@ in
|
|||||||
|
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
nix-output-monitor
|
unstable.nix-output-monitor
|
||||||
nix-top
|
nix-top
|
||||||
nix-index
|
nix-index
|
||||||
nix-tree
|
nix-tree
|
||||||
# unstable.comma
|
unstable.comma
|
||||||
nixd
|
|
||||||
|
rnix-lsp
|
||||||
|
|
||||||
openvpn
|
openvpn
|
||||||
|
|
||||||
@@ -59,9 +60,6 @@ in
|
|||||||
progress
|
progress
|
||||||
|
|
||||||
file
|
file
|
||||||
bintools
|
|
||||||
|
|
||||||
gh
|
|
||||||
tmux
|
tmux
|
||||||
|
|
||||||
timewarrior
|
timewarrior
|
||||||
@@ -69,8 +67,6 @@ in
|
|||||||
unzip
|
unzip
|
||||||
p7zip
|
p7zip
|
||||||
|
|
||||||
yt-dlp
|
|
||||||
|
|
||||||
parallel
|
parallel
|
||||||
sshfs
|
sshfs
|
||||||
jq
|
jq
|
||||||
@@ -78,29 +74,24 @@ in
|
|||||||
ncdu
|
ncdu
|
||||||
|
|
||||||
bat
|
bat
|
||||||
eza
|
exa
|
||||||
ripgrep
|
ripgrep
|
||||||
|
|
||||||
# gregctl
|
|
||||||
# wack
|
|
||||||
#
|
|
||||||
unstable.ollama
|
|
||||||
] ++ 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
|
||||||
eog
|
|
||||||
|
|
||||||
kdePackages.dolphin
|
dolphin
|
||||||
kdePackages.dolphin-plugins
|
plasma5Packages.dolphin-plugins
|
||||||
kdePackages.ffmpegthumbs
|
ffmpegthumbs
|
||||||
kdePackages.kdegraphics-thumbnailers
|
plasma5Packages.kdegraphics-thumbnailers
|
||||||
kdePackages.kio
|
plasma5Packages.kio
|
||||||
kdePackages.kio-extras
|
plasma5Packages.kio-extras
|
||||||
kdePackages.konsole # https://bugs.kde.org/show_bug.cgi?id=407990 reeee
|
krename
|
||||||
|
konsole # https://bugs.kde.org/show_bug.cgi?id=407990 reeee
|
||||||
|
|
||||||
gedit
|
gnome3.gedit
|
||||||
|
|
||||||
gimp
|
gimp
|
||||||
] ++ lib.optionals (config.profiles.gui.enable && cfg.plus) [
|
] ++ lib.optionals (config.profiles.gui.enable && cfg.plus) [
|
||||||
@@ -111,15 +102,15 @@ in
|
|||||||
libreoffice
|
libreoffice
|
||||||
thunderbird
|
thunderbird
|
||||||
|
|
||||||
kdePackages.kdenlive
|
kdenlive
|
||||||
frei0r
|
frei0r
|
||||||
audacity
|
audacity
|
||||||
# inkscape
|
inkscape
|
||||||
blender
|
blender
|
||||||
|
|
||||||
mkvtoolnix
|
mkvtoolnix
|
||||||
] ++ lib.optionals (config.profiles.gui.enable && (config ? nixpkgs && config.nixpkgs.config.allowUnfree) ) [
|
] ++ lib.optionals (config.profiles.gui.enable && (config ? nixpkgs && config.nixpkgs.config.allowUnfree) ) [
|
||||||
# geogebra
|
geogebra
|
||||||
];
|
];
|
||||||
|
|
||||||
programs.firefox = {
|
programs.firefox = {
|
||||||
@@ -131,11 +122,11 @@ in
|
|||||||
};
|
};
|
||||||
bookmarks = {
|
bookmarks = {
|
||||||
"NixOS Options" = {
|
"NixOS Options" = {
|
||||||
keyword = "nxo";
|
keyword = "no";
|
||||||
url = "https://search.nixos.org/options?query=%s";
|
url = "https://search.nixos.org/options?query=%s";
|
||||||
};
|
};
|
||||||
"NixOS Packages" = {
|
"NixOS Packages" = {
|
||||||
keyword = "nxp";
|
keyword = "np";
|
||||||
url = "https://search.nixos.org/packages?query=%s";
|
url = "https://search.nixos.org/packages?query=%s";
|
||||||
};
|
};
|
||||||
"Home-Manager Options" = {
|
"Home-Manager Options" = {
|
||||||
@@ -143,7 +134,7 @@ in
|
|||||||
url = "https://rycee.gitlab.io/home-manager/options.html#opt-%s";
|
url = "https://rycee.gitlab.io/home-manager/options.html#opt-%s";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
extensions = with pkgs.nur.repos.rycee.firefox-addons; [ cookies-txt no-pdf-download sponsorblock ublock-origin ];
|
extensions = with pkgs.nur.repos.rycee.firefox-addons; [ bitwarden cookies-txt metamask no-pdf-download sponsorblock ublock-origin ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@@ -201,43 +192,22 @@ in
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.zed-editor = {
|
programs.vscode = {
|
||||||
enable = config.profiles.gui.enable;
|
enable = config.profiles.gui.enable;
|
||||||
package = pkgs.unstable.zed-editor;
|
package = pkgs.vscodium;
|
||||||
extensions = [
|
extensions = with pkgs.vscode-extensions; [
|
||||||
"nix"
|
bbenoist.nix
|
||||||
|
|
||||||
|
matklad.rust-analyzer
|
||||||
|
vadimcn.vscode-lldb
|
||||||
|
] ++ lib.optionals config.nixpkgs.config.allowUnfree [
|
||||||
|
ms-vsliveshare.vsliveshare
|
||||||
];
|
];
|
||||||
userSettings = {
|
userSettings = {
|
||||||
telemetry.metrics = false;
|
"editor.insertSpaces" = false;
|
||||||
telemetry.diagnostics = false;
|
"terminal.integrated.fontFamily" = "MesloLGS NF";
|
||||||
features = {
|
|
||||||
copilot = false;
|
|
||||||
};
|
|
||||||
buffer_font_family = "MesloLGS NF";
|
|
||||||
base_keymap = "VSCode";
|
|
||||||
language_overrides = {
|
|
||||||
Rust = {
|
|
||||||
inlay_hints.enabled = true;
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# programs.vscode = {
|
|
||||||
# enable = config.profiles.gui.enable;
|
|
||||||
# package = pkgs.vscodium;
|
|
||||||
# extensions = with pkgs.vscode-extensions; [
|
|
||||||
# bbenoist.nix
|
|
||||||
# rust-lang.rust-analyzer
|
|
||||||
# vadimcn.vscode-lldb
|
|
||||||
# ] ++ lib.optionals config.nixpkgs.config.allowUnfree [
|
|
||||||
# ms-vsliveshare.vsliveshare
|
|
||||||
# ];
|
|
||||||
# userSettings = {
|
|
||||||
# "editor.insertSpaces" = false;
|
|
||||||
# "terminal.integrated.fontFamily" = "MesloLGS NF";
|
|
||||||
# };
|
|
||||||
# };
|
|
||||||
|
|
||||||
programs.git = {
|
programs.git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
@@ -273,9 +243,6 @@ in
|
|||||||
# });
|
# });
|
||||||
girt = pkgs.git-interactive-rebase-tool;
|
girt = pkgs.git-interactive-rebase-tool;
|
||||||
in "${girt}/bin/interactive-rebase-tool";
|
in "${girt}/bin/interactive-rebase-tool";
|
||||||
branch.sort = "-committerdate";
|
|
||||||
gpg.format = "ssh";
|
|
||||||
user.signingKey = "~/.ssh/id_rsa.pub";
|
|
||||||
};
|
};
|
||||||
delta.enable = true;
|
delta.enable = true;
|
||||||
};
|
};
|
||||||
@@ -285,32 +252,22 @@ in
|
|||||||
enable = true;
|
enable = true;
|
||||||
matchBlocks = {
|
matchBlocks = {
|
||||||
"lilith" = {
|
"lilith" = {
|
||||||
hostname = "lilith.tn.dodsorf.as";
|
hostname = "lilith.daniel";
|
||||||
user = "dandellion";
|
user = "dandellion";
|
||||||
};
|
};
|
||||||
"desktop" = {
|
"desktop" = {
|
||||||
hostname = "soryu.tn.dodsorf.as";
|
hostname = "desktop.daniel";
|
||||||
user = "dan";
|
user = "dan";
|
||||||
};
|
};
|
||||||
"ubuntu-ai" = {
|
|
||||||
hostname = "soryu.tn.dodsorf.as";
|
|
||||||
port = 2222;
|
|
||||||
user = "daniel";
|
|
||||||
};
|
|
||||||
"laptop" = {
|
"laptop" = {
|
||||||
hostname = "ayanami.tn.dodsorf.as";
|
hostname = "laptop.daniel";
|
||||||
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 !login.pvv.ntnu.no" = {
|
"*.pvv.ntnu.no" = {
|
||||||
user = "danio";
|
user = "danio";
|
||||||
proxyJump = "login.pvv.ntnu.no";
|
|
||||||
};
|
};
|
||||||
"pascal" = {
|
"pascal" = {
|
||||||
hostname = "wiki.wackattack.eu";
|
hostname = "wiki.wackattack.eu";
|
||||||
@@ -325,6 +282,10 @@ in
|
|||||||
"gitlab.stud.idi.ntnu.no" = {
|
"gitlab.stud.idi.ntnu.no" = {
|
||||||
proxyJump = "login.pvv.ntnu.no";
|
proxyJump = "login.pvv.ntnu.no";
|
||||||
};
|
};
|
||||||
|
"consolidation" = {
|
||||||
|
hostname = "62.92.111.62";
|
||||||
|
user = "root";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -336,8 +297,6 @@ in
|
|||||||
|
|
||||||
home.sessionVariables = {
|
home.sessionVariables = {
|
||||||
EDITOR = "hx";
|
EDITOR = "hx";
|
||||||
GRZEGORZ_DEFAULT_API_BASE = "https://georg-backend.pvv.ntnu.no/api/";
|
|
||||||
OLLAMA_HOST="100.64.0.19";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
xdg.mimeApps = {
|
xdg.mimeApps = {
|
||||||
@@ -7,6 +7,5 @@
|
|||||||
./gui.nix
|
./gui.nix
|
||||||
./non-nixos.nix
|
./non-nixos.nix
|
||||||
./games
|
./games
|
||||||
./timetracking
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
@@ -12,17 +12,20 @@ in {
|
|||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
fortune
|
fortune
|
||||||
|
lolcat
|
||||||
|
neofetch
|
||||||
|
pipes
|
||||||
] ++ lib.optionals config.profiles.gui.enable [
|
] ++ lib.optionals config.profiles.gui.enable [
|
||||||
steam
|
steam
|
||||||
|
|
||||||
prismlauncher
|
unstable.prismlauncher
|
||||||
fjordlauncher
|
|
||||||
# minetest
|
# minetest
|
||||||
# dwarf-fortress-packages.dwarf-fortress-full
|
# dwarf-fortress-packages.dwarf-fortress-full
|
||||||
# superTuxKart
|
# superTuxKart
|
||||||
# warsow
|
# warsow
|
||||||
# xonotic
|
# xonotic
|
||||||
# zeroad
|
# zeroad
|
||||||
|
unstable.osu-lazer
|
||||||
|
|
||||||
# nur.repos.ivar.sm64ex
|
# nur.repos.ivar.sm64ex
|
||||||
# dolphinEmuMaster
|
# dolphinEmuMaster
|
||||||
@@ -47,6 +47,8 @@ in
|
|||||||
|
|
||||||
export XDG_CURRENT_DESKTOP=kde
|
export XDG_CURRENT_DESKTOP=kde
|
||||||
export DESKTOP_SESSION=kde
|
export DESKTOP_SESSION=kde
|
||||||
|
|
||||||
|
export QT_STYLE_OVERRIDE="breeze"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
windowManager = {
|
windowManager = {
|
||||||
@@ -69,11 +71,6 @@ in
|
|||||||
"XF86AudioMute" = "exec --no-startup-id ${pkgs.pulseaudio}/bin/pactl set-sink-mute 0 toggle";
|
"XF86AudioMute" = "exec --no-startup-id ${pkgs.pulseaudio}/bin/pactl set-sink-mute 0 toggle";
|
||||||
"XF86AudioMicMute" = "exec --no-startup-id ${pkgs.pulseaudio}/bin/pactl set-source-mute 1 toggle";
|
"XF86AudioMicMute" = "exec --no-startup-id ${pkgs.pulseaudio}/bin/pactl set-source-mute 1 toggle";
|
||||||
|
|
||||||
# Georg volume controls
|
|
||||||
# "Shift+XF86AudioRaiseVolume" = "exec --no-startup-id ${lib.getExe pkgs.gregctl} set-volume -- +5%";
|
|
||||||
# "Shift+XF86AudioLowerVolume" = "exec --no-startup-id ${lib.getExe pkgs.gregctl} set-volume -- -5%";
|
|
||||||
# "Shift+XF86AudioMute" = "exec --no-startup-id ${lib.getExe pkgs.gregctl} toggle";
|
|
||||||
|
|
||||||
"XF86MonBrightnessUp" = "exec --no-startup-id brightnessctl set +5%";
|
"XF86MonBrightnessUp" = "exec --no-startup-id brightnessctl set +5%";
|
||||||
"XF86MonBrightnessDown" = "exec --no-startup-id brightnessctl set 5%-";
|
"XF86MonBrightnessDown" = "exec --no-startup-id brightnessctl set 5%-";
|
||||||
|
|
||||||
@@ -145,21 +142,21 @@ in
|
|||||||
|
|
||||||
|
|
||||||
gtk = {
|
gtk = {
|
||||||
enable = true;
|
enable = false;
|
||||||
theme = {
|
theme = {
|
||||||
# package = pkgs.breeze-gtk;
|
package = pkgs.breeze-gtk;
|
||||||
package = pkgs.kdePackages.breeze-gtk;
|
|
||||||
name = "Breeze";
|
name = "Breeze";
|
||||||
};
|
};
|
||||||
iconTheme = {
|
iconTheme = {
|
||||||
package = pkgs.kdePackages.breeze-icons;
|
package = pkgs.breeze-icons;
|
||||||
name = "breeze";
|
name = "breeze";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
# qt = {
|
qt = {
|
||||||
# enable = true;
|
enable = true;
|
||||||
# platformTheme = "gtk";
|
#useGtkTheme = true;
|
||||||
# };
|
platformTheme = "gtk";
|
||||||
|
};
|
||||||
|
|
||||||
xsession.windowManager.command = lib.mkIf non-nixos.enable (lib.mkForce "${pkgs.nixgl.auto.nixGLDefault}/bin/nixGL ${config.xsession.windowManager.i3.package}/bin/i3");
|
xsession.windowManager.command = lib.mkIf non-nixos.enable (lib.mkForce "${pkgs.nixgl.auto.nixGLDefault}/bin/nixGL ${config.xsession.windowManager.i3.package}/bin/i3");
|
||||||
|
|
||||||
@@ -174,7 +171,7 @@ in
|
|||||||
pkgs.dmenu
|
pkgs.dmenu
|
||||||
|
|
||||||
pkgs.scrot
|
pkgs.scrot
|
||||||
# pkgs.neofetch
|
pkgs.neofetch
|
||||||
#pkgs.dan.colors
|
#pkgs.dan.colors
|
||||||
pkgs.xclip
|
pkgs.xclip
|
||||||
|
|
||||||
@@ -182,8 +179,8 @@ in
|
|||||||
|
|
||||||
pkgs.source-code-pro
|
pkgs.source-code-pro
|
||||||
|
|
||||||
pkgs.kdePackages.breeze-gtk
|
pkgs.breeze-qt5
|
||||||
pkgs.kdePackages.breeze-icons
|
pkgs.breeze-icons
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
32
profiles/xsession/terminal.nix
Normal file
32
profiles/xsession/terminal.nix
Normal file
@@ -0,0 +1,32 @@
|
|||||||
|
{ pkgs, config, lib, ...}:
|
||||||
|
{
|
||||||
|
|
||||||
|
config = lib.mkIf config.profiles.xsession.enable {
|
||||||
|
|
||||||
|
home.file.kitty = {
|
||||||
|
target = ".config/kitty/kitty.conf";
|
||||||
|
text = ''
|
||||||
|
#term xterm-256color
|
||||||
|
font_family MesloLGS NF
|
||||||
|
font_size 12.0
|
||||||
|
background_opacity 0.7
|
||||||
|
|
||||||
|
clear_all_shortcuts yes
|
||||||
|
|
||||||
|
map ctrl+shift+c copy_to_clipboard
|
||||||
|
map ctrl+shift+v paste_from_clipboard
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
map ctrl+plus change_font_size all +2.0
|
||||||
|
map ctrl+shift+plus change_font_size all -2.0
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
home.packages = [
|
||||||
|
pkgs.kitty
|
||||||
|
pkgs.ncurses.dev
|
||||||
|
];
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -12,7 +12,7 @@ in
|
|||||||
programs.zsh = {
|
programs.zsh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
dotDir = ".config/zsh";
|
dotDir = ".config/zsh";
|
||||||
autosuggestion.enable = true;
|
enableAutosuggestions = true;
|
||||||
enableCompletion = true;
|
enableCompletion = true;
|
||||||
history = {
|
history = {
|
||||||
expireDuplicatesFirst = true;
|
expireDuplicatesFirst = true;
|
||||||
@@ -20,9 +20,9 @@ in
|
|||||||
share = false;
|
share = false;
|
||||||
};
|
};
|
||||||
shellAliases = {
|
shellAliases = {
|
||||||
cat = "bat -pp";
|
cat = "bat";
|
||||||
ls = "eza";
|
ls = "exa";
|
||||||
tree = "eza -T";
|
tree = "exa -T";
|
||||||
df = "df -h";
|
df = "df -h";
|
||||||
|
|
||||||
sysu = "systemctl --user";
|
sysu = "systemctl --user";
|
||||||
@@ -67,7 +67,6 @@ in
|
|||||||
|
|
||||||
programs.direnv = {
|
programs.direnv = {
|
||||||
enable = true;
|
enable = true;
|
||||||
nix-direnv.enable = true;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.atuin = {
|
programs.atuin = {
|
||||||
@@ -79,8 +78,6 @@ in
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.zoxide.enable = true;
|
|
||||||
|
|
||||||
home.packages = lib.optionals (config.profiles.gui.enable && config ? nixpkgs) [
|
home.packages = lib.optionals (config.profiles.gui.enable && config ? nixpkgs) [
|
||||||
pkgs.dan.mesloNFp10k
|
pkgs.dan.mesloNFp10k
|
||||||
];
|
];
|
||||||
Reference in New Issue
Block a user