diff options
53 files changed, 157 insertions, 136 deletions
diff --git a/modules/desktop/bspwm/default.nix b/modules/desktop/bspwm/default.nix index 2dc3f91..6b6acef 100644 --- a/modules/desktop/bspwm/default.nix +++ b/modules/desktop/bspwm/default.nix @@ -3,7 +3,7 @@ { config = lib.mkIf config.desktop.enable { xsession.windowManager.bspwm.enable = true; - + xsession.windowManager.bspwm.settings = with config.scheme.withHashtag; { window_gap = 10; split_ratio = 0.5; @@ -21,7 +21,7 @@ active_border_color = base02; focused_border_color = base03; }; - + xsession.windowManager.bspwm.rules = { "floating-termial" = { state = "floating"; @@ -31,7 +31,7 @@ follow = true; }; }; - + xsession.windowManager.bspwm.extraConfig = '' for monitor in $(xrandr -q | grep -w 'connected' | cut -d' ' -f1); do bspc monitor "$monitor" -d '1' '2' '3' '4' '5' '6' diff --git a/modules/desktop/polybar/bar/main.nix b/modules/desktop/polybar/bar/main.nix index 49c3b84..0f38ae4 100644 --- a/modules/desktop/polybar/bar/main.nix +++ b/modules/desktop/polybar/bar/main.nix @@ -10,31 +10,29 @@ in { override-redirect = false; wm-restack = "bspwm"; enable-ipc = true; - + border-top-size = 1; border-bottom-size = 1; border-left-size = 1; border-right-size = 1; border-color = base03; - + background = base00; foreground = base05; - + line-size = 3; line-color = base08; - + padding-left = 1; padding-right = 1; - - # separator = "%{F${base03}}%{T3}│%{T-}%{F-}"; - + offset-x = "10"; offset-y = "10"; - + font-0 = "${config.fonts.normal}:pixelsize=${toString config.fonts.size};3"; font-1 = "${config.fonts.normal}:weight=Bold:pixelsize=${largerFontSize};3"; font-2 = "${config.fonts.normal}:style=Light:pixelsize=${largerFontSize};2"; - + modules-left = "bspwm separator"; modules-center = "xwindow"; modules-right = "separator volume separator battery separator wifi wifi-separator ethernet ethernet-separator time separator memory separator cpu separator date"; diff --git a/modules/desktop/polybar/module/battery.nix b/modules/desktop/polybar/module/battery.nix index f2a10c8..cdf3b86 100644 --- a/modules/desktop/polybar/module/battery.nix +++ b/modules/desktop/polybar/module/battery.nix @@ -5,15 +5,15 @@ with config.scheme.withHashtag; type = "internal/battery"; battery = "BAT1"; adapter = "ADP1"; - + low-at = 0; format-charging = "%{T2}%{F${base03}}<animation-charging>%{F-}%{T-} <label-charging>"; format-discharging = "%{T2}%{F${base03}}<ramp-capacity>%{F-}%{T-} <label-discharging>"; format-full-prefix = " "; - + label-charging = "%percentage:3%%"; label-discharging = "%percentage:3%%"; - + ramp-capacity-0 = ""; ramp-capacity-1 = ""; ramp-capacity-2 = ""; @@ -24,7 +24,7 @@ with config.scheme.withHashtag; ramp-capacity-7 = ""; ramp-capacity-8 = ""; ramp-capacity-9 = ""; - + animation-charging-0 = ""; animation-charging-1 = ""; animation-charging-2 = ""; @@ -35,6 +35,6 @@ with config.scheme.withHashtag; animation-charging-7 = ""; animation-charging-8 = ""; animation-charging-9 = ""; - + animation-charging-framerate = 750; } diff --git a/modules/desktop/polybar/module/bspwm.nix b/modules/desktop/polybar/module/bspwm.nix index 383de8f..3c8f64a 100644 --- a/modules/desktop/polybar/module/bspwm.nix +++ b/modules/desktop/polybar/module/bspwm.nix @@ -3,18 +3,18 @@ with config.scheme.withHashtag; { type = "internal/bspwm"; - + label-focused = "%index%"; label-focused-underline = "${base0D}"; label-focused-padding = 1; - + label-occupied = "%index%"; label-occupied-padding = 1; - + label-urgent = "%index%"; label-urgent-underline = "${base08}"; label-urgent-padding = 1; - + label-empty = "%index%"; label-empty-foreground = "${base03}"; label-empty-padding = 1; diff --git a/modules/desktop/polybar/module/ethernet-separator.nix b/modules/desktop/polybar/module/ethernet-separator.nix index 87df6f3..c2fefaa 100644 --- a/modules/desktop/polybar/module/ethernet-separator.nix +++ b/modules/desktop/polybar/module/ethernet-separator.nix @@ -5,10 +5,10 @@ with config.scheme.withHashtag; type = "internal/network"; interface = "enp4s0"; interface-type = "wired"; - + format-connected = " %{F${base03}}%{T3}│%{T-}%{F-} "; format-disconnected = ""; - + label-connected = ""; label-disconnected = ""; } diff --git a/modules/desktop/polybar/module/ethernet.nix b/modules/desktop/polybar/module/ethernet.nix index 9073c79..3e2b48d 100644 --- a/modules/desktop/polybar/module/ethernet.nix +++ b/modules/desktop/polybar/module/ethernet.nix @@ -5,10 +5,10 @@ with config.scheme.withHashtag; type = "internal/network"; interface = "enp4s0"; interface-type = "wired"; - + format-connected = "%{T2}%{F${base03}}%{F-}%{T-} <label-connected>"; format-disconnected = ""; - + label-connected = "%netspeed:8%"; label-disconnected = ""; } diff --git a/modules/desktop/polybar/module/wifi-separator.nix b/modules/desktop/polybar/module/wifi-separator.nix index 4237d84..6b8da50 100644 --- a/modules/desktop/polybar/module/wifi-separator.nix +++ b/modules/desktop/polybar/module/wifi-separator.nix @@ -5,10 +5,10 @@ with config.scheme.withHashtag; type = "internal/network"; interface = "wlan0"; interface-type = "wireless"; - + format-connected = " %{F${base03}}%{T3}│%{T-}%{F-} "; format-disconnected = ""; - + label-connected = ""; label-disconnected = ""; } diff --git a/modules/desktop/polybar/module/wifi.nix b/modules/desktop/polybar/module/wifi.nix index f244054..9f25fa2 100644 --- a/modules/desktop/polybar/module/wifi.nix +++ b/modules/desktop/polybar/module/wifi.nix @@ -5,13 +5,13 @@ with config.scheme.withHashtag; type = "internal/network"; interface = "wlan0"; interface-type = "wireless"; - + format-connected = "%{T2}%{F${base03}}<ramp-signal>%{F-}%{T-} <label-connected>"; format-disconnected = ""; - + label-connected = "%netspeed:8%"; label-disconnected = ""; - + ramp-signal-0 = ""; ramp-signal-1 = ""; ramp-signal-2 = ""; diff --git a/modules/desktop/polybar/module/xwindow.nix b/modules/desktop/polybar/module/xwindow.nix index f0614d1..386efe2 100644 --- a/modules/desktop/polybar/module/xwindow.nix +++ b/modules/desktop/polybar/module/xwindow.nix @@ -1,6 +1,5 @@ { config }: -with config.scheme.withHashtag; { type = "internal/xwindow"; label = "%title:0:20:...%"; diff --git a/modules/desktop/sxhkd/default.nix b/modules/desktop/sxhkd/default.nix index 98338c2..3102efe 100644 --- a/modules/desktop/sxhkd/default.nix +++ b/modules/desktop/sxhkd/default.nix @@ -16,23 +16,23 @@ (import ./keybindings/maim.nix { inherit pkgs createKeybinding lib; }) (import ./keybindings/pamixer.nix { inherit pkgs createKeybindingBase lib; }) (import ./keybindings/playerctl.nix { inherit pkgs createKeybindingBase lib; }) - + (createKeybinding "s" "Show keybindings." "kitty --title 'Keybindings' --class floating-termial -e ${pkgs.writeShellScript "keybindings.sh" (builtins.readFile ./scripts/keybindings.sh)}" ) - + (createKeybinding "r" "Application launcher." "rofi -show drun") - + (createKeybinding "t" "Launch terminal." "kitty") - + (createKeybinding "f" "Launch File Manager." diff --git a/modules/desktop/sxhkd/keybindings/brightnessctl.nix b/modules/desktop/sxhkd/keybindings/brightnessctl.nix index acb4ea2..6cdf3e7 100644 --- a/modules/desktop/sxhkd/keybindings/brightnessctl.nix +++ b/modules/desktop/sxhkd/keybindings/brightnessctl.nix @@ -7,7 +7,7 @@ in lib.mkMerge [ "XF86MonBrightnessDown" "Decrease brightness." "${brightnessctl} set 5%-") - + (createKeybindingBase "XF86MonBrightnessUp" "Increase brightness." diff --git a/modules/desktop/sxhkd/keybindings/bspwm.nix b/modules/desktop/sxhkd/keybindings/bspwm.nix index ed62ed4..ffa7d6c 100644 --- a/modules/desktop/sxhkd/keybindings/bspwm.nix +++ b/modules/desktop/sxhkd/keybindings/bspwm.nix @@ -7,27 +7,27 @@ in lib.mkMerge [ "q" "Kill current window." "${bspc} node -c") - + (createKeybinding "{1-9,0}" "Switch workspace." "${bspc} desktop -f {1-9,10}") - + (createKeybinding "shift + {1-9,0}" "Move window to workspace." "${bspc} node -d {1-9,10} --follow") - + (createKeybinding "{n,d,m}" "Set current window mode (tiled, floating, fullscreen)." "${bspc} node focused -t {tiled,floating,fullscreen}") - + (createKeybinding "{_,shift + }{h,j,k,l}" "Navigate between windows." "${bspc} node --{focus,swap} {west,south,north,east}") - + # the indentation for each line is required to work with the help prompt (createKeybinding "ctrl + {h,j,k,l}" diff --git a/modules/desktop/sxhkd/keybindings/maim.nix b/modules/desktop/sxhkd/keybindings/maim.nix index 7b748da..b66ec98 100644 --- a/modules/desktop/sxhkd/keybindings/maim.nix +++ b/modules/desktop/sxhkd/keybindings/maim.nix @@ -7,7 +7,7 @@ in lib.mkMerge [ "p" "Take screenshot of selected area and save to clipboard" "${maim} -s | xclip -selection clipboard -t image/png") - + (createKeybinding "shift + p" "Take screenshot of selected area and save to ~/Pictures/Screenshots" diff --git a/modules/desktop/sxhkd/keybindings/pamixer.nix b/modules/desktop/sxhkd/keybindings/pamixer.nix index 3543d8f..a45bf83 100644 --- a/modules/desktop/sxhkd/keybindings/pamixer.nix +++ b/modules/desktop/sxhkd/keybindings/pamixer.nix @@ -7,12 +7,12 @@ in lib.mkMerge [ "XF86AudioLowerVolume" "Decrease volume." "${pamixer} --decrease 5") - + (createKeybindingBase "XF86AudioRaiseVolume" "Increase volume." "${pamixer} --increase 5") - + (createKeybindingBase "XF86AudioMute" "Mute audio." diff --git a/modules/desktop/sxhkd/scripts/keybindings.sh b/modules/desktop/sxhkd/scripts/keybindings.sh index 01bb05f..1548f1c 100755 --- a/modules/desktop/sxhkd/scripts/keybindings.sh +++ b/modules/desktop/sxhkd/scripts/keybindings.sh @@ -36,13 +36,12 @@ border_line="├$(printf '%.0s─' $(seq 1 $max_keybinding_length))┼$(printf ' # Print table header with borders echo "┌$(printf '%.0s─' $(seq 1 $max_keybinding_length))┬$(printf '%.0s─' $(seq 1 $description_width))┐" printf "│ %-*s │ %-*s │\n" "$max_keybinding_content_length" "KEYBINDING" "$description_content_width" "DESCRIPTION" - - # Initialize variables + description="" - + # Load the sxhkd file into an array mapfile -t lines < "$SXHKD_FILE" - + # Loop through lines for output for line in "${lines[@]}"; do # Check if the line is a comment diff --git a/modules/scripts/default.nix b/modules/scripts/default.nix index cbcc665..21b8399 100644 --- a/modules/scripts/default.nix +++ b/modules/scripts/default.nix @@ -5,7 +5,7 @@ home.sessionPath = [ "${config.home.homeDirectory}/scripts" ]; - + home.file = let shellScript = path: { text = '' diff --git a/modules/scripts/warp-start.sh b/modules/scripts/warp-start.sh index 49f807d..a1f3c76 100644 --- a/modules/scripts/warp-start.sh +++ b/modules/scripts/warp-start.sh @@ -21,7 +21,7 @@ wait_for_daemon() { fi sleep 1 done - + echo "ERROR: warp-svc did not become ready within ${DAEMON_TIMEOUT}s" >&2 exit 1 } @@ -52,21 +52,20 @@ main() { fi exit 1 } - + start_daemon wait_for_daemon - + if ! is_registered; then register_client else echo "Client already registered." fi - + connect_client - + echo "Current status:" warp-cli status } main - diff --git a/modules/scripts/warp-stop.sh b/modules/scripts/warp-stop.sh index 13b0c96..9fdf238 100644 --- a/modules/scripts/warp-stop.sh +++ b/modules/scripts/warp-stop.sh @@ -55,4 +55,3 @@ main() { } main "$@" - diff --git a/modules/tools/atac/default.nix b/modules/tools/atac/default.nix index 8d97fef..bc28761 100644 --- a/modules/tools/atac/default.nix +++ b/modules/tools/atac/default.nix @@ -4,7 +4,7 @@ options.tools.atac = { enable = lib.mkEnableOption "Enables atac."; }; - + config = lib.mkIf config.tools.atac.enable { home.packages = with pkgs; [ atac diff --git a/modules/tools/bluetui/default.nix b/modules/tools/bluetui/default.nix index 2a7847d..0555b44 100644 --- a/modules/tools/bluetui/default.nix +++ b/modules/tools/bluetui/default.nix @@ -4,7 +4,7 @@ options.tools.bluetui = { enable = lib.mkEnableOption "Enables bluetui."; }; - + config = lib.mkIf config.tools.bluetui.enable { home.packages = with pkgs; [ bluetui diff --git a/modules/tools/bottles/default.nix b/modules/tools/bottles/default.nix index 74dc551..e9261dc 100644 --- a/modules/tools/bottles/default.nix +++ b/modules/tools/bottles/default.nix @@ -4,7 +4,7 @@ options.tools.bottles = { enable = lib.mkEnableOption "Enables bottles."; }; - + config = lib.mkIf config.tools.bottles.enable { home.packages = with pkgs; [ (bottles.override { diff --git a/modules/tools/bottom/default.nix b/modules/tools/bottom/default.nix index c307047..e330576 100644 --- a/modules/tools/bottom/default.nix +++ b/modules/tools/bottom/default.nix @@ -4,7 +4,7 @@ options.tools.bottom = { enable = lib.mkEnableOption "Enables bottom."; }; - + config = lib.mkIf config.tools.bottom.enable { programs.bottom.enable = true; }; diff --git a/modules/tools/brightnessctl/default.nix b/modules/tools/brightnessctl/default.nix index a35e3e4..7c539a9 100644 --- a/modules/tools/brightnessctl/default.nix +++ b/modules/tools/brightnessctl/default.nix @@ -4,7 +4,7 @@ options.tools.brightnessctl = { enable = lib.mkEnableOption "Enables brightnessctl."; }; - + config = lib.mkIf config.tools.brightnessctl.enable { home.packages = with pkgs; [ brightnessctl diff --git a/modules/tools/cloudflare-warp/default.nix b/modules/tools/cloudflare-warp/default.nix index 5f94ef9..d644dee 100644 --- a/modules/tools/cloudflare-warp/default.nix +++ b/modules/tools/cloudflare-warp/default.nix @@ -4,7 +4,7 @@ options.tools.cloudflare-warp = { enable = lib.mkEnableOption "Enables CloudFlare Warp VPN."; }; - + config = lib.mkIf config.tools.cloudflare-warp.enable { home.packages = with pkgs; [ cloudflare-warp diff --git a/modules/tools/devenv/default.nix b/modules/tools/devenv/default.nix index 5ff8f95..a77149b 100644 --- a/modules/tools/devenv/default.nix +++ b/modules/tools/devenv/default.nix @@ -5,9 +5,28 @@ enable = lib.mkEnableOption "Enables devenv."; }; - config = lib.mkIf config.tools.devenv.enable { + config = let + # Use --no-reload by default for devenv shell + shellIntegration = '' +devenv() { + for arg in "$@"; do + if [[ "$arg" == "--reload" || "$arg" == "--no-reload" ]]; then + command devenv "$@" + return + fi + done + + command devenv "$@" --no-reload +} +''; + in lib.mkIf config.tools.devenv.enable { home.packages = with pkgs; [ devenv ]; + + programs.zsh.initContent = lib.mkIf config.programs.zsh.enable + (lib.mkAfter shellIntegration); + programs.bash.initExtra = lib.mkIf config.programs.bash.enable + (lib.mkAfter shellIntegration); }; } diff --git a/modules/tools/fastfetch/default.nix b/modules/tools/fastfetch/default.nix index 30ba375..edd1873 100644 --- a/modules/tools/fastfetch/default.nix +++ b/modules/tools/fastfetch/default.nix @@ -1,10 +1,10 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: { options.tools.fastfetch = { enable = lib.mkEnableOption "Enables fastfetch."; }; - + config = lib.mkIf config.tools.fastfetch.enable { programs.fastfetch = { enable = true; diff --git a/modules/tools/fzf/default.nix b/modules/tools/fzf/default.nix index f971ca9..3d19eca 100644 --- a/modules/tools/fzf/default.nix +++ b/modules/tools/fzf/default.nix @@ -4,11 +4,17 @@ options.tools.fzf = { enable = lib.mkEnableOption "Enables fzf."; }; - - config = lib.mkIf config.tools.fzf.enable { + + config = let + shellIntegration = '' +${if config.tools.zsh.enable then + "eval \"$(fzf --zsh)\"" +else "eval \"$(fzf --bash)\""} + ''; + in lib.mkIf config.tools.fzf.enable { programs.fzf = { enable = true; - + defaultOptions = [ "--height 100%" "--layout=reverse" @@ -21,18 +27,18 @@ "--no-info" "--margin=\"1,2\"" ]; - + colors = with config.scheme.withHashtag; { fg = base05; # Foreground bg = "-1"; # Background (-1 for transparent) hl = base0D; # Highlight - + "fg+" = base07; # Foreground for selected item "bg+" = "-1"; # Background for selected item "hl+" = base0D; # Highlight for selected item - + gutter = "-1"; # Remove the white margin at the left - + info = base0B; # Info text (usually count of items) border = base03; # Border color prompt = base0A; # Prompt text color @@ -41,5 +47,10 @@ spinner = base0C; # Spinner color (during search) }; }; + + programs.zsh.initContent = lib.mkIf config.programs.zsh.enable + (lib.mkAfter shellIntegration); + programs.bash.initExtra = lib.mkIf config.programs.bash.enable + (lib.mkAfter shellIntegration); }; } diff --git a/modules/tools/git/default.nix b/modules/tools/git/default.nix index f6082f4..09ac973 100644 --- a/modules/tools/git/default.nix +++ b/modules/tools/git/default.nix @@ -12,7 +12,7 @@ description = "Git email."; }; }; - + config = lib.mkIf config.tools.git.enable { programs.git = { enable = true; @@ -25,7 +25,7 @@ core.askPass = ""; }; }; - + # The base directory of the credential file must exist home.activation.createGitCacheDirectory = lib.hm.dag.entryAfter diff --git a/modules/tools/htop/default.nix b/modules/tools/htop/default.nix index f418054..9b61fb2 100644 --- a/modules/tools/htop/default.nix +++ b/modules/tools/htop/default.nix @@ -4,7 +4,7 @@ options.tools.htop = { enable = lib.mkEnableOption "Enables htop."; }; - + config = lib.mkIf config.tools.htop.enable { programs.htop = { enable = true; diff --git a/modules/tools/impala/default.nix b/modules/tools/impala/default.nix index d973fac..7a80c6d 100644 --- a/modules/tools/impala/default.nix +++ b/modules/tools/impala/default.nix @@ -4,7 +4,7 @@ options.tools.impala = { enable = lib.mkEnableOption "Enables impala."; }; - + config = lib.mkIf config.tools.impala.enable { home.packages = with pkgs; [ impala diff --git a/modules/tools/kitty/default.nix b/modules/tools/kitty/default.nix index 2bb7731..3fd298e 100644 --- a/modules/tools/kitty/default.nix +++ b/modules/tools/kitty/default.nix @@ -4,7 +4,7 @@ options.tools.kitty = { enable = lib.mkEnableOption "Enables kitty. WARNING! Currently faces problems with color rendering with picom."; }; - + config = lib.mkIf config.tools.kitty.enable { programs.kitty = { enable = true; @@ -15,13 +15,13 @@ filter_notification = "all"; update_check_interval = 0; scrollback_indicator_opacity = "0.5"; - + dynamic_background_opacity = false; enable_audio_bell = false; - + background = base00; foreground = base05; - + color0 = base00; color1 = base08; color2 = base0B; @@ -38,10 +38,10 @@ color13 = base0E; color14 = base0F; color15 = base07; - + selection_background = base05; selection_foreground = base00; - + allow_remote_control = "yes"; listen_on = "unix:/tmp/kitty"; shell = lib.mkIf config.tools.zsh.enable "zsh"; diff --git a/modules/tools/libreoffice/default.nix b/modules/tools/libreoffice/default.nix index fe2a387..c73d7ab 100644 --- a/modules/tools/libreoffice/default.nix +++ b/modules/tools/libreoffice/default.nix @@ -4,7 +4,7 @@ options.tools.libreoffice = { enable = lib.mkEnableOption "Enables libreoffice."; }; - + config = lib.mkIf config.tools.libreoffice.enable { home.packages = with pkgs; [ libreoffice diff --git a/modules/tools/librewolf/default.nix b/modules/tools/librewolf/default.nix index 522b76b..aa10982 100644 --- a/modules/tools/librewolf/default.nix +++ b/modules/tools/librewolf/default.nix @@ -4,7 +4,7 @@ options.tools.librewolf = { enable = lib.mkEnableOption "Enables librewolf."; }; - + config = lib.mkIf config.tools.librewolf.enable { programs.librewolf = { enable = true; diff --git a/modules/tools/lsd/default.nix b/modules/tools/lsd/default.nix index 31a69cc..da8e81f 100644 --- a/modules/tools/lsd/default.nix +++ b/modules/tools/lsd/default.nix @@ -4,7 +4,7 @@ options.tools.lsd = { enable = lib.mkEnableOption "Enables lsd."; }; - + config = lib.mkIf config.tools.lsd.enable { programs.lsd = { enable = true; diff --git a/modules/tools/maim/default.nix b/modules/tools/maim/default.nix index 55f9ef9..95c2f5b 100644 --- a/modules/tools/maim/default.nix +++ b/modules/tools/maim/default.nix @@ -4,7 +4,7 @@ options.tools.maim = { enable = lib.mkEnableOption "Enables maim."; }; - + config = lib.mkIf config.tools.maim.enable { home.packages = with pkgs; [ maim diff --git a/modules/tools/nixvim/colorscheme.nix b/modules/tools/nixvim/colorscheme.nix index 810111a..b3dbe4c 100644 --- a/modules/tools/nixvim/colorscheme.nix +++ b/modules/tools/nixvim/colorscheme.nix @@ -1,4 +1,4 @@ -{ pkgs, config, lib, ... }: +{ config, lib, ... }: { config = lib.mkIf config.tools.nixvim.enable { diff --git a/modules/tools/nixvim/default.nix b/modules/tools/nixvim/default.nix index 97d58ec..932d343 100644 --- a/modules/tools/nixvim/default.nix +++ b/modules/tools/nixvim/default.nix @@ -6,11 +6,11 @@ ./keymaps.nix ./plugins ]; - + options.tools.nixvim = { enable = lib.mkEnableOption "Enables nixvim."; }; - + config = lib.mkIf config.tools.nixvim.enable { programs.nixvim = { @@ -59,7 +59,7 @@ vim.api.nvim_set_hl(0, 'NotifyINFOBody', { link = 'Normal' }) vim.api.nvim_set_hl(0, 'NotifyDEBUGBody', { link = 'Normal' }) vim.api.nvim_set_hl(0, 'NotifyTRACEBody', { link = 'Normal' }) - + vim.api.nvim_create_autocmd({ "FileType" }, { pattern = "*", callback = function() @@ -69,7 +69,7 @@ vim.opt_local.tabstop = 3 end, }) - + vim.api.nvim_create_autocmd({ "FileType" }, { pattern = { "yaml", "yml" }, callback = function() @@ -85,7 +85,7 @@ combinePlugins.enable = true; }; }; - + home.sessionVariables.EDITOR = "nvim"; }; } diff --git a/modules/tools/nnn/default.nix b/modules/tools/nnn/default.nix index 641e3a5..7a9f30f 100644 --- a/modules/tools/nnn/default.nix +++ b/modules/tools/nnn/default.nix @@ -4,14 +4,14 @@ options.tools.nnn = { enable = lib.mkEnableOption "Enables nnn."; }; - + config = lib.mkIf config.tools.nnn.enable { home.sessionVariables = { # Start nnn in detail mode + show hidden items by default NNN_OPTS = "dH"; NNN_FIFO = "/tmp/nnn.fifo"; }; - + programs.nnn = { enable = true; package = pkgs.nnn.override ({ withNerdIcons = true; }); diff --git a/modules/tools/nvtop/default.nix b/modules/tools/nvtop/default.nix index 7fcbac0..d21b952 100644 --- a/modules/tools/nvtop/default.nix +++ b/modules/tools/nvtop/default.nix @@ -4,7 +4,7 @@ options.tools.nvtop = { enable = lib.mkEnableOption "Enables nvtop."; }; - + config = lib.mkIf config.tools.nvtop.enable { home.packages = with pkgs; [ nvtopPackages.full diff --git a/modules/tools/pamixer/default.nix b/modules/tools/pamixer/default.nix index d224ed2..1ae7679 100644 --- a/modules/tools/pamixer/default.nix +++ b/modules/tools/pamixer/default.nix @@ -4,7 +4,7 @@ options.tools.pamixer = { enable = lib.mkEnableOption "Enables pamixer."; }; - + config = lib.mkIf config.tools.pamixer.enable { home.packages = with pkgs; [ pamixer diff --git a/modules/tools/playerctl/default.nix b/modules/tools/playerctl/default.nix index 8b4487c..faf5d1c 100644 --- a/modules/tools/playerctl/default.nix +++ b/modules/tools/playerctl/default.nix @@ -4,7 +4,7 @@ options.tools.playerctl = { enable = lib.mkEnableOption "Enables playerctl."; }; - + config = lib.mkIf config.tools.playerctl.enable { home.packages = with pkgs; [ playerctl diff --git a/modules/tools/rofi/default.nix b/modules/tools/rofi/default.nix index 78c1614..ef4e87b 100644 --- a/modules/tools/rofi/default.nix +++ b/modules/tools/rofi/default.nix @@ -4,7 +4,7 @@ options.tools.rofi = { enable = lib.mkEnableOption "Enables rofi."; }; - + config = lib.mkIf config.tools.rofi.enable { programs.rofi = { enable = true; @@ -17,7 +17,7 @@ margin = 0; padding = 0; spacing = 0; - + bg = mkLiteral base00; bg-alt = mkLiteral base01; fg = mkLiteral base07; @@ -25,47 +25,47 @@ background-color = mkLiteral "@bg"; text-color = mkLiteral "@fg"; }; - + window = { border-color = mkLiteral base03; }; - + mainbox = { children = map mkLiteral [ "inputbar" "listview" ]; }; - + inputbar = { background-color = mkLiteral "@bg-alt"; children = map mkLiteral [ "prompt" "entry" ]; }; - + entry = { background-color = mkLiteral "inherit"; padding = mkLiteral "12px 3px"; }; - + prompt = { background-color = mkLiteral "inherit"; padding = mkLiteral "12px"; }; - + listview = { lines = 8; }; - + element = { children = map mkLiteral [ "element-text" ]; }; - + element-icon = { padding = mkLiteral "10px 10px"; }; - + element-text = { padding = mkLiteral "10px 10px"; text-color = mkLiteral "@fg-alt"; }; - + "element-text selected" = { text-color = mkLiteral "@fg"; }; diff --git a/modules/tools/starship/default.nix b/modules/tools/starship/default.nix index e8c657c..02e845e 100644 --- a/modules/tools/starship/default.nix +++ b/modules/tools/starship/default.nix @@ -4,7 +4,7 @@ options.tools.starship = { enable = lib.mkEnableOption "Enables starship."; }; - + config = lib.mkIf config.tools.starship.enable { programs.starship = { enable = true; @@ -14,50 +14,50 @@ mkSegment = content: ''[┄\[](red)[${content}]($style)[\]](red)''; in { add_newline = true; - + format = '' [╭─\[](red)$hostname[@](red)$username[\]](red)$directory$git_branch$git_status$nix_shell [╰─](red)$status$character ''; - + character.format = "[](red)"; - + username = { style_user = "blue"; style_root = "red bold"; format = "[$user]($style)"; show_always = true; }; - + hostname = { ssh_only = false; style = "green"; format = "[$hostname]($style)"; }; - + directory = { style = "purple"; truncate_to_repo = false; format = mkSegment "$path"; }; - + git_branch = { style = "bold yellow"; format = ''[┄\[](red)[$symbol$branch(:$remote_branch)]($style)''; }; - + git_status = { style = "cyan"; format = ''( [$all_status$ahead_behind]($style))[\]](red)''; }; - + nix_shell = { format = mkSegment "$symbol $state( \($name\))"; symbol = ""; impure_msg = ""; pure_msg = ""; }; - + status = { disabled = false; format = ''${mkSegment "$symbol $status"}[┄─](red)''; diff --git a/modules/tools/steam/default.nix b/modules/tools/steam/default.nix index 6c5e125..bd23fde 100644 --- a/modules/tools/steam/default.nix +++ b/modules/tools/steam/default.nix @@ -4,7 +4,7 @@ options.tools.steam = { enable = lib.mkEnableOption "Enables steam."; }; - + config = lib.mkIf config.tools.steam.enable { home.packages = with pkgs; [ steam diff --git a/modules/tools/systemctl-tui/default.nix b/modules/tools/systemctl-tui/default.nix index 406493f..0c6916f 100644 --- a/modules/tools/systemctl-tui/default.nix +++ b/modules/tools/systemctl-tui/default.nix @@ -4,7 +4,7 @@ options.tools.systemctl-tui = { enable = lib.mkEnableOption "Enables systemctl-tui."; }; - + config = lib.mkIf config.tools.systemctl-tui.enable { home.packages = with pkgs; [ systemctl-tui diff --git a/modules/tools/tmux/default.nix b/modules/tools/tmux/default.nix index 8e15690..f99cb40 100644 --- a/modules/tools/tmux/default.nix +++ b/modules/tools/tmux/default.nix @@ -4,7 +4,7 @@ options.tools.tmux = { enable = lib.mkEnableOption "Enables tmux."; }; - + config = lib.mkIf config.tools.tmux.enable { programs.tmux.enable = true; }; diff --git a/modules/tools/tor-browser/default.nix b/modules/tools/tor-browser/default.nix index 5bf58c7..7986ff4 100644 --- a/modules/tools/tor-browser/default.nix +++ b/modules/tools/tor-browser/default.nix @@ -4,7 +4,7 @@ options.tools.tor-browser = { enable = lib.mkEnableOption "Enables tor-browser."; }; - + config = lib.mkIf config.tools.tor-browser.enable { home.packages = with pkgs; [ tor-browser diff --git a/modules/tools/unar/default.nix b/modules/tools/unar/default.nix index 3594bec..956c3cd 100644 --- a/modules/tools/unar/default.nix +++ b/modules/tools/unar/default.nix @@ -4,7 +4,7 @@ options.tools.unar = { enable = lib.mkEnableOption "Enables unar."; }; - + config = lib.mkIf config.tools.unar.enable { home.packages = with pkgs; [ unar diff --git a/modules/tools/vlc/default.nix b/modules/tools/vlc/default.nix index eb6f329..8e71593 100644 --- a/modules/tools/vlc/default.nix +++ b/modules/tools/vlc/default.nix @@ -4,7 +4,7 @@ options.tools.vlc = { enable = lib.mkEnableOption "Enables vlc."; }; - + config = lib.mkIf config.tools.vlc.enable { home.packages = with pkgs; [ vlc diff --git a/modules/tools/vscode/default.nix b/modules/tools/vscode/default.nix index 67c3043..7aab6f7 100644 --- a/modules/tools/vscode/default.nix +++ b/modules/tools/vscode/default.nix @@ -4,7 +4,7 @@ options.tools.vscode = { enable = lib.mkEnableOption "Enables vscode."; }; - + config = lib.mkIf config.tools.vscode.enable { programs.vscode = { enable = true; diff --git a/modules/tools/zathura/default.nix b/modules/tools/zathura/default.nix index 1290352..9d7c48a 100644 --- a/modules/tools/zathura/default.nix +++ b/modules/tools/zathura/default.nix @@ -4,7 +4,7 @@ options.tools.zathura = { enable = lib.mkEnableOption "Enables zathura."; }; - + config = lib.mkIf config.tools.zathura.enable { programs.zathura.enable = true; }; diff --git a/modules/tools/zsh/default.nix b/modules/tools/zsh/default.nix index 71e0be3..882653b 100644 --- a/modules/tools/zsh/default.nix +++ b/modules/tools/zsh/default.nix @@ -4,16 +4,13 @@ options.tools.zsh = { enable = lib.mkEnableOption "Enables zsh."; }; - + config = lib.mkIf config.tools.zsh.enable { programs.zsh = { enable = true; dotDir = "${config.xdg.configHome}/zsh"; history.path = "${config.xdg.cacheHome}/zsh/history"; initContent = '' -${if config.tools.fzf.enable then - "eval \"$(fzf --zsh)\"" -else ""} setopt PROMPT_SUBST autoload -U colors && colors @@ -22,7 +19,7 @@ bindkey "^[[3~" delete-char bindkey "^?" backward-delete-char ''; }; - + home.sessionVariables.SHELL = "${config.programs.zsh.package}/bin/zsh"; }; } diff --git a/users/arpit.nix b/users/arpit.nix index 07711dd..c1e6d60 100644 --- a/users/arpit.nix +++ b/users/arpit.nix @@ -2,14 +2,14 @@ { nixpkgs.config.allowUnfree = true; - + home.username = "arpit"; home.homeDirectory = "/home/${config.home.username}"; home.stateVersion = "25.05"; - + # Desktop environment desktop.enable = true; - + # Tools tools.atac.enable = true; tools.bluetui.enable = true; @@ -47,6 +47,6 @@ tools.vscode.enable = true; tools.zathura.enable = true; tools.zsh.enable = true; - + programs.home-manager.enable = true; } |