From 379627f1e695b8b34106a161179364388bc4a357 Mon Sep 17 00:00:00 2001
From: Tyler Starr <starrtyler88@gmail.com>
Date: Tue, 19 Sep 2023 17:53:01 -0700
Subject: [PATCH] Refactor bulwark to be similiar to kestrel

---
 .../nixos/hosts/bulwark/configuration.nix     | 71 +++++++------------
 .../hosts/bulwark/home-configuration.nix      | 11 +--
 .../nixos/hosts/kestrel/configuration.nix     |  7 ++
 3 files changed, 38 insertions(+), 51 deletions(-)

diff --git a/provision/nixos/hosts/bulwark/configuration.nix b/provision/nixos/hosts/bulwark/configuration.nix
index 6211a4fe..1b6711d8 100644
--- a/provision/nixos/hosts/bulwark/configuration.nix
+++ b/provision/nixos/hosts/bulwark/configuration.nix
@@ -22,7 +22,7 @@
   nixpkgs.overlays = import ../../lib/overlays.nix;
 
   # Custom kernel is set within Jovian-Nixos
-  # boot.kernelPackages = pkgs.linuxPackages_zen;
+  #boot.kernelPackages = pkgs.linuxPackages_zen;
 
   # Hardware options
   hardware.bluetooth.enable = true;
@@ -50,9 +50,6 @@
     nerdfonts
   ];
 
-  # Enable zsh
-  programs.zsh.enable = true;
-
   # Define user account.
   users.users.${user} = {
     isNormalUser = true;
@@ -60,61 +57,41 @@
     shell = pkgs.zsh;
   };
 
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
+  # List packages installed in system profile.
   environment.systemPackages = with pkgs; [
-    vim
-    git
-    killall
-    pciutils
-    syncthing
-    pinentry-curses 
-    trash-cli
-    unzip
-    nnn
-    advcpmv
-    neovim
+      # One-off stable packages
   ] ++ [
+      # One-off unstable packages
       pkgs-unstable.ungoogled-chromium
   ];
 
-  # Enable user services
-  services = {
-    gvfs.enable = true; # USB automount
-    blueman.enable = true;
-    printing.enable = true;
-    printing.drivers = [ pkgs.hplip ];
-    avahi.enable = true;
-    avahi.nssmdns = true;
-    syncthing = {
-      enable = true;
-      user = "${user}";
-      dataDir = "/home/${user}/sync";
-      configDir = "/home/${user}/.config/syncthing";
-    };
-  };
-
-  # Enable the OpenSSH daemon.
-  services.openssh.enable = true;
-  services.pcscd.enable = true;
-  programs.gnupg.agent = {
-     enable = true;
-     pinentryFlavor = "curses";
-     enableSSHSupport = true;
-  };
-
   # Enable modules
   modules = {
-    services = {
-      samba-client.enable = true;
+    desktop = {
+      #sway.enable = true;
     };
     devel = {
-      tooling.enable = true;
+      #engineering.enable = true;
+      notes.enable = true;
+      #python.enable = true;
+      #tooling.enable = true;
     };
     gaming = {
       steam.enable = true;
     };
+    services = {
+      #jellyfin.enable = true;
+      #peripherals.enable = true;
+      samba-client.enable = true;
+      #samba-server.enable = true;
+      syncthing.enable = true;
+      #virt-manager.enable = true;
+    };
+    system = {
+      ssh.enable = true;
+      terminal.enable = true;
+    };
   };
-  
-  system.stateVersion = "23.05"; # Did you read the comment?
+  # Did you read the comment?
+  system.stateVersion = "23.05"; 
 }
diff --git a/provision/nixos/hosts/bulwark/home-configuration.nix b/provision/nixos/hosts/bulwark/home-configuration.nix
index aff8a7e3..49d7ea3c 100644
--- a/provision/nixos/hosts/bulwark/home-configuration.nix
+++ b/provision/nixos/hosts/bulwark/home-configuration.nix
@@ -4,11 +4,14 @@
   home.homeDirectory = "/home/${user}";
   programs.home-manager.enable = true;
 
+  # Setup git
+  programs.git = {
+      enable = true;
+      userName = "starr-dusT";
+      userEmail = "starrtyler88@gmail.com";
+  };
+
   home.packages = with pkgs; [
-    chezmoi
-    rbw 
-    zk
-    bat
   ];
 
   home.stateVersion = "23.05";
diff --git a/provision/nixos/hosts/kestrel/configuration.nix b/provision/nixos/hosts/kestrel/configuration.nix
index ff0095b1..fba7d41a 100644
--- a/provision/nixos/hosts/kestrel/configuration.nix
+++ b/provision/nixos/hosts/kestrel/configuration.nix
@@ -55,6 +55,13 @@
     extraGroups = [ "wheel" "docker" "libvirtd" ]; # Enable ‘sudo’ for the user.
   };
 
+  # List packages installed in system profile.
+  environment.systemPackages = with pkgs; [
+      # One-off stable packages
+  ] ++ [
+      # One-off unstable packages
+  ];
+
   # Enable modules
   imports = [ ../../modules ];
   modules = {