added kitty shell, module organization changes.

hosts/archlaptop/configuration.nix

@@ -90,6 +90,7 @@
   users.users.gabe = {
     isNormalUser = true;
     description = "Gabe Venberg";
+    shell = pkgs.nushell;
     extraGroups = ["networkmanager" "wheel"];
     packages = with pkgs; [
       firefox

hosts/archlaptop/hardware-configuration.nix

@@ -1,15 +1,11 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
 {
-  config,
+  imports =
-  lib,
+    [ (modulesPath + "/profiles/qemu-guest.nix")
-  pkgs,
-  modulesPath,
-  ...
-}: {
-  imports = [
-    (modulesPath + "/profiles/qemu-guest.nix")
     ];
 
   boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ];
@@ -17,13 +13,18 @@
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
+  fileSystems."/" =
-    device = "/dev/disk/by-uuid/87ee53a2-077d-47df-9051-9abcc0fc1a89";
+    { device = "/dev/disk/by-uuid/1000b969-f089-4b1e-bbef-3d0c39da8a91";
       fsType = "ext4";
     };
 
-  swapDevices = [
+  fileSystems."/boot" =
-    {device = "/dev/disk/by-uuid/5aa8725e-fdd1-4825-9d2c-e2c2c165b726";}
+    { device = "/dev/disk/by-uuid/AB75-97AD";
+      fsType = "vfat";
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/506f2ef4-c9ee-4fe6-8590-95e0821d5903"; }
     ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking

hosts/archlaptop/home.nix

@@ -15,7 +15,9 @@
   home.username = "gabe";
   home.homeDirectory = "/home/gabe";
   imports = [
-    ../../terminal/terminal.nix
+    ../../modules/home-manager/terminal/terminal.nix
+    ../../modules/home-manager/home-manager.nix
+    ../../modules/home-manager/kittty/kitty.nix
     inputs.nixvim.homeManagerModules.nixvim
   ];
 }

hosts/gabe-archlaptop.nix

@@ -16,5 +16,6 @@
   home.homeDirectory = "/home/gabe";
   imports = [
     ../terminal/terminal.nix
+    ../../modules/home-manager/home-manager.nix
   ];
 }

hosts/non-nixos-server.nix

@@ -16,5 +16,6 @@
   home.homeDirectory = "/home/gabe";
   imports = [
     ../terminal/terminal.nix
+    ../../modules/home-manager/home-manager.nix
   ];
 }

justfile

@@ -1,6 +1,9 @@
 default:
     just --list
 
+nixos target:
+    sudo nixos-rebuild --flake .#{{target}} switch
+
 home-manager target:
     home-manager --flake .#{{target}} switch
 

modules/home-manager/home-manager.nix

@@ -0,0 +1,21 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: {
+  home.stateVersion = "23.11"; # Please read the comment before changing.
+
+  # Let Home Manager install and manage itself.
+  programs.home-manager.enable = true;
+
+  # enable flakes
+  nix =
+    lib.mkIf config.targets.genericLinux.enable
+    {
+      package = pkgs.nix;
+      settings.experimental-features = ["nix-command" "flakes"];
+      settings.max-jobs = "auto";
+      gc.automatic = true;
+    };
+}

modules/home-manager/kittty/kitty.nix

@@ -0,0 +1,15 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: {
+  programs.kitty = {
+    enable=true;
+    font={
+      package=pkgs.fira-code-nerdfont;
+      name="Fira Code";
+    };
+    theme="Gruvbox Dark";
+  };
+}

modules/home-manager/terminal/nvim/nvim.nix

@@ -17,6 +17,10 @@
 
     clipboard.providers.xsel.enable = true;
   };
+  home.sessionVariables = {
+    EDITOR = "nvim";
+    VISUAL = "nvim";
+  };
   imports = [
     ./keybinds.nix
     ./options.nix

modules/home-manager/terminal/terminal.nix

@@ -4,8 +4,6 @@
   lib,
   ...
 }: {
-  home.stateVersion = "23.11"; # Please read the comment before changing.
-
   home.packages = with pkgs; [
     sshfs
     just
@@ -24,8 +22,6 @@
   };
 
   home.sessionVariables = {
-    EDITOR = "nvim";
-    VISUAL = "nvim";
     PIPENV_VENV_IN_PROJECT = 1;
     POETRY_VIRTUALENVS_IN_PROJECT = 1;
   };
@@ -47,8 +43,8 @@
     ./zsh.nix
     ./git.nix
     ./starship.nix
-    ./nvim/nvim.nix
     ./voice.nix
+    ./nvim/nvim.nix
   ];
 
   programs = {
@@ -66,17 +62,4 @@
   };
 
   services.ssh-agent.enable = true;
-
-  # Let Home Manager install and manage itself.
-  programs.home-manager.enable = true;
-
-  # enable flakes
-  nix =
-    lib.mkIf config.targets.genericLinux.enable
-    {
-      package = pkgs.nix;
-      settings.experimental-features = ["nix-command" "flakes"];
-      settings.max-jobs = "auto";
-      gc.automatic = true;
-    };
 }

modules/home-manager/terminal/zsh.nix

@@ -9,6 +9,7 @@
   programs.yazi.enableZshIntegration = true;
   programs.carapace.enableZshIntegration = true;
   programs.direnv.enableZshIntegration = true;
+  programs.kitty.shellIntegration.enableZshIntegration = true;
   programs.zsh = {
     enable = true;
     enableCompletion = true;