From fb356006601fd80c9ce8ff952340a90ebb4a366a Mon Sep 17 00:00:00 2001
From: Superredstone <patrickcanal3@gmail.com>
Date: Wed, 4 Sep 2024 07:50:50 +0200
Subject: [PATCH] Modularizing the system

---
 configuration.nix |  2 ++
 flake.nix         |  2 +-
 home.nix          | 32 --------------------------------
 home/default.nix  | 16 ++++++++++++++++
 home/fish.nix     | 10 ++++++++++
 home/git.nix      |  8 ++++++++
 home/kitty.nix    | 14 ++++++++++++++
 home/tmux.nix     | 14 ++++++++++++++
 8 files changed, 65 insertions(+), 33 deletions(-)
 delete mode 100644 home.nix
 create mode 100644 home/default.nix
 create mode 100644 home/fish.nix
 create mode 100644 home/git.nix
 create mode 100644 home/kitty.nix
 create mode 100644 home/tmux.nix

diff --git a/configuration.nix b/configuration.nix
index 96562c2..3821668 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -98,6 +98,8 @@
 		gnumake
 		cmake
 		zoxide
+		xdg-desktop-portal-gtk
+		xdg-desktop-portal-kde
 	];
 
 	system.stateVersion = "24.05"; # Did you read the comment?
diff --git a/flake.nix b/flake.nix
index 4bac0aa..16b975e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -20,7 +20,7 @@
 					home-manager.backupFileExtension = "backup";
 					home-manager.useGlobalPkgs = true;
 					home-manager.useUserPackages = true;
-					home-manager.users.r3ddy = import ./home.nix;
+					home-manager.users.r3ddy = import ./home/default.nix;
 				}
 			];
 		};
diff --git a/home.nix b/home.nix
deleted file mode 100644
index b8722db..0000000
--- a/home.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ config, pkgs, ... }:
-{
-	home.username = "r3ddy";
-	programs.home-manager.enable = true;
-	
-	programs.git = {
-		enable = true;
-		userName = "Superredstone";
-		userEmail = "patrickcanal3@gmail.com";
-	};
-	programs.fish = {
-		enable = true;
-		interactiveShellInit = ''
-			set fish_greeting # Disable greeting
-			alias cd z # Zoxide instead of cd 
-		'';
-	};
-	programs.kitty = {
-		enable = true;
-		font = { 
-			name = "JetBrainsMono Nerd Font";
-			size = 16;
-		};
-		theme = "Catppuccin-Mocha";
-		settings = {
-			enable_audio_bell = false;
-		};
-	};
-	programs.zoxide.enable = true;
-	programs.tmux.enable = true;
-	home.stateVersion = "24.11";
-}
diff --git a/home/default.nix b/home/default.nix
new file mode 100644
index 0000000..734a192
--- /dev/null
+++ b/home/default.nix
@@ -0,0 +1,16 @@
+{ config, pkgs, ... }:
+{
+	imports = [ 
+		./tmux.nix
+		./fish.nix
+		./git.nix
+		./kitty.nix
+	];
+
+	home.username = "r3ddy";
+
+	programs.home-manager.enable = true;
+	programs.zoxide.enable = true;
+
+	home.stateVersion = "24.11";
+}
diff --git a/home/fish.nix b/home/fish.nix
new file mode 100644
index 0000000..87c657c
--- /dev/null
+++ b/home/fish.nix
@@ -0,0 +1,10 @@
+{ config, pkgs, ... }:
+{
+	programs.fish = {
+		enable = true;
+		interactiveShellInit = ''
+			set fish_greeting # Disable greeting
+			alias cd z # Zoxide instead of cd 
+		'';
+	};
+}
diff --git a/home/git.nix b/home/git.nix
new file mode 100644
index 0000000..afd16f0
--- /dev/null
+++ b/home/git.nix
@@ -0,0 +1,8 @@
+{ config, pkgs, ... }:
+{
+	programs.git = {
+		enable = true;
+		userName = "Superredstone";
+		userEmail = "patrickcanal3@gmail.com";
+	};
+}
diff --git a/home/kitty.nix b/home/kitty.nix
new file mode 100644
index 0000000..d8c6b60
--- /dev/null
+++ b/home/kitty.nix
@@ -0,0 +1,14 @@
+{ pkgs, config, ... }:
+{
+	programs.kitty = {
+		enable = true;
+		font = { 
+			name = "JetBrainsMono Nerd Font";
+			size = 16;
+		};
+		theme = "Catppuccin-Mocha";
+		settings = {
+			enable_audio_bell = false;
+		};
+	};
+}
diff --git a/home/tmux.nix b/home/tmux.nix
new file mode 100644
index 0000000..de61b08
--- /dev/null
+++ b/home/tmux.nix
@@ -0,0 +1,14 @@
+{ pkgs, config, ... }:
+{
+	programs.tmux = {
+		enable = true;
+		escapeTime = 0;
+		extraConfig = ''
+			set-option -g mouse on
+			set -g @catppuccin_flavor 'mocha'
+		'';
+		plugins = with pkgs; [ 
+			tmuxPlugins.catppuccin
+		];
+	};
+}