roles/common/programs/btop.nix

@@ -1,27 +0,0 @@
-{ pkgs, ... }:
-let
-  catppuccinBtop = pkgs.fetchFromGitHub {
-    owner = "catppuccin";
-    repo = "btop";
-    # I know fetiching from master is not best practice but idc this is not going to change often
-    # Latest commit rn is c6469190f2ecf25f017d6120bf4e050e6b1d17af
-    rev = "master";
-    hash = "sha256-jodJl4f2T9ViNqsY9fk8IV62CrpC5hy7WK3aRpu70Cs=";
-};
-
-in
-{
-  home-manager = {
-    users.toast = {
-      programs.btop = {
-        enable = true;
-        settings = {
-          color_theme = "catppuccin_mocha";
-        };
-      };
-      xdg.configFile = {
-        "btop/themes".source = "${catppuccinBtop}/themes";
-      };
-    };
-  };
-}

roles/common/programs/default.nix

@@ -12,7 +12,6 @@
 		./git.nix
 		./starship.nix
 		./bat.nix
-		./btop.nix
 	];
 	# Some programs dont have a programs.*.enable option, so I install their package here
 	environment.systemPackages = with pkgs; [
@@ -24,6 +23,7 @@
 		ncdu
 		tree
 		btdu
+		btop
 		iperf3
 		restic
 	];

roles/common/programs/git.nix

@@ -7,6 +7,7 @@
 			delta.enable = true;
 			extraConfig = {
 				init.defaultBranch = "main";
+				pull.rebase = "interactive";
 				commit.verbose = "true";
 			};
 		};

roles/common/programs/starship.nix

@@ -1,16 +1,7 @@
-{ pkgs, ... }:
+{ config, ... }:
-let
+
-	catppuccinFlavour = "mocha";
-	catppuccinStarship = pkgs.fetchFromGitHub {
-		owner = "catppuccin";
-		repo = "starship";
-		# Latest commit is 5629d2356f62a9f2f8efad3ff37476c19969bd4f
-		rev = "main";
-		hash = "sha256-nsRuxQFKbQkyEI4TXgvAjcroVdG+heKX5Pauq/4Ota0=";
-	} + /palettes/${catppuccinFlavour}.toml;
-in
 {
-	programs.starship = with builtins; {
+	programs.starship = {
 		enable = true;
 		settings = {
 			nix_shell = {
@@ -26,9 +17,6 @@ in
 				disabled = false;
 				read_only = " 󰌾";
 			};
-			palette = "catppuccin_${catppuccinFlavour}";
+		};
-		} //
-		# Add the catppuccin palette to the settings file
-		(fromTOML (readFile catppuccinStarship));
 	};
 }

roles/kde/programs/default.nix

@@ -6,7 +6,6 @@
 		./firefox.nix
 		./skanpage.nix
 		./neochat.nix
-		./konsole.nix
 	];
 
 	# Enable the kde partition manager

roles/kde/programs/konsole.nix

@@ -1,17 +0,0 @@
-{ pkgs, ... }:
-let
-  catppuccinKonsole = pkgs.fetchFromGitHub {
-    owner = "catppuccin";
-    repo = "konsole";
-    # Latest commit is 7d86b8a1e56e58f6b5649cdaac543a573ac194ca
-    rev = "main";
-    hash = "sha256-EwSJMTxnaj2UlNJm1t6znnatfzgm1awIQQUF3VPfCTM=";
-  } + /Catppuccin-Mocha.colorscheme;
-in
-{
-  home-manager.users.toast = {
-    xdg.dataFile = {
-      "konsole/Catppuccin-Mocha.colorscheme".source = catppuccinKonsole;
-    };
-  };
-}