diff --git a/common/.wezterm.lua b/common/.wezterm.lua index 1aa7b4e..fdf83bd 100644 --- a/common/.wezterm.lua +++ b/common/.wezterm.lua @@ -203,13 +203,41 @@ if wezterm.target_triple == "x86_64-pc-windows-msvc" then }, }) else - config.font = wezterm.font_with_fallback({ - {family = "tewi", weight = "Regular"}, - {family = "tewi", weight = "Bold"}, + local function fallback(font) + return wezterm.font_with_fallback({ + font, + "Fixed", + "Terminus (TTF)", + "Sazanami Gothic", + "Unifont", + "Noto Emoji", + }) + end + config.font = fallback("tewi") + config.font_rules = { + { + intensity = "Bold", + font = fallback({family = "tewi", weight = "Bold"}), + }, + { + italic = true, + font = fallback({family = "orp", style = "Italic"}), + }, + { + intensity = "Bold", + italic = true, + font = fallback({family = "orp", style = "Italic"}), + } + } + --[[config.font = wezterm.font_with_fallback({ + {family = "tewi", style = "Normal"}, + {family = "tewi", style = "Normal", weight = "Bold"}, + {family = "orp", style = "Italic"}, + {family = "orp", style = "Italic", weight = "Bold"}, "Terminus (TTF)", "Unifont", "Noto Emoji", - }) + })--]] end return config diff --git a/common/.zshrc b/common/.zshrc index 54d310b..08923df 100644 --- a/common/.zshrc +++ b/common/.zshrc @@ -9,6 +9,7 @@ if [[ -f "$HOME/.zshcfg" ]]; then else CONF_BINARYCLOCK=0 CONF_ENABLEGIT=0 + CONF_FORTUNE=0 fi if [[ $CONF_ENABLEGIT -eq 1 ]]; then @@ -227,3 +228,7 @@ if [[ -f "$HOME/.zshenv" ]]; then source ~/.zshenv fi +if [[ $CONF_FORTUNE -eq 1 ]]; then + fortune $CONF_FORTUNE_PATH + echo +fi \ No newline at end of file diff --git a/common/helix/config.toml b/common/helix/config.toml new file mode 100644 index 0000000..8a0674a --- /dev/null +++ b/common/helix/config.toml @@ -0,0 +1,26 @@ +theme = "tokyonight" + +[editor] +line-number = "relative" +cursorline = true +color-modes = true + +[editor.statusline] +left = ["mode", "file-name"] +center = [] +right = ["spinner", "diagnostics", "selections", "position", "file-encoding", "file-line-ending", "file-type"] + +[editor.cursor-shape] +normal = "block" +insert = "bar" +select = "underline" + +[editor.whitespace] +render = "all" + +[editor.whitespace.characters] +newline = "↴" + +[editor.indent-guides] +render = true +character = "▎" \ No newline at end of file diff --git a/common/helix/languages.toml b/common/helix/languages.toml new file mode 100644 index 0000000..7932f61 --- /dev/null +++ b/common/helix/languages.toml @@ -0,0 +1,4 @@ +[[language]] +name = "javascript" +formatter = { command = "prettier", args = ["--parser", "babel"] } +auto-format = true \ No newline at end of file diff --git a/linux/.config/awesome/rc.lua b/linux/.config/awesome/rc.lua index 354eead..83eef8d 100644 --- a/linux/.config/awesome/rc.lua +++ b/linux/.config/awesome/rc.lua @@ -1057,7 +1057,7 @@ clientkeys = gears.table.join( ), awful.key( {modkey}, "f", - awful.client.floating.toggle , + awful.client.floating.toggle, { description = "toggle floating", group = "client", @@ -1119,6 +1119,10 @@ clientkeys = gears.table.join( awful.key( {modkey, "Shift"}, "r", function(c) + if not c.floating then + c.floating = true + end + local scr = awful.screen.focused({client = true}) local x = scr.geometry.x + (scr.geometry.width / 2 - 800) local y = scr.geometry.y + (scr.geometry.height / 2 - 450)