Cleanup of code and modules. Fully modular config now. Cleanup unused and redundant packages. Fix shell alias

hosts/minoxy-workstation/configuration.nix

@@ -8,18 +8,17 @@
 
     ./../../modules/common.nix
 
-		./../../modules/hardware/xremap.nix
     ./../../modules/services/webdav.nix
+
     ./../../modules/graphics/workstation.nix
 
     ./../../modules/hardware/nvidia.nix
+    ./../../modules/hardware/boot.nix
+    ./../../modules/hardware/xremap.nix
   ];
 
   networking.hostName = "minoxy";
 
-	boot.loader.systemd-boot.enable = true;
-	boot.loader.efi.canTouchEfiVariables = true;
-
   systemd.targets.sleep.enable = true;
   systemd.targets.suspend.enable = true;
 

hosts/nixyos-asus/configuration.nix

@@ -9,25 +9,18 @@
 		./../../modules/common.nix
 
 		./../../modules/hardware/xremap.nix
-		./../../modules/hardware/battery.nix
+		./../../modules/hardware/boot.nix
+
+		./../../modules/laptop/powersave.nix
+		./../../modules/laptop/battery.nix
 
 		./../../modules/graphics/workstation.nix
 
-		./../../modules/services/webdav.nix.nix
+		./../../modules/services/webdav.nix
-		./../../modules/services/scanning.nix.nix
+		./../../modules/services/scanning.nix
 	];
 
 	networking.hostName = "nixyos";
-	batMode = "single";
-
-	boot.loader.systemd-boot.enable = true;
-	boot.loader.efi.canTouchEfiVariables = true;
-
-	networking = {
-		networkmanager = {
-			wifi.powersave = true;
-		};
-	};
 
 	# Older machine
 	system.stateVersion = "24.11";

hosts/thinix-thinkpad/configuration.nix

@@ -9,10 +9,13 @@
 		./../../modules/common.nix
 
 		./../../modules/hardware/xremap.nix
-		./../../modules/hardware/battery.nix
+		./../../modules/hardware/boot.nix
 
 		./../../modules/graphics/workstation.nix
 
+		./../../modules/laptop/powersave.nix
+		./../../modules/laptop/battery.nix
+
 		./../../modules/services/webdav.nix.nix
 		./../../modules/services/scanning.nix.nix
 	];
@@ -20,21 +23,12 @@
 	networking.hostName = "thinix";
 	batMode = "double";
 
-	boot.loader.systemd-boot.enable = true;
-	boot.loader.efi.canTouchEfiVariables = true;
-
 	programs.gnupg.agent = {
 		enable = true;
 		pinentryPackage = with pkgs; pinentry-all;
 		enableSSHSupport = true;
 	};
 
-	networking = {
-		networkmanager = {
-			wifi.powersave = true;
-		};
-	};
-
 	swapDevices = [
 		{
 			device = "/swapfile";
@@ -42,6 +36,5 @@
 		}
 	];
 
-	# Older machine
 	system.stateVersion = "24.11";
 }

modules/hardware/boot.nix

@@ -0,0 +1,26 @@
+{ config, lib, ... }:
+
+let
+	inherit (lib) mkOption types;
+in {
+	options.bootMode = mkOption {
+		type = types.enum [ "uefi" "legacy" ];
+		default = "uefi";
+	};
+
+	config = {
+		boot.consoleLogLevel = 0;
+		boot.kernelParams = [ "quiet" "udev.log_level=3" ];
+
+		boot.loader = if config.bootMode == "uefi" then {
+			efi.canTouchEfiVariables = true;
+			systemd-boot.enable = true;
+			timeout = 0;
+		} else {
+			grub.enable = true;
+			grub.device = "/dev/sda";
+			timeout = 0;
+		};
+	};
+}
+

modules/hardware/nvidia.nix

@@ -13,11 +13,11 @@
 		package = config.boot.kernelPackages.nvidiaPackages.stable;
 	};
 
-	environment.systemPackages = with pkgs; [
+	#environment.systemPackages = with pkgs; [
-		(blender.override {
+	#	(blender.override {
-			cudaSupport = true;
+	#		cudaSupport = true;
-		})
+	#	})
-	];
+	#];
 
 	# This causes very long build times
 	#nixpkgs.config.cudaSupport = true;

modules/laptop/powersave.nix

@@ -0,0 +1,9 @@
+{ ... }:
+
+{
+	networking = {
+		networkmanager = {
+			wifi.powersave = true;
+		};
+	};
+}

user/home.nix

@@ -1,9 +1,7 @@
 { pkgs, ... }:
 
 {
-	imports = [
+  imports = [ ./packages.nix ];
-		./packages.nix
-	];
 
   services.gnome-keyring.enable = true;
 
@@ -31,14 +29,6 @@
   home = {
     username = "jonas";
     homeDirectory = "/home/jonas";
-		sessionVariables = {
-			EDITOR = "nvim";
-			HTTP_HOME = "duckduckgo.com";
-			MANPAGER="nvim +Man!";
-		};
-		shellAliases = {
-			fla = "sudo nixos-rebuild switch --flake '~/nixos#'";
-		};
     pointerCursor = {
       gtk.enable = true;
       name = "catppuccin-frappe-rosewater-cursors";
@@ -64,19 +54,15 @@
     platformTheme.name = "qtct";
     style.name = "Kvantum";
   };
-	xdg.configFile."Kvantum/kvantum.kvconfig".source = (pkgs.formats.ini { }).generate "kvantum.kvconfig" {
+
+  xdg.configFile."Kvantum/kvantum.kvconfig".source =
+    (pkgs.formats.ini { }).generate "kvantum.kvconfig" {
       General.theme = "Catppuccin-Frappe-Rosewater";
     };
   xdg.configFile."qt6ct/qt6ct.conf".source = pkgs.writeTextFile {
     name = "qt6ct.conf";
-		text = ''
+    text =
-			[Appearance]
+      "	[Appearance]\n	color_scheme_path=${pkgs.qt6ct}/share/qt6ct/colors/airy.conf\n	custom_palette=false\n	icon_theme=Papirus-Dark\n	standard_dialogs=default\n	style=kvantum\n";
-			color_scheme_path=${pkgs.qt6ct}/share/qt6ct/colors/airy.conf
-			custom_palette=false
-			icon_theme=Papirus-Dark
-			standard_dialogs=default
-			style=kvantum
-		'';
   };
 
   programs.starship = {
@@ -86,7 +72,6 @@
       aws.disabled = true;
       gcloud.disabled = true;
       line_break.disabled = true;
-
       sudo = {
         disabled = false;
         symbol = "SUDO ";

user/packages.nix

@@ -1,4 +1,4 @@
-{ pkgs, ...}:
+{ pkgs, ... }:
 
 {
   home.packages = with pkgs; [
@@ -13,8 +13,6 @@
     obsidian
     rclone
 
-		#jujutsu
-
     unstable.spotify-player
 
     sops
@@ -42,11 +40,9 @@
 
     shotcut
 
-		papirus-folders
     todo-txt-cli
     systemctl-tui
     acpi
-		zsh
     feh
 
     watson
@@ -56,7 +52,6 @@
     xdragon
 
     luarocks
-		lua
 
     gradle
     openjdk
@@ -70,7 +65,7 @@
     zathura
     eza
     fuzzel
-		catppuccin-cursors
+
     networkmanagerapplet
     gdu
     hyprpaper
@@ -84,7 +79,6 @@
     signal-desktop
     unison
     trash-cli
-		starship
     python3
     fd
     ttyper
@@ -92,46 +86,36 @@
     vim
     tofi
     bat
-		clipse
     dunst
     killall
     libreoffice
     perl
     pipx
-		wpgtk
     waybar
     stow
     brightnessctl
     anki
     unstable.typst
-		dnsmasq
-		davfs2
     mediainfo
     powertop
-		#midori
     exiftool
-		gtk4.dev
     curl
     sioyek
-		qt6.qtbase
 
-		libpulseaudio
     xournalpp
     rnote
-		libinput
-		libGL
-		libglvnd
     emacs
     cargo
     hyprshot
     hyprpicker
     hyprsunset
+
     wl-clipboard
+
     mpv
     gitui
     keepassxc
     kitty
-		wlsunset
     unstable.yazi
     neovim
     htop
@@ -142,49 +126,10 @@
     zip
     xz
     unzip
-		p7zip
 
-		jq
-		yq-go
-
-		mtr
-		iperf3
-		dnsutils
-		ldns
-		aria2
-		socat
-		nmap
-		ipcalc
-
-		# Misc
-		cowsay
     file
-		which
-		gnused
-		gnutar
-		gawk
-		zstd
     gnupg
 
     nix-output-monitor
-
-		# Productivity
-		hugo
-		glow
-
-		iotop
-		iftop
-
-		# System call monitoring
-		strace
-		ltrace
-		lsof
-
-		# System tools
-		sysstat
-		lm_sensors
-		pciutils
-		usbutils
   ];
 }
-