Modularize

hosts/t480/configuration.nix

@@ -1,77 +1,52 @@
 { config, lib, pkgs, inputs, ... }:
 
 {
-  imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-      inputs.home-manager.nixosModules.default
-    ];
+  imports = [
+    ./hardware-configuration.nix
+    inputs.home-manager.nixosModules.default
+    ../../modules/nixos/gtkapps.nix
+    ../../modules/nixos/gtkbar.nix
+    ../../modules/nixos/fonts.nix
+    ../../modules/nixos/system-packages.nix
+    ../../modules/nixos/user-jack.nix
+    ../../modules/nixos/sound.nix
+  ];
 
-  # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
-  # Use latest kernel.
   boot.kernelPackages = pkgs.linuxPackages_latest;
 
-  networking.hostName = "t480"; # Define your hostname.
-  networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
+  networking.hostName = "t480";
+  networking.networkmanager.enable = true;
 
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
 
-  time.timeZone = "America/LosAngeles";
+  time.timeZone = "America/Los_Angeles";
 
   # Enable CUPS to print documents.
   services.printing.enable = true;
 
-  # Enable sound.
-  services.pipewire = {
-     enable = true;
-     pulse.enable = true;
-   };
+  services.dbus.enable = true;
 
-  users.users.jack = {
-    isNormalUser = true;
-    extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
-    packages = with pkgs; [
-        zed-editor
-    ];
-  };
+  programs.zsh.enable = true;
+
+  programs.thunar.enable = true;
+
+  programs.dconf.enable = true;
 
   home-manager = {
-    extraSpecialArgs = {inherit inputs; };
-    users = {
-      "jack" = import ./home.nix;
-    };
+    extraSpecialArgs = { inherit inputs; };
+    users = { "jack" = import ./home.nix; };
   };
 
   nixpkgs.config.allowUnfree = true;
 
-  # Enable touchpad support (enabled default in most desktopManager).
   services.libinput.enable = true;
 
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-
-  programs.firefox.enable = true;
-  programs.hyprland.enable = true;
-
-  # List packages installed in system profile.
-  environment.systemPackages = with pkgs; [
-    neovim
-    tree
-    vim # Both vim and neovim just in case
-    wget
-    ghostty
-    git
-    gcc
-  ];
-
-  # List services that you want to enable:
-
-  # Enable the OpenSSH daemon.
   services.openssh.enable = true;
 
-  system.stateVersion = "25.05"; # Did you read the comment?
+  system.stateVersion = "25.05";
 
 }
 

hosts/t480/home.nix

@@ -2,10 +2,12 @@
 
 {
 
-    imports = [
-        inputs.zen-browser.homeModules.twilight
-    ];
+  imports = [
+    inputs.zen-browser.homeModules.twilight
+    ../../modules/home-manager/zsh.nix
+  ];
 
+  programs.home-manager.enable = true;
   # Home Manager needs a bit of information about you and the paths it should
   # manage.
   home.username = "jack";
@@ -15,19 +17,49 @@
 
   # The home.packages option allows you to install Nix packages into your
   # environment.
-  home.packages = [
-  ];
+  home.packages = [ pkgs.sway-contrib.grimshot ];
 
   programs.zen-browser.enable = true;
 
   # Home Manager is pretty good at managing dotfiles. The primary way to manage
   # plain files is through 'home.file'.
-  home.file = {
+  home.file = { };
+
+  gtk = {
+    enable = true;
+
+    theme = {
+      name = "Graphite-Dark";
+      package = pkgs.graphite-gtk-theme;
+    };
+
+    iconTheme = {
+      name = "Papirus-Dark";
+      package = pkgs.papirus-icon-theme;
+    };
   };
 
-  home.sessionVariables = {
-    EDITOR = "nvim";
+  home.pointerCursor = {
+    gtk.enable = true;
+    x11.enable = true;
+    name = "capitaine-cursors";
+    package = pkgs.capitaine-cursors;
+    size = 32; # optional, adjust as needed
   };
 
-  programs.home-manager.enable = true;
+  xdg.configFile = {
+    "gtk-4.0/assets".source =
+      "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}/gtk-4.0/assets";
+    "gtk-4.0/gtk.css".source =
+      "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}/gtk-4.0/gtk.css";
+    "gtk-4.0/gtk-dark.css".source =
+      "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}/gtk-4.0/gtk-dark.css";
+  };
+
+  home.shellAliases = {
+    nixreb = "sudo nixos-rebuild switch --flake /home/jack/nixos/#t480";
+  };
+
+  home.sessionVariables = { EDITOR = "nvim"; };
+
 }