feat: removing old stuff

.config/metapac/config.toml

@@ -1,16 +0,0 @@
-arch_package_manager = "paru"
-
-flatpak_default_systemwide = false
-
-# Whether to use the [hostname_groups] config table to decide which
-# group files to use or to use all files in the groups folder.
-# Default: false
-hostname_groups_enabled = true
-
-# Which group files apply for which hostnames
-# paths starting without a / are relative to the groups folder
-# Default: None
-[hostname_groups]
-john-desktop = ["default", "desktop"]
-john-laptop = ["default", "laptop"]
-server = []

.config/metapac/groups/default.toml

@@ -1,152 +0,0 @@
-arch = [
-    "base",
-    "base-devel",
-    "btrfs-progs",
-    "dolphin",
-    "dunst",
-    "fish",
-    "fuzzel",
-    "fzf",
-    "git",
-    "go",
-    "grim",
-    "gst-plugin-pipewire",
-    "htop",
-    "hyprland",
-    "hyprlock",
-    "intel-media-driver",
-    "iwd",
-    "kdeconnect",
-    "kitty",
-    "libpulse",
-    "libva-intel-driver",
-    "linux",
-    "linux-firmware",
-    "metapac",
-    "nano",
-    "neovim",
-    "network-manager-applet",
-    "networkmanager",
-    "noto-fonts-emoji",
-    "paru",
-    "pipewire",
-    "pipewire-alsa",
-    "pipewire-jack",
-    "pipewire-pulse",
-    "polkit-kde-agent",
-    "qt5-wayland",
-    "qt6-wayland",
-    "rsync",
-    "sddm",
-    "slurp",
-    "smartmontools",
-    "sof-firmware",
-    "starship",
-    "tmux",
-    "unzip",
-    "vim",
-    "vivaldi",
-    "vulkan-intel",
-    "vulkan-radeon",
-    "waybar",
-    "wget",
-    "wireless_tools",
-    "wireplumber",
-    "wl-clipboard",
-    "wlogout",
-    "wofi",
-    "xdg-desktop-portal-hyprland",
-    "xdg-utils",
-    "xf86-video-amdgpu",
-    "xf86-video-ati",
-    "xf86-video-nouveau",
-    "xf86-video-vmware",
-    "xorg-server",
-    "ada",
-    "argon2",
-    "atkmm",
-    "botan",
-    "c-ares",
-    "cairomm",
-    "cairomm-1.16",
-    "dkms",
-    "efibootmgr",
-    "efivar",
-    "fmt",
-    "freeglut",
-    "gcr-4",
-    "glibmm",
-    "glibmm-2.68",
-    "glu",
-    "graphene",
-    "gssdp",
-    "gst-plugins-bad-libs",
-    "gtk-layer-shell",
-    "gtk4",
-    "gtkmm-4.0",
-    "gtkmm3",
-    "gupnp",
-    "gupnp-igd",
-    "hunspell",
-    "intel-gmmlib",
-    "intel-ucode",
-    "jasper",
-    "jsoncpp",
-    "libappindicator-gtk3",
-    "libdbusmenu-glib",
-    "libdbusmenu-gtk3",
-    "libdispatch",
-    "libgit2",
-    "libluv",
-    "libmng",
-    "libmpdclient",
-    "libngtcp2",
-    "libnice",
-    "libnma",
-    "libnma-common",
-    "libsigc++",
-    "libsigc++-3.0",
-    "libutempter",
-    "libuv",
-    "libvterm",
-    "linux-headers",
-    "llhttp",
-    "lua51-lpeg",
-    "luajit",
-    "minizip",
-    "msgpack-c",
-    "neofetch",
-    "nm-connection-editor",
-    "nvidia-dkms",
-    "oniguruma",
-    "openal",
-    "openh264",
-    "openssh",
-    "pangomm",
-    "pangomm-2.48",
-    "playerctl",
-    "protobuf",
-    "qrencode",
-    "qt6-imageformats",
-    "rnnoise",
-    "simdjson",
-    "sndio",
-    "spdlog",
-    "syncthing",
-    "tree-sitter",
-    "tree-sitter-c",
-    "tree-sitter-lua",
-    "tree-sitter-markdown",
-    "tree-sitter-query",
-    "tree-sitter-vim",
-    "tree-sitter-vimdoc",
-    "unibilium",
-    "wpa_supplicant",
-    "xorg-xinit",
-    "yay",
-    "zram-generator", "lazygit", "logseq-desktop-bin", "tailscale", "git-delta", "keepassxc", "slack-desktop-wayland", "pavucontrol", "telegram-desktop", "filelight", "nodejs", "yarn", "rustup"
-, "vtsls","git-lfs", "less", "ttf-fira-sans", "texlive-bin", "texstudio", "gopls", "postgresql", "hoppscotch-bin", "dbeaver", "obs-studio", "mullvad-vpn", "bun-bin", "hyprshot", "qt6-svg", "qt6-declarative", "qt5-quickcontrols2", "wl-clipboard-history", "cliphist", "stylua", "biome", "okular", "docker", "docker-compose", "bluez", "gwenview", "tailwindcss-language-server", "sddm-catppuccin-git", "qt6ct-kde"]
-
-
-cargo = ["wasm-pack"]
-rustup = ["stable-x86_64-unknown-linux-gnu"]

.config/metapac/groups/desktop.toml

@@ -1,3 +0,0 @@
-arch = [
-    "limine"
-]

.config/metapac/groups/laptop.toml

@@ -1,5 +0,0 @@
-arch = [
-    "amd-ucode",
-    "efibootmgr",
-    "syncthing"
-]

config/hypr/hyprland.conf

@@ -246,7 +246,7 @@ bind = $mainMod, T, exec, $terminal
 bind = $mainMod, Q, killactive,
 bind = $mainMod, E, exec, $fileManager
 bind = $mainMod SHIFT, V, togglefloating,
-bind = $mainMod, P, pseudo, # dwindle
+# bind = $mainMod, P, pseudo, # dwindle
 bind = $mainMod, J, togglesplit, # dwindle
 
 bind = $mainMod, Slash, exec, fuzzel
@@ -281,6 +281,8 @@ bind = $mainMod SHIFT, 8, movetoworkspace, 8
 bind = $mainMod SHIFT, 9, movetoworkspace, 9
 bind = $mainMod SHIFT, 0, movetoworkspace, 10
 
+bind = $mainMod, Tab, exec, hyprctl dispatch workspace previous
+
 # Example special workspace (scratchpad)
 # bind = $mainMod, S, togglespecialworkspace, magic
 # bind = $mainMod SHIFT, S, movetoworkspace, special:magic
@@ -289,6 +291,7 @@ bind = $mainMod SHIFT, 0, movetoworkspace, 10
 bind = $mainMod, mouse_down, workspace, e+1
 bind = $mainMod, mouse_up, workspace, e-1
 
+
 # Move/resize windows with mainMod + LMB/RMB and dragging
 bindm = $mainMod, mouse:272, movewindow
 bindm = $mainMod, mouse:273, resizewindow

config/nvim/init.lua

@@ -2,11 +2,11 @@
 vim.g.mapleader = " "
 
 -- Guard (Linters + Formatters)
-vim.g.guard_config = {
+-- vim.g.guard_config = {
-	fmt_on_save = true,
+-- 	fmt_on_save = true,
-	lsp_as_default_formatter = true,
+-- 	lsp_as_default_formatter = true,
-	save_on_fmt = true,
+-- 	save_on_fmt = true,
-}
+-- }
 
 -- Sync system clipboard and neovim register
 vim.opt.clipboard = { "unnamedplus" }
@@ -109,3 +109,7 @@ vim.keymap.set("n", "<c-\\>", "<cmd>TmuxNavigatePrevious<cr>")
 -- Floating Terminal --
 vim.keymap.set("n", "<A-k>", "<cmd>ToggleTerm direction=float<cr>")
 vim.keymap.set("t", "<A-k>", "<cmd>ToggleTerm direction=float<cr>")
+
+-- TODO: shift this over now that lsp-config is no longer needed
+-- doesnt work?
+-- vim.lsp.enable("ty")

config/nvim/lua/plugins/init.lua

@@ -8,6 +8,7 @@ return {
 					lua = { "stylua" },
 					rust = { "rustfmt", lsp_format = "fallback" },
 					javascript = { "prettierd", "prettier", stop_after_first = true },
+					python = { "ruff_format" },
 				},
 				format_on_save = {
 					lsp_format = "fallback",
@@ -45,34 +46,6 @@ return {
 			vim.cmd.colorscheme("gruvbox-material")
 		end,
 	},
-	{ "hrsh7th/vim-vsnip" },
-	{ "hrsh7th/cmp-nvim-lsp" },
-	{
-		"hrsh7th/nvim-cmp",
-		config = function()
-			local cmp = require("cmp")
-			cmp.setup({
-				snippet = {
-					expand = function(args)
-						vim.fn["vsnip#anonymous"](args.body)
-					end,
-				},
-				mapping = cmp.mapping.preset.insert({
-					["<C-b>"] = cmp.mapping.scroll_docs(-4),
-					["<C-f>"] = cmp.mapping.scroll_docs(4),
-					["<C-Space>"] = cmp.mapping.complete(),
-					["<C-e>"] = cmp.mapping.abort(),
-					["<CR>"] = cmp.mapping.confirm({ select = true }),
-				}),
-				sources = cmp.config.sources({
-					{ name = "nvim_lsp" },
-					{ name = "vsnip" },
-				}, {
-					{ name = "buffer" },
-				}),
-			})
-		end,
-	},
 	{
 		"nvim-telescope/telescope.nvim",
 		dependencies = { "nvim-lua/plenary.nvim" },
@@ -136,10 +109,8 @@ return {
 	},
 	{
 		"neovim/nvim-lspconfig",
-		dependencies = { "hrsh7th/cmp-nvim-lsp" },
 		config = function()
 			local lsp = require("lspconfig")
-			local capabilities = require("cmp_nvim_lsp").default_capabilities()
 
 			lsp.lua_ls.setup({
 				capabilities = capabilities,
@@ -154,39 +125,48 @@ return {
 				},
 			})
 
-			lsp.vtsls.setup({
+			lsp.vtsls.setup({})
-				capabilities = capabilities,
-			})
 
-			lsp.zls.setup({
+			lsp.zls.setup({})
-				capabilities = capabilities,
-			})
 
 			lsp.rust_analyzer.setup({
-				capabilities = capabilities,
 				diagnostic = {
 					-- Prevents the annoying popup for cancalled requests
 					refreshSupport = false,
 				},
 			})
 
-			lsp.gopls.setup({
+			lsp.gopls.setup({})
-				capabilities = capabilities,
+			lsp.tailwindcss.setup({})
-			})
+			lsp.ocamllsp.setup({})
-			lsp.tailwindcss.setup({
+			lsp.svelte.setup({})
-				capabilities = capabilities,
+			lsp.biome.setup({})
-			})
+			lsp.pylsp.setup({})
-			lsp.ocamllsp.setup({
+			lsp.svelte.setup({})
-				capabilities = capabilities,
-			})
-			lsp.svelte.setup({
-				capabilities = capabilities,
-			})
-			lsp.biome.setup({
-				capabilities = capabilities,
-			})
 		end,
 	},
+	{
+		"saghen/blink.cmp",
+		-- optional: provides snippets for the snippet source
+		dependencies = { "rafamadriz/friendly-snippets" },
+
+		opts = {
+			keymap = { preset = "enter" },
+
+			appearance = {
+				nerd_font_variant = "mono",
+			},
+
+			completion = { documentation = { auto_show = false } },
+
+			sources = {
+				default = { "lsp", "path", "snippets" },
+			},
+
+			fuzzy = { implementation = "prefer_rust_with_warning" },
+		},
+		opts_extend = { "sources.default" },
+	},
 	{
 		"sindrets/diffview.nvim",
 	},

config/waybar/config.jsonc

@@ -10,7 +10,7 @@
           "disable-scroll": true
      },
     "tray": {
-        "icon-size": 36,
+        "icon-size": 24,
         "spacing": 16
     },
     "custom/music": {
@@ -50,7 +50,7 @@
         "format-source-muted": " src mute ",
         "format-icons": {
             "hdmi": ["", "", ""],
-            "default": ["", "", ""]
+            "default": ["", "", ""]
         },
         "on-click": "pavucontrol"
     },

config/waybar/style.css

@@ -2,7 +2,7 @@
 
 * {
   font-family: "SpaceMono Nerd Font";
-  font-size: 20px;
+  font-size: 16px;
   min-height: 0;
 }