diff --git a/eggs/alacritty/alacritty.toml b/eggs/alacritty/alacritty.toml index 43850d8..a5ae863 100644 --- a/eggs/alacritty/alacritty.toml +++ b/eggs/alacritty/alacritty.toml @@ -39,7 +39,7 @@ TERM = "xterm-256color" size = 14 [font.normal] -family = "Fira Code" +family = "Fira Code Nerd Font" [font.offset] x = 0 diff --git a/eggs/git/.gitconfig b/eggs/git/.gitconfig index 11fa16e..d0107d7 100644 --- a/eggs/git/.gitconfig +++ b/eggs/git/.gitconfig @@ -15,6 +15,7 @@ ; pager = delta ; [delta] ; features = side-by-side line-numbers decorations navigate + ; yntax-theme = gruvbox ; [delta "line-numbers"] ; line-numbers-left-style = cyan diff --git a/eggs/gtk/.config/gtk-3.0/.gitignore b/eggs/gtk/.config/gtk-3.0/.gitignore new file mode 100644 index 0000000..7e1f6a7 --- /dev/null +++ b/eggs/gtk/.config/gtk-3.0/.gitignore @@ -0,0 +1 @@ +bookmarks diff --git a/eggs/gtk/.config/gtk-3.0/bookmarks b/eggs/gtk/.config/gtk-3.0/bookmarks index 910705c..969308f 100644 --- a/eggs/gtk/.config/gtk-3.0/bookmarks +++ b/eggs/gtk/.config/gtk-3.0/bookmarks @@ -1 +1,3 @@ -file:///home/elk/code +file:///home/leon/Downloads Downloads +file:///home/leon/Pictures Pictures +file:///home/leon/code code diff --git a/eggs/kanshi/config b/eggs/kanshi/config new file mode 100644 index 0000000..85a3cfa --- /dev/null +++ b/eggs/kanshi/config @@ -0,0 +1,9 @@ +profile { + output "Philips Consumer Electronics Company PHL 345B1C 0x00008E7C" mode 3440x1440@99.982 position 2560,0 + output "Fujitsu Siemens Computers GmbH P27-8 TE Pro YVBH008792" mode 2560x1440 position 0,0 + output eDP-1 mode 1920x1200 position 2560,1440 +} + +profile { + output eDP-1 mode 1920x1200 position 0,0 +} diff --git a/eggs/niri/config.kdl b/eggs/niri/config.kdl index d85c0f1..a58af59 100644 --- a/eggs/niri/config.kdl +++ b/eggs/niri/config.kdl @@ -37,8 +37,9 @@ cursor { } environment { - DISPLAY ":0" + XDG_CURRENT_DESKTOP "niri" + XDG_SESSION_TYPE "wayland" // GDK_BACKEND "x11" } @@ -46,32 +47,26 @@ output "Philips Consumer Electronics Company PHL 345B1C 0x00008E7C" { mode "3440x1440@60" scale 1 transform "normal" - // {% if device.desktop %} + // {% if device.desktop || SYSTEM.hostname == "kenbun-laptop-leon" %} // position x=2560 y=0 // {% else %} position x=0 y=0 // {% end %} } -// {% if device.desktop %} -// output "HDMI-A-1" { +// {% if device.desktop || SYSTEM.hostname == "kenbun-laptop-leon" %} +// output "Fujitsu Siemens Computers GmbH P27-8 TE Pro YVBH008792" { // mode "2560x1440" // scale 1 // position x=0 y=0 // } +// {% end %} -// {% elif device.thinkix %} -// output "HDMI-A-1" { -// mode "1920x1080" -// scale 1 -// position x=0 y=0 -// //off -// } - +// {% if device.thinkix || SYSTEM.hostname == "kenbun-laptop-leon" %} // output "eDP-1" { -// mode "1920x1080@60" -// scale 1.0 -// transform "normal" -// position x=0 y=1440 + // mode "1920x1080@60" + // scale 1.0 + // transform "normal" + // position x=0 y=1440 // } // {% end %} @@ -96,12 +91,24 @@ layout { inactive-color "#1d2021" } + tab-indicator { + width 6 + hide-when-single-tab + // inactive-color "red" + length total-proportion=0.8 + active-color "#8ec07c" + inactive-color "#3c3836" + // inactive-color "#1d2021" + // inactive-gradient from="#1d2021" to="#3c3836" + } + } // {% if device.laptop %} // spawn-at-startup "bash" "-c" "swayidle -w timeout 601 'niri msg action power-off-monitors' timeout 600 'hyprlock' before-sleep 'hyprlock' timeout 3600 'systemctl suspend' timeout 60000 'systemctl hibernate'" // spawn-at-startup "waybar" +// spawn-at-startup "kanshi" // {% end %} // {% if device.desktop %} @@ -117,7 +124,7 @@ spawn-at-startup "clipse -listen" spawn-at-startup "wl-clip-persist" "--clipboard" "regular" spawn-at-startup "kdeconnect-indicator" // -spawn-at-startup "bash" "-c" "swaybg -m fill -i ~/wallpapers/green_leaves.jpg" +spawn-at-startup "bash" "-c" "swaybg -m fill -i ~/.config/wallpapers/elk_gasstation_dark.jpg" spawn-at-startup "~/.config/niri/clipsync watch with-notifications" spawn-at-startup // @@ -162,6 +169,22 @@ animations { } } +gestures { + dnd-edge-view-scroll { + trigger-width 200 + max-speed 3500 + } +} + +window-rule { + match is-window-cast-target=true + border { + on + active-color "#ff5555" + inactive-color "#ff5555" + width 2 + } +} window-rule { match app-id=r#"^foot$"# default-column-width { proportion 0.3333; } @@ -174,6 +197,7 @@ layer-rule { window-rule { match app-id=r#"1Password"# + match title="Open Folder" match title=r#"[gG]mail"# match title=r#".*[Ww]hats[aA]pp.*$"# match title=r#".*Ente Photos.*"# @@ -181,6 +205,10 @@ window-rule { } window-rule { match app-id=r#"^1Password$"# + match app-id=r#"msedge-_.*-Default"# + match title=r"[bB]itwarden" + match title=r#"^.* is sharing your screen.$"#; + match title="Open Folder" open-floating true } @@ -197,11 +225,6 @@ window-rule { // fake-fullscreen true } -window-rule { - match title=r#"^.* is sharing your screen.$"#; - open-floating true -} - window-rule { shadow { @@ -233,7 +256,11 @@ binds { // Suggested binds for running programs: terminal, app launcher, screen locker. Mod+T { spawn "foot"; } + // {% if SYSTEM.hostname == "kenbun-laptop-leon" %} + // Mod+B { spawn "bash" "-c" "unset DISPLAY && microsoft-edge --ozone-platform-hint=auto --enable-features=VaapiVideoDecodeLinuxGL --enable-features=TouchpadOverscrollHistoryNavigation"; } + // {% else %} Mod+B { spawn "bash" "-c" "unset DISPLAY && google-chrome --ozone-platform-hint=auto --enable-features=VaapiVideoDecodeLinuxGL --enable-features=TouchpadOverscrollHistoryNavigation"; } + // {% end %} Mod+Shift+P { spawn "~/.config/rofi/launchers/type-2/launcher.sh"; } Mod+Shift+B { spawn "firefox"; } @@ -249,6 +276,8 @@ binds { Mod+Shift+Q { close-window; } + Mod+W { toggle-column-tabbed-display; } + Mod+H { focus-column-or-monitor-left; } Mod+J { focus-window-down; } Mod+K { focus-window-up; } diff --git a/eggs/nvim/lazy-lock.json b/eggs/nvim/lazy-lock.json index c1dfde8..2bb47b2 100644 --- a/eggs/nvim/lazy-lock.json +++ b/eggs/nvim/lazy-lock.json @@ -1,64 +1,39 @@ { - "CopilotChat.nvim": { "branch": "main", "commit": "2ebe591cff06018e265263e71e1dbc4c5aa8281e" }, - "LazyVim": { "branch": "main", "commit": "d0c366e4d861b848bdc710696d5311dca2c6d540" }, + "LazyVim": { "branch": "main", "commit": "45d94b3197eaf3f35754b8ecb7adebfcebe5160d" }, "LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" }, - "SchemaStore.nvim": { "branch": "main", "commit": "fa47222e29d6f6e80eddcdd0f125c27edf274ad5" }, - "blink-cmp-copilot": { "branch": "main", "commit": "c5c5cbce5748d21073f1d5348a92ebe6ce63f387" }, - "blink.cmp": { "branch": "main", "commit": "e3b7cb4a1094377c3093a021300de123d9fc60d3" }, - "bufferline.nvim": { "branch": "main", "commit": "0b2fd861eee7595015b6561dade52fb060be10c4" }, - "catppuccin": { "branch": "main", "commit": "f67b886d65a029f12ffa298701fb8f1efd89295d" }, - "conform.nvim": { "branch": "master", "commit": "1a99fdc1d3aa9ccdf3021e67982a679a8c5c740c" }, - "copilot.lua": { "branch": "master", "commit": "886ee73b6d464b2b3e3e6a7ff55ce87feac423a9" }, - "crates.nvim": { "branch": "main", "commit": "bd35b13e94a292ee6e32c351e05ca2202dc9f070" }, - "dressing.nvim": { "branch": "master", "commit": "3a45525bb182730fe462325c99395529308f431e" }, - "dropbar.nvim": { "branch": "master", "commit": "e5f9fb998a54c0ec1c2d25de88a3c260c494ffe1" }, - "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, - "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, - "gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" }, - "grug-far.nvim": { "branch": "main", "commit": "08f32182335754abf461dfb77b2c4e24bfe4d614" }, - "indent-blankline.nvim": { "branch": "master", "commit": "18603eb949eba08300799f64027af11ef922283f" }, + "blink.cmp": { "branch": "main", "commit": "b6f11a0aa33e601c469a126e3ed6e35208fe3ea3" }, + "catppuccin": { "branch": "main", "commit": "0b2437bcc12b4021614dc41fcea9d0f136d94063" }, + "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" }, + "dropbar.nvim": { "branch": "master", "commit": "485558fb7c237cde72b624b20619124a74822b3e" }, + "gitsigns.nvim": { "branch": "main", "commit": "2bc3b472bbc2484214549af4d9f38c127b886a55" }, + "grug-far.nvim": { "branch": "main", "commit": "3a8690461afac34c0e5bacb0f7b4bc3066aab665" }, "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" }, - "lazydev.nvim": { "branch": "main", "commit": "8620f82ee3f59ff2187647167b6b47387a13a018" }, - "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, - "luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" }, - "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "97d9f1d3ad205dece6bcafd1d71cf1507608f3c7" }, + "lazydev.nvim": { "branch": "main", "commit": "a1b78b2ac6f978c72e76ea90ae92a94edf380cfc" }, + "lualine.nvim": { "branch": "master", "commit": "f4f791f67e70d378a754d02da068231d2352e5bc" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "805c31ec6bfb557975143712ecff6956d3227141" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "mini.ai": { "branch": "main", "commit": "ebb04799794a7f94628153991e6334c3304961b8" }, - "mini.animate": { "branch": "main", "commit": "d14190ac3040116540889e2ebc25f488b195799e" }, - "mini.comment": { "branch": "main", "commit": "a56581c40c19fa26f2b39da72504398de3173c5a" }, - "mini.hipatterns": { "branch": "main", "commit": "f34975103a38b3f608219a1324cdfc58ea660b8b" }, - "mini.icons": { "branch": "main", "commit": "1c79feb7478ca773fa3dac5cadf43ced9180e861" }, - "mini.move": { "branch": "main", "commit": "4caa1c212f5ca3d1633d21cfb184808090ed74b1" }, - "mini.pairs": { "branch": "main", "commit": "e543c760edc5e746e5b6cbd02c066c17ead3ef16" }, - "mini.surround": { "branch": "main", "commit": "aa5e245829dd12d8ff0c96ef11da28681d6049aa" }, - "neo-tree.nvim": { "branch": "main", "commit": "0774fa2085c62a147fcc7b56f0ac37053cc80217" }, - "noice.nvim": { "branch": "main", "commit": "eaed6cc9c06aa2013b5255349e4f26a6b17ab70f" }, + "mini.ai": { "branch": "main", "commit": "6e01c0e5a15554852546fac9853960780ac52ed4" }, + "mini.comment": { "branch": "main", "commit": "264b8a63edd5a9a41d5361a1d52c13131c3c51a2" }, + "mini.icons": { "branch": "main", "commit": "ec61af6e606fc89ee3b1d8f2f20166a3ca917a36" }, + "mini.move": { "branch": "main", "commit": "c8b30e92dd2668dd6e56a9a23cb7d4ee38c2266d" }, + "mini.surround": { "branch": "main", "commit": "f90069c7441a5fb04c3de42eacf93e16b64dd3eb" }, + "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" }, "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" }, - "nvim-lint": { "branch": "master", "commit": "dfa45de973c3ce7bd1b9a6d346f896a68ad07e44" }, + "nvim-lint": { "branch": "master", "commit": "6e9dd545a1af204c4022a8fcd99727ea41ffdcc8" }, "nvim-lsp-endhints": { "branch": "main", "commit": "a449f2f27b6b985ff216964572224ce432d94a86" }, - "nvim-lspconfig": { "branch": "master", "commit": "8121483b8132b7053120fafd83728178fb3febf6" }, - "nvim-notify": { "branch": "master", "commit": "bd9cd51f9ef2f6326fc2bc9931d0718c1794e247" }, + "nvim-lspconfig": { "branch": "master", "commit": "6c17f8656f667727b27f5f598463afedb7791b18" }, + "nvim-notify": { "branch": "master", "commit": "22f29093eae7785773ee9d543f8750348b1a195c" }, "nvim-scrollbar": { "branch": "main", "commit": "6994eb9f73d5fdc36ee2c8717940e8c853e51a49" }, - "nvim-snippets": { "branch": "main", "commit": "56b4052f71220144689caaa2e5b66222ba5661eb" }, - "nvim-treesitter": { "branch": "master", "commit": "958af94dd8d74071c72c9d6840b41d06ea436b2f" }, + "nvim-treesitter": { "branch": "master", "commit": "6d957c22cb48a734b009a69d03c18d20042c4754" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" }, - "nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" }, - "persistence.nvim": { "branch": "main", "commit": "f6aad7dde7fcf54148ccfc5f622c6d5badd0cc3d" }, "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" }, - "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, + "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "remote-nvim.nvim": { "branch": "main", "commit": "66fc20fd259401c7bb6ac5189ecb6283c2eb65d2" }, - "render-markdown.nvim": { "branch": "main", "commit": "16369540a005ad0cf267498162aedca6dfca1b9c" }, - "rustaceanvim": { "branch": "master", "commit": "10efd4d48fb241b2530062090dd84fd4f9717584" }, - "smear-cursor.nvim": { "branch": "main", "commit": "875c64511f4a544f8e59006c34c797fdfb303003" }, - "snacks.nvim": { "branch": "main", "commit": "ee08b1f32e06904318f8fa24714557d3abcdd215" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "dae2eac9d91464448b584c7949a31df8faefec56" }, - "telescope.nvim": { "branch": "master", "commit": "2eca9ba22002184ac05eddbe47a7fe2d5a384dfc" }, - "todo-comments.nvim": { "branch": "main", "commit": "319c01b99b7a8c9ac2066bf0efd4d6ec68fef444" }, - "tokyonight.nvim": { "branch": "main", "commit": "4b386e66a9599057587c30538d5e6192e3d1c181" }, - "trouble.nvim": { "branch": "main", "commit": "46cf952fc115f4c2b98d4e208ed1e2dce08c9bf6" }, + "render-markdown.nvim": { "branch": "main", "commit": "e05a9f22f31c088ece3fa5928daf546a015b66ee" }, + "snacks.nvim": { "branch": "main", "commit": "e5960d8e32ed2771a1d84ce4532bf0e2dc4dc8ca" }, + "telescope.nvim": { "branch": "master", "commit": "78857db9e8d819d3cc1a9a7bdc1d39d127a36495" }, + "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" }, "ts-comments.nvim": { "branch": "main", "commit": "872dcfa0418f4a33b7437fb4d9f4e89f2f000d74" }, - "which-key.nvim": { "branch": "main", "commit": "1f8d414f61e0b05958c342df9b6a4c89ce268766" }, - "zenbones.nvim": { "branch": "main", "commit": "3c0b86bb912d41d191d90c019a346f6a1d27f588" } + "which-key.nvim": { "branch": "main", "commit": "0e76a87ac51772569aec678dc74baa8e2a86100c" }, + "zenbones.nvim": { "branch": "main", "commit": "9ef4241c50ea24026b732512223dbc55589ce2c4" } } diff --git a/eggs/nvim/lazyvim.json b/eggs/nvim/lazyvim.json index def2a5f..9615003 100644 --- a/eggs/nvim/lazyvim.json +++ b/eggs/nvim/lazyvim.json @@ -11,6 +11,7 @@ "lazyvim.plugins.extras.lang.toml", "lazyvim.plugins.extras.util.mini-hipatterns" ], + "install_version": 7, "news": { "NEWS.md": "10960" }, diff --git a/eggs/nvim/lua/plugins/mini-surround.lua b/eggs/nvim/lua/plugins/mini-surround.lua new file mode 100644 index 0000000..f6ec6f8 --- /dev/null +++ b/eggs/nvim/lua/plugins/mini-surround.lua @@ -0,0 +1,14 @@ +return { + { + 'echasnovski/mini.surround', + opts = { + mappings = { + add = "ys", + delete = "ds", + replace = "cs", + find = "yfs", + find_left = "yfS", + } + } + } +} diff --git a/eggs/profile/.profile b/eggs/profile/.profile index 8096dbe..034d496 100644 --- a/eggs/profile/.profile +++ b/eggs/profile/.profile @@ -64,3 +64,5 @@ fi export NVM_DIR="$HOME/.config/nvm" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm + +. "$HOME/.local/share/../bin/env" diff --git a/eggs/wallpapers/elk_gasstation_dark.jpg b/eggs/wallpapers/elk_gasstation_dark.jpg new file mode 100644 index 0000000..973636f Binary files /dev/null and b/eggs/wallpapers/elk_gasstation_dark.jpg differ diff --git a/eggs/wallpapers/elk_gasstation_lights.jpg b/eggs/wallpapers/elk_gasstation_lights.jpg new file mode 100644 index 0000000..a24e016 Binary files /dev/null and b/eggs/wallpapers/elk_gasstation_lights.jpg differ diff --git a/eggs/waybar/.config/waybar/style.css b/eggs/waybar/.config/waybar/style.css index 9e79bec..cbc2d46 100644 --- a/eggs/waybar/.config/waybar/style.css +++ b/eggs/waybar/.config/waybar/style.css @@ -2,7 +2,7 @@ /* `otf-font-awesome` is required to be installed for icons */ font-family: Terminus, "Font awesome 6 Free", Helvetica, Arial, sans-serif; /*font-family: FontAwesome, Roboto, Helvetica, Arial, sans-serif;*/ - font-size: 16px; + font-size: 10px; } window.eDP-1 * { font-size: 10px; } @@ -19,7 +19,7 @@ window .modules-right > * > * { padding: 0 10px; } window .modules-left, .modules-right, .modules-center { - margin: 3px 0; + margin: 0px 0; } window.eDP-1 .modules-left, window.eDP-1 .modules-right, window.eDP-1 .modules-center { margin: 0px 0; diff --git a/eggs/zed/keymap.json b/eggs/zed/keymap.json index c882f76..03f3a0c 100644 --- a/eggs/zed/keymap.json +++ b/eggs/zed/keymap.json @@ -40,9 +40,10 @@ } }, { - "context": "MarkdownPreview || EmptyPane || Editor && VimControl && !VimWaiting && !menu", + "context": "MarkdownPreview || EmptyPane || Diagnostics || Editor && VimControl && !VimWaiting && !menu", "bindings": { - "z space": "editor::FoldFunctionBodies", + "z space": "editor::FoldAll", + "z backspace": "editor::FoldFunctionBodies", "z enter": "editor::UnfoldAll", "space b c": "pane::CloseActiveItem", @@ -91,12 +92,17 @@ }, { "context": "Editor && vim_mode == normal && !VimWaiting && !menu", - "bindings": {} + "bindings": { + "backspace": ["vim::PushOperator", { "Sneak": {} }], + "return": ["vim::PushOperator", { "SneakBackward": {} }] + } }, { "context": "Editor && vim_mode == insert", "bindings": { - "ctrl-w": "editor::DeleteToPreviousWordStart" + "ctrl-w": "editor::DeleteToPreviousWordStart", + "alt-tab": "zeta::NextEdit", + "alt-shift-tab": "zeta::PreviousEdit" } }, { diff --git a/eggs/zed/keymap_backup.json b/eggs/zed/keymap_backup.json new file mode 100644 index 0000000..03f3a0c --- /dev/null +++ b/eggs/zed/keymap_backup.json @@ -0,0 +1,194 @@ +[ + { + "context": "Pane", + "bindings": { + // unbind closing the tab with this + "ctrl-w": null, + "ctrl-w ctrl-h": ["workspace::ActivatePaneInDirection", "Left"], + "ctrl-w ctrl-j": ["workspace::ActivatePaneInDirection", "Down"], + "ctrl-w ctrl-k": ["workspace::ActivatePaneInDirection", "Up"], + "ctrl-w ctrl-l": ["workspace::ActivatePaneInDirection", "Right"], + "ctrl-shift-t": "pane::ReopenClosedItem", + "ctrl-o": "pane::GoBack", + "ctrl-i": "pane::GoForward" + // "shift-escape": null + } + }, + { + "context": "EmptyPane", + "bindings": { + ":": "command_palette::Toggle", + "space p": "file_finder::Toggle" + } + }, + { + "context": "os == macos && Editor && VimControl && !VimWaiting && !menu", + "bindings": { + "cmd-d": "editor::SelectNext" + } + }, + { + "bindings": { + "ctrl-alt-shift-p": "projects::OpenRecent", + "ctrl-alt-shift-o": "workspace::Open" + } + }, + { + "context": "os == linux && Editor && VimControl && !VimWaiting && !menu", + "bindings": { + "ctrl-shift-d": "editor::SelectNext" + } + }, + { + "context": "MarkdownPreview || EmptyPane || Diagnostics || Editor && VimControl && !VimWaiting && !menu", + "bindings": { + "z space": "editor::FoldAll", + "z backspace": "editor::FoldFunctionBodies", + "z enter": "editor::UnfoldAll", + + "space b c": "pane::CloseActiveItem", + ":": "command_palette::Toggle", + "space p": "file_finder::Toggle", + "space o": "pane::DeploySearch", + + "space h": "pane::ActivatePrevItem", + "space l": "pane::ActivateNextItem", + "space c space": "editor::ToggleComments", + + // go to search result + "g space": "editor::OpenExcerpts", + "space e j": "editor::ExpandExcerptsDown", + "space e k": "editor::ExpandExcerptsUp", + + // multi-cursor + "cmd-shift-d": "editor::SelectPrevious", + "cmd-shift-l": "editor::SelectAllMatches", + "ctrl-j": "editor::AddSelectionBelow", + "ctrl-k": "editor::AddSelectionAbove", + "alt-d": "editor::SelectNext", + "alt-j": "editor::SelectAllMatches", + // lsp + "space m f": "editor::Format", + "space m s": "project_symbols::Toggle", + "space m g": "editor::GoToDefinition", + "space m d": "editor::Hover", + "space m n": "editor::Rename", + "space m r": "editor::FindAllReferences", + "space m t": "editor::GoToTypeDefinition", + "space m e": "editor::GoToDiagnostic", + "space m E": "editor::GoToPrevDiagnostic", + "space m v": "editor::ToggleCodeActions", + "space m o": "outline::Toggle", + "space m h": "editor::ShowSignatureHelp", + // diagnostics + "space e e": "diagnostics::Deploy", + "space e w": "diagnostics::ToggleWarnings", + // view + "space v n": "editor::ToggleLineNumbers", + "space v i": "editor::ToggleInlayHints", + // Git + "space g b": "editor::ToggleGitBlame" + } + }, + { + "context": "Editor && vim_mode == normal && !VimWaiting && !menu", + "bindings": { + "backspace": ["vim::PushOperator", { "Sneak": {} }], + "return": ["vim::PushOperator", { "SneakBackward": {} }] + } + }, + { + "context": "Editor && vim_mode == insert", + "bindings": { + "ctrl-w": "editor::DeleteToPreviousWordStart", + "alt-tab": "zeta::NextEdit", + "alt-shift-tab": "zeta::PreviousEdit" + } + }, + { + "context": "os == linux && ((Editor && vim_mode == normal) || Terminal) && !VimWaiting && !menu", + "bindings": { + "ctrl-t ctrl-t": "terminal_panel::ToggleFocus", + "ctrl-t ctrl-n": "workspace::NewTerminal", + "ctrl-t ctrl-shift-n": "workspace::NewCenterTerminal", + "ctrl-t ctrl-h": "pane::ActivatePrevItem", + "ctrl-t ctrl-l": "pane::ActivateNextItem", + "ctrl-x ctrl-c": "pane::CloseActiveItem", + "ctrl-t ctrl-c": "pane::CloseActiveItem", + + "alt-j": "workspace::ToggleBottomDock" + } + }, + { + "context": "os == macos && ((Editor && vim_mode == normal) || Terminal) && !VimWaiting && !menu", + "bindings": { + "cmd-t cmd-t": "terminal_panel::ToggleFocus", + "cmd-t cmd-n": "workspace::NewTerminal", + "cmd-t cmd-shift-n": "workspace::NewCenterTerminal", + "cmd-t cmd-h": "pane::ActivatePrevItem", + "cmd-t cmd-l": "pane::ActivateNextItem", + "cmd-x cmd-c": "pane::CloseActiveItem" + } + }, + { + "context": "os == linux && ((Editor && vim_mode == normal) || Terminal) && !VimWaiting && !menu", + "bindings": { + "alt-j": "workspace::ToggleBottomDock", + "alt-t alt-t": "terminal_panel::ToggleFocus", + "alt-t alt-n": "workspace::NewTerminal", + "alt-t alt-shift-n": "workspace::NewCenterTerminal", + "alt-t alt-h": "pane::ActivatePrevItem", + "alt-t alt-l": "pane::ActivateNextItem", + "alt-x alt-c": "pane::CloseActiveItem" + } + }, + { + "context": "Editor && vim_mode == visual && !VimWaiting && !menu", + "bindings": { + "n": "editor::SelectLargerSyntaxNode", + "N": "editor::SelectSmallerSyntaxNode", + "m": "vim::SelectNext", + "M": "vim::SelectPrevious", + ",": "editor::SplitSelectionIntoLines" + } + }, + + { + "context": "ProjectSearchBar", + "bindings": { + "space b c": "pane::CloseActiveItem", + "escape escape": "pane::CloseActiveItem" + } + }, + + // Panel stuff + { + "context": "Editor && VimControl && !VimWaiting && !menu || OutlinePanel || ProjectPanel || Assistant || EmptyPane", + "bindings": { + "space v h": "workspace::ToggleLeftDock", + "space v l": "workspace::ToggleRightDock", + + "space v o": "outline_panel::ToggleFocus", + "space v p": "project_panel::ToggleFocus", + "space v a": "assistant::ToggleFocus" + } + }, + { + "context": "OutlinePanel", + "bindings": { + "space l": "outline_panel::ToggleFocus" + } + }, + { + "context": "ProjectPanel", + "bindings": { + "space l": "project_panel::ToggleFocus" + } + }, + { + "context": "Assistant", + "bindings": { + "space h": "assistant::ToggleFocus" + } + } +] diff --git a/eggs/zed/settings.json b/eggs/zed/settings.json index f2541f0..40b69b9 100644 --- a/eggs/zed/settings.json +++ b/eggs/zed/settings.json @@ -1,4 +1,12 @@ { + "features": { + "inline_completion_provider": "zed" + }, + "icon_theme": "Material Icon Theme", + "telemetry": { + "metrics": false, + "diagnostics": false + }, "remove_trailing_whitespace_on_save": false, "auto_signature_help": false, "unnecessary_code_fade": 0.5, @@ -10,11 +18,13 @@ "provider": "copilot_chat", "model": "claude-3-5-sonnet" }, + "enable_experimental_live_diffs": true, "version": "2" }, "theme": "Gruvbox Dark Hard", - "buffer_font_size": 14, + "buffer_font_size": 14.0, "buffer_font_family": "Input", + // "buffer_font_family": "Input", // "buffer_font_family": "FiraCode Nerd Font", // "buffer_font_family": "JetBrainsMono Nerd Font Mono", // "buffer_line_height": { "custom": 1.55 }, @@ -54,7 +64,7 @@ }, "terminal": { - "font_family": "JetBrainsMono Nerd Font", + "font_family": "FiraCode Nerd Font", "font_size": 14 }, "vim_mode": true, diff --git a/eggs/zed/settings_backup.json b/eggs/zed/settings_backup.json new file mode 100644 index 0000000..40b69b9 --- /dev/null +++ b/eggs/zed/settings_backup.json @@ -0,0 +1,106 @@ +{ + "features": { + "inline_completion_provider": "zed" + }, + "icon_theme": "Material Icon Theme", + "telemetry": { + "metrics": false, + "diagnostics": false + }, + "remove_trailing_whitespace_on_save": false, + "auto_signature_help": false, + "unnecessary_code_fade": 0.5, + // "use_autoclose": true, + // "always_treat_brackets_as_autoclosed": false, + // "unstable.ui_density": "compact", + "assistant": { + "default_model": { + "provider": "copilot_chat", + "model": "claude-3-5-sonnet" + }, + "enable_experimental_live_diffs": true, + "version": "2" + }, + "theme": "Gruvbox Dark Hard", + "buffer_font_size": 14.0, + "buffer_font_family": "Input", + // "buffer_font_family": "Input", + // "buffer_font_family": "FiraCode Nerd Font", + // "buffer_font_family": "JetBrainsMono Nerd Font Mono", + // "buffer_line_height": { "custom": 1.55 }, + // "ui_font_family": "Noto Sans", + // "buffer_font_family": "Zed Mono", + + // "active_pane_magnification": 1.3, + "tab_bar": { + "show_nav_history_buttons": false + }, + "calls": { + "mute_on_join": true + }, + "gutter": { + "line_numbers": false, + "folds": false + }, + "toolbar": { + "quick_actions": false + // "selections_menu": false + }, + "vertical_scroll_margin": 5, + "tabs": { + "git_status": true, + "file_icons": true, + "show_diagnostics": "errors" + }, + "use_smartcase_search": true, + "preview_tabs": { + "enabled": true, + "enable_preview_from_file_finder": true, + "enable_preview_from_code_navigation": true + }, + + "message_editor": { + "auto_replace_emoji_shortcode": true + }, + + "terminal": { + "font_family": "FiraCode Nerd Font", + "font_size": 14 + }, + "vim_mode": true, + "vim": { + "use_smartcase_find": true, + "use_system_clipboard": "on_yank" + }, + "languages": { + "JSON": { + "format_on_save": "off" + } + }, + "lsp": { + "rust-analyzer": { + "initialization_options": { + "typing": { + // Temporary workaround around round rust-analzyer wrongly inserting `|` twice + "excludeChars": "|<" + } + } + } + }, + "drop_target_size": 0.3, + "indent_guides": { + "coloring": "fixed" + }, + "experimental.theme_overrides": { + "editor.indent_guide": "#ffffff08", + "panel.indent_guide": "#ffffff08", + "panel.indent_guide_active": "#ffffff11", + "panel.indent_guide_hover": "#ffffff13", + + "panel.background": "#282828", + "tab_bar.background": "#282828", + // "border": "#3c3836", + "border": "#282828", + "title_bar.background": "#1d2021" + } +} diff --git a/eggs/zsh/.config/zsh/.zshrc b/eggs/zsh/.config/zsh/.zshrc index 8881e80..85d270b 100644 --- a/eggs/zsh/.config/zsh/.zshrc +++ b/eggs/zsh/.config/zsh/.zshrc @@ -10,6 +10,11 @@ setopt SHARE_HISTORY source "$ZDOTDIR/utils.zsh" +if [ ! -f "$HISTFILE" ]; then + mkdir -p "$(dirname "$HISTFILE")" + touch "$HISTFILE" +fi + # pnpm export PNPM_HOME="$HOME/.local/share/pnpm" case ":$PATH:" in diff --git a/yolk.rhai b/yolk.rhai index 7d3d9dd..7b30a46 100644 --- a/yolk.rhai +++ b/yolk.rhai @@ -1,30 +1,42 @@ +export const themes = #{ + gruvbox: #{ + bg: "#1d2021", + fg: "#ebdbb2", + } +}; +export const theme = themes.gruvbox; + export const device = #{ thinkix: SYSTEM.hostname == "thinkix", - desktop: SYSTEM.hostname == "fedora.fritz.box" ||SYSTEM.hostname == "fedora", - laptop: SYSTEM.hostname == "thinkix" || SYSTEM.hostname == "frissnix", + desktop: SYSTEM.hostname == "fedora.fritz.box" || SYSTEM.hostname == "fedora", + laptop: SYSTEM.hostname == "thinkix" + || SYSTEM.hostname == "frissnix" + || SYSTEM.device_name == "Matthiass MacBook Pro" + || SYSTEM.hostname == "kenbun-laptop-leon", linux: SYSTEM.platform == "Linux", windows: SYSTEM.platform == "Windows", - macbook: "Matthiass-MacBook-Pro" in SYSTEM.hostname, - kenbun: "Matthiass-MacBook-Pro" in SYSTEM.hostname, + macbook: SYSTEM.device_name == "Matthiass MacBook Pro", + kenbun: SYSTEM.device_name == "Matthiass MacBook Pro" || SYSTEM.hostname == "kenbun-laptop-leon", }; - private fn merge_into_home(enabled, templates) { #{ enabled: enabled, targets: "~", strategy: "merge", templates: templates } } + export let eggs = #{ + "nvim-old": #{ enabled: false }, + "wallpapers": #{ targets: "~/.config/wallpapers" }, "alacritty": #{ enabled: !device.windows, targets: "~/.config/alacritty" }, "eww": merge_into_home(device.linux && device.desktop, []), "eww-bar": merge_into_home(device.linux && device.desktop, []), "foot": #{ enabled: device.linux, targets: "~/.config/foot", templates: ["foot.ini"] }, "git": merge_into_home(true, [".gitconfig"]), "niri": #{ enabled: device.linux, targets: "~/.config/niri", templates: ["**/*.kdl"], main_file: "config.kdl" }, - "nvim": #{ strategy: "put", targets: "~/.config/nvim", main_file: "init.lua" }, - "nvim-old": #{ enabled: false }, + "nvim": #{ enabled: true, strategy: "put", targets: "~/.config/nvim", main_file: "init.lua" }, "profile": #{ enabled: device.linux, strategy: "merge", targets: "~" }, "starship": merge_into_home(true, []), "bat": #{ enabled: device.linux || device.macbook, strategy: "put", targets: "~/.config/bat", templates: ["config"]}, @@ -37,8 +49,9 @@ export let eggs = #{ "scripts": #{ enabled: device.linux, targets: "~/scripts", strategy: "merge" }, "hyprlock": merge_into_home(device.laptop && device.linux, []), - "kanata": merge_into_home(device.laptop && device.linux, []), - "waybar": merge_into_home(device.laptop && device.linux, []), + "kanata": merge_into_home(device.laptop, []), + "waybar": merge_into_home(device.laptop && device.linux, ["*"]), + "kanshi": #{ enabled: device.laptop && device.linux, targets: "~/.config/kanshi" }, "karabiner": merge_into_home(device.macbook, []), "sioyek": merge_into_home(device.linux, []),