Compare commits
	
		
			47 Commits
		
	
	
		
			gitea-navb
			...
			setup-git-
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 48c59201e1 | |||
| 20e3f89b79 | |||
| f0e6521fbb | |||
| d59a3f6ec0 | |||
| b730bdc34d | |||
| f1f4da9ff6 | |||
| cd40bd6178 | |||
| 41e7f09c8b | |||
| 30bedecd72 | |||
| 29ad65bfef | |||
| b5a95eac90 | |||
| b2adb38a8b | |||
| 3a707b00d3 | |||
| decd69d9ae | |||
| b7fca76ea5 | |||
| c6b7e7f555 | |||
| 32a529e60f | |||
| 493ab057f4 | |||
| c683e2184a | |||
| 5c32798dcf | |||
| e5cbd66769 | |||
| 8b34f31e3f | |||
| 08b010cb93 | |||
| a408ef6688 | |||
| c83005983e | |||
| 30d31956c6 | |||
| c8bf3b7c01 | |||
| 069da36895 | |||
| 83f83a91b7 | |||
| 6372a4111e | |||
| bdfb7384c2 | |||
| ace351c0a7 | |||
| cd5c2c0e01 | |||
| 2be9eb16fe | |||
| 64bd33a213 | |||
| 7b5e114944 | |||
| ee8965e18c | |||
| 7125fd2478 | |||
| 0c1762619a | |||
| 84d1ae13c0 | |||
| a3c88b7869 | |||
| 4aa994e7a3 | |||
| fc64139739 | |||
| 75b0c00212 | |||
| 4f28815018 | |||
| bdaa765dbb | |||
| c0e551eb8b | 
							
								
								
									
										13
									
								
								.sops.yaml
									
									
									
									
									
								
							
							
						
						
									
										13
									
								
								.sops.yaml
									
									
									
									
									
								
							| @@ -14,6 +14,7 @@ keys: | |||||||
|   - &host_bekkalokk age12nj59tguy9wg882updc2vjdusx5srnxmjyfaqve4zx6jnnsaw3qsyjq6zd |   - &host_bekkalokk age12nj59tguy9wg882updc2vjdusx5srnxmjyfaqve4zx6jnnsaw3qsyjq6zd | ||||||
|   - &host_bicep age1sl43gc9cw939z5tgha2lpwf0xxxgcnlw7w4xem4sqgmt2pt264vq0dmwx2 |   - &host_bicep age1sl43gc9cw939z5tgha2lpwf0xxxgcnlw7w4xem4sqgmt2pt264vq0dmwx2 | ||||||
|   - &host_ustetind age1hffjafs4slznksefmtqrlj7rdaqgzqncn4un938rhr053237ry8s3rs0v8 |   - &host_ustetind age1hffjafs4slznksefmtqrlj7rdaqgzqncn4un938rhr053237ry8s3rs0v8 | ||||||
|  |   - &host_kommode age1mt4d0hg5g76qp7j0884llemy0k2ymr5up8vfudz6vzvsflk5nptqqd32ly | ||||||
|  |  | ||||||
| creation_rules: | creation_rules: | ||||||
|   # Global secrets |   # Global secrets | ||||||
| @@ -44,6 +45,18 @@ creation_rules: | |||||||
|       pgp: |       pgp: | ||||||
|       - *user_oysteikt |       - *user_oysteikt | ||||||
|  |  | ||||||
|  |   - path_regex: secrets/kommode/[^/]+\.yaml$ | ||||||
|  |     key_groups: | ||||||
|  |     - age: | ||||||
|  |       - *host_kommode | ||||||
|  |       - *user_danio | ||||||
|  |       - *user_felixalb | ||||||
|  |       - *user_pederbs_sopp | ||||||
|  |       - *user_pederbs_nord | ||||||
|  |       - *user_pederbs_bjarte | ||||||
|  |       pgp: | ||||||
|  |       - *user_oysteikt | ||||||
|  |  | ||||||
|   - path_regex: secrets/jokum/[^/]+\.yaml$ |   - path_regex: secrets/jokum/[^/]+\.yaml$ | ||||||
|     key_groups: |     key_groups: | ||||||
|     - age: |     - age: | ||||||
|   | |||||||
| @@ -10,6 +10,8 @@ | |||||||
|  |  | ||||||
|     ./services/acme.nix |     ./services/acme.nix | ||||||
|     ./services/auto-upgrade.nix |     ./services/auto-upgrade.nix | ||||||
|  |     ./services/dbus.nix | ||||||
|  |     ./services/fwupd.nix | ||||||
|     ./services/irqbalance.nix |     ./services/irqbalance.nix | ||||||
|     ./services/logrotate.nix |     ./services/logrotate.nix | ||||||
|     ./services/nginx.nix |     ./services/nginx.nix | ||||||
| @@ -17,9 +19,12 @@ | |||||||
|     ./services/postfix.nix |     ./services/postfix.nix | ||||||
|     ./services/smartd.nix |     ./services/smartd.nix | ||||||
|     ./services/thermald.nix |     ./services/thermald.nix | ||||||
|  |     ./services/userborn.nix | ||||||
|  |     ./services/userdbd.nix | ||||||
|   ]; |   ]; | ||||||
|  |  | ||||||
|   boot.tmp.cleanOnBoot = lib.mkDefault true; |   boot.tmp.cleanOnBoot = lib.mkDefault true; | ||||||
|  |   boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest; | ||||||
|  |  | ||||||
|   time.timeZone = "Europe/Oslo"; |   time.timeZone = "Europe/Oslo"; | ||||||
|  |  | ||||||
| @@ -45,8 +50,22 @@ | |||||||
|     kitty.terminfo |     kitty.terminfo | ||||||
|   ]; |   ]; | ||||||
|  |  | ||||||
|  |   # .bash_profile already works, but lets also use .bashrc like literally every other distro | ||||||
|  |   # https://man.archlinux.org/man/core/bash/bash.1.en#INVOCATION | ||||||
|  |   # 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 | ||||||
|  |   ''; | ||||||
|  |  | ||||||
|   programs.zsh.enable = true; |   programs.zsh.enable = true; | ||||||
|  |  | ||||||
|  |   security.lockKernelModules = true; | ||||||
|  |   security.protectKernelImage = true; | ||||||
|   security.sudo.execWheelOnly = true; |   security.sudo.execWheelOnly = true; | ||||||
|   security.sudo.extraConfig = '' |   security.sudo.extraConfig = '' | ||||||
|     Defaults lecture = never |     Defaults lecture = never | ||||||
|   | |||||||
| @@ -5,10 +5,10 @@ | |||||||
|       automatic = true; |       automatic = true; | ||||||
|       options = "--delete-older-than 2d"; |       options = "--delete-older-than 2d"; | ||||||
|     }; |     }; | ||||||
|  |     optimise.automatic = true; | ||||||
|  |  | ||||||
|     settings = { |     settings = { | ||||||
|       allow-dirty = true; |       allow-dirty = true; | ||||||
|       auto-optimise-store = true; |  | ||||||
|       builders-use-substitutes = true; |       builders-use-substitutes = true; | ||||||
|       experimental-features = [ "nix-command" "flakes" ]; |       experimental-features = [ "nix-command" "flakes" ]; | ||||||
|       log-lines = 50; |       log-lines = 50; | ||||||
|   | |||||||
							
								
								
									
										7
									
								
								base/services/dbus.nix
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										7
									
								
								base/services/dbus.nix
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,7 @@ | |||||||
|  | { ... }: | ||||||
|  | { | ||||||
|  |   services.dbus = { | ||||||
|  |     enable = true; | ||||||
|  |     implementation = "broker"; | ||||||
|  |   }; | ||||||
|  | } | ||||||
							
								
								
									
										4
									
								
								base/services/fwupd.nix
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										4
									
								
								base/services/fwupd.nix
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,4 @@ | |||||||
|  | { ... }: | ||||||
|  | { | ||||||
|  |   services.fwupd.enable = true; | ||||||
|  | } | ||||||
							
								
								
									
										4
									
								
								base/services/userborn.nix
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										4
									
								
								base/services/userborn.nix
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,4 @@ | |||||||
|  | { ... }: | ||||||
|  | { | ||||||
|  |   services.userborn.enable = true; | ||||||
|  | } | ||||||
							
								
								
									
										4
									
								
								base/services/userdbd.nix
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										4
									
								
								base/services/userdbd.nix
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,4 @@ | |||||||
|  | { ... }: | ||||||
|  | { | ||||||
|  |   services.userdbd.enable = true; | ||||||
|  | } | ||||||
							
								
								
									
										72
									
								
								flake.lock
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										72
									
								
								flake.lock
									
									
									
										generated
									
									
									
								
							| @@ -7,11 +7,11 @@ | |||||||
|         ] |         ] | ||||||
|       }, |       }, | ||||||
|       "locked": { |       "locked": { | ||||||
|         "lastModified": 1740485968, |         "lastModified": 1745502102, | ||||||
|         "narHash": "sha256-WK+PZHbfDjLyveXAxpnrfagiFgZWaTJglewBWniTn2Y=", |         "narHash": "sha256-LqhRwzvIVPEjH0TaPgwzqpyhW6DtCrvz7FnUJDoUZh8=", | ||||||
|         "owner": "nix-community", |         "owner": "nix-community", | ||||||
|         "repo": "disko", |         "repo": "disko", | ||||||
|         "rev": "19c1140419c4f1cdf88ad4c1cfb6605597628940", |         "rev": "ca27b88c88948d96feeee9ed814cbd34f53d0d70", | ||||||
|         "type": "github" |         "type": "github" | ||||||
|       }, |       }, | ||||||
|       "original": { |       "original": { | ||||||
| @@ -48,11 +48,11 @@ | |||||||
|         "rust-overlay": "rust-overlay" |         "rust-overlay": "rust-overlay" | ||||||
|       }, |       }, | ||||||
|       "locked": { |       "locked": { | ||||||
|         "lastModified": 1736545379, |         "lastModified": 1746563623, | ||||||
|         "narHash": "sha256-PeTTmGumdOX3rd6OKI7QMCrZovCDkrckZbcHr+znxWA=", |         "narHash": "sha256-5DxgNFpSgxft/sWraZnHIUlb4S3Io73SVS7FZCbWSUY=", | ||||||
|         "ref": "refs/heads/main", |         "ref": "refs/heads/main", | ||||||
|         "rev": "74f5316121776db2769385927ec0d0c2cc2b23e4", |         "rev": "4e0408887f80e61a90286ff630a7855b828ae421", | ||||||
|         "revCount": 42, |         "revCount": 45, | ||||||
|         "type": "git", |         "type": "git", | ||||||
|         "url": "https://git.pvv.ntnu.no/Grzegorz/greg-ng.git" |         "url": "https://git.pvv.ntnu.no/Grzegorz/greg-ng.git" | ||||||
|       }, |       }, | ||||||
| @@ -88,16 +88,16 @@ | |||||||
|         ] |         ] | ||||||
|       }, |       }, | ||||||
|       "locked": { |       "locked": { | ||||||
|         "lastModified": 1727410897, |         "lastModified": 1735857245, | ||||||
|         "narHash": "sha256-tWsyxvf421ieWUJYgjV7m1eTdr2ZkO3vId7vmtvfFpQ=", |         "narHash": "sha256-AKLLPrgXTxgzll3DqVUMa4QlPlRN3QceutgFBmEf8Nk=", | ||||||
|         "owner": "dali99", |         "owner": "dali99", | ||||||
|         "repo": "nixos-matrix-modules", |         "repo": "nixos-matrix-modules", | ||||||
|         "rev": "ff787d410cba17882cd7b6e2e22cc88d4064193c", |         "rev": "da9dc0479ffe22362793c87dc089035facf6ec4d", | ||||||
|         "type": "github" |         "type": "github" | ||||||
|       }, |       }, | ||||||
|       "original": { |       "original": { | ||||||
|         "owner": "dali99", |         "owner": "dali99", | ||||||
|         "ref": "v0.6.1", |         "ref": "0.7.0", | ||||||
|         "repo": "nixos-matrix-modules", |         "repo": "nixos-matrix-modules", | ||||||
|         "type": "github" |         "type": "github" | ||||||
|       } |       } | ||||||
| @@ -110,11 +110,11 @@ | |||||||
|         "rev": "1b4087bd3322a2e2ba84271c8fcc013e6b641a58", |         "rev": "1b4087bd3322a2e2ba84271c8fcc013e6b641a58", | ||||||
|         "revCount": 2, |         "revCount": 2, | ||||||
|         "type": "git", |         "type": "git", | ||||||
|         "url": "https://git.pvv.ntnu.no/Drift/minecraft-data.git" |         "url": "https://git.pvv.ntnu.no/Projects/minecraft-kartverket.git" | ||||||
|       }, |       }, | ||||||
|       "original": { |       "original": { | ||||||
|         "type": "git", |         "type": "git", | ||||||
|         "url": "https://git.pvv.ntnu.no/Drift/minecraft-data.git" |         "url": "https://git.pvv.ntnu.no/Projects/minecraft-kartverket.git" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "nix-gitea-themes": { |     "nix-gitea-themes": { | ||||||
| @@ -124,26 +124,26 @@ | |||||||
|         ] |         ] | ||||||
|       }, |       }, | ||||||
|       "locked": { |       "locked": { | ||||||
|         "lastModified": 1736531400, |         "lastModified": 1743881366, | ||||||
|         "narHash": "sha256-+X/HVI1AwoPcud28wI35XRrc1kDgkYdDUGABJBAkxDI=", |         "narHash": "sha256-ScGA2IHPk9ugf9bqEZnp+YB/OJgrkZblnG/XLEKvJAo=", | ||||||
|         "ref": "refs/heads/main", |         "ref": "refs/heads/main", | ||||||
|         "rev": "e4dafd06b3d7e9e6e07617766e9c3743134571b7", |         "rev": "db2e4becf1b11e5dfd33de12a90a7d089fcf68ec", | ||||||
|         "revCount": 7, |         "revCount": 11, | ||||||
|         "type": "git", |         "type": "git", | ||||||
|         "url": "https://git.pvv.ntnu.no/oysteikt/nix-gitea-themes.git" |         "url": "https://git.pvv.ntnu.no/Drift/nix-gitea-themes.git" | ||||||
|       }, |       }, | ||||||
|       "original": { |       "original": { | ||||||
|         "type": "git", |         "type": "git", | ||||||
|         "url": "https://git.pvv.ntnu.no/oysteikt/nix-gitea-themes.git" |         "url": "https://git.pvv.ntnu.no/Drift/nix-gitea-themes.git" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "nixpkgs": { |     "nixpkgs": { | ||||||
|       "locked": { |       "locked": { | ||||||
|         "lastModified": 1740782485, |         "lastModified": 1745526780, | ||||||
|         "narHash": "sha256-GkDJDqHYlPKZFdyxzZHtljxNRsosKB1GCrblqlvLFgo=", |         "narHash": "sha256-LXXYBmFPMQU2lTb6alKWfjgQs08BKn+txMNcgbu00hI=", | ||||||
|         "owner": "NixOS", |         "owner": "NixOS", | ||||||
|         "repo": "nixpkgs", |         "repo": "nixpkgs", | ||||||
|         "rev": "dd5c2540983641bbaabdfc665931592d4c9989e8", |         "rev": "9204750b34cae1a8347ab4b5588115edfeebc6d7", | ||||||
|         "type": "github" |         "type": "github" | ||||||
|       }, |       }, | ||||||
|       "original": { |       "original": { | ||||||
| @@ -155,11 +155,11 @@ | |||||||
|     }, |     }, | ||||||
|     "nixpkgs-unstable": { |     "nixpkgs-unstable": { | ||||||
|       "locked": { |       "locked": { | ||||||
|         "lastModified": 1740848276, |         "lastModified": 1745688173, | ||||||
|         "narHash": "sha256-bYeI3FEs824X+MJYksKboNlmglehzplqzn+XvcojWMc=", |         "narHash": "sha256-fgvG1O5JvSSjeQx+ea0DJ3GfMbLPVhAQta/DqQ2y6jc=", | ||||||
|         "owner": "NixOS", |         "owner": "NixOS", | ||||||
|         "repo": "nixpkgs", |         "repo": "nixpkgs", | ||||||
|         "rev": "e9b0ff70ddc61c42548501b0fafb86bb49cca858", |         "rev": "6a2957c7978b189202e03721aab901c0a9dc1e1a", | ||||||
|         "type": "github" |         "type": "github" | ||||||
|       }, |       }, | ||||||
|       "original": { |       "original": { | ||||||
| @@ -196,11 +196,11 @@ | |||||||
|         ] |         ] | ||||||
|       }, |       }, | ||||||
|       "locked": { |       "locked": { | ||||||
|         "lastModified": 1737151758, |         "lastModified": 1741738148, | ||||||
|         "narHash": "sha256-yZBsefIarFUEhFRj+rCGMp9Zvag3MCafqV/JfGVRVwc=", |         "narHash": "sha256-cJo6nbcJEOjkazkZ194NDnlsZe0W0wpxeUh2/886uC8=", | ||||||
|         "ref": "refs/heads/master", |         "ref": "refs/heads/main", | ||||||
|         "rev": "a4ebe6ded0c8c124561a41cb329ff30891914b5e", |         "rev": "c1802e7cf27c7cf8b4890354c982a4eef5b11593", | ||||||
|         "revCount": 475, |         "revCount": 486, | ||||||
|         "type": "git", |         "type": "git", | ||||||
|         "url": "https://git.pvv.ntnu.no/Projects/nettsiden.git" |         "url": "https://git.pvv.ntnu.no/Projects/nettsiden.git" | ||||||
|       }, |       }, | ||||||
| @@ -233,11 +233,11 @@ | |||||||
|         ] |         ] | ||||||
|       }, |       }, | ||||||
|       "locked": { |       "locked": { | ||||||
|         "lastModified": 1729391507, |         "lastModified": 1746498961, | ||||||
|         "narHash": "sha256-as0I9xieJUHf7kiK2a9znDsVZQTFWhM1pLivII43Gi0=", |         "narHash": "sha256-rp+oh/N88JKHu7ySPuGiA3lBUVIsrOtHbN2eWJdYCgk=", | ||||||
|         "owner": "oxalica", |         "owner": "oxalica", | ||||||
|         "repo": "rust-overlay", |         "repo": "rust-overlay", | ||||||
|         "rev": "784981a9feeba406de38c1c9a3decf966d853cca", |         "rev": "24b00064cdd1d7ba25200c4a8565dc455dc732ba", | ||||||
|         "type": "github" |         "type": "github" | ||||||
|       }, |       }, | ||||||
|       "original": { |       "original": { | ||||||
| @@ -253,11 +253,11 @@ | |||||||
|         ] |         ] | ||||||
|       }, |       }, | ||||||
|       "locked": { |       "locked": { | ||||||
|         "lastModified": 1739262228, |         "lastModified": 1745310711, | ||||||
|         "narHash": "sha256-7JAGezJ0Dn5qIyA2+T4Dt/xQgAbhCglh6lzCekTVMeU=", |         "narHash": "sha256-ePyTpKEJTgX0gvgNQWd7tQYQ3glIkbqcW778RpHlqgA=", | ||||||
|         "owner": "Mic92", |         "owner": "Mic92", | ||||||
|         "repo": "sops-nix", |         "repo": "sops-nix", | ||||||
|         "rev": "07af005bb7d60c7f118d9d9f5530485da5d1e975", |         "rev": "5e3e92b16d6fdf9923425a8d4df7496b2434f39c", | ||||||
|         "type": "github" |         "type": "github" | ||||||
|       }, |       }, | ||||||
|       "original": { |       "original": { | ||||||
|   | |||||||
							
								
								
									
										35
									
								
								flake.nix
									
									
									
									
									
								
							
							
						
						
									
										35
									
								
								flake.nix
									
									
									
									
									
								
							| @@ -17,10 +17,10 @@ | |||||||
|     pvv-calendar-bot.url = "git+https://git.pvv.ntnu.no/Projects/calendar-bot.git"; |     pvv-calendar-bot.url = "git+https://git.pvv.ntnu.no/Projects/calendar-bot.git"; | ||||||
|     pvv-calendar-bot.inputs.nixpkgs.follows = "nixpkgs"; |     pvv-calendar-bot.inputs.nixpkgs.follows = "nixpkgs"; | ||||||
|  |  | ||||||
|     matrix-next.url = "github:dali99/nixos-matrix-modules/v0.6.1"; |     matrix-next.url = "github:dali99/nixos-matrix-modules/0.7.0"; | ||||||
|     matrix-next.inputs.nixpkgs.follows = "nixpkgs"; |     matrix-next.inputs.nixpkgs.follows = "nixpkgs"; | ||||||
|  |  | ||||||
|     nix-gitea-themes.url = "git+https://git.pvv.ntnu.no/oysteikt/nix-gitea-themes.git"; |     nix-gitea-themes.url = "git+https://git.pvv.ntnu.no/Drift/nix-gitea-themes.git"; | ||||||
|     nix-gitea-themes.inputs.nixpkgs.follows = "nixpkgs"; |     nix-gitea-themes.inputs.nixpkgs.follows = "nixpkgs"; | ||||||
|  |  | ||||||
|     greg-ng.url = "git+https://git.pvv.ntnu.no/Grzegorz/greg-ng.git"; |     greg-ng.url = "git+https://git.pvv.ntnu.no/Grzegorz/greg-ng.git"; | ||||||
| @@ -30,7 +30,7 @@ | |||||||
|     grzegorz-clients.url = "git+https://git.pvv.ntnu.no/Grzegorz/grzegorz-clients.git"; |     grzegorz-clients.url = "git+https://git.pvv.ntnu.no/Grzegorz/grzegorz-clients.git"; | ||||||
|     grzegorz-clients.inputs.nixpkgs.follows = "nixpkgs"; |     grzegorz-clients.inputs.nixpkgs.follows = "nixpkgs"; | ||||||
|  |  | ||||||
|     minecraft-data.url = "git+https://git.pvv.ntnu.no/Drift/minecraft-data.git"; |     minecraft-data.url = "git+https://git.pvv.ntnu.no/Projects/minecraft-kartverket.git"; | ||||||
|   }; |   }; | ||||||
|  |  | ||||||
|   outputs = { self, nixpkgs, nixpkgs-unstable, sops-nix, disko, ... }@inputs: |   outputs = { self, nixpkgs, nixpkgs-unstable, sops-nix, disko, ... }@inputs: | ||||||
| @@ -71,6 +71,11 @@ | |||||||
|  |  | ||||||
|           pkgs = import nixpkgs { |           pkgs = import nixpkgs { | ||||||
|             inherit system; |             inherit system; | ||||||
|  |             config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) | ||||||
|  |               [ | ||||||
|  |                 "nvidia-x11" | ||||||
|  |                 "nvidia-settings" | ||||||
|  |               ]; | ||||||
|             overlays = [ |             overlays = [ | ||||||
|               # Global overlays go here |               # Global overlays go here | ||||||
|             ] ++ config.overlays or [ ]; |             ] ++ config.overlays or [ ]; | ||||||
| @@ -86,6 +91,7 @@ | |||||||
|         modules = [ |         modules = [ | ||||||
|           inputs.matrix-next.nixosModules.default |           inputs.matrix-next.nixosModules.default | ||||||
|           inputs.pvv-calendar-bot.nixosModules.default |           inputs.pvv-calendar-bot.nixosModules.default | ||||||
|  |           self.nixosModules.gickup | ||||||
|         ]; |         ]; | ||||||
|         overlays = [ |         overlays = [ | ||||||
|           inputs.pvv-calendar-bot.overlays.x86_64-linux.default |           inputs.pvv-calendar-bot.overlays.x86_64-linux.default | ||||||
| @@ -99,11 +105,9 @@ | |||||||
|             simplesamlphp = final.callPackage ./packages/simplesamlphp { }; |             simplesamlphp = final.callPackage ./packages/simplesamlphp { }; | ||||||
|             bluemap = final.callPackage ./packages/bluemap.nix { }; |             bluemap = final.callPackage ./packages/bluemap.nix { }; | ||||||
|           }) |           }) | ||||||
|           inputs.nix-gitea-themes.overlays.default |  | ||||||
|           inputs.pvv-nettsiden.overlays.default |           inputs.pvv-nettsiden.overlays.default | ||||||
|         ]; |         ]; | ||||||
|         modules = [ |         modules = [ | ||||||
|           inputs.nix-gitea-themes.nixosModules.default |  | ||||||
|           inputs.pvv-nettsiden.nixosModules.default |           inputs.pvv-nettsiden.nixosModules.default | ||||||
|         ]; |         ]; | ||||||
|       }; |       }; | ||||||
| @@ -116,6 +120,16 @@ | |||||||
|       ildkule = stableNixosConfig "ildkule" { }; |       ildkule = stableNixosConfig "ildkule" { }; | ||||||
|       #ildkule-unstable = unstableNixosConfig "ildkule" { }; |       #ildkule-unstable = unstableNixosConfig "ildkule" { }; | ||||||
|       shark = stableNixosConfig "shark" { }; |       shark = stableNixosConfig "shark" { }; | ||||||
|  |       wenche = stableNixosConfig "wenche" { }; | ||||||
|  |  | ||||||
|  |       kommode = stableNixosConfig "kommode" { | ||||||
|  |         overlays = [ | ||||||
|  |           inputs.nix-gitea-themes.overlays.default | ||||||
|  |         ]; | ||||||
|  |         modules = [ | ||||||
|  |           inputs.nix-gitea-themes.nixosModules.default | ||||||
|  |         ]; | ||||||
|  |       }; | ||||||
|  |  | ||||||
|       ustetind = stableNixosConfig "ustetind" { |       ustetind = stableNixosConfig "ustetind" { | ||||||
|         modules = [ |         modules = [ | ||||||
| @@ -150,10 +164,21 @@ | |||||||
|     nixosModules = { |     nixosModules = { | ||||||
|       snakeoil-certs = ./modules/snakeoil-certs.nix; |       snakeoil-certs = ./modules/snakeoil-certs.nix; | ||||||
|       snappymail = ./modules/snappymail.nix; |       snappymail = ./modules/snappymail.nix; | ||||||
|  |       robots-txt = ./modules/robots-txt.nix; | ||||||
|  |       gickup = ./modules/gickup; | ||||||
|     }; |     }; | ||||||
|  |  | ||||||
|     devShells = forAllSystems (system: { |     devShells = forAllSystems (system: { | ||||||
|       default = nixpkgs.legacyPackages.${system}.callPackage ./shell.nix { }; |       default = nixpkgs.legacyPackages.${system}.callPackage ./shell.nix { }; | ||||||
|  |       cuda = let | ||||||
|  |         cuda-pkgs = import nixpkgs { | ||||||
|  |           inherit system; | ||||||
|  |           config = { | ||||||
|  |             allowUnfree = true; | ||||||
|  |             cudaSupport = true; | ||||||
|  |           }; | ||||||
|  |         }; | ||||||
|  |       in cuda-pkgs.callPackage ./shells/cuda.nix { }; | ||||||
|     }); |     }); | ||||||
|  |  | ||||||
|     packages = { |     packages = { | ||||||
|   | |||||||
| @@ -7,7 +7,6 @@ | |||||||
|     (fp /misc/metrics-exporters.nix) |     (fp /misc/metrics-exporters.nix) | ||||||
|  |  | ||||||
|     ./services/bluemap/default.nix |     ./services/bluemap/default.nix | ||||||
|     ./services/gitea/default.nix |  | ||||||
|     ./services/idp-simplesamlphp |     ./services/idp-simplesamlphp | ||||||
|     ./services/kerberos |     ./services/kerberos | ||||||
|     ./services/mediawiki |     ./services/mediawiki | ||||||
|   | |||||||
| @@ -61,7 +61,6 @@ in { | |||||||
|       user = "mediawiki"; |       user = "mediawiki"; | ||||||
|       passwordFile = config.sops.secrets."mediawiki/postgres_password".path; |       passwordFile = config.sops.secrets."mediawiki/postgres_password".path; | ||||||
|       createLocally = false; |       createLocally = false; | ||||||
|       # TODO: create a normal database and copy over old data when the service is production ready |  | ||||||
|       name = "mediawiki"; |       name = "mediawiki"; | ||||||
|     }; |     }; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -67,7 +67,12 @@ in { | |||||||
|         ADMIN_NAME = "PVV Drift"; |         ADMIN_NAME = "PVV Drift"; | ||||||
|         ADMIN_EMAIL = "drift@pvv.ntnu.no"; |         ADMIN_EMAIL = "drift@pvv.ntnu.no"; | ||||||
|         ADMIN_PASSWORD = includeFromSops "simplesamlphp/admin_password"; |         ADMIN_PASSWORD = includeFromSops "simplesamlphp/admin_password"; | ||||||
|         TRUSTED_DOMAINS = [ cfg.domainName ]; |         TRUSTED_DOMAINS = [ | ||||||
|  |           "www.pvv.ntnu.no" | ||||||
|  |           "pvv.ntnu.no" | ||||||
|  |           "www.pvv.org" | ||||||
|  |           "pvv.org" | ||||||
|  |         ]; | ||||||
|       }; |       }; | ||||||
|     }; |     }; | ||||||
|   }; |   }; | ||||||
|   | |||||||
| @@ -7,10 +7,10 @@ | |||||||
|     (fp /misc/metrics-exporters.nix) |     (fp /misc/metrics-exporters.nix) | ||||||
|     ./services/nginx |     ./services/nginx | ||||||
|  |  | ||||||
|  |     ./services/calendar-bot.nix | ||||||
|  |     ./services/git-mirrors | ||||||
|     ./services/mysql.nix |     ./services/mysql.nix | ||||||
|     ./services/postgres.nix |     ./services/postgres.nix | ||||||
|     ./services/mysql.nix |  | ||||||
|     ./services/calendar-bot.nix |  | ||||||
|  |  | ||||||
|     ./services/matrix |     ./services/matrix | ||||||
|   ]; |   ]; | ||||||
|   | |||||||
							
								
								
									
										92
									
								
								hosts/bicep/services/git-mirrors/default.nix
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										92
									
								
								hosts/bicep/services/git-mirrors/default.nix
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,92 @@ | |||||||
|  | { config, pkgs, lib, fp, ... }: | ||||||
|  | let | ||||||
|  |   cfg = config.services.gickup; | ||||||
|  | in | ||||||
|  | { | ||||||
|  |   sops.secrets."gickup/github-token" = { | ||||||
|  |     owner = "gickup"; | ||||||
|  |   }; | ||||||
|  |  | ||||||
|  |   services.gickup = { | ||||||
|  |     enable = true; | ||||||
|  |  | ||||||
|  |     dataDir = "/data/gickup"; | ||||||
|  |  | ||||||
|  |     destinationSettings = { | ||||||
|  |       structured = true; | ||||||
|  |       zip = false; | ||||||
|  |       keep = 10; | ||||||
|  |       bare = true; | ||||||
|  |       lfs = true; | ||||||
|  |     }; | ||||||
|  |  | ||||||
|  |     instances = let | ||||||
|  |       defaultGithubConfig = { | ||||||
|  |         settings.token_file = config.sops.secrets."gickup/github-token".path; | ||||||
|  |       }; | ||||||
|  |       defaultGitlabConfig = { | ||||||
|  |         # settings.token_file = ... | ||||||
|  |       }; | ||||||
|  |     in { | ||||||
|  |       "github:Git-Mediawiki/Git-Mediawiki" = defaultGithubConfig; | ||||||
|  |       "github:NixOS/nixpkgs" = defaultGithubConfig; | ||||||
|  |       "github:go-gitea/gitea" = defaultGithubConfig; | ||||||
|  |       "github:heimdal/heimdal" = defaultGithubConfig; | ||||||
|  |       "github:saltstack/salt" = defaultGithubConfig; | ||||||
|  |       "github:typst/typst" = defaultGithubConfig; | ||||||
|  |       "github:unmojang/FjordLauncher" = defaultGithubConfig; | ||||||
|  |       "github:unmojang/drasl" = defaultGithubConfig; | ||||||
|  |       "github:yushijinhun/authlib-injector" = defaultGithubConfig; | ||||||
|  |  | ||||||
|  |       "gitlab:mx-puppet/discord/better-discord.js" = defaultGitlabConfig; | ||||||
|  |       "gitlab:mx-puppet/discord/discord-markdown" = defaultGitlabConfig; | ||||||
|  |       "gitlab:mx-puppet/discord/matrix-discord-parser" = defaultGitlabConfig; | ||||||
|  |       "gitlab:mx-puppet/discord/mx-puppet-discord" = defaultGitlabConfig; | ||||||
|  |       "gitlab:mx-puppet/mx-puppet-bridge" = defaultGitlabConfig; | ||||||
|  |  | ||||||
|  |       "any:glibc" = { | ||||||
|  |         settings.url = "https://sourceware.org/git/glibc.git"; | ||||||
|  |       }; | ||||||
|  |     }; | ||||||
|  |   }; | ||||||
|  |  | ||||||
|  |   services.cgit = let | ||||||
|  |     domain = "bicep.pvv.ntnu.no"; | ||||||
|  |   in { | ||||||
|  |     ${domain} = { | ||||||
|  |       enable = true; | ||||||
|  |       package = pkgs.callPackage (fp /packages/cgit.nix) { }; | ||||||
|  |       group = "gickup"; | ||||||
|  |       scanPath = "${cfg.dataDir}/linktree"; | ||||||
|  |       settings = { | ||||||
|  |         enable-commit-graph = true; | ||||||
|  |         enable-follow-links = true; | ||||||
|  |         enable-http-clone = true; | ||||||
|  |         enable-remote-branches = true; | ||||||
|  |         clone-url = "https://${domain}/$CGIT_REPO_URL"; | ||||||
|  |         remove-suffix = true; | ||||||
|  |         root-title = "PVVSPPP"; | ||||||
|  |         root-desc = "PVV Speiler Praktisk og Prominent Programvare"; | ||||||
|  |         snapshots = "all"; | ||||||
|  |         logo = "/PVV-logo.png"; | ||||||
|  |       }; | ||||||
|  |     }; | ||||||
|  |   }; | ||||||
|  |  | ||||||
|  |   services.nginx.virtualHosts."bicep.pvv.ntnu.no" = { | ||||||
|  |     forceSSL = true; | ||||||
|  |     enableACME = true; | ||||||
|  |  | ||||||
|  |     locations."= /PVV-logo.png".alias = let | ||||||
|  |       small-pvv-logo = pkgs.runCommandLocal "pvv-logo-96x96" { | ||||||
|  |         nativeBuildInputs = [ pkgs.imagemagick ]; | ||||||
|  |       } '' | ||||||
|  |         magick '${fp /assets/logo_blue_regular.svg}' -resize 96x96 PNG:"$out" | ||||||
|  |       ''; | ||||||
|  |     in toString small-pvv-logo; | ||||||
|  |   }; | ||||||
|  |  | ||||||
|  |   systemd.services."fcgiwrap-cgit-bicep.pvv.ntnu.no" = { | ||||||
|  |     serviceConfig.BindReadOnlyPaths = [ cfg.dataDir ]; | ||||||
|  |   }; | ||||||
|  | } | ||||||
| @@ -1539,8 +1539,8 @@ | |||||||
|     ] |     ] | ||||||
|   }, |   }, | ||||||
|   "timezone": "browser", |   "timezone": "browser", | ||||||
|   "title": "Gitea Dashbaord", |   "title": "Gitea Dashboard", | ||||||
|   "uid": "nNq1Iw5Gz", |   "uid": "nNq1Iw5Gz", | ||||||
|   "version": 29, |   "version": 29, | ||||||
|   "weekStart": "" |   "weekStart": "" | ||||||
| } | } | ||||||
| @@ -56,13 +56,12 @@ in { | |||||||
|           url = "https://raw.githubusercontent.com/matrix-org/synapse/develop/contrib/grafana/synapse.json"; |           url = "https://raw.githubusercontent.com/matrix-org/synapse/develop/contrib/grafana/synapse.json"; | ||||||
|           options.path = dashboards/synapse.json; |           options.path = dashboards/synapse.json; | ||||||
|         } |         } | ||||||
|         # TODO: enable once https://github.com/NixOS/nixpkgs/pull/242365 gets merged |         { | ||||||
|         # { |           name = "MySQL"; | ||||||
|         #   name = "MySQL"; |           type = "file"; | ||||||
|         #   type = "file"; |           url = "https://raw.githubusercontent.com/prometheus/mysqld_exporter/main/mysqld-mixin/dashboards/mysql-overview.json"; | ||||||
|         #   url = "https://raw.githubusercontent.com/prometheus/mysqld_exporter/main/mysqld-mixin/dashboards/mysql-overview.json"; |           options.path = dashboards/mysql.json; | ||||||
|         #   options.path = dashboards/mysql.json; |         } | ||||||
|         # } |  | ||||||
|         { |         { | ||||||
|           name = "Postgresql"; |           name = "Postgresql"; | ||||||
|           type = "file"; |           type = "file"; | ||||||
| @@ -76,10 +75,10 @@ in { | |||||||
|           options.path = dashboards/go-processes.json; |           options.path = dashboards/go-processes.json; | ||||||
|         } |         } | ||||||
|         { |         { | ||||||
|           name = "Gitea Dashbaord"; |           name = "Gitea Dashboard"; | ||||||
|           type = "file"; |           type = "file"; | ||||||
|           url = "https://grafana.com/api/dashboards/17802/revisions/3/download"; |           url = "https://grafana.com/api/dashboards/17802/revisions/3/download"; | ||||||
|           options.path = dashboards/gitea-dashbaord.json; |           options.path = dashboards/gitea-dashboard.json; | ||||||
|         } |         } | ||||||
|       ]; |       ]; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -4,8 +4,7 @@ in { | |||||||
|   imports = [ |   imports = [ | ||||||
|     ./gitea.nix |     ./gitea.nix | ||||||
|     ./matrix-synapse.nix |     ./matrix-synapse.nix | ||||||
|     # TODO: enable once https://github.com/NixOS/nixpkgs/pull/242365 gets merged |     ./mysqld.nix | ||||||
|     # ./mysqld.nix |  | ||||||
|     ./postgres.nix |     ./postgres.nix | ||||||
|     ./machines.nix |     ./machines.nix | ||||||
|   ]; |   ]; | ||||||
|   | |||||||
| @@ -16,6 +16,12 @@ in { | |||||||
|           "bekkalokk.pvv.ntnu.no:9101" |           "bekkalokk.pvv.ntnu.no:9101" | ||||||
|         ]; |         ]; | ||||||
|       } |       } | ||||||
|  |       { labels.hostname = "kommode"; | ||||||
|  |         targets = [ | ||||||
|  |           "kommode.pvv.ntnu.no:9100" | ||||||
|  |           "kommode.pvv.ntnu.no:9101" | ||||||
|  |         ]; | ||||||
|  |       } | ||||||
|       { labels.hostname = "bicep"; |       { labels.hostname = "bicep"; | ||||||
|         targets = [ |         targets = [ | ||||||
|           "bicep.pvv.ntnu.no:9100" |           "bicep.pvv.ntnu.no:9100" | ||||||
| @@ -34,6 +40,12 @@ in { | |||||||
|           "georg.pvv.ntnu.no:9101" |           "georg.pvv.ntnu.no:9101" | ||||||
|         ]; |         ]; | ||||||
|       } |       } | ||||||
|  |       { labels.hostname = "ustetind"; | ||||||
|  |         targets = [ | ||||||
|  |           "ustetind.pvv.ntnu.no:9100" | ||||||
|  |           "ustetind.pvv.ntnu.no:9101" | ||||||
|  |         ]; | ||||||
|  |       } | ||||||
|       { labels.hostname =  "hildring"; |       { labels.hostname =  "hildring"; | ||||||
|         targets = [ |         targets = [ | ||||||
|           "hildring.pvv.ntnu.no:9100" |           "hildring.pvv.ntnu.no:9100" | ||||||
|   | |||||||
| @@ -1,7 +1,22 @@ | |||||||
| { config, ... }: let | { config, ... }: let | ||||||
|   cfg = config.services.prometheus; |   cfg = config.services.prometheus; | ||||||
| in { | in { | ||||||
|   sops.secrets."config/mysqld_exporter" = { }; |   sops = { | ||||||
|  |     secrets."config/mysqld_exporter_password" = { }; | ||||||
|  |  | ||||||
|  |     templates."mysqld_exporter.conf" = { | ||||||
|  |       restartUnits = [ "prometheus-mysqld-exporter.service" ]; | ||||||
|  |       content = let | ||||||
|  |         inherit (config.sops) placeholder; | ||||||
|  |       in '' | ||||||
|  |         [client] | ||||||
|  |         host = bicep.pvv.ntnu.no | ||||||
|  |         port = 3306 | ||||||
|  |         user = prometheus_mysqld_exporter | ||||||
|  |         password = ${placeholder."config/mysqld_exporter_password"} | ||||||
|  |       ''; | ||||||
|  |     }; | ||||||
|  |   }; | ||||||
|  |  | ||||||
|   services.prometheus = { |   services.prometheus = { | ||||||
|     scrapeConfigs = [{ |     scrapeConfigs = [{ | ||||||
| @@ -19,7 +34,7 @@ in { | |||||||
|  |  | ||||||
|     exporters.mysqld = { |     exporters.mysqld = { | ||||||
|       enable = true; |       enable = true; | ||||||
|       configFilePath = config.sops.secrets."config/mysqld_exporter".path; |       configFile = config.sops.templates."mysqld_exporter.conf".path; | ||||||
|     }; |     }; | ||||||
|   }; |   }; | ||||||
| } | } | ||||||
|   | |||||||
							
								
								
									
										34
									
								
								hosts/kommode/configuration.nix
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										34
									
								
								hosts/kommode/configuration.nix
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,34 @@ | |||||||
|  | { pkgs, values, fp, ... }: | ||||||
|  | { | ||||||
|  |   imports = [ | ||||||
|  |     # Include the results of the hardware scan. | ||||||
|  |     ./hardware-configuration.nix | ||||||
|  |     (fp /base) | ||||||
|  |     (fp /misc/metrics-exporters.nix) | ||||||
|  |  | ||||||
|  |     ./services/gitea | ||||||
|  |     ./services/nginx.nix | ||||||
|  |   ]; | ||||||
|  |  | ||||||
|  |   sops.defaultSopsFile = fp /secrets/kommode/kommode.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; | ||||||
|  |  | ||||||
|  |   networking.hostName = "kommode"; # Define your hostname. | ||||||
|  |  | ||||||
|  |   systemd.network.networks."30-ens18" = values.defaultNetworkConfig // { | ||||||
|  |     matchConfig.Name = "ens18"; | ||||||
|  |     address = with values.hosts.kommode; [ (ipv4 + "/25") (ipv6 + "/64") ]; | ||||||
|  |   }; | ||||||
|  |  | ||||||
|  |   services.btrfs.autoScrub.enable = true; | ||||||
|  |  | ||||||
|  |   environment.systemPackages = with pkgs; []; | ||||||
|  |  | ||||||
|  |   system.stateVersion = "24.11"; | ||||||
|  | } | ||||||
|  |  | ||||||
							
								
								
									
										39
									
								
								hosts/kommode/hardware-configuration.nix
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										39
									
								
								hosts/kommode/hardware-configuration.nix
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,39 @@ | |||||||
|  | # 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 + "/profiles/qemu-guest.nix") | ||||||
|  |     ]; | ||||||
|  |  | ||||||
|  |   boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ]; | ||||||
|  |   boot.initrd.kernelModules = [ ]; | ||||||
|  |   boot.kernelModules = [ ]; | ||||||
|  |   boot.extraModulePackages = [ ]; | ||||||
|  |  | ||||||
|  |   fileSystems."/" = | ||||||
|  |     { device = "/dev/disk/by-uuid/d421538f-a260-44ae-8e03-47cac369dcc1"; | ||||||
|  |       fsType = "btrfs"; | ||||||
|  |     }; | ||||||
|  |  | ||||||
|  |   fileSystems."/boot" = | ||||||
|  |     { device = "/dev/disk/by-uuid/86CD-4C23"; | ||||||
|  |       fsType = "vfat"; | ||||||
|  |       options = [ "fmask=0077" "dmask=0077" ]; | ||||||
|  |     }; | ||||||
|  |  | ||||||
|  |   swapDevices = | ||||||
|  |     [ { device = "/dev/disk/by-uuid/4cfbb41e-801f-40dd-8c58-0a0c1a6025f6"; } | ||||||
|  |     ]; | ||||||
|  |  | ||||||
|  |   # 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.ens18.useDHCP = lib.mkDefault true; | ||||||
|  |  | ||||||
|  |   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; | ||||||
|  | } | ||||||
							
								
								
									
										52
									
								
								hosts/kommode/services/gitea/customization/default.nix
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										52
									
								
								hosts/kommode/services/gitea/customization/default.nix
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,52 @@ | |||||||
|  | { config, pkgs, lib, fp, ... }: | ||||||
|  | let | ||||||
|  |   cfg = config.services.gitea; | ||||||
|  | in | ||||||
|  | { | ||||||
|  |   services.gitea-themes.monokai = pkgs.gitea-theme-monokai; | ||||||
|  |  | ||||||
|  |   systemd.services.gitea-customization = lib.mkIf cfg.enable { | ||||||
|  |     description = "Install extra customization in gitea's CUSTOM_DIR"; | ||||||
|  |     wantedBy = [ "gitea.service" ]; | ||||||
|  |     requiredBy = [ "gitea.service" ]; | ||||||
|  |  | ||||||
|  |     serviceConfig =  { | ||||||
|  |       Type = "oneshot"; | ||||||
|  |       User = cfg.user; | ||||||
|  |       Group = cfg.group; | ||||||
|  |     }; | ||||||
|  |  | ||||||
|  |     script = let | ||||||
|  |       logo-svg = fp /assets/logo_blue_regular.svg; | ||||||
|  |       logo-png = fp /assets/logo_blue_regular.png; | ||||||
|  |       extraLinks = pkgs.writeText "gitea-extra-links.tmpl" '' | ||||||
|  |         <a class="item" href="https://www.pvv.ntnu.no/">PVV</a> | ||||||
|  |         <a class="item" href="https://wiki.pvv.ntnu.no/">Wiki</a> | ||||||
|  |         <a class="item" href="https://git.pvv.ntnu.no/Drift/-/projects/4">Tokyo Drift Issues</a> | ||||||
|  |       ''; | ||||||
|  |  | ||||||
|  |       project-labels = (pkgs.formats.yaml { }).generate "gitea-project-labels.yaml" { | ||||||
|  |         labels = lib.importJSON ./labels/projects.json; | ||||||
|  |       }; | ||||||
|  |  | ||||||
|  |       customTemplates = pkgs.runCommandLocal "gitea-templates" { | ||||||
|  |         nativeBuildInputs = with pkgs; [ | ||||||
|  |           coreutils | ||||||
|  |           gnused | ||||||
|  |         ]; | ||||||
|  |       } '' | ||||||
|  |         # Bigger icons | ||||||
|  |         install -Dm444 "${cfg.package.src}/templates/repo/icon.tmpl" "$out/repo/icon.tmpl" | ||||||
|  |         sed -i -e 's/24/48/g' "$out/repo/icon.tmpl" | ||||||
|  |       ''; | ||||||
|  |     in '' | ||||||
|  |       install -Dm444 ${logo-svg} ${cfg.customDir}/public/assets/img/logo.svg | ||||||
|  |       install -Dm444 ${logo-png} ${cfg.customDir}/public/assets/img/logo.png | ||||||
|  |       install -Dm444 ${./loading.apng} ${cfg.customDir}/public/assets/img/loading.png | ||||||
|  |       install -Dm444 ${extraLinks} ${cfg.customDir}/templates/custom/extra_links.tmpl | ||||||
|  |       install -Dm444 ${project-labels} ${cfg.customDir}/options/label/project-labels.yaml | ||||||
|  |  | ||||||
|  |       "${lib.getExe pkgs.rsync}" -a "${customTemplates}/" ${cfg.customDir}/templates/ | ||||||
|  |     ''; | ||||||
|  |   }; | ||||||
|  | } | ||||||
| Before Width: | Height: | Size: 1.1 MiB After Width: | Height: | Size: 1.1 MiB | 
| @@ -1,10 +1,11 @@ | |||||||
| { config, values, fp, pkgs, lib, ... }: | { config, values, lib, unstablePkgs, ... }: | ||||||
| let | let | ||||||
|   cfg = config.services.gitea; |   cfg = config.services.gitea; | ||||||
|   domain = "git.pvv.ntnu.no"; |   domain = "git.pvv.ntnu.no"; | ||||||
|   sshPort  = 2222; |   sshPort  = 2222; | ||||||
| in { | in { | ||||||
|   imports = [ |   imports = [ | ||||||
|  |     ./customization | ||||||
|     ./gpg.nix |     ./gpg.nix | ||||||
|     ./import-users |     ./import-users | ||||||
|     ./web-secret-provider |     ./web-secret-provider | ||||||
| @@ -25,6 +26,8 @@ in { | |||||||
|     enable = true; |     enable = true; | ||||||
|     appName = "PVV Git"; |     appName = "PVV Git"; | ||||||
| 
 | 
 | ||||||
|  |     package = unstablePkgs.gitea; | ||||||
|  | 
 | ||||||
|     database = { |     database = { | ||||||
|       type = "postgres"; |       type = "postgres"; | ||||||
|       host = "postgres.pvv.ntnu.no"; |       host = "postgres.pvv.ntnu.no"; | ||||||
| @@ -46,6 +49,10 @@ in { | |||||||
|         START_LFS_SERVER = true; |         START_LFS_SERVER = true; | ||||||
|         LANDING_PAGE = "explore"; |         LANDING_PAGE = "explore"; | ||||||
|       }; |       }; | ||||||
|  |       "git.timeout" = { | ||||||
|  |         MIGRATE = 3600; | ||||||
|  |         MIRROR = 1800; | ||||||
|  |       }; | ||||||
|       mailer = { |       mailer = { | ||||||
|         ENABLED = true; |         ENABLED = true; | ||||||
|         FROM = "gitea@pvv.ntnu.no"; |         FROM = "gitea@pvv.ntnu.no"; | ||||||
| @@ -130,10 +137,18 @@ in { | |||||||
|       }; |       }; | ||||||
|       "ui.meta".DESCRIPTION = "Bokstavelig talt programvareverkstedet"; |       "ui.meta".DESCRIPTION = "Bokstavelig talt programvareverkstedet"; | ||||||
|     }; |     }; | ||||||
|  | 
 | ||||||
|  |     dump = { | ||||||
|  |       enable = true; | ||||||
|  |       interval = "weekly"; | ||||||
|  |       type = "tar.gz"; | ||||||
|  |     }; | ||||||
|   }; |   }; | ||||||
| 
 | 
 | ||||||
|   environment.systemPackages = [ cfg.package ]; |   environment.systemPackages = [ cfg.package ]; | ||||||
| 
 | 
 | ||||||
|  |   systemd.services.gitea.serviceConfig.CPUSchedulingPolicy = "batch"; | ||||||
|  | 
 | ||||||
|   services.nginx.virtualHosts."${domain}" = { |   services.nginx.virtualHosts."${domain}" = { | ||||||
|     forceSSL = true; |     forceSSL = true; | ||||||
|     enableACME = true; |     enableACME = true; | ||||||
| @@ -149,6 +164,7 @@ in { | |||||||
|         proxyPass = "http://unix:${cfg.settings.server.HTTP_ADDR}"; |         proxyPass = "http://unix:${cfg.settings.server.HTTP_ADDR}"; | ||||||
|         extraConfig = '' |         extraConfig = '' | ||||||
|           allow ${values.hosts.ildkule.ipv4}/32; |           allow ${values.hosts.ildkule.ipv4}/32; | ||||||
|  |           allow ${values.hosts.ildkule.ipv6}/128; | ||||||
|           deny all; |           deny all; | ||||||
|         ''; |         ''; | ||||||
|       }; |       }; | ||||||
| @@ -156,40 +172,4 @@ in { | |||||||
|   }; |   }; | ||||||
| 
 | 
 | ||||||
|   networking.firewall.allowedTCPPorts = [ sshPort ]; |   networking.firewall.allowedTCPPorts = [ sshPort ]; | ||||||
| 
 |  | ||||||
|   # Extra customization |  | ||||||
| 
 |  | ||||||
|   services.gitea-themes.monokai = pkgs.gitea-theme-monokai; |  | ||||||
| 
 |  | ||||||
|   systemd.services.install-gitea-customization = { |  | ||||||
|     description = "Install extra customization in gitea's CUSTOM_DIR"; |  | ||||||
|     wantedBy = [ "gitea.service" ]; |  | ||||||
|     requiredBy = [ "gitea.service" ]; |  | ||||||
| 
 |  | ||||||
|     serviceConfig =  { |  | ||||||
|       Type = "oneshot"; |  | ||||||
|       User = cfg.user; |  | ||||||
|       Group = cfg.group; |  | ||||||
|     }; |  | ||||||
| 
 |  | ||||||
|     script = let |  | ||||||
|       logo-svg = fp /assets/logo_blue_regular.svg; |  | ||||||
|       logo-png = fp /assets/logo_blue_regular.png; |  | ||||||
|       extraLinks = pkgs.writeText "gitea-extra-links.tmpl" '' |  | ||||||
|         <a class="item" href="https://www.pvv.ntnu.no/">PVV</a> |  | ||||||
|         <a class="item" href="https://wiki.pvv.ntnu.no/">Wiki</a> |  | ||||||
|         <a class="item" href="https://git.pvv.ntnu.no/Drift/-/projects/4">Tokyo Drift Issues</a> |  | ||||||
|       ''; |  | ||||||
| 
 |  | ||||||
|       project-labels = (pkgs.formats.yaml { }).generate "gitea-project-labels.yaml" { |  | ||||||
|         labels = lib.importJSON ./labels/projects.json; |  | ||||||
|       }; |  | ||||||
|     in '' |  | ||||||
|       install -Dm444 ${logo-svg} ${cfg.customDir}/public/assets/img/logo.svg |  | ||||||
|       install -Dm444 ${logo-png} ${cfg.customDir}/public/assets/img/logo.png |  | ||||||
|       install -Dm444 ${./loading.apng} ${cfg.customDir}/public/assets/img/loading.png |  | ||||||
|       install -Dm444 ${extraLinks} ${cfg.customDir}/templates/custom/extra_links.tmpl |  | ||||||
|       install -Dm444 ${project-labels} ${cfg.customDir}/options/label/project-labels.yaml |  | ||||||
|     ''; |  | ||||||
|   }; |  | ||||||
| } | } | ||||||
							
								
								
									
										4
									
								
								hosts/kommode/services/nginx.nix
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										4
									
								
								hosts/kommode/services/nginx.nix
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,4 @@ | |||||||
|  | { ... }: | ||||||
|  | { | ||||||
|  |   services.nginx.enable = true; | ||||||
|  | } | ||||||
							
								
								
									
										39
									
								
								hosts/wenche/configuration.nix
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										39
									
								
								hosts/wenche/configuration.nix
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,39 @@ | |||||||
|  | { config, fp, pkgs, values, lib, ... }: | ||||||
|  | { | ||||||
|  |   imports = [ | ||||||
|  |       # Include the results of the hardware scan. | ||||||
|  |       ./hardware-configuration.nix | ||||||
|  |       (fp /base) | ||||||
|  |       (fp /misc/metrics-exporters.nix) | ||||||
|  |  | ||||||
|  |       (fp /misc/builder.nix) | ||||||
|  |     ]; | ||||||
|  |  | ||||||
|  |   sops.defaultSopsFile = fp /secrets/wenche/wenche.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.device = "/dev/sda"; | ||||||
|  |  | ||||||
|  |   networking.hostName = "wenche"; # Define your hostname. | ||||||
|  |  | ||||||
|  |   systemd.network.networks."30-ens18" = values.defaultNetworkConfig // { | ||||||
|  |     matchConfig.Name = "ens18"; | ||||||
|  |     address = with values.hosts.wenche; [ (ipv4 + "/25") (ipv6 + "/64") ]; | ||||||
|  |   }; | ||||||
|  |  | ||||||
|  |   hardware.graphics.enable = true; | ||||||
|  |   services.xserver.videoDrivers = [ "nvidia" ]; | ||||||
|  |   hardware.nvidia = { | ||||||
|  |     modesetting.enable = true; | ||||||
|  |     open = false; | ||||||
|  |     package = config.boot.kernelPackages.nvidiaPackages.production; | ||||||
|  |   }; | ||||||
|  |  | ||||||
|  |   # List packages installed in system profile | ||||||
|  |   environment.systemPackages = with pkgs; [ | ||||||
|  |   ]; | ||||||
|  |  | ||||||
|  |   system.stateVersion = "24.11"; # Did you read the comment? | ||||||
|  | } | ||||||
							
								
								
									
										27
									
								
								hosts/wenche/hardware-configuration.nix
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										27
									
								
								hosts/wenche/hardware-configuration.nix
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,27 @@ | |||||||
|  | { config, lib, pkgs, modulesPath, ... }: | ||||||
|  |  | ||||||
|  | { | ||||||
|  |   imports = | ||||||
|  |     [ (modulesPath + "/profiles/qemu-guest.nix") | ||||||
|  |     ]; | ||||||
|  |  | ||||||
|  |   boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ]; | ||||||
|  |   boot.initrd.kernelModules = [ ]; | ||||||
|  |   boot.kernelModules = [ "nvidia"  ]; | ||||||
|  |   boot.extraModulePackages = [ ]; | ||||||
|  |  | ||||||
|  |   fileSystems."/" = | ||||||
|  |     { device = "/dev/disk/by-uuid/4e8ecdd2-d453-4fff-b952-f06da00f3b85"; | ||||||
|  |       fsType = "ext4"; | ||||||
|  |     }; | ||||||
|  |  | ||||||
|  |   swapDevices = [ { | ||||||
|  |     device = "/var/lib/swapfile"; | ||||||
|  |     size = 16*1024; | ||||||
|  |   } ]; | ||||||
|  |  | ||||||
|  |   networking.useDHCP = lib.mkDefault false; | ||||||
|  |   # networking.interfaces.ens18.useDHCP = lib.mkDefault true; | ||||||
|  |  | ||||||
|  |   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; | ||||||
|  | } | ||||||
| @@ -8,34 +8,47 @@ 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 | ||||||
| SNkE | gpCGtxnHW2zReIS6ezZdtxYBCkEHK70yASyaIHrLLDknw+DuKvXAWOAecob8GNBH | ||||||
| =oTMO | 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 | ||||||
| -----END PGP PUBLIC KEY BLOCK----- | -----END PGP PUBLIC KEY BLOCK----- | ||||||
|   | |||||||
| @@ -2,4 +2,10 @@ | |||||||
|  |  | ||||||
| { | { | ||||||
|   nix.settings.trusted-users = [ "@nix-builder-users" ]; |   nix.settings.trusted-users = [ "@nix-builder-users" ]; | ||||||
|  |   nix.daemonCPUSchedPolicy = "batch"; | ||||||
|  |  | ||||||
|  |   boot.binfmt.emulatedSystems = [ | ||||||
|  |     "aarch64-linux" | ||||||
|  |     "armv7l-linux" | ||||||
|  |   ]; | ||||||
| } | } | ||||||
|   | |||||||
							
								
								
									
										312
									
								
								modules/gickup/default.nix
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										312
									
								
								modules/gickup/default.nix
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,312 @@ | |||||||
|  | { config, pkgs, lib, utils, ... }: | ||||||
|  | let | ||||||
|  |   cfg = config.services.gickup; | ||||||
|  |   format = pkgs.formats.yaml { }; | ||||||
|  | in | ||||||
|  | { | ||||||
|  |   imports = [ | ||||||
|  |     ./set-description.nix | ||||||
|  |     ./hardlink-files.nix | ||||||
|  |     ./import-from-toml.nix | ||||||
|  |     ./update-linktree.nix | ||||||
|  |   ]; | ||||||
|  |  | ||||||
|  |   options.services.gickup = { | ||||||
|  |     enable = lib.mkEnableOption "gickup, a git repository mirroring service"; | ||||||
|  |  | ||||||
|  |     package = lib.mkPackageOption pkgs "gickup" { }; | ||||||
|  |     gitPackage = lib.mkPackageOption pkgs "git" { }; | ||||||
|  |     gitLfsPackage = lib.mkPackageOption pkgs "git-lfs" { }; | ||||||
|  |  | ||||||
|  |     dataDir = lib.mkOption { | ||||||
|  |       type = lib.types.path; | ||||||
|  |       description = "The directory to mirror repositories to."; | ||||||
|  |       default = "/var/lib/gickup"; | ||||||
|  |       example = "/data/gickup"; | ||||||
|  |     }; | ||||||
|  |  | ||||||
|  |     destinationSettings = lib.mkOption { | ||||||
|  |       description = '' | ||||||
|  |         Settings for destination local, see gickup configuration file | ||||||
|  |  | ||||||
|  |         Note that `path` will be set automatically to `/var/lib/gickup` | ||||||
|  |       ''; | ||||||
|  |       type = lib.types.submodule { | ||||||
|  |         freeformType = format.type; | ||||||
|  |       }; | ||||||
|  |       default = { }; | ||||||
|  |       example = { | ||||||
|  |         structured = true; | ||||||
|  |         zip = false; | ||||||
|  |         keep = 10; | ||||||
|  |         bare = true; | ||||||
|  |         lfs = true; | ||||||
|  |       }; | ||||||
|  |     }; | ||||||
|  |  | ||||||
|  |     instances = lib.mkOption { | ||||||
|  |       type = lib.types.attrsOf (lib.types.submodule (submoduleInputs@{ name, ... }: let | ||||||
|  |         submoduleName = name; | ||||||
|  |  | ||||||
|  |         nameParts = rec { | ||||||
|  |           repoType = builtins.head (lib.splitString ":" submoduleName); | ||||||
|  |  | ||||||
|  |           owner = if repoType == "any" | ||||||
|  |                   then null | ||||||
|  |                   else lib.pipe submoduleName [ | ||||||
|  |                     (lib.removePrefix "${repoType}:") | ||||||
|  |                     (lib.splitString "/") | ||||||
|  |                     builtins.head | ||||||
|  |                     lib.toLower | ||||||
|  |                   ]; | ||||||
|  |  | ||||||
|  |           repo = if repoType == "any" | ||||||
|  |                  then null | ||||||
|  |                  else lib.pipe submoduleName [ | ||||||
|  |                     (lib.removePrefix "${repoType}:") | ||||||
|  |                     (lib.splitString "/") | ||||||
|  |                     lib.last | ||||||
|  |                     lib.toLower | ||||||
|  |                   ]; | ||||||
|  |  | ||||||
|  |           slug = if repoType == "any" | ||||||
|  |                  then builtins.replaceStrings [ ":" "/" ] [ "-" "-" ] submoduleName | ||||||
|  |                  else "${repoType}-${owner}-${repo}"; | ||||||
|  |         }; | ||||||
|  |       in { | ||||||
|  |         options = { | ||||||
|  |           interval = lib.mkOption { | ||||||
|  |             type = lib.types.str; | ||||||
|  |             default = "daily"; | ||||||
|  |             example = "weekly"; | ||||||
|  |             description = '' | ||||||
|  |               Specification (in the format described by {manpage}`systemd.time(7)`) of the time | ||||||
|  |               interval at which to run the service. | ||||||
|  |             ''; | ||||||
|  |           }; | ||||||
|  |  | ||||||
|  |           type = lib.mkOption { | ||||||
|  |             type = lib.types.enum [ | ||||||
|  |               "github" | ||||||
|  |               "gitlab" | ||||||
|  |               "gitea" | ||||||
|  |               "gogs" | ||||||
|  |               "bitbucket" | ||||||
|  |               "onedev" | ||||||
|  |               "sourcehut" | ||||||
|  |               "any" | ||||||
|  |             ]; | ||||||
|  |             example = "github"; | ||||||
|  |             default = nameParts.repoType; | ||||||
|  |             description = '' | ||||||
|  |               The type of the repository to mirror. | ||||||
|  |             ''; | ||||||
|  |           }; | ||||||
|  |  | ||||||
|  |           owner = lib.mkOption { | ||||||
|  |             type = with lib.types; nullOr str; | ||||||
|  |             example = "go-gitea"; | ||||||
|  |             default = nameParts.owner; | ||||||
|  |             description = '' | ||||||
|  |               The owner of the repository to mirror (if applicable) | ||||||
|  |             ''; | ||||||
|  |           }; | ||||||
|  |  | ||||||
|  |           repo = lib.mkOption { | ||||||
|  |             type = with lib.types; nullOr str; | ||||||
|  |             example = "gitea"; | ||||||
|  |             default = nameParts.repo; | ||||||
|  |             description = '' | ||||||
|  |               The name of the repository to mirror (if applicable) | ||||||
|  |             ''; | ||||||
|  |           }; | ||||||
|  |  | ||||||
|  |           slug = lib.mkOption { | ||||||
|  |             type = lib.types.str; | ||||||
|  |             default = nameParts.slug; | ||||||
|  |             example = "github-go-gitea-gitea"; | ||||||
|  |             description = '' | ||||||
|  |               The slug of the repository to mirror. | ||||||
|  |             ''; | ||||||
|  |           }; | ||||||
|  |  | ||||||
|  |           description = lib.mkOption { | ||||||
|  |             type = with lib.types; nullOr str; | ||||||
|  |             example = "A project which does this and that"; | ||||||
|  |             description = '' | ||||||
|  |               A description of the project. This isn't used directly by gickup for anything, | ||||||
|  |               but can be useful if gickup is used together with cgit or similar. | ||||||
|  |             ''; | ||||||
|  |           }; | ||||||
|  |  | ||||||
|  |           settings = lib.mkOption { | ||||||
|  |             description = "Instance specific settings, see gickup configuration file"; | ||||||
|  |             type = lib.types.submodule { | ||||||
|  |               freeformType = format.type; | ||||||
|  |             }; | ||||||
|  |             default = { }; | ||||||
|  |             example = { | ||||||
|  |               username = "gickup"; | ||||||
|  |               password = "hunter2"; | ||||||
|  |               wiki = true; | ||||||
|  |               issues = true; | ||||||
|  |             }; | ||||||
|  |           }; | ||||||
|  |         }; | ||||||
|  |       })); | ||||||
|  |     }; | ||||||
|  |   }; | ||||||
|  |  | ||||||
|  |   config = lib.mkIf cfg.enable { | ||||||
|  |     users.users.gickup = { | ||||||
|  |       isSystemUser = true; | ||||||
|  |       group = "gickup"; | ||||||
|  |       home = "/var/lib/gickup"; | ||||||
|  |     }; | ||||||
|  |  | ||||||
|  |     users.groups.gickup = { }; | ||||||
|  |  | ||||||
|  |     services.gickup.destinationSettings.path = "/var/lib/gickup/raw"; | ||||||
|  |  | ||||||
|  |     systemd.tmpfiles.settings."10-gickup" = lib.mkIf (cfg.dataDir != "/var/lib/gickup") { | ||||||
|  |       ${cfg.dataDir}.d = { | ||||||
|  |         user = "gickup"; | ||||||
|  |         group = "gickup"; | ||||||
|  |         mode = "0755"; | ||||||
|  |       }; | ||||||
|  |     }; | ||||||
|  |  | ||||||
|  |     systemd.slices."system-gickup" = { | ||||||
|  |       description = "Gickup git repository mirroring service"; | ||||||
|  |       after = [ "network.target" ]; | ||||||
|  |     }; | ||||||
|  |  | ||||||
|  |     systemd.targets.gickup = { | ||||||
|  |       description = "Gickup git repository mirroring service"; | ||||||
|  |       wants = map ({ slug, ... }: "gickup@${slug}.service") (lib.attrValues cfg.instances); | ||||||
|  |     }; | ||||||
|  |  | ||||||
|  |     systemd.timers = { | ||||||
|  |       "gickup@" = { | ||||||
|  |         description = "Gickup git repository mirroring service for %i"; | ||||||
|  |  | ||||||
|  |         timerConfig = { | ||||||
|  |           OnCalendar = "daily"; | ||||||
|  |           RandomizedDelaySec = "1h"; | ||||||
|  |           Persistent = true; | ||||||
|  |           AccuracySec = "1s"; | ||||||
|  |         }; | ||||||
|  |       }; | ||||||
|  |     } | ||||||
|  |     // | ||||||
|  |     # Overrides for mirrors which are not "daily" | ||||||
|  |     (lib.pipe cfg.instances [ | ||||||
|  |       builtins.attrValues | ||||||
|  |       (builtins.filter (instance: instance.interval != "daily")) | ||||||
|  |       (map ({ slug, interval, ... }: { | ||||||
|  |         name = "gickup@${slug}"; | ||||||
|  |         value = { | ||||||
|  |           overrideStrategy = "asDropin"; | ||||||
|  |           timerConfig.OnCalendar = interval; | ||||||
|  |         }; | ||||||
|  |       })) | ||||||
|  |       builtins.listToAttrs | ||||||
|  |     ]); | ||||||
|  |  | ||||||
|  |     systemd.targets.timers.wants = map ({ slug, ... }: "gickup@${slug}.timer") (lib.attrValues cfg.instances); | ||||||
|  |  | ||||||
|  |     systemd.services = { | ||||||
|  |       "gickup@" = let | ||||||
|  |         configDir = lib.pipe cfg.instances [ | ||||||
|  |           (lib.mapAttrsToList (name: instance: { | ||||||
|  |             name = "${instance.slug}.yml"; | ||||||
|  |             path = format.generate "gickup-configuration-${name}.yml" { | ||||||
|  |               destination.local = [ cfg.destinationSettings ]; | ||||||
|  |               source.${instance.type} = [ | ||||||
|  |                 ( | ||||||
|  |                   (lib.optionalAttrs (instance.type != "any") { | ||||||
|  |                     user = instance.owner; | ||||||
|  |                     includeorgs = [ instance.owner ]; | ||||||
|  |                     include = [ instance.repo ]; | ||||||
|  |                   }) | ||||||
|  |                   // | ||||||
|  |                   instance.settings | ||||||
|  |                 ) | ||||||
|  |               ]; | ||||||
|  |             }; | ||||||
|  |           })) | ||||||
|  |           (pkgs.linkFarm "gickup-configuration-files") | ||||||
|  |         ]; | ||||||
|  |       in { | ||||||
|  |         description = "Gickup git repository mirroring service for %i"; | ||||||
|  |         after = [ "network.target" ]; | ||||||
|  |  | ||||||
|  |         path = [ | ||||||
|  |           cfg.gitPackage | ||||||
|  |           cfg.gitLfsPackage | ||||||
|  |         ]; | ||||||
|  |  | ||||||
|  |         restartIfChanged = false; | ||||||
|  |  | ||||||
|  |         serviceConfig = { | ||||||
|  |           Type = "oneshot"; | ||||||
|  |           ExecStart = "'${pkgs.gickup}/bin/gickup' '${configDir}/%i.yml'"; | ||||||
|  |           ExecStartPost = ""; | ||||||
|  |  | ||||||
|  |           User = "gickup"; | ||||||
|  |           Group = "gickup"; | ||||||
|  |  | ||||||
|  |           BindPaths = lib.optionals (cfg.dataDir != "/var/lib/gickup") [ | ||||||
|  |             "${cfg.dataDir}:/var/lib/gickup" | ||||||
|  |           ]; | ||||||
|  |  | ||||||
|  |           Slice = "system-gickup.slice"; | ||||||
|  |  | ||||||
|  |           SyslogIdentifier = "gickup-%i"; | ||||||
|  |           StateDirectory = "gickup"; | ||||||
|  |           # WorkingDirectory = "gickup"; | ||||||
|  |           # RuntimeDirectory = "gickup"; | ||||||
|  |           # RuntimeDirectoryMode = "0700"; | ||||||
|  |  | ||||||
|  |           # https://discourse.nixos.org/t/how-to-prevent-custom-systemd-service-from-restarting-on-nixos-rebuild-switch/43431 | ||||||
|  |           RemainAfterExit = true; | ||||||
|  |  | ||||||
|  |           # Hardening options | ||||||
|  |           AmbientCapabilities = []; | ||||||
|  |           LockPersonality = true; | ||||||
|  |           NoNewPrivileges = true; | ||||||
|  |           PrivateDevices = true; | ||||||
|  |           PrivateMounts = true; | ||||||
|  |           PrivateTmp = true; | ||||||
|  |           PrivateUsers = true; | ||||||
|  |           ProcSubset = "pid"; | ||||||
|  |           ProtectClock = true; | ||||||
|  |           ProtectControlGroups = true; | ||||||
|  |           ProtectHome = true; | ||||||
|  |           ProtectHostname = true; | ||||||
|  |           ProtectKernelLogs = true; | ||||||
|  |           ProtectKernelModules = true; | ||||||
|  |           ProtectKernelTunables = true; | ||||||
|  |           # ProtectProc = "invisible"; | ||||||
|  |           # ProtectSystem = "strict"; | ||||||
|  |           RemoveIPC = true; | ||||||
|  |           RestrictAddressFamilies = [ | ||||||
|  |             "AF_INET" | ||||||
|  |             "AF_INET6" | ||||||
|  |           ]; | ||||||
|  |           RestrictNamespaces = true; | ||||||
|  |           RestrictRealtime = true; | ||||||
|  |           RestrictSUIDSGID = true; | ||||||
|  |           SystemCallArchitectures = "native"; | ||||||
|  |           # SystemCallFilter = [ | ||||||
|  |           #   "@system-service" | ||||||
|  |           #   "~@resources" | ||||||
|  |           #   "~@privileged" | ||||||
|  |           # ]; | ||||||
|  |           UMask = "0002"; | ||||||
|  |           CapabilityBoundingSet = []; | ||||||
|  |         }; | ||||||
|  |       }; | ||||||
|  |     }; | ||||||
|  |   }; | ||||||
|  | } | ||||||
							
								
								
									
										42
									
								
								modules/gickup/hardlink-files.nix
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										42
									
								
								modules/gickup/hardlink-files.nix
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,42 @@ | |||||||
|  | { config, lib, pkgs, ... }: | ||||||
|  | let | ||||||
|  |   cfg = config.services.gickup; | ||||||
|  | in | ||||||
|  | { | ||||||
|  |   config = lib.mkIf cfg.enable { | ||||||
|  |     # TODO: add a service that will look at the backed up files and hardlink | ||||||
|  |     #       the ones that have a matching hash together to save space. This can | ||||||
|  |     #       either run routinely (i.e. trigger by systemd-timer), or be activated | ||||||
|  |     #       whenever a gickup@<slug>.service finishes. The latter is probably better. | ||||||
|  |  | ||||||
|  |     # systemd.services."gickup-hardlink" = { | ||||||
|  |     #   serviceConfig = { | ||||||
|  |     #     Type = "oneshot"; | ||||||
|  |     #     ExecStart = let | ||||||
|  |     #       script = pkgs.writeShellApplication { | ||||||
|  |     #         name = "gickup-hardlink-files.sh"; | ||||||
|  |     #         runtimeInputs = [ pkgs.coreutils pkgs.jdupes ]; | ||||||
|  |     #         text = '' | ||||||
|  |  | ||||||
|  |     #         ''; | ||||||
|  |     #       }; | ||||||
|  |     #     in lib.getExe script; | ||||||
|  |  | ||||||
|  |     #     User = "gickup"; | ||||||
|  |     #     Group = "gickup"; | ||||||
|  |  | ||||||
|  |     #     BindPaths = lib.optionals (cfg.dataDir != "/var/lib/gickup") [ | ||||||
|  |     #       "${cfg.dataDir}:/var/lib/gickup" | ||||||
|  |     #     ]; | ||||||
|  |  | ||||||
|  |     #     Slice = "system-gickup.slice"; | ||||||
|  |  | ||||||
|  |     #     StateDirectory = "gickup"; | ||||||
|  |  | ||||||
|  |     #     # Hardening options | ||||||
|  |     #     # TODO: | ||||||
|  |     #     PrivateNetwork = true; | ||||||
|  |     #   }; | ||||||
|  |     # }; | ||||||
|  |   }; | ||||||
|  | } | ||||||
							
								
								
									
										11
									
								
								modules/gickup/import-from-toml.nix
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										11
									
								
								modules/gickup/import-from-toml.nix
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,11 @@ | |||||||
|  | { config, lib, pkgs, ... }: | ||||||
|  |  | ||||||
|  | let | ||||||
|  |   cfg = config.services.gickup; | ||||||
|  | in | ||||||
|  | { | ||||||
|  |   config = lib.mkIf cfg.enable { | ||||||
|  |     # TODO: import cfg.instances from a toml file to make it easier for non-nix users | ||||||
|  |     #       to add repositories to mirror | ||||||
|  |   }; | ||||||
|  | } | ||||||
							
								
								
									
										9
									
								
								modules/gickup/set-description.nix
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										9
									
								
								modules/gickup/set-description.nix
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,9 @@ | |||||||
|  | { config, lib, pkgs, ... }: | ||||||
|  | let | ||||||
|  |   cfg = config.services.gickup; | ||||||
|  | in | ||||||
|  | { | ||||||
|  |   config = lib.mkIf cfg.enable { | ||||||
|  |     # TODO: create .git/description files for each repo where cfg.instances.<instance>.description is set | ||||||
|  |   }; | ||||||
|  | } | ||||||
							
								
								
									
										76
									
								
								modules/gickup/update-linktree.nix
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										76
									
								
								modules/gickup/update-linktree.nix
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,76 @@ | |||||||
|  | { config, lib, pkgs, ... }: | ||||||
|  | let | ||||||
|  |   cfg = config.services.gickup; | ||||||
|  | in | ||||||
|  | { | ||||||
|  |   config = lib.mkIf cfg.enable { | ||||||
|  |     # TODO: run upon completion of cloning a repository | ||||||
|  |  | ||||||
|  |     # TODO: update symlink for one repo at a time (e.g. gickup-linktree@<instance>.service) | ||||||
|  |     systemd.services."gickup-linktree" = { | ||||||
|  |       serviceConfig = { | ||||||
|  |         Type = "oneshot"; | ||||||
|  |         ExecStart = let | ||||||
|  |           script = pkgs.writeShellApplication { | ||||||
|  |             name = "gickup-update-symlink-tree.sh"; | ||||||
|  |             runtimeInputs = [ | ||||||
|  |               pkgs.coreutils | ||||||
|  |               pkgs.findutils | ||||||
|  |             ]; | ||||||
|  |             text = '' | ||||||
|  |               shopt -s nullglob | ||||||
|  |  | ||||||
|  |               for repository in ./*/*/*; do | ||||||
|  |                 REPOSITORY_RELATIVE_DIRS=''${repository#"./"} | ||||||
|  |  | ||||||
|  |                 echo "Checking $REPOSITORY_RELATIVE_DIRS" | ||||||
|  |  | ||||||
|  |                 declare -a REVISIONS | ||||||
|  |                 readarray -t REVISIONS < <(find "$repository" -mindepth 1 -maxdepth 1 -printf "%f\n" | sort --numeric-sort --reverse) | ||||||
|  |  | ||||||
|  |                 if [[ "''${#REVISIONS[@]}" == 0 ]]; then | ||||||
|  |                   echo "Found no revisions for $repository, continuing" | ||||||
|  |                   continue | ||||||
|  |                 fi | ||||||
|  |  | ||||||
|  |                 LAST_REVISION="''${REVISIONS[0]}" | ||||||
|  |                 SYMLINK_PATH="../linktree/''${REPOSITORY_RELATIVE_DIRS}" | ||||||
|  |  | ||||||
|  |                 mkdir -p "$(dirname "$SYMLINK_PATH")" | ||||||
|  |  | ||||||
|  |                 EXPECTED_SYMLINK_TARGET=$(realpath "''${repository}/''${LAST_REVISION}") | ||||||
|  |                 EXISTING_SYMLINK_TARGET=$(realpath "$SYMLINK_PATH" || echo "<none>") | ||||||
|  |  | ||||||
|  |                 if [[ "$EXISTING_SYMLINK_TARGET" != "$EXPECTED_SYMLINK_TARGET" ]]; then | ||||||
|  |                   echo "Updating symlink for $REPOSITORY_RELATIVE_DIRS" | ||||||
|  |                   rm "$SYMLINK_PATH" ||: | ||||||
|  |                   ln -rs "$EXPECTED_SYMLINK_TARGET" "$SYMLINK_PATH" | ||||||
|  |                 else | ||||||
|  |                   echo "Symlink already up to date, continuing..." | ||||||
|  |                 fi | ||||||
|  |  | ||||||
|  |                 echo "---" | ||||||
|  |               done | ||||||
|  |             ''; | ||||||
|  |           }; | ||||||
|  |         in lib.getExe script; | ||||||
|  |  | ||||||
|  |         User = "gickup"; | ||||||
|  |         Group = "gickup"; | ||||||
|  |  | ||||||
|  |         BindPaths = lib.optionals (cfg.dataDir != "/var/lib/gickup") [ | ||||||
|  |           "${cfg.dataDir}:/var/lib/gickup" | ||||||
|  |         ]; | ||||||
|  |  | ||||||
|  |         Slice = "system-gickup.slice"; | ||||||
|  |  | ||||||
|  |         StateDirectory = "gickup"; | ||||||
|  |         WorkingDirectory = "/var/lib/gickup/raw"; | ||||||
|  |  | ||||||
|  |         # Hardening options | ||||||
|  |         # TODO: | ||||||
|  |         PrivateNetwork = true; | ||||||
|  |       }; | ||||||
|  |     }; | ||||||
|  |   }; | ||||||
|  | } | ||||||
							
								
								
									
										116
									
								
								modules/robots-txt.nix
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										116
									
								
								modules/robots-txt.nix
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,116 @@ | |||||||
|  | { config, pkgs, lib, ... }: | ||||||
|  | let | ||||||
|  |   cfg = config.environment.robots-txt; | ||||||
|  |  | ||||||
|  |   robots-txt-format = { | ||||||
|  |     type = let | ||||||
|  |       coercedStrToNonEmptyListOfStr = lib.types.coercedTo lib.types.str lib.singleton (lib.types.nonEmptyListOf lib.types.str); | ||||||
|  |     in lib.types.listOf (lib.types.submodule { | ||||||
|  |       freeformType = lib.types.attrsOf coercedStrToNonEmptyListOfStr; | ||||||
|  |       options = { | ||||||
|  |         pre_comment = lib.mkOption { | ||||||
|  |           description = "Comment to add before the rule"; | ||||||
|  |           type = lib.types.lines; | ||||||
|  |           default = ""; | ||||||
|  |         }; | ||||||
|  |         post_comment = lib.mkOption { | ||||||
|  |           description = "Comment to add after the rule"; | ||||||
|  |           type = lib.types.lines; | ||||||
|  |           default = ""; | ||||||
|  |         }; | ||||||
|  |       }; | ||||||
|  |     }); | ||||||
|  |  | ||||||
|  |     generate = name: value: let | ||||||
|  |       makeComment = comment: lib.pipe comment [ | ||||||
|  |         (lib.splitString "\n") | ||||||
|  |         (lib.map (line: if line == "" then "#" else "# ${line}")) | ||||||
|  |         (lib.concatStringsSep "\n") | ||||||
|  |       ]; | ||||||
|  |  | ||||||
|  |       ruleToString = rule: let | ||||||
|  |         user_agent = rule.User-agent or []; | ||||||
|  |         pre_comment = rule.pre_comment; | ||||||
|  |         post_comment = rule.post_comment; | ||||||
|  |         rest = builtins.removeAttrs rule [ "User-agent" "pre_comment" "post_comment" ]; | ||||||
|  |       in lib.concatStringsSep "\n" (lib.filter (x: x != null) [ | ||||||
|  |         (if (pre_comment != "") then makeComment pre_comment else null) | ||||||
|  |         (let | ||||||
|  |           user-agents = lib.concatMapStringsSep "\n" (value: "User-agent: ${value}") user_agent; | ||||||
|  |         in | ||||||
|  |           if user_agent == [] then null else user-agents | ||||||
|  |         ) | ||||||
|  |         (lib.pipe rest [ | ||||||
|  |           (lib.mapAttrsToList (ruleName: map (value: "${ruleName}: ${value}"))) | ||||||
|  |           lib.concatLists | ||||||
|  |           (lib.concatStringsSep "\n") | ||||||
|  |         ]) | ||||||
|  |         (if (post_comment != "") then makeComment post_comment else null) | ||||||
|  |       ]); | ||||||
|  |  | ||||||
|  |       content = lib.concatMapStringsSep "\n\n" ruleToString value; | ||||||
|  |     in pkgs.writeText name content; | ||||||
|  |   }; | ||||||
|  | in | ||||||
|  | { | ||||||
|  |   options.environment.robots-txt = lib.mkOption { | ||||||
|  |     default = { }; | ||||||
|  |     description = '' | ||||||
|  |       Different instances of robots.txt to use with web services. | ||||||
|  |     ''; | ||||||
|  |     type = lib.types.attrsOf (lib.types.submodule ({ name, ... }: { | ||||||
|  |       options = { | ||||||
|  |         enable = lib.mkEnableOption "this instance of robots.txt" // { | ||||||
|  |           default = true; | ||||||
|  |         }; | ||||||
|  |  | ||||||
|  |         path = lib.mkOption { | ||||||
|  |           description = "The resulting path of the dir containing the robots.txt file"; | ||||||
|  |           type = lib.types.path; | ||||||
|  |           readOnly = true; | ||||||
|  |           default = "/etc/robots-txt/${name}"; | ||||||
|  |         }; | ||||||
|  |  | ||||||
|  |         rules = lib.mkOption { | ||||||
|  |           description = "Rules to include in robots.txt"; | ||||||
|  |           default = [ ]; | ||||||
|  |           example = [ | ||||||
|  |             { User-agent = "Googlebot"; Disallow = "/no-googlebot"; } | ||||||
|  |             { User-agent = "Bingbot"; Disallow = [ "/no-bingbot" "/no-bingbot2" ]; } | ||||||
|  |           ]; | ||||||
|  |           type = robots-txt-format.type; | ||||||
|  |         }; | ||||||
|  |  | ||||||
|  |         virtualHost = lib.mkOption { | ||||||
|  |           description = "An nginx virtual host to add the robots.txt to"; | ||||||
|  |           type = lib.types.nullOr lib.types.str; | ||||||
|  |           default = null; | ||||||
|  |         }; | ||||||
|  |       }; | ||||||
|  |     })); | ||||||
|  |   }; | ||||||
|  |  | ||||||
|  |   config = { | ||||||
|  |     environment.etc = lib.mapAttrs' (name: value: { | ||||||
|  |       name = "robots-txt/${name}/robots.txt"; | ||||||
|  |       value.source = robots-txt-format.generate name value.rules; | ||||||
|  |     }) cfg; | ||||||
|  |  | ||||||
|  |     services.nginx.virtualHosts = lib.pipe cfg [ | ||||||
|  |       (lib.filterAttrs (_: value: value.virtualHost != null)) | ||||||
|  |       (lib.mapAttrs' (name: value: { | ||||||
|  |         name = value.virtualHost; | ||||||
|  |         value = { | ||||||
|  |           locations = { | ||||||
|  |             "= /robots.txt" = { | ||||||
|  |               extraConfig = '' | ||||||
|  |                 add_header Content-Type text/plain; | ||||||
|  |               ''; | ||||||
|  |               root = cfg.${name}.path; | ||||||
|  |             }; | ||||||
|  |           }; | ||||||
|  |         }; | ||||||
|  |       })) | ||||||
|  |     ]; | ||||||
|  |   }; | ||||||
|  | } | ||||||
							
								
								
									
										21
									
								
								packages/cgit.nix
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										21
									
								
								packages/cgit.nix
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,21 @@ | |||||||
|  | { cgit, fetchurl, ... }: | ||||||
|  | let | ||||||
|  |   pname = cgit.pname; | ||||||
|  |   commit = "09d24d7cd0b7e85633f2f43808b12871bb209d69"; | ||||||
|  | in | ||||||
|  | cgit.overrideAttrs (_: { | ||||||
|  |   version = "1.2.3-unstable-2024.07.16"; | ||||||
|  |  | ||||||
|  |   src = fetchurl { | ||||||
|  |     url = "https://git.zx2c4.com/cgit/snapshot/${pname}-${commit}.tar.xz"; | ||||||
|  |     hash = "sha256-gfgjAXnWRqVCP+4cmYOVdB/3OFOLJl2WBOc3bFVDsjw="; | ||||||
|  |   }; | ||||||
|  |  | ||||||
|  |   # cgit is tightly coupled with git and needs a git source tree to build. | ||||||
|  |   # IMPORTANT: Remember to check which git version cgit needs on every version | ||||||
|  |   # bump (look for "GIT_VER" in the top-level Makefile). | ||||||
|  |   gitSrc = fetchurl { | ||||||
|  |     url = "mirror://kernel/software/scm/git/git-2.46.0.tar.xz"; | ||||||
|  |     hash = "sha256-fxI0YqKLfKPr4mB0hfcWhVTCsQ38FVx+xGMAZmrCf5U="; | ||||||
|  |   }; | ||||||
|  | }) | ||||||
| @@ -3,6 +3,8 @@ calendar-bot: | |||||||
|     mysql_password: ENC[AES256_GCM,data:Gqag8yOgPH3ntoT5TmaqJWv1j+si2qIyz5Ryfw5E2A==,iv:kQDcxnPfwJQcFovI4f87UDt18F8ah3z5xeY86KmdCyY=,tag:A1sCSNXJziAmtUWohqwJgg==,type:str] |     mysql_password: ENC[AES256_GCM,data:Gqag8yOgPH3ntoT5TmaqJWv1j+si2qIyz5Ryfw5E2A==,iv:kQDcxnPfwJQcFovI4f87UDt18F8ah3z5xeY86KmdCyY=,tag:A1sCSNXJziAmtUWohqwJgg==,type:str] | ||||||
| mysql: | mysql: | ||||||
|     password: ENC[AES256_GCM,data:KqEe0TVdeMIzPKsmFg9x0X9xWijnOk306ycyXTm2Tpqo/O0F,iv:Y+hlQ8n1ZIP9ncXBzd2kCSs/DWVTWhiEluFVwZFKRCA=,tag:xlaUk0Wftk62LpYE5pKNQw==,type:str] |     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] | ||||||
| sops: | sops: | ||||||
|     kms: [] |     kms: [] | ||||||
|     gcp_kms: [] |     gcp_kms: [] | ||||||
| @@ -63,8 +65,8 @@ sops: | |||||||
|             cTh5bnJ3WW90aXRCSUp6NHFYeU1tZ0kK4afdtJwGNu6wLRI0fuu+mBVeqVeB0rgX |             cTh5bnJ3WW90aXRCSUp6NHFYeU1tZ0kK4afdtJwGNu6wLRI0fuu+mBVeqVeB0rgX | ||||||
|             0q5hwyzjiRnHnyjF38CmcGgydSfDRmF6P+WIMbCwXC6LwfRhAmBGPg== |             0q5hwyzjiRnHnyjF38CmcGgydSfDRmF6P+WIMbCwXC6LwfRhAmBGPg== | ||||||
|             -----END AGE ENCRYPTED FILE----- |             -----END AGE ENCRYPTED FILE----- | ||||||
|     lastmodified: "2024-08-15T21:18:33Z" |     lastmodified: "2025-05-07T21:34:48Z" | ||||||
|     mac: ENC[AES256_GCM,data:uR5HgeDAYqoqB9kk1V6p0T30+v6WpQJi4+qIeCDRnoUPnQKUVR10hvBhICck+E+Uh8p+tGhM6Uf3YrAJAV0ZCUiNJjtwDJQQLUDT53vdOAXN4xADCQqNuhgVwVMaruoTheEiwOswRuhFeEwy0gBj3Ze2pu47lueHYclmEzumLeQ=,iv:t0UyXN2YaR2m7M/pV2wTLJG5wVfqTIUs7wSQMmyeTVw=,tag:O7dIffzrDAXz3kGx5uazhw==,type:str] |     mac: ENC[AES256_GCM,data:n6GHD+nQmZL17WvUZiMCBLRHbtpoKU6U8o/Oraj0VSRi/pQ74QWGVEcIX87kFjBvR2C+UPd3KwXzjQHhjUfHpz9EjIGi6tXLTTo8K3ptd2wCL8MW418TVO4KV+BFmHGT4kwlbdoqaJ2SA7HcfXNaC68e/2CTXhtkLpIwGXtYWJA=,iv:iC5QX/JMwno4mBljPdorNmcQSD2wy/wOYvGrUoC2yzg=,tag:GuFNQ6+d6o9DYC6Do/IEqQ==,type:str] | ||||||
|     pgp: |     pgp: | ||||||
|         - created_at: "2024-08-04T00:03:40Z" |         - created_at: "2024-08-04T00:03:40Z" | ||||||
|           enc: |- |           enc: |- | ||||||
| @@ -87,4 +89,4 @@ sops: | |||||||
|             -----END PGP MESSAGE----- |             -----END PGP MESSAGE----- | ||||||
|           fp: F7D37890228A907440E1FD4846B9228E814A2AAC |           fp: F7D37890228A907440E1FD4846B9228E814A2AAC | ||||||
|     unencrypted_suffix: _unencrypted |     unencrypted_suffix: _unencrypted | ||||||
|     version: 3.9.0 |     version: 3.9.4 | ||||||
|   | |||||||
| @@ -1,15 +1,5 @@ | |||||||
| #ENC[AES256_GCM,data:oyFG9fCzJH8yLB0QY78CVOcYO6Ttp/ARqtIcXwWGYOvL6nW+yLcakrdmVA96sR5toywb32aW,iv:7o3FI0cI6GHCwmQfLYh2iAVr8sELOMoxGSzE5qvuAaI=,tag:z9F1c4dOIiy2FtKpBwm5wg==,type:comment] |  | ||||||
| #ENC[AES256_GCM,data:nhDznFCozGpXdYBfumLyhp7TnA7C/IqBCpHJ,iv:3AZN6iVBha8Qh5/X6Yn/5JWsGhDXlE/zdUh1CcO7fQc=,tag:59DaAyKTOmkKty4eyFWFqw==,type:comment] |  | ||||||
| #ENC[AES256_GCM,data:vQu+AG19Vy94xxwj196G2uk9,iv:YJGBvoMgOngjn/TeuXeoU82daRvJDxvCQMYb3XCPlw0=,tag:fU6ZhhmAh0yh3/QuXbCNkQ==,type:comment] |  | ||||||
| #ENC[AES256_GCM,data:S1UOENn/ewhw8Pb9CmKp,iv:jafOhkCoiTm5HXQ/S611L4VlQFa1Wqr5WIIRzLQm3i0=,tag:6CQ+Y9E/FxWN8K+D9J7+Fg==,type:comment] |  | ||||||
| #ENC[AES256_GCM,data:lHHmoCHyP2Tc3waRGeMPEasQiv5+,iv:W6SSFpeWBfTBOEDo4P9hox39eoAiO40Ay4T3QeiI9Tw=,tag:9bLbcEZ9/B1QolDettwcfg==,type:comment] |  | ||||||
| #ENC[AES256_GCM,data:DrF4XHSd8QAWn5h1xEGGpDKMQcLF,iv:nPCBbThQh/Aa+uccKJtmiCXSvoJKHxZMJ42yFkV+hi8=,tag:3l50mMn7cPoCnjPcHv1+Vg==,type:comment] |  | ||||||
| #ENC[AES256_GCM,data:ADUhFzufaR2xXNOLgiXKu5Cd8Zx3waYeZiLF,iv:WMK2gJwplf6r/EdijrvrOBHgPL57W+UMIQ8dBPp/DBA=,tag:E/q/ccAd7UH3BV7nut6Slg==,type:comment] |  | ||||||
| #ENC[AES256_GCM,data:IVFSM6VOWnR0YDRfecsDPlYr,iv:Jxe8pq3lxw5QUGKyspB8tWSquDSMo3mAJBAsQGKxSec=,tag:7bffwY98iTX4/De0coUIxA==,type:comment] |  | ||||||
| #ENC[AES256_GCM,data:pHSDnojWTLYXIKk=,iv:ph2xCpxbP3OiWm+B/MDboykPa2gtCWpP0b3j96YCDh4=,tag:u5hmvxHaa/m8GaSeYvONmg==,type:comment] |  | ||||||
| #ENC[AES256_GCM,data:Q0fCyyP0DJqUyJPo,iv:qwBE3c2VqF52Yq8POXhy2Qv2xJd82wL1aX4eVY6wL1w=,tag:IwmbD7XqIkemOTODBKpS0g==,type:comment] |  | ||||||
| config: | config: | ||||||
|     mysqld_exporter: ENC[AES256_GCM,data:w4muNsWmsW1fPx9nqtDGPCZ9faO3W5Pagn/DfWrb5yf88GQOzOsN4z7TH3QeW0Xs6I5jDIktGmFml6RDxCjD8UX9eer1pvC7Kxyl2DQKLHwmsgx1DUFNTRUzE1Sgx8rZAJ8HM7DO7L/6aXS0ndY4J+huyhDDVd+cIetgiQ==,iv:Q4cZD9CKd/EDOm4bjAE2EOstwKpwexF2pxhMEF0/5/k=,tag:S0rOLJS+b9ualtxcHKdHlw==,type:str] |     mysqld_exporter_password: ENC[AES256_GCM,data:I9K+QMqaN3FOOVKzeOR9Q6UERStXX0P8WEHyN1jzzbM=,iv:UxvIdlfAyJvNuxPkU4+guKPa0fiD0vVLzHOTYktcmso=,tag:ltnIqEwESYx9HBu8UN0ZLw==,type:str] | ||||||
| keys: | keys: | ||||||
|     grafana: |     grafana: | ||||||
|         secret_key: ENC[AES256_GCM,data:+WoAJbDBEgKs0RoHT+7oEELAVQ+/2Xt+5RTMSXg23moCqVRx+Gzll9P5Drw=,iv:AkRn/Y20iEe5i1T+84wAgLCTFtAox2G3giyawAkltAw=,tag:BZbt5Wb5lYLIJBm/pfP4GQ==,type:str] |         secret_key: ENC[AES256_GCM,data:+WoAJbDBEgKs0RoHT+7oEELAVQ+/2Xt+5RTMSXg23moCqVRx+Gzll9P5Drw=,iv:AkRn/Y20iEe5i1T+84wAgLCTFtAox2G3giyawAkltAw=,tag:BZbt5Wb5lYLIJBm/pfP4GQ==,type:str] | ||||||
| @@ -77,8 +67,8 @@ sops: | |||||||
|             WDRSdDZRa1lIbEVTdDlhU1dwUXUzQTgK5iE4Cf/zjsPYHKcqYA0rFqY0TNcCnzNU |             WDRSdDZRa1lIbEVTdDlhU1dwUXUzQTgK5iE4Cf/zjsPYHKcqYA0rFqY0TNcCnzNU | ||||||
|             vTM+cEPaA+/FXTwLfPpaiSkg5Fq8k2XdeMQsjQnglTBSWCwAJin27g== |             vTM+cEPaA+/FXTwLfPpaiSkg5Fq8k2XdeMQsjQnglTBSWCwAJin27g== | ||||||
|             -----END AGE ENCRYPTED FILE----- |             -----END AGE ENCRYPTED FILE----- | ||||||
|     lastmodified: "2024-04-20T23:41:59Z" |     lastmodified: "2025-03-16T20:08:18Z" | ||||||
|     mac: ENC[AES256_GCM,data:38Ask+adT2FshF8DYEfCWeVWt4KiaJsTXhF7Ib3xxdfQ6vAixM2OXTaK/qqUvN6gQok9TFF+HMJBJ+jezV00nVcKUYn04FaU2/D2zdam44eEEYEEovmfAZ6vbC+CiDv4d/DCc3hnYtDZCEgUTfP4gsZ9rLZFAOwaOFWRJxcDi6Y=,iv:BzuWdTjn6LhscNeouHjM7IYKxTahA8PzzlHSCYZ618s=,tag:BWtPbNwzdOJb788eOO5ZNA==,type:str] |     mac: ENC[AES256_GCM,data:C2tpWppc13jKJq5d4nmAKQOaNWHm27TKwxAxm1fi2lejN1lqUaoz5bHfTBA7MfaWvuP5uZnfbtG32eeu48mnlWpo58XRUFFecAhb9JUpW9s5IR3/nbzLNkGU7H5C0oWPrxI4thd+bAVduIgBjjFyGj1pe6J9db3c0yUWRwNlwGU=,iv:YpoQ4psiFYOWLGipxv1QvRvr034XFsyn2Bhyy39HmOo=,tag:ByiCWygFC/VokVTbdLoLgg==,type:str] | ||||||
|     pgp: |     pgp: | ||||||
|         - created_at: "2024-08-04T00:03:54Z" |         - created_at: "2024-08-04T00:03:54Z" | ||||||
|           enc: |- |           enc: |- | ||||||
| @@ -101,4 +91,4 @@ sops: | |||||||
|             -----END PGP MESSAGE----- |             -----END PGP MESSAGE----- | ||||||
|           fp: F7D37890228A907440E1FD4846B9228E814A2AAC |           fp: F7D37890228A907440E1FD4846B9228E814A2AAC | ||||||
|     unencrypted_suffix: _unencrypted |     unencrypted_suffix: _unencrypted | ||||||
|     version: 3.8.1 |     version: 3.9.4 | ||||||
|   | |||||||
							
								
								
									
										95
									
								
								secrets/kommode/kommode.yaml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										95
									
								
								secrets/kommode/kommode.yaml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,95 @@ | |||||||
|  | gitea: | ||||||
|  |     web-secret-provider: | ||||||
|  |         token: ENC[AES256_GCM,data:7ljFuW0CApzvvGSpWa7fiITIXtejhZk5aed70NNup6AS2GpDOv1NMw==,iv:vi+0BM4QkpnMatlGU6rdEYnCgGUU3U8SuE3imbwKfdE=,tag:uTFaeS/56t/MfBwb1hpkvA==,type:str] | ||||||
|  |     password: ENC[AES256_GCM,data:1Hr2M95xT6J4SxnQLWe9ZQ7q4BIAACnpQXEGyCEm2OgRb/kqyv2s+gJAsw==,iv:95CbOJzeGl+jT8OsSSSx+DH8KYD1HtbXOyZhR60QwnU=,tag:dheIVvgqpiFrKvLLpFlPBg==,type:str] | ||||||
|  |     database: ENC[AES256_GCM,data:nDZqnSBKijyhslBjhSu9weqLVJzUiBD8Ltu/nmllicadraeISylyEk3pOA==,iv:XFzM1pGv98jehdgvlZN217LrsK8TcAMFK5eDrPi2bm0=,tag:+YpXqMmvMTrnt7cDK/Sa7A==,type:str] | ||||||
|  |     email-password: ENC[AES256_GCM,data:tasMZ2Zu449o/mH6uSSPM7cFOlBg4vC+,iv:lDNMvXh5P3HNy9pW6nBsSLCyij/3HiSRunVuLeKAmbI=,tag:ApqGWYE9MSE8m6iYLK6Yww==,type:str] | ||||||
|  |     passwd-ssh-key: ENC[AES256_GCM,data:VOp8vqVoX9IFJhzpKy0J+AzyX3TvxEIBvv3dXpD1f8szmUyPwd4gDOlaFpqTSDu8ebmK3m/D0FMTkfBkPVhUG6XTPo7YIV37gLhfsBF6CuwCMXxTQAd23nfpwJKcDIn3R5h8Mu4MMme2Ev/4PNDztktmIYv3KoEbPglzBMS4LrZqJsDilvIYKEIDUExhSAkESKQZiIzK1TdtWDQSUzvUZ3OsbxONZgaTw5e+xz3qk/q+IR5eRNp9fpeZQ8EkpC7aa/JDIwxzNIuMFi8W9PWh6ANmAOm6GK7JSKiHYQL8GofVifhUGUanAnjgDTYkIWpDiSsuHjfDPGupFCeONNd+Wd4NpJZsej3p9ldLOVxa01Le2tIVYY80jUWT0dpV9IJ5syp4gVaky5Vk6i2QhvjunDoEUnArSRGyMTxWfxAxZLvbLYMNAJDoWzy25vf3jteNB43lVHckEW1F8w/RtzoKzbjKYiANHg+eNLVq0HK67gX2twpblNN4OBt9d03ZbV2lZjTMXGzJXHGFT5ZPDwTkxcDooNvoRuCMe8t8dpuksHFaIp4=,iv:3sgiIgGD9pmCMLVRk0Q8+7GZajYIWsokDUx9JuNrO2c=,tag:WDXyNYtqjdAMePEsnA0hbw==,type:str] | ||||||
|  |     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] | ||||||
|  | sops: | ||||||
|  |     kms: [] | ||||||
|  |     gcp_kms: [] | ||||||
|  |     azure_kv: [] | ||||||
|  |     hc_vault: [] | ||||||
|  |     age: | ||||||
|  |         - recipient: age1mt4d0hg5g76qp7j0884llemy0k2ymr5up8vfudz6vzvsflk5nptqqd32ly | ||||||
|  |           enc: | | ||||||
|  |             -----BEGIN AGE ENCRYPTED FILE----- | ||||||
|  |             YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjWnlOa1NGME00dVhBQ3Z2 | ||||||
|  |             UE1HZlc0Nldrb1VwZTk0Z2I2Nm5ZazV6WndFCnNoM2JaWFJnazJaWlltVW9uNGhm | ||||||
|  |             UmdPSWlsdllORFhyMzRhYXBKQjRqWmcKLS0tIC91RmRCNG91UW1xb1pETXczSDlM | ||||||
|  |             aStmM20xL0hHT3VnMWpTSEltZEpqT1kKj7Io72QSR/dgggQRBZ0gjs0Q7Y3GIP9K | ||||||
|  |             GPgvKGxEi8CcrUj5J9u7rDUed1/TowgWWs/ujt/8q2zfli7AjTpS1w== | ||||||
|  |             -----END AGE ENCRYPTED FILE----- | ||||||
|  |         - recipient: age17tagmpwqjk3mdy45rfesrfey6h863x8wfq38wh33tkrlrywxducs0k6tpq | ||||||
|  |           enc: | | ||||||
|  |             -----BEGIN AGE ENCRYPTED FILE----- | ||||||
|  |             YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSByclROelpuQUFPQlFpREJr | ||||||
|  |             NjhlUDA0TGw4R2FKbmRwWEVCSldrem9neVI0CmU1Q29qUUNZbmZDSkx0UmZmNkVL | ||||||
|  |             dmNQMEJjRjJtcWFYNE1SamV5SUozZVUKLS0tIFBMdFB5TTV4dGRoeVNnYWV5dERY | ||||||
|  |             ejV3RTlSMjNlcGNreXM0YjhpUkVxUzQK2xB69WIRrMPNdZuJUzwuNM/a/Qzpyp7b | ||||||
|  |             nInPmTCCOhqc3eNFSc+od6y5urMeW+r2i2iNV4B2rIdJTdLl1434eg== | ||||||
|  |             -----END AGE ENCRYPTED FILE----- | ||||||
|  |         - recipient: age1mrnldl334l2nszuta6ywvewng0fswv2dz9l5g4qcwe3nj4yxf92qjskdx6 | ||||||
|  |           enc: | | ||||||
|  |             -----BEGIN AGE ENCRYPTED FILE----- | ||||||
|  |             YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBuVFEyaWtlV0F1d0QvMGpU | ||||||
|  |             KzUxdGpXRUMzOWhSODJNYU1Id1Evbm1QelVzCmNZS3NSNWZlZDhPYUVCS3ZIUXRM | ||||||
|  |             aVdScUI5aFI0aXU1ZUx0VjBBQW1hRUUKLS0tIGtOcmFNTXIxdEV0RlI0akJpWEM0 | ||||||
|  |             bk9lWDZkS3BrM0t6V2xEbVdtZlQ1aTgKv7bIQpdGIoXMxPZDmLzqunIEaqQ5M63r | ||||||
|  |             Qu1oFC+yZh2UlkjGxKE6HMlMGn0CnBcTa8XvBaEVMfchVR/2WVq8TQ== | ||||||
|  |             -----END AGE ENCRYPTED FILE----- | ||||||
|  |         - recipient: age1hmpdk4h69wxpwqk9tkud39f66hprhehxtzhgw97r6dvr7v0mx5jscsuhkn | ||||||
|  |           enc: | | ||||||
|  |             -----BEGIN AGE ENCRYPTED FILE----- | ||||||
|  |             YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGQWM5dlFCbTIrSXlZYnBw | ||||||
|  |             VVQzK1ZiaXpQcTcwQzV5YVV3d1A2L012K1NBCmpXNnNnenNrNTZDUjdXdzNXd2R2 | ||||||
|  |             T3FSc3BLdUUxWEs2OXlRNEdieXU1bEkKLS0tIFJkU0ZGcjd4bEUyOWFZeHVUMHow | ||||||
|  |             dVNTbk41S0VUNndQLzRoZ2ZpVTVqNU0Kp6okYalYtbI1CFuJq/881ZyOVpFoRq0j | ||||||
|  |             DvG2E2U+go6XftSaJ59DIUC6rzVBg1JKpJX3TS6SJhe+T+1paoxG/A== | ||||||
|  |             -----END AGE ENCRYPTED FILE----- | ||||||
|  |         - recipient: age1wrssr4z4g6vl3fd3qme5cewchmmhm0j2xe6wf2meu4r6ycn37anse98mfs | ||||||
|  |           enc: | | ||||||
|  |             -----BEGIN AGE ENCRYPTED FILE----- | ||||||
|  |             YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArYVdXc2hrQ0JFQnF6NFpG | ||||||
|  |             UWVMVTN5U0JuQkRxU1ExdUlpWkV4RHlvYUNZCmIzOFI5QnVrMU84VTV6WmcxdjdZ | ||||||
|  |             aTZpOWZNdGNoSnJ2c0R2UzJ2cU1TRmMKLS0tIGFxTkxaYjUvaUxsRmhxRmpVeFFD | ||||||
|  |             aWt5dnlUYWxoUUlHTjRnWEVBU0NzODQKQ2v9oCbXhUhRnURyHWbAIJHGjgb/eVp1 | ||||||
|  |             h9Tdld0TWTxxbyN8JkRa80B8JpUVwHgeqJmq2krnhDrYLN9zaugVMQ== | ||||||
|  |             -----END AGE ENCRYPTED FILE----- | ||||||
|  |         - recipient: age1zhxul786an743u0fascv4wtc5xduu7qfy803lfs539yzhgmlq5ds2lznt5 | ||||||
|  |           enc: | | ||||||
|  |             -----BEGIN AGE ENCRYPTED FILE----- | ||||||
|  |             YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA4bFd5OGpvY0YxczdkVnVY | ||||||
|  |             ZXExNnY1UXBtb0d4MFNYR3JrMTN1SXhNOUhrCi9xVm1HZDhHZmpEdmdJNVBFcWhv | ||||||
|  |             UjI3VDNycEpKdTNnbVU1eVFUeUZuZTAKLS0tIE5GdEJ3Nk1oam9KYUVCMk9CVmpL | ||||||
|  |             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] | ||||||
|  |     pgp: | ||||||
|  |         - created_at: "2025-03-16T13:02:45Z" | ||||||
|  |           enc: |- | ||||||
|  |             -----BEGIN PGP MESSAGE----- | ||||||
|  |  | ||||||
|  |             hQIMA0av/duuklWYAQ/9Ey8zpaRU7DuvVaKTaybgkLCPTKNyq6mKXAusKqC0adMu | ||||||
|  |             9G4M8G18uEoo6/Oa1LpJsQneU05EFuStZPaCs9+zxe5ZU2YhcVcDGAHgCDFBbI27 | ||||||
|  |             7kzUVxA/n5cK61CfIslNYdJolceJeLyH9HSrS3k3eI3V6zEQL9Yz05dDz7Nlma4q | ||||||
|  |             AKsnGtLY4og0j2k7HZcK39ikhJGkllZHhsM4RT8/UVeVZF9CxKzwQ2OKbHkhJZyn | ||||||
|  |             LGEpioYAKuIIWm/20y/DQwIYpAilltWkg+RWQUnYeAINAZKSzFNi9vd3N4n6e41t | ||||||
|  |             ikq8Ukpjbesy42w0ju9sbNWayga14OG5STg/qacrCDjp+wY55VJCcEEM/6kPj1rf | ||||||
|  |             e2dBR+eN8VMgcPOlexOf1pkrVhNqz9eDfEfaEtDbFDIgznt0pmLeeYcL3NBa5+Xf | ||||||
|  |             vpGXG3fmgoXvQYW05yY4efBRiex9f70lbhnnngeY9ZbmSpy3ZuzIKq8RgBxy1ve+ | ||||||
|  |             4B6RYC2Ag8Tndj1xYfHcrqSNfmxq+xNieFV49PMGDO1hjJF++VASqPuRtX9lz3tZ | ||||||
|  |             Y7E7VPtTESaxEp9IuUgLYYnvSHh1SNIRl3OtcctL+bwbF2wNk5iBha+jC/aXNRU/ | ||||||
|  |             PoRv1y+G+0R6aV3hLJjoC+Hrm2JX3FIksk64LRDM9mSI7Yl7MfEFrIzcH4HEzlTS | ||||||
|  |             XAHugaMjpRCntUxlaP2tq4jlrv+PQLh7+uBzzbhLBK6qSjybKiqHBKeluxfYVsDs | ||||||
|  |             rJJicnclRfI1eJPfZDlCr2iggd+2ABYG7uINQVrZYuw2dfb4IvvrqCQz/fBy | ||||||
|  |             =Qb5k | ||||||
|  |             -----END PGP MESSAGE----- | ||||||
|  |           fp: F7D37890228A907440E1FD4846B9228E814A2AAC | ||||||
|  |     unencrypted_suffix: _unencrypted | ||||||
|  |     version: 3.9.4 | ||||||
							
								
								
									
										20
									
								
								shell.nix
									
									
									
									
									
								
							
							
						
						
									
										20
									
								
								shell.nix
									
									
									
									
									
								
							| @@ -11,14 +11,14 @@ pkgs.mkShellNoCC { | |||||||
|     editorconfig-checker |     editorconfig-checker | ||||||
|   ]; |   ]; | ||||||
|  |  | ||||||
|   shellHook = '' |   env = { | ||||||
|     export OS_AUTH_URL=https://api.stack.it.ntnu.no:5000 |     OS_AUTH_URL = "https://api.stack.it.ntnu.no:5000"; | ||||||
|     export OS_PROJECT_ID=b78432a088954cdc850976db13cfd61c |     OS_PROJECT_ID = "b78432a088954cdc850976db13cfd61c"; | ||||||
|     export OS_PROJECT_NAME="STUDORG_Programvareverkstedet" |     OS_PROJECT_NAME = "STUDORG_Programvareverkstedet"; | ||||||
|     export OS_USER_DOMAIN_NAME="NTNU" |     OS_USER_DOMAIN_NAME = "NTNU"; | ||||||
|     export OS_PROJECT_DOMAIN_ID="d3f99bcdaf974685ad0c74c2e5d259db" |     OS_PROJECT_DOMAIN_ID = "d3f99bcdaf974685ad0c74c2e5d259db"; | ||||||
|     export OS_REGION_NAME="NTNU-IT" |     OS_REGION_NAME = "NTNU-IT"; | ||||||
|     export OS_INTERFACE=public |     OS_INTERFACE = "public"; | ||||||
|     export OS_IDENTITY_API_VERSION=3 |     OS_IDENTITY_API_VERSION = "3"; | ||||||
|   ''; |   }; | ||||||
| } | } | ||||||
|   | |||||||
							
								
								
									
										45
									
								
								shells/cuda.nix
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										45
									
								
								shells/cuda.nix
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,45 @@ | |||||||
|  | # nix develop .#cuda | ||||||
|  | # Copied from https://nixos.wiki/wiki/CUDA | ||||||
|  | { pkgs }: | ||||||
|  |  | ||||||
|  | pkgs.mkShell { | ||||||
|  |   name = "cuda-env-shell"; | ||||||
|  |   buildInputs = with pkgs; [ | ||||||
|  |     autoconf | ||||||
|  |     binutils | ||||||
|  |     curl | ||||||
|  |     freeglut | ||||||
|  |     git | ||||||
|  |     gitRepo | ||||||
|  |     gnumake | ||||||
|  |     gnupg | ||||||
|  |     gperf | ||||||
|  |     libGL | ||||||
|  |     libGLU | ||||||
|  |     m4 | ||||||
|  |     ncurses5 | ||||||
|  |     procps | ||||||
|  |     stdenv.cc | ||||||
|  |     unzip | ||||||
|  |     util-linux | ||||||
|  |     xorg.libX11 | ||||||
|  |     xorg.libXext | ||||||
|  |     xorg.libXi | ||||||
|  |     xorg.libXmu | ||||||
|  |     xorg.libXrandr | ||||||
|  |     xorg.libXv | ||||||
|  |     zlib | ||||||
|  |  | ||||||
|  |     cudatoolkit | ||||||
|  |     linuxPackages.nvidia_x11 | ||||||
|  |  | ||||||
|  |     # Other applications, like | ||||||
|  |     hashcat | ||||||
|  |   ]; | ||||||
|  |  | ||||||
|  |   env = { | ||||||
|  |     CUDA_PATH = pkgs.cudatoolkit; | ||||||
|  |     EXTRA_LDFLAGS = "-L/lib -L${pkgs.linuxPackages.nvidia_x11}/lib"; | ||||||
|  |     EXTRA_CCFLAGS = "-I/usr/include"; | ||||||
|  |   }; | ||||||
|  | } | ||||||
| @@ -60,10 +60,18 @@ in rec { | |||||||
|       ipv4 = pvv-ipv4 204; |       ipv4 = pvv-ipv4 204; | ||||||
|       ipv6 = pvv-ipv6 "1:4f"; # Wtf øystein og daniel why |       ipv6 = pvv-ipv6 "1:4f"; # Wtf øystein og daniel why | ||||||
|     }; |     }; | ||||||
|  |     kommode = { | ||||||
|  |       ipv4 = pvv-ipv4 223; | ||||||
|  |       ipv6 = pvv-ipv6 223; | ||||||
|  |     }; | ||||||
|     ustetind = { |     ustetind = { | ||||||
|       ipv4 = pvv-ipv4 234; |       ipv4 = pvv-ipv4 234; | ||||||
|       ipv6 = pvv-ipv6 234; |       ipv6 = pvv-ipv6 234; | ||||||
|     }; |     }; | ||||||
|  |     wenche = { | ||||||
|  |       ipv4 = pvv-ipv4 240; | ||||||
|  |       ipv6 = pvv-ipv6 240; | ||||||
|  |     }; | ||||||
|   }; |   }; | ||||||
|  |  | ||||||
|   defaultNetworkConfig = { |   defaultNetworkConfig = { | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user