Move a ton of programs to Common.nix.

flake.nix

@@ -66,15 +66,6 @@
     
     # hyprland-protocols
     hyprland-protocols-git.url = "github:hyprwm/hyprland-protocols";
-
-    # hyprland-community nix
-    hyprland-nix = {
-      url = "github:hyprland-community/hyprland-nix";
-      inputs = {
-        hyprland-xdph.follows = "hyprland-xdph-git";
-        hyprland-protocols.follows = "hyprland-protocols-git";
-      };
-    };
   };
 
   # The `@` syntax here is used to alias the attribute set of the

home-manager/durincore.nix

@@ -140,7 +140,6 @@
     };
   };
 
-
   # please change the username & home direcotry to your own
   home.username = "jahanson";
   home.homeDirectory = "/home/jahanson";
@@ -158,8 +157,6 @@
     };
   };
 
-  # exa replacement, ls replacement.
-  programs.lsd.enable = true;
   programs.fish = {
     enable = true;
     shellAliases = {
@@ -196,31 +193,13 @@
     # here is some command line tools I use frequently
     # feel free to add your own or remove some of them
 
-    # terminal file managers
-    nnn 
-    ranger
-    yazi
-
     # Hyprland must haves
     xfce.thunar # gui file manager
     wofi # Run Menu
     waybar # Wayland bar for Sway and Wlroots based compositors
     dunst # A lightweight replacement for the notification-daemons provided by most desktop environments
 
-    # archives
-    zip
-    xz
-    unzip
-    p7zip
-
     # utils
-    go-task
-    ripgrep # recursively searches directories for a regex pattern
-    jq # A lightweight and flexible command-line JSON processor
-    yq-go # yaml processer https://github.com/mikefarah/yq
-    fzf # A command-line fuzzy finder
-    age # sops-age encryption
-    sops
     direnv # shell environment management
     pre-commit # Pre-commit tasks for git
     minio-client # S3 management
@@ -230,15 +209,6 @@
     _1password-gui
     _1password
 
-    # networking tools
-    iperf3
-    dnsutils # `dig` + `nslookup`
-    ldns # replacement of `dig`, it provide the command `drill`
-    aria2 # A lightweight multi-protocol & multi-source command-line download utility
-    socat # replacement of openbsd-netcat
-    nmap # A utility for network discovery and security auditing
-    ipcalc # it is a calculator for the IPv4/v6 addresses
-
     # kubernetes
     k9s
     kubectl
@@ -251,16 +221,6 @@
     lens
 
     # misc
-    fastfetch
-    cowsay
-    file
-    which
-    tree
-    gnused
-    gnutar
-    gawk
-    zstd
-    gnupg
     fira-code-nerdfont
 
     # nix related
@@ -271,24 +231,8 @@
     nixd # nix lsp server
 
     # productivity
-    hugo # static site generator
     glow # markdown previewer in terminal
 
-    btop # replacement of htop/nmon
-    iotop # io monitoring
-    iftop # network monitoring
-
-    # system call monitoring
-    strace # system call monitoring
-    ltrace # library call monitoring
-    lsof # list open files
-
-    # system tools
-    sysstat
-    lm_sensors # for `sensors` command
-    ethtool
-    pciutils # lspci
-    usbutils # lsusb
     rtx # rtx package manager
 
     # Browsers
@@ -302,32 +246,8 @@
     # Dev
     vscode
     termius
-    atuin
   ];
 
-  # starship - an customizable prompt for any shell
-  programs.starship = {
-    enable = true;
-    # custom settings
-    settings = {
-      add_newline = false;
-      aws.disabled = true;
-      gcloud.disabled = true;
-      line_break.disabled = true;
-      username = {
-        disabled = false;
-        show_always = true;
-        format = "[$user]($style)@";
-      };
-      hostname ={ 
-        disabled = false;
-        ssh_only = false;
-        format = "[$hostname]($style) ";
-        ssh_symbol = "";
-      };
-    };
-  };
-
   # alacritty - a cross-platform, GPU-accelerated terminal emulator
   programs.alacritty = {
     enable = true;

home-manager/este.nix

@@ -16,9 +16,6 @@
     userEmail = "joe@veri.dev";
   };
 
-  # exa replacement, ls replacement.
-  programs.lsd.enable = true;
-  
   # Fish configuration
   programs.fish = {
     enable = true;
@@ -40,6 +37,9 @@
       direnv hook fish | source
       set -gx PATH $PATH $HOME/.krew/bin
     '';
+    interactiveShellInit = ''
+      atuin init fish | source
+    '';
     functions = {
       fish_greeting = {
         description = "Set the fish greeting";
@@ -48,102 +48,17 @@
     };
   };
 
-  # starship - an customizable prompt for any shell
-  programs.starship = {
-    enable = true;
-    # custom settings
-    settings = {
-      add_newline = false;
-      aws.disabled = true;
-      gcloud.disabled = true;
-      line_break.disabled = true;
-      username = {
-        disabled = false;
-        show_always = true;
-        format = "[$user]($style)@";
-      };
-      hostname ={ 
-        disabled = false;
-        ssh_only = false;
-        format = "[$hostname]($style) ";
-      };
-    };
-  };
-
     # Packages that should be installed to the user profile.
   home.packages = with pkgs; [
     # here is some command line tools I use frequently
     # feel free to add your own or remove some of them
 
-    fastfetch
-    go-task
-    
-    # terminal file managers
-    nnn
-    ranger
-    yazi
-
-    # archives
-    zip
-    xz
-    unzip
-    p7zip
-
-    # utils
-    ripgrep # recursively searches directories for a regex pattern
-    jq # A lightweight and flexible command-line JSON processor
-    yq-go # yaml processer https://github.com/mikefarah/yq
-    fzf # A command-line fuzzy finder
-    age # sops-age encryption
-    sops 
-    direnv # shell environment management
-    pre-commit # Pre-commit tasks for git
-    minio-client # S3 management
-    shellcheck
-    envsubst
-
-    # networking tools
-    mtr # A network diagnostic tool
-    iperf3
-    dnsutils  # `dig` + `nslookup`
-    ldns # replacement of `dig`, it provide the command `drill`
-    aria2 # A lightweight multi-protocol & multi-source command-line download utility
-    socat # replacement of openbsd-netcat
-    nmap # A utility for network discovery and security auditing
-    ipcalc  # it is a calculator for the IPv4/v6 addresses
-
-    # misc
-    cowsay
-    file
-    which
-    tree
-    gnused
-    gnutar
-    gawk
-    zstd
-    gnupg
-
     # nix related
     #
     # it provides the command `nom` works just like `nix`
     # with more details log output
     nix-output-monitor
 
-    btop  # replacement of htop/nmon
-    iotop # io monitoring
-    iftop # network monitoring
-
-    # system call monitoring
-    strace # system call monitoring
-    ltrace # library call monitoring
-    lsof # list open files
-
-    # system tools
-    sysstat
-    lm_sensors # for `sensors` command
-    ethtool
-    pciutils # lspci
-    usbutils # lsusb
   ];
 
   home.stateVersion = "23.11";

home-manager/gandalf.nix

@@ -16,32 +16,6 @@
     userEmail = "joe@veri.dev";
   };
 
-  # starship - an customizable prompt for any shell
-  programs.starship = {
-    enable = true;
-    # custom settings
-    settings = {
-      add_newline = false;
-      aws.disabled = true;
-      gcloud.disabled = true;
-      line_break.disabled = true;
-      username = {
-        disabled = false;
-        show_always = true;
-        format = "[$user]($style)@";
-      };
-      hostname ={ 
-        disabled = false;
-        ssh_only = false;
-        format = "[$hostname]($style) ";
-        ssh_symbol = "";
-      };
-    };
-  };
-
-  # exa replacement, ls replacement.
-  programs.lsd.enable = true;
-  
   # Fish configuration
   programs.fish = {
     enable = true;
@@ -66,6 +40,9 @@
       direnv hook fish | source
       set -gx PATH $PATH $HOME/.krew/bin
     '';
+    interactiveShellInit = ''
+      atuin init fish | source
+    '';
     functions = {
       fish_greeting = {
         description = "Set the fish greeting";
@@ -79,75 +56,11 @@
     # here is some command line tools I use frequently
     # feel free to add your own or remove some of them
 
-    fastfetch
-    go-task
-    
-    # terminal file managers
-    nnn
-    ranger
-    yazi
-
-    # archives
-    zip
-    xz
-    unzip
-    p7zip
-
-    # utils
-    ripgrep # recursively searches directories for a regex pattern
-    jq # A lightweight and flexible command-line JSON processor
-    yq-go # yaml processer https://github.com/mikefarah/yq
-    fzf # A command-line fuzzy finder
-    age # sops-age encryption
-    sops 
-    direnv # shell environment management
-    pre-commit # Pre-commit tasks for git
-    minio-client # S3 management
-    shellcheck
-    envsubst
-
-    # networking tools
-    mtr # A network diagnostic tool
-    iperf3
-    dnsutils  # `dig` + `nslookup`
-    ldns # replacement of `dig`, it provide the command `drill`
-    aria2 # A lightweight multi-protocol & multi-source command-line download utility
-    socat # replacement of openbsd-netcat
-    nmap # A utility for network discovery and security auditing
-    ipcalc  # it is a calculator for the IPv4/v6 addresses
-
-    # misc
-    cowsay
-    file
-    which
-    tree
-    gnused
-    gnutar
-    gawk
-    zstd
-    gnupg
-
     # nix related
     #
     # it provides the command `nom` works just like `nix`
     # with more details log output
     nix-output-monitor
-
-    btop  # replacement of htop/nmon
-    iotop # io monitoring
-    iftop # network monitoring
-
-    # system call monitoring
-    strace # system call monitoring
-    ltrace # library call monitoring
-    lsof # list open files
-
-    # system tools
-    sysstat
-    lm_sensors # for `sensors` command
-    ethtool
-    pciutils # lspci
-    usbutils # lsusb
   ];
 
   home.stateVersion = "23.11";

nixos/common.nix

@@ -88,10 +88,100 @@
     nfs-utils
     borgbackup
     borgmatic
-  ];
 
+    #utils
+    ripgrep # recursively searches directories for a regex pattern
+    jq # A lightweight and flexible command-line JSON processor
+    yq-go # yaml processer https://github.com/mikefarah/yq
+    fzf # A command-line fuzzy finder
+    age # sops-age encryption
+    sops
+    lsd
+
+    #misc
+    cowsay
+    file
+    which
+    tree
+    gnused
+    gnutar
+    gawk
+    zstd
+    gnupg
+    fastfetch
+    atuin
+    go-task
+
+    # archives
+    zip
+    xz
+    unzip
+    p7zip
+
+    # terminal file managers
+    nnn
+    ranger
+    yazi
+
+    # networking tools
+    iperf3
+    dnsutils  # `dig` + `nslookup`
+    ldns # replacement of `dig`, it provide the command `drill`
+    aria2 # A lightweight multi-protocol & multi-source command-line download utility
+    socat # replacement of openbsd-netcat
+    nmap # A utility for network discovery and security auditing
+    ipcalc  # it is a calculator for the IPv4/v6 addresses
+
+    # system tools
+    sysstat
+    lm_sensors # for `sensors` command
+    ethtool
+    pciutils # lspci
+    usbutils # lsusb
+
+    # system call monitoring
+    strace # system call monitoring
+    ltrace # library call monitoring
+    lsof # list open files
+
+    btop # replacement of htop/nmon
+    iotop # io monitoring
+    iftop # network monitoring
+
+    # utils
+    direnv # shell environment management
+    pre-commit # Pre-commit tasks for git
+    minio-client # S3 management
+    shellcheck
+    envsubst
+
+  ];
+  # my traceroute
   programs.mtr.enable = true;
 
+  # starship - an customizable prompt for any shell
+  programs.starship = {
+    enable = true;
+    # custom settings
+    settings = {
+      add_newline = false;
+      aws.disabled = true;
+      gcloud.disabled = true;
+      line_break.disabled = true;
+      username = {
+        disabled = false;
+        show_always = true;
+        format = "[$user]($style)@";
+      };
+      hostname ={ 
+        disabled = false;
+        ssh_only = false;
+        format = "[$hostname]($style) ";
+        ssh_symbol = "";
+      };
+    };
+  };
+
   # Enable/Start Tailscale service
   services.tailscale.enable = true;
 

nixos/durincore/configuration.nix

@@ -87,7 +87,7 @@
   # this value at the release version of the first install of this system.
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "23.11"; # Did you read the comment?
+  system.stateVersion = "24.05"; # Did you read the comment?
 
   # Register app image as an executable and run it with appimage-run
   boot.binfmt.registrations.appimage = {