summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/modules/window_managers/niri/default.nix8
-rw-r--r--common/programs/bash.nix41
-rw-r--r--common/programs/fish.nix5
-rw-r--r--common/programs/vesktop.nix6
4 files changed, 48 insertions, 12 deletions
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;