From 0b709f4ef0f46cca491f5f0e24a3de49536d4de8 Mon Sep 17 00:00:00 2001 From: Danilo Reyes Date: Sat, 27 Sep 2025 19:59:40 -0600 Subject: [PATCH] dotfiles cleanup --- config/home-manager.nix | 2 + dotfiles/gopass/config.yml | 10 ---- dotfiles/htop/htoprc | 61 ----------------------- dotfiles/secrets/mailserver | 1 - modules/shell/tools.nix | 97 +++++++++++++++++++++---------------- 5 files changed, 57 insertions(+), 114 deletions(-) delete mode 100644 dotfiles/gopass/config.yml delete mode 100644 dotfiles/htop/htoprc delete mode 100644 dotfiles/secrets/mailserver diff --git a/config/home-manager.nix b/config/home-manager.nix index f545ddc..3f4579c 100644 --- a/config/home-manager.nix +++ b/config/home-manager.nix @@ -17,6 +17,7 @@ userName = "Danilo Reyes"; userEmail = "CaptainJawZ@protonmail.com"; }; + bash = let inherit (pkgs) fd fzf; @@ -57,6 +58,7 @@ ''; }; }; + xdg = { enable = true; userDirs = { diff --git a/dotfiles/gopass/config.yml b/dotfiles/gopass/config.yml deleted file mode 100644 index ece10ca..0000000 --- a/dotfiles/gopass/config.yml +++ /dev/null @@ -1,10 +0,0 @@ -autoclip: true -autoimport: false -cliptimeout: 45 -exportkeys: false -nopager: false -notifications: false -parsing: true -path: /home/jawz/.local/share/pass -safecontent: true -mounts: {} diff --git a/dotfiles/htop/htoprc b/dotfiles/htop/htoprc deleted file mode 100644 index 79ff45d..0000000 --- a/dotfiles/htop/htoprc +++ /dev/null @@ -1,61 +0,0 @@ -# Beware! This file is rewritten by htop when settings are changed in the interface. -# The parser is also very primitive, and not human-friendly. -htop_version=3.2.1 -config_reader_min_version=3 -fields=18 0 123 124 46 47 38 50 1 -hide_kernel_threads=0 -hide_userland_threads=0 -shadow_other_users=0 -show_thread_names=0 -show_program_path=0 -highlight_base_name=1 -highlight_deleted_exe=1 -highlight_megabytes=1 -highlight_threads=1 -highlight_changes=0 -highlight_changes_delay_secs=5 -find_comm_in_cmdline=1 -strip_exe_from_cmdline=1 -show_merged_command=1 -header_margin=1 -screen_tabs=1 -detailed_cpu_time=0 -cpu_count_from_one=1 -show_cpu_usage=1 -show_cpu_frequency=1 -show_cpu_temperature=1 -degree_fahrenheit=0 -update_process_names=0 -account_guest_in_cpu_meter=0 -color_scheme=3 -enable_mouse=1 -delay=15 -hide_function_bar=0 -header_layout=two_67_33 -column_meters_0=LeftCPUs Swap Tasks NetworkIO Memory -column_meter_modes_0=1 1 2 2 2 -column_meters_1=RightCPUs Hostname Uptime LoadAverage -column_meter_modes_1=1 2 2 2 -tree_view=1 -sort_key=38 -tree_sort_key=0 -sort_direction=-1 -tree_sort_direction=1 -tree_view_always_by_pid=1 -all_branches_collapsed=1 -screen:Main=NICE PID COMM EXE PERCENT_CPU PERCENT_MEM M_VIRT NLWP Command -.sort_key=M_VIRT -.tree_sort_key=PID -.tree_view=1 -.tree_view_always_by_pid=1 -.sort_direction=-1 -.tree_sort_direction=1 -.all_branches_collapsed=1 -screen:I/O=PID USER IO_PRIORITY IO_RATE IO_READ_RATE IO_WRITE_RATE PERCENT_SWAP_DELAY PERCENT_IO_DELAY Command -.sort_key=IO_RATE -.tree_sort_key=PID -.tree_view=0 -.tree_view_always_by_pid=0 -.sort_direction=-1 -.tree_sort_direction=1 -.all_branches_collapsed=0 diff --git a/dotfiles/secrets/mailserver b/dotfiles/secrets/mailserver deleted file mode 100644 index 2a2b8ea..0000000 --- a/dotfiles/secrets/mailserver +++ /dev/null @@ -1 +0,0 @@ -b/run/current-system/sw/bin/bash5/BpvLE.0dXQuzNskhAD94U6zFCFvfhzqWJEiBi diff --git a/modules/shell/tools.nix b/modules/shell/tools.nix index 4e74feb..aff56c8 100644 --- a/modules/shell/tools.nix +++ b/modules/shell/tools.nix @@ -8,50 +8,63 @@ { options.my.shell.tools.enable = lib.mkEnableOption "enable"; config = lib.mkIf config.my.shell.tools.enable { - home-manager.users.jawz = { - programs = { - hstr.enable = true; - htop = { - enable = true; - package = pkgs.htop-vim; + home-manager.users.jawz.programs = { + hstr.enable = true; + htop = { + enable = true; + package = pkgs.htop-vim; + }; + zoxide = { + enable = true; + enableBashIntegration = true; + }; + bash = { + initExtra = '' + if command -v fzf-share >/dev/null; then + source "$(fzf-share)/key-bindings.bash" + source "$(fzf-share)/completion.bash" + fi + ''; + shellAliases = { + cd = "z"; + hh = "hstr"; + ls = "eza --icons --group-directories-first"; + rm = "trash"; + b = "bat"; + f = "fzf --multi --exact -i"; + unique-extensions = '' + fd -tf | rev | cut -d. -f1 | rev | + tr '[:upper:]' '[:lower:]' | sort | + uniq --count | sort -rn''; }; - zoxide = { - enable = true; - enableBashIntegration = true; + }; + bat = { + enable = false; + config.pager = "less -FR"; + extraPackages = builtins.attrValues { + inherit (pkgs.bat-extras) + batman # man pages + batpipe # piping + batgrep # ripgrep + batdiff # this is getting crazy! + batwatch # probably my next best friend + prettybat # trans your sourcecode! + ; }; - bash = { - initExtra = '' - if command -v fzf-share >/dev/null; then - source "$(fzf-share)/key-bindings.bash" - source "$(fzf-share)/completion.bash" - fi - ''; - shellAliases = { - cd = "z"; - hh = "hstr"; - ls = "eza --icons --group-directories-first"; - rm = "trash"; - b = "bat"; - f = "fzf --multi --exact -i"; - unique-extensions = '' - fd -tf | rev | cut -d. -f1 | rev | - tr '[:upper:]' '[:lower:]' | sort | - uniq --count | sort -rn''; - }; - }; - bat = { - enable = true; - config.pager = "less -FR"; - extraPackages = builtins.attrValues { - inherit (pkgs.bat-extras) - batman # man pages - batpipe # piping - batgrep # ripgrep - batdiff # this is getting crazy! - batwatch # probably my next best friend - prettybat # trans your sourcecode! - ; - }; + }; + password-store = { + enable = false; + package = pkgs.gopass; + settings = { + PASSWORD_STORE_AUTOCLIP = "true"; + PASSWORD_STORE_AUTOIMPORT = "false"; + PASSWORD_STORE_CLIPTIMEOUT = "45"; + PASSWORD_STORE_EXPORTKEYS = "false"; + PASSWORD_STORE_NOPAGER = "false"; + PASSWORD_STORE_NOTIFICATIONS = "false"; + PASSWORD_STORE_PARSING = "true"; + PASSWORD_STORE_PATH = "/home/jawz/.local/share/pass"; + PASSWORD_STORE_SAFECONTENT = "true"; }; }; };