From 3cc3abc920cc96a53427c221a7a9e4623c0b20b4 Mon Sep 17 00:00:00 2001 From: Mitja Felicijan Date: Tue, 28 Apr 2026 02:27:15 +0200 Subject: Cleanup and squash --- .alacritty.toml | 2 +- .black.rasi | 37 ++++++++++ .config/i3/config | 174 ++++++++++++++++++++++++++++++++++++++++++++++++ .config/i3status/config | 25 +++++++ .gitconfig | 2 +- .shenanigans.sh | 33 +++------ .xinitrc | 2 +- 7 files changed, 249 insertions(+), 26 deletions(-) create mode 100644 .black.rasi create mode 100644 .config/i3/config create mode 100644 .config/i3status/config diff --git a/.alacritty.toml b/.alacritty.toml index 6ba8f61..dd2ce1d 100644 --- a/.alacritty.toml +++ b/.alacritty.toml @@ -7,7 +7,7 @@ dimensions = { columns = 140, lines = 50 } [font] normal = { family = "Berkeley Mono", style = "Bold" } -size = 10 +size = 9 [colors.primary] background = '#000000' diff --git a/.black.rasi b/.black.rasi new file mode 100644 index 0000000..ac7c046 --- /dev/null +++ b/.black.rasi @@ -0,0 +1,37 @@ +configuration { + show-icons: false; + disable-history: false; +} + +* { + font: "Berkeley Mono Bold 14"; + foreground: white; + background-color: black; +} + +#window { + background-color: black; + border: 2; + border-color: white; + padding: 20; + width: 800; +} + +prompt, inputbar, entry { + text-color: white; + padding: 0 10 10 0; +} + +listview { + lines: 20; + columns: 1; +} + +element-text { + text-color: khaki; +} + +element-text selected { + text-color: black; + background-color: white; +} diff --git a/.config/i3/config b/.config/i3/config new file mode 100644 index 0000000..b43b47d --- /dev/null +++ b/.config/i3/config @@ -0,0 +1,174 @@ +set $mod Mod4 + +font pango:Berkeley Mono Bold 7 +exec --no-startup-id dex --autostart --environment i3 +exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork +exec --no-startup-id nm-applet + +# Use pactl to adjust volume in PulseAudio. +set $refresh_i3status killall -SIGUSR1 i3status +bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status +bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10% && $refresh_i3status +bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status +bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status + +# My keybinds +bindsym $mod+bracketright exec --no-startup-id pats -t +bindsym $mod+m exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle +bindsym $mod+l exec --no-startup-id i3lock +bindsym $mod+p exec --no-startup-id "rofi -show drun -theme ~/.black.rasi" +bindsym $mod+Escape exec --no-startup-id "maim -s | xclip -selection clipboard -t image/png" + +# Use Mouse+$mod to drag floating windows to their wanted position +floating_modifier $mod +tiling_drag modifier titlebar + +# start a terminal +bindsym $mod+Return exec alacritty + +# kill focused window +bindsym $mod+Shift+q kill + +# change focus +bindsym $mod+Left focus left +bindsym $mod+Down focus down +bindsym $mod+Up focus up +bindsym $mod+Right focus right + +# move focused window +bindsym $mod+Shift+j move left +bindsym $mod+Shift+k move down +bindsym $mod+Shift+l move up +bindsym $mod+Shift+semicolon move right + +# alternatively, you can use the cursor keys: +bindsym $mod+Shift+Left move left +bindsym $mod+Shift+Down move down +bindsym $mod+Shift+Up move up +bindsym $mod+Shift+Right move right + +# split in horizontal orientation +bindsym $mod+h split h + +# split in vertical orientation +bindsym $mod+v split v + +# enter fullscreen mode for the focused container +bindsym $mod+f fullscreen toggle + +# change container layout (stacked, tabbed, toggle split) +bindsym $mod+s layout stacking +bindsym $mod+w layout tabbed +bindsym $mod+e layout toggle split + +# toggle tiling / floating +bindsym $mod+Shift+space floating toggle + +# change focus between tiling / floating windows +bindsym $mod+space focus mode_toggle + +# focus the parent container +bindsym $mod+a focus parent + +# focus the child container +bindsym $mod+d focus child + +# Define names for default workspaces for which we configure key bindings later on. +# We use variables to avoid repeating the names in multiple places. +set $ws1 "1" +set $ws2 "2" +set $ws3 "3" +set $ws4 "4" +set $ws5 "5" +set $ws6 "6" +set $ws7 "7" +set $ws8 "8" +set $ws9 "9" +set $ws10 "10" + +# switch to workspace +bindsym $mod+1 workspace number $ws1 +bindsym $mod+2 workspace number $ws2 +bindsym $mod+3 workspace number $ws3 +bindsym $mod+4 workspace number $ws4 +bindsym $mod+5 workspace number $ws5 +bindsym $mod+6 workspace number $ws6 +bindsym $mod+7 workspace number $ws7 +bindsym $mod+8 workspace number $ws8 +bindsym $mod+9 workspace number $ws9 +bindsym $mod+0 workspace number $ws10 + +# move focused container to workspace +bindsym $mod+Shift+1 move container to workspace number $ws1 +bindsym $mod+Shift+2 move container to workspace number $ws2 +bindsym $mod+Shift+3 move container to workspace number $ws3 +bindsym $mod+Shift+4 move container to workspace number $ws4 +bindsym $mod+Shift+5 move container to workspace number $ws5 +bindsym $mod+Shift+6 move container to workspace number $ws6 +bindsym $mod+Shift+7 move container to workspace number $ws7 +bindsym $mod+Shift+8 move container to workspace number $ws8 +bindsym $mod+Shift+9 move container to workspace number $ws9 +bindsym $mod+Shift+0 move container to workspace number $ws10 + +# reload the configuration file +bindsym $mod+Shift+c reload +# restart i3 inplace (preserves your layout/session, can be used to upgrade i3) +bindsym $mod+Shift+r restart +# exit i3 (logs you out of your X session) +bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'" + +# resize window (you can also use the mouse for that) +mode "resize" { + # same bindings, but for the arrow keys + bindsym Left resize shrink width 10 px or 10 ppt + bindsym Down resize grow height 10 px or 10 ppt + bindsym Up resize shrink height 10 px or 10 ppt + bindsym Right resize grow width 10 px or 10 ppt + + # back to normal: Enter or Escape or $mod+r + bindsym Return mode "default" + bindsym Escape mode "default" + bindsym $mod+r mode "default" +} + +bindsym $mod+r mode "resize" + +# No title bars +for_window [class="^.*"] border pixel 2 + +# Do not follow mouse for focus +focus_follows_mouse no + +set $primary #c3b091 +set $secondary #ff4500 +set $dark #333333 +set $light #ffffff + +# Start i3bar to display a workspace bar (plus the system information i3status +# finds out, if available) +bar { + status_command i3status + position top + colors { + background #000000 + separator #191919 + # border background text + focused_workspace $primary $primary $dark + inactive_workspace $dark $dark $light + urgent_workspace $secondary $secondary $light + + } +} + +# border background text indicator +client.focused $primary $primary $light $light +client.unfocused $dark $dark $light $light +client.focused_inactive $dark $dark $light $light +client.urgent $secondary $secondary $light $light + +# Workspace 1 only has floating windows +for_window [workspace="1"] floating enable + +# Expections for opening in floating mode where XSetClassHint is set to floating +for_window [class="^(mpv|SimpleScreenRecorder|Thunar|transmission)$"] floating enable +for_window [title="^(Stalag)$"] floating enable diff --git a/.config/i3status/config b/.config/i3status/config new file mode 100644 index 0000000..6ff978a --- /dev/null +++ b/.config/i3status/config @@ -0,0 +1,25 @@ +general { + colors = true + interval = 5 +} + +order += "disk /" +order += "cpu_usage" +order += "memory" +order += "tztime local" + +disk "/" { + format = "Disk: %avail" +} + +cpu_usage { + format = "CPU: %usage" +} + +memory { + format = "Memory: %used" +} + +tztime local { + format = "%a %Y-%m-%d %H:%M:%S" +} diff --git a/.gitconfig b/.gitconfig index a3a8fcc..479cc69 100644 --- a/.gitconfig +++ b/.gitconfig @@ -16,7 +16,7 @@ [gpg] format = ssh [alias] - pushall = !sh -c \"git remote | xargs -L1 git push --all\" + pushall = !sh -c \"git remote | xargs -L1 git push --all --force-with-lease\" tree = log --oneline --graph [filter "lfs"] required = true diff --git a/.shenanigans.sh b/.shenanigans.sh index 9dc5732..86e57d5 100755 --- a/.shenanigans.sh +++ b/.shenanigans.sh @@ -1,14 +1,9 @@ -# Software list (Void Linux): -# void-repo-nonfree void-repo-multilib void-repo-multilib-nonfree +# Software list: # file-roller xfce4-plugins thunar-archive-plugin -# lm_sensors conky maim xlockmore picom cwm xclip xsel xsetroot xdotool -# xss-lock wmctrl zip mc htop entr cifs-utils rsync jq rofi st fd -# clang clang-tools-extra vim git curl tmux hstr tree make cmake gdb -# nvtop ctags stow newsboat mpv rsync python3-pipx lazygit +# vim git tmux maim xclip xsel mc htop entr cifs-utils rsync jq rofi fd +# rsync curl hstr tree make gdb nvtop ctags stow newsboat mpv lazygit # Additonal stuff: # go install golang.org/x/tools/gopls@latest -# pipx install pyright mdformat -# pipx inject mdformat mdformat-gfm # Only run if the script is being sourced (bashrc). if [[ "${BASH_SOURCE[0]}" != "${0}" ]]; then @@ -35,7 +30,7 @@ if [[ "${BASH_SOURCE[0]}" != "${0}" ]]; then alias tmux='tmux -T 256 -u' alias server='python3 -m http.server 6969' alias newsboat='newsboat -r -u ~/.feeds.txt' - alias n='cd ~/Notes && vim toc.txt' + alias emptytrash='gio trash --empty' # Custom folder jump commands. alias j='cd ~/Junk' @@ -49,7 +44,6 @@ if [[ "${BASH_SOURCE[0]}" != "${0}" ]]; then export HISTFILESIZE= export HISTFILE=~/.bash_history_infinite PROMPT_COMMAND="history -a; ${PROMPT_COMMAND}" - # PROMPT_COMMAND="history -a; history -n; ${PROMPT_COMMAND}" bind '"\e[A": history-search-backward' bind '"\e[B": history-search-forward' export HSTR_CONFIG=hicolor @@ -70,9 +64,6 @@ backup() { "ssh.zip $HOME/.ssh" "bash_history_infinite.zip $HOME/.bash_history_infinite" "projects.zip $HOME/Projects" - "notes.zip $HOME/Notes" - "twow.zip $HOME/Games/turtlewow/WTF $HOME/Games/turtlewow/wow.sh" - "vanilla+.zip $HOME/Games/vanilla+/WTF $HOME/Games/vanilla+/wow.sh" ) for entry in "${archive_sets[@]}"; do @@ -83,18 +74,14 @@ backup() { rm -Rf /tmp/$SNAPSHOT } -micstatus() { - pactl get-source-mute @DEFAULT_SOURCE@ | grep -q "no" && echo 1 || echo 0; -} - slugify() { - local text="$1" - echo "$text" | tr '[:upper:]' '[:lower:]' | sed -E 's/[^a-z0-9]+/-/g; s/^-+|-+$//g' + local text="$1" + echo "$text" | tr '[:upper:]' '[:lower:]' | sed -E 's/[^a-z0-9]+/-/g; s/^-+|-+$//g' } worldclocks() { - printf "%-18s %s\n" "Local:" "$(TZ='Europe/Ljubljana' date +'%a %H:%M')" - printf "%-18s %s\n" "Brisbane:" "$(TZ='Australia/Brisbane' date +'%a %H:%M')" - printf "%-18s %s\n" "San Francisco:" "$(TZ='America/Los_Angeles' date +'%a %H:%M')" - printf "%-18s %s\n" "New York:" "$(TZ='America/New_York' date +'%a %H:%M')" + printf "%-18s %s\n" "Local:" "$(TZ='Europe/Ljubljana' date +'%a %H:%M')" + printf "%-18s %s\n" "Brisbane:" "$(TZ='Australia/Brisbane' date +'%a %H:%M')" + printf "%-18s %s\n" "San Francisco:" "$(TZ='America/Los_Angeles' date +'%a %H:%M')" + printf "%-18s %s\n" "New York:" "$(TZ='America/New_York' date +'%a %H:%M')" } diff --git a/.xinitrc b/.xinitrc index c4a752d..bc8b791 100644 --- a/.xinitrc +++ b/.xinitrc @@ -10,4 +10,4 @@ xset s 900 xss-lock -- xlock & xinput --set-prop "pointer:Logitech MX Master 3" "libinput Accel Speed" -0.3 -exec glitch +exec i3 -- cgit v1.2.3