Added how to use sudo to README

Reviewed-on: #1

README.md

@@ -0,0 +1,27 @@
+## Install
+
+```
+git clone https://github.com/Rogue-King/nix-shell-config.git
+cd nix-shell-config
+bash install.sh
+```
+## Update
+
+```
+bash update.sh
+```
+
+## Updating Configurations
+
+```home-manager switch```
+
+or just use the alias:
+
+```rebuild```
+
+## Allowing Sudo to run commands
+
+Edit the sudoers file in /etc, (must be root user or have sudo permissions to edit)
+append the following to secure_path:
+
+```:/home/yourusername/.nix-profile/bin:/nix/var/nix/profiles/default/bin```

home-manager/cli-tools.nix

@@ -8,6 +8,8 @@
     curl
     docker
     dust
+    file
+    findutils
     ghostty
     git
     neovim
@@ -15,6 +17,7 @@
     nix-prefetch-github
     nmap
     openssh
+    plocate
     tailscale
     thefuck
     tldr
@@ -32,8 +35,8 @@
     yazi.enable = true;
     starship.enable = true;
     lazygit.enable = true;
-    #thefuck.enable = true;
+    thefuck.enable = true;
-    #thefuck.enableZshIntegration = true;
+    thefuck.enableZshIntegration = true;
     
     git = {  
       enable = true;
@@ -82,13 +85,16 @@
         grep = "grep --color=auto";
         ll = "eza -la";
         lg = "lazygit";
-        fu = "fuck";
+        fu = "thefuck";
+	fk = "thefuck";
+	fuck = "thefuck";
         lt = "eza --tree";
       	cd = "z";
         cat = "bat";
         catp = "bat -p";
         btop = "btop --utf-force";
         open = "xdg-open";
+	rebuild = "home-manager switch";
       };
 
       initExtra = ''
@@ -103,86 +109,7 @@
 
       oh-my-zsh = {
         enable = true;
-        #plugins = ["thefuck"];
       };
     };
-
-    starship = {
-      settings = {
-      add_newline = true;
-      format = lib.concatStrings [
-      	"$time"
-      	"$directory"
-      	"$git_branch"
-      	"$git_status"
-      	"$hostname"
-      	"$golang"
-      	"direnv"
-      	"$status"
-      ];
-
-      right_format = lib.concatStrings [
-      	"$cmd_duration"
-      ];
-
-      cmd_duration = {
-      	disabled = false;
-      	show_notifications = false;
-      	min_time = 2000;
-      	format = "[$duration](bold yellow)";
-      };
-
-      directory = {
-        style = "cyan";
-      	format = ''\[[$path]($style)\] '';
-      };
-
-      direnv = {
-      	disabled = false;
-      };
-
-      git_branch = {
-      	style = "bold cyan";
-      	format = ''\[[$symbol$branch(:$remote_branch)]($style)\] '';
-      };
-	
-      git_status = {
-      	format = "[($all_status$ahead_behind )]($style)";
-      	conflicted = "🏳";
-      	ahead = "⇡\${count}";
-      	diverged = "⇕⇡\${ahead_count}⇣\${behind_count}";
-      	behind = "⇣\${count}";
-      	up_to_date = "✓";
-      	untracked = "🤷";
-      	stashed = "📦";
-      	modified = "📝";
-        staged = ''[++\($count\)](green)'';
-      	renamed = "👅";
-      	deleted = "🗑";
-      };
-
-      golang = {
-      	format = ''\[[$symbol($version)]($style)\]'';
-      };
-
-      hostname = {
-      	format = "[$ssh_symbol$hostname]($style) ";
-      };
-
-      status = {
-      	disabled = false;
-      	success_symbol = "[❱](bold red)[❱](bold yellow)[❱](bold green) ";
-      	symbol = "[❱❱❱](bold red) ";
-      	format = "$symbol";
-      };
-
-      time = {
-        disabled = false;
-      	style = "cyan";
-      	format = ''\[[$time]($style)\] '';
-      };
-
-     };
-    };
   };
 }

home-manager/fastfetch/fastfetch.nix

@@ -4,7 +4,7 @@
       enable = true;
       settings = {
         logo = {
-          source = "/etc/nixos/home-manager/fastfetch/assets/evangelion-mecha-neon-genesis-desktop-wallpaper-cover.jpg";
+          source = "/etc/nixos/home-manager/fastfetch/assets/Jiji.jpg";
           type = "kitty";
           height = 20;
           width = 60;

home-manager/home.nix

@@ -5,6 +5,9 @@
       ./cli-tools.nix
       ./fastfetch/fastfetch.nix
       ./direnv.nix
+#      ./nixvim/nixvim.nix
+      ./starship.nix
+#      inputs.nixvim.homeManagerModules.nixvim
  ];
   
   # Home Manager needs a bit of information about you and the paths it should

home-manager/nixvim/nixvim.nix

@@ -0,0 +1,365 @@
+{
+  programs = {
+    nixvim = {
+      enable = true;
+      defaultEditor = true;
+      viAlias = true;
+      vimAlias = true;
+
+      #colorschemes.onedark.enable = true;
+
+      colorschemes.everforest = {
+        enable = true;
+        settings = {
+          background = "hard";
+          transparent_background = 1;  
+        };
+      };
+
+      opts = {
+        number = true;
+        relativenumber = true;
+        expandtab = true;
+        shiftwidth = 2;
+        tabstop = 2;
+      };
+
+      diagnostics = {
+        virtual_text = true;
+        update_in_insert = true;
+        severity_sort = true;
+      };
+
+      globals = {
+        mapleader = " ";
+        maplocalleader = " ";
+      };
+
+      keymaps = [
+        {
+          action = ":q<CR>";
+          key = "<leader>q";
+          options = {
+            silent = true;
+            noremap = true;
+            desc = "Quit";
+          };
+        }
+        {
+          action = ":w<CR>";
+          key = "<leader>w";
+          options = {
+            silent = true;
+            noremap = true;
+            desc = "Save";
+          };
+        }
+        {
+          action = ":wq<CR>";
+          key = "<leader>wq";
+          options = {
+            silent = true;
+            noremap = true;
+            desc = "Save and quit";
+          };
+        }
+        {
+          action = "<C-\\><C-n>:ToggleTerm direction=float<CR>";
+          key = "<leader>t";
+          mode = [ "n" "v" "t" ];
+          options = {
+            silent = true;
+            noremap = true;
+            desc = "Toggle floating terminal";
+          };
+        }
+        {
+          action = ":Telescope live_grep<CR>";
+          key = "<leader>lg";
+          options = {
+            silent = true;
+            noremap = true;
+            desc = "Live grep";
+          };
+        }
+        {
+          action = ":Telescope find_files<CR>";
+          key = "<leader>ff";
+          options = {
+            silent = true;
+            noremap = true;
+            desc = "Find file";
+          };
+        }
+        {
+          action = ":Telescope oldfiles<CR>";
+          key = "<leader>of";
+          options = {
+            silent = true;
+            noremap = true;
+            desc = "Browse recent files";
+          };
+        }
+        {
+          action = ":Telescope file_browser<CR>";
+          key = "<leader>fb";
+          options = {
+            silent = true;
+            noremap = true;
+            desc = "Directory-based file browser";
+          };
+        }
+        {
+          action = ":Neotree toggle reveal<CR>";
+          key = "<leader>nt";
+          options = {
+            silent = true;
+            noremap = true;
+            desc = "Toggle file tree";
+          };
+        }
+      ];
+
+      plugins = {
+        comment.enable = true;
+        direnv.enable = true;
+        gitsigns.enable = true;
+        intellitab.enable = true;
+        lastplace.enable = true;
+        lsp-format.enable = true;
+        lspsaga.enable = true;
+        lualine.enable = true;
+        luasnip.enable = true;
+        multicursors.enable = true;
+        neo-tree.enable = true;
+        neoscroll.enable = true;
+        nix.enable = true;
+        nvim-autopairs.enable = true;
+        nvim-colorizer.enable = true;
+        refactoring.enable = true;
+        toggleterm.enable = true;
+        treesitter.enable = true;
+        web-devicons.enable = true;
+
+        telescope = {
+          enable = true;
+          extensions.file-browser.enable = true;
+        };
+
+        transparent = {
+          enable = true;
+          settings = {
+            groups = [
+              "Normal"
+              "NormalNC"
+              "Comment"
+              "Constant"
+              "Special"
+              "Identifier"
+              "Statement"
+              "PreProc"
+              "Type"
+              "Underlined"
+              "Todo"    
+              "String"
+              "Function"
+              "Conditional"
+              "Repeat"
+              "Operator"  
+              "Structure"
+              "LineNr"
+              "NonText"
+              "SignColumn"
+              "CursorLine"
+              "CursorLineNr"
+              "StatusLine"
+              "StatusLineNC"
+              "EndOfBuffer"
+            ];
+
+          };
+
+        };
+
+        lint = {
+          enable = true;
+          autoCmd = {
+            event = [ "InsertLeave" "TextChanged" ];
+          };
+        };
+
+        illuminate = {
+          enable = true;
+          delay = 100;
+          minCountToHighlight = 1;
+          modesAllowlist = ["n" "i" "v"];
+        };
+
+        ollama = {
+          enable = true;
+          #url = ;
+        };
+
+        which-key = {
+          enable = true;
+          settings = {
+            preset = "modern";
+            delay = 500;
+            expand = 1;
+            notify = false;
+            win = {
+              border = "single";
+              padding = [1 1];
+              wo.winblend = 10;
+            };
+            replace = {
+              desc = [
+                [
+                  "<space>"
+                  "SPACE"
+                ]
+                [
+                  "<leader>"
+                  "SPACE"
+                ]
+                [
+                  "<[cC][rR]>"
+                  "RETURN"
+                ]
+                [
+                  "<[tT][aA][bB]>"
+                  "TAB"
+                ]
+                [
+                  "<[bB][sS]>"
+                  "BACKSPACE"
+                ]
+              ];
+            };
+          };
+        };
+
+        scrollview = {
+          enable = true;
+          settings = {
+            signs_on_startup = [
+              "all"
+            ];
+          };
+        };
+
+        startup = {
+          enable = true;
+          parts = [ "header" "body" ];
+          sections = {
+            header = {
+              align = "center";
+              content = {
+                __raw = "require('startup.headers').hydra_header";
+              };
+              defaultColor = "";
+              foldSection = false;
+              highlight = "Statement";
+              margin = 5;
+              oldfilesAmount = 0;
+              title = "Header";
+              type = "text";
+            };
+            body = {
+              align = "center";
+              content = [
+                [
+                  " Find File"
+                  "Telescope find_files"
+                  "<leader>ff"
+                ]
+                [
+                  "󰍉 Find Word"
+                  "Telescope live_grep"
+                  "<leader>lg"
+                ]
+                [
+                  " Recent Files"
+                  "Telescope oldfiles"
+                  "<leader>of"
+                ]
+                [
+                  " File Browser"
+                  "Telescope file_browser"
+                  "<leader>fb"
+                ]
+                [
+                  " New File"
+                  "lua require'startup'.new_file()"
+                  "<leader>nf"
+                ]
+              ];
+              defaultColor = "";
+              foldSection = false;
+              highlight = "String";
+              margin = 5;
+              oldfilesAmount = 0;
+              title = "Basic Commands";
+              type = "mapping";
+            };
+          };
+        };
+
+        indent-blankline = {
+          enable = true;
+          settings = {
+            scope = {
+              show_end = true;
+              show_exact_scope = true;
+              show_start = true;
+            };
+          };
+        };
+
+        cmp = {
+          enable = true;
+          autoEnableSources = true;
+
+          settings = {
+            sources = [
+              {name = "nvim_lsp";}
+              {name = "path";}
+              {name = "buffer";}
+              {name = "luasnip";}
+            ];
+            mapping = {
+              "<C-Space>" = "cmp.mapping.complete()";
+              "<C-d>" = "cmp.mapping.scroll_docs(-4)";
+              "<C-e>" = "cmp.mapping.close()";
+              "<C-f>" = "cmp.mapping.scroll_docs(4)";
+              "<CR>" = "cmp.mapping.confirm({ select = true })";
+              "<S-Tab>" = "cmp.mapping(cmp.mapping.select_prev_item(), {'i', 's'})";
+              "<Tab>" = "cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})";
+            };
+          };
+        };
+
+        lsp = {
+          enable = true;
+          
+          servers = {
+            nixd = {
+              enable = true;
+              extraOptions = {
+                offset_encoding = "utf-8";
+              };
+            };
+            ts_ls.enable = true;
+            gopls.enable = true;
+            golangci_lint_ls.enable = true;
+            rust_analyzer = {
+              enable = true;
+              installCargo = true;
+              installRustc = true;
+            };
+          };
+        };
+      };
+    };
+  };
+}

home-manager/starship.nix

@@ -0,0 +1,84 @@
+{ lib, ... }:
+
+{
+  programs = {
+    starship = {
+      settings = {
+      add_newline = true;
+      format = lib.concatStrings [
+      	"$time"
+      	"$directory"
+      	"$git_branch"
+      	"$git_status"
+      	"$hostname"
+      	"$golang"
+      	"direnv"
+      	"$status"
+      ];
+
+      right_format = lib.concatStrings [
+      	"$cmd_duration"
+      ];
+
+      cmd_duration = {
+      	disabled = false;
+      	show_notifications = false;
+      	min_time = 2000;
+      	format = "[$duration](bold yellow)";
+      };
+
+      directory = {
+        style = "cyan";
+      	format = ''\[[$path]($style)\] '';
+      };
+
+      direnv = {
+      	disabled = false;
+      };
+
+      git_branch = {
+      	style = "bold cyan";
+      	format = ''\[[$symbol$branch(:$remote_branch)]($style)\] '';
+      };
+	
+      git_status = {
+      	format = "[($all_status$ahead_behind )]($style)";
+      	conflicted = "🏳";
+      	ahead = "⇡\${count}";
+      	diverged = "⇕⇡\${ahead_count}⇣\${behind_count}";
+      	behind = "⇣\${count}";
+      	up_to_date = "✓";
+      	untracked = "🤷";
+      	stashed = "📦";
+      	modified = "📝";
+        staged = ''[++\($count\)](green)'';
+      	renamed = "👅";
+      	deleted = "🗑";
+      };
+
+      golang = {
+      	format = ''\[[$symbol($version)]($style)\]'';
+      };
+
+      hostname = {
+      	format = "[$ssh_symbol$hostname]($style) ";
+      };
+
+      status = {
+      	disabled = false;
+      	success_symbol = "[❱](bold red)[❱](bold yellow)[❱](bold green) ";
+      	symbol = "[❱❱❱](bold red) ";
+      	format = "$symbol";
+      };
+
+      time = {
+        disabled = false;
+      	style = "cyan";
+      	format = ''\[[$time]($style)\] '';
+      };
+
+     };
+    };
+  };
+}
+

install.sh

@@ -1,4 +1,4 @@
-!#/bin/bash
+#!/bin/bash
 
 echo "You are logged in as $USER"
 read -p "Is this the target user? Y/N: " response
@@ -28,7 +28,7 @@ files=("home-manager/home.nix" "home-manager/cli-tools.nix")
 for file in "${files[@]}"; do
     if [ -f "$file" ]; then
         # Use sed to replace 'USER' with the replacement word
-        sed -i "s/USER/$replacement_word/g" "$file"
+        sed -i "s/USER/$USER/g" $file
         echo "Processed: $file"
     else
         echo "Error: $file does not exist or is not a regular file."
@@ -47,4 +47,6 @@ sudo echo "/home/$USER/.nix-profile/bin/zsh" | sudo tee -a /etc/shells
 
 chsh -s /home/$USER/.nix-profile/bin/zsh $USER
 
-source ~/.zshrc
+echo "Restarting Shell, log back in"
+
+exit

update.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+git pull
+
+files=("home-manager/home.nix" "home-manager/cli-tools.nix")
+
+for file in "${files[@]}"; do
+    if [ -f "$file" ]; then
+        # Use sed to replace 'USER' with the replacement word
+        sed -i "s/USER/$USER/g" $file
+        echo "Processed: $file"
+    else
+        echo "Error: $file does not exist or is not a regular file."
+    fi
+done
+
+cp -r home-manager/ ~/.config/
+
+home-manager switch