mirror of
				https://github.com/Jokiller230/puzzlevision.git
				synced 2025-10-30 13:20:04 +00:00 
			
		
		
		
	✨ Add direnv and remove some unused stuff
	
		
			
	
		
	
	
		
	
		
			Some checks failed
		
		
	
	
		
			
				
	
				Nix: validate flake.lock / Check Lockfile (push) Has been cancelled
				
			
		
			
				
	
				Nix: validate flake / Validate x86_64-linux (push) Has been cancelled
				
			
		
			
				
	
				Trufflehog: check for exposed secrets / Run trufflehog (push) Has been cancelled
				
			
		
			
				
	
				Nix: check for unused code / Run deadnix (push) Has been cancelled
				
			
		
		
	
	
				
					
				
			
		
			Some checks failed
		
		
	
	Nix: validate flake.lock / Check Lockfile (push) Has been cancelled
				
			Nix: validate flake / Validate x86_64-linux (push) Has been cancelled
				
			Trufflehog: check for exposed secrets / Run trufflehog (push) Has been cancelled
				
			Nix: check for unused code / Run deadnix (push) Has been cancelled
				
			This commit is contained in:
		
							parent
							
								
									92c9d47900
								
							
						
					
					
						commit
						fad807fb47
					
				
					 9 changed files with 74 additions and 144 deletions
				
			
		|  | @ -23,8 +23,3 @@ creation_rules: | ||||||
|     key_groups: |     key_groups: | ||||||
|       - age: |       - age: | ||||||
|           - *jo |           - *jo | ||||||
| 
 |  | ||||||
|   - path_regex: homes/[^/]+/drfrontend/secrets/.*\.(yaml|env|json|cfg)$ |  | ||||||
|     key_groups: |  | ||||||
|       - age: |  | ||||||
|           - *jo |  | ||||||
|  |  | ||||||
							
								
								
									
										48
									
								
								flake.lock
									
										
									
										generated
									
									
									
								
							
							
						
						
									
										48
									
								
								flake.lock
									
										
									
										generated
									
									
									
								
							|  | @ -7,11 +7,11 @@ | ||||||
|         ] |         ] | ||||||
|       }, |       }, | ||||||
|       "locked": { |       "locked": { | ||||||
|         "lastModified": 1758186094, |         "lastModified": 1760468693, | ||||||
|         "narHash": "sha256-uvfqk4A5pCKwGvq0f/ZrmqarF80KViSNfYWKdeOYFaw=", |         "narHash": "sha256-JtXWEvA09PLiBOcNws3eUa6WSj/j1aDc1isWXka6ctk=", | ||||||
|         "owner": "catppuccin", |         "owner": "catppuccin", | ||||||
|         "repo": "nix", |         "repo": "nix", | ||||||
|         "rev": "ff94d16ca2d7f51b9fc4a7f6559dc18de54d1915", |         "rev": "2b289e5837767dd9239e4469d6ba69ca4f98038b", | ||||||
|         "type": "github" |         "type": "github" | ||||||
|       }, |       }, | ||||||
|       "original": { |       "original": { | ||||||
|  | @ -56,11 +56,11 @@ | ||||||
|         ] |         ] | ||||||
|       }, |       }, | ||||||
|       "locked": { |       "locked": { | ||||||
|         "lastModified": 1756770412, |         "lastModified": 1759362264, | ||||||
|         "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", |         "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", | ||||||
|         "owner": "hercules-ci", |         "owner": "hercules-ci", | ||||||
|         "repo": "flake-parts", |         "repo": "flake-parts", | ||||||
|         "rev": "4524271976b625a4a605beefd893f270620fd751", |         "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", | ||||||
|         "type": "github" |         "type": "github" | ||||||
|       }, |       }, | ||||||
|       "original": { |       "original": { | ||||||
|  | @ -94,11 +94,11 @@ | ||||||
|         ] |         ] | ||||||
|       }, |       }, | ||||||
|       "locked": { |       "locked": { | ||||||
|         "lastModified": 1758207369, |         "lastModified": 1760500983, | ||||||
|         "narHash": "sha256-BG7GlXo5moXtrFSCqnkIb1Q00szOZXTj5Dx7NmWgves=", |         "narHash": "sha256-zfY4F4CpeUjTGgecIJZ+M7vFpwLc0Gm9epM/iMQd4w8=", | ||||||
|         "owner": "nix-community", |         "owner": "nix-community", | ||||||
|         "repo": "home-manager", |         "repo": "home-manager", | ||||||
|         "rev": "b5698ed57db7ee7da5e93df2e6bbada91c88f3ce", |         "rev": "c53e65ec92f38d30e3c14f8d628ab55d462947aa", | ||||||
|         "type": "github" |         "type": "github" | ||||||
|       }, |       }, | ||||||
|       "original": { |       "original": { | ||||||
|  | @ -138,11 +138,11 @@ | ||||||
|         ] |         ] | ||||||
|       }, |       }, | ||||||
|       "locked": { |       "locked": { | ||||||
|         "lastModified": 1758183841, |         "lastModified": 1760491287, | ||||||
|         "narHash": "sha256-c04iKVUNTZDYlWIcToS9/jLgqA5BgkxTYE0Opn0Hxpw=", |         "narHash": "sha256-BOvhD3Q9fZcxQbjz9YPdOTrWjRnyUVqW2YTFJZI8rQE=", | ||||||
|         "owner": "kaylorben", |         "owner": "kaylorben", | ||||||
|         "repo": "nixcord", |         "repo": "nixcord", | ||||||
|         "rev": "1be1e2031b70966b8ae5ec86ada23d8a05e81d73", |         "rev": "b88450ad729eed534601ff0813b3fed46dd013cb", | ||||||
|         "type": "github" |         "type": "github" | ||||||
|       }, |       }, | ||||||
|       "original": { |       "original": { | ||||||
|  | @ -153,11 +153,11 @@ | ||||||
|     }, |     }, | ||||||
|     "nixos-hardware": { |     "nixos-hardware": { | ||||||
|       "locked": { |       "locked": { | ||||||
|         "lastModified": 1757943327, |         "lastModified": 1760106635, | ||||||
|         "narHash": "sha256-w6cDExPBqbq7fTLo4dZ1ozDGeq3yV6dSN4n/sAaS6OM=", |         "narHash": "sha256-2GoxVaKWTHBxRoeUYSjv0AfSOx4qw5CWSFz2b+VolKU=", | ||||||
|         "owner": "NixOS", |         "owner": "NixOS", | ||||||
|         "repo": "nixos-hardware", |         "repo": "nixos-hardware", | ||||||
|         "rev": "67a709cfe5d0643dafd798b0b613ed579de8be05", |         "rev": "9ed85f8afebf2b7478f25db0a98d0e782c0ed903", | ||||||
|         "type": "github" |         "type": "github" | ||||||
|       }, |       }, | ||||||
|       "original": { |       "original": { | ||||||
|  | @ -168,11 +168,11 @@ | ||||||
|     }, |     }, | ||||||
|     "nixpkgs": { |     "nixpkgs": { | ||||||
|       "locked": { |       "locked": { | ||||||
|         "lastModified": 1758035966, |         "lastModified": 1760284886, | ||||||
|         "narHash": "sha256-qqIJ3yxPiB0ZQTT9//nFGQYn8X/PBoJbofA7hRKZnmE=", |         "narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=", | ||||||
|         "owner": "NixOS", |         "owner": "NixOS", | ||||||
|         "repo": "nixpkgs", |         "repo": "nixpkgs", | ||||||
|         "rev": "8d4ddb19d03c65a36ad8d189d001dc32ffb0306b", |         "rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43", | ||||||
|         "type": "github" |         "type": "github" | ||||||
|       }, |       }, | ||||||
|       "original": { |       "original": { | ||||||
|  | @ -203,11 +203,11 @@ | ||||||
|         ] |         ] | ||||||
|       }, |       }, | ||||||
|       "locked": { |       "locked": { | ||||||
|         "lastModified": 1758007585, |         "lastModified": 1760393368, | ||||||
|         "narHash": "sha256-HYnwlbY6RE5xVd5rh0bYw77pnD8lOgbT4mlrfjgNZ0c=", |         "narHash": "sha256-8mN3kqyqa2PKY0wwZ2UmMEYMcxvNTwLaOrrDsw6Qi4E=", | ||||||
|         "owner": "Mic92", |         "owner": "Mic92", | ||||||
|         "repo": "sops-nix", |         "repo": "sops-nix", | ||||||
|         "rev": "f77d4cfa075c3de66fc9976b80e0c4fc69e2c139", |         "rev": "ab8d56e85b8be14cff9d93735951e30c3e86a437", | ||||||
|         "type": "github" |         "type": "github" | ||||||
|       }, |       }, | ||||||
|       "original": { |       "original": { | ||||||
|  | @ -239,11 +239,11 @@ | ||||||
|         ] |         ] | ||||||
|       }, |       }, | ||||||
|       "locked": { |       "locked": { | ||||||
|         "lastModified": 1758213608, |         "lastModified": 1760276212, | ||||||
|         "narHash": "sha256-/CPyP3EC9EMYuGWrzPRpnWRrmw01N7upfB+xIRxfLUU=", |         "narHash": "sha256-7It9jBYdT8lqJLkKN+i/9RplR2Fv3F7bH02gDVlEV0o=", | ||||||
|         "owner": "vicinaehq", |         "owner": "vicinaehq", | ||||||
|         "repo": "vicinae", |         "repo": "vicinae", | ||||||
|         "rev": "a026db18b9f9a29edd94305b4e77d196bf91afb0", |         "rev": "6c583ff744ce0acf4f1af9c5f5af37057bfcde68", | ||||||
|         "type": "github" |         "type": "github" | ||||||
|       }, |       }, | ||||||
|       "original": { |       "original": { | ||||||
|  |  | ||||||
|  | @ -1,50 +0,0 @@ | ||||||
| { |  | ||||||
|   pkgs, |  | ||||||
|   config, |  | ||||||
|   ... |  | ||||||
| }: |  | ||||||
| { |  | ||||||
|   puzzlevision = { |  | ||||||
|     themes.catppuccin.enable = true; |  | ||||||
|     apps.zed.enable = true; |  | ||||||
|     apps.firefox = { |  | ||||||
|       enable = true; |  | ||||||
|       extensions = [ |  | ||||||
|         "uBlock0@raymondhill.net" |  | ||||||
|         "ATBC@EasonWong" |  | ||||||
|         "languagetool-webextension@languagetool.org" |  | ||||||
|         "firefox-enpass@enpass.io" |  | ||||||
|         "firefox@tampermonkey.net" |  | ||||||
|         "wappalyzer@crunchlabz.com" |  | ||||||
|         "{7a7a4a92-a2a0-41d1-9fd7-1e92480d612d}" |  | ||||||
|         "{d49033ac-8969-488c-afb0-5cdb73957f41}" |  | ||||||
|       ]; |  | ||||||
|     }; |  | ||||||
|   }; |  | ||||||
| 
 |  | ||||||
|   sops.secrets.wakatime-cfg = { |  | ||||||
|     format = "binary"; |  | ||||||
|     sopsFile = ./secrets/wakatime.cfg; |  | ||||||
|     path = "${config.home.homeDirectory}/.wakatime.cfg"; |  | ||||||
|   }; |  | ||||||
| 
 |  | ||||||
|   home.packages = with pkgs; [ |  | ||||||
|     ## GENERAL |  | ||||||
|     ghostty |  | ||||||
|     teams-for-linux |  | ||||||
|     enpass |  | ||||||
|     youtube-music |  | ||||||
| 
 |  | ||||||
|     ## WEB |  | ||||||
|     ungoogled-chromium |  | ||||||
| 
 |  | ||||||
|     ## EDITORS |  | ||||||
|     jetbrains.phpstorm |  | ||||||
| 
 |  | ||||||
|     ## RUNTIMES and CLIs for development |  | ||||||
|     bun |  | ||||||
|     git |  | ||||||
|   ]; |  | ||||||
| 
 |  | ||||||
|   home.stateVersion = "25.05"; |  | ||||||
| } |  | ||||||
|  | @ -1,19 +0,0 @@ | ||||||
| { |  | ||||||
| 	"data": "ENC[AES256_GCM,data:UAADE/aH98MYyfxL3ZkZ06lHHTRmmRVuOhiqEyF6DP35sGTC7Mpqe++MTYBDFrD4Rraeao9T2tcu3sL22p9SW9jF7Y2L1YZ9zKKUyP2y+G8PN25GqXWaNwJQG/hxcKs8km448g==,iv:SkyBC+VkwccprAomhXUzdmSQuBDfFn22MKJwjV9ZSzo=,tag:m/uUcl9r3GW3QYCajoAhYw==,type:str]", |  | ||||||
| 	"sops": { |  | ||||||
| 		"age": [ |  | ||||||
| 			{ |  | ||||||
| 				"recipient": "age1qcjcwh9tq8pzf2yr7m3hm2n3n3y5rlc30fpkr0eytju9w57ucgcsgcy79d", |  | ||||||
| 				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA5VmtTRHo4NWVuU2tiZTc5\nWUVyeU54ZmtZbi9uUWNablIxSm9aZ3hadjBnCmNiVlBXS2lEbE00VFl6QVRlQk92\nMFI0TVBMVDZiQXg3VzZTaVNEd2RROTQKLS0tIEg3aGwvWXgvVldGTjZFaS95dEVP\nUmZHaGFaNndDRWY5cXBJeGY4TVVqbTgKeFTClhSmX5IQ5+7DXk4HEwTAv4uB/HCl\nVeoKUNaTHme60hWE/J12B2PvxtRa+f6diDMFg11mQkPOZwyEcQWMpg==\n-----END AGE ENCRYPTED FILE-----\n" |  | ||||||
| 			}, |  | ||||||
| 			{ |  | ||||||
| 				"recipient": "age1ajkq0lalyc75tjhdtpx2yshw5y3wt85fwjy24luf69rvpavg33vqw6c3tc", |  | ||||||
| 				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnK1NtOE9tZ0poRjdkOTBi\nbWFQbGovY1VvRDN4clJmRGdTSHlzQk5JSmtrCitSc3hnb21CMVVuclZ2YndIOWRk\naDduM3VadDBaWFRDRElZSWlUaXdUZGMKLS0tIEJOUEFoS3ZJQWtkNGFQNk1CdGxI\nSmRFQ25TSXY1S0FHQmhUbWNsT1Z2c2sKBTV2WEW+HynmrrPza8gsIQAK2V3HhYfJ\nrG6rjnzMONd+0Q6Z0KBqgoMfCTjWE9CBnm78DL16u9pRH3CwhpKabg==\n-----END AGE ENCRYPTED FILE-----\n" |  | ||||||
| 			} |  | ||||||
| 		], |  | ||||||
| 		"lastmodified": "2025-05-22T18:30:26Z", |  | ||||||
| 		"mac": "ENC[AES256_GCM,data:/aZOXw2xgQ8UZG5TIWXwHZjlofa08WM2XpPhXUbf2qrx0yyhEyZrtibalCIDdUGgzaZjt8b+qrZqgNE9o+HCUNVX9fU9yCXRL1kpksz9e6HV4S+KIrdHnEFtuRt7r8nP29BotLYoP9KKbA57lL5SYJgPINHq11CAiQLU6A8W8YI=,iv:0zvQe2wRd/qKjrqinc9kgP8RSl47xxD0LofREiK8XOc=,tag:eWhtD/X3CPHTlEZPgp0cjA==,type:str]", |  | ||||||
| 		"unencrypted_suffix": "_unencrypted", |  | ||||||
| 		"version": "3.10.2" |  | ||||||
| 	} |  | ||||||
| } |  | ||||||
|  | @ -13,19 +13,25 @@ | ||||||
| 
 | 
 | ||||||
|   puzzlevision = { |   puzzlevision = { | ||||||
|     themes.catppuccin.enable = true; |     themes.catppuccin.enable = true; | ||||||
|     apps.zed.enable = true; |     apps = { | ||||||
|     apps.firefox = { |       zed.enable = true; | ||||||
|       enable = true; |       firefox = { | ||||||
|       extensions = [ |         enable = true; | ||||||
|         "uBlock0@raymondhill.net" |         extensions = [ | ||||||
|         "ATBC@EasonWong" |           "uBlock0@raymondhill.net" | ||||||
|         "languagetool-webextension@languagetool.org" |           "ATBC@EasonWong" | ||||||
|         "firefox-enpass@enpass.io" |           "languagetool-webextension@languagetool.org" | ||||||
|         "firefox@tampermonkey.net" |           "firefox-enpass@enpass.io" | ||||||
|         "wappalyzer@crunchlabz.com" |           "firefox@tampermonkey.net" | ||||||
|         "{7a7a4a92-a2a0-41d1-9fd7-1e92480d612d}" |           "wappalyzer@crunchlabz.com" | ||||||
|         "{d49033ac-8969-488c-afb0-5cdb73957f41}" |           "{7a7a4a92-a2a0-41d1-9fd7-1e92480d612d}" | ||||||
|       ]; |           "{d49033ac-8969-488c-afb0-5cdb73957f41}" | ||||||
|  |         ]; | ||||||
|  |       }; | ||||||
|  |     }; | ||||||
|  | 
 | ||||||
|  |     cli = { | ||||||
|  |       direnv.enable = true; | ||||||
|     }; |     }; | ||||||
|   }; |   }; | ||||||
| 
 | 
 | ||||||
|  | @ -45,13 +51,9 @@ | ||||||
|     enpass |     enpass | ||||||
|     youtube-music |     youtube-music | ||||||
| 
 | 
 | ||||||
|     ## WEB |  | ||||||
|     ungoogled-chromium |  | ||||||
| 
 |  | ||||||
|     ## EDITORS |     ## EDITORS | ||||||
|     apostrophe |     apostrophe | ||||||
|     jetbrains.phpstorm |     jetbrains.phpstorm | ||||||
|     arduino-ide |  | ||||||
|     obsidian |     obsidian | ||||||
| 
 | 
 | ||||||
|     ## RUNTIMES and CLIs for development |     ## RUNTIMES and CLIs for development | ||||||
|  |  | ||||||
							
								
								
									
										29
									
								
								modules/home/cli/direnv/default.nix
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										29
									
								
								modules/home/cli/direnv/default.nix
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,29 @@ | ||||||
|  | { | ||||||
|  |   osConfig, | ||||||
|  |   config, | ||||||
|  |   self, | ||||||
|  |   pkgs, | ||||||
|  |   lib, | ||||||
|  |   ... | ||||||
|  | }: | ||||||
|  | let | ||||||
|  |   inherit (lib) mkIf mkEnableOption; | ||||||
|  |   inherit (self) namespace; | ||||||
|  | 
 | ||||||
|  |   cfg = config.${namespace}.cli.direnv; | ||||||
|  | in | ||||||
|  | { | ||||||
|  | 
 | ||||||
|  |   options.${namespace}.cli.direnv = { | ||||||
|  |     enable = mkEnableOption "enable direnv support"; | ||||||
|  |   }; | ||||||
|  | 
 | ||||||
|  |   config = mkIf cfg.enable { | ||||||
|  |     programs.direnv = { | ||||||
|  |       enable = true; | ||||||
|  |       nix-direnv.enable = true; | ||||||
|  | 
 | ||||||
|  |       enableFishIntegration = mkIf (osConfig.${namespace}.users.defaultUserShell == pkgs.fish); | ||||||
|  |     }; | ||||||
|  |   }; | ||||||
|  | } | ||||||
|  | @ -65,7 +65,7 @@ in | ||||||
|       }; |       }; | ||||||
|     }; |     }; | ||||||
|     wallpaper = |     wallpaper = | ||||||
|       mkOpt path ../wallpapers/scenic-landscape-blurred.jpg |       mkOpt path ../wallpapers/building_top_sit_dusk.jpg | ||||||
|         "Specify the path of your prefered Gnome wallpaper."; |         "Specify the path of your prefered Gnome wallpaper."; | ||||||
|   }; |   }; | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -5,13 +5,11 @@ | ||||||
|     ./hardware-generated.nix |     ./hardware-generated.nix | ||||||
|   ]; |   ]; | ||||||
| 
 | 
 | ||||||
|   # Todo: automate this globally for all workstation and server archetypes! |  | ||||||
|   # Configure Sops |   # Configure Sops | ||||||
|   sops.defaultSopsFile = ./secrets/users.yaml; |   sops.defaultSopsFile = ./secrets/users.yaml; | ||||||
|   sops.age.keyFile = "/var/lib/sops-nix/key.txt"; |   sops.age.keyFile = "/var/lib/sops-nix/key.txt"; | ||||||
| 
 | 
 | ||||||
|   programs.steam.enable = true; |   programs.steam.enable = true; | ||||||
|   programs.steam.remotePlay.openFirewall = true; |  | ||||||
| 
 | 
 | ||||||
|   puzzlevision = { |   puzzlevision = { | ||||||
|     users.jo = { |     users.jo = { | ||||||
|  | @ -23,32 +21,8 @@ | ||||||
|       ]; |       ]; | ||||||
|     }; |     }; | ||||||
| 
 | 
 | ||||||
|     users.drfrontend = { |  | ||||||
|       enable = true; |  | ||||||
|       hashedPassword = "$6$mvK9bT756Aok54Vt$vBRnT66Vb3HL0Y5rEMJlHvKkvzVQ.KUciInTmW3FCBFT00IuFMpz3q9RhXPLTLMRPho65bTg9hMnFPb84I774."; |  | ||||||
|       extraGroups = [ |  | ||||||
|         "wheel" |  | ||||||
|         "docker" |  | ||||||
|       ]; |  | ||||||
|     }; |  | ||||||
| 
 |  | ||||||
|     archetypes.laptop.enable = true; |     archetypes.laptop.enable = true; | ||||||
|     system.kernel.version = "linuxPackages_zen"; |     system.kernel.version = "linuxPackages_6_16"; | ||||||
|   }; |  | ||||||
| 
 |  | ||||||
|   # Configure some last-resort aggressive nix-daemon OOM protection |  | ||||||
|   systemd = { |  | ||||||
|     # Create a separate slice for nix-daemon that is |  | ||||||
|     # memory-managed by the userspace systemd-oomd killer |  | ||||||
|     slices."nix-daemon".sliceConfig = { |  | ||||||
|       ManagedOOMMemoryPressure = "kill"; |  | ||||||
|       ManagedOOMMemoryPressureLimit = "50%"; |  | ||||||
|     }; |  | ||||||
|     services."nix-daemon".serviceConfig.Slice = "nix-daemon.slice"; |  | ||||||
| 
 |  | ||||||
|     # If a kernel-level OOM event does occur anyway, |  | ||||||
|     # strongly prefer killing nix-daemon child processes |  | ||||||
|     services."nix-daemon".serviceConfig.OOMScoreAdjust = 1000; |  | ||||||
|   }; |   }; | ||||||
| 
 | 
 | ||||||
|   boot = { |   boot = { | ||||||
|  |  | ||||||
|  | @ -77,7 +77,6 @@ | ||||||
|     # Kill processes before they can cause an OOM exception |     # Kill processes before they can cause an OOM exception | ||||||
|     earlyoom = { |     earlyoom = { | ||||||
|       enable = true; |       enable = true; | ||||||
|       enableNotifications = true; |  | ||||||
|     }; |     }; | ||||||
| 
 | 
 | ||||||
|     # Enable Thermald for improved overheating protection |     # Enable Thermald for improved overheating protection | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue