refreshed config

4 files changed, 13 insertions, 128 deletions

diff --git a/nixos/desktop/xfce.nix b/modules/desktop/wms/xfce.nix
index 563b205..0c62ee0 100644
--- a/nixos/desktop/xfce.nix
+++ b/modules/desktop/wms/xfce.nix
@@ -1,5 +1,15 @@
-{pkgs, ...}:
-{
+{pkgs, config, lib, ...}:
+let 
+  cfg = config.addons.desktop.xfce; 
+in {
+  
+  options.addons.desktop.xfce = {
+    enable = lib.mkEnableOption "Enable xfce";
+  };
+  
+  config = lib.mkIf cfg.enable (lib.mkMerge [ 
+  (import ../../../utils/makeWm.nix "xfce" "x11" )
+  {
    environment.systemPackages = with pkgs; [
      # XFCE stuff
      xfce.catfish
@@ -23,4 +33,5 @@
      gnome-disk-utility
    ];
    services.xserver.desktopManager.xfce.enable = true; 
+  }]);
 }
diff --git a/nixos/desktop/apps.nix b/nixos/desktop/apps.nix
deleted file mode 100644
index 68e5090..0000000
--- a/nixos/desktop/apps.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{pkgs, ...} :
-{
-  environment.systemPackages = with pkgs; [
-	neovim
-	kitty
-  ];
-
-  programs.steam =  {
-    enable = true; 
-    protontricks.enable = true; 
-    gamescopeSession.enable = true; 
-  };
-} 
diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix
deleted file mode 100644
index b987376..0000000
--- a/nixos/desktop/default.nix
+++ /dev/null
@@ -1,67 +0,0 @@
-
-{pkgs, ...}:
-{
-	imports = [
-	   ./apps.nix
-     ./xfce.nix
-	   ./hyprland.nix
-	]; 
-
-	programs = {
-	   dconf.enable = true; 
-     thunar = {
-	   	  enable = true; 
-        plugins = with pkgs.xfce; [
-          thunar-archive-plugin
-          thunar-media-tags-plugin
-          thunar-volman
-		  ];
-    };
-	};
-  # Enable CUPS to print documents.
-  services.printing.enable = true;
-
-
-  # Enable touchpad support (enabled default in most desktopManager).
-  services.libinput.enable = true;
-	
-	services = {
-	   blueman.enable = true; 
-	   # Enable sound 
-     pipewire = {
-	       enable = true; 
-	       pulse.enable = true; 
-     };
-
-	  displayManager.sddm = {
-      enable=true; 
-      wayland.enable = true;
-      #theme = "catppuccin-mocha";
-     };
-
-	   xserver = {
-	      enable = true; 
-	      excludePackages = with pkgs; [
-	    	xterm
-              ];
-	   };
-	};
-
-  i18n.inputMethod = {
-    type = "fcitx5";
-    enable = true; 
-    fcitx5.addons = with pkgs; [
-      fcitx5-gtk
-      fcitx5-lua
-      fcitx5-mozc
-      catppuccin-fcitx5 
-      fcitx5-table-other
-    ]; 
-  }; 
-
-  fonts.packages = with pkgs; [
-	   noto-fonts
-	   font-awesome
-	   nerd-fonts.hurmit 
-	]; 
-}
diff --git a/nixos/desktop/hyprland.nix b/nixos/desktop/hyprland.nix
deleted file mode 100644
index 62b39ae..0000000
--- a/nixos/desktop/hyprland.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{pkgs, ...}: {
-    environment.systemPackages = with pkgs; [
-      hyprland
-      hyprshot
-      hyprkeys
-      hypridle
-      hyprpaper
-      hyprpicker
-      hyprnotify
-      hyprcursor
-      hyprpolkitagent
-       waybar
-       waybar-mpris
-    ]; 
-
-
-  services.xserver.exportConfiguration = true; # This makes it easy to search for a valid keymap 
-  # Enable KDE6 env in case Hyprland gets borked. 
-  # services.desktopManager.plasma6.enable = true;
-  programs.hyprland.enable = true; 
-  programs.hyprland.withUWSM  = true; 
-  programs.uwsm = {
-    enable = true; 
-    waylandCompositors ={
-      hyprland = {
-        prettyName = "Hyprland";
-        comment = "Hyprland compositor managed by UWSM";
-        binPath = "/run/current-system/sw/bin/Hyprland";
-      };
-    };
-  };
-  
-  xdg.portal = {
-     enable = true;
-     extraPortals = with pkgs; [ xdg-desktop-portal-hyprland xdg-desktop-portal-gtk ]; 
-     config = {
-         common = {
-           default = [
-             "hyprland"
-             "gtk"
-           ];
-           "org.freedesktop.impl.portal.Filechooser"="gtk";
-         }; 
-      }; 
-  };
-}