refactor project to prioritize correctness. place custom nixos options into existing 'modules' and prefix them with '_'. use _archetypes module for software collections, system profiles, etc. personal configs moved to _archetypes.tjkeller. probably changed or fixed or broke a few other things in the process

11 files changed, 0 insertions, 289 deletions

diff --git a/modules/root/software/awesome.nix b/modules/root/software/awesome.nix
deleted file mode 100644
index fdc86e8..0000000
--- a/modules/root/software/awesome.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ pkgs, lib, config, ... }: {
-	options = {
-		xserver.awesome.enable = lib.mkEnableOption "enables awesomewm";
-	};
-
-	config = lib.mkIf (config.xserver.enable && config.xserver.awesome.enable ) {
-		services.xserver.windowManager.awesome = {
-			enable = true;
-			noArgb = true;  # disables transparency. why not?
-			luaModules = with pkgs.luajitPackages; [
-				lgi
-			];
-			package = with pkgs; awesome.override {
-				gtk3Support = true;
-				gtk3 = gtk3;
-				lua = luajit;
-			};
-		};
-	};
-}
diff --git a/modules/root/software/ddcutil.nix b/modules/root/software/ddcutil.nix
deleted file mode 100644
index 0c62370..0000000
--- a/modules/root/software/ddcutil.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ pkgs, lib, config ... }: {
-	options = {
-		programs.ddcutil.enable = lib.mkEnableOption "enables ddcutil and i2c control";
-	};
-
-	config = lib.mkIf programs.ddcutil.enable {
-		hardware.i2c.enable = true;
-		environment.systemPackages = [ pkgs.ddcutil ];
-	}
-}
diff --git a/modules/root/software/default.nix b/modules/root/software/default.nix
deleted file mode 100644
index 7adcb6a..0000000
--- a/modules/root/software/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ lib, config, ... }: {
-	imports = [
-		./awesome.nix
-		./ddcutil.nix
-		./desktop.nix
-		./development.nix
-		./docker.nix
-		./overlays.nix
-		./system.nix
-		./utilities.nix
-		./virtualization.nix
-	];
-
-	software.desktop = {
-		enable             = lib.mkDefault config.xserver.enable;
-		chromium.enable    = lib.mkDefault false;
-		cad.enable         = lib.mkDefault false;
-		crypto.enable      = lib.mkDefault false;
-		firefox.enable     = lib.mkDefault true;
-		graphics.enable    = lib.mkDefault false;
-		office.enable      = lib.mkDefault false;
-		utilities.enable   = lib.mkDefault false;
-	};
-
-	software.development = {
-		enable             = lib.mkDefault true;
-		docker = {
-			enable         = lib.mkDefault false;
-			btrfsSupport   = lib.mkDefault true;
-		};
-	};
-
-	programs.ddcutil.enable = lib.mkDefault true;
-	virtualization.enable  = lib.mkDefault false;
-	xserver.awesome.enable = lib.mkDefault true;
-}
diff --git a/modules/root/software/derivations b/modules/root/software/derivations
deleted file mode 120000
index a075779..0000000
--- a/modules/root/software/derivations
+++ /dev/null
@@ -1 +0,0 @@
-../../../derivations
\ No newline at end of file
diff --git a/modules/root/software/desktop.nix b/modules/root/software/desktop.nix
deleted file mode 100644
index 4dcb215..0000000
--- a/modules/root/software/desktop.nix
+++ /dev/null
@@ -1,80 +0,0 @@
-{ pkgs, lib, config, ... }: {
-	options = {
-		software.desktop = {
-			enable = lib.mkEnableOption "enables desktop apps";
-			chromium = {
-				enable = lib.mkEnableOption "enables selected chromium browser package";
-				package = lib.mkOption {
-					type = lib.types.package;
-					default = pkgs.ungoogled-chromium;
-					description = "chromium package to install";
-				};
-			};
-			cad.enable = lib.mkEnableOption "enables cad and 3d printing apps";
-			crypto.enable = lib.mkEnableOption "enables crypto wallet apps";
-			firefox.enable = lib.mkEnableOption "enables firefox";
-			graphics.enable = lib.mkEnableOption "enables graphic design apps";
-			office.enable = lib.mkEnableOption "enables office apps";
-			utilities.enable = lib.mkEnableOption "enables miscellaneous utility apps";
-		};
-	};
-
-	config = lib.mkIf config.software.desktop.enable {
-		environment.systemPackages = with pkgs; [
-			# Default
-			arandr
-			dmenu
-			libnotify
-			mpv
-			pavucontrol
-			pcmanfm
-			redshift
-			scrot
-			st
-			sxiv
-			wpa_supplicant_gui
-			zathura
-		] ++ pkgs.lib.optionals config.software.desktop.chromium.enable [
-			# Chrome
-			config.software.desktop.chromium.package
-		] ++ pkgs.lib.optionals config.software.desktop.cad.enable [
-			# CAD
-			blender
-			freecad
-			prusa-slicer
-		] ++ pkgs.lib.optionals config.software.desktop.crypto.enable [
-			# Crypto Wallets
-			sparrow
-		] ++ pkgs.lib.optionals config.software.desktop.graphics.enable [
-			# Graphics
-			blender
-			geeqie
-			gimp3
-			inkscape
-		] ++ pkgs.lib.optionals config.software.desktop.office.enable [
-			# Office
-			hunspell  # Spell checking in libreoffice
-			hunspellDicts.en_US
-			kdePackages.okular
-			libreoffice
-			pdfchain
-			thunderbird
-		] ++ pkgs.lib.optionals config.software.desktop.utilities.enable [
-			# Misc Utilities
-			jellyfin-mpv-shim
-			qbittorrent
-			qdirstat
-			remmina
-		];
-
-		programs.localsend.enable = config.software.desktop.utilities.enable;  # Installs & opens firewall
-		programs.firefox.enable = config.software.desktop.firefox.enable;
-
-		# GVfs allows for mounting drives in a graphical file manager
-		services.gvfs.enable = true;
-
-		# For home-manager to configure gtk
-		# TODO this should be there instead
-		programs.dconf.enable = config.software.desktop.enable;
-	};
-}
diff --git a/modules/root/software/development.nix b/modules/root/software/development.nix
deleted file mode 100644
index af8a8a7..0000000
--- a/modules/root/software/development.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ pkgs, lib, config, ... }: {
-	options = {
-		software.development.enable = lib.mkEnableOption "enables development tools";
-	};
-
-	config = lib.mkIf config.software.development.enable {
-		environment.systemPackages = with pkgs; [
-			#adb-sync
-			android-tools
-			gcc
-			git
-			gnumake
-			hugo
-			lua
-			pkg-config
-		];
-
-		# Open 1313 for hugo serve
-		networking.firewall.allowedTCPPorts = [
-			1313
-		];
-	};
-}
diff --git a/modules/root/software/docker.nix b/modules/root/software/docker.nix
deleted file mode 100644
index bf1898c..0000000
--- a/modules/root/software/docker.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ pkgs, lib, config, userDetails, ... }: {
-	options = {
-		software.development.docker = {
-			enable = lib.mkEnableOption "enables docker";
-			btrfsSupport = lib.mkEnableOption "changes docker storageDriver to btrfs";
-		};
-	};
-
-	config = lib.mkIf config.software.development.docker.enable {
-		virtualisation.docker = {
-			enable = true;
-			storageDriver = lib.mkIf config.software.development.docker.btrfsSupport "btrfs";
-		};
-
-		environment.systemPackages = with pkgs; [
-			docker-compose
-		];
-
-		users.groups.docker.members = [ userDetails.username ];
-	};
-}
diff --git a/modules/root/software/overlays.nix b/modules/root/software/overlays.nix
deleted file mode 100644
index 2037c0d..0000000
--- a/modules/root/software/overlays.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ pkgs, ... }: {
-	nixpkgs.overlays = with pkgs; [
-		(final: prev: {
-			crazydiskinfo = (callPackage ./derivations/crazydiskinfo {});
-			lowbat        = (callPackage ./derivations/lowbat {});
-			workcentre-7800-series = (callPackage ./derivations/xerox-workcentre-7800-series-driver {});
-
-			# Use my vimv-rs until pr gets merged
-			vimv-rs = prev.vimv-rs.overrideAttrs (oldAttrs: {
-				src = fetchFromGitHub {
-					owner = "tjkeller-xyz";
-					repo = "vimv-rs";
-					rev = "5deb76fb81dd4acf3c4809087ff3a1d846ab4769";
-					sha256 = "sha256-XMn+5mIxSEHaR31ixMi6o7PSkN1iYjDT4aOiQkfEwpA=";
-				};
-			});
-
-			# Use my tamzen until pr gets merged
-			tamzen = prev.tamzen.overrideAttrs (oldAttrs: {
-				src = fetchFromGitHub {
-					owner = "tjkeller-xyz";
-					repo = "tamzen-font";
-					rev = "middledot";
-					sha256 = "sha256-mVZ8SdYKTdMG1qBKKYdNjuoYvWkEq2ph2O1ztsNJEhs=";
-				};
-			});
-		})
-		(import ./derivations/st/overrides.nix)
-	];
-}
diff --git a/modules/root/software/system.nix b/modules/root/software/system.nix
deleted file mode 100644
index 4c81596..0000000
--- a/modules/root/software/system.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ pkgs, ... }: {
-	environment.systemPackages = with pkgs; [
-		age  # Secrets
-		cryptsetup
-		dash  # TODO should be default /bin/sh
-		exfat
-		git  # Needed for home-manager
-		ntfs3g
-		python3
-		sops  # Secrets
-	];
-
-	services.gpm.enable = true;
-}
diff --git a/modules/root/software/utilities.nix b/modules/root/software/utilities.nix
deleted file mode 100644
index 79285a1..0000000
--- a/modules/root/software/utilities.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ pkgs, ... }: {
-	environment.systemPackages = with pkgs; [
-		crazydiskinfo
-		entr
-		fastfetch
-		ffmpeg
-		htop
-		jq
-		light
-		lm_sensors
-		lowbat
-		mediainfo
-		neovim
-		nmap
-		openssl
-		p7zip
-		pavolctld
-		powertop
-		pv
-		rsync
-		screen
-		smartmontools
-		sslscan
-		stress
-		testdisk
-		tmux
-		uhubctl
-		vimv-rs
-		wget
-		wireguard-tools
-		xxHash
-		yt-dlp
-	];
-}
diff --git a/modules/root/software/virtualization.nix b/modules/root/software/virtualization.nix
deleted file mode 100644
index 36a51fc..0000000
--- a/modules/root/software/virtualization.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ lib, config, pkgs, ... }: {
-	options = {
-		virtualization.enable = lib.mkEnableOption "enables virtualization and virt-manager";
-	};
-
-	config = lib.mkIf config.virtualization.enable {
-		virtualisation = {
-			spiceUSBRedirection.enable = true;
-			libvirtd.enable = true;
-			# Enable efi support with ovmf firmware
-			libvirtd.qemu = {
-				package = pkgs.qemu_kvm;
-				runAsRoot = true;
-				swtpm.enable = true;
-				ovmf.enable = true;
-			};
-		};
-		programs.virt-manager.enable = config.software.desktop.enable;
-	};
-}