aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore1
-rw-r--r--env/.bashrc2
-rwxr-xr-xenv/.config/.profile13
-rw-r--r--env/.config/i3/config21
-rwxr-xr-xenv/.config/tmux/tmux.conf12
-rw-r--r--env/.config/vis/plugins.lua90
-rw-r--r--env/.config/vis/visrc.lua2
-rwxr-xr-xenv/.config/wezterm/wezterm.lua70
-rwxr-xr-xenv/.local/bin/scripts/backup/backup-flash4
-rwxr-xr-xenv/.local/bin/scripts/backup/backup-flash-priv4
-rwxr-xr-xenv/.local/bin/scripts/backup/backup-tol4
-rwxr-xr-xenv/.local/bin/scripts/backup/backup-tol24
-rwxr-xr-xenv/.local/bin/scripts/backup/bbackup4
-rwxr-xr-xenv/.local/bin/scripts/backup/bbackup-browser2
-rwxr-xr-xenv/.local/bin/scripts/backup/pull-froml2
-rwxr-xr-xenv/.local/bin/scripts/dmount2
-rwxr-xr-xenv/.local/bin/system/start-scripts/autostart.sh2
-rwxr-xr-xenv/.zshrc2
-rw-r--r--keep/manual-programs/suckless/st-flexipatch/config.def.h42
19 files changed, 144 insertions, 139 deletions
diff --git a/.gitignore b/.gitignore
index f470fd2..0bd53e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
env_private
**/st-flexipatch/config.h
**/st-flexipatch/patches.h
+**/st-flexipatch/st
diff --git a/env/.bashrc b/env/.bashrc
index a22a7b7..bff5a70 100644
--- a/env/.bashrc
+++ b/env/.bashrc
@@ -11,4 +11,4 @@ set -o vi
source ~/.config/.profile
eval "$(fzf --bash)"
-eval "$(atuin init bash)"
+# eval "$(atuin init bash)"
diff --git a/env/.config/.profile b/env/.config/.profile
index 16b383a..2106abf 100755
--- a/env/.config/.profile
+++ b/env/.config/.profile
@@ -90,17 +90,8 @@ if [ "$XDG_CURRENT_DESKTOP" = "sway:wlroots" ]; then
fi
# mounting
-alias umsu="fukn umount u"
-alias umsu2="fukn umount u2"
-alias mswin="fukn mount -o umask=0,uid=nobody,gid=nobody /dev/sdb3 ~/windir"
-alias umswin="fukn umount ~/windir"
-alias msbak="doas cryptsetup open /dev/sda1 backups && doas mount /dev/mapper/backups ~/mnt-backups" # && fukn bindfs -u iceyrazor /mnt-backups ~/mnt-backups"
-alias umsbak="doas umount ~/mnt-backups && doas cryptsetup close backups" # " fukn umount /mnt-backups && fukn cryptsetup close backups"
-alias mssec="doas cryptsetup open /dev/sdb1 secdrive && doas mount /dev/mapper/secdrive ~/mnt-sec"
-alias umssec="doas umount ~/mnt-sec && doas cryptsetup close secdrive"
-alias msfd="fukn mount /dev/sdc1 u2"
-alias msf="fukn cryptsetup open /dev/sdc2 flashdrive && fukn mount /dev/mapper/flashdrive ~/u"
-alias umsf="fukn umount ~/u && fukn cryptsetup close flashdrive"
+alias msbak="doas cryptsetup open /dev/sda1 backups && doas mount /dev/mapper/backups /mnts/mnt-backups" # && fukn bindfs -u iceyrazor /mnt-backups ~/mnt-backups"
+alias umsbak="doas umount /mnts/mnt-backups && doas cryptsetup close backups" # " fukn umount /mnt-backups && fukn cryptsetup close backups"
alias cam="ffplay -input_format mjpeg -fast -fflags +nobuffer -i -framerate 30 -max_delay 100 -max_probe_packets 0 -analyzeduration 0 -flags +low_delay"
alias sc="ffmpeg -f x11grab -framerate 1 -video_size 1920x1200 -i :0.0 -vframes 1 -crf 18 ~/Pictures/Screenshots/$(date '+%m-%d-%Y-%I-%M')_${RANDOM}_screenshot.jpeg"
diff --git a/env/.config/i3/config b/env/.config/i3/config
index 7143ae6..06c4752 100644
--- a/env/.config/i3/config
+++ b/env/.config/i3/config
@@ -289,8 +289,8 @@ client.unfocused #222222 #222222 #8568e6 #e598ff #222222
default_border pixel 1
default_floating_border pixel 1
-set $trans #00000000
-set $inactive-bg-color #1e1e2e
+set $trans #1a1b26
+set $inactive-bg-color #1a1b26
set $text-color #cdd6f4
set $urbg-color #f38ba8
set $color #8568ef
@@ -302,11 +302,12 @@ set $ws_bord #8568ef
bar {
separator_symbol ""
output primary
+ tray_output primary
strip_workspace_numbers yes
status_command SCRIPT_DIR=~/.config/i3blocks i3blocks
colors {
- statusline #FFFFFF
+ statusline #c0caf5
background $trans
separator #757575
# border background text
@@ -314,12 +315,24 @@ bar {
inactive_workspace $trans $trans #676E7D
active_workspace $trans $trans $text-color
urgent_workspace $urbg-color $urbg-color $text-color
-
}
}
bar {
separator_symbol ""
output nonprimary
+ tray_output none
strip_workspace_numbers yes
+ status_command SCRIPT_DIR=~/.config/i3blocks i3blocks
+
+ colors {
+ statusline #c0caf5
+ background $trans
+ separator #757575
+ # border background text
+ focused_workspace $ws_bord $color $text-color
+ inactive_workspace $trans $trans #676E7D
+ active_workspace $trans $trans $text-color
+ urgent_workspace $urbg-color $urbg-color $text-color
+ }
}
diff --git a/env/.config/tmux/tmux.conf b/env/.config/tmux/tmux.conf
index 4947e83..a61d679 100755
--- a/env/.config/tmux/tmux.conf
+++ b/env/.config/tmux/tmux.conf
@@ -58,14 +58,14 @@ bind-key -r H split-window -h -f
# colors/theme
# using vars in this cause the  chars to not use the color
-set -g status-bg "#222222"
+set -g status-bg "#1a1b26"
set -g status-fg "#f1f1f1"
-set -wg mode-style bg="#222222"
-set -g pane-border-style fg='#222222'
+set -wg mode-style bg="#1a1b26"
+set -g pane-border-style fg='#1a1b26'
set -g pane-active-border-style fg='#a030f0'
active_window_fg='#e080f0'
-set -g status-left "#[fg=#f1f1f1,bold,bg=#4020af]  #S #[fg=#4020af,bg=#222222] "
+set -g status-left "#[fg=#f1f1f1,bold,bg=#4020af]  #S #[fg=#4020af,bg=#1a1b26] "
set -g status-left-length 40
-set -g window-status-current-format "#[fg=${active_window_fg},bg=#222222]#I:#W #[fg=#f1f1f1,bg=#222222]"
-set -g window-status-format "#[fg=#f1f1f1,bg=#222222]#I:#W #[fg=#f1f1f1,bg=#222222]"
+set -g window-status-current-format "#[fg=${active_window_fg},bg=#1a1b26]#I:#W #[fg=#f1f1f1,bg=#1a1b26]"
+set -g window-status-format "#[fg=#f1f1f1,bg=#1a1b26]#I:#W #[fg=#f1f1f1,bg=#1a1b26]"
set -g status-right '#[fg=#f1f1f1,bg=#4020af] @#H %H:%M %d-%b-%y'
diff --git a/env/.config/vis/plugins.lua b/env/.config/vis/plugins.lua
index 16003a9..015a45c 100644
--- a/env/.config/vis/plugins.lua
+++ b/env/.config/vis/plugins.lua
@@ -1,49 +1,53 @@
-local autoclose = require('plugins/vis-autoclose')
+local _,autoclose = pcall(require,'plugins/vis-autoclose')
-local colorizer = require('plugins/vis-colorizer')
-colorizer.three = false
-colorizer.six = true
+local cok,colorizer = pcall(require,'plugins/vis-colorizer')
+if cok then
+ colorizer.three = false
+ colorizer.six = true
+end
-local completefilename = require('plugins/complete-filename')
+local _,completefilename = pcall(require,'plugins/complete-filename')
-local lsp = require('plugins/vis-lspc')
+local _,chain = pcall(require,'plugins/vis-chain')
--- https://git.symlinx.net/vis-modal/
-local modal = require('plugins/vis-modal')
-
-modal.MODES = {
- [vis.modes.NORMAL] = ' NORMAL ',
- [vis.modes.INSERT] = ' INSERT ',
- [vis.modes.VISUAL] = ' VISUAL ',
- [vis.modes.REPLACE] = ' REPLACE ',
- [vis.modes.VISUAL_LINE] = ' VISUAL_LINE ',
- [vis.modes.OPERATOR_PENDING] = ' OPERATOR_PENDING '
-}
+local _,lsp = pcall(require,'plugins/vis-lspc')
-modal.STYLES = {
- [vis.modes.NORMAL] = {
- REGULAR = 'fore:default,back:yellow',
- INVERTED = 'fore:yellow,back:black',
- },
- [vis.modes.INSERT] = {
- REGULAR = 'fore:default,back:green',
- INVERTED = 'fore:green,back:black',
- },
- [vis.modes.VISUAL] = {
- REGULAR = 'fore:default,back:magenta',
- INVERTED = 'fore:magenta,back:black',
- },
- [vis.modes.REPLACE] = {
- REGULAR = 'fore:default,back:blue',
- INVERTED = 'fore:blue,back:black',
- },
- [vis.modes.VISUAL_LINE] = {
- REGULAR = 'fore:default,back:magenta',
- INVERTED = 'fore:magenta,back:black',
- },
- [vis.modes.OPERATOR_PENDING] = {
- REGULAR = 'fore:default,back:blue',
- INVERTED = 'fore:blue,back:black',
- },
-}
+-- https://git.symlinx.net/vis-modal/
+local Vok,modal = pcall(require,'plugins/vis-modal')
+if Vok then
+ modal.MODES = {
+ [vis.modes.NORMAL] = ' NORMAL ',
+ [vis.modes.INSERT] = ' INSERT ',
+ [vis.modes.VISUAL] = ' VISUAL ',
+ [vis.modes.REPLACE] = ' REPLACE ',
+ [vis.modes.VISUAL_LINE] = ' VISUAL_LINE ',
+ [vis.modes.OPERATOR_PENDING] = ' OPERATOR_PENDING '
+ }
+ modal.STYLES = {
+ [vis.modes.NORMAL] = {
+ REGULAR = 'fore:default,back:yellow',
+ INVERTED = 'fore:yellow,back:black',
+ },
+ [vis.modes.INSERT] = {
+ REGULAR = 'fore:default,back:green',
+ INVERTED = 'fore:green,back:black',
+ },
+ [vis.modes.VISUAL] = {
+ REGULAR = 'fore:default,back:magenta',
+ INVERTED = 'fore:magenta,back:black',
+ },
+ [vis.modes.REPLACE] = {
+ REGULAR = 'fore:default,back:blue',
+ INVERTED = 'fore:blue,back:black',
+ },
+ [vis.modes.VISUAL_LINE] = {
+ REGULAR = 'fore:default,back:magenta',
+ INVERTED = 'fore:magenta,back:black',
+ },
+ [vis.modes.OPERATOR_PENDING] = {
+ REGULAR = 'fore:default,back:blue',
+ INVERTED = 'fore:blue,back:black',
+ },
+ }
+end
diff --git a/env/.config/vis/visrc.lua b/env/.config/vis/visrc.lua
index c1c1d1d..f518a2d 100644
--- a/env/.config/vis/visrc.lua
+++ b/env/.config/vis/visrc.lua
@@ -16,10 +16,10 @@ end)
-- per-window configuration options
vis.events.subscribe(vis.events.WIN_OPEN, function(win)
vis:command("set tabwidth 4")
- --vis:command("set numbers true")
vis:command("set relativenumbers true")
vis:command("set autoindent true")
vis:command("set expandtab true")
+ vis:command("set ignorecase true")
vis:map(vis.modes.NORMAL, leader.."pv", function()
vis:command("open .")
vis:feedkeys("<C-w>k")
diff --git a/env/.config/wezterm/wezterm.lua b/env/.config/wezterm/wezterm.lua
index f75304f..c6052b5 100755
--- a/env/.config/wezterm/wezterm.lua
+++ b/env/.config/wezterm/wezterm.lua
@@ -1,34 +1,36 @@
-local wezterm = require 'wezterm'
-local colors= require 'colors'
-
-local config = {}
---config.font = wezterm.font 'Classic Console' config.font_size = 15 config.font = wezterm.font 'Source Code Pro'
-config.set_environment_variables = {
- wezterm = 'yes',
-}
-config.enable_tab_bar = false
-
-config.font = wezterm.font_with_fallback {
- 'B612 Mono',
- 'JetBrainsMono',
- 'JetBrainsMono Nerd Font',
- 'JetBrainsMono Nerd Font Mono',
- 'IPAGothic',
- 'FreeMono',
-}
-config.font_size = 13
-
-config.colors=colors
-
-config.window_background_opacity = 0.8
-
-config.unix_domains = {
- {
- name = 'unix',
- no_serve_automatically = false,
- },
-}
-
-config.front_end = "OpenGL"
-
-return config
+local wezterm = require 'wezterm'
+local colors= require 'colors'
+
+local config = {}
+--config.font = wezterm.font 'Classic Console' config.font_size = 15 config.font = wezterm.font 'Source Code Pro'
+config.set_environment_variables = {
+ wezterm = 'yes',
+}
+config.enable_tab_bar = false
+
+config.font = wezterm.font_with_fallback {
+ 'iosevka',
+ 'iosevka-nerd',
+ 'B612 Mono',
+ 'JetBrainsMono',
+ 'JetBrainsMono Nerd Font',
+ 'JetBrainsMono Nerd Font Mono',
+ 'IPAGothic',
+ 'FreeMono',
+}
+config.font_size = 12
+
+config.colors=colors
+
+config.window_background_opacity = 0.8
+
+config.unix_domains = {
+ {
+ name = 'unix',
+ no_serve_automatically = false,
+ },
+}
+
+config.front_end = "OpenGL"
+
+return config
diff --git a/env/.local/bin/scripts/backup/backup-flash b/env/.local/bin/scripts/backup/backup-flash
index 8b959b2..051b6d6 100755
--- a/env/.local/bin/scripts/backup/backup-flash
+++ b/env/.local/bin/scripts/backup/backup-flash
@@ -13,9 +13,7 @@ fsync () {
}
syncfile="stuff/scripts"
-
-#sync game stuff
-target="/home/iceyrazor/u/backup"
+target="/mnts/flash/backup"
exclude="--exclude target/* --exclude node_modules/* --exclude thumbnails/* --exclude 4dm/* --exclude /nwjs.*"
fsync
diff --git a/env/.local/bin/scripts/backup/backup-flash-priv b/env/.local/bin/scripts/backup/backup-flash-priv
index ddb032b..7fceb6c 100755
--- a/env/.local/bin/scripts/backup/backup-flash-priv
+++ b/env/.local/bin/scripts/backup/backup-flash-priv
@@ -14,9 +14,7 @@ fsync () {
}
syncfile="LINUX-SERVER1 sites"
-
-#sync game stuff
-target="/home/iceyrazor/u"
+target="/mnts/flash/backups"
exclude=""
fsync
diff --git a/env/.local/bin/scripts/backup/backup-tol b/env/.local/bin/scripts/backup/backup-tol
index c9e5517..2d11371 100755
--- a/env/.local/bin/scripts/backup/backup-tol
+++ b/env/.local/bin/scripts/backup/backup-tol
@@ -16,9 +16,7 @@ fsyncb () {
fi
}
-syncfile=".surf/styles .urlview .gnupg .local/bin/lf-gadgets .local/share/applications/custom .config/FreeTube .config/newsboat .config/zsh .config/vesktop/themes .keepass .config/Pinta .config/gajim/theme stuff/notes stuff/openvpn-cons stuff/scripts stuff/media/ICE stuff/media/music stuff/manual-programs/mediamtx"
-
-#sync game stuff
+syncfile=".surf/styles .urlview .gnupg .local/bin/lf-gadgets .local/share/applications/custom .config/FreeTube .config/newsboat .config/zsh .config/vesktop/themes .config/Pinta .config/gajim/theme stuff/notes stuff/openvpn-cons stuff/scripts stuff/media/ICE stuff/media/music stuff/manual-programs/mediamtx"
target="laptop:~"
exclude="--exclude stream.sh --exclude node_modules --exclude **/target"
diff --git a/env/.local/bin/scripts/backup/backup-tol2 b/env/.local/bin/scripts/backup/backup-tol2
index 7be76ff..839f0af 100755
--- a/env/.local/bin/scripts/backup/backup-tol2
+++ b/env/.local/bin/scripts/backup/backup-tol2
@@ -16,11 +16,9 @@ fsyncb () {
fi
}
-syncfile=".surf/styles .urlview .local/bin/lf-gadgets .local/share/applications/custom .config/newsboat .config/zsh .keepass .config/Pinta stuff/notes stuff/openvpn-cons stuff/media/ICE stuff/scripts/iceys-linux-stuffs .config/swapscape.map"
+syncfile=".surf/styles .urlview .local/bin/lf-gadgets .local/share/applications/custom .config/newsboat .config/zsh .config/Pinta stuff/notes stuff/openvpn-cons stuff/media/ICE stuff/scripts/iceys-linux-stuffs .config/swapscape.map"
# stuff/scripts .gnupg
-
-#sync game stuff
target="laptop2:~"
exclude="--exclude mediamtx.yml --exclude stream.sh --exclude node_modules --exclude **/target"
diff --git a/env/.local/bin/scripts/backup/bbackup b/env/.local/bin/scripts/backup/bbackup
index 725fc86..7a4cb70 100755
--- a/env/.local/bin/scripts/backup/bbackup
+++ b/env/.local/bin/scripts/backup/bbackup
@@ -16,9 +16,9 @@ fsyncb () {
fi
}
-syncfile="stuff .surf/styles .config/eDEX-UI/ .gnupg .ssh .local/bin/lfimg-sixel .config/FreeTube .config/wlxoverlay .config/newsboat .config/zsh .config/vesktop/themes .keepass .config/Pinta .config/cava .config/gajim/theme .local/share/applications/custom .local/share/osu"
+syncfile="stuff .surf/styles .config/eDEX-UI/ .gnupg .ssh .local/bin/lfimg-sixel .config/FreeTube .config/wlxoverlay .config/newsboat .config/zsh .config/vesktop/themes .config/Pinta .config/cava .config/gajim/theme .local/share/applications/custom .local/share/osu"
-target="/home/iceyrazor/mnt-backups/LINUX FILES/home/iceyrazor"
+target="/mnts/mnt-backups/LINUX FILES/home/iceyrazor"
exclude="--exclude node_modules --exclude node_modules_23 --exclude **/target --exclude LinVAM/pyenv --exclude stuff/custom-linux/LFN --exclude stuff/custom-linux/LFN-borked-lol --exclude stuff/.private-parent/.private/minecraft --exclude /home/iceyrazor/stuff/projects/blender-projects/anim-pose/image-sequence"
fsynca
diff --git a/env/.local/bin/scripts/backup/bbackup-browser b/env/.local/bin/scripts/backup/bbackup-browser
index cf1723c..465ffaf 100755
--- a/env/.local/bin/scripts/backup/bbackup-browser
+++ b/env/.local/bin/scripts/backup/bbackup-browser
@@ -18,7 +18,7 @@ fsyncb () {
syncfile=".librewolf"
-target="/home/iceyrazor/mnt-backups/LINUX FILES/home/iceyrazor"
+target="/mnts/mnt-backups/LINUX FILES/home/iceyrazor"
exclude=""
fsynca
diff --git a/env/.local/bin/scripts/backup/pull-froml b/env/.local/bin/scripts/backup/pull-froml
index 5c1cb15..63d1f05 100755
--- a/env/.local/bin/scripts/backup/pull-froml
+++ b/env/.local/bin/scripts/backup/pull-froml
@@ -18,7 +18,7 @@ fsyncb () {
# !! no in use. backup script does not perserve timestamps or something so it wants to overwrite most files
# will fix bidirectional sync at some point
-# syncfile="laptop:.surf/styles laptop:.urlview laptop:.gnupg laptop:.local/bin/lf-gadgets laptop:.local/share/applications/custom laptop:.config/FreeTube laptop:.config/newsboat laptop:.config/zsh laptop:.config/vesktop/themes laptop:.keepass laptop:.config/Pinta laptop:.config/cmus laptop:.config/gajim/theme laptop:stuff"
+# syncfile="laptop:.surf/styles laptop:.urlview laptop:.gnupg laptop:.local/bin/lf-gadgets laptop:.local/share/applications/custom laptop:.config/FreeTube laptop:.config/newsboat laptop:.config/zsh laptop:.config/vesktop/themes laptop:.config/Pinta laptop:.config/cmus laptop:.config/gajim/theme laptop:stuff"
syncfile="laptop:stuff/scripts/node/Nwjs/nms-data/"
#sync game stuff
diff --git a/env/.local/bin/scripts/dmount b/env/.local/bin/scripts/dmount
index d33fa27..b157208 100755
--- a/env/.local/bin/scripts/dmount
+++ b/env/.local/bin/scripts/dmount
@@ -31,5 +31,5 @@ choice="$(printf "$parts" | fzf | sed 's/ .*//')"
if [ $umo == 1 ]; then
$sudo umount $choice
else
- $sudo mount $choice ~/u
+ $sudo mount $choice /mnts/flash
fi
diff --git a/env/.local/bin/system/start-scripts/autostart.sh b/env/.local/bin/system/start-scripts/autostart.sh
index 9a5ac46..5347578 100755
--- a/env/.local/bin/system/start-scripts/autostart.sh
+++ b/env/.local/bin/system/start-scripts/autostart.sh
@@ -14,7 +14,7 @@ fi
xrdb -merge /home/iceyrazor/.Xresources &
if [ -z "$WAYLAND_DISPLAY" ]; then
- xcompmgr &
+ picom &
setxkbmap -option caps:swapescape
fi
diff --git a/env/.zshrc b/env/.zshrc
index ee16a4f..84418af 100755
--- a/env/.zshrc
+++ b/env/.zshrc
@@ -37,4 +37,4 @@ source ~/.config/.profile
# bindkey -a n down-history
# bindkey -a e up-history
-eval "$(atuin init zsh)"
+# eval "$(atuin init zsh)"
diff --git a/keep/manual-programs/suckless/st-flexipatch/config.def.h b/keep/manual-programs/suckless/st-flexipatch/config.def.h
index 2a9debc..8040b5f 100644
--- a/keep/manual-programs/suckless/st-flexipatch/config.def.h
+++ b/keep/manual-programs/suckless/st-flexipatch/config.def.h
@@ -187,34 +187,36 @@ char *xdndescchar = " !\"#$&'()*;<>?[\\]^`{|}~";
/* Terminal colors (16 first used in escape sequence) */
static const char *colorname[] = {
/* 8 normal colors */
- "#1e1e2e",
- "#f38ba8",
- "#a6e3a1",
- "#f9e2af",
- "#89b4fa",
- "#f5c2e7",
- "#94e2d5",
- "#cdd6f4",
+ "#15161e",
+ "#f7768e",
+ "#9ece6a",
+ "#e0af68",
+ "#7aa2f7",
+ "#bb9af7",
+ "#7dcfff",
+ "#a9b1d6",
+
/* 8 bright colors */
- "#45475a",
- "#f38ba8",
- "#a6e3a1",
- "#f9e2af",
- "#89b4fa",
- "#f5c2e7",
- "#94e2d5",
- "#ffffff",
+ "#414868",
+ "#f7768e",
+ "#9ece6a",
+ "#e0af68",
+ "#7aa2f7",
+ "#bb9af7",
+ "#7dcfff",
+ "#c0caf5",
+
[255] = 0,
/* more colors can be added after 255 to use with DefaultXX */
- "#f5e0dc",
- "#08000a",
- "#1e1e2e", /* default background colour */
- "#cdd6f4", /* default foreground colour */
+ "#c0caf5",
+ "#28344a",
+ "#1a1b26", /* default background colour */
+ "#c0caf5", /* default foreground colour */
};
generated by cgit v1.3 (git 2.53.0) at 2026-07-28 10:05:38 +0000