merge
This commit is contained in:
		
						commit
						e0c325b5d8
					
				
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							| @ -1,9 +1,6 @@ | |||||||
| font-family = "" | font-family = "" | ||||||
| # font-family = "FairfaxHax" |  | ||||||
| # font-family = "BigBlueTermPlus Nerd Font" |  | ||||||
| # font-family = "Olympe Mono Hacked" |  | ||||||
| font-family = "CaskaydiaCove Nerd Font" | font-family = "CaskaydiaCove Nerd Font" | ||||||
| font-size = 14 |  | ||||||
| # theme = light:rose-pine-dawn,dark:rose-pine | # theme = light:rose-pine-dawn,dark:rose-pine | ||||||
|  | font-size = 14 | ||||||
| theme = light:xcodelight,dark:xcodedark | theme = light:xcodelight,dark:xcodedark | ||||||
| window-decoration = false | window-decoration = false | ||||||
|  | |||||||
| @ -294,13 +294,13 @@ return require('packer').startup(function(use) | |||||||
|                 for i, server in pairs(vim.lsp.get_active_clients({ bufnr = 0 })) do |                 for i, server in pairs(vim.lsp.get_active_clients({ bufnr = 0 })) do | ||||||
|                     table.insert(names, server.name) |                     table.insert(names, server.name) | ||||||
|                 end |                 end | ||||||
|                 -- return " [" .. table.concat(names, " ") .. "]" |                 -- return "[" .. table.concat(names, " ") .. "]" | ||||||
|                 return "[" .. table.concat(names, " ") .. "]" |                 return " [" .. table.concat(names, " ") .. "]" | ||||||
|             end |             end | ||||||
|             require('lualine').setup { |             require('lualine').setup { | ||||||
|                 options = { |                 options = { | ||||||
|                     globalstatus = true, |                     globalstatus = true, | ||||||
|                     icons_enabled = false, |                     icons_enabled = true, | ||||||
|                     section_separators = { left = '', right = '' }, |                     section_separators = { left = '', right = '' }, | ||||||
|                     component_separators = { left = '', right = '' } |                     component_separators = { left = '', right = '' } | ||||||
|                 }, |                 }, | ||||||
|  | |||||||
							
								
								
									
										22
									
								
								config/.config/river/bar.sh
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										22
									
								
								config/.config/river/bar.sh
									
									
									
									
									
										Executable file
									
								
							| @ -0,0 +1,22 @@ | |||||||
|  | #!/usr/bin/env bash | ||||||
|  | DATE=$(date +'%Y-%m-%d %I:%M:%S %p') | ||||||
|  | # BAT=$(cat /sys/class/power_supply/BAT1/capacity) | ||||||
|  | VOL=$(pactl get-sink-volume @DEFAULT_SINK@ | tr "," "\n" | grep \% | sed s/Volume\:// | sed 's/\%.*$//' | sed 's/^.*\///' | head -n1 | sed s/\ *//) | ||||||
|  | VOL="${VOL}%" | ||||||
|  | MUTED=$(pactl get-sink-mute @DEFAULT_SINK@ | cut -d\  -f2) | ||||||
|  | # BRIGHT=$(brightnessctl | tr "\n" " " | cut -d\  -f9 | tr -d "()%") | ||||||
|  | MEM=$(free -h | sed 's/[  ]\+/:/g' | cut -d\: -f4 | tr "\n" ":" | cut -d\: -f2) | ||||||
|  | USER=$(id -u -n) | ||||||
|  | HOST=$(cat /proc/sys/kernel/hostname) | ||||||
|  | # LAYOUT=$(swaymsg -t get_inputs | jq -r '.[] | select( .type == "keyboard") .xkb_active_layout_name' | tr "\n" ":" | cut -d\: -f1 | cut -d\  -f2| tr -d "()") | ||||||
|  | NETWORK_NAME=$(iwctl station wlan0 show | grep network | sed s/"Connected network"// | tr -d " ") | ||||||
|  | IP=$(iwctl station wlan0 show | grep IPv4 | sed s/"IPv4 address"// | tr -d " ") | ||||||
|  | 
 | ||||||
|  | if [ $MUTED == 'yes' ] | ||||||
|  | then | ||||||
|  |     VOL='muted' | ||||||
|  | fi | ||||||
|  | 
 | ||||||
|  | # echo ${MEM} \| ${USER}\@${HOST} \| KB\: ${LAYOUT} \| ${NETWORK_NAME}\@${IP} \| Vol: ${VOL}  \| ${BRIGHT}% Backlight \| ${BAT}\% Bat \| ${DATE} | ||||||
|  | # echo ${MEM} \| ${USER}\@${HOST} \| KB\: ${LAYOUT} \| ${NETWORK_NAME}\@${IP} \| Vol: ${VOL}  \| ${DATE} | ||||||
|  | echo ${MEM} \| ${USER}\@${HOST} \| ${NETWORK_NAME}\@${IP} \| Vol: ${VOL}  \| ${DATE} | ||||||
							
								
								
									
										166
									
								
								config/.config/river/init
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										166
									
								
								config/.config/river/init
									
									
									
									
									
										Executable file
									
								
							| @ -0,0 +1,166 @@ | |||||||
|  | #!/bin/sh | ||||||
|  | 
 | ||||||
|  | # This is the example configuration file for river. | ||||||
|  | # | ||||||
|  | # If you wish to edit this, you will probably want to copy it to | ||||||
|  | # $XDG_CONFIG_HOME/river/init or $HOME/.config/river/init first. | ||||||
|  | # | ||||||
|  | # See the river(1), riverctl(1), and rivertile(1) man pages for complete | ||||||
|  | # documentation. | ||||||
|  | 
 | ||||||
|  | # Note: the "Super" modifier is also known as Logo, GUI, Windows, Mod4, etc. | ||||||
|  | 
 | ||||||
|  | # Super+Shift+Return to start an instance of foot (https://codeberg.org/dnkl/foot) | ||||||
|  | riverctl map normal Super Return spawn ghostty | ||||||
|  | 
 | ||||||
|  | riverctl map normal Super P spawn bemenu-run | ||||||
|  | # Super+Q to close the focused view | ||||||
|  | riverctl map normal Super X close | ||||||
|  | 
 | ||||||
|  | # Super+Shift+E to exit river | ||||||
|  | riverctl map normal Super+Shift Q exit | ||||||
|  | 
 | ||||||
|  | # Super+J and Super+K to focus the next/previous view in the layout stack | ||||||
|  | riverctl map normal Super J focus-view next | ||||||
|  | riverctl map normal Super K focus-view previous | ||||||
|  | 
 | ||||||
|  | # Super+Shift+J and Super+Shift+K to swap the focused view with the next/previous | ||||||
|  | # view in the layout stack | ||||||
|  | riverctl map normal Super+Shift J swap next | ||||||
|  | riverctl map normal Super+Shift K swap previous | ||||||
|  | 
 | ||||||
|  | # Super+Period and Super+Comma to focus the next/previous output | ||||||
|  | riverctl map normal Super Period focus-output next | ||||||
|  | riverctl map normal Super Comma focus-output previous | ||||||
|  | 
 | ||||||
|  | # Super+Shift+{Period,Comma} to send the focused view to the next/previous output | ||||||
|  | riverctl map normal Super+Shift Period send-to-output next | ||||||
|  | riverctl map normal Super+Shift Comma send-to-output previous | ||||||
|  | 
 | ||||||
|  | # Super+Return to bump the focused view to the top of the layout stack | ||||||
|  | riverctl map normal Super+Shift Return zoom | ||||||
|  | 
 | ||||||
|  | # Super+H and Super+L to decrease/increase the main ratio of rivertile(1) | ||||||
|  | riverctl map normal Super H send-layout-cmd rivertile "main-ratio -0.05" | ||||||
|  | riverctl map normal Super L send-layout-cmd rivertile "main-ratio +0.05" | ||||||
|  | 
 | ||||||
|  | # Super+Shift+H and Super+Shift+L to increment/decrement the main count of rivertile(1) | ||||||
|  | riverctl map normal Super+Shift H send-layout-cmd rivertile "main-count +1" | ||||||
|  | riverctl map normal Super+Shift L send-layout-cmd rivertile "main-count -1" | ||||||
|  | 
 | ||||||
|  | # Super+Alt+{H,J,K,L} to move views | ||||||
|  | riverctl map normal Super+Alt H move left 100 | ||||||
|  | riverctl map normal Super+Alt J move down 100 | ||||||
|  | riverctl map normal Super+Alt K move up 100 | ||||||
|  | riverctl map normal Super+Alt L move right 100 | ||||||
|  | 
 | ||||||
|  | # Super+Alt+Control+{H,J,K,L} to snap views to screen edges | ||||||
|  | riverctl map normal Super+Alt+Control H snap left | ||||||
|  | riverctl map normal Super+Alt+Control J snap down | ||||||
|  | riverctl map normal Super+Alt+Control K snap up | ||||||
|  | riverctl map normal Super+Alt+Control L snap right | ||||||
|  | 
 | ||||||
|  | # Super+Alt+Shift+{H,J,K,L} to resize views | ||||||
|  | riverctl map normal Super+Alt+Shift H resize horizontal -100 | ||||||
|  | riverctl map normal Super+Alt+Shift J resize vertical 100 | ||||||
|  | riverctl map normal Super+Alt+Shift K resize vertical -100 | ||||||
|  | riverctl map normal Super+Alt+Shift L resize horizontal 100 | ||||||
|  | 
 | ||||||
|  | # Super + Left Mouse Button to move views | ||||||
|  | riverctl map-pointer normal Super BTN_LEFT move-view | ||||||
|  | 
 | ||||||
|  | # Super + Right Mouse Button to resize views | ||||||
|  | riverctl map-pointer normal Super BTN_RIGHT resize-view | ||||||
|  | 
 | ||||||
|  | # Super + Middle Mouse Button to toggle float | ||||||
|  | riverctl map-pointer normal Super BTN_MIDDLE toggle-float | ||||||
|  | 
 | ||||||
|  | for i in $(seq 1 9) | ||||||
|  | do | ||||||
|  |     tags=$((1 << ($i - 1))) | ||||||
|  | 
 | ||||||
|  |     # Super+[1-9] to focus tag [0-8] | ||||||
|  |     riverctl map normal Super $i set-focused-tags $tags | ||||||
|  | 
 | ||||||
|  |     # Super+Shift+[1-9] to tag focused view with tag [0-8] | ||||||
|  |     riverctl map normal Super+Shift $i set-view-tags $tags | ||||||
|  | 
 | ||||||
|  |     # Super+Control+[1-9] to toggle focus of tag [0-8] | ||||||
|  |     riverctl map normal Super+Control $i toggle-focused-tags $tags | ||||||
|  | 
 | ||||||
|  |     # Super+Shift+Control+[1-9] to toggle tag [0-8] of focused view | ||||||
|  |     riverctl map normal Super+Shift+Control $i toggle-view-tags $tags | ||||||
|  | done | ||||||
|  | 
 | ||||||
|  | # Super+0 to focus all tags | ||||||
|  | # Super+Shift+0 to tag focused view with all tags | ||||||
|  | all_tags=$(((1 << 32) - 1)) | ||||||
|  | riverctl map normal Super 0 set-focused-tags $all_tags | ||||||
|  | riverctl map normal Super+Shift 0 set-view-tags $all_tags | ||||||
|  | 
 | ||||||
|  | # Super+Space to toggle float | ||||||
|  | riverctl map normal Super Space toggle-float | ||||||
|  | 
 | ||||||
|  | # Super+F to toggle fullscreen | ||||||
|  | riverctl map normal Super F toggle-fullscreen | ||||||
|  | 
 | ||||||
|  | # Super+{Up,Right,Down,Left} to change layout orientation | ||||||
|  | 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" | ||||||
|  | riverctl map normal Super Left  send-layout-cmd rivertile "main-location left" | ||||||
|  | 
 | ||||||
|  | # Declare a passthrough mode. This mode has only a single mapping to return to | ||||||
|  | # normal mode. This makes it useful for testing a nested wayland compositor | ||||||
|  | riverctl declare-mode passthrough | ||||||
|  | 
 | ||||||
|  | # Super+F11 to enter passthrough mode | ||||||
|  | riverctl map normal Super F11 enter-mode passthrough | ||||||
|  | 
 | ||||||
|  | # Super+F11 to return to normal mode | ||||||
|  | riverctl map passthrough Super F11 enter-mode normal | ||||||
|  | 
 | ||||||
|  | # Various media key mapping examples for both normal and locked mode which do | ||||||
|  | # not have a modifier | ||||||
|  | for mode in normal locked | ||||||
|  | do | ||||||
|  |     # Eject the optical drive (well if you still have one that is) | ||||||
|  |     riverctl map $mode None XF86Eject spawn 'eject -T' | ||||||
|  | 
 | ||||||
|  |     # Control pulse audio volume with pamixer (https://github.com/cdemoulins/pamixer) | ||||||
|  |     riverctl map $mode None XF86AudioRaiseVolume  spawn 'pamixer -i 5' | ||||||
|  |     riverctl map $mode None XF86AudioLowerVolume  spawn 'pamixer -d 5' | ||||||
|  |     riverctl map $mode None XF86AudioMute         spawn 'pamixer --toggle-mute' | ||||||
|  | 
 | ||||||
|  |     # Control MPRIS aware media players with playerctl (https://github.com/altdesktop/playerctl) | ||||||
|  |     riverctl map $mode None XF86AudioMedia spawn 'playerctl play-pause' | ||||||
|  |     riverctl map $mode None XF86AudioPlay  spawn 'playerctl play-pause' | ||||||
|  |     riverctl map $mode None XF86AudioPrev  spawn 'playerctl previous' | ||||||
|  |     riverctl map $mode None XF86AudioNext  spawn 'playerctl next' | ||||||
|  | 
 | ||||||
|  |     # Control screen backlight brightness with brightnessctl (https://github.com/Hummer12007/brightnessctl) | ||||||
|  |     riverctl map $mode None XF86MonBrightnessUp   spawn 'brightnessctl set +5%' | ||||||
|  |     riverctl map $mode None XF86MonBrightnessDown spawn 'brightnessctl set 5%-' | ||||||
|  | done | ||||||
|  | 
 | ||||||
|  | # Set background and border color | ||||||
|  | riverctl background-color 0x002b36 | ||||||
|  | riverctl border-color-focused 0x93a1a1 | ||||||
|  | riverctl border-color-unfocused 0x586e75 | ||||||
|  | 
 | ||||||
|  | # Set keyboard repeat rate | ||||||
|  | riverctl set-repeat 50 300 | ||||||
|  | 
 | ||||||
|  | # Make all views with an app-id that starts with "float" and title "foo" start floating. | ||||||
|  | riverctl rule-add -app-id 'float*' -title 'foo' float | ||||||
|  | 
 | ||||||
|  | # Make all views with app-id "bar" and any title use client-side decorations | ||||||
|  | riverctl rule-add -app-id "bar" csd | ||||||
|  | 
 | ||||||
|  | # Set the default layout generator to be rivertile and start it. | ||||||
|  | # River will send the process group of the init executable SIGTERM on exit. | ||||||
|  | riverctl default-layout rivertile | ||||||
|  | rivertile -view-padding 6 -outer-padding 6 & | ||||||
|  | 
 | ||||||
|  | swaybg -m fill -i $HOME/Pictures/wallpapers/wallpaper & | ||||||
|  | pgrep creek || ( while $HOME/.config/river/bar.sh; do sleep 1; done ) | creek -fn 'BigBlueTermPlus Nerd Font:size=12' -nf 0xb8b8b8 -nb 0x282828 -ff 0x181818 -fb 0x7cafc2 | ||||||
| @ -31,7 +31,7 @@ super + p | |||||||
|     dmenu_run |     dmenu_run | ||||||
| # Terminal | # Terminal | ||||||
| super + Return | super + Return | ||||||
|     st |     ghostty | ||||||
| # Screenshot | # Screenshot | ||||||
| super + shift + s | super + shift + s | ||||||
|     scrot -s -e 'xclip -selection clipboard -t image/png -i $f' ~/Pictures/screenshots/%Y-%m-%d-%T-screenshot.png |     scrot -s -e 'xclip -selection clipboard -t image/png -i $f' ~/Pictures/screenshots/%Y-%m-%d-%T-screenshot.png | ||||||
|  | |||||||
| @ -3,14 +3,16 @@ if [ "$XDG_SESSION_DESKTOP" = "sway" ] ; then | |||||||
|     export _JAVA_AWT_WM_NONREPARENTING=1 |     export _JAVA_AWT_WM_NONREPARENTING=1 | ||||||
|     export STUDIO_JDK=/usr/lib/jvm/java-11-openjdk/ |     export STUDIO_JDK=/usr/lib/jvm/java-11-openjdk/ | ||||||
| fi | fi | ||||||
|  | 
 | ||||||
| export PATH="${PATH}:$HOME/.scripts:$HOME/.emacs.d/bin:$HOME/.local/share/gem/ruby/3.0.0/bin" | export PATH="${PATH}:$HOME/.scripts:$HOME/.emacs.d/bin:$HOME/.local/share/gem/ruby/3.0.0/bin" | ||||||
| source ~/.bashrc | source ~/.bashrc | ||||||
| export QSYS_ROOTDIR="/home/mikec/intelFPGA_lite/18.1/quartus/sopc_builder/bin" | export QSYS_ROOTDIR="/home/mikec/intelFPGA_lite/18.1/quartus/sopc_builder/bin" | ||||||
| export CLASSPATH="/usr/share/java/junit.jar:/usr/share/java/hamcrest/core.jar" | export CLASSPATH="/usr/share/java/junit.jar:/usr/share/java/hamcrest/core.jar" | ||||||
| 
 | 
 | ||||||
|  | export BEMENU_OPTS='--fn "Cascadia Code 12"' | ||||||
|  | 
 | ||||||
| # Added by Toolbox App | # Added by Toolbox App | ||||||
| export PATH="$PATH:/home/mikec/.local/share/JetBrains/Toolbox/scripts" | export PATH="$PATH:/home/mikec/.local/share/JetBrains/Toolbox/scripts" | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| 
 | [ -f "/home/mikec/.ghcup/env" ] && . "/home/mikec/.ghcup/env" # ghcup-env | ||||||
| [ -f "/home/mikec/.ghcup/env" ] && . "/home/mikec/.ghcup/env" # ghcup-env |  | ||||||
|  | |||||||
							
								
								
									
										19
									
								
								config/.scripts/switch.sh
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										19
									
								
								config/.scripts/switch.sh
									
									
									
									
									
										Executable file
									
								
							| @ -0,0 +1,19 @@ | |||||||
|  | #!/bin/sh | ||||||
|  | 
 | ||||||
|  | current=$(gsettings get org.gnome.desktop.interface color-scheme) | ||||||
|  | 
 | ||||||
|  | if [ "${current}" != "'prefer-dark'" ]; then #default | ||||||
|  | 
 | ||||||
|  |     echo "Switching to dark." | ||||||
|  |     gsettings set org.gnome.desktop.interface color-scheme prefer-dark | ||||||
|  |     gsettings set org.gnome.desktop.interface gtk-theme Adwaita-dark | ||||||
|  |     gsettings set org.gnome.desktop.interface icon-theme breeze-dark | ||||||
|  | 
 | ||||||
|  | else # already dark | ||||||
|  | 
 | ||||||
|  |     echo "Switching to light." | ||||||
|  |     gsettings set org.gnome.desktop.interface color-scheme default | ||||||
|  |     gsettings set org.gnome.desktop.interface gtk-theme Adwaita | ||||||
|  |     gsettings set org.gnome.desktop.interface icon-theme breeze | ||||||
|  | 
 | ||||||
|  | fi | ||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Michael Chalupiak
						Michael Chalupiak