tidying up

modules/configurations.nix

@@ -0,0 +1,10 @@
+flake.nixosConfigurations.nixos = inputs.nixpkgs.lib.nixosSystem {
+	specialArgs = { inherit inputs; };
+	modules = [
+		self.nixosModules.nixos-host
+		self.nixosModules.ui
+		self.nixosModules.packages
+		self.nixosModules.fonts
+		self.nixosModules.shell
+	];
+};

modules/desktop-ui.nix

@@ -1,22 +0,0 @@
-{ inputs, ... }: {
-
-flake.nixosModules.desktop-ui = { pkgs, ... }: {
-  # Desktop environment
-  services.xserver.enable = true;
-  services.xserver.displayManager.gdm.enable = true;
-  services.xserver.desktopManager.gnome.enable = true;
-  services.xserver.xkb = {
-    layout = "us";
-    variant = "";
-  };
-
-  # DankMaterialShell
-  programs.dank-material-shell = {
-    enable = true;
-    enableSystemMonitoring = true;
-    enableDynamicTheming = true;
-  };
-
-	programs.niri.enable = true;
-	services.gnome.gnome-keyring.enable = true; # secret service
-};}

modules/fonts.nix

@@ -0,0 +1,7 @@
+{ inputs, ... }: {
+	flake.nixosModules.fonts = {pkgs, ...}: {
+		fonts.packages = with pkgs; [
+			nerd-fonts.iosevka-term-slab
+		];
+	};
+}

modules/globals/meta.nix

@@ -0,0 +1,8 @@
+{ lib, ... }:
+{
+  options.username = lib.mkOption {
+    type = lib.types.singleLineStr;
+    readOnly = true;
+    default = "thomasgl";
+  };
+}

modules/globals/systems.nix

@@ -0,0 +1,6 @@
+{
+  systems = [
+    "x86_64-linux"
+    "aarch64-linux"
+  ];
+}

modules/hosts/nixos.nix

@@ -1,15 +1,6 @@
 { inputs, self, ... }: {
 
-flake.nixosConfigurations.nixos = inputs.nixpkgs.lib.nixosSystem {
-	specialArgs = { inherit inputs; };
-	modules = [
-		inputs.dms.nixosModules.dank-material-shell
-		self.nixosModules.nixos
-		self.nixosModules.desktop-ui
-	];
-};
-
-flake.nixosModules.nixos = {pkgs, ...}: {
+flake.nixosModules.nixos-host = {pkgs, ...}: {
   imports = [
     ../hardware-configuration.nix
   ];
@@ -67,34 +58,13 @@ flake.nixosModules.nixos = {pkgs, ...}: {
   };
 
   # User account
-  users.users.thomasgl = {
+  users.users.${config.username} = {
     isNormalUser = true;
     description = "Thomas Gouveia Lopes";
     extraGroups = [ "networkmanager" "wheel" ];
-    packages = with pkgs; [
-      neovim
-      nodejs_24
-      pnpm
-      fd
-      ripgrep
-      fish
-      go
-      nerdfetch
-      git
-      alacritty
-      zellij
-      fzf
-      autojump
-    ];
   };
 
-  # Fonts
-  fonts.packages = with pkgs; [
-    nerd-fonts.iosevka-term-slab
-  ];
-
   # Programs
-  programs.firefox.enable = true;
 
   # Allow unfree
   nixpkgs.config.allowUnfree = true;
@@ -102,18 +72,6 @@ flake.nixosModules.nixos = {pkgs, ...}: {
   # Enable flakes
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
 
-  # DankMaterialShell
-  programs.dank-material-shell = {
-    enable = true;
-    enableSystemMonitoring = true;
-    enableDynamicTheming = true;
-  };
-
-  # System packages
-  environment.systemPackages = with pkgs; [
-    # Add system-wide packages here
-  ];
-
   # State version
   system.stateVersion = "25.11";
 };

modules/packages.nix

@@ -0,0 +1,23 @@
+{ inputs, ... }: {
+	flake.nixosModules.packages = {pkgs, ...}: {
+		environment.systemPackages = with pkgs; [
+			neovim
+      nodejs_24
+      pnpm
+      fd
+      ripgrep
+      go
+      nerdfetch
+      git
+      lazygit
+      mako
+      libnotify
+      alacritty
+      zellij
+      fzf
+      autojump
+		];
+
+		programs.firefox.enable = true;
+	};
+}

modules/shell.nix

@@ -0,0 +1,7 @@
+{ config, lib, ... }:
+{
+  flake.nixosModules.shell = {
+		programs.fish.enable = true;
+		# users.users.${config.username}.shell = nixosArgs.config.programs.fish.package;
+  };
+}

modules/ui.nix

@@ -0,0 +1,33 @@
+{ inputs, ... }: {
+	flake.nixosModules.ui = { pkgs, ... }: {
+		# Desktop environment
+		services.xserver.enable = true;
+		services.xserver.displayManager.gdm.enable = true;
+		services.xserver.displayManager.gdm.wayland = true;
+		services.xserver.desktopManager.gnome.enable = true;
+		services.xserver.xkb = {
+			layout = "us";
+			variant = "";
+		};
+
+		programs.dms-shell = {
+			enable = true;
+			systemd = {
+				enable = true;             # Systemd service for auto-start
+				restartIfChanged = true;   # Auto-restart dms.service when dms-shell changes
+			};
+
+			# Core features
+			enableSystemMonitoring = true;     # System monitoring widgets (dgop)
+			enableVPN = true;                  # VPN management widget
+			enableDynamicTheming = true;       # Wallpaper-based theming (matugen)
+			enableAudioWavelength = true;      # Audio visualizer (cava)
+			enableCalendarEvents = true;       # Calendar integration (khal)
+			enableClipboardPaste = true;       # Pasting from the clipboard history (wtype)
+		};
+
+		programs.niri.enable = true;
+		services.displayManager.sessionPackages = [ pkgs.niri ];
+		services.gnome.gnome-keyring.enable = true; # secret service
+	};
+}