Enable VFR at Hyprland

This more closely mimicks bspwm

.gitmodules

@@ -43,3 +43,6 @@
 [submodule "base/.vim/bundle/vim-groovy"]
 	path = base/.vim/bundle/vim-groovy
 	url = https://github.com/thecodesmith/vim-groovy
+[submodule "base/.vim/bundle/FastFold"]
+	path = base/.vim/bundle/FastFold
+	url = https://github.com/Konfekt/FastFold

base/.config/systemd/user/ollama.service

@@ -8,6 +8,8 @@ Environment="LD_LIBRARY_PATH=/var/home/salt/Projects/ollama/rocm/lib/ollama/"
 ExecStart=/home/salt/Projects/ollama/ollama serve
 Restart=always
 RestartSec=3
+MemoryHigh=3G
+MemoryMax=4G
 
 [Install]
 WantedBy=default.target

base/.functions

@@ -21,7 +21,7 @@ proj() {
 		cd "$projdir" || return 50
 		# Run code if we have it
 		# The fun part is this environment file can access some vars about the proj
-		local envfile="$projdir/.env"
+		local envfile="$projdir/.project-env"
 		if [ -r "$envfile" ]; then
 			. "$envfile"
 			echo "Sourced environment file for project"

base/.profile

@@ -67,6 +67,14 @@ if [ -f "$brewfix"/bin/brew ]; then
 fi
 unset brew
 
+# If we have toolbox, assume we're on Wayblue and set up an alias
+if has toolbox; then
+	#toolbox create hyprpm
+	#toolbox run -c hyprpm sudo dnf -y install hyprland hyprland-devel
+	alias mktoolbox-hyprpm='toolbox create hyprpm && toolbox run -c hyprpm sudo dnf -y install hyprland hyprland-devel'
+	alias hyprpm='toolbox run -c hyprpm env HYPRLAND_INSTANCE_SIGNATURE="$HYPRLAND_INSTANCE_SIGNATURE" hyprpm'
+fi
+
 # Grab pip completion, if it exists
 if has pip; then
 	case "$_baseshell" in

base/.vim/templates/=template=.bash

@@ -1,124 +0,0 @@
-#! /bin/bash
-#
-# %FILE%
-# Copyright (C) %YEAR% %USER% <%MAIL%>
-#
-# Distributed under terms of the %LICENSE% license.
-#
-set -e
-
-# Read-only set-once variables
-declare -r _name="$(basename -- "$0")"
-# Options
-declare -i _opthelp
-declare -i _optverbose
-# Working variables
-declare -a _args
-declare _return
-
-# Helper functions
-log() {
-	# Print a line to the terminal if _optverbose is greater than $2
-	# $2 defaults to 0
-	# loglevel 0: Daily-use messages
-	# loglevel 1: Detailed but not quite debugging
-	# loglevel 2: Definitely debugging
-	[ -z "$1" ] && return 1
-	if (( _optverbose >= ${2:-0} )); then
-		printf "%s\\n" "$1"
-	fi
-}
-warn() {
-	# Print a yellow line to the terminal, respecting _optverbose
-	[ -z "$1" ] && return 1
-	if (( _optverbose >= ${2:-0} )); then
-		if [ -t 1 ]; then
-			printf "\\e[33m%s\\e[0m\\n" "$1"
-		else
-			printf "WARN: %s\\n" "$1"
-		fi
-	fi
-}
-error() {
-	# Print a red line to the terminal, exit if $2 is specified
-	[ -z "$1" ] && return 1
-	if [ -t 2 ]; then
-		printf "\\e[31m%s\\e[0m\\n" "$1" 1>&2
-	else
-		printf "ERROR: %s\\n" "$1" 1>&2
-	fi
-	[ -z "$2" ] && return
-	exit "${2:-1}"
-}
-has() {
-	# Parse out all arguments and try to find them in path
-	# If an argument cannot be found, set _return and fail
-	for prog in "$@"; do
-		if ! command -v "$prog" > /dev/null 2>&1; then
-			_return="$prog"
-			return 1
-		fi
-	done
-	return 0
-}
-
-# Core program functions
-printhelp() {
-	cat << EOF
-Usage: $_name [OPTION]...
-
-  -h			Print this help text
-  -v			Print more status messages. Stacks
-
-Copyright (c) %YEAR% %MAIL%
-Licensed under the %LICENSE% license
-EOF
-}
-
-# Main
-main() {
-	# Parse out arguments
-	while [ -n "$1" ]; do
-		# Parse out flags
-		while getopts ":hv" opt; do
-			case $opt in
-				h)
-					_opthelp=1
-					;;
-				v)
-					_optverbose+=1
-					;;
-				:)
-					error "Option requires argument: -$OPTARG" 2
-					;;
-				*)
-					error "Invalid option: -$OPTARG" 2
-					;;
-			esac
-		done
-		# Store arguments
-		shift $((OPTIND - 1))
-		if [ -n "$1" ]; then
-			_args+=("$1")
-			shift
-		fi
-		unset OPTIND
-	done
-	# Early hook for help
-	[ -n "$_opthelp" ] && printhelp && exit 0
-	# Validate critical options
-	# TODO: That
-	# Validate core program dependencies
-	log "Validating dependencies" 2
-	if ! has basename; then
-		error "Failed to find program: $_return" 1
-	fi
-
-	# Do the do
-	# TODO: The do%HERE%
-	warn "Nothing to do"
-	exit 0
-}
-
-main "$@"
-

base/.vim/templates/=template=.py

@@ -1,9 +0,0 @@
-#! /usr/bin/env python3
-# -*- coding: utf-8 -*-
-# vim:fenc=utf-8
-#
-# Copyright © %YEAR% %USER% <%MAIL%>
-#
-# Distributed under terms of the %LICENSE% license.
-
-%HERE%

base/.vimrc

@@ -13,7 +13,6 @@ endif
 set autoread " Automatically read when a file is changed outside of Vim
 set clipboard=unnamedplus " Use XA_PRIMARY clipboard by default
 set encoding=utf-8
-set foldmethod=syntax
 set hidden " Allow buffer switching without saving
 set incsearch " Search while you type
 set laststatus=2 " Always show statusbar
@@ -21,16 +20,14 @@ set list
 set listchars=tab:>·,trail:·
 set modeline
 set modelines=5
-set nofoldenable " Fuck autofolding
-set number relativenumber " Relative line numbering
+set number
 set t_Co=256
 set viminfo='20,<1000,s1000 " Increase buffer size
+" Folding
+set foldmethod=syntax
+"nnoremap <space> za
+set nofoldenable " Fuck autofolding
 
-" Templates
-let g:email = 'jacob@babor.tech'
-let g:user = 'Jacob Babor'
-let g:license = 'MIT'
-let g:templates_directory = [ '~/.vim/templates' ]
 " Lightline
 set noshowmode
 let g:lightline = {

hyprland-work/.config/hypr/contrib/30-dsk-ryzen-1.ws.mgmt.desu.ltd.conf

@@ -1,8 +1,8 @@
 # vim: set ft=config:
 # See https://wiki.hyprland.org/Configuring/Monitors/
 #monitor=eDP-1,preferred,auto,1.3333
-monitor = DP-1,preferred,1440x937,1
-monitor = DP-2,preferred,0x0,1,transform,1
+monitor = DP-1,preferred,2560x0,1
+monitor = DP-2,preferred,0x0,1
 
 workspace = 1, monitor:DP-1
 workspace = 2, monitor:DP-1

hyprland/.config/hypr/config.d/00-basic.conf

@@ -1,4 +1,4 @@
-# vim: set ft=config:
+# vim: set ft=hyprlang:
 
 # Some default env vars.
 env = XCURSOR_SIZE,24
@@ -34,15 +34,16 @@ decoration {
 animations {
 	# https://wiki.hyprland.org/Configuring/Animations/
 	enabled = yes
-	bezier = snappy, 0.05, 0.9, 0.1, 1.05
-	animation = windows, 1, 2, snappy
+	bezier = snappy, 0.05, 0.9, 0.1, 1.05 # This is apparently kinda an ease-out-back sorta deal
+	bezier = ease-out-expo, 0.16, 1, 0.30, 1
+	animation = windows, 1, 2, ease-out-expo
 	animation = windowsIn, 1, 1, default
 	animation = windowsOut, 1, 2, default, popin 80%
 	animation = layers, 1, 1, default
 	animation = border, 1, 3, default
 	animation = borderangle, 1, 8, default
 	animation = fade, 1, 3, default
-	animation = workspaces, 1, 1.5, snappy
+	animation = workspaces, 1, 1.5, ease-out-expo
 }
 
 dwindle {
@@ -50,6 +51,7 @@ dwindle {
 	pseudotile = yes			# Enables pseudotile functionality
 	preserve_split = yes			# Remember splits
 	force_split = 2				# Force splits to put the child on the right/down
+	default_split_ratio = 1.1
 }
 
 master {
@@ -72,6 +74,7 @@ misc {
 	# fullscreen/maximized state.
 	# 0 - behind, 1 - takes over, 2 - unfullscreen/unmaxize [0/1/2]
 	new_window_takes_over_fullscreen = 2
+	vfr = 1
 }
 
 xwayland {

hyprland/.config/hypr/config.d/03-keybinds.conf

@@ -1,4 +1,4 @@
-# vim: set ft=config:
+# vim: set ft=hyprlang:
 # https://wiki.hyprland.org/Configuring/Binds/
 $mainMod = ALT
 
@@ -8,10 +8,11 @@ bind = $mainMod, Return, exec, foot
 bind = $mainMod, Q, killactive
 bind = $mainMod, Space, exec, pgrep wofi || wofi --show drun
 #bind = $mainMod, M, exit, 
-bind = $mainMod, T, pseudo, # dwindle
-bind = $mainMod, F, togglefloating, 
+bind = $mainMod, T, pseudo
+bind = $mainMod, F, togglefloating
 bind = $mainMod Shift, F, fullscreen
-bind = $mainMod, R, togglesplit, # dwindle
+bind = $mainMod, R, togglesplit
+bind = $mainMod, G, swapsplit
 
 # Dunst management
 bind = $mainMod Shift, Space, exec, dunstctl close
@@ -44,10 +45,10 @@ bind = $mainMod, k, movefocus, u
 bind = $mainMod, l, movefocus, r
 
 # Move the focused window around
-bind = $mainMod Shift, h, movewindow, l
-bind = $mainMod Shift, j, movewindow, d
-bind = $mainMod Shift, k, movewindow, u
-bind = $mainMod Shift, l, movewindow, r
+bind = $mainMod Shift, h, swapwindow, l
+bind = $mainMod Shift, j, swapwindow, d
+bind = $mainMod Shift, k, swapwindow, u
+bind = $mainMod Shift, l, swapwindow, r
 
 # Switch workspaces with mainMod + [0-9]
 bind = $mainMod, 1, workspace, 1
@@ -79,5 +80,23 @@ bind = $mainMod SHIFT, MINUS, movetoworkspace, 11
 bind = $mainMod, Period, workspace, e+1
 bind = $mainMod, Comma, workspace, e-1
 
-# Resize
+# Move windows around
+bindm = $mainMod, mouse:272, movewindow
+
+# Resize mouse binding and submap
 bindm = $mainMod, mouse:273, resizewindow
+bind = $mainMod SHIFT, R, submap, resize
+submap = resize
+$resizeFactor = 50
+bind = , l, resizeactive, $resizeFactor 0
+bind = , h, resizeactive, -$resizeFactor 0
+bind = , k, resizeactive, 0 -$resizeFactor
+bind = , j, resizeactive, 0 $resizeFactor
+bind = SHIFT, h, moveactive, -$resizeFactor 0
+bind = SHIFT, j, moveactive, 0 $resizeFactor
+bind = SHIFT, k, moveactive, 0 -$resizeFactor
+bind = SHIFT, l, moveactive, $resizeFactor 0
+bind = , Return, submap, reset
+bind = , Escape, submap, reset
+bind = $mainMod SHIFT, R, submap, reset
+submap = reset

hyprland/.config/hypr/config.d/04-inputs.conf

@@ -1,4 +1,4 @@
-# vim: set ft=config:
+# vim: set ft=hyprlang:
 # For all categories, see https://wiki.hyprland.org/Configuring/Variables/
 input {
 	kb_layout = us

hyprland/.config/hypr/config.d/50-window-rules.conf

@@ -1,4 +1,4 @@
-# vim: set ft=config:
+# vim: set ft=hyprlang:
 # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
 
 # Force all windows to be unable to maximize themselves
@@ -13,7 +13,8 @@ windowrulev2 = pin, class:^(.*pavucontrol.*)$
 windowrulev2 = workspace 2 silent, class:^(steam)$
 windowrulev2 = workspace 8 silent, class:^(org.keepassxc.KeePassXC)$
 windowrulev2 = workspace 8 silent, class:^(org.mozilla.Thunderbird)$
+windowrulev2 = workspace 9 silent, class:^(im.riot.Riot)$
 windowrulev2 = workspace 9 silent, class:^(.*vesktop.*)$
 windowrulev2 = workspace 10 silent, class:^(.*spotube.*)$
 windowrulev2 = workspace 10 silent, class:^(.*potify.*)$
-windowrulev2 = workspace 10 silent, class:^(im.riot.Riot)$
+windowrulev2 = workspace 10 silent, class:^(feishin)$

hyprland/.config/hypr/config.d/60-monitors.conf

@@ -1,4 +1,4 @@
-# vim: set ft=config:
+# vim: set ft=hyprlang:
 # See https://wiki.hyprland.org/Configuring/Monitors/
 # Fall-through rule that sets sane defaults when possible
 monitor=,preferred,auto,auto

hyprland/.config/hypr/config.d/80-autostart-daemons.conf

@@ -1,4 +1,4 @@
-# vim: set ft=config:
+# vim: set ft=hyprlang:
 # Run this at first to fix up some systemd stuff
 exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
 

hyprland/.config/hypr/config.d/81-autostart-hypridle.conf

@@ -1,3 +1,3 @@
-# vim: set ft=config:
+# vim: set ft=hyprlang:
 # Configuration for hypridle is in ~/.config/hypr/hypridle.conf
 exec-once = hypridle

hyprland/.config/hypr/config.d/82-autostart-swww.conf

@@ -1,2 +1,2 @@
-# vim: set ft=config:
-exec-once = pgrep -U $USER swww-daemon || { rm /run/user/$UID/swww.socket; swww-daemon --format xrgb; }
+# vim: set ft=hyprlang:
+exec-once = pgrep -U $USER swww-daemon || { rm /run/user/$UID/swww-wayland-1.sock; swww-daemon --format xrgb; }

hyprland/.config/hypr/config.d/85-autostart-applications.conf

@@ -1,8 +1,9 @@
-# vim: set ft=config:
+# vim: set ft=hyprlang:
 # Workspace-specific applications
 exec-once = [workspace 2 silent] flatpak run com.valvesoftware.Steam -silent
 exec-once = [workspace 8 silent] flatpak run org.keepassxc.KeePassXC
 exec-once = [workspace 8 silent] flatpak run org.mozilla.Thunderbird
+exec-once = [workspace 9 silent] flatpak run im.riot.Riot
 exec-once = [workspace 9 silent] flatpak run dev.vencord.Vesktop
-exec-once = [workspace 10 silent] flatpak run im.riot.Riot
-exec-once = [workspace 10 silent] flatpak run com.spotify.Client
+#exec-once = [workspace 10 silent] flatpak run com.spotify.Client
+exec-once = [workspace 10 silent] ~/Programs/feishin

hyprland/.config/hypr/config.d/90-post.conf

@@ -1,2 +1,2 @@
-# vim: set ft=config:
+# vim: set ft=hyprlang:
 exec-once = test -x "$HOME/.config/hypr/post.sh" && "$HOME/.config/hypr/post.sh"

hyprland/.config/hypr/contrib/000-debug.conf

@@ -1,4 +1,4 @@
-# vim: set ft=config:
+# vim: set ft=hyprlang:
 debug {
 	# This enables debug logging for troubleshooting
 	disable_logs = false

hyprland/.config/hypr/contrib/20-plugin-hyprexpo.conf

@@ -0,0 +1,17 @@
+# vim: set ft=hyprlang:
+# https://github.com/hyprwm/hyprland-plugins/tree/main/hyprexpo
+bind = $mainMod, grave, hyprexpo:expo, toggle
+
+plugin {
+	hyprexpo {
+		columns = 3
+		gap_size = 8
+		bg_col = rgb(282828)
+		workspace_method = first 1
+
+		enable_gesture = true
+		gesture_fingers = 3
+		gesture_distance = 300
+		gesture_positive = true # positive=swipe down, negative=swipe up
+	}
+}

hyprland/.config/hypr/contrib/30-dsk-ryzen-1.ws.mgmt.desu.ltd.conf

@@ -1,8 +1,8 @@
-# vim: set ft=config:
+# vim: set ft=hyprlang:
 # See https://wiki.hyprland.org/Configuring/Monitors/
 #monitor=eDP-1,preferred,auto,1.3333
-monitor = DP-1,preferred,1440x937,1
-monitor = DP-2,preferred,0x0,1,transform,1
+monitor = DP-1,preferred,2560x0,1
+monitor = DP-2,preferred,0x0,1
 
 workspace = 1, monitor:DP-1
 workspace = 2, monitor:DP-1

hyprland/.config/hypr/contrib/30-lap-fw-diy-1.ws.mgmt.desu.ltd.conf

@@ -1,3 +1,3 @@
-# vim: set ft=config:
+# vim: set ft=hyprlang:
 # See https://wiki.hyprland.org/Configuring/Monitors/
 monitor=eDP-1,preferred,auto,1.3333

hyprland/.config/hypr/contrib/30-lap-s76-lemp13-0.ws.mgmt.desu.ltd.conf

@@ -1,3 +1,3 @@
-# vim: set ft=config:
+# vim: set ft=hyprlang:
 # See https://wiki.hyprland.org/Configuring/Monitors/
 monitor=eDP-1,preferred,auto,1.00

hyprland/.config/hypr/hypridle.conf

@@ -1,4 +1,4 @@
-# vim: set ft=config:
+# vim: set ft=hyprlang:
 # for more configuration options, refer https://wiki.hyprland.org/Hypr-Ecosystem/hypridle
 general {
 	lock_cmd = pgrep -u "$USER" hyprlock || hyprlock

hyprland/.config/hypr/hyprland.conf

@@ -1,3 +1,3 @@
-# vim: set ft=config:
+# vim: set ft=hyprlang:
 # See https://wiki.hyprland.org/Configuring/Keywords/ for more
 source = ~/.config/hypr/config.d/*.conf

hyprland/.config/hypr/hyprlock.conf

@@ -1,4 +1,4 @@
-# vim: set ft=config:
+# vim: set ft=hyprlang:
 # for more configuration options, refer https://wiki.hyprland.org/Hypr-Ecosystem/hyprlock
 
 # General settings

hyprland/.config/waybar/config

@@ -6,7 +6,7 @@
 	"margin-top": 16,
 	"margin-left": 16,
 	"margin-right": 16,
-	"modules-left": ["hyprland/workspaces", "hyprland/window", "sway/mode"],
+	"modules-left": ["hyprland/workspaces", "hyprland/window", "hyprland/submap", "sway/mode"],
 	"modules-right": ["tray"],
 	"hyprland/workspaces": {
 		"all-outputs": false,
@@ -21,6 +21,9 @@
 		"separate-outputs": true,
 		"format": "{}"
 	},
+	"hyprland/submap": {
+		"on-click": "hyprctl dispatch submap reset"
+	},
 	"tray": {
 		"icon-size": 16,
 		"spacing": 10
@@ -35,7 +38,7 @@
 	"margin-bottom": 16,
 	"margin-left": 16,
 	"margin-right": 16,
-	"modules-left": ["gamemode", "custom/flatpak", "custom/backup", "battery", "temperature", "cpu", "memory", "network"],
+	"modules-left": ["gamemode", "custom/flatpak", "custom/backup", "custom/rpm-ostree-staged", "battery", "temperature", "cpu", "memory", "network"],
 	"modules-center": [],
 	"modules-right": ["mpris", "pulseaudio", "backlight", "idle_inhibitor", "clock"],
 	"clock": {
@@ -53,8 +56,9 @@
 			"warning": 30,
 			"critical": 15
 		},
+		"interval": 3,
 		"format": "{icon} {capacity}%",
-		"format-charging": "{icon} {capacity}%",
+		"format-charging": " {capacity}%",
 		"format-plugged": "{icon} {capacity}%",
 		"format-icons": ["", "", "", "", ""]
 	},
@@ -131,6 +135,13 @@
 	"custom/backup": {
 		"interval": 60,
 		"format": "",
+		"tooltip-format": "The last backup job failed -- investigate backup.service for more details",
 		"exec": "systemctl is-failed backup.service"
+	},
+	"custom/rpm-ostree-staged": {
+		"interval": 60,
+		"format": "",
+		"tooltip-format": "An rpm-ostree deployment is pending and will be applied upon the next reboot",
+		"exec": "rpm-ostree status --json | jq -e '.deployments[0].staged'"
 	}
 }]

hyprland/.config/waybar/style.css

@@ -89,6 +89,16 @@ window#waybar.fullscreen #window {
 	color: rgba(40, 40, 40, 0.8);
 	background: #d3869b;
 }
+/* Submap display */
+#submap {
+	color: rgba(235, 219, 178, 0.4);
+	padding: 0 1em;
+	border-radius: 8px;
+}
+#submap.resize {
+	color: rgba(40, 40, 40, 0.8);
+	background: #d3869b;
+}
 
 /* widgets */
 #pulseaudio {
@@ -208,3 +218,7 @@ window#waybar.fullscreen #window {
 	color: rgba(235, 219, 178, 0.2);
 	padding: 0 1em;
 }
+#custom-rpm-ostree-staged {
+	color: rgba(235, 219, 178, 0.2);
+	padding: 0 1em;
+}