Compare commits
7 Commits
1243f93092
...
0c46f6e4b2
| Author | SHA1 | Date | |
|---|---|---|---|
|
0c46f6e4b2 | ||
|
|
5943dbccbc | ||
|
|
c62872d94c | ||
|
|
ddc6897d80 | ||
|
|
44d9a9aa84 | ||
|
|
5b374ef972 | ||
|
|
0fc6034632 |
359
flake.lock
generated
359
flake.lock
generated
@ -42,17 +42,74 @@
|
||||
"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"
|
||||
"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,
|
||||
@ -99,6 +156,21 @@
|
||||
"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": [
|
||||
@ -119,12 +191,57 @@
|
||||
"url": "https://git.pvv.ntnu.no/Projects/grzegorz-clients"
|
||||
}
|
||||
},
|
||||
"greg-clients_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"wack-server-conf",
|
||||
"dandellion",
|
||||
"unstable"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1726861934,
|
||||
"narHash": "sha256-lOzPDwktd+pwszUTbpUdQg6iCzInS11fHLfkjmnvJrM=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "546d921ec46735dbf876e36f4af8df1064d09432",
|
||||
"revCount": 78,
|
||||
"type": "git",
|
||||
"url": "https://git.pvv.ntnu.no/Projects/grzegorz-clients"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "https://git.pvv.ntnu.no/Projects/grzegorz-clients"
|
||||
}
|
||||
},
|
||||
"home-manager": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733050161,
|
||||
"narHash": "sha256-lYnT+EYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "62d536255879be574ebfe9b87c4ac194febf47c5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "release-24.11",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"home-manager_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"wack-server-conf",
|
||||
"dandellion",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1726989464,
|
||||
"narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
|
||||
@ -140,9 +257,11 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"home-manager_2": {
|
||||
"home-manager_3": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"wack-server-conf",
|
||||
"dandellion",
|
||||
"wack-server-conf",
|
||||
"dandellion",
|
||||
"nixpkgs"
|
||||
@ -163,9 +282,11 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"home-manager_3": {
|
||||
"home-manager_4": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"wack-server-conf",
|
||||
"dandellion",
|
||||
"wack-server-conf",
|
||||
"nixpkgs"
|
||||
]
|
||||
@ -185,6 +306,28 @@
|
||||
"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": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
@ -215,6 +358,31 @@
|
||||
"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": {
|
||||
"lastModified": 1685908677,
|
||||
"narHash": "sha256-E4zUPEUFyVWjVm45zICaHRpfGepfkE9Z2OECV9HXfA4=",
|
||||
@ -230,6 +398,22 @@
|
||||
}
|
||||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1733217105,
|
||||
"narHash": "sha256-fc6jTzIwCIVWTX50FtW6AZpuukuQWSEbPiyg6ZRGWFY=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "cceee0a31d2f01bcc98b2fbd591327c06a4ea4f9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "master",
|
||||
"repo": "nixos-hardware",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixos-hardware_2": {
|
||||
"locked": {
|
||||
"lastModified": 1730368399,
|
||||
"narHash": "sha256-F8vJtG389i9fp3k2/UDYHMed3PLCJYfxCqwiVP7b9ig=",
|
||||
@ -247,16 +431,16 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1730327045,
|
||||
"narHash": "sha256-xKel5kd1AbExymxoIfQ7pgcX6hjw9jCgbiBjiUfSVJ8=",
|
||||
"lastModified": 1733261153,
|
||||
"narHash": "sha256-eq51hyiaIwtWo19fPEeE0Zr2s83DYMKJoukNLgGGpek=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "080166c15633801df010977d9d7474b4a6c549d7",
|
||||
"rev": "b681065d0919f7eb5309a93cea2cfa84dec9aa88",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-24.05",
|
||||
"ref": "nixos-24.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
@ -277,6 +461,22 @@
|
||||
"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,
|
||||
@ -292,7 +492,37 @@
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nixpkgs-unstable_2": {
|
||||
"locked": {
|
||||
"lastModified": 1699099776,
|
||||
"narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"ref": "nixos-unstable",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
"nur": {
|
||||
"locked": {
|
||||
"lastModified": 1733417713,
|
||||
"narHash": "sha256-/3foD2ePFtms/swS2J77CbAepo1nQ4CHlRBpj1IR8t0=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "6e671d63e6b1e29f31781b8dfef69b147b69ab77",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nur_2": {
|
||||
"locked": {
|
||||
"lastModified": 1730450711,
|
||||
"narHash": "sha256-quBA0X4kODNac/4ZF/urYD99PFC789rDC4Vi8ASKn6s=",
|
||||
@ -307,7 +537,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nur_2": {
|
||||
"nur_3": {
|
||||
"locked": {
|
||||
"lastModified": 1699131694,
|
||||
"narHash": "sha256-dKWORPD0ODREKihqCZqEqc1zJ3wACmoMmuf2BGg3DbE=",
|
||||
@ -339,6 +569,8 @@
|
||||
"sops-nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"wack-server-conf",
|
||||
"dandellion",
|
||||
"wack-server-conf",
|
||||
"nixpkgs"
|
||||
],
|
||||
@ -358,7 +590,45 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"sops-nix_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"wack-server-conf",
|
||||
"nixpkgs"
|
||||
],
|
||||
"nixpkgs-stable": "nixpkgs-stable_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729999681,
|
||||
"narHash": "sha256-qm0uCtM9bg97LeJTKQ8dqV/FvqRN+ompyW4GIJruLuw=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "1666d16426abe79af5c47b7c0efa82fd31bf4c56",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1733229606,
|
||||
"narHash": "sha256-FLYY5M0rpa5C2QAE3CKLYAM6TwbKicdRK6qNrSHlNrE=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "566e53c2ad750c84f6d31f9ccb9d00f823165550",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"unstable_2": {
|
||||
"locked": {
|
||||
"lastModified": 1730272153,
|
||||
"narHash": "sha256-B5WRZYsRlJgwVHIV6DvidFN7VX7Fg9uuwkRW9Ha8z+w=",
|
||||
@ -374,7 +644,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"unstable_2": {
|
||||
"unstable_3": {
|
||||
"locked": {
|
||||
"lastModified": 1699094435,
|
||||
"narHash": "sha256-YLZ5/KKZ1PyLrm2MO8UxRe4H3M0/oaYqNhSlq6FDeeA=",
|
||||
@ -390,7 +660,7 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"unstable_3": {
|
||||
"unstable_4": {
|
||||
"locked": {
|
||||
"lastModified": 1698924604,
|
||||
"narHash": "sha256-GCFbkl2tj8fEZBZCw3Tc0AkGo0v+YrQlohhEGJ/X4s0=",
|
||||
@ -406,6 +676,22 @@
|
||||
"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": [
|
||||
@ -413,6 +699,29 @@
|
||||
],
|
||||
"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=",
|
||||
@ -430,12 +739,38 @@
|
||||
"wack-server-conf": {
|
||||
"inputs": {
|
||||
"dandellion": "dandellion",
|
||||
"home-manager": "home-manager_3",
|
||||
"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_3"
|
||||
"unstable": "unstable_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1699656973,
|
||||
|
||||
18
flake.nix
18
flake.nix
@ -5,9 +5,9 @@
|
||||
# nixConfig.exta-trusted-public-keys = "cache.dodsorf.as:FYKGadXTyI2ax8mirBTOjEqS/8PZKAWxiJVOBjESQXc=";
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
|
||||
|
||||
home-manager.url = "github:nix-community/home-manager/release-24.05";
|
||||
home-manager.url = "github:nix-community/home-manager/release-24.11";
|
||||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
||||
unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
|
||||
@ -78,11 +78,11 @@
|
||||
|
||||
mkHomes = machines: extraArgs: nixlib.genAttrs machines (machine: mkHome ({inherit machine; } // extraArgs));
|
||||
|
||||
allMachines = [ "laptop" "desktop" "headless" "pvv-terminal" ];
|
||||
allMachines = [ "laptop" "desktop" "headless" "pvv-terminal" "ikari" ];
|
||||
in
|
||||
{
|
||||
|
||||
homeConfigurations = mkHomes [ "laptop" "headless" ] { }
|
||||
homeConfigurations = mkHomes [ "laptop" "headless" "ikari" ] { }
|
||||
// mkHomes [ "desktop" ] { username = "dan"; }
|
||||
// mkHomes [ "pvv-terminal" ] { username = "danio"; homeDirectory = "/home/pvv/d/danio"; };
|
||||
|
||||
@ -107,6 +107,16 @@
|
||||
./hosts/soryu/configuration.nix
|
||||
];
|
||||
};
|
||||
|
||||
ikari = nixpkgs.lib.nixosSystem {
|
||||
system = "x86_64-linux";
|
||||
specialArgs = {
|
||||
inherit inputs;
|
||||
};
|
||||
modules = [
|
||||
./hosts/ikari/configuration.nix
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
nixosModules = {
|
||||
|
||||
@ -21,6 +21,6 @@
|
||||
profiles.games.enable = true;
|
||||
|
||||
home.packages = [
|
||||
pkgs.unstable.osu-lazer
|
||||
pkgs.unstable.osu-lazer-bin
|
||||
];
|
||||
}
|
||||
|
||||
25
home/machines/ikari.nix
Normal file
25
home/machines/ikari.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{ 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
|
||||
];
|
||||
}
|
||||
@ -87,7 +87,7 @@ in
|
||||
] ++ lib.optionals config.profiles.gui.enable [
|
||||
mpv
|
||||
sxiv
|
||||
gnome3.eog
|
||||
eog
|
||||
|
||||
dolphin
|
||||
plasma5Packages.dolphin-plugins
|
||||
@ -205,7 +205,7 @@ in
|
||||
extensions = with pkgs.vscode-extensions; [
|
||||
bbenoist.nix
|
||||
|
||||
matklad.rust-analyzer
|
||||
rust-lang.rust-analyzer
|
||||
vadimcn.vscode-lldb
|
||||
] ++ lib.optionals config.nixpkgs.config.allowUnfree [
|
||||
ms-vsliveshare.vsliveshare
|
||||
@ -262,27 +262,32 @@ in
|
||||
enable = true;
|
||||
matchBlocks = {
|
||||
"lilith" = {
|
||||
hostname = "lilith.daniel";
|
||||
hostname = "lilith.tn.dodsorf.as";
|
||||
user = "dandellion";
|
||||
};
|
||||
"desktop" = {
|
||||
hostname = "desktop.daniel";
|
||||
hostname = "soryu.tn.dodsorf.as";
|
||||
user = "dan";
|
||||
};
|
||||
"ubuntu-ai" = {
|
||||
hostname = "100.64.0.2";
|
||||
hostname = "soryu.tn.dodsorf.as";
|
||||
port = 2222;
|
||||
user = "daniel";
|
||||
};
|
||||
"laptop" = {
|
||||
hostname = "laptop.daniel";
|
||||
hostname = "ayanami.tn.dodsorf.as";
|
||||
user = "daniel";
|
||||
};
|
||||
"login.pvv.ntnu.no" = {
|
||||
user = "danio";
|
||||
};
|
||||
"pvv.ntnu.no" = {
|
||||
user = "danio";
|
||||
proxyJump = "login.pvv.ntnu.no";
|
||||
};
|
||||
"*.pvv.ntnu.no" = {
|
||||
"*.pvv.ntnu.no !login.pvv.ntnu.no" = {
|
||||
user = "danio";
|
||||
proxyJump = "login.pvv.ntnu.no";
|
||||
};
|
||||
"pascal" = {
|
||||
hostname = "wiki.wackattack.eu";
|
||||
|
||||
172
hosts/ikari/configuration.nix
Normal file
172
hosts/ikari/configuration.nix
Normal file
@ -0,0 +1,172 @@
|
||||
# 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.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?
|
||||
}
|
||||
|
||||
38
hosts/ikari/hardware-configuration.nix
Normal file
38
hosts/ikari/hardware-configuration.nix
Normal file
@ -0,0 +1,38 @@
|
||||
# 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;
|
||||
}
|
||||
@ -29,7 +29,7 @@
|
||||
CPUQuota = "300%";
|
||||
MemoryHigh = "29G";
|
||||
MemoryMax = "30G";
|
||||
MemorySwapMax = "25G";
|
||||
MemorySwapMax = "50G";
|
||||
ExecStart = "systemd-nspawn --quiet --keep-unit --boot --link-journal=try-guest --network-veth -U --settings=override --machine=%i -D /mnt/human/machines/ubuntu-ai";
|
||||
};
|
||||
# overrideStrategy = "asDropin";
|
||||
|
||||
@ -29,6 +29,10 @@
|
||||
"fs.file-max" = 524288;
|
||||
};
|
||||
|
||||
zramSwap = {
|
||||
enable = true;
|
||||
memoryMax = 32 * 1024 * 1024 * 1024; # 16 GB ZRAM
|
||||
};
|
||||
|
||||
disabledModules = [
|
||||
"services/network-filesystems/tahoe.nix"
|
||||
@ -174,17 +178,16 @@
|
||||
# "L+ /opt/rocm/hip - - - - ${pkgs.hip}"
|
||||
# ];
|
||||
|
||||
|
||||
hardware.opengl.driSupport = true;
|
||||
hardware.opengl.driSupport32Bit = true;
|
||||
hardware.opengl.extraPackages = with pkgs; [
|
||||
hardware.graphics.enable = true;
|
||||
hardware.graphics.enable32Bit = true;
|
||||
hardware.graphics.extraPackages = with pkgs; [
|
||||
libva
|
||||
rocmPackages.clr.icd
|
||||
];
|
||||
hardware.amdgpu.opencl.enable = true;
|
||||
|
||||
# Enable the X11 windowing system.
|
||||
services.xserver.enable = true;
|
||||
services.xserver.layout = "no";
|
||||
services.xserver.xkb.layout = "no";
|
||||
# services.xserver.xkbOptions = "eurosign:e";
|
||||
|
||||
services.xserver.displayManager.lightdm.enable = true;
|
||||
@ -196,6 +199,7 @@
|
||||
|
||||
virtualisation.docker.enable = true;
|
||||
virtualisation.libvirtd.enable = true;
|
||||
virtualisation.spiceUSBRedirection.enable = true;
|
||||
|
||||
|
||||
# networking.nameservers = lib.mkForce [ "192.168.0.25" ];
|
||||
|
||||
Loading…
Reference in New Issue
Block a user