diff --git a/.gitattributes b/.gitattributes index 08a5adc..0805c94 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1 @@ -* filter=yolk \ No newline at end of file +* filter=yolk 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/kanshi/config b/eggs/kanshi/config new file mode 100644 index 0000000..73a8cc1 --- /dev/null +++ b/eggs/kanshi/config @@ -0,0 +1,5 @@ +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 +} diff --git a/eggs/niri/config.kdl b/eggs/niri/config.kdl index d85c0f1..1e0b949 100644 --- a/eggs/niri/config.kdl +++ b/eggs/niri/config.kdl @@ -46,32 +46,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,6 +90,16 @@ layout { inactive-color "#1d2021" } + tab-indicator { + width 6 + // inactive-color "red" + length total-proportion=0.8 + active-color "#8ec07c" + inactive-color "#3c3836" + // inactive-color "#1d2021" + // inactive-gradient from="#1d2021" to="#3c3836" + } + } @@ -117,7 +121,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 // @@ -233,7 +237,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 +257,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 dc5b302..741c373 100644 --- a/eggs/nvim/lazy-lock.json +++ b/eggs/nvim/lazy-lock.json @@ -1,47 +1,49 @@ { "CopilotChat.nvim": { "branch": "main", "commit": "1b375c24602680b5fe28c3c223a822111857dc37" }, - "LazyVim": { "branch": "main", "commit": "d0c366e4d861b848bdc710696d5311dca2c6d540" }, + "LazyVim": { "branch": "main", "commit": "eb8ddea8c9438c34e71db097eb77a44185dd1093" }, "LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" }, "SchemaStore.nvim": { "branch": "main", "commit": "4244700eff0a9258b88f48b2b0d0339dea3338af" }, - "catppuccin": { "branch": "main", "commit": "f67b886d65a029f12ffa298701fb8f1efd89295d" }, - "copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" }, - "crates.nvim": { "branch": "main", "commit": "786d12a70c9b91fa2d0d102bb07df02be0db31a1" }, - "dressing.nvim": { "branch": "master", "commit": "5162edb1442a729a885c45455a07e9a89058be2f" }, - "dropbar.nvim": { "branch": "master", "commit": "e5f9fb998a54c0ec1c2d25de88a3c260c494ffe1" }, - "gitsigns.nvim": { "branch": "main", "commit": "035da036e68e509ed158414416c827d022d914bd" }, + "blink-cmp-copilot": { "branch": "main", "commit": "5d4ed42c5d7d144012792bb6cc4ac7899a108169" }, + "blink.cmp": { "branch": "main", "commit": "b6f11a0aa33e601c469a126e3ed6e35208fe3ea3" }, + "catppuccin": { "branch": "main", "commit": "4965db2d6155c25db4e8417465fc2703fdf4c2b7" }, + "copilot.lua": { "branch": "master", "commit": "886ee73b6d464b2b3e3e6a7ff55ce87feac423a9" }, + "crates.nvim": { "branch": "main", "commit": "bd35b13e94a292ee6e32c351e05ca2202dc9f070" }, + "dressing.nvim": { "branch": "master", "commit": "56ef6a969a4990d938c5fed40c370f65e125fc97" }, + "dropbar.nvim": { "branch": "master", "commit": "f11b27344dc3675cdaeffa9e1e5cab0442abb0fa" }, + "gitsigns.nvim": { "branch": "main", "commit": "9b36d497495436c135659902054ee637e0ba6021" }, "grug-far.nvim": { "branch": "main", "commit": "3a8690461afac34c0e5bacb0f7b4bc3066aab665" }, - "lazy.nvim": { "branch": "main", "commit": "3f13f080434ac942b150679223d54f5ca91e0d52" }, + "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" }, "lazydev.nvim": { "branch": "main", "commit": "a1b78b2ac6f978c72e76ea90ae92a94edf380cfc" }, "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "f75e877f5266e87523eb5a18fcde2081820d087b" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "mini.ai": { "branch": "main", "commit": "640418aafb5a6e830eade483cdc2d4f0cd0e3f1a" }, - "mini.comment": { "branch": "main", "commit": "a56581c40c19fa26f2b39da72504398de3173c5a" }, + "mini.comment": { "branch": "main", "commit": "5bd72d50d36f4c0fd531adc409715a75a2c984da" }, "mini.hipatterns": { "branch": "main", "commit": "fbf1e2195fdd65cf1bc970316c28098257728868" }, - "mini.icons": { "branch": "main", "commit": "1c79feb7478ca773fa3dac5cadf43ced9180e861" }, - "mini.move": { "branch": "main", "commit": "4caa1c212f5ca3d1633d21cfb184808090ed74b1" }, + "mini.icons": { "branch": "main", "commit": "ec61af6e606fc89ee3b1d8f2f20166a3ca917a36" }, + "mini.move": { "branch": "main", "commit": "c8b30e92dd2668dd6e56a9a23cb7d4ee38c2266d" }, "mini.surround": { "branch": "main", "commit": "ceddea5fe862f13b279d9bbe81c3327a0e66d56b" }, - "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" }, - "noice.nvim": { "branch": "main", "commit": "eaed6cc9c06aa2013b5255349e4f26a6b17ab70f" }, + "noice.nvim": { "branch": "main", "commit": "e3c68a4d2275a01268a52e2931bfccfbfb693d15" }, "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" }, "nvim-lint": { "branch": "master", "commit": "789b7ada1b4f00e08d026dffde410dcfa6a0ba87" }, "nvim-lsp-endhints": { "branch": "main", "commit": "a449f2f27b6b985ff216964572224ce432d94a86" }, - "nvim-lspconfig": { "branch": "master", "commit": "cfa386fc4027e847156ee16141ea1f4c0bc2f0a4" }, - "nvim-notify": { "branch": "master", "commit": "bd9cd51f9ef2f6326fc2bc9931d0718c1794e247" }, - "nvim-scrollbar": { "branch": "main", "commit": "35f99d559041c7c0eff3a41f9093581ceea534e8" }, - "nvim-treesitter": { "branch": "master", "commit": "ef267f0c285928ea3a0d3362a260a0728fd4a146" }, + "nvim-lspconfig": { "branch": "master", "commit": "00b236b795acfb79339bd6771488c155073a2889" }, + "nvim-notify": { "branch": "master", "commit": "22f29093eae7785773ee9d543f8750348b1a195c" }, + "nvim-scrollbar": { "branch": "main", "commit": "6994eb9f73d5fdc36ee2c8717940e8c853e51a49" }, + "nvim-treesitter": { "branch": "master", "commit": "4e701776f8824fc188a6254f57d080971ce28c92" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" }, "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" }, - "plenary.nvim": { "branch": "master", "commit": "5129a3693c482fcbc5ab99a7706ffc4360b995a0" }, + "plenary.nvim": { "branch": "master", "commit": "3707cdb1e43f5cea73afb6037e6494e7ce847a66" }, "remote-nvim.nvim": { "branch": "main", "commit": "66fc20fd259401c7bb6ac5189ecb6283c2eb65d2" }, - "render-markdown.nvim": { "branch": "main", "commit": "16369540a005ad0cf267498162aedca6dfca1b9c" }, - "rustaceanvim": { "branch": "master", "commit": "2a53e2fe911e971fa90341af27d2fe1447c0cbd2" }, - "snacks.nvim": { "branch": "main", "commit": "762821e420cef56b03b6897b008454eefe68fd1d" }, + "render-markdown.nvim": { "branch": "main", "commit": "2a9e0ab6043bfb4996ce6a6a35594ab357e5d299" }, + "rustaceanvim": { "branch": "master", "commit": "f03035fa03ccb36cd26d0792c946fbacba1d1a39" }, + "snacks.nvim": { "branch": "main", "commit": "b773368f8aa6e84a68e979f0e335d23de71f405a" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "dae2eac9d91464448b584c7949a31df8faefec56" }, - "telescope.nvim": { "branch": "master", "commit": "7d1698f3d88b448e0639974248cc17f49b7b8acf" }, - "trouble.nvim": { "branch": "main", "commit": "b9cf677f20bb2faa2dacfa870b084e568dca9572" }, - "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }, + "telescope.nvim": { "branch": "master", "commit": "415af52339215926d705cccc08145f3782c4d132" }, + "trouble.nvim": { "branch": "main", "commit": "6f380b8826fb819c752c8fd7daaee9ef96d4c689" }, + "ts-comments.nvim": { "branch": "main", "commit": "872dcfa0418f4a33b7437fb4d9f4e89f2f000d74" }, + "which-key.nvim": { "branch": "main", "commit": "0e76a87ac51772569aec678dc74baa8e2a86100c" }, "zenbones.nvim": { "branch": "main", "commit": "9ef4241c50ea24026b732512223dbc55589ce2c4" } -} \ No newline at end of file +} 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/settings.json b/eggs/zed/settings.json index 0dae023..d766c17 100644 --- a/eggs/zed/settings.json +++ b/eggs/zed/settings.json @@ -1,4 +1,8 @@ { + "telemetry": { + "metrics": false, + "diagnostics": false + }, "remove_trailing_whitespace_on_save": false, "auto_signature_help": false, "unnecessary_code_fade": 0.5, @@ -14,8 +18,9 @@ }, "theme": "Gruvbox Dark Hard", "buffer_font_size": 14, - "buffer_font_family": "Input", - // "buffer_font_family": "FiraCode Nerd Font", + // "buffer_font_family": "Input Sans Compressed", + // "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", 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 2e1e1a9..89d4857 100644 --- a/yolk.rhai +++ b/yolk.rhai @@ -3,13 +3,14 @@ export const device = #{ desktop: SYSTEM.hostname == "fedora.fritz.box" || SYSTEM.hostname == "fedora", laptop: SYSTEM.hostname == "thinkix" || SYSTEM.hostname == "frissnix" - || SYSTEM.device_name == "Matthiass MacBook Pro", + || SYSTEM.device_name == "Matthiass MacBook Pro" + || SYSTEM.hostname == "kenbun-laptop-leon", linux: SYSTEM.platform == "Linux", windows: SYSTEM.platform == "Windows", macbook: SYSTEM.device_name == "Matthiass MacBook Pro", - kenbun: SYSTEM.device_name == "Matthiass MacBook Pro", + kenbun: SYSTEM.device_name == "Matthiass MacBook Pro" || SYSTEM.hostname == "kenbun-laptop-leon", }; @@ -18,14 +19,15 @@ private fn merge_into_home(enabled, templates) { } export let eggs = #{ - "nvim-old": #{enabled: false}, + "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": #{ 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"]}, @@ -39,7 +41,8 @@ export let eggs = #{ "hyprlock": merge_into_home(device.laptop && device.linux, []), "kanata": merge_into_home(device.laptop, []), - "waybar": merge_into_home(device.laptop && device.linux, []), + "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, []),