mirror of
https://github.com/elkowar/dots-of-war.git
synced 2024-11-05 19:02:24 +00:00
äf
This commit is contained in:
parent
88dcbccaf7
commit
9ae9191fb2
8 changed files with 37 additions and 17 deletions
|
@ -11,7 +11,9 @@
|
||||||
(bottom :screen screen))))
|
(bottom :screen screen))))
|
||||||
|
|
||||||
(defwidget top [screen]
|
(defwidget top [screen]
|
||||||
(workspaces :screen {screen == 1 ? "DP-2" : "HDMI-A-1"}))
|
(box :orientation "v"
|
||||||
|
(workspaces :screen {screen == 1 ? "DP-2" : "HDMI-A-1"})
|
||||||
|
(systray)))
|
||||||
;(workspaces :wsp_yuck {screen == 1 ? workspaces_1_yuck : workspaces_2_yuck}))
|
;(workspaces :wsp_yuck {screen == 1 ? workspaces_1_yuck : workspaces_2_yuck}))
|
||||||
|
|
||||||
(defwidget workspaces [screen]
|
(defwidget workspaces [screen]
|
||||||
|
@ -122,7 +124,7 @@
|
||||||
(bar :screen 1))
|
(bar :screen 1))
|
||||||
|
|
||||||
(defwindow bar_2
|
(defwindow bar_2
|
||||||
;:monitor [1 "HDMI-A-1"]
|
:monitor '[2, "HDMI-A-1"]'
|
||||||
:geometry (geometry :x 0 :y 0 :width "40px" :height "100%" :anchor "top left")
|
:geometry (geometry :x 0 :y 0 :width "40px" :height "100%" :anchor "top left")
|
||||||
:reserve (struts :distance "40px" :side "left")
|
:reserve (struts :distance "40px" :side "left")
|
||||||
(bar :screen 2))
|
(bar :screen 2))
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
[user]
|
[user]
|
||||||
email = 5300871+elkowar@users.noreply.github.com
|
email = dev@elkowar.dev
|
||||||
name = elkowar
|
name = elkowar
|
||||||
[include]
|
[include]
|
||||||
path = ~/.gitconfig.local
|
path = ~/.gitconfig.local
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
"conflict-marker.vim": { "branch": "master", "commit": "11a4d42244755505b66b15cd4496a150432eb5e3" },
|
"conflict-marker.vim": { "branch": "master", "commit": "11a4d42244755505b66b15cd4496a150432eb5e3" },
|
||||||
"conjure": { "branch": "master", "commit": "dfb9f75010a181c090ab905b2a2b4180aea20f15" },
|
"conjure": { "branch": "master", "commit": "dfb9f75010a181c090ab905b2a2b4180aea20f15" },
|
||||||
"copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" },
|
"copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" },
|
||||||
"crates.nvim": { "branch": "main", "commit": "786d12a70c9b91fa2d0d102bb07df02be0db31a1" },
|
"crates.nvim": { "branch": "main", "commit": "f00e11e8282b94f2a2e938d32712c99f0e0bdeb4" },
|
||||||
"diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" },
|
"diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" },
|
||||||
"dressing.nvim": { "branch": "master", "commit": "5162edb1442a729a885c45455a07e9a89058be2f" },
|
"dressing.nvim": { "branch": "master", "commit": "5162edb1442a729a885c45455a07e9a89058be2f" },
|
||||||
"editorconfig-vim": { "branch": "master", "commit": "8b7da79e9daee7a3f3a8d4fe29886b9756305aff" },
|
"editorconfig-vim": { "branch": "master", "commit": "8b7da79e9daee7a3f3a8d4fe29886b9756305aff" },
|
||||||
|
@ -49,29 +49,29 @@
|
||||||
"nvim-dap": { "branch": "master", "commit": "6ae8a14828b0f3bff1721a35a1dfd604b6a933bb" },
|
"nvim-dap": { "branch": "master", "commit": "6ae8a14828b0f3bff1721a35a1dfd604b6a933bb" },
|
||||||
"nvim-dap-ui": { "branch": "master", "commit": "edfa93f60b189e5952c016eee262d0685d838450" },
|
"nvim-dap-ui": { "branch": "master", "commit": "edfa93f60b189e5952c016eee262d0685d838450" },
|
||||||
"nvim-jenkinsfile-linter": { "branch": "main", "commit": "b6b48b0a7aed92ed46bb9e1ab208dce92941f50b" },
|
"nvim-jenkinsfile-linter": { "branch": "main", "commit": "b6b48b0a7aed92ed46bb9e1ab208dce92941f50b" },
|
||||||
"nvim-lspconfig": { "branch": "master", "commit": "cfa386fc4027e847156ee16141ea1f4c0bc2f0a4" },
|
"nvim-lspconfig": { "branch": "master", "commit": "7133e85c3df14a387da8942c094c7edddcdef309" },
|
||||||
"nvim-nio": { "branch": "master", "commit": "5800f585def265d52f1d8848133217c800bcb25d" },
|
"nvim-nio": { "branch": "master", "commit": "5800f585def265d52f1d8848133217c800bcb25d" },
|
||||||
"nvim-scrollbar": { "branch": "main", "commit": "35f99d559041c7c0eff3a41f9093581ceea534e8" },
|
"nvim-scrollbar": { "branch": "main", "commit": "35f99d559041c7c0eff3a41f9093581ceea534e8" },
|
||||||
"nvim-web-devicons": { "branch": "master", "commit": "beb6367ab8496c9e43f22e0252735fdadae1872d" },
|
"nvim-web-devicons": { "branch": "master", "commit": "beb6367ab8496c9e43f22e0252735fdadae1872d" },
|
||||||
"nvim.lua": { "branch": "master", "commit": "5d57be0b6eea6c06977b1c5fe0752da909cf4154" },
|
"nvim.lua": { "branch": "master", "commit": "5d57be0b6eea6c06977b1c5fe0752da909cf4154" },
|
||||||
"nvlime": { "branch": "master", "commit": "936df437a74851e2696d802778f3217e2b296af9" },
|
"nvlime": { "branch": "master", "commit": "024b007766734d4be0e325eab2b33a3111720fbc" },
|
||||||
"obsidian.nvim": { "branch": "main", "commit": "b1bfc2ad9172f0405bf6c21e1f63cfb73f79b480" },
|
"obsidian.nvim": { "branch": "main", "commit": "b1bfc2ad9172f0405bf6c21e1f63cfb73f79b480" },
|
||||||
"octo.nvim": { "branch": "master", "commit": "5646539320cd62af6ff28f48ec92aeb724c68e18" },
|
"octo.nvim": { "branch": "master", "commit": "5646539320cd62af6ff28f48ec92aeb724c68e18" },
|
||||||
"parinfer-rust": { "branch": "master", "commit": "0e4d52e712641ad351a1bfe6cee3d34d63ed087b" },
|
"parinfer-rust": { "branch": "master", "commit": "0e4d52e712641ad351a1bfe6cee3d34d63ed087b" },
|
||||||
"parsley": { "branch": "main", "commit": "c4100aa449bfa971dcfc56ffe4206ba034db08cc" },
|
"parsley": { "branch": "main", "commit": "c4100aa449bfa971dcfc56ffe4206ba034db08cc" },
|
||||||
"persistence.nvim": { "branch": "main", "commit": "4982499c1636eac254b72923ab826ee7827b3084" },
|
"persistence.nvim": { "branch": "main", "commit": "4982499c1636eac254b72923ab826ee7827b3084" },
|
||||||
"plenary.nvim": { "branch": "master", "commit": "5129a3693c482fcbc5ab99a7706ffc4360b995a0" },
|
"plenary.nvim": { "branch": "master", "commit": "08e301982b9a057110ede7a735dd1b5285eb341f" },
|
||||||
"popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
|
"popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
|
||||||
"purescript-vim": { "branch": "main", "commit": "82348352e6568fcc0385bd7c99a8ead3a479feea" },
|
"purescript-vim": { "branch": "main", "commit": "82348352e6568fcc0385bd7c99a8ead3a479feea" },
|
||||||
"rust.vim": { "branch": "master", "commit": "889b9a7515db477f4cb6808bef1769e53493c578" },
|
"rust.vim": { "branch": "master", "commit": "889b9a7515db477f4cb6808bef1769e53493c578" },
|
||||||
"rustaceanvim": { "branch": "master", "commit": "2a53e2fe911e971fa90341af27d2fe1447c0cbd2" },
|
"rustaceanvim": { "branch": "master", "commit": "cd35b0f7fb0c9fe6879b084096230a74fefa4da8" },
|
||||||
"sad.vim": { "branch": "master", "commit": "2f5b33b239a566ffedaa81cee3051bb613482d1e" },
|
"sad.vim": { "branch": "master", "commit": "2f5b33b239a566ffedaa81cee3051bb613482d1e" },
|
||||||
"stabilize.nvim": { "branch": "master", "commit": "eeb1873daffaba67246188a5668b366e45ed1de1" },
|
"stabilize.nvim": { "branch": "master", "commit": "eeb1873daffaba67246188a5668b366e45ed1de1" },
|
||||||
"startuptime.vim": { "branch": "master", "commit": "dfa57f522d6f61793fe5fea65bca7484751b8ca2" },
|
"startuptime.vim": { "branch": "master", "commit": "dfa57f522d6f61793fe5fea65bca7484751b8ca2" },
|
||||||
"tabular": { "branch": "master", "commit": "339091ac4dd1f17e225fe7d57b48aff55f99b23a" },
|
"tabular": { "branch": "master", "commit": "339091ac4dd1f17e225fe7d57b48aff55f99b23a" },
|
||||||
"targets.vim": { "branch": "master", "commit": "642d3a4ce306264b05ea3219920b13ea80931767" },
|
"targets.vim": { "branch": "master", "commit": "642d3a4ce306264b05ea3219920b13ea80931767" },
|
||||||
"telescope-dap.nvim": { "branch": "master", "commit": "8c88d9716c91eaef1cdea13cb9390d8ef447dbfe" },
|
"telescope-dap.nvim": { "branch": "master", "commit": "8c88d9716c91eaef1cdea13cb9390d8ef447dbfe" },
|
||||||
"telescope.nvim": { "branch": "master", "commit": "7d1698f3d88b448e0639974248cc17f49b7b8acf" },
|
"telescope.nvim": { "branch": "master", "commit": "35f94f0ef32d70e3664a703cefbe71bd1456d899" },
|
||||||
"todo-comments.nvim": { "branch": "main", "commit": "a7e39ae9e74f2c8c6dc4eea6d40c3971ae84752d" },
|
"todo-comments.nvim": { "branch": "main", "commit": "a7e39ae9e74f2c8c6dc4eea6d40c3971ae84752d" },
|
||||||
"trouble.nvim": { "branch": "main", "commit": "b9cf677f20bb2faa2dacfa870b084e568dca9572" },
|
"trouble.nvim": { "branch": "main", "commit": "b9cf677f20bb2faa2dacfa870b084e568dca9572" },
|
||||||
"typescript-vim": { "branch": "master", "commit": "e83ccab88c7a045ce795583adb66956afd464a31" },
|
"typescript-vim": { "branch": "master", "commit": "e83ccab88c7a045ce795583adb66956afd464a31" },
|
||||||
|
@ -93,10 +93,10 @@
|
||||||
"vim-svelte": { "branch": "main", "commit": "0e93ec53c3667753237282926fec626785622c1c" },
|
"vim-svelte": { "branch": "main", "commit": "0e93ec53c3667753237282926fec626785622c1c" },
|
||||||
"vim-toml": { "branch": "main", "commit": "d36caa6b1cf508a4df1c691f915572fc02143258" },
|
"vim-toml": { "branch": "main", "commit": "d36caa6b1cf508a4df1c691f915572fc02143258" },
|
||||||
"vim-tsx": { "branch": "master", "commit": "77c89c42e189fefd3c9a632b37b7e3b3b9edf918" },
|
"vim-tsx": { "branch": "master", "commit": "77c89c42e189fefd3c9a632b37b7e3b3b9edf918" },
|
||||||
"vim-visual-multi": { "branch": "master", "commit": "e2ff111f123da6cf97f95b96b10eb95854f953c9" },
|
"vim-visual-multi": { "branch": "master", "commit": "b84a6d42c1c10678928b0bf8327f378c8bc8af5a" },
|
||||||
"vim-vsnip": { "branch": "master", "commit": "02a8e79295c9733434aab4e0e2b8c4b7cea9f3a9" },
|
"vim-vsnip": { "branch": "master", "commit": "02a8e79295c9733434aab4e0e2b8c4b7cea9f3a9" },
|
||||||
"vim-vsnip-integ": { "branch": "master", "commit": "1914e72cf3de70df7f5dde476cd299aba2440aef" },
|
"vim-vsnip-integ": { "branch": "master", "commit": "1914e72cf3de70df7f5dde476cd299aba2440aef" },
|
||||||
"vimtex": { "branch": "master", "commit": "1b4df785a530b7704d081972e438b5678a6d111c" },
|
"vimtex": { "branch": "master", "commit": "6c01660a99c0cc0906b39094f4a2d086b28fa995" },
|
||||||
"webapi-vim": { "branch": "master", "commit": "70c49ada7827d3545a65cbdab04c5c89a3a8464e" },
|
"webapi-vim": { "branch": "master", "commit": "70c49ada7827d3545a65cbdab04c5c89a3a8464e" },
|
||||||
"which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" },
|
"which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" },
|
||||||
"yats.vim": { "branch": "master", "commit": "6927af6e3e45d0ce585684be5681bada0ffcc3a7" },
|
"yats.vim": { "branch": "master", "commit": "6927af6e3e45d0ce585684be5681bada0ffcc3a7" },
|
||||||
|
|
|
@ -70,3 +70,6 @@ if [[ -z $DISPLAY ]] && [[ $(tty) = /dev/tty1 ]]; then
|
||||||
tbsm
|
tbsm
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
export NVM_DIR="$HOME/.config/nvm"
|
||||||
|
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
|
||||||
|
|
|
@ -11,9 +11,9 @@ set $menu $rofi_cmd -show combi -combi-modes drun#run -modes combi
|
||||||
set $out-vert HDMI-A-1
|
set $out-vert HDMI-A-1
|
||||||
set $out-main DP-2
|
set $out-main DP-2
|
||||||
|
|
||||||
|
#timeout 300 'swaylock -f -c 000000' \
|
||||||
exec swayidle -w \
|
exec swayidle -w \
|
||||||
timeout 300 'swaylock -f -c 000000' \
|
timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on" && sleep 5 && eww -c "$HOME/.config/eww-bar" reload' \
|
||||||
timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \
|
|
||||||
before-sleep 'swaylock -f -c 000000'
|
before-sleep 'swaylock -f -c 000000'
|
||||||
|
|
||||||
exec mako
|
exec mako
|
||||||
|
|
|
@ -1,11 +1,23 @@
|
||||||
[
|
[
|
||||||
{
|
{
|
||||||
"context": "EmptyPane",
|
"context": "os == macos && EmptyPane",
|
||||||
"bindings": {
|
"bindings": {
|
||||||
":": "command_palette::Toggle",
|
":": "command_palette::Toggle",
|
||||||
"space p": "file_finder::Toggle"
|
"space p": "file_finder::Toggle"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"context": "os == macos && Editor && VimControl && !VimWaiting && !menu",
|
||||||
|
"bindings":{
|
||||||
|
"cmd-d": "editor::SelectNext"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"context": "os == linux && Editor && VimControl && !VimWaiting && !menu",
|
||||||
|
"bindings":{
|
||||||
|
"ctrl-shift-d": "editor::SelectNext"
|
||||||
|
}
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"context": "Editor && VimControl && !VimWaiting && !menu",
|
"context": "Editor && VimControl && !VimWaiting && !menu",
|
||||||
"bindings": {
|
"bindings": {
|
||||||
|
@ -18,7 +30,6 @@
|
||||||
"space c space": "editor::ToggleComments",
|
"space c space": "editor::ToggleComments",
|
||||||
|
|
||||||
// multi-cursor
|
// multi-cursor
|
||||||
"cmd-d": "editor::SelectNext",
|
|
||||||
"cmd-shift-d": "editor::SelectPrevious",
|
"cmd-shift-d": "editor::SelectPrevious",
|
||||||
"cmd-shift-l": "editor::SelectAllMatches",
|
"cmd-shift-l": "editor::SelectAllMatches",
|
||||||
"ctrl-j": "editor::AddSelectionBelow",
|
"ctrl-j": "editor::AddSelectionBelow",
|
||||||
|
@ -51,7 +62,7 @@
|
||||||
"bindings": {}
|
"bindings": {}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"context": "((Editor && vim_mode == normal) || Terminal) && !VimWaiting && !menu",
|
"context": "os == macos && ((Editor && vim_mode == normal) || Terminal) && !VimWaiting && !menu",
|
||||||
"bindings": {
|
"bindings": {
|
||||||
"cmd-t cmd-t": "terminal_panel::ToggleFocus",
|
"cmd-t cmd-t": "terminal_panel::ToggleFocus",
|
||||||
"cmd-t cmd-n": "workspace::NewTerminal",
|
"cmd-t cmd-n": "workspace::NewTerminal",
|
||||||
|
|
|
@ -1,7 +1,8 @@
|
||||||
{
|
{
|
||||||
"theme": "Gruvbox Dark Hard",
|
"theme": "Gruvbox Dark Hard",
|
||||||
"buffer_font_size": 14,
|
"buffer_font_size": 14,
|
||||||
"buffer_font_family": "JetBrainsMono Nerd Font Mono",
|
"buffer_font_family": "FiraCodeNF-Reg",
|
||||||
|
//"buffer_font_family": "JetBrainsMono Nerd Font Mono",
|
||||||
// "buffer_line_height": { "custom": 1.55 },
|
// "buffer_line_height": { "custom": 1.55 },
|
||||||
// "ui_font_family": "Noto Sans",
|
// "ui_font_family": "Noto Sans",
|
||||||
// "buffer_font_family": "Zed Mono",
|
// "buffer_font_family": "Zed Mono",
|
||||||
|
|
|
@ -138,6 +138,9 @@ export PATH="$HOME/.volta/bin:$PATH"
|
||||||
export PATH="$HOME/.local/bin:$PATH"
|
export PATH="$HOME/.local/bin:$PATH"
|
||||||
export PATH="$HOME/.bun/bin:$PATH"
|
export PATH="$HOME/.bun/bin:$PATH"
|
||||||
|
|
||||||
|
export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")"
|
||||||
|
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
|
||||||
|
|
||||||
if [ -d "/Applications/WezTerm.app" ]; then
|
if [ -d "/Applications/WezTerm.app" ]; then
|
||||||
export PATH="/Applications/WezTerm.app/Contents/MacOS:$PATH"
|
export PATH="/Applications/WezTerm.app/Contents/MacOS:$PATH"
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue