diff --git a/dashie.json b/dashie.json index 21a89c9..7e3e561 100644 --- a/dashie.json +++ b/dashie.json @@ -35,7 +35,7 @@ "KC_O", "KC_P", "KC_BSLS", - "LT(1,KC_CAPS)", + "MO(1)", "KC_A", "KC_S", "KC_D", @@ -64,20 +64,20 @@ "KC_SLSH", "KC_GRV", "KC_LCTL", - "KC_LGUI", - "KC_LALT", - "RGB_TOG", "MO(4)", + "RGB_TOG", + "KC_LALT", + "KC_LGUI", "KC_SPC", "KC_PGDN", "KC_DEL", - "KC_ENT", + "KC_BSPC", "KC_PGUP", "KC_ENT", - "KC_LEFT", - "KC_DOWN", - "KC_UP", - "KC_RGHT", + "KC_RCTL", + "KC_RALT", + "KC_CAPS", + "KC_HOME", "KC_RCTL", "KC_VOLD", "KC_VOLU", @@ -164,7 +164,7 @@ "KC_TRNS", "KC_TRNS", "KC_TRNS", - "KC_TRNS", + "KC_CAPS", "KC_TRNS", "KC_TRNS", "KC_TRNS", diff --git a/eww_desktop/eww.yuck b/eww_desktop/eww.yuck index a330875..45cff80 100644 --- a/eww_desktop/eww.yuck +++ b/eww_desktop/eww.yuck @@ -1,5 +1,5 @@ ;; date definitions ;; -(defpoll clock_time :interval "1m" "date +\%I") +(defpoll clock_time :interval "5s" "date +\%I") (defpoll clock_minute :interval "5s" "date +\%M") (defpoll clock_date :interval "1h" "date '+%d/%m'") diff --git a/gtk-3.0/bookmarks b/gtk-3.0/bookmarks index 5e8c660..4be38b9 100644 --- a/gtk-3.0/bookmarks +++ b/gtk-3.0/bookmarks @@ -2,8 +2,10 @@ file:///home/dashie/Documents file:///home/dashie/Pictures file:///home/dashie/Downloads file:///home/dashie/gits +file:///home/dashie/gits/ost-5semester ost-5semester file:///home/dashie/gits/ost-4semester file:///home/dashie/gits/ost-3semester +file:///home/dashie/Documents/OST%205.semester OST 5.semester file:///home/dashie/Documents/OST%204.semester file:///drive2 file:///drive2/animu diff --git a/gtk-4.0/servers b/gtk-4.0/servers index d3eb808..afeb2e7 100644 --- a/gtk-4.0/servers +++ b/gtk-4.0/servers @@ -3,12 +3,21 @@ xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks" xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info" > - + Windows shares on 192.168.1.4 - + + + + + + + + + + diff --git a/gtk-4.0/settings.ini b/gtk-4.0/settings.ini new file mode 100644 index 0000000..5dbd750 --- /dev/null +++ b/gtk-4.0/settings.ini @@ -0,0 +1,2 @@ +[Settings] +gtk-application-prefer-dark-theme=true diff --git a/hypr_desktop/hyprland.conf b/hypr_desktop/hyprland.conf index 4de4312..d5d0d30 100644 --- a/hypr_desktop/hyprland.conf +++ b/hypr_desktop/hyprland.conf @@ -18,8 +18,8 @@ workspace=DP-1,2 workspace=DP-2,3 input { - kb_file=/home/dashie/.config/keymap.xkb #us with dead_diaeresis on shift + ' to get ä ö ü - kb_layout= + kb_file= + kb_layout=diaeresis kb_variant= kb_model= kb_options= @@ -221,4 +221,5 @@ exec-once=firefox exec-once=streamdeck -n exec-once=copyq --start-server exec-once=/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 +exec-once= easyeffects --gapplication-service # plugin=/home/dashie/gits/hy3/build/libhy3.so diff --git a/hypr_desktop/neovide_backtraces.log b/hypr_desktop/neovide_backtraces.log new file mode 100644 index 0000000..051982a --- /dev/null +++ b/hypr_desktop/neovide_backtraces.log @@ -0,0 +1,15 @@ +2023-05-17 18:07:34 - Neovide panicked with the message 'Failed to initialize any backend! Wayland status: NoCompositorListening X11 status: XOpenDisplayFailed'. (File: /home/dashie/.cargo/git/checkouts/winit-223f41148c32cc30/19d9aaf/src/platform_impl/linux/mod.rs; Line: 795, Column: 9) + 0: + 1: + 2: + 3: + 4: + 5: + 6: + 7: + 8: + 9: + 10: + 11: __libc_start_main + 12: + diff --git a/ncspot/config.toml b/ncspot/config.toml index 2748c2c..535ee7e 100644 --- a/ncspot/config.toml +++ b/ncspot/config.toml @@ -20,3 +20,9 @@ statusbar_bg = "#7dcfff" cmdline_bg = "#24283b" search_match = "#bb9af7" + +[keybindings] +"j" = "move left 1" +"k" = "move down 1" +"l" = "move up 1" +";" = "move right 1" diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 718e715..3f0b7dd 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -1,72 +1,73 @@ { - "LazyVim": { "branch": "main", "commit": "9f2010a8b9fa88ef77d1acf362bab59db4baaef9" }, - "LuaSnip": { "branch": "master", "commit": "b4bc24c4925aeb05fd47d2ee9b24b7f73f5d7e32" }, - "alpha-nvim": { "branch": "main", "commit": "1838ae926e8d49fe5330d1498ee8289ae2c340bc" }, - "bufferline.nvim": { "branch": "main", "commit": "1952c33e425ede785d26aa9e250addfe304a8510" }, - "catppuccin": { "branch": "main", "commit": "57b421ee5f7380f816791fa451e86f213b625ece" }, + "LazyVim": { "branch": "main", "commit": "c998be8fa4bd67bf130fdbc05f7c2198aa00441c" }, + "LuaSnip": { "branch": "master", "commit": "c7984d1cca3d8615e4daefc196597872a0b8d590" }, + "alpha-nvim": { "branch": "main", "commit": "9e33db324b8bb7a147bce9ea5496686ee859461d" }, + "bufferline.nvim": { "branch": "main", "commit": "fe774743cc7434d8f5539093108bf7d6d950f416" }, + "catppuccin": { "branch": "main", "commit": "8d02781a638123394f9bc160aad47a9560a113f9" }, "cmp-async-path": { "branch": "main", "commit": "d8229a93d7b71f22c66ca35ac9e6c6cd850ec61d" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, - "crates.nvim": { "branch": "main", "commit": "dca1949b0405c6ee5173d0627a523a10a63eca3c" }, - "dressing.nvim": { "branch": "master", "commit": "66e4990240f92e31b0d5e4df6deb6bb0160ae832" }, + "crates.nvim": { "branch": "main", "commit": "258961973c2cbef5717d4a726c68a0730fb0f94b" }, + "dressing.nvim": { "branch": "master", "commit": "e6eff7a5a950a853c3903d906dbcea03f778db5f" }, "editorconfig.nvim": { "branch": "master", "commit": "5b9e303e1d6f7abfe616ce4cc8d3fffc554790bf" }, - "flit.nvim": { "branch": "main", "commit": "f60e4b3d49bb5a5e97cfffe66f2e671eb422078e" }, - "friendly-snippets": { "branch": "main", "commit": "1d0dac346de7c6895ac72528df3276386c6b149b" }, - "git-blame.nvim": { "branch": "master", "commit": "37abc3436aef9b9fe37f38541fe096f8a42b8d4a" }, - "gitsigns.nvim": { "branch": "main", "commit": "814158f6c4b1724c039fcefe79b0be72c9131c2d" }, - "harpoon": { "branch": "master", "commit": "3476228be2d79f66ebbdb34eafc45842d054f7df" }, - "indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" }, + "flit.nvim": { "branch": "main", "commit": "5c9a78b97f7f4301473ea5e37501b5b1d4da167b" }, + "friendly-snippets": { "branch": "main", "commit": "5749f093759c29e3694053d048ceb940fe12c3d3" }, + "git-blame.nvim": { "branch": "master", "commit": "93d983806a0c76692bebd6f804c8eaa2a3844452" }, + "gitsigns.nvim": { "branch": "main", "commit": "a36bc3360d584d39b4fb076d855c4180842d4444" }, + "harpoon": { "branch": "master", "commit": "21f4c47c6803d64ddb934a5b314dcb1b8e7365dc" }, + "indent-blankline.nvim": { "branch": "master", "commit": "7075d7861f7a6bbf0de0298c83f8a13195e6ec01" }, "instant.nvim": { "branch": "master", "commit": "294b6d08143b3db8f9db7f606829270149e1a786" }, - "lazy.nvim": { "branch": "main", "commit": "aba872ec78ffe7f7367764ab0fff6f0170421fde" }, - "leap.nvim": { "branch": "main", "commit": "6f2912755c9c4ae790abd829f0cf1b07c037b2a4" }, - "lsp-inlayhints.nvim": { "branch": "main", "commit": "62c7b8dd8ac9933b071912fe3c789ef2cb704672" }, + "lazy.nvim": { "branch": "main", "commit": "b7043f2983d7aead78ca902f3f2053907081859a" }, + "leap.nvim": { "branch": "main", "commit": "c390eab0950ea01a0d118c2c3c29db7781430b33" }, + "lsp-inlayhints.nvim": { "branch": "main", "commit": "d981f65c9ae0b6062176f0accb9c151daeda6f16" }, "lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" }, "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "90a8bbf106b85b76951a34c542058ffa807de2b1" }, - "mason-nvim-dap.nvim": { "branch": "main", "commit": "c836e511e796d2b6a25ad9f164f5b25d8b9ff705" }, - "mason.nvim": { "branch": "main", "commit": "e634134312bb936f472468a401c9cae6485ab54b" }, - "mini.ai": { "branch": "main", "commit": "44d7df1340b16b16b27b67fba07028cb57f45408" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "c993ca55e3991535bc74cd2d6ef273810d066c84" }, + "mason-nvim-dap.nvim": { "branch": "main", "commit": "e4d56b400e9757b1dc77d620fd3069396e92d5fc" }, + "mason.nvim": { "branch": "main", "commit": "db58ec7bc9248fb1878172f90cadc825b77564a6" }, + "mini.ai": { "branch": "main", "commit": "3f5963b3f5f42d5cf545b06192e1682395f90fb3" }, "mini.bufremove": { "branch": "main", "commit": "14805473144fffbd019d07e51bed2d176e065ee9" }, - "mini.comment": { "branch": "main", "commit": "6fbcd1294fa516dafc97e25e2f316de851f680d3" }, + "mini.comment": { "branch": "main", "commit": "877acea5b2a32ff55f808fc0ebe9aa898648318c" }, "mini.indentscope": { "branch": "main", "commit": "f60e9b51a6214c73a170ffc5445ce91560981031" }, "mini.pairs": { "branch": "main", "commit": "963b800d0524eadd297199207011b98684205ada" }, - "mini.surround": { "branch": "main", "commit": "ea2e9c4cdbddc826dc6eeac69b035f8220f65de5" }, - "neoconf.nvim": { "branch": "main", "commit": "0995e82a5252167de792494356da7907577b927c" }, - "neodev.nvim": { "branch": "main", "commit": "5e7e613950df5e2be27534ab5c55fd21af1b2ad3" }, + "mini.surround": { "branch": "main", "commit": "14f418209ecf52d1a8de9d091eb6bd63c31a4e01" }, + "neoconf.nvim": { "branch": "main", "commit": "3454d48dce19e0fe534e3e4849aa17c47c47d15f" }, + "neodev.nvim": { "branch": "main", "commit": "2e53151d1a0895f7c642feb5ed6dc7f7d205238c" }, "neoscroll.nvim": { "branch": "master", "commit": "d7601c26c8a183fa8994ed339e70c2d841253e93" }, - "nui.nvim": { "branch": "main", "commit": "698e75814cd7c56b0dd8af4936bcef2d13807f3c" }, - "null-ls.nvim": { "branch": "main", "commit": "08bb00c7c2cd58c72e02cf54e4b9cbfe14b03e09" }, - "nvim-cmp": { "branch": "main", "commit": "d153771162bd9795d9f7142df5c674b61066a585" }, - "nvim-dap": { "branch": "master", "commit": "6cedcb527e264c8f25e86afa8dae74c6692dee51" }, - "nvim-dap-ui": { "branch": "master", "commit": "4ce7b97dd8f50b4f672948a34bf8f3a56214fdb8" }, - "nvim-dap-virtual-text": { "branch": "master", "commit": "ab988dbb7d20cdaebf9b3ef7554a89f6895de042" }, + "nui.nvim": { "branch": "main", "commit": "d146966a423e60699b084eeb28489fe3b6427599" }, + "null-ls.nvim": { "branch": "main", "commit": "bbaf5a96913aa92281f154b08732be2f57021c45" }, + "nvim-cmp": { "branch": "main", "commit": "e1f1b40790a8cb7e64091fb12cc5ffe350363aa0" }, + "nvim-dap": { "branch": "master", "commit": "a6d48d23407fbad7a4c1451803b8f34cab31c441" }, + "nvim-dap-ui": { "branch": "master", "commit": "c020f660b02772f9f3d11f599fefad3268628a9e" }, + "nvim-dap-virtual-text": { "branch": "master", "commit": "57f1dbd0458dd84a286b27768c142e1567f3ce3b" }, "nvim-highlight-colors": { "branch": "main", "commit": "8d7e7fe540b404ec06a248d6e5797eaf3362420c" }, - "nvim-jdtls": { "branch": "master", "commit": "355de7458fd63ccef9c6485d952ea118ba2cb46a" }, - "nvim-lspconfig": { "branch": "master", "commit": "df58d91c9351a9dc5be6cf8d54f49ab0d9a64e73" }, - "nvim-navic": { "branch": "master", "commit": "15704c607569d6c5cfeab486d3ef9459645a70ce" }, - "nvim-spectre": { "branch": "master", "commit": "1abe23ec9b7bc3082164f4cb842d521ef70e080e" }, - "nvim-tree.lua": { "branch": "master", "commit": "89816ace70642e9d3db0dab3dc68918f8979ec31" }, - "nvim-treesitter": { "branch": "master", "commit": "680807fa6a482c639119098bc48ca3831c66db13" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "35a60f093fa15a303874975f963428a5cd24e4a0" }, - "nvim-web-devicons": { "branch": "master", "commit": "986875b7364095d6535e28bd4aac3a9357e91bbe" }, - "persistence.nvim": { "branch": "main", "commit": "c814fae5c37aa0aba9cd9da05df6e52b88d612c3" }, - "plenary.nvim": { "branch": "master", "commit": "9ac3e9541bbabd9d73663d757e4fe48a675bb054" }, - "rust-tools.nvim": { "branch": "master", "commit": "71d2cf67b5ed120a0e31b2c8adb210dd2834242f" }, + "nvim-jdtls": { "branch": "master", "commit": "c6a3c47a0c57c6c0c9b5fb92d3770bb59e92d9c6" }, + "nvim-lspconfig": { "branch": "master", "commit": "b6b34b9acf84949f0ac1c00747765e62b81fb38d" }, + "nvim-navic": { "branch": "master", "commit": "32cff45f1c84bec5e2a7bf15c0f3c6739b64c85d" }, + "nvim-spectre": { "branch": "master", "commit": "f4dc98ec45ecded2344aa3aac2d7cc43ad236858" }, + "nvim-tree.lua": { "branch": "master", "commit": "3cc698b35b0a67792c61e1726830bb9ecfc4c9f4" }, + "nvim-treesitter": { "branch": "master", "commit": "bad9f5bf5b4af5d97a9cffdc957f1b23dc91d851" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "52f1f3280d9092bfaee5c45be5962fabee3d9654" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "7f625207f225eea97ef7a6abe7611e556c396d2f" }, + "nvim-web-devicons": { "branch": "master", "commit": "9ab9b0b894b2388a9dbcdee5f00ce72e25d85bf9" }, + "persistence.nvim": { "branch": "main", "commit": "4b8051c01f696d8849a5cb8afa9767be8db16e40" }, + "plenary.nvim": { "branch": "master", "commit": "36aaceb6e93addd20b1b18f94d86aecc552f30c4" }, "tailwindcss-colorizer-cmp.nvim": { "branch": "main", "commit": "65565c62963579897d28390dbd1ba8fb15ba545f" }, - "telescope-file-browser.nvim": { "branch": "master", "commit": "4054a5d0ab85475bf75df00cf10754d2e54b5532" }, + "telescope-file-browser.nvim": { "branch": "master", "commit": "acf2eade45563803afdd4e9873a8481bc98bd726" }, "telescope-project.nvim": { "branch": "master", "commit": "7c64b181dd4e72deddcf6f319e3bf1e95b2a2f30" }, "telescope-zoxide": { "branch": "main", "commit": "68966349aa1b8e9ade403e18479ecf79447389a7" }, - "telescope.nvim": { "branch": "master", "commit": "d77b37f4520e5fc2cf4c74c12e42ed4b589bd367" }, - "todo-comments.nvim": { "branch": "main", "commit": "8febc60a76feefd8203077ef78b6a262ea1a41f9" }, - "toggleterm.nvim": { "branch": "main", "commit": "68fdf851c2b7901a7065ff129b77d3483419ddce" }, - "tokyonight.nvim": { "branch": "main", "commit": "df13e3268a44f142999fa166572fe95a650a0b37" }, - "trouble.nvim": { "branch": "main", "commit": "d56bfc0c501ced4002a57cb60433362fb2ce9c4d" }, - "typst.vim": { "branch": "main", "commit": "9fc5668556ffac9ef180adaac717995b67330f2c" }, + "telescope.nvim": { "branch": "master", "commit": "6074847b6ee4b725747c8fc540d9b6b128ac8a12" }, + "todo-comments.nvim": { "branch": "main", "commit": "09b0b17d824d2d56f02ff15967e8a2499a89c731" }, + "toggleterm.nvim": { "branch": "main", "commit": "4cac5c96445df3a97f162a0f810e38fde1eb525e" }, + "tokyonight.nvim": { "branch": "main", "commit": "fd0a005fd8986ec0d98a1938dc570303e8d8444b" }, + "trouble.nvim": { "branch": "main", "commit": "d99e2abd10808ef91738ce98a5c767e6a51df449" }, + "typst.vim": { "branch": "main", "commit": "e990294efa7ea9b4116f03291dce7dea6b3250d3" }, "vim-illuminate": { "branch": "master", "commit": "a2907275a6899c570d16e95b9db5fd921c167502" }, "vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" }, - "vim-startuptime": { "branch": "master", "commit": "01b67169c3ebe41f163c07bf6853555ca19bc27f" }, - "vimtex": { "branch": "master", "commit": "f4145bc2af5e4d8f989e1d31be63b3d4140d2a81" }, - "which-key.nvim": { "branch": "main", "commit": "5a6c954a5a46023c19acc03a8b6d7c3e57964fc5" } + "vim-startuptime": { "branch": "master", "commit": "454b3de856b7bd298700de33d79774ca9b9e3875" }, + "vim-visual-multi": { "branch": "master", "commit": "724bd53adfbaf32e129b001658b45d4c5c29ca1a" }, + "vimtex": { "branch": "master", "commit": "b38bbcab7ab05067ce460e2d9e69c896fea7ebe0" }, + "which-key.nvim": { "branch": "main", "commit": "d871f2b664afd5aed3dc1d1573bef2fb24ce0484" } } \ No newline at end of file diff --git a/nvim/lua/config/lsp-keymap.lua b/nvim/lua/config/lsp-keymap.lua index c5cd329..25451e2 100644 --- a/nvim/lua/config/lsp-keymap.lua +++ b/nvim/lua/config/lsp-keymap.lua @@ -40,17 +40,8 @@ function M.get() }) end, desc = "Code Action", mode = { "n", "v" }, has = "codeAction" }, { - "cA", - function() - vim.lsp.buf.code_action({ - context = { - only = { - "refactor", - }, - diagnostics = {}, - }, - }) - end, + "cQ", + vim.lsp.buf.code_action, desc = "Source Action", has = "codeAction", } diff --git a/nvim/lua/plugins/lsp.lua b/nvim/lua/plugins/lsp.lua index 5252522..e2f4cbd 100644 --- a/nvim/lua/plugins/lsp.lua +++ b/nvim/lua/plugins/lsp.lua @@ -156,7 +156,7 @@ return { require("lazyvim.plugins.lsp.format").autoformat = opts.autoformat -- setup formatting and keymaps require("lazyvim.util").on_attach(function(client, buffer) - require("lazyvim.plugins.lsp.format").on_attach(client, buffer) + require("lazyvim.plugins.lsp.format").setup(opts) require("config.lsp-keymap").on_attach(client, buffer) end) diff --git a/nvim/lua/plugins/plugins.lua b/nvim/lua/plugins/plugins.lua index 127dc5e..aabedbd 100644 --- a/nvim/lua/plugins/plugins.lua +++ b/nvim/lua/plugins/plugins.lua @@ -209,4 +209,7 @@ return { "f-person/git-blame.nvim", lazy = true, }, + { + "mg979/vim-visual-multi", + }, }