diff --git a/.bashrc b/.bashrc index 7b1928f..94dee49 100644 --- a/.bashrc +++ b/.bashrc @@ -1,10 +1,12 @@ -alias ls="ls -A --color" +alias ls="ls -Alh --color=never" alias push="git push" alias pull="git pull" alias clone="git clone" alias commit="git commit" alias add="git add" - -date +'%Y-%m-%d %H:%M:%S %z' +alias :e="vim" +alias sc="sc-im" +alias mapscii="telnet mapscii.me" PS1='$(pwd)\n\u@\H > ' +export PATH=$PATH:"/home/deadvey/.cargo/bin" diff --git a/.config/feeds.opml b/.config/feeds.opml new file mode 100755 index 0000000..2b0e10b --- /dev/null +++ b/.config/feeds.opml @@ -0,0 +1,28 @@ + + + + Newsboat - Exported Feeds + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index f97de49..537f280 100644 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -22,8 +22,10 @@ # See https://wiki.hypr.land/Configuring/Monitors/ #monitor=,preferred,auto,auto -monitor = DP-1, 1920x1080@50.00Hz, 0x0, 1 -monitor = HDMI-A-1, 1920x1080@60.00000, 1000x1080, 1 +#monitor = DP-1, 1920x1080@50.00Hz, 0x0, 1 +#monitor = HDMI-A-1, 1920x1080@60.00000, 1000x1080, 1 +monitor = VGA-1, 1920x1080@60Hz, 0x0, 1 +monitor = LVDS-1, 1600x900@59.99Hz, 1920x0, 1 ################### @@ -85,14 +87,14 @@ env = HYPRCURSOR_SIZE,24 # https://wiki.hypr.land/Configuring/Variables/#general general { - gaps_in = 5 - gaps_out = 10 + gaps_in = 0 + gaps_out = 0 - border_size = 1 + border_size = 2 # https://wiki.hypr.land/Configuring/Variables/#variable-types for info about colors - col.active_border = rgb(2aa198) - col.inactive_border = rgb(586e75) + col.active_border = rgb(859900) + col.inactive_border = rgb(839496) # Set to true enable resizing windows by clicking and dragging on borders and gaps resize_on_border = false @@ -100,7 +102,11 @@ general { # Please see https://wiki.hypr.land/Configuring/Tearing/ before you turn this on allow_tearing = false - layout = dwindle + layout = master +} + +master { + mfact = 0.6 } # https://wiki.hypr.land/Configuring/Variables/#decoration @@ -116,22 +122,20 @@ decoration { enabled = false range = 4 render_power = 3 - color = rgba(1a1a1aee) } # https://wiki.hypr.land/Configuring/Variables/#blur blur { - enabled = true + enabled = false size = 3 passes = 1 - vibrancy = 0.1696 } } # https://wiki.hypr.land/Configuring/Variables/#animations animations { - enabled = yes, please :) + enabled = no, please :) # Default curves, see https://wiki.hypr.land/Configuring/Animations/#curves # NAME, X0, Y0, X1, Y1 @@ -172,11 +176,6 @@ animations { # windowrule = bordersize 0, floating:0, onworkspace:f[1] # windowrule = rounding 0, floating:0, onworkspace:f[1] -# See https://wiki.hypr.land/Configuring/Dwindle-Layout/ for more -dwindle { - pseudotile = true # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below - preserve_split = true # You probably want this -} # See https://wiki.hypr.land/Configuring/Master-Layout/ for more master { @@ -203,6 +202,7 @@ input { kb_rules = follow_mouse = 1 + scroll_method = "on_button_down" sensitivity = 0 # -1.0 - 1.0, 0 means no modification. @@ -221,7 +221,6 @@ device { sensitivity = -0.5 } - ################### ### KEYBINDINGS ### ################### @@ -236,16 +235,22 @@ bind = $mainMod, M, fullscreen,1 bind = $mainMod, E, exit bind = $mainMod, V, togglefloating, bind = $mainMod, Space, exec, $menu -bind = $mainMod, T, togglesplit, # dwindle -bind = $mainMod, F12, exec, screenshot -bind = $mainMod, P, exec, screenshot +bind = $mainMod, F12, exec, screenshot-wayland bind = $mainMod, O, exec, hyprpicker +bind = $mainMod, S, layoutmsg, swapwithmaster master +bind = $mainMod, N, layoutmsg, cyclenext +bind = $mainMod, P, layoutmsg, cycleprev -# Move focus with mainMod + arrow keys +# Move focus with mainMod + hjkl keys bind = $mainMod, h, movefocus, l bind = $mainMod, l, movefocus, r bind = $mainMod, k, movefocus, u bind = $mainMod, j, movefocus, d +# Resize with mainMod + hjkl keys +bind = $mainMod SHIFT, h, resizeactive, -10 0 +bind = $mainMod SHIFT, l, resizeactive, 10 0 +bind = $mainMod SHIFT, k, resizeactive, 0 -10 +bind = $mainMod SHIFT, j, resizeactive, 0 10 # Switch workspaces with mainMod + [0-9] bind = $mainMod, 1, workspace, 1 @@ -272,8 +277,8 @@ bind = $mainMod SHIFT, 9, movetoworkspace, 9 bind = $mainMod SHIFT, 0, movetoworkspace, 10 # Example special workspace (scratchpad) -bind = $mainMod, S, togglespecialworkspace, magic -bind = $mainMod SHIFT, S, movetoworkspace, special:magic +#bind = $mainMod, S, togglespecialworkspace, magic +#bind = $mainMod SHIFT, S, movetoworkspace, special:magic # Scroll through existing workspaces with mainMod + scroll bind = $mainMod, mouse_down, workspace, e+1 diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf index 2b31619..f26838d 100644 --- a/.config/kitty/kitty.conf +++ b/.config/kitty/kitty.conf @@ -10,8 +10,7 @@ include current-theme.conf #: kitty has very powerful font management. You can configure #: individual font faces and even specify special fonts for particular #: characters. - -# font_family monospace +# font_family "Victor Mono" # bold_font auto # italic_font auto # bold_italic_font auto @@ -2954,3 +2953,13 @@ cursor_shape underline #: }}} #: }}} + + +# BEGIN_KITTY_FONTS +font_family family="Victor Mono" +bold_font auto +italic_font auto +bold_italic_font auto +# END_KITTY_FONTS + +confirm_os_window_close 0 diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf new file mode 100644 index 0000000..a022d16 --- /dev/null +++ b/.config/tmux/tmux.conf @@ -0,0 +1,36 @@ +# Behaviour +set -g base-index 1 +setw -g status-keys vi +setw -g mode-keys vi +setw -g pane-base-index 1 +select-layout main-vertical +set -g main-pane-width 60% +set-hook -g after-new-window 'select-layout main-vertical' +set-hook -g after-split-window 'select-layout main-vertical' + +# Appearance +set -g clock-mode-style 12-with-seconds +set -g clock-mode-colour red +set -g status-right "#S #I #P #h #(upower -i /org/freedesktop/UPower/devices/battery_BAT0 | grep -E "percentage" | sed 's/[ ]*percentage:[ ]*//') %Y-%m-%d %I:%M" +set -g status-left "#W" + +set -g status-position top +set -g status-style 'fg=black bg=white' + +#Binds +unbind C-b +set -g prefix C-s +bind C-a send-prefix + +bind -n M-h select-pane -L +bind -n M-j select-pane -D +bind -n M-k select-pane -U +bind -n M-l select-pane -R + +bind M-h resize-pane -L S +bind M-j resize-pane -D S +bind M-k resize-pane -U S +bind M-l resize-pane -R S + +bind -n M-s swap-pane -s ! -t 0 \; select-layout main-vertical +bind -n M-n select-pane -t :.+ diff --git a/.config/user-dirs.dirs b/.config/user-dirs.dirs new file mode 100644 index 0000000..9c56e09 --- /dev/null +++ b/.config/user-dirs.dirs @@ -0,0 +1,16 @@ +# This file is written by xdg-user-dirs-update +# If you want to change or add directories, just edit the line you're +# interested in. All local changes will be retained on the next run. +# Format is XDG_xxx_DIR="$HOME/yyy", where yyy is a shell-escaped +# homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an +# absolute path. No other format is supported. +# +XDG_DESKTOP_DIR="$HOME/desktop" +XDG_DOWNLOAD_DIR="$HOME/downloads" +XDG_DOCUMENTS_DIR="$HOME/documents" +XDG_MUSIC_DIR="$HOME/music" +XDG_PICTURES_DIR="$HOME/pictures" +XDG_VIDEOS_DIR="$HOME/videos" +XDG_PROJECTS_DIR="$HOME/code" +XDG_TEMPLATES_DIR="$HOME/templates" +XDG_PUBLICSHARE_DIR="$HOME/public" diff --git a/.config/waybar/.style.css.swp b/.config/waybar/.style.css.swp deleted file mode 100644 index e55822e..0000000 Binary files a/.config/waybar/.style.css.swp and /dev/null differ diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc index 25df585..d005018 100644 --- a/.config/waybar/config.jsonc +++ b/.config/waybar/config.jsonc @@ -3,160 +3,152 @@ "name": "main", "layer": "top", // Waybar at top layer // "position": "bottom", // Waybar position (top|bottom|left|right) - "height": 30, // Waybar height (to be removed for auto height) + "height": 26, // Waybar height (to be removed for auto height) // "width": 1280, // Waybar width // "gtk-layer-shell": "false", // Choose the order of the modules - "modules-left": ["custom/menu","hyprland/window"], - "modules-center": ["hyprland/workspaces"], - "modules-right": ["custom/zypper","hyprland/language", "network", "pulseaudio", "custom/layout", "clock"], - "hyprland/workspaces": { - "format": "{icon}", - "format-icons": { - "default": "", - "active": "" + "modules-left": ["hyprland/window"], + "modules-center": [], + "modules-right": ["hyprland/workspaces","custom/hostname","battery","clock"], + "custom/workspaces": { + "format": "{}", + "exec": "hyprctl activeworkspace -j | jq '.id'", + "interval": 1 }, - "disable-scroll": true, - "all-outputs": true, - "show-special": true + "custom/hostname": { + "exec": "hostname", + "format": "{}", + "interval": 10000 }, - "hyprland/window": { - + "custom/zypper": { + "format": "{} ", + "interval": 3600, + "exec": "zypper lu | grep 'v \\+|' | wc -l; echo 'packages to update'", + "exec-if": "exit 0", + "on-click": "exec alacritty -e sudo sh -c 'zypper ref; zypper dup; pkill -SIGRTMIN+8 waybar'", + "signal": 8 }, - "custom/menu": { - "format": "", - "on-click": "fuzzel" + "idle_inhibitor": { + "format": "{icon}", + "format-icons": { + "activated": "", + "deactivated": "" + } + }, + "tray": { + // "icon-size": 21, + "spacing": 10 + }, + "clock": { + "format": "{:%Y-%m-%d %I:%M:%S}", + "format-alt": "{:%a %d %b w:%V %H:%M}", + "actions": { + "on-click-right" : "mode", + "on-scroll-up" : "shift_up", + "on-scroll-down" : "shift_down" + }, + "interval": 1 + }, + "cpu": { + "format": "{usage}% ", + "tooltip": false + }, + "memory": { + "format": "{}% " + }, + "temperature": { + // "thermal-zone": 2, + // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input", + "critical-threshold": 80, + // "format-critical": "{temperatureC}°C {icon}", + "format": "{temperatureC}°C {icon}", + "format-icons": ["", "", ""] + }, + "backlight": { + // "device": "acpi_video1", + "format": "{percent}% {icon}", + "format-icons": ["", ""] + }, + "battery": { + "format": "{capacity}%" + }, + "battery#bat2": { + "bat": "BAT2" + }, + "network": { + // "interface": "wlp2*", // (Optional) To force the use of this interface + "format-wifi": "WiFi", + "format-ethernet": "Eth", + "format-linked": "Connected", + "format-disconnected": "Disconnected", + "format-alt": "{ifname} {essid} ({signalStrength}%)" + }, + "pulseaudio": { + "format": "{icon}", + "format-alt": "{volume} {icon}", + "format-alt-click": "click-middle", + "format-muted": "", + "format-icons": { + "headphones": "", + "handsfree": "", + "headset": "", + "phone": "", + "portable": "", + "car": "", + "default": ["", "", ""] + }, + "scroll-step": 10, + "on-click": "pactl set-sink-mute @DEFAULT_SINK@ toggle", + "on-click-right": "pavucontrol", + "tooltip": true + }, + "custom/scratchpad": { + "format-text": "{}", + "return-type": "json", + "interval": 3, + "exec": "/usr/share/openSUSEway/helpers/scratchpad-indicator.sh 2> /dev/null", + "exec-if": "exit 0", + "on-click": "swaymsg 'scratchpad show'", + "on-click-right": "swaymsg 'move scratchpad'" }, - "custom/layout": { - "tooltip": false, - "exec": "swaymsg -mrt subscribe '[\"input\"]' | jq -r --unbuffered \"select(.change == \\\"xkb_layout\\\") | .input | select(.type == \\\"keyboard\\\") | .xkb_active_layout_name | .[0:2]\"" - }, - "custom/zypper": { - "format": "{} ", - "interval": 3600, - "exec": "zypper lu | grep 'v \\+|' | wc -l; echo 'packages to update'", - "exec-if": "exit 0", - "on-click": "exec alacritty -e sudo sh -c 'zypper ref; zypper dup; pkill -SIGRTMIN+8 waybar'", - "signal": 8 - }, - "idle_inhibitor": { - "format": "{icon}", - "format-icons": { - "activated": "", - "deactivated": "" - } - }, - "tray": { - // "icon-size": 21, - "spacing": 10 - }, - "clock": { - "format": " {:%Y-%m-%d %H:%M:%S}", - "format-alt": "{:%a %d %b w:%V %H:%M}", - "tooltip-format": "{calendar}", - "calendar": { - "mode-mon-col" : 4, - "weeks-pos" : "left", - "on-scroll" : 1, - "on-click-right" : "mode", - "format": { - "months": "{}", - "weeks": "{}", - "weekdays": "{}", - "today": "{}" - } - }, - "actions": { - "on-click-right" : "mode", - "on-scroll-up" : "shift_up", - "on-scroll-down" : "shift_down" - }, - "interval": 1 - }, - "cpu": { - "format": "{usage}% ", - "tooltip": false - }, - "memory": { - "format": "{}% " - }, - "temperature": { - // "thermal-zone": 2, - // "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input", - "critical-threshold": 80, - // "format-critical": "{temperatureC}°C {icon}", - "format": "{temperatureC}°C {icon}", - "format-icons": ["", "", ""] - }, - "backlight": { - // "device": "acpi_video1", - "format": "{percent}% {icon}", - "format-icons": ["", ""] - }, - "battery": { - "states": { - // "good": 95, - "warning": 30, - "critical": 15 - }, - "format": "{icon}", - "format-charging": "", - "format-plugged": "", - "format-alt": "{capacity}% {time}", - "format-icons": ["", "", "", "", ""] - }, - "battery#bat2": { - "bat": "BAT2" - }, - "network": { - // "interface": "wlp2*", // (Optional) To force the use of this interface - "format-wifi": "", - "format-ethernet": "", - "format-linked": "", - "format-disconnected": "⚠", - "format-alt": "{ifname} {essid} ({signalStrength}%)" - }, - "pulseaudio": { - "format": "{icon}", - "format-alt": "{volume} {icon}", - "format-alt-click": "click-middle", - "format-muted": "", - "format-icons": { - "headphones": "", - "handsfree": "", - "headset": "", - "phone": "", - "portable": "", - "car": "", - "default": ["", "", ""] - }, - "scroll-step": 10, - "on-click": "pactl set-sink-mute @DEFAULT_SINK@ toggle", - "on-click-right": "pavucontrol", - "tooltip": true - }, - "custom/scratchpad": { - "format-text": "{}", - "return-type": "json", - "interval": 3, - "exec": "/usr/share/openSUSEway/helpers/scratchpad-indicator.sh 2> /dev/null", - "exec-if": "exit 0", - "on-click": "swaymsg 'scratchpad show'", - "on-click-right": "swaymsg 'move scratchpad'" - }, "hyprland/language": { "format": "{}", "on-click": "hyprctl switchxkblayout current next", "keyboard-name": "current" }, - "custom/notification": { + "mpd": { + "format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ", + "format-disconnected": "Disconnected ", + "format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ", + "interval": 2, + "consume-icons": { + "on": " " // Icon shows only when "consume" is on + }, + "random-icons": { + "off": " ", // Icon grayed out when "random" is off + "on": " " + }, + "repeat-icons": { + "on": " " + }, + "single-icons": { + "on": "1 " + }, + "state-icons": { + "paused": "", + "playing": "" + }, + "tooltip-format": "MPD (connected)", + "tooltip-format-disconnected": "MPD (disconnected)" + }, + "custom/notification": { "tooltip": true, "format": "{icon}", "format-icons": { - "notification": "⬤", - "none": " ", - "dnd-notification": "⬤", - "dnd-none": " " + "notification": "⬤", + "none": " ", + "dnd-notification": "⬤", + "dnd-none": " " }, "return-type": "json", "exec-if": "which swaync-client", diff --git a/.config/waybar/style.css b/.config/waybar/style.css index 20fd284..0493413 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -1,107 +1,40 @@ * { - border: none; - border-radius: 0; - font-family: "Source Sans Pro", "FontAwesome 6 Free"; - font-size: 15px; - box-shadow: none; - text-shadow: none; - transition-duration: 0s; + border: none; + border-radius: 0; + font-family: "Victor Mono"; + font-size: 12px; + box-shadow: none; + text-shadow: none; + transition-duration: 0s; } window.main { - color: rgb(101,123,131); - background-color: rgb(0,43,54); - border-bottom: 1px solid rgb(88,110,117); + color: #1c1c1c; + background-color: #839496; } -#workspaces { - margin-right: 5px; +#battery, +#custom-workspaces, +#workspaces button, +#custom-hostname, +#clock, +#window { + color: #1c1c1c; + background-color: #839496; + padding-right: 5px; + padding-left: 5px; } - -#custom-scratchpad { - margin-right: 5px; - padding: 0px 5px; -} - -/* Modules center */ -#workspaces { - background: #073642; - border-radius: 10px; - margin: 6px 5px; - padding: 0px 6px; -} - -#workspaces button { - color: #586e75; - background: transparent; - padding: 4px 4px; - transition: color 0.3s ease, text-shadow 0.3s ease, transform 0.3s ease; -} - -#workspaces button.occupied { - color: #d33682; -} - #workspaces button.active { - color: #2aa198; - text-shadow: 0 0 4px #ABE9B3; -} - -#workspaces button:hover { - color: #6c71c4; -} - -#workspaces button.active:hover {} -#mode, -#network, -#pulseaudio, -#idle_inhibitor, -#temperature, -#custom-layout, -#hyprland-languages, -#custom-menu, -#hyprland-window, -#custom-zypper { - margin: 0px 6px 0px 10px; -/* min-width: 30px;*/ -} - -#clock { - margin: 0px 6px 0px 10px; -} - -#battery.warning { - color: rgba(255, 210, 4, 1); -} - -#battery.critical { - color: rgba(238, 46, 36, 1); -} - -#battery.charging { - color: rgba(217, 216, 216, 1); -} - -#bluetooth.disabled { - color: rgba(128, 128, 128, 1); -} - -#bluetooth.off { - color: rgba(128, 128, 128, 1); + color: #585858; } #bluetooth.connected { - color: rgba(115, 186, 37, 1); -} -tooltip { - color: #eee8d5; - background-color: #073642; - text-shadow: none; + color: rgba(115, 186, 37, 1); } tooltip * { - background-color: #073642; - color: #eee8d5; + background-color: #839496; + color: #1c1c1c; text-shadow: none; } diff --git a/.gitconfig b/.gitconfig new file mode 100755 index 0000000..48e4d9b --- /dev/null +++ b/.gitconfig @@ -0,0 +1,5 @@ +[user] + name = deadvey + email = deadvey@deadvey.com +[gui] + recentrepo = /home/deadvey/code/happening diff --git a/.newsboat/config b/.newsboat/config new file mode 100644 index 0000000..9e8d0c6 --- /dev/null +++ b/.newsboat/config @@ -0,0 +1,16 @@ +browser cha +download-path ~/downloads +player mpv +color background white black +color listnormal white black +color listfocus yellow black bold +color listnormal_unread white black bold +color listfocus_unread yellow black bold +color title yellow black bold +color info yellow black bold +color hint-key yellow black bold +color hint-keys-delimiter white black +color hint-separator white black bold +color hint-description white black +color article white black + diff --git a/.newsboat/urls b/.newsboat/urls new file mode 100644 index 0000000..0106f61 --- /dev/null +++ b/.newsboat/urls @@ -0,0 +1,4 @@ +https://feeds.megaphone.fm/LMG3928170156 podcast +https://tilvids.com/feeds/videos.xml?videoChannelId=47 video +https://odysee.com/$/rss/@BrodieRobertson:5 video +https://radar.spacebar.org/f/a/weblog/rss/1 blog article diff --git a/.vim/colors/deadvey.vim b/.vim/colors/deadvey.vim index 2b506dc..867e959 100644 --- a/.vim/colors/deadvey.vim +++ b/.vim/colors/deadvey.vim @@ -1,17 +1,17 @@ hi Comment ctermfg=0 ctermbg=14 cterm=bold,italic " comment! hi Constant ctermfg=15 cterm=bold -hi Identifier ctermfg=15 -hi String ctermfg=3 " Yellow +hi Identifier ctermfg=15 cterm=bold +hi String ctermfg=12 cterm=italic " Yellow hi Function ctermfg=15 hi Error ctermfg=15 hi Special ctermfg=15 -hi Statement ctermfg=15 cterm=bold -hi Operator ctermfg=1 " Red +hi Statement ctermfg=15 +hi Operator ctermfg=15 hi Boolean ctermfg=15 hi Label ctermfg=15 -hi Keyword ctermfg=15 cterm=bold +hi Keyword ctermfg=15 hi Exception ctermfg=15 -hi Conditional ctermfg=15 cterm=bold +hi Conditional ctermfg=15 hi PreProc ctermfg=15 hi Include ctermfg=15 hi Macro ctermfg=15 diff --git a/.vimrc b/.vimrc index da2723a..778d1cd 100644 --- a/.vimrc +++ b/.vimrc @@ -1,8 +1,9 @@ set list syntax on -set listchars=tab:\|\ ,trail:~,eol:↩,extends:>,precedes:<,nbsp:· +set listchars=tab:\|\ ,trail:~,eol:↩,nbsp:·,multispace:· set number set relativenumber +set visualbell set shiftwidth=4 set tabstop=4 @@ -11,5 +12,6 @@ colorscheme deadvey set foldmethod=indent set compatible +set viminfo="" set nomodeline -set backspace= +set undolevels=1