20240210 - Edited river, bash, waybar, and package collections

This commit is contained in:
Thai Noodles 2024-02-10 09:31:53 -08:00
parent 0173d9cdc3
commit 598c08a060
5 changed files with 18 additions and 32 deletions

View File

@ -8,9 +8,9 @@
enable = true;
text = ''
[[ -f ~/.bashrc ]] && . ~/.bashrc
#if [ -z "$DISPLAY" ] && [ "$XDG_VTNR" -eq 1 ]; then
# exec river
#fi
if [ -z "$DISPLAY" ] && [ "$XDG_VTNR" -eq 1 ]; then
exec river
fi
'';
};
".bash_logout" = {
@ -84,7 +84,8 @@
--binding 'vim'\
--vim-esc-exits\
--ignorecase\
--no-overlap"
--no-overlap\
--bottom"
'';
};
};

View File

@ -34,10 +34,10 @@
riverctl map normal Super Space spawn "wmenu.sh"
# Focus Controls
riverctl map normal Super H send-layout-cmd rivertile "main-count +1"
riverctl map normal Super H focus-view previous
riverctl map normal Super J focus-view next
riverctl map normal Super K focus-view previous
riverctl map normal Super L send-layout-cmd rivertile "main-count -1"
riverctl map normal Super L focus-view next
riverctl map normal Alt Tab focus-view next
riverctl map normal Alt+Shift Tab focus-view previous
riverctl map normal Super Tab focus-output next
@ -45,10 +45,11 @@
riverctl map normal Super Bracketleft focus-output previous
# Move Controls
riverctl map normal Super+Shift H zoom
riverctl map normal Super+Shift H swap previous
riverctl map normal Super+Shift J swap next
riverctl map normal Super+Shift K swap previous
riverctl map normal Super+Shift L spawn $LOCKSCREEN
riverctl map normal Super+Shift L swap next
riverctl map normal Super+Shift Space zoom
riverctl map normal Super+Shift Tab send-to-output next
riverctl map normal Super+Shift Bracketright send-to-output next
riverctl map normal Super+Shift Bracketleft send-to-output previous
@ -57,7 +58,7 @@
riverctl map normal Super+Alt H send-layout-cmd rivertile "main-ratio -0.05"
riverctl map normal Super+Alt L send-layout-cmd rivertile "main-ratio +0.05"
riverctl map normal Super I send-layout-cmd rivertile "main-count +1"
riverctl map normal Super D send-layout-cmd rivertile "main-count -1"
riverctl map normal Super+Shift I send-layout-cmd rivertile "main-count -1"
riverctl map normal Super Up send-layout-cmd rivertile "main-location top"
riverctl map normal Super Right send-layout-cmd rivertile "main-location right"
riverctl map normal Super Down send-layout-cmd rivertile "main-location bottom"

View File

@ -8,8 +8,7 @@
[{
"exclusive": false,
"position": "top",
"height": 22,
"spacing": 16,
"height": 20,
"fixed-center": false,
"modules-left": [
"user"
@ -31,8 +30,7 @@
{
"exclusive": false,
"position": "bottom",
"height": 22,
"spacing": 16,
"height": 20,
"fixed-center": false,
"modules-left": [
"river/mode"
@ -41,7 +39,7 @@
"tray"
],
"tray": {
"icon-size": 18,
"icon-size": 16,
"spacing": 4,
"show-passive-items": true,
"reverse-direction": true
@ -56,37 +54,22 @@
* {
background: transparent;
color: #F2F2F8;
font-size: 16px;
}
#user {
background: #282A36;
border-style: solid;
border-bottom-right-radius: 5px;
border-width: 0 2 2 0;
border-color: #44475A;
padding: 0 8 0 8;
}
#clock {
background: #282A36;
border-style: solid;
border-bottom-left-radius: 5px;
border-width: 0 0 2 2;
border-color: #44475A;
padding: 0 8 0 8;
}
#mode {
background: #282A36;
border-style: solid;
border-top-right-radius: 5px;
border-width: 2 2 0 0;
border-color: #44475A;
padding: 0 8 0 8;
}
#tray {
background: #282A36;
border-style: solid;
border-top-left-radius: 5px;
border-width: 2 0 0 2;
border-color: #44475A;
padding: 0 4 0 8;
}
'';

View File

@ -86,7 +86,6 @@
ffmpeg
fq
fx
gitui
glow
gpg-tui
gping
@ -103,7 +102,6 @@
jo
john
jq
just
killall
lavat
lynis
@ -134,5 +132,6 @@
yank
yq-go
yt-dlp
zoxide
];
}

View File

@ -8,8 +8,10 @@
};
users.users.${user.name}.packages = with pkgs; [
cargo
gitui
go
just
lazygit
rustc
];
}