neovim migration

gtk-3.0/bookmarks

@@ -5,3 +5,4 @@ file:///home/mahalo/photos/random random
 file:///home/mahalo/School School
 file:///home/mahalo/nextcloud nextcloud
 sftp://adum/ / on adum
+file:///home/mahalo/School/statistics statistics

hypr/hyprland.conf

@@ -1,7 +1,6 @@
-# See https://wiki.hyprland.org/Configuring/Monitors/
+# monitors
 monitor=DP-4,3840x2160@144,0x0,2
 monitor=DP-5, 3840x2160@60,-1920x-950,2
-# See https://wiki.hyprland.org/Configuring/Keywords/ for more
 
 # Execute your favorite apps at launch
 exec-once = waybar & nm-applet & dunst & nextcloud & hyprpaper & hypridle
@@ -9,7 +8,6 @@ exec-once = waybar -c ~/.config/waybar/config2
 exec-once = /usr/bin/openrgb --startminimized --profile "ssx"
 exec-once = dbus-update-activation-environment --all
 exec-once = gnome-keyring-daemon --start --components=secrets
-
 exec-once = $HOME/scripts/startup.sh
 
 
@@ -41,10 +39,7 @@ env = ELECTRON_OZONE_PLATFORM_HINT , auto
 xwayland {
   force_zero_scaling = true
 }
-# toolkit-specific scale x11
-# env = GDK_SCALE,1
-# env =  QT_SCALE_FACTOR,1
-# For all categories, see https://wiki.hyprland.org/Configuring/Variables/
+
 input {
     kb_layout = us
     kb_variant =
@@ -52,7 +47,6 @@ input {
     kb_options = caps:escape
     kb_rules =
 
-
     follow_mouse = 1
 
     touchpad {
@@ -106,47 +100,32 @@ animations {
 }
 
 dwindle {
-    # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
-    pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
+    pseudotile = yes
     preserve_split = yes
 }
 
 master {
 }
 
-gestures {
-    workspace_swipe = off
-}
 
 misc {
     disable_splash_rendering = true
     disable_hyprland_logo = true
 }
 
-# Example per-device config
-# See https://wiki.hyprland.org/Configuring/Keywords/#per-device-input-configs for more
 device {
     name = epic-mouse-v1
     sensitivity = -0.5
 }
 
-# Example windowrule v1
-# windowrule = float, ^(kitty)$
-# Example windowrule v2
-# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
-# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
-# Special window rules
-
 windowrulev2 = suppressevent maximize, class:.* # You'll probably like this.
 windowrulev2 = noscreenshare, class:^(Bitwarden)$
 windowrulev2 = float,class:^(io.bassi.Amberol)$
 windowrulev2 = size 413 689,class:^(io.bassi.Amberol)$
 windowrulev2 = float,class:^(qalculate-gtk)$,title:^(Qalculate!)$
 
-# See https://wiki.hyprland.org/Configuring/Keywords/ for more
 $mainMod = SUPER
 
-# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
 bind = $mainMod, R, exec, $terminal
 bind = $mainMod, T, exec, alacritty
 bind = $mainMod, Q, killactive,
@@ -225,6 +204,7 @@ windowrulev2 = workspace 3,class:^(nemo)$
 windowrulev2 = workspace 4,title:^(VSCodium)$
 windowrulev2 = workspace 4,class:^(jetbrains-idea-ce)$
 windowrulev2 = workspace 4,title:^(Postman)$
+windowrulev2 = workspace 4,title:^(RStudio)$
 windowrulev2 = workspace 5,class:^(obsidian)$
 windowrulev2 = workspace 5,class:^(libreoffice-writer)$
 windowrulev2 = workspace 5,class:^(com.discordapp.DiscordCanary)$

hypr/hyprpaper.conf

@@ -1,7 +1,7 @@
-preload= /home/mahalo/photos/wallhaven-e8z1jw.jpg
-preload= /home/mahalo/photos/wallhaven-vqorm5.jpg
-wallpaper = DP-4,/home/mahalo/photos/wallhaven-e8z1jw.jpg
-wallpaper = DP-5,/home/mahalo/photos/wallhaven-vqorm5.jpg
+preload= /home/mahalo/photos/wallhaven-6dp3mx.jpg
+preload= /home/mahalo/photos/wallhaven-p8qrym.jpg
+wallpaper = DP-4,/home/mahalo/photos/wallhaven-6dp3mx.jpg
+wallpaper = DP-5,/home/mahalo/photos/wallhaven-p8qrym.jpg
 
 
 #set the default wallpaper(s) seen on initial workspace(s) --depending on the number of monitors used

nvim/lazy-lock.json

@@ -1,8 +1,8 @@
 {
-  "LuaSnip": { "branch": "master", "commit": "de10d8414235b0a8cabfeba60d07c24304e71f5c" },
+  "LuaSnip": { "branch": "master", "commit": "b3104910bb5ebf40492aadffae18f2528fa757d9" },
   "barbar.nvim": { "branch": "master", "commit": "549ee11d97057eae207bafa2c23c315942cca097" },
   "buffer-vacuum": { "branch": "main", "commit": "917986d31cce6501c929ab6088c0887beff56b69" },
-  "catppuccin": { "branch": "main", "commit": "30fa4d122d9b22ad8b2e0ab1b533c8c26c4dde86" },
+  "catppuccin": { "branch": "main", "commit": "5af9374957a65be8770696da295dc9016b96f241" },
   "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" },
   "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
@@ -15,26 +15,24 @@
   "local-highlight.nvim": { "branch": "master", "commit": "272f36f412c0a82c785c01256abf4eda4c1cb11d" },
   "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" },
   "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "5e085efe67fccb13372d54331d849219662a7e93" },
-  "mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" },
-  "mini.icons": { "branch": "main", "commit": "f9a177c11daa7829389b7b6eaaec8b8a5c47052d" },
-  "neo-tree.nvim": { "branch": "v3.x", "commit": "f1deac7ecec88c28a250d890ba7bb35843e69cbd" },
-  "none-ls-extras.nvim": { "branch": "main", "commit": "924fe88a9983c7d90dbb31fc4e3129a583ea0a90" },
-  "none-ls.nvim": { "branch": "main", "commit": "53ec77181d96494b9dc9457110dd62dc623cc78d" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "f760507df8c49a4bf46a4d12e1fc616797508979" },
+  "mason.nvim": { "branch": "main", "commit": "b3689a41dd77e5294498dba9757fb22cc80cbebd" },
+  "mini.icons": { "branch": "main", "commit": "e8fae66cb400744daeedf6e387347df50271c252" },
+  "neo-tree.nvim": { "branch": "v3.x", "commit": "ed057048a281b418d5318dd5153f9486daa517a3" },
+  "none-ls-extras.nvim": { "branch": "main", "commit": "d29ccbdf83b5baa402ee959cede13a8bf0230f57" },
+  "none-ls.nvim": { "branch": "main", "commit": "88e2508bd1754e2643e54e9f181e64bbda118ab9" },
   "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
   "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" },
   "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "51cf7c995ed1eb6642aecf19067ee634fa1b6ba2" },
-  "nvim-lspconfig": { "branch": "master", "commit": "cb4765526f7201ce4ff0c49888f80c18da614e68" },
+  "nvim-lspconfig": { "branch": "master", "commit": "336b388c272555d2ae94627a50df4c2f89a5e257" },
   "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "71385f191ec06ffc60e80e6b0c9a9d5daed4824c" },
-  "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" },
-  "nvim-web-devicons": { "branch": "master", "commit": "f66cdfef5e84112045b9ebc3119fee9bddb3c687" },
-  "oil.nvim": { "branch": "master", "commit": "07f80ad645895af849a597d1cac897059d89b686" },
-  "otter.nvim": { "branch": "main", "commit": "71fec0dc58c3a66078e691b9a77b2516fe3e319b" },
+  "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" },
+  "nvim-web-devicons": { "branch": "master", "commit": "f6b0920f452bfd7595ee9a9efe5e1ae78e0e2997" },
+  "oil.nvim": { "branch": "master", "commit": "919e155fdf38e9148cdb5304faaaf53c20d703ea" },
   "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
-  "quarto-nvim": { "branch": "main", "commit": "0e9491509b38efbd83d3f41dbfacc7fc4bd40191" },
-  "rainbow-delimiters.nvim": { "branch": "master", "commit": "97bf4b8ef9298644a29fcd9dd41a0210cf08cac7" },
+  "rainbow-delimiters.nvim": { "branch": "master", "commit": "687ef75fdbd497eabc9eea92b52e7b4d403b3319" },
   "ruffer": { "branch": "plugin", "commit": "5248604605bf1039147f3f29dcd46aa296557e9c" },
   "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
   "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },

nvim/lua/coderun.lua

@@ -59,3 +59,12 @@ vim.api.nvim_create_autocmd('FileType', {
         buf_map('n', '<F11>', ':w<CR>:FloatermNew --disposable --autoclose=0 npx tsx %<CR>')
     end,
 })
+
+vim.api.nvim_create_autocmd('FileType', {
+  pattern = 'r',
+  callback = function()
+    buf_map('n', '<F10>', ':w<CR>:!Rscript %<CR>')
+    buf_map('i', '<F10>', '<Esc>:w<CR>:!Rscript %<CR>')
+    buf_map('n', '<F11>', ':w<CR>:FloatermNew --disposable --autoclose=0 Rscript %<CR>')
+  end,
+})

nvim/lua/lspConfig.lua

@@ -52,55 +52,46 @@ local servers = { "clangd", "ts_ls", "pyright", "tailwindcss", "html", "stimulus
 --   ensure_installed = servers,
 -- })
 
-local lspconfig = require("lspconfig")
 
--- Setup LSP servers dynamically
 for _, server in ipairs(servers) do
-    lspconfig[server].setup({
-            capabilities = capabilities,
-            on_attach = lsp_attach
-        })
-    end
+  vim.lsp.config(server, {
+    capabilities = capabilities,
+    on_attach = lsp_attach
+  })
+  vim.lsp.enable(server)
+end
 
-
--- r
-lspconfig.r_language_server.setup({
-        capabilities = capabilities,
-        on_attach = lsp_attach
-
-})
-
-
-local util = require("lspconfig.util")
-require('lspconfig').pyright.setup{
+vim.lsp.config('pyright', {
     capabilities = capabilities,
     on_attach = lsp_attach,
-    root_dir  = util.root_pattern(
-        'pyproject.toml',
-        'requirements.txt',
-        '.git'
-    ),
     settings = {
         python = {
             analysis = {
                 autoSearchPaths = true,
                 useLibraryCodeForTypes = true,
                 stubPath = "",
-                diagnosticMode  = 'off',
+                diagnosticMode = 'off',
                 autoImportCompletions = true,
             },
         },
     },
-}
+})
+vim.lsp.enable('pyright')
+
+
+
 
 -- RUFF
 vim.lsp.config('ruff', {
-  init_options = {
-    settings = {
-      configuration = "~/.config/ruff/pyproject.toml"
+    filetypes = {'python'},
+    init_options = {
+        settings = {
+            configuration = "~/.config/ruff/pyproject.toml"
+        }
     }
-  }
 })
+
+
 vim.api.nvim_create_autocmd("LspAttach", {
   group = vim.api.nvim_create_augroup('lsp_attach_disable_ruff_hover', { clear = true }),
   callback = function(args)
@@ -118,6 +109,15 @@ vim.api.nvim_create_autocmd("LspAttach", {
 vim.lsp.enable('ruff')
 
 
+vim.lsp.config("r-languageserver",{
+    filetypes = {'r','rmd'},
+    cmd = {'R', '--slave', '-e', 'languageserver::run()'},
+    on_attach = lsp_attach,
+    capabilities = capabilities,
+})
+vim.lsp.enable("r-languageserver")
+
+
 --''''''''''''''''Non-ls/null-ls''''''''''''''''
 local null_ls = require("null-ls")
 

nvim/lua/plugins.lua

@@ -188,16 +188,6 @@ local plugins = {
     -- harpoon
     {'ThePrimeagen/harpoon',lazy=true},
 
-
-    -- R
-    {
-        "quarto-dev/quarto-nvim",
-        dependencies = {
-            "jmbuhr/otter.nvim",
-            "nvim-treesitter/nvim-treesitter",
-        }
-    },
-
 }
 
 local opts = {}

rofi/apps/apps.sh

@@ -26,7 +26,7 @@ file_cmd='flatpak run io.github.flattool.Warehouse'
 text_cmd='flatpak run md.obsidian.Obsidian'
 web_cmd='firefox -no-remote -P School'
 music_cmd='flatpak run com.discordapp.DiscordCanary'
-setting_cmd='steam'
+setting_cmd='env QT_SCALE_FACTOR=2 GDK_SCALE=2 steam'
 
 # Options
 layout=`cat ${theme} | grep 'USE_ICON' | cut -d'=' -f2`