diff --git a/environment.d/envvars.conf b/environment.d/envvars.conf index c5df174..bb42f2f 100644 --- a/environment.d/envvars.conf +++ b/environment.d/envvars.conf @@ -14,4 +14,3 @@ TEXMFHOME=$HOME/.texmf PATH=/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl:$HOME/.local/bin:$HOME/.cargo/bin:$PATH EDITOR=nv SUDO_EDITOR=nv -RADV_PERFTEST=gpl diff --git a/gtk-3.0/bookmarks b/gtk-3.0/bookmarks index bebcd68..5e8c660 100644 --- a/gtk-3.0/bookmarks +++ b/gtk-3.0/bookmarks @@ -5,3 +5,5 @@ file:///home/dashie/gits file:///home/dashie/gits/ost-4semester file:///home/dashie/gits/ost-3semester 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 45a22c7..d3eb808 100644 --- a/gtk-4.0/servers +++ b/gtk-4.0/servers @@ -3,12 +3,12 @@ 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/hypr_desktop/hyprdock.toml b/hypr_desktop/hyprdock.toml index 8a74e1f..46f0353 100644 --- a/hypr_desktop/hyprdock.toml +++ b/hypr_desktop/hyprdock.toml @@ -1,2 +1,3 @@ monitor_name = 'whatever' utility_command = "echo 'henlo' ;; echo 'pingpang'" +css_string = "/home/dashie/.config/hypr/hyprstyle.css" diff --git a/hypr_desktop/hyprstyle.css b/hypr_desktop/hyprstyle.css new file mode 100644 index 0000000..fb79df0 --- /dev/null +++ b/hypr_desktop/hyprstyle.css @@ -0,0 +1,3 @@ +#MainWindow { + border-radius: 10px; +} diff --git a/hypr_desktop/monitors/1.json b/hypr_desktop/monitors/1.json new file mode 100644 index 0000000..38301d7 --- /dev/null +++ b/hypr_desktop/monitors/1.json @@ -0,0 +1,67 @@ +[{ + "id": 0, + "name": "DP-1", + "description": "ASUSTek COMPUTER INC XG349C (DP-1)", + "make": "ASUSTek COMPUTER INC", + "model": "XG349C", + "serial": "", + "width": 3440, + "height": 1440, + "refreshRate": 179.998993, + "x": 2560, + "y": 0, + "activeWorkspace": { + "id": 2, + "name": "2" + }, + "reserved": [0, 30, 0, 0], + "scale": 1.00, + "transform": 0, + "focused": false, + "dpmsStatus": true, + "vrr": true +},{ + "id": 1, + "name": "DP-2", + "description": "Lenovo Group Limited LEN LT2452pwC 0x33344B41 (DP-2)", + "make": "Lenovo Group Limited", + "model": "LEN LT2452pwC", + "serial": "0x33344B41", + "width": 1920, + "height": 1200, + "refreshRate": 59.950001, + "x": 6000, + "y": 0, + "activeWorkspace": { + "id": 3, + "name": "3" + }, + "reserved": [0, 0, 0, 0], + "scale": 1.00, + "transform": 1, + "focused": false, + "dpmsStatus": true, + "vrr": false +},{ + "id": 2, + "name": "DP-3", + "description": "ASUSTek COMPUTER INC ROG PG278QR #ASOWXFZDWU/d (DP-3)", + "make": "ASUSTek COMPUTER INC", + "model": "ROG PG278QR", + "serial": "#ASOWXFZDWU/d", + "width": 2560, + "height": 1440, + "refreshRate": 165.000000, + "x": 0, + "y": 0, + "activeWorkspace": { + "id": 1, + "name": "1" + }, + "reserved": [0, 0, 0, 0], + "scale": 1.00, + "transform": 0, + "focused": true, + "dpmsStatus": true, + "vrr": false +}] diff --git a/nvim/ftplugin/rust.lua b/nvim/ftplugin/rust.lua new file mode 100644 index 0000000..bcda183 --- /dev/null +++ b/nvim/ftplugin/rust.lua @@ -0,0 +1,12 @@ +local rt = require("rust-tools") + +rt.setup({ + server = { + on_attach = function(_, bufnr) + -- Hover actions + vim.keymap.set("n", "", rt.hover_actions.hover_actions, { buffer = bufnr }) + -- Code action groups + vim.keymap.set("n", "a", rt.code_action_group.code_action_group, { buffer = bufnr }) + end, + }, +}) diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 0b4acd7..3501717 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -35,7 +35,6 @@ "neoconf.nvim": { "branch": "main", "commit": "6aaeb48336b369d7ed8ef243bfd0d76ec79362cd" }, "neodev.nvim": { "branch": "main", "commit": "864b35006d3de24c60e44b566de8018f919b13e6" }, "neoscroll.nvim": { "branch": "master", "commit": "d7601c26c8a183fa8994ed339e70c2d841253e93" }, - "noice.nvim": { "branch": "main", "commit": "1da4edfba3e9278e98fc9723d7235d9ab3889744" }, "nui.nvim": { "branch": "main", "commit": "1f43b13d133eb4b4f53a4485379d9afa58808389" }, "null-ls.nvim": { "branch": "main", "commit": "5855128178fa78293acdfb5b4e41ef046779240b" }, "nvim-cmp": { "branch": "main", "commit": "777450fd0ae289463a14481673e26246b5e38bf2" }, @@ -54,6 +53,7 @@ "nvim-web-devicons": { "branch": "master", "commit": "0568104bf8d0c3ab16395433fcc5c1638efc25d4" }, "persistence.nvim": { "branch": "main", "commit": "c814fae5c37aa0aba9cd9da05df6e52b88d612c3" }, "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, + "rust-tools.nvim": { "branch": "master", "commit": "71d2cf67b5ed120a0e31b2c8adb210dd2834242f" }, "tailwindcss-colorizer-cmp.nvim": { "branch": "main", "commit": "f044050da3ec6e1cdb31985beecec6810cc27f0b" }, "telescope-file-browser.nvim": { "branch": "master", "commit": "e0fcb12702ad0d2873544a31730f9aaef04fd032" }, "telescope-project.nvim": { "branch": "master", "commit": "fa081e35ba7397e5147a51ece693aa3afda167fc" }, diff --git a/nvim/lua/config/keymaps.lua b/nvim/lua/config/keymaps.lua index 48f64ae..ac16dcb 100644 --- a/nvim/lua/config/keymaps.lua +++ b/nvim/lua/config/keymaps.lua @@ -1,7 +1,3 @@ --- maps are automatically loaded on the VeryLazy event --- Default maps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/maps.lua --- Add any additional maps here - local Util = require("lazyvim.util") local function map(mode, lhs, rhs, opts) @@ -17,10 +13,6 @@ end local opts = { noremap = true, silent = true } local term_opts = { silent = true } --- map("n", "d", ':set relativenumberd', opts) --- map("n", "y", ':set relativenumbery', opts) --- map("n", "", ':set norelativenumber', opts) - -- crimes against humanity, but I don't care map("n", "j", "h", opts) map("n", "l", "k", opts) @@ -43,7 +35,7 @@ map("n", "", ':lua require("dap").close() :lua require("dapui").toggle( map("n", "f", ":lua require('nvim-tree.api').tree.toggle()", opts) -- toggle terminal -map("n", "", ":lua require('toggleterm').toggle(1)", opts) +map("n", "", ":lua require('toggleterm').toggle(1)", opts) -- tab switching map("n", "", ":BufferLineCyclePrev", opts) @@ -72,8 +64,8 @@ function _G.set_terminal_maps() vim.keymap.set("t", "jk", [[]], opts) vim.keymap.set("t", "", [[wincmd h]], opts) vim.keymap.set("t", "", [[wincmd j]], opts) - -- vim.keymap.set("t", "", [[wincmd k]], opts) - -- vim.keymap.set("t", "", [[wincmd l]], opts) + vim.keymap.set("n", "", ":lua require('toggleterm').toggle(1)", opts) + vim.keymap.set("i", "", ":lua require('toggleterm').toggle(1)", opts) end -- if you only want these mappings for toggle term use term://*toggleterm#* instead @@ -84,7 +76,6 @@ map("n", "", ":wincmd k", opts) map("n", "", ":wincmd l", opts) -- harpoon man - map("n", "", ":lua require('harpoon.ui').nav_file(1)", opts) map("n", "", ":lua require('harpoon.ui').nav_file(2)", opts) map("n", "", ":lua require('harpoon.ui').nav_file(3)", opts) @@ -98,7 +89,6 @@ map("n", "fg", ":lua require('telescope.builtin').live_grep()", {}) map("n", "fh", ":lua require('telescope.builtin').help_tags()", {}) map("n", "fp", ":lua require'telescope'.extensions.project.project{}", { noremap = true, silent = true }) map("n", "fm", ":Telescope harpoon marks", { noremap = true, silent = true }) - vim.keymap.set("n", "z", ":lua require('telescope').extensions.zoxide.list{}") -- trouble @@ -110,8 +100,9 @@ function Better_yank(opts) vim.api.nvim_command(current_line .. "," .. (opts.count - (current_line - 1)) .. "y") end -vim.api.nvim_create_user_command("BetterYank", Better_yank, { count = 1 }) map("n", "gy", ":BetterYank", term_opts) +vim.api.nvim_create_user_command("BetterYank", Better_yank, { count = 1 }) map("n", "y", ":BetterYank", term_opts) + -- better delete function Better_delete(opts) local current_line = unpack(vim.api.nvim_win_get_cursor(0)) @@ -121,6 +112,17 @@ end vim.api.nvim_create_user_command("BetterDelete", Better_delete, { count = 1 }) map("n", "d", ":BetterDelete", term_opts) +-- neovide zoom +local change_scale_factor = function(delta) + vim.g.neovide_scale_factor = vim.g.neovide_scale_factor * delta +end +vim.keymap.set("n", "", function() + change_scale_factor(1.25) +end) +vim.keymap.set("n", "", function() + change_scale_factor(1 / 1.25) +end) + -- gitui map("n", "gg", function() Util.float_term({ "gitui" }, { cwd = Util.get_root() }) diff --git a/nvim/lua/plugins/lsp.lua b/nvim/lua/plugins/lsp.lua index 7b3163d..596999e 100644 --- a/nvim/lua/plugins/lsp.lua +++ b/nvim/lua/plugins/lsp.lua @@ -50,7 +50,7 @@ return { marksman = {}, asm_lsp = {}, csharp_ls = { - cmd = { "/home/dashie/.dotnet/tools/csharp-ls" }, + cmd = { "/home/dashie/.local/share/nvim/mason/bin/csharp-ls" }, filetypes = { "cs" }, init_options = { AutomaticWorkspaceInit = true, @@ -115,6 +115,9 @@ return { jdtls = function() return true end, + rust_analyzer = function() + return true + end, }, }, config = function(plugin, opts) @@ -148,7 +151,6 @@ return { on_attach = on_attach, vim.lsp.diagnostic.on_publish_diagnostics, { - -- Disable virtual_text virtual_text = true, }, }, servers[server] or {}) diff --git a/nvim/lua/plugins/plugins.lua b/nvim/lua/plugins/plugins.lua index b97d5ef..d85cc76 100644 --- a/nvim/lua/plugins/plugins.lua +++ b/nvim/lua/plugins/plugins.lua @@ -158,4 +158,18 @@ return { require("neoscroll.config").set_mappings(t) end, }, + { + "simrat39/rust-tools.nvim", + lazy = true, + event = "FileType rust", + dependencies = { "neovim/nvim-lspconfig", "nvim-lua/plenary.nvim", "mfussenegger/nvim-dap" }, + opts = function() + local extension_path = vim.env.HOME .. "/.local/share/nvim/mason/packages/codelldb/extension/" + local codelldb_path = extension_path .. "adapter/codelldb" + local liblldb_path = extension_path .. "lldb/lib/liblldb.dylib" + return { + dap = { adapter = require("rust-tools.dap").get_codelldb_adapter(codelldb_path, liblldb_path) }, + } + end, + }, }