From 20d922e7984ad22964f31a1a3fe3377ed23d4c4a Mon Sep 17 00:00:00 2001 From: beeb5k Date: Sun, 7 Jun 2026 12:29:22 +0530 Subject: Bash is what god intended us to use --- common/modules/window_managers/niri/default.nix | 8 ++-- common/programs/bash.nix | 41 ++++++++++++++++++ common/programs/fish.nix | 5 --- common/programs/vesktop.nix | 6 +-- flake.lock | 20 ++++----- hosts/common.nix | 57 ++----------------------- hosts/niuwux/default.nix | 2 +- users/beeb5k/default.nix | 2 +- users/common.nix | 10 ++++- 9 files changed, 73 insertions(+), 78 deletions(-) create mode 100644 common/programs/bash.nix diff --git a/common/modules/window_managers/niri/default.nix b/common/modules/window_managers/niri/default.nix index fad916d..9f00391 100644 --- a/common/modules/window_managers/niri/default.nix +++ b/common/modules/window_managers/niri/default.nix @@ -174,8 +174,8 @@ in XF86AudioMute allow-when-locked=true { spawn-sh "${scripts.volume} toggle"; } XF86AudioMicMute allow-when-locked=true { spawn-sh "${scripts.micToggle}"; } - XF86MonBrightnessUp allow-when-locked=true { spawn-sh "${scripts.volume} up 0.02"; } - XF86MonBrightnessDown allow-when-locked=true { spawn-sh "{scripts.volume} down 0.02"; } + Mod+TouchpadScrollDown { spawn-sh "${scripts.volume} up 0.02"; } + Mod+TouchpadScrollUp { spawn-sh "${scripts.volume} down 0.02"; } XF86MonBrightnessUp allow-when-locked=true { spawn-sh "${scripts.brightness} up"; } XF86MonBrightnessDown allow-when-locked=true { spawn-sh "${scripts.brightness} down"; } @@ -197,8 +197,8 @@ in Mod+TouchpadScrollDown { spawn-sh "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.02+"; } Mod+TouchpadScrollUp { spawn-sh "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.02-"; } - XF86MonBrightnessUp allow-when-locked=true { spawn-sh "noctalia msg volume-up 0.02"; } - XF86MonBrightnessDown allow-when-locked=true { spawn-sh "noctalia msg volume-down 0.02"; } + XF86MonBrightnessUp allow-when-locked=true { spawn-sh "noctalia msg brightness-up"; } + XF86MonBrightnessDown allow-when-locked=true { spawn-sh "noctalia msg brightness-down"; } ''} Mod+Shift+C hotkey-overlay-title="Get current dat and time as noticiation" { spawn-sh "fyi Clock $(date)"; } diff --git a/common/programs/bash.nix b/common/programs/bash.nix new file mode 100644 index 0000000..1ad9e80 --- /dev/null +++ b/common/programs/bash.nix @@ -0,0 +1,41 @@ +{ + programs.bash = { + enable = true; + historySize = 10000; + historyFile = "$HOME/.bash_history"; + historyControl = [ + "ignorespace" + "erasedups" + ]; + initExtra = '' + shopt -s histappend + + bind "set completion-ignore-case on" + bind "set show-all-if-ambiguous on" + + bind '"\e[Z": menu-complete-backward' + + bind '"\e[A": history-search-backward' + bind '"\e[B": history-search-forward' + + + if [ "$TERM" != "dumb" ] || [ -n "$INSIDE_EMACS" ]; then + # Removed the '1;' prefix to disable bold + PROMPT_COLOR="31m" + ((UID)) && PROMPT_COLOR="32m" + + if [ -n "$INSIDE_EMACS" ]; then + PS1="\[\033[$PROMPT_COLOR\]\u@\h:\w\\$\[\033[0m\] " + else + # PS1="\[\033[$PROMPT_COLOR\]\[\e]0;\u@\h: \w\a\]\u@\h:\w\\$\[\033[0m\] " + PS1="\[\e[38;5;75m\]\u@\h \[\e[38;5;113m\]\w \[\e[38;5;189m\]\$ \[\e[0m\]" + fi + + if test "$TERM" = "xterm"; then + PS1="\[\033]2;\h:\u:\w\007\]$PS1" + fi + fi + ''; + }; + +} diff --git a/common/programs/fish.nix b/common/programs/fish.nix index e45182a..9d979a2 100644 --- a/common/programs/fish.nix +++ b/common/programs/fish.nix @@ -7,7 +7,6 @@ home.packages = with pkgs; [ fzf - pay-respects ]; programs.fish = { @@ -21,10 +20,6 @@ set -U fish_color_user blue set -U fish_color_host normal set -U fish_color_cwd blue - - pay-respects fish | source - - alias fuck='f' ''; }; } diff --git a/common/programs/vesktop.nix b/common/programs/vesktop.nix index 0363bb9..1211011 100644 --- a/common/programs/vesktop.nix +++ b/common/programs/vesktop.nix @@ -1,7 +1,7 @@ { lib, config, ... }: { programs.vesktop = { - enable = false; + enable = true; vencord = { settings = { enabledThemes = @@ -10,9 +10,9 @@ && config.beeMods.windowManagers.beeConfig.enable && !config.beeMods.windowManagers.noctalia then - [ "system24-matugen" ] + [ "system24-matugen.css" ] else - [ "noctalia-system24" ]; + [ "discord-system24.css" ]; autoUpdate = false; autoUpdateNotification = false; notifyAboutUpdates = false; diff --git a/flake.lock b/flake.lock index a94099c..6655a3d 100644 --- a/flake.lock +++ b/flake.lock @@ -12,11 +12,11 @@ "wrappers": "wrappers" }, "locked": { - "lastModified": 1780656633, - "narHash": "sha256-K/Nwr8H627IoADSaEEwxqPa+7pH4uQ/ZSW3wIyz0gZ0=", + "lastModified": 1780763342, + "narHash": "sha256-+L99tx4tp7keMkTTXrXrh1tWViTMuwFhioWSjIWu5G8=", "ref": "refs/heads/main", - "rev": "511492f6e1ab66957a37aaccffe748bb0f8e3d65", - "revCount": 30, + "rev": "5e577b7c0160192abcb352390f52bb9acc12acdb", + "revCount": 32, "type": "git", "url": "https://codeberg.org/beeb5k/beeVim" }, @@ -90,11 +90,11 @@ "scenefx": "scenefx" }, "locked": { - "lastModified": 1780541279, - "narHash": "sha256-UdwXcUeOgfct2GBadVCsonMIay3Gndylr0pMmxz7z/k=", + "lastModified": 1780752094, + "narHash": "sha256-5hv9HjWafU9i83HBYVEZDJbOIDM5WdKx9TpI87PwhP8=", "owner": "mangowm", "repo": "mango", - "rev": "8a92184667ae945955c2139847e5e1994a5f9671", + "rev": "db8d22ae8e39fb53d766c33c974c0c6a5fe43359", "type": "github" }, "original": { @@ -156,11 +156,11 @@ ] }, "locked": { - "lastModified": 1780678820, - "narHash": "sha256-GWoeltlb6C2L8kkzAG2YvZF6xrMv+7FRVX0qzC1R81I=", + "lastModified": 1780759059, + "narHash": "sha256-sG/Vl0AY94baxWt8yTG0goGXCaJ4BBe1ozeugum5VNw=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "644d86cb7f6ef782c82e1a90167ba6f171b7add7", + "rev": "49210033ffe9f004ff269410f4e79fdf16747811", "type": "github" }, "original": { diff --git a/hosts/common.nix b/hosts/common.nix index 016bfc9..884e0f5 100644 --- a/hosts/common.nix +++ b/hosts/common.nix @@ -150,13 +150,12 @@ # }; fonts.fontDir.enable = true; - fonts.packages = [ + fonts.packages = with pkgs; [ inputs.self.packages.${pkgs.system}.iosevka-input - pkgs.nerd-fonts.symbols-only - pkgs.noto-fonts - pkgs.noto-fonts-cjk-sans-static + nerd-fonts.symbols-only + noto-fonts + noto-fonts-cjk-sans-static # nerd-fonts.jetbrains-mono - # maple-mono.NF ]; fonts.fontconfig.defaultFonts.monospace = [ @@ -165,54 +164,6 @@ "Symbols Nerd Font" ]; - programs.bash = { - enable = true; - interactiveShellInit = '' - # --- History Configuration --- - # HISTSIZE: Number of lines to keep in memory - # HISTFILESIZE: Number of lines to keep in the file - export HISTSIZE=5000 - export HISTFILESIZE=5000 - export HISTFILE="$HOME/.bash_history" - - # Append to history file rather than overwriting - shopt -s histappend - - # Ignore commands starting with space - export HISTCONTROL=ignorespace:erasedups - - # --- Completion Configuration --- - # Bash completion is usually handled by the 'bash-completion' package - # Ensure it is enabled in your nixos config: programs.bash.completion.enable = true; - bind "set completion-ignore-case on" - bind "set show-all-if-ambiguous on" - - # Correct way to enable menu-complete: - # bind '"\t": menu-complete' - bind '"\e[Z": menu-complete-backward' - - bind "set show-all-if-ambiguous on" - ''; - promptInit = '' - if [ "$TERM" != "dumb" ] || [ -n "$INSIDE_EMACS" ]; then - # Removed the '1;' prefix to disable bold - PROMPT_COLOR="31m" - ((UID)) && PROMPT_COLOR="32m" - - # Removed \n (newline) and [ ] brackets - if [ -n "$INSIDE_EMACS" ]; then - PS1="\[\033[$PROMPT_COLOR\]\u@\h:\w\\$\[\033[0m\] " - else - # PS1="\[\033[$PROMPT_COLOR\]\[\e]0;\u@\h: \w\a\]\u@\h:\w\\$\[\033[0m\] " - PS1="\[\e[38;5;75m\]\u@\h \[\e[38;5;113m\]\w \[\e[38;5;189m\]\$ \[\e[0m\]" - fi - - if test "$TERM" = "xterm"; then - PS1="\[\033]2;\h:\u:\w\007\]$PS1" - fi - fi - ''; - }; programs.nano.enable = false; programs.gnupg.agent = { enable = true; diff --git a/hosts/niuwux/default.nix b/hosts/niuwux/default.nix index aa97b0d..f2d16ca 100644 --- a/hosts/niuwux/default.nix +++ b/hosts/niuwux/default.nix @@ -30,7 +30,7 @@ beeMods = { windowManagers = { - mango.enable = true; + mango.enable = false; niri.enable = true; }; }; diff --git a/users/beeb5k/default.nix b/users/beeb5k/default.nix index 2ef7866..df36459 100644 --- a/users/beeb5k/default.nix +++ b/users/beeb5k/default.nix @@ -21,7 +21,7 @@ beeMods = { windowManagers = { - mango.enable = true; + mango.enable = false; niri.enable = true; eyeCandy.enable = false; beeConfig.enable = false; diff --git a/users/common.nix b/users/common.nix index 766e0cf..999c0ca 100644 --- a/users/common.nix +++ b/users/common.nix @@ -123,7 +123,15 @@ in setSessionVariables = false; }; - programs.yazi.enable = true; + programs.yazi = { + enable = true; + shellWrapperName = "yy"; + }; + + programs.zathura = { + enable = true; + }; + programs.mpv = { enable = true; package = pkgs.mpv-unwrapped.override { -- cgit v1.3.1