From 3fa414d794e1acf110eb1ac30f4b4cd5824a9d72 Mon Sep 17 00:00:00 2001 From: JyyHuang Date: Wed, 21 Aug 2024 11:17:51 -0400 Subject: [PATCH] update files --- firefox/userChrome.css | 202 ---------------------------- firefox/userContent.css | 54 -------- komorebi/komorebi.ahk | 8 +- komorebi/komorebi.json | 3 +- nvim/lua/plugin_config/gitsigns.lua | 3 - wezterm/keys.lua | 90 +++++-------- wezterm/wallpaper.lua | 43 ------ wezterm/wezterm.lua | 1 - 8 files changed, 39 insertions(+), 365 deletions(-) delete mode 100644 firefox/userChrome.css delete mode 100644 firefox/userContent.css delete mode 100644 wezterm/wallpaper.lua diff --git a/firefox/userChrome.css b/firefox/userChrome.css deleted file mode 100644 index 0212530..0000000 --- a/firefox/userChrome.css +++ /dev/null @@ -1,202 +0,0 @@ -@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); -/* Background image new tab page */ -* { - font-family: "Ubuntu Nerd Font"; - --animation-speed: 0.2s; - --button-corner-rounding: 30px; - --urlbar-container-height: 40px !important; - --urlbar-min-height: 30px !important; - --urlbar-height: 30px !important; - --urlbar-toolbar-height: 38px !important; - --moz-hidden-unscrollable: scroll !important; - --toolbarbutton-border-radius: 8px !important; - --tabs-border-color: transparent; -} - -:root { - --window: -moz-Dialog !important; - --secondary: color-mix(in srgb, currentColor 5%, -moz-Dialog) !important; - --uc-border-radius: 0px; - --uc-status-panel-spacing: 0px; - --uc-page-action-margin: 7px; -} - -/* animation and effect */ -#nav-bar:not([customizing]) { - visibility: visible; - margin-top: -40px; - transition-delay: 0.1s; - filter: alpha(opacity=0); - opacity: 0; - transition: - visibility, - ease 0.1s, - margin-top, - ease 0.1s, - opacity, - ease 0.1s, - rotate, - ease 0.1s !important; -} - -#nav-bar:hover, -#nav-bar:focus-within, -#urlbar[focused="true"], -#identity-box[open="true"], -#titlebar:hover + #nav-bar:not([customizing]), -#toolbar-menubar:not([inactive="true"]) ~ #nav-bar:not([customizing]) { - visibility: visible; - margin-top: 0px; - filter: alpha(opacity=100); - opacity: 100; -} - -#PersonalToolbar { - margin-top: 0px !important; -} - -#nav-bar .toolbarbutton-1[open="true"] { - visibility: visible; - opacity: 100; -} -#PersonalToolbar .toolbarbutton-1[open="true"] { - visibility: visible; - opacity: 100; -} - -:root:not([customizing]) :hover > .tabbrowser-tab:not(:hover) { - transition: - blur, - ease 0.1s !important; -} - -:root:not([customizing]) :not(:hover) > .tabbrowser-tab { - transition: - blur, - ease 0.1s !important; -} - -#tabbrowser-tabs .tab-label-container[customizing] { - color: transparent; - transition: ease 0.1s; - transition-delay: 0.2s; -} - -/* Removes annoying buttons and spaces */ -.titlebar-spacer[type="pre-tabs"], -.titlebar-spacer[type="post-tabs"] { - display: none !important; -} -#tabbrowser-tabs { - border-inline-start-width: 0 !important; -} - -/* Makes some buttons nicer */ -#PanelUI-menu-button, -#unified-extensions-button, -#reload-button, -#stop-button { - padding: 2px !important; -} -#reload-button, -#stop-button { - margin: 1px !important; -} - -/* X-button */ -:root { - --show-tab-close-button: none; - --show-tab-close-button-hover: -moz-inline-block; -} -.tabbrowser-tab:not([pinned]) .tab-close-button { - display: var(--show-tab-close-button) !important; -} -.tabbrowser-tab:not([pinned]):hover .tab-close-button { - display: var(--show-tab-close-button-hover) !important; -} - -/* tabbar */ - -/* Hide the secondary Tab Label - * e.g. playing indicator (the text, not the icon) */ -.tab-secondary-label { - display: none !important; -} - -:root { - --toolbarbutton-border-radius: 0 !important; - --tab-border-radius: 0 !important; - --tab-block-margin: 0 !important; -} - -.tabbrowser-tab:is([visuallyselected="true"], [multiselected]) - > .tab-stack - > .tab-background { - box-shadow: none !important; -} - -.tab-background { - border-right: 0px solid rgba(0, 0, 0, 0) !important; - margin-left: -1px !important; -} - -.tabbrowser-tab[last-visible-tab="true"] { - padding-inline-end: 0 !important; -} - -#tabs-newtab-button { - padding-left: 0 !important; -} - -/* multi tab selection */ -#tabbrowser-tabs:not([noshadowfortests]) - .tabbrowser-tab:is([multiselected]) - > .tab-stack - > .tab-background:-moz-lwtheme { - outline-color: var(--toolbarseparator-color) !important; -} - -/* remove gap after pinned tabs */ -#tabbrowser-tabs[haspinnedtabs]:not([positionpinnedtabs]) - > #tabbrowser-arrowscrollbox - > .tabbrowser-tab:nth-child(1 of :not([pinned], [hidden])) { - margin-inline-start: 0 !important; -} - -/* Removes annoying border */ -#navigator-toolbox { - border: none !important; -} - -/* Removes the annoying rainbow thing from the hamburger */ -#appMenu-fxa-separator { - border-image: none !important; -} - -#PlacesToolbarItems { - justify-content: center !important; -} - -#alltabs-button { - display: none !important; -} - -#star-button[starred] { - fill: #c0caf5 !important; -} - -.tab-background[selected] { - background: #1a1b26 !important; -} - -.bookmark-item { - color: white; - font-size: 13px !important; - margin-left: 5px !important; - margin-right: 5px !important; - padding: 4px !important; -} -.bookmark-item:hover { - color: white !important; - background-color: rgba(192, 202, 245, 0.3) !important; /* pale gray */ -} diff --git a/firefox/userContent.css b/firefox/userContent.css deleted file mode 100644 index ca17015..0000000 --- a/firefox/userContent.css +++ /dev/null @@ -1,54 +0,0 @@ -@-moz-document url(about:home), url(about:newtab), url(about:privatebrowsing){ - -/* Newtab */ -.search-inner-wrapper { - display: none !important; -} - -.icon.icon-settings { - display: none !important; -} - -.outer-wrapper .search-wrapper { - padding: 0px !important; -} - -.logo-and-wordmark { - display: none !important; -} -body{ - background-color: #15161e!important; -} - -} - -@-moz-document url-prefix(about:) { - - /* Removes the scrollbar on some places */ - body, - html { - overflow-y: auto; - } - - /* Devtools */ - @-moz-document url-prefix(about:devtools) { - #toolbox-container { - margin-top: 10px !important; - } - - .devtools-tabbar { - background: transparent !important; - } - - .devtools-tab-line { - border-radius: 0 0 5px 5px; - } - - .customize-animate-enter-done, - .customize-menu, - .top-site-outer:hover, - button { - background-color: transparent !important; - } - } -} diff --git a/komorebi/komorebi.ahk b/komorebi/komorebi.ahk index 6721b77..7d804ab 100644 --- a/komorebi/komorebi.ahk +++ b/komorebi/komorebi.ahk @@ -21,10 +21,10 @@ CapsLock & Right::Move("right") CapsLock & Enter::Promote() ; Resize -CapsLock & u::ResizeAxis("horizontal", "increase") -CapsLock & p::ResizeAxis("horizontal", "decrease") -CapsLock & o::ResizeAxis("vertical", "increase") -CapsLock & i::ResizeAxis("vertical", "decrease") +CapsLock & p::ResizeAxis("horizontal", "increase") +CapsLock & u::ResizeAxis("horizontal", "decrease") +CapsLock & i::ResizeAxis("vertical", "increase") +CapsLock & o::ResizeAxis("vertical", "decrease") ; Manipulate windows CapsLock & f::ToggleFloat() diff --git a/komorebi/komorebi.json b/komorebi/komorebi.json index f7682bb..d9599c5 100644 --- a/komorebi/komorebi.json +++ b/komorebi/komorebi.json @@ -6,7 +6,8 @@ "cross_monitor_move_behaviour": "Insert", "default_workspace_padding": 2, "default_container_padding": 2, - "border_width": 2, + "focus_follows_mouse": "Windows", + "border_width": 1, "border_offset": -1, "active_window_border": true, "active_window_border_colours": { diff --git a/nvim/lua/plugin_config/gitsigns.lua b/nvim/lua/plugin_config/gitsigns.lua index 2be2c88..3388758 100644 --- a/nvim/lua/plugin_config/gitsigns.lua +++ b/nvim/lua/plugin_config/gitsigns.lua @@ -28,9 +28,6 @@ return { virt_text_priority = 100, }, current_line_blame_formatter = ", - ", - current_line_blame_formatter_opts = { - relative_time = false, - }, sign_priority = 6, update_debounce = 100, status_formatter = nil, -- Use default diff --git a/wezterm/keys.lua b/wezterm/keys.lua index 9a260e9..ac31e8e 100644 --- a/wezterm/keys.lua +++ b/wezterm/keys.lua @@ -9,61 +9,47 @@ function module.apply_to_config(config) config.leader = { key = "LeftAlt", mods = "ALT", timeout_milliseconds = 1000 } config.keys = { - { key = "|", mods = "LEADER|SHIFT", action = act.SplitHorizontal({ domain = "CurrentPaneDomain" }) }, - { key = "-", mods = "LEADER", action = act.SplitVertical({ domain = "CurrentPaneDomain" }) }, - { key = "w", mods = "LEADER", action = act.CloseCurrentPane({ confirm = true }) }, - { key = "q", mods = "LEADER", action = act.CloseCurrentTab({ confirm = true }) }, - { - key = "a", + key = "|", + mods = "LEADER|SHIFT", + action = act.SplitHorizontal({ domain = "CurrentPaneDomain" }), + }, + { + key = "-", mods = "LEADER", - action = act.ActivateKeyTable({ - name = "activate_pane", - one_shot = false, - until_unknown = true, - timeout_milliseconds = 1000, - replace_current = true, - }), + action = act.SplitVertical({ domain = "CurrentPaneDomain" }), }, + { key = "w", mods = "LEADER", action = act.CloseCurrentPane({ confirm = false }) }, - { key = "z", mods = "LEADER", action = act.TogglePaneZoomState }, - { key = "Enter", mods = "LEADER", action = act.ToggleFullScreen }, - { key = "n", mods = "LEADER", action = act.SpawnWindow }, - { key = "t", mods = "LEADER", action = act.SpawnTab("CurrentPaneDomain") }, - { key = "1", mods = "LEADER", action = act.ActivateTab(0) }, - { key = "2", mods = "LEADER", action = act.ActivateTab(1) }, - { key = "3", mods = "LEADER", action = act.ActivateTab(2) }, - { key = "4", mods = "LEADER", action = act.ActivateTab(3) }, - { key = "5", mods = "LEADER", action = act.ActivateTab(4) }, - { key = "6", mods = "LEADER", action = act.ActivateTab(5) }, - { key = "7", mods = "LEADER", action = act.ActivateTab(6) }, - { key = "8", mods = "LEADER", action = act.ActivateTab(7) }, - { key = "9", mods = "LEADER", action = act.ActivateTab(-1) }, - { key = "f", mods = "LEADER", action = act.Search({ CaseSensitiveString = "" }) }, - { key = "x", mods = "LEADER", action = act.ActivateCopyMode }, + { key = "h", mods = "LEADER", action = act.ActivatePaneDirection("Left") }, + { key = "j", mods = "LEADER", action = act.ActivatePaneDirection("Down") }, + { key = "k", mods = "LEADER", action = act.ActivatePaneDirection("Up") }, + { key = "l", mods = "LEADER", action = act.ActivatePaneDirection("Right") }, + { key = "LeftArrow", mods = "LEADER", action = act.AdjustPaneSize({ "Left", 5 }) }, + { key = "RightArrow", mods = "LEADER", action = act.AdjustPaneSize({ "Right", 5 }) }, + { key = "UpArrow", mods = "LEADER", action = act.AdjustPaneSize({ "Up", 5 }) }, + { key = "DownArrow", mods = "LEADER", action = act.AdjustPaneSize({ "Down", 5 }) }, + + { key = "z", mods = "LEADER", action = act.TogglePaneZoomState }, + { key = "t", mods = "LEADER", action = act.SpawnTab("CurrentPaneDomain") }, { - key = ";", + key = "f", mods = "LEADER", - action = act.MoveTabRelative(-1), + action = act.Search({ CaseSensitiveString = "" }), }, + { key = "x", mods = "LEADER", action = act.ActivateCopyMode }, { - key = "'", + key = ";", mods = "LEADER", - action = act.MoveTabRelative(1), + action = act.MoveTabRelative(-1), }, { - key = "s", + key = "'", mods = "LEADER", - action = act.ActivateKeyTable({ - name = "size_pane", - one_shot = false, - until_unknown = true, - timeout_milliseconds = 1000, - replace_current = true, - }), + action = act.MoveTabRelative(1), }, { key = "r", @@ -76,23 +62,13 @@ function module.apply_to_config(config) action = wezterm.action.EmitEvent("toggle-background"), }, } - - config.key_tables = { - activate_pane = { - { key = "h", action = act.ActivatePaneDirection("Left") }, - { key = "j", action = act.ActivatePaneDirection("Down") }, - { key = "k", action = act.ActivatePaneDirection("Up") }, - { key = "l", action = act.ActivatePaneDirection("Right") }, - { key = "Escape", action = "PopKeyTable" }, - }, - size_pane = { - { key = "h", action = act.AdjustPaneSize({ "Left", 5 }) }, - { key = "l", action = act.AdjustPaneSize({ "Right", 5 }) }, - { key = "k", action = act.AdjustPaneSize({ "Up", 5 }) }, - { key = "j", action = act.AdjustPaneSize({ "Down", 5 }) }, - { key = "Escape", action = "PopKeyTable" }, - }, - } + for i = 0, 8 do + table.insert(config.keys, { + key = tostring(i + 1), + mods = "LEADER", + action = wezterm.action.ActivateTab(i), + }) + end end return module diff --git a/wezterm/wallpaper.lua b/wezterm/wallpaper.lua deleted file mode 100644 index 6fcd4be..0000000 --- a/wezterm/wallpaper.lua +++ /dev/null @@ -1,43 +0,0 @@ ---local wezterm = require("wezterm") ---local module = {} --- ---function module.apply_to_config(config) --- local function get_random_entry(tbl) --- local keys = {} --- for key, _ in ipairs(tbl) do --- table.insert(keys, key) --- end --- local randomKey = keys[math.random(1, #keys)] --- return tbl[randomKey] --- end --- --- local function get_wallpaper(dir) --- local wallpapers = {} --- local dimmer = { brightness = 0.05 } --- for _, v in ipairs(wezterm.glob(dir)) do --- table.insert(wallpapers, v) --- end --- local wallpaper = get_random_entry(wallpapers) --- return { --- --- source = { --- File = { --- path = wallpaper, --- }, --- }, --- attachment = "Fixed", --- repeat_x = "NoRepeat", --- repeat_y = "NoRepeat", --- hsb = dimmer, --- vertical_align = "Middle", --- horizontal_align = "Center", --- } --- end --- --- local wallpaper_dir = wezterm.home_dir .. "/.config/wallpapers/*" --- config.background = { --- get_wallpaper(wallpaper_dir), --- } ---end --- ---return module diff --git a/wezterm/wezterm.lua b/wezterm/wezterm.lua index 9989998..5786622 100644 --- a/wezterm/wezterm.lua +++ b/wezterm/wezterm.lua @@ -1,7 +1,6 @@ local wezterm = require("wezterm") local appearance = require("appearance") local keys = require("keys") -local wallpaper = require("wallpaper") local mux = wezterm.mux local config = {}