Compare commits
	
		
			51 Commits
		
	
	
		
			new_nodes
			...
			gitea-vask
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| bd5cb05ecf | |||
| 3faad36418 | |||
| 0b74907f76 | |||
| bacfdeff23 | |||
| 9e51bdb373 | |||
| df5557698f | |||
| c7930b793a | |||
| dbe9dbe6f4 | |||
| 2e75f31d3e | |||
| 1166161858 | |||
| a0164a4038 | |||
| 470cc451e0 | |||
| a803de2b23 | |||
| 1dc78b6101 | |||
| 54434b7f93 | |||
| 736dc44008 | |||
| 9e68287f1b | |||
| b821d36f40 | |||
| 0b7fbcac32 | |||
| f3c60d0551 | |||
| f0d2d989d1 | |||
| 57d0c6247b | |||
| 95840bfa3c | |||
| 72da80f93f | |||
| 8ffc2acea7 | |||
| 0d1423ab22 | |||
| 809fcefbcf | |||
| 203358a207 | |||
| d11b189f95 | |||
| b439ddd6f6 | |||
| a22747bb66 | |||
| efc79ee189 | |||
| 8715fb220f | |||
| 649c21de01 | |||
| 2010556643 | |||
| 8dcd471a6f | |||
| 234a7030f0 | |||
| 0a7f559869 | |||
| d482eb332d | |||
| 0600fce2ca | |||
| f5fed06381 | |||
| 579ed180a3 | |||
| 043099eb37 | |||
| 59969b9ec8 | |||
| febc0940f8 | |||
| 76c251c277 | |||
| 1d48a63e3d | |||
| 5d704840ce | |||
| 43d3ef1fed | |||
| e8df081894 | |||
| f40f2ae89d | 
							
								
								
									
										21
									
								
								.sops.yaml
									
									
									
									
									
								
							
							
						
						
									
										21
									
								
								.sops.yaml
									
									
									
									
									
								
							| @@ -15,6 +15,11 @@ keys: | ||||
|   - &host_bicep age1sl43gc9cw939z5tgha2lpwf0xxxgcnlw7w4xem4sqgmt2pt264vq0dmwx2 | ||||
|   - &host_ustetind age1hffjafs4slznksefmtqrlj7rdaqgzqncn4un938rhr053237ry8s3rs0v8 | ||||
|   - &host_kommode age1mt4d0hg5g76qp7j0884llemy0k2ymr5up8vfudz6vzvsflk5nptqqd32ly | ||||
|   - &host_lupine-1 age1fkrypl6fu4ldsa7te4g3v4qsegnk7sd6qhkquuwzh04vguy96qus08902e | ||||
|   - &host_lupine-2 age1mu0ej57n4s30ghealhyju3enls83qyjua69986la35t2yh0q2s0seruz5n | ||||
|   - &host_lupine-3 age1j2u876z8hu87q5npfxzzpfgllyw8ypj66d7cgelmzmnrf3xud34qzkntp9 | ||||
|   - &host_lupine-4 age1t8zlawqkmhye737pn8yx0z3p9cl947d9ktv2cajdc6hnvn52d3fsc59s2k | ||||
|   - &host_lupine-5 age199zkqq4jp4yc3d0hx2q0ksxdtp42xhmjsqwyngh8tswuck34ke3smrfyqu | ||||
|  | ||||
| creation_rules: | ||||
|   # Global secrets | ||||
| @@ -104,3 +109,19 @@ creation_rules: | ||||
|       - *user_pederbs_bjarte | ||||
|       pgp: | ||||
|       - *user_oysteikt | ||||
|  | ||||
|   - path_regex: secrets/lupine/[^/]+\.yaml$ | ||||
|     key_groups: | ||||
|     - age: | ||||
|       - *host_lupine-1 | ||||
|       - *host_lupine-2 | ||||
|       - *host_lupine-3 | ||||
|       - *host_lupine-4 | ||||
|       - *host_lupine-5 | ||||
|       - *user_danio | ||||
|       - *user_felixalb | ||||
|       - *user_pederbs_sopp | ||||
|       - *user_pederbs_nord | ||||
|       - *user_pederbs_bjarte | ||||
|       pgp: | ||||
|       - *user_oysteikt | ||||
|   | ||||
| @@ -1,4 +1,9 @@ | ||||
| { pkgs, lib, fp, ... }: | ||||
| { | ||||
|   pkgs, | ||||
|   lib, | ||||
|   fp, | ||||
|   ... | ||||
| }: | ||||
|  | ||||
| { | ||||
|   imports = [ | ||||
| @@ -8,6 +13,7 @@ | ||||
|     ./networking.nix | ||||
|     ./nix.nix | ||||
|     ./vm.nix | ||||
|     ./flake-input-exporter.nix | ||||
|  | ||||
|     ./services/acme.nix | ||||
|     ./services/uptimed.nix | ||||
| @@ -57,16 +63,16 @@ | ||||
|   # home-manager usually handles this for you: https://github.com/nix-community/home-manager/blob/22a36aa709de7dd42b562a433b9cefecf104a6ee/modules/programs/bash.nix#L203-L209 | ||||
|   # btw, programs.bash.shellInit just goes into environment.shellInit which in turn goes into /etc/profile, spooky shit | ||||
|   programs.bash.shellInit = '' | ||||
|    if [ -n "''${BASH_VERSION:-}" ]; then | ||||
|      if [[ ! -f ~/.bash_profile && ! -f ~/.bash_login ]]; then | ||||
|       [[ -f ~/.bashrc ]] && . ~/.bashrc | ||||
|      fi | ||||
|    fi | ||||
|     if [ -n "''${BASH_VERSION:-}" ]; then | ||||
|       if [[ ! -f ~/.bash_profile && ! -f ~/.bash_login ]]; then | ||||
|        [[ -f ~/.bashrc ]] && . ~/.bashrc | ||||
|       fi | ||||
|     fi | ||||
|   ''; | ||||
|  | ||||
|   programs.zsh.enable = true; | ||||
|  | ||||
|   security.lockKernelModules = true; | ||||
|   # security.lockKernelModules = true; | ||||
|   security.protectKernelImage = true; | ||||
|   security.sudo.execWheelOnly = true; | ||||
|   security.sudo.extraConfig = '' | ||||
|   | ||||
							
								
								
									
										55
									
								
								base/flake-input-exporter.nix
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										55
									
								
								base/flake-input-exporter.nix
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,55 @@ | ||||
| { | ||||
|   config, | ||||
|   inputs, | ||||
|   lib, | ||||
|   pkgs, | ||||
|   values, | ||||
|   ... | ||||
| }: | ||||
| let | ||||
|   data = lib.flip lib.mapAttrs inputs ( | ||||
|     name: input: { | ||||
|       inherit (input) | ||||
|         lastModified | ||||
|         ; | ||||
|     } | ||||
|   ); | ||||
|   folder = pkgs.writeTextDir "share/flake-inputs" ( | ||||
|     lib.concatMapStringsSep "\n" ( | ||||
|       { name, value }: ''nixos_last_modified_input{flake="${name}"} ${toString value.lastModified}'' | ||||
|     ) (lib.attrsToList data) | ||||
|   ); | ||||
|   port = 9102; | ||||
| in | ||||
| { | ||||
|   services.nginx.virtualHosts."${config.networking.fqdn}-nixos-metrics" = { | ||||
|     serverName = config.networking.fqdn; | ||||
|     serverAliases = [ | ||||
|       "${config.networking.hostName}.pvv.org" | ||||
|     ]; | ||||
|     locations."/metrics" = { | ||||
|       root = "${folder}/share"; | ||||
|       tryFiles = "/flake-inputs =404"; | ||||
|       extraConfig = '' | ||||
|         default_type text/plain; | ||||
|       ''; | ||||
|     }; | ||||
|     listen = [ | ||||
|       { | ||||
|         inherit port; | ||||
|         addr = "0.0.0.0"; | ||||
|       } | ||||
|     ]; | ||||
|     extraConfig = '' | ||||
|       allow ${values.hosts.ildkule.ipv4}/32; | ||||
|       allow ${values.hosts.ildkule.ipv6}/128; | ||||
|       allow 127.0.0.1/32; | ||||
|       allow ::1/128; | ||||
|       allow 129.241.210.128/25; | ||||
|       allow 2001:700:300:1900::/64; | ||||
|       deny all; | ||||
|     ''; | ||||
|   }; | ||||
|  | ||||
|   networking.firewall.allowedTCPPorts = [ port ]; | ||||
| } | ||||
							
								
								
									
										95
									
								
								flake.lock
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										95
									
								
								flake.lock
									
									
									
										generated
									
									
									
								
							| @@ -7,11 +7,11 @@ | ||||
|         ] | ||||
|       }, | ||||
|       "locked": { | ||||
|         "lastModified": 1745502102, | ||||
|         "narHash": "sha256-LqhRwzvIVPEjH0TaPgwzqpyhW6DtCrvz7FnUJDoUZh8=", | ||||
|         "lastModified": 1758287904, | ||||
|         "narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=", | ||||
|         "owner": "nix-community", | ||||
|         "repo": "disko", | ||||
|         "rev": "ca27b88c88948d96feeee9ed814cbd34f53d0d70", | ||||
|         "rev": "67ff9807dd148e704baadbd4fd783b54282ca627", | ||||
|         "type": "github" | ||||
|       }, | ||||
|       "original": { | ||||
| @@ -27,11 +27,11 @@ | ||||
|         ] | ||||
|       }, | ||||
|       "locked": { | ||||
|         "lastModified": 1736621371, | ||||
|         "narHash": "sha256-45UIQSQA7R5iU4YWvilo7mQbhY1Liql9bHBvYa3qRI0=", | ||||
|         "lastModified": 1758384693, | ||||
|         "narHash": "sha256-zakdGo9micgEXGiC5Uq0gE5GkHtX12qaRYLcstKPek4=", | ||||
|         "ref": "refs/heads/main", | ||||
|         "rev": "3729796c1213fe76e568ac28f1df8de4e596950b", | ||||
|         "revCount": 20, | ||||
|         "rev": "5f6a462d87cbe25834e8f31283f39fb46c9c3561", | ||||
|         "revCount": 21, | ||||
|         "type": "git", | ||||
|         "url": "https://git.pvv.ntnu.no/Grzegorz/gergle.git" | ||||
|       }, | ||||
| @@ -48,11 +48,11 @@ | ||||
|         "rust-overlay": "rust-overlay" | ||||
|       }, | ||||
|       "locked": { | ||||
|         "lastModified": 1746563623, | ||||
|         "narHash": "sha256-5DxgNFpSgxft/sWraZnHIUlb4S3Io73SVS7FZCbWSUY=", | ||||
|         "lastModified": 1758919016, | ||||
|         "narHash": "sha256-TSJMOWq9dO7P1iQB4httzWwAtpM1veacLcaS7FAyTpo=", | ||||
|         "ref": "refs/heads/main", | ||||
|         "rev": "4e0408887f80e61a90286ff630a7855b828ae421", | ||||
|         "revCount": 45, | ||||
|         "rev": "c87263b784954d20485d108e70934c9316935d75", | ||||
|         "revCount": 51, | ||||
|         "type": "git", | ||||
|         "url": "https://git.pvv.ntnu.no/Grzegorz/greg-ng.git" | ||||
|       }, | ||||
| @@ -88,16 +88,16 @@ | ||||
|         ] | ||||
|       }, | ||||
|       "locked": { | ||||
|         "lastModified": 1735857245, | ||||
|         "narHash": "sha256-AKLLPrgXTxgzll3DqVUMa4QlPlRN3QceutgFBmEf8Nk=", | ||||
|         "lastModified": 1753216555, | ||||
|         "narHash": "sha256-qfgVfgXjVPV7vEER4PVFiGUOUW08GHH71CVXgYW8EVc=", | ||||
|         "owner": "dali99", | ||||
|         "repo": "nixos-matrix-modules", | ||||
|         "rev": "da9dc0479ffe22362793c87dc089035facf6ec4d", | ||||
|         "rev": "099db715d1eba526a464f271b05cead5166fd9a9", | ||||
|         "type": "github" | ||||
|       }, | ||||
|       "original": { | ||||
|         "owner": "dali99", | ||||
|         "ref": "0.7.0", | ||||
|         "ref": "v0.7.1", | ||||
|         "repo": "nixos-matrix-modules", | ||||
|         "type": "github" | ||||
|       } | ||||
| @@ -117,6 +117,26 @@ | ||||
|         "url": "https://git.pvv.ntnu.no/Projects/minecraft-kartverket.git" | ||||
|       } | ||||
|     }, | ||||
|     "minecraft-heatmap": { | ||||
|       "inputs": { | ||||
|         "nixpkgs": [ | ||||
|           "nixpkgs" | ||||
|         ] | ||||
|       }, | ||||
|       "locked": { | ||||
|         "lastModified": 1756124334, | ||||
|         "narHash": "sha256-DXFmSpgI8FrqcdqY7wg5l/lpssWjslHq5ufvyp/5k4o=", | ||||
|         "ref": "refs/heads/main", | ||||
|         "rev": "83760b1ebcd9722ddf58a4117d29555da65538ad", | ||||
|         "revCount": 13, | ||||
|         "type": "git", | ||||
|         "url": "https://git.pvv.ntnu.no/Projects/minecraft-heatmap.git" | ||||
|       }, | ||||
|       "original": { | ||||
|         "type": "git", | ||||
|         "url": "https://git.pvv.ntnu.no/Projects/minecraft-heatmap.git" | ||||
|       } | ||||
|     }, | ||||
|     "nix-gitea-themes": { | ||||
|       "inputs": { | ||||
|         "nixpkgs": [ | ||||
| @@ -139,11 +159,11 @@ | ||||
|     }, | ||||
|     "nixpkgs": { | ||||
|       "locked": { | ||||
|         "lastModified": 1752247770, | ||||
|         "narHash": "sha256-WDk5Sx9JWr8A+EPfkTLEcVNrBlY700rSNH8nm/oaVGY=", | ||||
|         "rev": "739c8f530a2c5e0b9eefc8019d201654264cb974", | ||||
|         "lastModified": 1760254360, | ||||
|         "narHash": "sha256-Npp92Joy2bRyickrrVP9+85z31aGS8kVNiLlKvd5pC4=", | ||||
|         "rev": "bafe987a29b8bea2edbb3aba76b51464b3d222f0", | ||||
|         "type": "tarball", | ||||
|         "url": "https://releases.nixos.org/nixos/25.05-small/nixos-25.05.806236.739c8f530a2c/nixexprs.tar.xz" | ||||
|         "url": "https://releases.nixos.org/nixos/25.05-small/nixos-25.05.811161.bafe987a29b8/nixexprs.tar.xz" | ||||
|       }, | ||||
|       "original": { | ||||
|         "type": "tarball", | ||||
| @@ -152,11 +172,11 @@ | ||||
|     }, | ||||
|     "nixpkgs-unstable": { | ||||
|       "locked": { | ||||
|         "lastModified": 1748588304, | ||||
|         "narHash": "sha256-YCnUqO9k39p0oMIBndxYTbu8m0fOA/KVcq3IekXPy9c=", | ||||
|         "rev": "b8af95f4cf511c5f056b463c3a45d2b63c7cfb03", | ||||
|         "lastModified": 1760252326, | ||||
|         "narHash": "sha256-5v32B25kSE++E+KtP4DO687r/AlWL9qOlOjtYyfcDSw=", | ||||
|         "rev": "66e5020bfe0af40ffa127426f8405edbdadbb40b", | ||||
|         "type": "tarball", | ||||
|         "url": "https://releases.nixos.org/nixos/unstable-small/nixos-25.11pre807945.b8af95f4cf51/nixexprs.tar.xz?rev=b8af95f4cf511c5f056b463c3a45d2b63c7cfb03" | ||||
|         "url": "https://releases.nixos.org/nixos/unstable-small/nixos-25.11pre876242.66e5020bfe0a/nixexprs.tar.xz" | ||||
|       }, | ||||
|       "original": { | ||||
|         "type": "tarball", | ||||
| @@ -170,11 +190,11 @@ | ||||
|         ] | ||||
|       }, | ||||
|       "locked": { | ||||
|         "lastModified": 1723850344, | ||||
|         "narHash": "sha256-aT37O9l9eclWEnqxASVNBL1dKwDHZUOqdbA4VO9DJvw=", | ||||
|         "lastModified": 1742225512, | ||||
|         "narHash": "sha256-OB0ndlrGLE5wMUeYP4lmxly9JUEpPCeZRQyMzITKCB0=", | ||||
|         "ref": "refs/heads/main", | ||||
|         "rev": "38b66677ab8c01aee10cd59e745af9ce3ea88092", | ||||
|         "revCount": 19, | ||||
|         "rev": "c4a6a02c84d8227abf00305dc995d7242176e6f6", | ||||
|         "revCount": 21, | ||||
|         "type": "git", | ||||
|         "url": "https://git.pvv.ntnu.no/Projects/calendar-bot.git" | ||||
|       }, | ||||
| @@ -190,11 +210,11 @@ | ||||
|         ] | ||||
|       }, | ||||
|       "locked": { | ||||
|         "lastModified": 1741738148, | ||||
|         "narHash": "sha256-cJo6nbcJEOjkazkZ194NDnlsZe0W0wpxeUh2/886uC8=", | ||||
|         "lastModified": 1757332682, | ||||
|         "narHash": "sha256-4p4aVQWs7jHu3xb6TJlGik20lqbUU/Fc0/EHpzoRlO0=", | ||||
|         "ref": "refs/heads/main", | ||||
|         "rev": "c1802e7cf27c7cf8b4890354c982a4eef5b11593", | ||||
|         "revCount": 486, | ||||
|         "rev": "da1113341ad9881d8d333d1e29790317bd7701e7", | ||||
|         "revCount": 518, | ||||
|         "type": "git", | ||||
|         "url": "https://git.pvv.ntnu.no/Projects/nettsiden.git" | ||||
|       }, | ||||
| @@ -211,6 +231,7 @@ | ||||
|         "grzegorz-clients": "grzegorz-clients", | ||||
|         "matrix-next": "matrix-next", | ||||
|         "minecraft-data": "minecraft-data", | ||||
|         "minecraft-heatmap": "minecraft-heatmap", | ||||
|         "nix-gitea-themes": "nix-gitea-themes", | ||||
|         "nixpkgs": "nixpkgs", | ||||
|         "nixpkgs-unstable": "nixpkgs-unstable", | ||||
| @@ -227,11 +248,11 @@ | ||||
|         ] | ||||
|       }, | ||||
|       "locked": { | ||||
|         "lastModified": 1746498961, | ||||
|         "narHash": "sha256-rp+oh/N88JKHu7ySPuGiA3lBUVIsrOtHbN2eWJdYCgk=", | ||||
|         "lastModified": 1758335443, | ||||
|         "narHash": "sha256-2jaGMj32IckpZgBjn7kG4zyJl66T+2A1Fn2ppkHh91o=", | ||||
|         "owner": "oxalica", | ||||
|         "repo": "rust-overlay", | ||||
|         "rev": "24b00064cdd1d7ba25200c4a8565dc455dc732ba", | ||||
|         "rev": "f1ccb14649cf87e48051a6ac3a571b4a57d84ff3", | ||||
|         "type": "github" | ||||
|       }, | ||||
|       "original": { | ||||
| @@ -247,11 +268,11 @@ | ||||
|         ] | ||||
|       }, | ||||
|       "locked": { | ||||
|         "lastModified": 1745310711, | ||||
|         "narHash": "sha256-ePyTpKEJTgX0gvgNQWd7tQYQ3glIkbqcW778RpHlqgA=", | ||||
|         "lastModified": 1760240450, | ||||
|         "narHash": "sha256-sa9bS9jSyc4vH0jSWrUsPGdqtMvDwmkLg971ntWOo2U=", | ||||
|         "owner": "Mic92", | ||||
|         "repo": "sops-nix", | ||||
|         "rev": "5e3e92b16d6fdf9923425a8d4df7496b2434f39c", | ||||
|         "rev": "41fd1f7570c89f645ee0ada0be4e2d3c4b169549", | ||||
|         "type": "github" | ||||
|       }, | ||||
|       "original": { | ||||
|   | ||||
							
								
								
									
										59
									
								
								flake.nix
									
									
									
									
									
								
							
							
						
						
									
										59
									
								
								flake.nix
									
									
									
									
									
								
							| @@ -17,12 +17,15 @@ | ||||
|     pvv-calendar-bot.url = "git+https://git.pvv.ntnu.no/Projects/calendar-bot.git"; | ||||
|     pvv-calendar-bot.inputs.nixpkgs.follows = "nixpkgs"; | ||||
|  | ||||
|     matrix-next.url = "github:dali99/nixos-matrix-modules/0.7.0"; | ||||
|     matrix-next.url = "github:dali99/nixos-matrix-modules/v0.7.1"; | ||||
|     matrix-next.inputs.nixpkgs.follows = "nixpkgs"; | ||||
|  | ||||
|     nix-gitea-themes.url = "git+https://git.pvv.ntnu.no/Drift/nix-gitea-themes.git"; | ||||
|     nix-gitea-themes.inputs.nixpkgs.follows = "nixpkgs"; | ||||
|  | ||||
|     minecraft-heatmap.url = "git+https://git.pvv.ntnu.no/Projects/minecraft-heatmap.git"; | ||||
|     minecraft-heatmap.inputs.nixpkgs.follows = "nixpkgs"; | ||||
|  | ||||
|     greg-ng.url = "git+https://git.pvv.ntnu.no/Grzegorz/greg-ng.git"; | ||||
|     greg-ng.inputs.nixpkgs.follows = "nixpkgs"; | ||||
|     gergle.url = "git+https://git.pvv.ntnu.no/Grzegorz/gergle.git"; | ||||
| @@ -55,47 +58,62 @@ | ||||
|  | ||||
|     nixosConfigurations = let | ||||
|       unstablePkgs = nixpkgs-unstable.legacyPackages.x86_64-linux; | ||||
|       nixosConfig = nixpkgs: name: config: lib.nixosSystem (lib.recursiveUpdate | ||||
|         rec { | ||||
|  | ||||
|       nixosConfig = | ||||
|         nixpkgs: | ||||
|         name: | ||||
|         configurationPath: | ||||
|         extraArgs: | ||||
|         lib.nixosSystem (lib.recursiveUpdate | ||||
|         (let | ||||
|           system = "x86_64-linux"; | ||||
|         in { | ||||
|           inherit system; | ||||
|  | ||||
|           specialArgs = { | ||||
|             inherit unstablePkgs inputs; | ||||
|             values = import ./values.nix; | ||||
|             fp = path: ./${path}; | ||||
|           }; | ||||
|           } // extraArgs.specialArgs or { }; | ||||
|  | ||||
|           modules = [ | ||||
|             ./hosts/${name}/configuration.nix | ||||
|             configurationPath | ||||
|             sops-nix.nixosModules.sops | ||||
|           ] ++ config.modules or []; | ||||
|           ] ++ extraArgs.modules or []; | ||||
|  | ||||
|           pkgs = import nixpkgs { | ||||
|             inherit system; | ||||
|             config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) | ||||
|             extraArgs.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) | ||||
|               [ | ||||
|                 "nvidia-x11" | ||||
|                 "nvidia-settings" | ||||
|               ]; | ||||
|             overlays = [ | ||||
|               # Global overlays go here | ||||
|             ] ++ config.overlays or [ ]; | ||||
|             ] ++ extraArgs.overlays or [ ]; | ||||
|           }; | ||||
|         } | ||||
|         (removeAttrs config [ "modules" "overlays" ]) | ||||
|         }) | ||||
|         (builtins.removeAttrs extraArgs [ | ||||
|           "modules" | ||||
|           "overlays" | ||||
|           "specialArgs" | ||||
|         ]) | ||||
|       ); | ||||
|  | ||||
|       stableNixosConfig = nixosConfig nixpkgs; | ||||
|       unstableNixosConfig = nixosConfig nixpkgs-unstable; | ||||
|       stableNixosConfig = name: extraArgs: | ||||
|           nixosConfig nixpkgs name ./hosts/${name}/configuration.nix extraArgs; | ||||
|     in { | ||||
|       bicep = stableNixosConfig "bicep" { | ||||
|         modules = [ | ||||
|           inputs.matrix-next.nixosModules.default | ||||
|           inputs.pvv-calendar-bot.nixosModules.default | ||||
|           inputs.minecraft-heatmap.nixosModules.default | ||||
|           self.nixosModules.gickup | ||||
|           self.nixosModules.matrix-ooye | ||||
|         ]; | ||||
|         overlays = [ | ||||
|           inputs.pvv-calendar-bot.overlays.x86_64-linux.default | ||||
|           inputs.minecraft-heatmap.overlays.default | ||||
|           (final: prev: { | ||||
|             inherit (self.packages.${prev.system}) out-of-your-element; | ||||
|           }) | ||||
| @@ -115,12 +133,6 @@ | ||||
|           inputs.pvv-nettsiden.nixosModules.default | ||||
|         ]; | ||||
|       }; | ||||
|       bob = stableNixosConfig "bob" { | ||||
|         modules = [ | ||||
|           disko.nixosModules.disko | ||||
|           { disko.devices.disk.disk1.device = "/dev/vda"; } | ||||
|         ]; | ||||
|       }; | ||||
|       ildkule = stableNixosConfig "ildkule" { }; | ||||
|       #ildkule-unstable = unstableNixosConfig "ildkule" { }; | ||||
|       shark = stableNixosConfig "shark" { }; | ||||
| @@ -163,7 +175,16 @@ | ||||
|           inputs.gergle.overlays.default | ||||
|         ]; | ||||
|       }; | ||||
|     }; | ||||
|     } | ||||
|     // | ||||
|     (let | ||||
|       machineNames = map (i: "lupine-${toString i}") (lib.range 1 5); | ||||
|       stableLupineNixosConfig = name: extraArgs: | ||||
|           nixosConfig nixpkgs name ./hosts/lupine/configuration.nix extraArgs; | ||||
|     in lib.genAttrs machineNames (name: stableLupineNixosConfig name { | ||||
|       modules = [{ networking.hostName = name; }]; | ||||
|       specialArgs.lupineName = name; | ||||
|     })); | ||||
|  | ||||
|     nixosModules = { | ||||
|       snakeoil-certs = ./modules/snakeoil-certs.nix; | ||||
|   | ||||
| @@ -9,6 +9,7 @@ | ||||
|  | ||||
|     ./services/calendar-bot.nix | ||||
|     ./services/git-mirrors | ||||
|     ./services/minecraft-heatmap.nix | ||||
|     ./services/mysql.nix | ||||
|     ./services/postgres.nix | ||||
|  | ||||
|   | ||||
| @@ -77,7 +77,7 @@ in | ||||
|         outbound = true; | ||||
|         urlPrefix = "https://hookshot.pvv.ntnu.no/webhook/"; | ||||
|         userIdPrefix = "_webhooks_"; | ||||
|         allowJsTransformationFunctions = false; | ||||
|         allowJsTransformationFunctions = true; | ||||
|         waitForComplete = false; | ||||
|       }; | ||||
|       feeds = { | ||||
| @@ -94,6 +94,11 @@ in | ||||
|         } | ||||
|       ]; | ||||
|  | ||||
|       widgets = { | ||||
|         roomSetupWidget.addOnInvite = false; | ||||
|         publicUrl = "https://hookshot.pvv.ntnu.no/widgetapi/v1/static"; | ||||
|       }; | ||||
|  | ||||
|       permissions = [ | ||||
|         # Users of the PVV Server | ||||
|         { actor = "pvv.ntnu.no"; | ||||
| @@ -128,6 +133,7 @@ in | ||||
|  | ||||
|   services.nginx.virtualHosts."hookshot.pvv.ntnu.no" = { | ||||
|     enableACME = true; | ||||
|     addSSL = true; | ||||
|     locations."/" = { | ||||
|       proxyPass = "http://${webhookListenAddress}:${toString webhookListenPort}"; | ||||
|     }; | ||||
|   | ||||
							
								
								
									
										49
									
								
								hosts/bicep/services/minecraft-heatmap.nix
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										49
									
								
								hosts/bicep/services/minecraft-heatmap.nix
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,49 @@ | ||||
| { config, lib, pkgs, ... }: | ||||
| let | ||||
|   cfg = config.services.minecraft-heatmap; | ||||
| in | ||||
| { | ||||
|   sops.secrets."minecraft-heatmap/ssh-key/private" = { | ||||
|     mode = "600"; | ||||
|   }; | ||||
|  | ||||
|   sops.secrets."minecraft-heatmap/postgres-passwd" = { | ||||
|     mode = "600"; | ||||
|   }; | ||||
|  | ||||
|   services.minecraft-heatmap = { | ||||
|     enable = true; | ||||
|     database = { | ||||
|       host = "postgres.pvv.ntnu.no"; | ||||
|       port = 5432; | ||||
|       name = "minecraft_heatmap"; | ||||
|       user = "minecraft_heatmap"; | ||||
|       passwordFile = config.sops.secrets."minecraft-heatmap/postgres-passwd".path; | ||||
|     }; | ||||
|   }; | ||||
|  | ||||
|   systemd.services.minecraft-heatmap-ingest-logs = { | ||||
|     serviceConfig.LoadCredential = [ | ||||
|       "sshkey:${config.sops.secrets."minecraft-heatmap/ssh-key/private".path}" | ||||
|     ]; | ||||
|  | ||||
|     preStart = let | ||||
|       knownHostsFile = pkgs.writeText "minecraft-heatmap-known-hosts" '' | ||||
|         innovation.pvv.ntnu.no ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE9O/y5uqcLKCodg2Q+XfZPH/AoUIyBlDhigImU+4+Kn | ||||
|         innovation.pvv.ntnu.no ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQClR9GvWeVPZHudlnFXhGHUX5sGX9nscsOsotnlQ4uVuGsgvRifsVsuDULlAFXwoV1tYp4vnyXlsVtMddpLI5ANOIDcZ4fgDxpfSQmtHKssNpDcfMhFJbfRVyacipjA4osxTxvLox/yjtVt+URjTHUA1MWzEwc26KfiOvWO5tCBTan7doN/4KOyT05GwBxwzUAwUmoGTacIITck2Y9qp4+xFYqehbXqPdBb15hFyd38OCQhtU1hWV2Yi18+hJ4nyjc/g5pr6mW09ULlFghe/BaTUXrTisYC6bMcJZsTDwsvld9581KPvoNZOTQhZPTEQCZZ1h54fe0ZHuveVB3TIHovZyjoUuaf4uiFOjJVaKRB+Ig+Il6r7tMUn9CyHtus/Nd86E0TFBzoKxM0OFu88oaUlDtZVrUJL5En1lGoimajebb1JPxllFN5hqIT+gVyMY6nRzkcfS7ieny/U4rzXY2rfz98selftgh3LsBywwADv65i+mPw1A/1QdND1R6fV4U= | ||||
|         innovation.pvv.ntnu.no ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBNjl3HfsDqmALWCL9uhz9k93RAD2565ndBqUh4N/rvI7MCwEJ6iRCdDev0YzB1Fpg24oriyYoxZRP24ifC2sQf8= | ||||
|       ''; | ||||
|     in '' | ||||
|       mkdir -p '${cfg.minecraftLogsDir}' | ||||
|       "${lib.getExe pkgs.rsync}" \ | ||||
|       --archive \ | ||||
|       --verbose \ | ||||
|       --progress \ | ||||
|       --no-owner \ | ||||
|       --no-group \ | ||||
|       --rsh="${pkgs.openssh}/bin/ssh -o UserKnownHostsFile=\"${knownHostsFile}\" -i \"$CREDENTIALS_DIRECTORY\"/sshkey" \ | ||||
|       root@innovation.pvv.ntnu.no:/ \ | ||||
|       '${cfg.minecraftLogsDir}'/ | ||||
|     ''; | ||||
|   }; | ||||
| } | ||||
| @@ -1,46 +0,0 @@ | ||||
| { config, fp, pkgs, values, ... }: | ||||
| { | ||||
|   imports = [ | ||||
|       # Include the results of the hardware scan. | ||||
|       ./hardware-configuration.nix | ||||
|       (fp /base) | ||||
|       (fp /misc/metrics-exporters.nix) | ||||
|       ./disks.nix | ||||
|  | ||||
|       (fp /misc/builder.nix) | ||||
|     ]; | ||||
|  | ||||
|   sops.defaultSopsFile = fp /secrets/bob/bob.yaml; | ||||
|   sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; | ||||
|   sops.age.keyFile = "/var/lib/sops-nix/key.txt"; | ||||
|   sops.age.generateKey = true; | ||||
|  | ||||
|   boot.loader.grub = { | ||||
|     enable = true; | ||||
|     efiSupport = true; | ||||
|     efiInstallAsRemovable = true; | ||||
|   }; | ||||
|  | ||||
|   networking.hostName = "bob"; # Define your hostname. | ||||
|  | ||||
|   systemd.network.networks."30-all" = values.defaultNetworkConfig // { | ||||
|     matchConfig.Name = "en*"; | ||||
|     DHCP = "yes"; | ||||
|     gateway = [ ]; | ||||
|   }; | ||||
|  | ||||
|   # List packages installed in system profile | ||||
|   environment.systemPackages = with pkgs; [ | ||||
|   ]; | ||||
|  | ||||
|   # List services that you want to enable: | ||||
|  | ||||
|   # 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.05"; # Did you read the comment? | ||||
|  | ||||
| } | ||||
| @@ -1,39 +0,0 @@ | ||||
| # Example to create a bios compatible gpt partition | ||||
| { lib, ... }: | ||||
| { | ||||
|   disko.devices = { | ||||
|     disk.disk1 = { | ||||
|       device = lib.mkDefault "/dev/sda"; | ||||
|       type = "disk"; | ||||
|       content = { | ||||
|         type = "gpt"; | ||||
|         partitions = { | ||||
|           boot = { | ||||
|             name = "boot"; | ||||
|             size = "1M"; | ||||
|             type = "EF02"; | ||||
|           }; | ||||
|           esp = { | ||||
|             name = "ESP"; | ||||
|             size = "500M"; | ||||
|             type = "EF00"; | ||||
|             content = { | ||||
|               type = "filesystem"; | ||||
|               format = "vfat"; | ||||
|               mountpoint = "/boot"; | ||||
|             }; | ||||
|           }; | ||||
|           root = { | ||||
|             name = "root"; | ||||
|             size = "100%"; | ||||
|             content = { | ||||
|               type = "filesystem"; | ||||
|               format = "ext4"; | ||||
|               mountpoint = "/"; | ||||
|             }; | ||||
|           }; | ||||
|         }; | ||||
|       }; | ||||
|     }; | ||||
|   }; | ||||
| } | ||||
| @@ -8,7 +8,7 @@ | ||||
|  | ||||
|       (fp /modules/grzegorz.nix) | ||||
|     ]; | ||||
|   services.spotifyd.enable = true; | ||||
|  | ||||
|   boot.loader.systemd-boot.enable = true; | ||||
|   boot.loader.efi.canTouchEfiVariables = true; | ||||
|  | ||||
| @@ -25,6 +25,26 @@ | ||||
|  | ||||
|   # List services that you want to enable: | ||||
|  | ||||
|  | ||||
|  | ||||
|   services.spotifyd = { | ||||
|     enable = true; | ||||
|     settings.global = { | ||||
|       device_name = "georg"; | ||||
|       use_mpris = false; | ||||
|       #dbus_type = "system"; | ||||
|       #zeroconf_port = 1234; | ||||
|     }; | ||||
|   }; | ||||
|  | ||||
|   networking.firewall.allowedTCPPorts = [ | ||||
|     # config.services.spotifyd.settings.zeroconf_port | ||||
|     5353 # spotifyd is its own mDNS service wtf | ||||
|   ]; | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
|   # 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 | ||||
|   | ||||
| @@ -2,11 +2,12 @@ | ||||
|   stateDir = "/data/monitoring/prometheus"; | ||||
| in { | ||||
|   imports = [ | ||||
|     ./exim.nix | ||||
|     ./gitea.nix | ||||
|     ./machines.nix | ||||
|     ./matrix-synapse.nix | ||||
|     ./mysqld.nix | ||||
|     ./postgres.nix | ||||
|     ./machines.nix | ||||
|   ]; | ||||
|  | ||||
|   services.prometheus = { | ||||
|   | ||||
							
								
								
									
										14
									
								
								hosts/ildkule/services/monitoring/prometheus/exim.nix
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										14
									
								
								hosts/ildkule/services/monitoring/prometheus/exim.nix
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,14 @@ | ||||
| { ... }: | ||||
| { | ||||
|   services.prometheus = { | ||||
|     scrapeConfigs = [ | ||||
|       { | ||||
|         job_name = "exim"; | ||||
|         scrape_interval = "15s"; | ||||
|         static_configs = [{ | ||||
|           targets = [ "microbel.pvv.ntnu.no:9636" ]; | ||||
|         }]; | ||||
|       } | ||||
|     ]; | ||||
|   }; | ||||
| } | ||||
| @@ -1,66 +1,37 @@ | ||||
| { config, ... }: let | ||||
|   cfg = config.services.prometheus; | ||||
|  | ||||
|   mkHostScrapeConfig = name: ports: { | ||||
|     labels.hostname = name; | ||||
|     targets = map (port: "${name}.pvv.ntnu.no:${toString port}") ports; | ||||
|   }; | ||||
|  | ||||
|   defaultNodeExporterPort = 9100; | ||||
|   defaultSystemdExporterPort = 9101; | ||||
|   defaultNixosExporterPort = 9102; | ||||
| in { | ||||
|   services.prometheus.scrapeConfigs = [{ | ||||
|     job_name = "base_info"; | ||||
|     static_configs = [ | ||||
|       { labels.hostname = "ildkule"; | ||||
|         targets = [ | ||||
|           "ildkule.pvv.ntnu.no:${toString cfg.exporters.node.port}" | ||||
|           "ildkule.pvv.ntnu.no:${toString cfg.exporters.systemd.port}" | ||||
|         ]; | ||||
|       } | ||||
|       { labels.hostname = "bekkalokk"; | ||||
|         targets = [ | ||||
|           "bekkalokk.pvv.ntnu.no:9100" | ||||
|           "bekkalokk.pvv.ntnu.no:9101" | ||||
|         ]; | ||||
|       } | ||||
|       { labels.hostname = "kommode"; | ||||
|         targets = [ | ||||
|           "kommode.pvv.ntnu.no:9100" | ||||
|           "kommode.pvv.ntnu.no:9101" | ||||
|         ]; | ||||
|       } | ||||
|       { labels.hostname = "bicep"; | ||||
|         targets = [ | ||||
|           "bicep.pvv.ntnu.no:9100" | ||||
|           "bicep.pvv.ntnu.no:9101" | ||||
|         ]; | ||||
|       } | ||||
|       { labels.hostname = "brzeczyszczykiewicz"; | ||||
|         targets = [ | ||||
|           "brzeczyszczykiewicz.pvv.ntnu.no:9100" | ||||
|           "brzeczyszczykiewicz.pvv.ntnu.no:9101" | ||||
|         ]; | ||||
|       } | ||||
|       { labels.hostname = "georg"; | ||||
|         targets = [ | ||||
|           "georg.pvv.ntnu.no:9100" | ||||
|           "georg.pvv.ntnu.no:9101" | ||||
|         ]; | ||||
|       } | ||||
|       { labels.hostname = "ustetind"; | ||||
|         targets = [ | ||||
|           "ustetind.pvv.ntnu.no:9100" | ||||
|           "ustetind.pvv.ntnu.no:9101" | ||||
|         ]; | ||||
|       } | ||||
|       { labels.hostname =  "hildring"; | ||||
|         targets = [ | ||||
|           "hildring.pvv.ntnu.no:9100" | ||||
|         ]; | ||||
|       } | ||||
|       { labels.hostname =  "isvegg"; | ||||
|         targets = [ | ||||
|           "isvegg.pvv.ntnu.no:9100" | ||||
|         ]; | ||||
|       } | ||||
|       { labels.hostname =  "microbel"; | ||||
|         targets = [ | ||||
|           "microbel.pvv.ntnu.no:9100" | ||||
|         ]; | ||||
|       } | ||||
|       (mkHostScrapeConfig "ildkule" [ cfg.exporters.node.port cfg.exporters.systemd.port defaultNixosExporterPort ]) | ||||
|  | ||||
|       (mkHostScrapeConfig "bekkalokk" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ]) | ||||
|       (mkHostScrapeConfig "bicep" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ]) | ||||
|       (mkHostScrapeConfig "brzeczyszczykiewicz" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ]) | ||||
|       (mkHostScrapeConfig "georg" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ]) | ||||
|       (mkHostScrapeConfig "kommode" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ]) | ||||
|       (mkHostScrapeConfig "ustetind" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ]) | ||||
|       (mkHostScrapeConfig "wenche" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ]) | ||||
|  | ||||
|       (mkHostScrapeConfig "lupine-1" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ]) | ||||
|       # (mkHostScrapeConfig "lupine-2" [ defaultNodeExporterPort defaultSystemdExporterPort ]) | ||||
|       (mkHostScrapeConfig "lupine-3" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ]) | ||||
|       (mkHostScrapeConfig "lupine-4" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ]) | ||||
|       (mkHostScrapeConfig "lupine-5" [ defaultNodeExporterPort defaultSystemdExporterPort defaultNixosExporterPort ]) | ||||
|  | ||||
|       (mkHostScrapeConfig "hildring" [ defaultNodeExporterPort ]) | ||||
|       (mkHostScrapeConfig "isvegg" [ defaultNodeExporterPort ]) | ||||
|       (mkHostScrapeConfig "microbel" [ defaultNodeExporterPort ]) | ||||
|     ]; | ||||
|   }]; | ||||
| } | ||||
|   | ||||
| @@ -1,4 +1,4 @@ | ||||
| { config, values, lib, unstablePkgs, ... }: | ||||
| { config, values, lib, pkgs, unstablePkgs, ... }: | ||||
| let | ||||
|   cfg = config.services.gitea; | ||||
|   domain = "git.pvv.ntnu.no"; | ||||
| @@ -8,18 +8,21 @@ in { | ||||
|     ./customization | ||||
|     ./gpg.nix | ||||
|     ./import-users | ||||
|     ./vaskepersonalet.nix | ||||
|     ./web-secret-provider | ||||
|   ]; | ||||
|  | ||||
|   sops.secrets = { | ||||
|     "gitea/database" = { | ||||
|       owner = "gitea"; | ||||
|       group = "gitea"; | ||||
|     }; | ||||
|     "gitea/email-password" = { | ||||
|   sops.secrets = let | ||||
|     defaultConfig = { | ||||
|       owner = "gitea"; | ||||
|       group = "gitea"; | ||||
|     }; | ||||
|   in { | ||||
|     "gitea/database" = defaultConfig; | ||||
|     "gitea/email-password" = defaultConfig; | ||||
|     "gitea/lfs-jwt-secret" = defaultConfig; | ||||
|     "gitea/oauth2-jwt-secret" = defaultConfig; | ||||
|     "gitea/secret-key" = defaultConfig; | ||||
|   }; | ||||
|  | ||||
|   services.gitea = { | ||||
| @@ -45,9 +48,15 @@ in { | ||||
|         ROOT_URL = "https://${domain}/"; | ||||
|         PROTOCOL = "http+unix"; | ||||
|         SSH_PORT = sshPort; | ||||
|         LANDING_PAGE = "explore"; | ||||
|         START_SSH_SERVER = true; | ||||
|         START_LFS_SERVER = true; | ||||
|         LANDING_PAGE = "explore"; | ||||
|         LFS_JWT_SECRET = lib.mkForce ""; | ||||
|         LFS_JWT_SECRET_URI = "file:${config.sops.secrets."gitea/lfs-jwt-secret".path}"; | ||||
|       }; | ||||
|       oauth2 = { | ||||
|         JWT_SECRET = lib.mkForce ""; | ||||
|         JWT_SECRET_URI = "file:${config.sops.secrets."gitea/oauth2-jwt-secret".path}"; | ||||
|       }; | ||||
|       "git.timeout" = { | ||||
|         MIGRATE = 3600; | ||||
| @@ -75,6 +84,10 @@ in { | ||||
|       }; | ||||
|       admin.DEFAULT_EMAIL_NOTIFICATIONS = "onmention"; | ||||
|       session.COOKIE_SECURE = true; | ||||
|       security = { | ||||
|         SECRET_KEY = lib.mkForce ""; | ||||
|         SECRET_KEY_URI = "file:${config.sops.secrets."gitea/secret-key".path}"; | ||||
|       }; | ||||
|       database.LOG_SQL = false; | ||||
|       repository = { | ||||
|         PREFERRED_LICENSES = lib.concatStringsSep "," [ | ||||
| @@ -147,8 +160,17 @@ in { | ||||
|  | ||||
|   environment.systemPackages = [ cfg.package ]; | ||||
|  | ||||
|   systemd.services.gitea.serviceConfig.Type = lib.mkForce "notify"; | ||||
|  | ||||
|   systemd.services.gitea.serviceConfig.WatchdogSec = "60"; | ||||
|  | ||||
|   systemd.services.gitea.serviceConfig.CPUSchedulingPolicy = "batch"; | ||||
|  | ||||
|   systemd.services.gitea.serviceConfig.CacheDirectory = "gitea/repo-archive"; | ||||
|   systemd.services.gitea.serviceConfig.BindPaths = [ | ||||
|     "%C/gitea/repo-archive:${cfg.stateDir}/data/repo-archive" | ||||
|   ]; | ||||
|  | ||||
|   services.nginx.virtualHosts."${domain}" = { | ||||
|     forceSSL = true; | ||||
|     enableACME = true; | ||||
| @@ -172,4 +194,31 @@ in { | ||||
|   }; | ||||
|  | ||||
|   networking.firewall.allowedTCPPorts = [ sshPort ]; | ||||
|  | ||||
|   systemd.services.gitea-dump = { | ||||
|     serviceConfig.ExecStart = let | ||||
|       args = lib.cli.toGNUCommandLineShell { } { | ||||
|         type = cfg.dump.type; | ||||
|  | ||||
|         # This should be declarative on nixos, no need to backup. | ||||
|         skip-custom-dir = true; | ||||
|  | ||||
|         # This can be regenerated, no need to backup | ||||
|         skip-index = true; | ||||
|  | ||||
|         # Logs are stored in the systemd journal | ||||
|         skip-log = true; | ||||
|       }; | ||||
|     in lib.mkForce "${lib.getExe cfg.package} ${args}"; | ||||
|  | ||||
|     # Only keep n backup files at a time | ||||
|     postStop = let | ||||
|       cu = prog: "'${lib.getExe' pkgs.coreutils prog}'"; | ||||
|       backupCount = 3; | ||||
|     in '' | ||||
|       for file in $(${cu "ls"} -t1 '${cfg.dump.backupDir}' | ${cu "sort"} --reverse | ${cu "tail"} -n+${toString (backupCount + 1)}); do | ||||
|         ${cu "rm"} "$file" | ||||
|       done | ||||
|       ''; | ||||
|   }; | ||||
| } | ||||
|   | ||||
| @@ -11,7 +11,8 @@ in | ||||
|  | ||||
|   systemd.services.gitea-import-users = lib.mkIf cfg.enable { | ||||
|     enable = true; | ||||
|     preStart=''${pkgs.rsync}/bin/rsync -e "${pkgs.openssh}/bin/ssh -o UserKnownHostsFile=$CREDENTIALS_DIRECTORY/ssh-known-hosts -i $CREDENTIALS_DIRECTORY/sshkey" -a pvv@smtp.pvv.ntnu.no:/etc/passwd /tmp/passwd-import''; | ||||
|     preStart=''${pkgs.rsync}/bin/rsync -e "${pkgs.openssh}/bin/ssh -o UserKnownHostsFile=$CREDENTIALS_DIRECTORY/ssh-known-hosts -i $CREDENTIALS_DIRECTORY/sshkey" -a pvv@smtp.pvv.ntnu.no:/etc/passwd /run/gitea-import-users/passwd''; | ||||
|     environment.PASSWD_FILE_PATH = "/run/gitea-import-users/passwd"; | ||||
|     serviceConfig = { | ||||
|       ExecStart = pkgs.writers.writePython3 "gitea-import-users" { | ||||
|         flakeIgnore = [ | ||||
| @@ -25,6 +26,7 @@ in | ||||
|       ]; | ||||
|       DynamicUser="yes"; | ||||
|       EnvironmentFile=config.sops.secrets."gitea/import-user-env".path; | ||||
|       RuntimeDirectory = "gitea-import-users"; | ||||
|     }; | ||||
|   }; | ||||
|  | ||||
|   | ||||
| @@ -17,6 +17,10 @@ GITEA_API_URL = os.getenv('GITEA_API_URL') | ||||
| if GITEA_API_URL is None: | ||||
|     GITEA_API_URL = 'https://git.pvv.ntnu.no/api/v1' | ||||
|  | ||||
| PASSWD_FILE_PATH = os.getenv('PASSWD_FILE_PATH') | ||||
| if PASSWD_FILE_PATH is None: | ||||
|     PASSWD_FILE_PATH = '/tmp/passwd-import' | ||||
|  | ||||
|  | ||||
| def gitea_list_all_users() -> dict[str, dict[str, any]] | None: | ||||
|     r = requests.get( | ||||
| @@ -187,7 +191,8 @@ def main(): | ||||
|     if existing_users is None: | ||||
|         exit(1) | ||||
|  | ||||
|     for username, name in passwd_file_parser("/tmp/passwd-import"): | ||||
|     print(f"Reading passwd entries from {PASSWD_FILE_PATH}") | ||||
|     for username, name in passwd_file_parser(PASSWD_FILE_PATH): | ||||
|         print(f"Processing {username}") | ||||
|         add_or_patch_gitea_user(username, name, existing_users) | ||||
|         for org, team_name in COMMON_USER_TEAMS: | ||||
|   | ||||
							
								
								
									
										59
									
								
								hosts/kommode/services/gitea/vaskepersonalet.nix
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										59
									
								
								hosts/kommode/services/gitea/vaskepersonalet.nix
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,59 @@ | ||||
| { config, ... }: | ||||
| let | ||||
|   cfg = config.services.gitea; | ||||
|   cacheDir = "/var/cache/${config.systemd.services.gitea.serviceConfig.CacheDirectory}"; | ||||
| in | ||||
| { | ||||
|   systemd.services."gitea-vaskepersonalet" = { | ||||
|     description = "yeeet"; | ||||
|     startAt = "hourly"; | ||||
|  | ||||
|     serviceConfig = rec { | ||||
|       User = cfg.user; | ||||
|       Group = cfg.group; | ||||
|  | ||||
|       RuntimeDirectory = "gitea-vaskepersonalet"; | ||||
|       RootDirectory = "/run/${RuntimeDirectory}"; | ||||
|  | ||||
|       BindPaths = [ | ||||
|         builtins.storeDir | ||||
|         cacheDir | ||||
|         cfg.dump.backupDir | ||||
|       ]; | ||||
|     }; | ||||
|  | ||||
|     script = let | ||||
|       percentageLimit = 80; | ||||
|     in '' | ||||
|       USED=$(df --output=pcent '${cacheDir}' | grep '[0-9]' | tr -d '%') | ||||
|       if [[ $USED -lt ${toString percentageLimit} ]]; then exit 0; fi | ||||
|  | ||||
|       echo "omg omg, we're running out of space, imma yeet the cache" | ||||
|  | ||||
|       rm -rf '${cacheDir}'/* | ||||
|       echo "yeetus deletus" | ||||
|  | ||||
|       USED=$(df --output=pcent '${cacheDir}' | grep '[0-9]' | tr -d '%') | ||||
|       if [[ $USED -lt ${toString percentageLimit} ]]; then exit 0; fi | ||||
|  | ||||
|       echo "" | ||||
|       echo "bruh, still low on space, yeeting old backups" | ||||
|       echo "" | ||||
|  | ||||
|       # tail -n+2 ensure we keep at least one backup. | ||||
|       for file in $(ls -t1 '${cfg.dump.backupDir}' | sort --reverse | tail -n+2); do | ||||
|         echo "> Chose $file" | ||||
|         echo "> Do you really want to release this pokemon? [Y/n] Y" | ||||
|         rm "$file" | ||||
|         echo "> ..." | ||||
|         echo "> The pokemon was released back into the wild" | ||||
|         echo "" | ||||
|  | ||||
|         USED=$(df --output=pcent '${cacheDir}' | grep '[0-9]' | tr -d '%') | ||||
|         if [[ $USED -lt ${toString percentageLimit} ]]; then exit 0; fi | ||||
|       done | ||||
|  | ||||
|       echo "No way, we're still out of space? Not my problem anymore" | ||||
|     ''; | ||||
|   }; | ||||
| } | ||||
							
								
								
									
										35
									
								
								hosts/lupine/configuration.nix
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										35
									
								
								hosts/lupine/configuration.nix
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,35 @@ | ||||
| { fp, values, lupineName, ... }: | ||||
| { | ||||
|   imports = [ | ||||
|     ./hardware-configuration/${lupineName}.nix | ||||
|  | ||||
|     (fp /base) | ||||
|     (fp /misc/metrics-exporters.nix) | ||||
|  | ||||
|     ./services/gitea-runner.nix | ||||
|   ]; | ||||
|  | ||||
|   sops.defaultSopsFile = fp /secrets/lupine/lupine.yaml; | ||||
|   sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; | ||||
|   sops.age.keyFile = "/var/lib/sops-nix/key.txt"; | ||||
|   sops.age.generateKey = true; | ||||
|  | ||||
|   boot.loader.systemd-boot.enable = true; | ||||
|   boot.loader.efi.canTouchEfiVariables = true; | ||||
|  | ||||
|   systemd.network.networks."30-enp0s31f6" = values.defaultNetworkConfig // { | ||||
|     matchConfig.Name = "enp0s31f6"; | ||||
|     address = with values.hosts.${lupineName}; [ (ipv4 + "/25") (ipv6 + "/64") ]; | ||||
|     networkConfig.LLDP = false; | ||||
|   }; | ||||
|   systemd.network.wait-online = { | ||||
|     anyInterface = true; | ||||
|   }; | ||||
|  | ||||
|   # There are no smart devices | ||||
|   services.smartd.enable = false; | ||||
|  | ||||
|   # Do not change, even during upgrades. | ||||
|   # See https://search.nixos.org/options?show=system.stateVersion | ||||
|   system.stateVersion = "25.05"; | ||||
| } | ||||
							
								
								
									
										40
									
								
								hosts/lupine/hardware-configuration/lupine-1.nix
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										40
									
								
								hosts/lupine/hardware-configuration/lupine-1.nix
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,40 @@ | ||||
| # 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" "usbhid" "sd_mod" ]; | ||||
|   boot.initrd.kernelModules = [ ]; | ||||
|   boot.kernelModules = [ "kvm-intel" ]; | ||||
|   boot.extraModulePackages = [ ]; | ||||
|  | ||||
|   fileSystems."/" = | ||||
|     { device = "/dev/disk/by-uuid/a949e2e8-d973-4925-83e4-bcd815e65af7"; | ||||
|       fsType = "ext4"; | ||||
|     }; | ||||
|  | ||||
|   fileSystems."/boot" = | ||||
|     { device = "/dev/disk/by-uuid/81D6-38D3"; | ||||
|       fsType = "vfat"; | ||||
|       options = [ "fmask=0077" "dmask=0077" ]; | ||||
|     }; | ||||
|  | ||||
|   swapDevices = | ||||
|     [ { device = "/dev/disk/by-uuid/82c2d7fa-7cd0-4398-8cf6-c892bc56264b"; } | ||||
|     ]; | ||||
|  | ||||
|   # 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.enp0s31f6.useDHCP = lib.mkDefault true; | ||||
|  | ||||
|   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; | ||||
|   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; | ||||
| } | ||||
							
								
								
									
										40
									
								
								hosts/lupine/hardware-configuration/lupine-2.nix
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										40
									
								
								hosts/lupine/hardware-configuration/lupine-2.nix
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,40 @@ | ||||
| # 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" "usbhid" "sd_mod" ]; | ||||
|   boot.initrd.kernelModules = [ ]; | ||||
|   boot.kernelModules = [ "kvm-intel" ]; | ||||
|   boot.extraModulePackages = [ ]; | ||||
|  | ||||
|   fileSystems."/" = | ||||
|     { device = "/dev/disk/by-uuid/aa81d439-800b-403d-ac10-9d2aac3619d0"; | ||||
|       fsType = "ext4"; | ||||
|     }; | ||||
|  | ||||
|   fileSystems."/boot" = | ||||
|     { device = "/dev/disk/by-uuid/4A34-6AE5"; | ||||
|       fsType = "vfat"; | ||||
|       options = [ "fmask=0077" "dmask=0077" ]; | ||||
|     }; | ||||
|  | ||||
|   swapDevices = | ||||
|     [ { device = "/dev/disk/by-uuid/efb7cd0c-c1ae-4a86-8bc2-8e7fd0066650"; } | ||||
|     ]; | ||||
|  | ||||
|   # 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.enp0s31f6.useDHCP = lib.mkDefault true; | ||||
|  | ||||
|   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; | ||||
|   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; | ||||
| } | ||||
							
								
								
									
										40
									
								
								hosts/lupine/hardware-configuration/lupine-3.nix
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										40
									
								
								hosts/lupine/hardware-configuration/lupine-3.nix
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,40 @@ | ||||
| # 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" "usbhid" "sd_mod" ]; | ||||
|   boot.initrd.kernelModules = [ ]; | ||||
|   boot.kernelModules = [ "kvm-intel" ]; | ||||
|   boot.extraModulePackages = [ ]; | ||||
|  | ||||
|   fileSystems."/" = | ||||
|     { device = "/dev/disk/by-uuid/39ba059b-3205-4701-a832-e72c0122cb88"; | ||||
|       fsType = "ext4"; | ||||
|     }; | ||||
|  | ||||
|   fileSystems."/boot" = | ||||
|     { device = "/dev/disk/by-uuid/63FA-297B"; | ||||
|       fsType = "vfat"; | ||||
|       options = [ "fmask=0077" "dmask=0077" ]; | ||||
|     }; | ||||
|  | ||||
|   swapDevices = | ||||
|     [ { device = "/dev/disk/by-uuid/9c72eb54-ea8c-4b09-808a-8be9b9a33869"; } | ||||
|     ]; | ||||
|  | ||||
|   # 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.enp0s31f6.useDHCP = lib.mkDefault true; | ||||
|  | ||||
|   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; | ||||
|   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; | ||||
| } | ||||
| @@ -5,20 +5,30 @@ | ||||
| 
 | ||||
| { | ||||
|   imports = | ||||
|     [ (modulesPath + "/profiles/qemu-guest.nix") | ||||
|     [ (modulesPath + "/installer/scan/not-detected.nix") | ||||
|     ]; | ||||
| 
 | ||||
|   boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_blk" ]; | ||||
|   boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "sd_mod" ]; | ||||
|   boot.initrd.kernelModules = [ ]; | ||||
|   boot.kernelModules = [ ]; | ||||
|   boot.kernelModules = [ "kvm-intel" ]; | ||||
|   boot.extraModulePackages = [ ]; | ||||
| 
 | ||||
|   fileSystems."/" = | ||||
|     { device = "/dev/disk/by-uuid/c7bbb293-a0a3-4995-8892-0ec63e8c67dd"; | ||||
|       fsType = "ext4"; | ||||
|     }; | ||||
| 
 | ||||
|   swapDevices = | ||||
|     [ { device = "/dev/disk/by-uuid/a86ffda8-8ecb-42a1-bf9f-926072e90ca5"; } | ||||
|     ]; | ||||
| 
 | ||||
|   # 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.ens3.useDHCP = lib.mkDefault true; | ||||
|   # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; | ||||
| 
 | ||||
|   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; | ||||
|   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; | ||||
| } | ||||
							
								
								
									
										40
									
								
								hosts/lupine/hardware-configuration/lupine-5.nix
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										40
									
								
								hosts/lupine/hardware-configuration/lupine-5.nix
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,40 @@ | ||||
| # 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" "usbhid" "sd_mod" ]; | ||||
|   boot.initrd.kernelModules = [ ]; | ||||
|   boot.kernelModules = [ "kvm-intel" ]; | ||||
|   boot.extraModulePackages = [ ]; | ||||
|  | ||||
|   fileSystems."/" = | ||||
|     { device = "/dev/disk/by-uuid/5f8418ad-8ec1-4f9e-939e-f3a4c36ef343"; | ||||
|       fsType = "ext4"; | ||||
|     }; | ||||
|  | ||||
|   fileSystems."/boot" = | ||||
|     { device = "/dev/disk/by-uuid/F372-37DF"; | ||||
|       fsType = "vfat"; | ||||
|       options = [ "fmask=0077" "dmask=0077" ]; | ||||
|     }; | ||||
|  | ||||
|   swapDevices = | ||||
|     [ { device = "/dev/disk/by-uuid/27bf292d-bbb3-48c4-a86e-456e0f1f648f"; } | ||||
|     ]; | ||||
|  | ||||
|   # 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.enp0s31f6.useDHCP = lib.mkDefault true; | ||||
|  | ||||
|   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; | ||||
|   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; | ||||
| } | ||||
							
								
								
									
										45
									
								
								hosts/lupine/services/gitea-runner.nix
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										45
									
								
								hosts/lupine/services/gitea-runner.nix
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,45 @@ | ||||
| { config, lupineName, ... }: | ||||
| { | ||||
|   # This is unfortunately state, and has to be generated one at a time :( | ||||
|   # To do that, comment out all except one of the runners, fill in its token | ||||
|   # inside the sops file, rebuild the system, and only after this runner has | ||||
|   # successfully registered will gitea give you the next token. | ||||
|   # - oysteikt Sep 2023 | ||||
|   sops = { | ||||
|     secrets."gitea/runners/token" = { | ||||
|       key = "gitea/runners/${lupineName}"; | ||||
|     }; | ||||
|  | ||||
|     templates."gitea-runner-envfile" = { | ||||
|       restartUnits = [ | ||||
|         "gitea-runner-${lupineName}.service" | ||||
|       ]; | ||||
|       content = '' | ||||
|         TOKEN="${config.sops.placeholder."gitea/runners/token"}" | ||||
|       ''; | ||||
|     }; | ||||
|   }; | ||||
|  | ||||
|   services.gitea-actions-runner.instances = { | ||||
|     ${lupineName} = { | ||||
|       enable = true; | ||||
|       name = "git-runner-${lupineName}"; | ||||
|       url = "https://git.pvv.ntnu.no"; | ||||
|       labels = [ | ||||
|         "debian-latest:docker://node:current-bookworm" | ||||
|         "ubuntu-latest:docker://node:current-bookworm" | ||||
|       ]; | ||||
|       tokenFile = config.sops.templates."gitea-runner-envfile".path; | ||||
|     }; | ||||
|   }; | ||||
|  | ||||
|   virtualisation.podman = { | ||||
|     enable = true; | ||||
|     defaultNetwork.settings.dns_enabled = true; | ||||
|     autoPrune.enable = true; | ||||
|   }; | ||||
|  | ||||
|   networking.dhcpcd.IPv6rs = false; | ||||
|  | ||||
|   networking.firewall.interfaces."podman+".allowedUDPPorts = [53 5353]; | ||||
| } | ||||
| @@ -26,29 +26,40 @@ eJAiipB0QOH9SEa5Io6BSiqsBQJmqp4CBQkFpUs7AIF2IAQZFgoAHRYhBPPNqGzF | ||||
| Wp8Q16BpgZ8vfYJQ81FGBQJi5oZHAAoJEJ8vfYJQ81FGFZgBALN+Rh4m323TaM5z | ||||
| dJfCTV7V0aP3J0RdKmtKvz/Y9a7uAP4oP8UlbM9ucyG252gZ8IjM0VprNzP9CpNl | ||||
| 4GzpD4CRDgkQRrkijoFKKqwYoQEAz0D3G/dD6DBYBf7p6pGYqXd2X0Dv8nmnalol | ||||
| Z6SxfUMA/jT/XjPh7c4Ui8nZO7XDzYWrbV/eZwGMd1zXq2mU42MLuQINBGLmhnoB | ||||
| EADa1yBK0NKxVIto3hSh21hooYpWcEXWqMPXHO34rcAhktVFOOHIl2bFGScQAZXt | ||||
| jAcqUmMyC+PMs1DZoocFk+9PJt17hAa/s6CRrw8vK+1fVqhj0XOLtevGV9iC6IRv | ||||
| hPxzTsOaeOssgMGIU8xDmMKT2nGHGNUkqOXGld63E3NKsK3lnl+BCdpJ0f3GEB7a | ||||
| SQ+pk6k1uzODXX/mhAUJmL1MkVZ6jJA3vhsre0Kfa9p+C5mP4hLJ6jF+oESvA4HC | ||||
| +LuCSGm66gIDMC39jnLo6hwYEEjfPXD7CUAN4S2eISSFd+ZclN2vYcrKYgsCZS0h | ||||
| BFOgDhKKCHBuMwP12AIM8y8L64/eOWFpR7s2StAPjjYbZeZECHLWZt1zGVvkS7Xp | ||||
| 6lsAg6/T8EysKG7vTl2Qq9W0BmzNgk2ODTZkhv0gqqXppdr8eRiq+h0qMfJptG0G | ||||
| ycOvqb9PoEO2dfNCjjII8VfaSGfSEYo8UwsqYTtfgdoNnFCXKd1r7QmvrdbNsFDR | ||||
| mkv+wWJoipwUaVquyb2KN652jSlpwMECW6fSEsT/5C3mJLgAmi6l6yosw6HdIY6j | ||||
| gpCGtxnHW2zReIS6ezZdtxYBCkEHK70yASyaIHrLLDknw+DuKvXAWOAecob8GNBH | ||||
| OjXZe3LzBt2rVgOCRa+W7milNgjUCsz+R3rM8XfR+wNEGwARAQABiH4EGBYKACYW | ||||
| IQT303iQIoqQdEDh/UhGuSKOgUoqrAUCYuaGegIbDAUJA8JnAAAKCRBGuSKOgUoq | ||||
| rDE0AQDBxRsmW9L60mxGCp1CpNWBXD2T6D605PlNiNCcM+cOCgD/c2OitSSG50M0 | ||||
| YRbyh1LPYL6YQePL0dQkYsjm6XVmrAKIfgQYFgoAJgIbDBYhBPfTeJAiipB0QOH9 | ||||
| SEa5Io6BSiqsBQJmqp4FBQkFpUsIAAoJEEa5Io6BSiqsydsA/ihBulpSSLg4B9pJ | ||||
| sffqphMht7yT3Dnz57iexUEgj3jBAQDedI+gwpZlMjV6IdH/Epz244j82Ta04cqk | ||||
| SOz2Y63LBrgzBGLmhsUWCSsGAQQB2kcPAQEHQFg/avgj0sZbxqL58tZEpcaieeL1 | ||||
| OWOoVU3mZX/K7GU+iH4EGBYKACYWIQT303iQIoqQdEDh/UhGuSKOgUoqrAUCYuaG | ||||
| xQIbIAUJA8JnAAAKCRBGuSKOgUoqrN5jAP96aO0MEPQSIKdLaa9+ilpPp+glJ9du | ||||
| IJ7zdR0U15tONAEA0WqeRc8Jhv10UjIz/Q3UlcfvKPzVW6yVKo+Lg1FI2QSIfgQY | ||||
| FgoAJgIbIBYhBPfTeJAiipB0QOH9SEa5Io6BSiqsBQJmqp4GBQkFpUq9AAoJEEa5 | ||||
| Io6BSiqsjF0BAJn0EBEJfszskYiZzMshFHW5k0QUF+Ak3JNh2UG+M6FJAQCQVY/l | ||||
| DkrvOytuFnKbkDrCaTrtLh/JAmBXpSERIejmDw== | ||||
| =7cFp | ||||
| Z6SxfUMA/jT/XjPh7c4Ui8nZO7XDzYWrbV/eZwGMd1zXq2mU42MLiPUEGBYKACYC | ||||
| GwIWIQT303iQIoqQdEDh/UhGuSKOgUoqrAUCaI6lzgUJCWqGhwCBdiAEGRYKAB0W | ||||
| IQTzzahsxVqfENegaYGfL32CUPNRRgUCYuaGRwAKCRCfL32CUPNRRhWYAQCzfkYe | ||||
| Jt9t02jOc3SXwk1e1dGj9ydEXSprSr8/2PWu7gD+KD/FJWzPbnMhtudoGfCIzNFa | ||||
| azcz/QqTZeBs6Q+AkQ4JEEa5Io6BSiqsCG0BALDNFlploZWjQ0Xn3B9fd+1sTUmY | ||||
| +e0s95lEY7XqVkF2AQCkKzMd2mHsymyVtY32bSsZ0iJxHTmxomS0uQ/TGIugB7kC | ||||
| DQRi5oZ6ARAA2tcgStDSsVSLaN4UodtYaKGKVnBF1qjD1xzt+K3AIZLVRTjhyJdm | ||||
| xRknEAGV7YwHKlJjMgvjzLNQ2aKHBZPvTybde4QGv7Ogka8PLyvtX1aoY9Fzi7Xr | ||||
| xlfYguiEb4T8c07DmnjrLIDBiFPMQ5jCk9pxhxjVJKjlxpXetxNzSrCt5Z5fgQna | ||||
| SdH9xhAe2kkPqZOpNbszg11/5oQFCZi9TJFWeoyQN74bK3tCn2vafguZj+ISyeox | ||||
| fqBErwOBwvi7gkhpuuoCAzAt/Y5y6OocGBBI3z1w+wlADeEtniEkhXfmXJTdr2HK | ||||
| ymILAmUtIQRToA4SighwbjMD9dgCDPMvC+uP3jlhaUe7NkrQD442G2XmRAhy1mbd | ||||
| cxlb5Eu16epbAIOv0/BMrChu705dkKvVtAZszYJNjg02ZIb9IKql6aXa/HkYqvod | ||||
| KjHyabRtBsnDr6m/T6BDtnXzQo4yCPFX2khn0hGKPFMLKmE7X4HaDZxQlynda+0J | ||||
| r63WzbBQ0ZpL/sFiaIqcFGlarsm9ijeudo0pacDBAlun0hLE/+Qt5iS4AJoupesq | ||||
| LMOh3SGOo4KQhrcZx1ts0XiEuns2XbcWAQpBByu9MgEsmiB6yyw5J8Pg7ir1wFjg | ||||
| HnKG/BjQRzo12Xty8wbdq1YDgkWvlu5opTYI1ArM/kd6zPF30fsDRBsAEQEAAYh+ | ||||
| BBgWCgAmFiEE99N4kCKKkHRA4f1IRrkijoFKKqwFAmLmhnoCGwwFCQPCZwAACgkQ | ||||
| RrkijoFKKqwxNAEAwcUbJlvS+tJsRgqdQqTVgVw9k+g+tOT5TYjQnDPnDgoA/3Nj | ||||
| orUkhudDNGEW8odSz2C+mEHjy9HUJGLI5ul1ZqwCiH4EGBYKACYCGwwWIQT303iQ | ||||
| IoqQdEDh/UhGuSKOgUoqrAUCZqqeBQUJBaVLCAAKCRBGuSKOgUoqrMnbAP4oQbpa | ||||
| Uki4OAfaSbH36qYTIbe8k9w58+e4nsVBII94wQEA3nSPoMKWZTI1eiHR/xKc9uOI | ||||
| /Nk2tOHKpEjs9mOtywaIfgQYFgoAJgIbDBYhBPfTeJAiipB0QOH9SEa5Io6BSiqs | ||||
| BQJojqXOBQkJaoZUAAoJEEa5Io6BSiqsiXkBAJ0JTRmdQQpEK9KSh8V7FEkblIsm | ||||
| Ngko2cs+OhNSUgW9AQD0a7FHM3Dx32a7yD0zE3QwWi5VgeZZVIPyhItrOaANDbgz | ||||
| BGLmhsUWCSsGAQQB2kcPAQEHQFg/avgj0sZbxqL58tZEpcaieeL1OWOoVU3mZX/K | ||||
| 7GU+iH4EGBYKACYWIQT303iQIoqQdEDh/UhGuSKOgUoqrAUCYuaGxQIbIAUJA8Jn | ||||
| AAAKCRBGuSKOgUoqrN5jAP96aO0MEPQSIKdLaa9+ilpPp+glJ9duIJ7zdR0U15tO | ||||
| NAEA0WqeRc8Jhv10UjIz/Q3UlcfvKPzVW6yVKo+Lg1FI2QSIfgQYFgoAJgIbIBYh | ||||
| BPfTeJAiipB0QOH9SEa5Io6BSiqsBQJmqp4GBQkFpUq9AAoJEEa5Io6BSiqsjF0B | ||||
| AJn0EBEJfszskYiZzMshFHW5k0QUF+Ak3JNh2UG+M6FJAQCQVY/lDkrvOytuFnKb | ||||
| kDrCaTrtLh/JAmBXpSERIejmD4h+BBgWCgAmAhsgFiEE99N4kCKKkHRA4f1IRrki | ||||
| joFKKqwFAmiOpc4FCQlqhgkACgkQRrkijoFKKqwSMAD/bbO/uwwdFEJVgcNRexZU | ||||
| 6aoSxAGI1vjS92hSyfxZ9AABAK8KYO8sBGGCiVu+vWUpoUYmp3lfYTJHtf+36WMc | ||||
| D5MD | ||||
| =Gubf | ||||
| -----END PGP PUBLIC KEY BLOCK----- | ||||
|   | ||||
| @@ -1,4 +1,4 @@ | ||||
| {config, lib, pkgs, ...}: | ||||
| { config, lib, pkgs, unstablePkgs, ... }: | ||||
| let | ||||
|   grg = config.services.greg-ng; | ||||
|   grgw = config.services.grzegorz-webui; | ||||
| @@ -11,6 +11,8 @@ in { | ||||
|     settings.port = 31337; | ||||
|     enableSway = true; | ||||
|     enablePipewire = true; | ||||
|  | ||||
|     mpvPackage = unstablePkgs.mpv; | ||||
|   }; | ||||
|  | ||||
|   systemd.user.services.restart-greg-ng = { | ||||
|   | ||||
| @@ -5,11 +5,12 @@ mysql: | ||||
|     password: ENC[AES256_GCM,data:KqEe0TVdeMIzPKsmFg9x0X9xWijnOk306ycyXTm2Tpqo/O0F,iv:Y+hlQ8n1ZIP9ncXBzd2kCSs/DWVTWhiEluFVwZFKRCA=,tag:xlaUk0Wftk62LpYE5pKNQw==,type:str] | ||||
| gickup: | ||||
|     github-token: ENC[AES256_GCM,data:H/yBDLIvEXunmaUha3c2vUWKLRIbl9QrC0t13AQDRCTnrvhabeiUFLNxZ/F+4B6sZ2aPSgZoB69WwnHvh1wLdiFp1qLWKW/jQPvzZOxE4n+jXrnSOutUWktbPzVj,iv:KFW4jRru93JIl9doVFtcNkJDWp89NlzWjPDflHxcL/U=,tag:YtgyRxkoZO9MkuP3DJh7zA==,type:str] | ||||
| minecraft-heatmap: | ||||
|     postgres-passwd: ENC[AES256_GCM,data:T8s9xct07AJ4/Z6MQjNrqZQq7FerHz8Op+ea8zO2MDLPWWgU7/hBfrr+T4sc1TgT3e5vtE0dVcqCSbZCZj+6zQ==,iv:prx6d8c92OvbL8IjBLAvi1Vqk69D6ZIkAp7E8CSljok=,tag:UA5YS4YwViYZJ2PWzIIM3g==,type:str] | ||||
|     ssh-key: | ||||
|         private: ENC[AES256_GCM,data:h9OtD6hxrxyokFDe9bveAkMICrs3YrsAEqg0RVHV+xCkgkNAdoh85wb1QI8FJ0tga4Bfq8ZxZTdMnexQvbYWL8m/N/P6gWoPPJd7dwGuxaUZu5lqngVuHIhH0yWFWtPXjQ0Zyl5Q1aBKyjzJMvJc/H2iprgVH4YFs/fWf/KDEp17Plvvz0AoPGPrOZErDmne4MtLbW3pUm1r5ACo/41OyXYwjHk1Ywgsoz1CMxe/DrmkADnf7jSDWL6Q0mz8hIIYi8GbToJS4BIJ2plttraxV9sqpIPzS/1jMERNchItlkCppSYIy/eohVmskP8dAySm5Z7HNGGtzWSSGLxq15xKc7OVFYPMI+B35nPnp1LVOUWqBHAqVo7dwxc3VXOlVat7AMknUZnr67d4TIIl5BOdy/rvAxzXS/fDV0zntIs5o3phKStVvq07eZFaOVva45B7Pyyn0PdBhHBt2JcBtm+Xtg9i3xvZdwQgbeeJRhnYgDqK6BVhmtTuirwp1GOyslqaFCjg0MJj+W+d8R9gbbfyFR6YrZQAkcd/o/yZGg86z7Phe18=,iv:nt/+qPBwPZKQt43VJ9FbKjLYioFwCxD7VK9WNCJCmpQ=,tag:MuDfnTiro3VVJq9x5rkEQg==,type:str] | ||||
|         public: ENC[AES256_GCM,data:+fiCO8VRSmV7tmyweYSpZJMOuMORLHkWetYbr20aTQ1vRYr927nYGes4E464t+Dv9OyJPCLmHBdgt7UvxJWuC3pZE8iStnBYnej3D4ebMzi2SMfOkJjGuQSplXtl8QeAYe1YvROmtQ==,iv:thgGQUyWdXfwUt1E/vudoNjl8JjnksFd1rb/asTry+g=,tag:t1iQPocvfI+JafuJycaLuw==,type:str] | ||||
| sops: | ||||
|     kms: [] | ||||
|     gcp_kms: [] | ||||
|     azure_kv: [] | ||||
|     hc_vault: [] | ||||
|     age: | ||||
|         - recipient: age1sl43gc9cw939z5tgha2lpwf0xxxgcnlw7w4xem4sqgmt2pt264vq0dmwx2 | ||||
|           enc: | | ||||
| @@ -65,8 +66,8 @@ sops: | ||||
|             cTh5bnJ3WW90aXRCSUp6NHFYeU1tZ0kK4afdtJwGNu6wLRI0fuu+mBVeqVeB0rgX | ||||
|             0q5hwyzjiRnHnyjF38CmcGgydSfDRmF6P+WIMbCwXC6LwfRhAmBGPg== | ||||
|             -----END AGE ENCRYPTED FILE----- | ||||
|     lastmodified: "2025-05-07T21:34:48Z" | ||||
|     mac: ENC[AES256_GCM,data:n6GHD+nQmZL17WvUZiMCBLRHbtpoKU6U8o/Oraj0VSRi/pQ74QWGVEcIX87kFjBvR2C+UPd3KwXzjQHhjUfHpz9EjIGi6tXLTTo8K3ptd2wCL8MW418TVO4KV+BFmHGT4kwlbdoqaJ2SA7HcfXNaC68e/2CTXhtkLpIwGXtYWJA=,iv:iC5QX/JMwno4mBljPdorNmcQSD2wy/wOYvGrUoC2yzg=,tag:GuFNQ6+d6o9DYC6Do/IEqQ==,type:str] | ||||
|     lastmodified: "2025-08-25T12:27:53Z" | ||||
|     mac: ENC[AES256_GCM,data:GoJ2en7e+D4wjyPJqq7i1s8JPdgFO3wcxrtXOgSKTxi6HTibuIcP4KQcKrCMRAZmXOEL1vpnWFA2uk7S00Av7/QOnzP0Zrk3aPBM6lbB+p9XSabN0sOe1UpZDtAM3bzvS9JZzyztT5nHKvO/eV2rP71y/tYbsT6yvj7Y9zxpvKg=,iv:tQiCr7zpo7g5jZpt2VD9jtFKo32XUWs94Jay+T4XWys=,tag:npBqmlbUUfN+ztttajva3w==,type:str] | ||||
|     pgp: | ||||
|         - created_at: "2024-08-04T00:03:40Z" | ||||
|           enc: |- | ||||
| @@ -89,4 +90,4 @@ sops: | ||||
|             -----END PGP MESSAGE----- | ||||
|           fp: F7D37890228A907440E1FD4846B9228E814A2AAC | ||||
|     unencrypted_suffix: _unencrypted | ||||
|     version: 3.9.4 | ||||
|     version: 3.10.2 | ||||
|   | ||||
| @@ -8,11 +8,10 @@ gitea: | ||||
|     gpg-signing-key: ENC[AES256_GCM,data:AyafTF3H8p1qDk9xsNvT68BksoKGLwE2uE3hjz0TrT2XPxCRDOIlfAVYEPSu2Ih6l5a2uruEJhHPtU2fPCB2hln3Bv3gZfFGLb3GFWkSvdePIYFxG56uqGK5dE1KaMccc2cTi+raDImKqSTbp7Qpdo/c6C0WYVglYrD+2l8Y4QOiFuazyLY9zwcX0qG7pIjJ+akCUjfE4rJDAW6H/v+OqvHpcED3q4iXOYuw9sj/UeIgZfJ5Xc/uVrRmPewP4yALnA8o9gsaaLdjWRFIILe7VRwPr0YqwQ6XGgc+pEartkV8AzxjCq6DOtifOOzmu8EI1U1yoaOViYCAMbSHfP6SIKr7pJbrdU+YDBq9mvRx8KPXWUU2uNGrMObATEzlqMYAYA/HJeOdV4w3Axvq8RG2FLkJxJJniwNP5VZRF3bbbI3w+hprRP2yAwgeQw19KBU8yF8upKga/GdMNScpKJvRyVLjZtI0rsfvSC81lHawouuje6aPXT3dH1S5ROJBHMTeV0sP0vK6liBevz9RZpvNs6JVyNCgiRRtRSSYqsgwPJonDKuPeI/Zpgih7HboA8HqhIibqpO96h5/4yO69oJAbLUYV3zlKQcMDTaqadL4Ox5Z+8ygSAL3l1ufZIFGSj73SNHGQqQlIS/a3dAccRi5fPqv0gOmGFAAUJPKfeauFn3TclwojKzu5vwmQxZ5g50txEpTSTaYOy++qq6UZa/dXEyDC7fle75dXhqXyqMCf9kDwZZl5E9eBsabNdTF+auQCp82iLQivdBy7uJX2hkJFSg84fF9MLgH4mOcMQc2E/z961uNzEgoyvVhbDY6+SIJ+6SGmnardbFW7mYrj/QqnSUiMc4tHukAB4NGQYHgjOYRZMpHfVO/6dLbjmTOljnPsnfQUCepvb9rGim8NazvnARaVzezx4t3tfbNR8uLQudSeLZzn/Fu1mKSQvpP+IjdglmyAgp6QhB4OCDPbiaMRDUtOQIzlVILdz1/geUVzhZkJ4xzkm5klGukhtv+3TqjiTcEnoVJC+A1jRvxBQUfEE92GFuupJUfrw8bIDqsWQLkHPCNUMgdoKa/q2OkrWeQz2zm2yUqMAJn1/puoLHdSH5aCELUggx1gQZoc480pSBUvSCML+Qc4B4Cd6hX2PPp+/KQeKtfqHIsKz2I+DMT6KDirReX6WHxqk+s2DtLw7Wx/j65PWCIWLCz,iv:c9BDRxQImWTmwq11+T2CW0S00Dixd8d0od5xn5zZmY8=,tag:brnMedsdTwlkbaHaLa2w2g==,type:str] | ||||
|     ssh-known-hosts: ENC[AES256_GCM,data:P6hKaCpcZdXIy4rE/1b1+66Md/3Kmviileb0OIT3Vz4IVsDLecBh3IiadHq66V4KocXC4LBUNFjcrxlVVGIonHJ3qd6VpQUwG0n83yhj6LD5hgxmZ5phAyR77Ri8BiH1lWUcg51L2k0U+WJFPP6JkumT9MEz1t1+JYr5Imij6GKRWRKFwTbU6QJwFH4tCA/iGw0ElrzIjSHiNiwIKfbm8yas9vlOhr4y7vCeV10hVyvV,iv:dZ8hQxhn7pokWbQG/8rQ2vFDpPYut7WCG3xy9g6kzNs=,tag:xMyPtJJoh8kjJcOT4t9aRA==,type:str] | ||||
|     import-user-env: ENC[AES256_GCM,data:9SE2k3/IJqbdexj0QFSQBQ1+u1AduWNjt+0XIHryJlxIEdvv9a+6hP4EXPo+31GnaE4=,iv:qZlWOBV5owr3ESTyFaV/R8VwlGl04kaui80I2zYk4zY=,tag:PhjRfEC1xoHaYyl648yCVw==,type:str] | ||||
|     secret-key: ENC[AES256_GCM,data:YqwSJazPqz1OOsUVIPKsGvIHbX7SyJqryan1KWSRGRJkt9yZlaiRtQG/mQugAM6IvLFD3pj+gPTcXyqenaAQKA==,iv:nyPnL7wuhpb0kl0tm1JhOHmF7KI9vVcTN1SRGTgD2o8=,tag:Rt/IPC/YtBcmTx5osGlbBg==,type:str] | ||||
|     oauth2-jwt-secret: ENC[AES256_GCM,data:YUVbf0xgnzeNoahu57yzoib2XSB0rR2AAIkdlEe8eC9AFEdv4vE0S372jw==,iv:k1cEa/sWqJZ9b/NetVSR37BYy6UUOM4qAnbsfLEw+5Y=,tag:CrUh0xDWA77dAFp8FY0jPA==,type:str] | ||||
|     lfs-jwt-secret: ENC[AES256_GCM,data:fAirrt7Ue1XpHYB12e8l+47x1dY/eIsDV61KrDA/sRSKvZherRNnahtLQw==,iv:S6+rQHf3TL/1tKcknX/jHJ7k79GCU1BRBZHhuqXSRME=,tag:WUjNaP8bb1HvZnAX3+vXoQ==,type:str] | ||||
| sops: | ||||
|     kms: [] | ||||
|     gcp_kms: [] | ||||
|     azure_kv: [] | ||||
|     hc_vault: [] | ||||
|     age: | ||||
|         - recipient: age1mt4d0hg5g76qp7j0884llemy0k2ymr5up8vfudz6vzvsflk5nptqqd32ly | ||||
|           enc: | | ||||
| @@ -68,8 +67,8 @@ sops: | ||||
|             OCtLcUZwL084TUp0QmpSQXNtSFhHYkUKwGvXXE9AWlrlDgRl2ECCmej7IMztO+fx | ||||
|             852Vu610cI9FLv5oghlKM769+/A2QP82KwdxZ4MaRSDvJwXKBi16aw== | ||||
|             -----END AGE ENCRYPTED FILE----- | ||||
|     lastmodified: "2025-03-16T13:03:12Z" | ||||
|     mac: ENC[AES256_GCM,data:cuMHvEjR3nA/LqGHwIGOD+rWwmvg0fPiFtVTDLATKuc0Ulf+0PKogv9cddmXlmqaBOLMkmZue44egEpiLoNm38kEr7gPfP7XKj3kkwL2U4BiS43JEokt5CEq44sSETKylEMEVajgOEwyWn1od4MLxa7xsuhbvGvDpsbvjyPvzh0=,iv:zWFNpOS9cgCs36rdW9FcJ+jG3HrjRmcw2Ogz7QZuyJQ=,tag:L3x6Bsu+7n5A0/Dx0HghkA==,type:str] | ||||
|     lastmodified: "2025-08-03T01:35:52Z" | ||||
|     mac: ENC[AES256_GCM,data:wQPIW9zRhB6IjK1OQy69Ln+dj6OMNLnNKIzFIhv/vbQ4GllMJ3N/gZjuzMJIumcVND+jEY/qiYnsCFSptStlDYtB3/zHWo1e6It2pM4igtoTP29uiQME0vPJSz0guakZlDMa20mOTN0vVZODEbeBiQNXWtnTbl93R2JVJlZrWcI=,iv:L9Dk5S+hbBO0LTM0irfLuqjLYHzVtY5Tq+Q7m65u6p8=,tag:0GT9IyPeGY5YM6PP/LNs/Q==,type:str] | ||||
|     pgp: | ||||
|         - created_at: "2025-03-16T13:02:45Z" | ||||
|           enc: |- | ||||
| @@ -92,4 +91,4 @@ sops: | ||||
|             -----END PGP MESSAGE----- | ||||
|           fp: F7D37890228A907440E1FD4846B9228E814A2AAC | ||||
|     unencrypted_suffix: _unencrypted | ||||
|     version: 3.9.4 | ||||
|     version: 3.10.2 | ||||
|   | ||||
							
								
								
									
										124
									
								
								secrets/lupine/lupine.yaml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										124
									
								
								secrets/lupine/lupine.yaml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,124 @@ | ||||
| gitea: | ||||
|     runners: | ||||
|         lupine-1: ENC[AES256_GCM,data:UcZB2p/dInvcl0yNBEohzbmcVxg/QQPXlIsaVB3M3hyxFg1gtGfUGA==,iv:OigyPfPoRIjvyiId7hiiWdNrZqyZqI3OonvJC+zYEzI=,tag:SjBsvo/IJKhFQs+PiI596g==,type:str] | ||||
|         lupine-2: null | ||||
|         lupine-3: null | ||||
|         lupine-4: null | ||||
|         lupine-5: null | ||||
| sops: | ||||
|     age: | ||||
|         - recipient: age1fkrypl6fu4ldsa7te4g3v4qsegnk7sd6qhkquuwzh04vguy96qus08902e | ||||
|           enc: | | ||||
|             -----BEGIN AGE ENCRYPTED FILE----- | ||||
|             YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBncnd2NVdqdjU1WWx4YWJr | ||||
|             RUVuSThBWWdyVnpFT0kzZjBrVjZiN1FiU0ZBCmNCbGVZK09YaFNGSUE2QWpidEFw | ||||
|             aEZEVndkODRzYmNLWDRzSGMzOWZKajAKLS0tIE00b3NiclFrOEk3R1lkeWM0VHY3 | ||||
|             dUFQcG04bWNwYjRjTlNWV0pXNnlTN28KEc8nM7jzMuh2B6Q9vDS9apmVZDH9fAGi | ||||
|             dyze2SHCvfbr6So6GtJnZQy5J7tPoHBd3zwjojYV11kR9Ci1GszrVw== | ||||
|             -----END AGE ENCRYPTED FILE----- | ||||
|         - recipient: age1mu0ej57n4s30ghealhyju3enls83qyjua69986la35t2yh0q2s0seruz5n | ||||
|           enc: | | ||||
|             -----BEGIN AGE ENCRYPTED FILE----- | ||||
|             YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBuVzdFdXdETEN3bjdIY0hi | ||||
|             TUV3YjFSUHBhNTIyUDd6MC93R2xRZmZGTkd3CkZuNWRZY25nY1FMZjV1QzJuUUZN | ||||
|             d0hzMUplY0w4c0hVK0dCbHVzVURvUm8KLS0tIGt2UEozYTdzMDRGUlRYeWpLY0Q3 | ||||
|             bmFMZGRhWGZQZlpwMFZsV3VwdEljRUkKwS1gGaLCY/+wv2blCiDWHXOTl7eRVDPH | ||||
|             NPk33fXDa0y4AxFmwJ9caHL+UHWhSCVvi6odl1F6OA4blNLHRZAyzQ== | ||||
|             -----END AGE ENCRYPTED FILE----- | ||||
|         - recipient: age1j2u876z8hu87q5npfxzzpfgllyw8ypj66d7cgelmzmnrf3xud34qzkntp9 | ||||
|           enc: | | ||||
|             -----BEGIN AGE ENCRYPTED FILE----- | ||||
|             YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBDdmZXREhrUk5kWHgyMzI0 | ||||
|             RnR0bVE1cm9GQkpwc0VWZ3ZmUjMxMzF2WVhFCkcrcEI4enlRN09wNzF4M0tTNXZi | ||||
|             TWg1TTkwUlNYUU1ReUVSU1dTdFoxeWcKLS0tIGZaMmVmZ1kxbFVVMmsxTzczYU9j | ||||
|             N3Y3Qm9SQ2Z0bWNhM043czdnWC9RR0kK61W5sqXybAbjTUR8D05dYMInLl683Rzj | ||||
|             G+0MZEzvfYONGU1gduRB5quHAwZLG5b9N6zorRSFON1meni+v/Ciww== | ||||
|             -----END AGE ENCRYPTED FILE----- | ||||
|         - recipient: age1t8zlawqkmhye737pn8yx0z3p9cl947d9ktv2cajdc6hnvn52d3fsc59s2k | ||||
|           enc: | | ||||
|             -----BEGIN AGE ENCRYPTED FILE----- | ||||
|             YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBod1RDR1NLZlhQQWw4Nk8z | ||||
|             TTZHZitTNjFxUHVIZWY3N2VDd3pXRGt4N0JFClNzQ2REbSt5T0FXaVBhS09zcS9y | ||||
|             TW5PTW1mSzlyOHppSm1yMWp6by9ZUWMKLS0tIFVsYkJZbHE3K3B5TS95amJhbDYy | ||||
|             dFV1REdKYmIweWw1MDJ4L3p0cW9nVWMKQndDoniGQOn01SnscX7u7y6l119Eb++q | ||||
|             JoTZELALPIyGdI4pXd6zCfRyLFaqWd4CO0RFtl8FTcm75W+ETmqqlQ== | ||||
|             -----END AGE ENCRYPTED FILE----- | ||||
|         - recipient: age199zkqq4jp4yc3d0hx2q0ksxdtp42xhmjsqwyngh8tswuck34ke3smrfyqu | ||||
|           enc: | | ||||
|             -----BEGIN AGE ENCRYPTED FILE----- | ||||
|             YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjdlhET094ZGJsZU9tZnhz | ||||
|             d20wcnltVU1MS09Qb3lzV2RjNi9OZjhDdFRBCndRY3hwQ3VHQWF2MVRFUU1MQkhh | ||||
|             bGRQdEVaSzF0YTgxTGdITGN2dDlYc1kKLS0tIEw1MmFkUHJaKzZGRU93T2VTTkxK | ||||
|             VU0xV0gwQ1NnbVIrS3lHTnJ5bU9IcGMKDWSWfA7iBQ+8iclmXDVf5Qjv67D2WbJg | ||||
|             ovrYcT1F5+qE4xkuUkzVaGn9vgT+/kkzFucBz0c0iD5KCoa52z5AlQ== | ||||
|             -----END AGE ENCRYPTED FILE----- | ||||
|         - recipient: age17tagmpwqjk3mdy45rfesrfey6h863x8wfq38wh33tkrlrywxducs0k6tpq | ||||
|           enc: | | ||||
|             -----BEGIN AGE ENCRYPTED FILE----- | ||||
|             YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBtV2R5VzdCbkFDTGRJUG81 | ||||
|             bUk3Y3F6NkJGYUk1VW1XQnFOSTlwMTduL0Y0CjJ4N1Q5MXZjQXhsTk5Hbk40U1pU | ||||
|             aFNxeFIyaGJpd3dMZFpQL0R2M1dHbk0KLS0tIGpUVGMyRSt6aDZVOERRWnRSY1Ns | ||||
|             dXptcUNmeGRHcEs3WStpL3BuZUtJbjAKhqJEec4vjSC18oRl1dTNkF2Ev4YtudE4 | ||||
|             Lp2vbcSHXwrZhqbFlQ8stCpUJvjCBEr2cT/shrG38aP0MzgeSmMacQ== | ||||
|             -----END AGE ENCRYPTED FILE----- | ||||
|         - recipient: age1mrnldl334l2nszuta6ywvewng0fswv2dz9l5g4qcwe3nj4yxf92qjskdx6 | ||||
|           enc: | | ||||
|             -----BEGIN AGE ENCRYPTED FILE----- | ||||
|             YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBURXhRWEFHU2Rtd0pyZGUw | ||||
|             b09VQ1JhYjhJYlpnY2FCZndEcU1Ed3k1K0UwCit1NVIyL2xuZlAzbEJwY3V0UTB3 | ||||
|             Unk1L3p6cHlVWjllMjcvcTdDcnlxcGcKLS0tIGdGa3MvTmJiSGF4YnBZbE1wdGEv | ||||
|             eFArZE5MaXlvOE9XN1I4eEtNMEpzcU0KVNUfcUJM+IVY/+b8mQiHKvuFnsih+zHx | ||||
|             ZdUD+FPjghqrzJB4MOl/PYAxJ4lga6gPbcRWD5UUDuyDGOUwRpOt7w== | ||||
|             -----END AGE ENCRYPTED FILE----- | ||||
|         - recipient: age1hmpdk4h69wxpwqk9tkud39f66hprhehxtzhgw97r6dvr7v0mx5jscsuhkn | ||||
|           enc: | | ||||
|             -----BEGIN AGE ENCRYPTED FILE----- | ||||
|             YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNUnhIOHVLUG1meWFlZ24w | ||||
|             SVlFenR1aWZXK21HSXpHU1NSZ2llQ1EwSnpnCmJYRXR3b3IvclZvaGpGdEpOUk9D | ||||
|             eDg2eFFJQ0M4TEJqZDVUQUZGa2h3V3cKLS0tIEhWTzhoMVg1UEM2M1k1TVZTUDlL | ||||
|             RDE1RCtUV2dDR3haclBMZDFhYXcyV2sKjwEI2dY4rluumihyEggLYDDvZZAK4SZw | ||||
|             FWkwIUpMCZzg2fCeDMnTSAWfAZbiDcPLoCieJ2bpGXPTzyasRlOakg== | ||||
|             -----END AGE ENCRYPTED FILE----- | ||||
|         - recipient: age1wrssr4z4g6vl3fd3qme5cewchmmhm0j2xe6wf2meu4r6ycn37anse98mfs | ||||
|           enc: | | ||||
|             -----BEGIN AGE ENCRYPTED FILE----- | ||||
|             YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBxamdXMXJ4K3hMV2g1WmUy | ||||
|             Ry80dG5wdWlLc1paY1VoSE8vWk1ra1g5cldFClN1eXlVUGVndnovQ3dxQTdzQjRV | ||||
|             Wm9NNWg5VVR4NVNsRjM0VHFya1FQeWsKLS0tIG43bTdKVjNrQlBUWHJoNjIyOW85 | ||||
|             TGd1Tng1akExRDd0TFZmQ3JnS3FtK3cKn2t7/4yIDZT2oy8fyJibF62usPjhuBOb | ||||
|             9qQjChRm5h5mNSWdAzyf48wID7czzJiZjqtfE4vjLYLsWKMzz9j3xg== | ||||
|             -----END AGE ENCRYPTED FILE----- | ||||
|         - recipient: age1zhxul786an743u0fascv4wtc5xduu7qfy803lfs539yzhgmlq5ds2lznt5 | ||||
|           enc: | | ||||
|             -----BEGIN AGE ENCRYPTED FILE----- | ||||
|             YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBKQm5UalBhV1NWa2ZQNzVQ | ||||
|             OEZXODkrYXRGR2lRMzMwSk5KV01WK3pLZlZ3ClNwZTV6aGRvZlV2UXJaNm9IOVVR | ||||
|             VFZscVZhVkFaMlk5a1ZCcWJReVN5YWcKLS0tIEhHMnRKdWJvTkREbFlWb25YRXg3 | ||||
|             YU5mMDlRckJCMDAzcHYyMWN1clRJRVEK77PiAQP+2+WblGYEgAf6bx6RTh0JHiSZ | ||||
|             /jPIN/rbAKNv36wpZDbuLV8tcMuvhleNMRSSqbIloLSzww+Z5nOU4A== | ||||
|             -----END AGE ENCRYPTED FILE----- | ||||
|     lastmodified: "2025-07-30T18:29:08Z" | ||||
|     mac: ENC[AES256_GCM,data:47cki5ucPTVd4JuEyK0QkDCCEqj1pW6SA5I6ihC/MEja6TIuHTcEPFpje8+LvpGjpP9uobKX4g3UcyvkJ63j/k3hU0xPYQX3Z1ee00KIMKB0GHNjUR8ENtnwd3TU7kp5ohtXeCtcyzCjdFFuXp8AINGv3vpbU2MzauctUxn5B1Y=,iv:1mpk/f1QlRtHfA9dqyNLBrvfVPgtLnZ7ibj8qNrEGD8=,tag:drEK1+qeJy97rgeQJyqucA==,type:str] | ||||
|     pgp: | ||||
|         - created_at: "2025-07-30T18:27:50Z" | ||||
|           enc: |- | ||||
|             -----BEGIN PGP MESSAGE----- | ||||
|  | ||||
|             hQIMA0av/duuklWYAQ/9HdDiIXAQjcAbokD7yliGC+p7j+RxD2FDh5aXtDIS14dM | ||||
|             pF7wdTdY7PvcXoSCQ5ZC7bjIY86MDfD+BT63MwjOczIgBJJ9wrGDZ2o9DnzzYsI1 | ||||
|             XdUgQscjtbAycNlaczI6IXrYlWqjt6qpp/OADXdMXZo3W+pTR3aSdrj/FcMzJad1 | ||||
|             AMQt8raqrD5LxIj0yWEYvob5z7NA6slBvVJRszsbYgz3aJWqG2DhlUBph6j2Rgmq | ||||
|             /W796+fywrunmY/dmzptT5Epp5gZ55BAqg09qHj/+crTxIt7SNpsfps2ki8JBVq0 | ||||
|             4ooaUktBBMnhsZBA8NIauesokZkLO0MvyvjMBPGR8jun2EXoNtFmWZqUqD1fb0B5 | ||||
|             xe0SVg8XIzS/AFnKVAWfj6h9lM4guLL/kxu3aPAJwOj+YtIAXx4vojs81Led8nlQ | ||||
|             jXvfy7Y94EQhKTLWuK12QC+bw2vy4V9L98nyDKB3ZuN2l3A2CN1ZLXArk/oez56d | ||||
|             5t/0C43qEPfzQH87kygGuuQmlZvQupnHN4iCvExmoiX362/3S9h1wS5QcKdC3Lk/ | ||||
|             f3yr0+r1uOYuoQuofwitLZaq66aCmqYUmXhLvGujPjg8YuNXQ5k1MlOilDqoZnxk | ||||
|             0V8RQbTpvUcqRLgczofC0ovgE2W13khS2BGxG3ZPmAbUGiaIP9OkfebI7hJJE7LS | ||||
|             XgE4cU06C5jj4wLkOj3y4nEKwaFrEGRO3YQa1kl5/sExOg0Jd7fehozVh8+opGOZ | ||||
|             MhmVHghd/RYZzBi3NZL28xnAvsawE1m6h6WEGk6JaVEdJh9W009AQCtVyChs9Og= | ||||
|             =4gbo | ||||
|             -----END PGP MESSAGE----- | ||||
|           fp: F7D37890228A907440E1FD4846B9228E814A2AAC | ||||
|     unencrypted_suffix: _unencrypted | ||||
|     version: 3.10.2 | ||||
							
								
								
									
										23
									
								
								users/albertba.nix
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										23
									
								
								users/albertba.nix
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,23 @@ | ||||
| { pkgs, ... }: | ||||
| { | ||||
|   users.users.albertba = { | ||||
|     isNormalUser = true; | ||||
|     extraGroups = [ "wheel" "drift" "nix-builder-users" ]; | ||||
|  | ||||
|     packages = with pkgs; [ | ||||
|       htop | ||||
|       neovim | ||||
|       ripgrep | ||||
|       fd | ||||
|       tmux | ||||
|     ]; | ||||
|  | ||||
|     shell = pkgs.zsh; | ||||
|  | ||||
|     openssh.authorizedKeys.keys = [ | ||||
|       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICheSCAxsYc/6g8hq2lXXHoUWPjWvntzzTA7OhG8waMN albert@Arch" | ||||
|     ]; | ||||
|   }; | ||||
|  | ||||
| } | ||||
|  | ||||
							
								
								
									
										22
									
								
								users/vegardbm.nix
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										22
									
								
								users/vegardbm.nix
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,22 @@ | ||||
| { pkgs, ... }: | ||||
| { | ||||
|   users.users.vegardbm = { | ||||
|     isNormalUser = true; | ||||
|     description = "noe"; | ||||
|     extraGroups = [ | ||||
|       "wheel" | ||||
|       "drift" | ||||
|       "nix-builder-users" | ||||
|     ]; | ||||
|     packages = with pkgs; [ | ||||
|       btop | ||||
|       eza | ||||
|       neovim | ||||
|       ripgrep | ||||
|       tmux | ||||
|     ]; | ||||
|     openssh.authorizedKeys.keys = [ | ||||
|       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDVA3HqEx3je6L1AC+bP8sTxu3ZTKvTCR0npCyOVAYK5 vbm@arch-xeon" | ||||
|     ]; | ||||
|   }; | ||||
| } | ||||
							
								
								
									
										24
									
								
								values.nix
									
									
									
									
									
								
							
							
						
						
									
										24
									
								
								values.nix
									
									
									
									
									
								
							| @@ -41,10 +41,6 @@ in rec { | ||||
|       ipv4 = pvv-ipv4 209; | ||||
|       ipv6 = pvv-ipv6 209; | ||||
|     }; | ||||
|     bob = { | ||||
|       ipv4 = "129.241.152.254"; | ||||
|       # ipv6 = ; | ||||
|     }; | ||||
|     knutsen = { | ||||
|       ipv4 = pvv-ipv4 191; | ||||
|     }; | ||||
| @@ -72,6 +68,26 @@ in rec { | ||||
|       ipv4 = pvv-ipv4 240; | ||||
|       ipv6 = pvv-ipv6 240; | ||||
|     }; | ||||
|     lupine-1 = { | ||||
|       ipv4 = pvv-ipv4 224; | ||||
|       ipv6 = pvv-ipv6 224; | ||||
|     }; | ||||
|     lupine-2 = { | ||||
|       ipv4 = pvv-ipv4 225; | ||||
|       ipv6 = pvv-ipv6 225; | ||||
|     }; | ||||
|     lupine-3 = { | ||||
|       ipv4 = pvv-ipv4 226; | ||||
|       ipv6 = pvv-ipv6 226; | ||||
|     }; | ||||
|     lupine-4 = { | ||||
|       ipv4 = pvv-ipv4 227; | ||||
|       ipv6 = pvv-ipv6 227; | ||||
|     }; | ||||
|     lupine-5 = { | ||||
|       ipv4 = pvv-ipv4 228; | ||||
|       ipv6 = pvv-ipv6 228; | ||||
|     }; | ||||
|   }; | ||||
|  | ||||
|   defaultNetworkConfig = { | ||||
|   | ||||
		Reference in New Issue
	
	Block a user