From ba5e2567944e1b0001fb84fb3a5c2a071fb6b3bd Mon Sep 17 00:00:00 2001
From: specCon18 <steven.carpenter@skdevstudios.com>
Date: Fri, 9 Feb 2024 01:15:28 -0500
Subject: [PATCH] added budgie

---
 flake.nix                                      |  3 ++-
 hosts/katana/default.nix                       |  2 +-
 hosts/katana/system-pkgs.nix                   | 14 +-------------
 modules/home-manager/zsh.nix                   |  4 +---
 modules/system/desktop-environments/budgie.nix | 12 ++++++++++++
 modules/system/desktop-environments/gnome.nix  |  6 +++---
 users/speccon18/default.nix                    |  1 -
 users/speccon18/home.nix                       |  6 ------
 8 files changed, 20 insertions(+), 28 deletions(-)
 create mode 100644 modules/system/desktop-environments/budgie.nix

diff --git a/flake.nix b/flake.nix
index 971f511..4fbe5fe 100644
--- a/flake.nix
+++ b/flake.nix
@@ -66,6 +66,7 @@
                     [
                         ./modules/system/desktop-environments/tuigreet.nix
                         ./modules/system/desktop-environments/hyprland.nix
+                        ./modules/system/desktop-environments/budgie.nix
                         ./hosts/katana/default.nix
                         ./hosts/katana/bluetooth.nix
                         ./hosts/katana/networkd.nix
@@ -76,7 +77,7 @@
                         ./modules/system/services/syncthing.nix
                         ./modules/system/services/tailscale.nix
                         
-                    ] #extra modules to be loaded
+                    ] #extra modules to be loaded by nixos
                     [
                        hyprland.homeManagerModules.default
                         ./modules/home-manager/hyprland.nix
diff --git a/hosts/katana/default.nix b/hosts/katana/default.nix
index d919d57..8e2da6e 100644
--- a/hosts/katana/default.nix
+++ b/hosts/katana/default.nix
@@ -62,7 +62,7 @@
   };
   speccon18 = {
     desktop = {
-      hyprland.enable = true;
+      hyprland.enable = false;
       gnome.enable = false;
       displayManager.tuigreet.enable = true;
     };
diff --git a/hosts/katana/system-pkgs.nix b/hosts/katana/system-pkgs.nix
index e30ce7d..f455b14 100644
--- a/hosts/katana/system-pkgs.nix
+++ b/hosts/katana/system-pkgs.nix
@@ -9,15 +9,7 @@
         ripgrep
         openssl
         tree
-        unrar
-        unzip
-        gzip
-        p7zip
-        bzip2
-        dconf2nix
-        bat
         exa
-        uutils-coreutils
         htop
         zsh
         dig #dns lookup
@@ -32,10 +24,6 @@
         bottom
         felix-fm
         gitui
-        swww
-        rofi
-        prismlauncher
-        parallel
-        skate
+        spotify
   ];
 }
\ No newline at end of file
diff --git a/modules/home-manager/zsh.nix b/modules/home-manager/zsh.nix
index 7ef2680..1a10d62 100644
--- a/modules/home-manager/zsh.nix
+++ b/modules/home-manager/zsh.nix
@@ -13,10 +13,8 @@
       shellAliases = {
         ls = "exa -l";
         lsa = "exa -al";
-        cd = "z";
+        grep = "rg";
         osrb = "sudo nixos-rebuild $1 --flake ~/code/nixos-config/#katana";
-        top = "btm";
-        cat = "bat --decorations=never";
       };
       localVariables = {
         EDITOR="hx";
diff --git a/modules/system/desktop-environments/budgie.nix b/modules/system/desktop-environments/budgie.nix
new file mode 100644
index 0000000..14b1229
--- /dev/null
+++ b/modules/system/desktop-environments/budgie.nix
@@ -0,0 +1,12 @@
+{ config, pkgs, lib, ...}:
+{
+  
+    environment.systemPackages = with pkgs; [
+      budgie.budgie-desktop-with-plugins
+    ];
+    services.xserver = {
+      enable = true;
+      desktopManager.budgie.enable = true;
+    };
+}
+
diff --git a/modules/system/desktop-environments/gnome.nix b/modules/system/desktop-environments/gnome.nix
index ab244e1..c752e58 100644
--- a/modules/system/desktop-environments/gnome.nix
+++ b/modules/system/desktop-environments/gnome.nix
@@ -18,7 +18,7 @@ in {
     services = {
       gnome = {
         core-utilities.enable = false;
-        gnome-keyring.enable = false;
+        gnome-keyring.enable = true;
       };
       
       xserver = {
@@ -30,7 +30,7 @@ in {
               enable = true;
               wayland = true;
             };
-            defaultSession = lib.mkDefault "gnome";
+            # defaultSession = lib.mkDefault "gnome";
           };
         desktopManager = {
           xterm.enable = false;
@@ -44,7 +44,7 @@ in {
   };
   
   xdg = {
-    # portal = { enable = lib.mkDefault true; };
+    portal = { enable = lib.mkDefault true; };
     mime.defaultApplications = {
       "text/markdown" = "hx";
     };
diff --git a/users/speccon18/default.nix b/users/speccon18/default.nix
index 006a0b1..bcc6656 100644
--- a/users/speccon18/default.nix
+++ b/users/speccon18/default.nix
@@ -6,7 +6,6 @@
     isNormalUser = true;
     initialHashedPassword = "$y$j9T$RdLBHOvUpb17egl0d16LT/$3Y2RD/tT1IZ0nkfAR13pp3IzBjvKLRgGpDPLobUeO23";
     openssh.authorizedKeys.keys = [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIrZpH5QV62dtTb2yx5I3PF2lJyNpPkV57pDlo6xawID"
     ];
     description = "Steven Carpenter";
     extraGroups = [
diff --git a/users/speccon18/home.nix b/users/speccon18/home.nix
index 6b2e586..4b334ff 100644
--- a/users/speccon18/home.nix
+++ b/users/speccon18/home.nix
@@ -15,22 +15,16 @@
     stateVersion = "22.11";
     
     packages = with pkgs; [
-      inkscape
       freecad
       calibre
       bitwarden
       firefox
       discord
-      nodejs_20
-      fira-code
       gimp
       obsidian
       neofetch
       vlc
       remmina
-      bacon
-      skate
-      neovim
     ];
   };  
 }