adding theming and config from ryan4yin nix-config on git

7 files changed, 72 insertions, 22 deletions

diff --git a/flake.nix b/flake.nix
index 777dd9d..3084729 100644
--- a/flake.nix
+++ b/flake.nix
@@ -41,11 +41,11 @@
     #   flake = false;
     # };
 
-    # # useful nushell scripts, such as auto_completion
-    # nushell-scripts = {
-    #   url = "github:nushell/nu_scripts"
-    #   flake = false;
-    # };
+    # useful nushell scripts, such as auto_completion
+    nushell-scripts = {
+      url = "github:nushell/nu_scripts"
+      flake = false;
+    };
 
     # ryan4yin wallpapers
     wallpapers = {
@@ -154,7 +154,6 @@
           }
 
           # hyprland.homeManagerModules.default {wayland.windowManager.hyprland.enable = true;}
-          ./modules/hyprland.nix
 
           ./modules/bluetooth.nix
           ./modules/environment.nix
@@ -186,7 +185,6 @@
             home-manager.useUserPackages = true;
             home-manager.users.defin = import ./home-manager/home.nix;
           }
-          ./modules/hyprland.nix
 
           ./modules/bluetooth.nix
           ./modules/environment.nix
diff --git a/home-manager/btop.nix b/home-manager/btop.nix
new file mode 100644
index 0000000..b736efe
--- /dev/null
+++ b/home-manager/btop.nix
@@ -0,0 +1,12 @@
+{ catppuccin-btop, ... }: {
+  home.file.".config/btop/themes".source = "${catppuccin-btop}/themes";
+
+  #replace htop/nmon
+  programs.btop = {
+    enable = true;
+    settings = {
+      color_theme = "catppuccing_mocha";
+      theme_background = false; # make btop transparent
+    };
+  };
+}
diff --git a/home-manager/helix.nix b/home-manager/helix.nix
new file mode 100644
index 0000000..a8891a5
--- /dev/null
+++ b/home-manager/helix.nix
@@ -0,0 +1,25 @@
+{ pkgs, catppuccin-helix, ... }: {
+  # https://github.com/catppuccin/helix
+  xdg.configFile."helix/themes".source = "${catppuccin-helix}/themes/default";
+
+  programs.helix = {
+    enable = true;
+    package = pkgs.helix;
+    # defaultEditor = true;
+    settings = {
+      theme = "catppuccin_mocha";
+      editor = {
+        line-number = "relative";
+        cursorline = true;
+        color-modes = true;
+        lsp.display-messages = true;
+        cursor.shape = {
+          insert = "bar";
+          normal = "block";
+          select = "underline";
+        };
+        indent-guides.render = true;
+      };
+    };
+  };
+}
diff --git a/home-manager/home.nix b/home-manager/home.nix
index 8ce8d5e..02785bb 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -4,9 +4,13 @@
 #   unstable = import <nixpkgs-unstable>{};
 # in
 {
-  # imports = [
-  #   (import "${home-manager}/nixos")
-  # ];
+  imports = [
+    ./hyprland.nix
+    ./starship.nix
+    ./btop.nix
+    ./helix.nix
+    ./shell.nix
+  ];
 
   nixpkgs = {
     # texlive.combined.scheme-medium;
@@ -126,18 +130,6 @@
           };
         };
 
-        starship = {
-          enable = true;
-          settings = {
-            command_timeout = 1000;
-          };
-        };
-
-        helix = {
-          enable = true;
-          # defaultEditor = true;
-          settings.theme = "base16_transparent";
-        };
       # Let Home Manager install and manage itself.
       # home-manager.enable = true;
     };
diff --git a/modules/hyprland.nix b/home-manager/hyprland.nix
index 0540606..0540606 100644
--- a/modules/hyprland.nix
+++ b/home-manager/hyprland.nix
diff --git a/home-manager/shell.nix b/home-manager/shell.nix
new file mode 100644
index 0000000..c86190e
--- /dev/null
+++ b/home-manager/shell.nix
@@ -0,0 +1,12 @@
+{nushell-scripts, ... }: {
+  programs.nushell = {
+    extraConfig = ''
+      use ${nushell-scripts}/custom-completions/pass/pass-completions.nu *
+      use ${nushell-scripts}/custom-completions/nix/nix-completions.nu *
+      use ${nushell-scripts}/custom-completions/man/man-completions.nu *
+      use ${nushell-scripts}/custom-completions/cargo/cargo-completions.nu *
+      use ${nushell-scripts}/custom-completions/make/make-completions.nu *
+      use ${nushell-scripts}/custom-completions/git/git-completions.nu *
+      '';
+  };  
+}
diff --git a/home-manager/starship.nix b/home-manager/starship.nix
new file mode 100644
index 0000000..12d6f6b
--- /dev/null
+++ b/home-manager/starship.nix
@@ -0,0 +1,11 @@
+{ catppuccin-starship, ... }: {
+  programs.starship = {
+    enable = true;
+   
+    settings = {
+      command_timeout = 1000;
+
+      palette = "catppuccin_mocha";
+    } // builtins.fromTOML (builtins.readFile "${catppuccin-starship}/palettes/mocha.toml");
+  };
+}
\ No newline at end of file