updated laptop

5 files changed, 80 insertions, 95 deletions

diff --git a/laptop/.bashrc b/laptop/.bashrc
index f699ec5..76f037f 100644
--- a/laptop/.bashrc
+++ b/laptop/.bashrc
@@ -12,7 +12,7 @@ alias grepfind='sudo find / | grep'
 alias rfm='ranger --choosedir=$HOME/.rangerdir; LASTDIR=`cat $HOME/.rangerdir`; cd "$LASTDIR"'
 
 # yaptide
-alias yap='~/yap/start.sh'
+alias yap='~/projects/yap/start.sh'
 
 restart() {
 	wezterm &
diff --git a/laptop/.config/flameshot/flameshot.ini b/laptop/.config/flameshot/flameshot.ini
deleted file mode 100644
index 0c46b53..0000000
--- a/laptop/.config/flameshot/flameshot.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[General]
-contrastOpacity=188
-disabledTrayIcon=true
-saveAsFileExtension=png
-savePath=/home/mosder/screenshots
-showStartupLaunchMessage=false
-uiColor=#8f00ba
-useGrimAdapter=true
-disabledGrimWarning=true
diff --git a/laptop/.config/hypr/hyprland.conf b/laptop/.config/hypr/hyprland.conf
index 7c0e395..0687450 100644
--- a/laptop/.config/hypr/hyprland.conf
+++ b/laptop/.config/hypr/hyprland.conf
@@ -150,8 +150,6 @@ cursor {
 ecosystem:no_donation_nag = true
 
 dwindle {
-    pseudotile = true
-
 	force_split = 2
     preserve_split = true
 }
@@ -162,7 +160,7 @@ dwindle {
 
 # General
 bind = SUPER, Q, killactive,
-bind = SUPER, V, togglesplit,
+bind = SUPER, V, layoutmsg, togglesplit
 bind = SUPER, N, exec, dunstctl close-all
 bind = SUPER, slash, exec, $LOCKSCREEN
 bind = ALT, SPACE, exec, pkill $MENU || $MENU
@@ -181,9 +179,9 @@ bind = SUPER SHIFT, M, exec, $SCRIPTS_DIR/zoom.sh
 bind = SUPER SHIFT, S, exec, $SCREENSHOT -m region --clipboard-only # Select region
 
 # Passthru keybinds to VMs
-bind = SUPER,V,submap,passthru
+bind = SUPER,P,submap,passthru
 submap = passthru
-bind = SUPER,V,submap,reset
+bind = SUPER,P,submap,reset
 submap = reset
 
 # Move focus
diff --git a/laptop/.config/waybar/config.jsonc b/laptop/.config/waybar/config.jsonc
index 162f151..3ee74ab 100644
--- a/laptop/.config/waybar/config.jsonc
+++ b/laptop/.config/waybar/config.jsonc
@@ -61,7 +61,7 @@
     },
     "clock": {
         "format": "{:%Y-%m-%d  %H:%M (%Z)}",
-		"tooltip-format": "<b>{tz_list}</b><tt><small>{calendar}</small></tt>",
+		"tooltip-format": "<b>{tz_list}</b>\n<tt><small>{calendar}</small></tt>",
 		"timezones": [
 			"Europe/Warsaw",
 			"Etc/UTC",
diff --git a/laptop/.wezterm.lua b/laptop/.wezterm.lua
index b780496..8ee662f 100644
--- a/laptop/.wezterm.lua
+++ b/laptop/.wezterm.lua
@@ -1,4 +1,4 @@
-local wezterm = require "wezterm"

+local wezterm = require("wezterm")

 local cfg = wezterm.config_builder()

 

 -- Miscellaneous

@@ -22,7 +22,7 @@ cfg.color_scheme = "Pro"
 cfg.colors = {

 	cursor_bg = "#fff",

 	cursor_fg = "#000",

-	cursor_border = "#999"

+	cursor_border = "#999",

 }

 

 -- Tab bar

@@ -30,15 +30,11 @@ cfg.hide_tab_bar_if_only_one_tab = true
 cfg.show_close_tab_button_in_tabs = false

 cfg.show_new_tab_button_in_tab_bar = false

 cfg.show_tab_index_in_tab_bar = false

-wezterm.on(

-	'format-tab-title',

-	function(tab, tabs, panes, config, hover, max_width)

-		local title = tab.active_pane.title

-		local part_to_remove = "mosder@archtop:"

-		return string.gsub(title, part_to_remove, "")

-	end

-)

-

+wezterm.on("format-tab-title", function(tab, tabs, panes, config, hover, max_width)

+	local title = tab.active_pane.title

+	local part_to_remove = "mosder@archtop:"

+	return string.gsub(title, part_to_remove, "")

+end)

 

 -- Window

 cfg.window_background_opacity = 0.95

@@ -47,13 +43,13 @@ cfg.window_frame = {
 	-- to the area above the tabs themselves, so it's 1 for now

 	active_titlebar_bg = "rgba(40,44,52,1)",

 	inactive_titlebar_bg = "rgba(40,44,52,1)",

-	font_size = 11

+	font_size = 11,

 }

 cfg.window_padding = {

-  left = 5,

-  right = 5,

-  top = 2,

-  bottom = 2,

+	left = 5,

+	right = 5,

+	top = 2,

+	bottom = 2,

 }

 

 -- Key bindings

@@ -62,124 +58,124 @@ cfg.disable_default_key_bindings = true
 cfg.keys = {

 	-- Delete last word (Remap ALT+Backspace to CTRL+Backspace)

 	{

-		mods = 'CTRL',

-		key = 'Backspace',

-		action = act.SendKey { mods = 'ALT', key = 'Backspace' }

+		mods = "CTRL",

+		key = "Backspace",

+		action = act.SendKey({ mods = "ALT", key = "Backspace" }),

 	},

 	-- Copy mode

 	{

-		mods = 'CTRL|SHIFT',

-		key = 'X',

-		action = act.ActivateCopyMode

+		mods = "CTRL|SHIFT",

+		key = "X",

+		action = act.ActivateCopyMode,

 	},

 	-- Change tabs - relative

 	{

-		mods = 'CTRL',

-		key = 'Tab',

-		action = act.ActivateTabRelative(1)

+		mods = "CTRL",

+		key = "Tab",

+		action = act.ActivateTabRelative(1),

 	},

 	{

-		mods = 'CTRL|SHIFT',

-		key = 'Tab',

-		action = act.ActivateTabRelative(-1)

+		mods = "CTRL|SHIFT",

+		key = "Tab",

+		action = act.ActivateTabRelative(-1),

 	},

 	-- Unicode menu

 	{

-		mods = 'CTRL',

-		key = 'u',

-		action = act.CharSelect

+		mods = "CTRL",

+		key = "u",

+		action = act.CharSelect,

 	},

 	-- Close current tab

 	{

-		mods = 'CTRL',

-		key = 'w',

-		action = act.CloseCurrentTab { confirm = true }

+		mods = "CTRL",

+		key = "w",

+		action = act.CloseCurrentTab({ confirm = true }),

 	},

 	{

-		mods = 'CTRL',

-		key = 'q',

-		action = act.CloseCurrentTab { confirm = true }

+		mods = "CTRL",

+		key = "q",

+		action = act.CloseCurrentTab({ confirm = true }),

 	},

 	-- Copy selection to clipboard

 	{

-		mods = 'CTRL|SHIFT',

-		key = 'c',

-		action = act.CopyTo 'Clipboard'

+		mods = "CTRL|SHIFT",

+		key = "c",

+		action = act.CopyTo("Clipboard"),

 	},

 	-- Decrease font size

 	{

-		mods = 'CTRL',

-		key = '-',

-		action = act.DecreaseFontSize

+		mods = "CTRL",

+		key = "-",

+		action = act.DecreaseFontSize,

 	},

 	-- Increase font size

 	{

-		mods = 'CTRL',

-		key = '=',

-		action = act.IncreaseFontSize

+		mods = "CTRL",

+		key = "=",

+		action = act.IncreaseFontSize,

 	},

 	-- Move tabs - relative

 	{

-		mods = 'CTRL|SHIFT',

-		key = 'LeftArrow',

-		action = act.MoveTabRelative(-1)

+		mods = "CTRL|SHIFT",

+		key = "LeftArrow",

+		action = act.MoveTabRelative(-1),

 	},

 	{

-		mods = 'CTRL|SHIFT',

-		key = 'RightArrow',

-		action = act.MoveTabRelative(1)

+		mods = "CTRL|SHIFT",

+		key = "RightArrow",

+		action = act.MoveTabRelative(1),

 	},

 	-- Pase from clipboard

 	{

-		mods = 'CTRL|SHIFT',

-		key = 'v',

-		action = act.PasteFrom 'Clipboard'

+		mods = "CTRL|SHIFT",

+		key = "v",

+		action = act.PasteFrom("Clipboard"),

 	},

 	{

-		mods = 'SHIFT',

-		key = 'Insert',

-		action = act.PasteFrom 'Clipboard'

+		mods = "SHIFT",

+		key = "Insert",

+		action = act.PasteFrom("Clipboard"),

 	},

 	-- Reset font size

 	{

-		mods = 'CTRL',

-		key = 'p',

-		action = act.ResetFontSize

+		mods = "CTRL",

+		key = "p",

+		action = act.ResetFontSize,

 	},

 	-- Search

 	{

-		mods = 'CTRL',

-		key = 'f',

-		action = act.Search('CurrentSelectionOrEmptyString')

+		mods = "CTRL",

+		key = "f",

+		action = act.Search("CurrentSelectionOrEmptyString"),

 	},

 	-- Debug

 	{

-		mods = 'CTRL',

-		key = 'd',

-		action = act.ShowDebugOverlay

+		mods = "CTRL",

+		key = "d",

+		action = act.ShowDebugOverlay,

 	},

 	-- New tab

 	{

-		mods = 'CTRL',

-		key = 't',

-		action = act.SpawnTab 'CurrentPaneDomain'

-	}

+		mods = "CTRL",

+		key = "t",

+		action = act.SpawnTab("CurrentPaneDomain"),

+	},

 }

 -- Change tabs

 for i = 0, 9 do

 	table.insert(cfg.keys, {

-		mods = 'CTRL',

+		mods = "CTRL",

 		key = tostring(i),

-		action = act.ActivateTab(i - 1)

+		action = act.ActivateTab(i - 1),

 	})

 end

 -- Move tabs (no support for -1, so a script instead)

-local special_characters = {'!', '@', '#', '$', '%', '^', '&', '*', '('}

+local special_characters = { "!", "@", "#", "$", "%", "^", "&", "*", "(" }

 for i = 1, 9 do

 	table.insert(cfg.keys, {

-		mods = 'CTRL|SHIFT',

+		mods = "CTRL|SHIFT",

 		key = special_characters[i],

-		action = act.MoveTab(i - 1)

+		action = act.MoveTab(i - 1),

 	})

 end

 wezterm.on("move-tab-to-last-spot", function(window, pane)

@@ -187,9 +183,9 @@ wezterm.on("move-tab-to-last-spot", function(window, pane)
 	window:perform_action(act.MoveTab(#tabs - 1), pane)

 end)

 table.insert(cfg.keys, {

-	mods = 'CTRL|SHIFT',

-	key = ')',

-	action = act.EmitEvent 'move-tab-to-last-spot'

+	mods = "CTRL|SHIFT",

+	key = ")",

+	action = act.EmitEvent("move-tab-to-last-spot"),

 })

 

 return cfg