Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 6b93a8734e |
16
.config/metapac/config.toml
Normal file
16
.config/metapac/config.toml
Normal file
@ -0,0 +1,16 @@
|
||||
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 = []
|
||||
152
.config/metapac/groups/default.toml
Normal file
152
.config/metapac/groups/default.toml
Normal file
@ -0,0 +1,152 @@
|
||||
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"]
|
||||
3
.config/metapac/groups/desktop.toml
Normal file
3
.config/metapac/groups/desktop.toml
Normal file
@ -0,0 +1,3 @@
|
||||
arch = [
|
||||
"limine"
|
||||
]
|
||||
5
.config/metapac/groups/laptop.toml
Normal file
5
.config/metapac/groups/laptop.toml
Normal file
@ -0,0 +1,5 @@
|
||||
arch = [
|
||||
"amd-ucode",
|
||||
"efibootmgr",
|
||||
"syncthing"
|
||||
]
|
||||
@ -5,7 +5,5 @@ set -gx ANDROID_HOME $HOME/Android/Sdk
|
||||
set -gx NDK_HOME $ANDROID_HOME/ndk/$(ls -1 $ANDROID_HOME/ndk)
|
||||
|
||||
alias add-pkg="bash ~/Code/dotfiles/scripts/add-package.bash"
|
||||
alias lg="lazygit"
|
||||
alias v="nvim"
|
||||
|
||||
starship init fish | source
|
||||
|
||||
@ -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,8 +281,6 @@ 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
|
||||
@ -291,10 +289,6 @@ bind = $mainMod, Tab, exec, hyprctl dispatch workspace previous
|
||||
bind = $mainMod, mouse_down, workspace, e+1
|
||||
bind = $mainMod, mouse_up, workspace, e-1
|
||||
|
||||
# OBS
|
||||
bind = $mainMod, R, exec, obs-cmd recording toggle
|
||||
|
||||
|
||||
# Move/resize windows with mainMod + LMB/RMB and dragging
|
||||
bindm = $mainMod, mouse:272, movewindow
|
||||
bindm = $mainMod, mouse:273, resizewindow
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
preload = ~/arch.png
|
||||
wallpaper = ,~/arch.png
|
||||
preload = ~/arch.jpg
|
||||
wallpaper = ,~/arch.jpg
|
||||
|
||||
@ -24,6 +24,7 @@ arch = [
|
||||
"linux-firmware",
|
||||
"metapac",
|
||||
"nano",
|
||||
"neovim",
|
||||
"network-manager-applet",
|
||||
"networkmanager",
|
||||
"noto-fonts-emoji",
|
||||
@ -143,9 +144,8 @@ arch = [
|
||||
"wpa_supplicant",
|
||||
"xorg-xinit",
|
||||
"yay",
|
||||
"neovim-nightly-bin",
|
||||
"zram-generator", "lazygit", "logseq-desktop-bin", "tailscale", "git-delta", "keepassxc", "pavucontrol", "telegram-desktop", "filelight", "yarn", "rustup"
|
||||
, "vtsls","git-lfs", "less", "ttf-fira-sans", "texlive-bin", "texstudio", "gopls", "postgresql", "hoppscotch-bin", "dbeaver", "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", "hyprpaper", "spotify", "fastfetch"]
|
||||
"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", "hyprpaper", "spotify"]
|
||||
|
||||
|
||||
cargo = ["wasm-pack"]
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
arch = [
|
||||
"limine"
|
||||
, "gimp"]
|
||||
]
|
||||
|
||||
@ -1,12 +1,18 @@
|
||||
-- Leader
|
||||
vim.g.mapleader = " "
|
||||
|
||||
-- Guard (Linters + Formatters)
|
||||
vim.g.guard_config = {
|
||||
fmt_on_save = true,
|
||||
lsp_as_default_formatter = true,
|
||||
save_on_fmt = true,
|
||||
}
|
||||
|
||||
-- Sync system clipboard and neovim register
|
||||
vim.opt.clipboard = { "unnamedplus" }
|
||||
|
||||
-- Save undo history
|
||||
vim.opt.undofile = true
|
||||
|
||||
--
|
||||
-- Case-insensitive searching UNLESS \C or one or more capital letters in the search term
|
||||
vim.opt.ignorecase = true
|
||||
@ -103,7 +109,3 @@ 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")
|
||||
|
||||
@ -1,21 +1,17 @@
|
||||
{
|
||||
"Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
|
||||
"blink.cmp": { "branch": "main", "commit": "bae4bae0eedd1fa55f34b685862e94a222d5c6f8" },
|
||||
"conform.nvim": { "branch": "master", "commit": "8132ec733eed3bf415b97b76797ca41b59f51d7d" },
|
||||
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
|
||||
"friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
|
||||
"gruvbox-material": { "branch": "master", "commit": "f5f912fbc7cf2d45da6928b792d554f85c7aa89a" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
|
||||
"neo-tree.nvim": { "branch": "v3.x", "commit": "f481de16a0eb59c985abac8985e3f2e2f75b4875" },
|
||||
"nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
|
||||
"nvim-autopairs": { "branch": "master", "commit": "4d74e75913832866aa7de35e4202463ddf6efd1b" },
|
||||
"cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" },
|
||||
"everblush": { "branch": "main", "commit": "9a0e695fdd57b340d3ba2b72406e3ca519029f25" },
|
||||
"guard-collection": { "branch": "main", "commit": "06da4a065b974bbedf1a5535232c90a3526f8a43" },
|
||||
"guard.nvim": { "branch": "main", "commit": "bdbc43dadd530b0058708723db76e705a4542063" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" },
|
||||
"neo-tree.nvim": { "branch": "v3.x", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" },
|
||||
"nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
|
||||
"nvim-cmp": { "branch": "main", "commit": "d3a3056204e1a9dbb7c7fe36c114dc43b681768c" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "38da5bbe1eaab2394056109e48c7e195bdb8fdfe" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" },
|
||||
"nvim-window-picker": { "branch": "main", "commit": "6382540b2ae5de6c793d4aa2e3fe6dbb518505ec" },
|
||||
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
|
||||
"telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
|
||||
"toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" },
|
||||
"vim-tmux-navigator": { "branch": "master", "commit": "412c474e97468e7934b9c217064025ea7a69e05e" },
|
||||
"vim-wakatime": { "branch": "master", "commit": "f39c4a201ae350aaba713b59d4a4fdd88e0811aa" }
|
||||
}
|
||||
"nvim-treesitter": { "branch": "master", "commit": "0179a89656b4ce395a4487c07ae385b8425524ae" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "f0267921c845c42685968401bc49aa65e18d3e09" },
|
||||
"nvim-window-picker": { "branch": "main", "commit": "41cfaa428577c53552200a404ae9b3a0b5719706" },
|
||||
"plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" },
|
||||
"telescope.nvim": { "branch": "master", "commit": "74ce793a60759e3db0d265174f137fb627430355" },
|
||||
"vim-vsnip": { "branch": "master", "commit": "02a8e79295c9733434aab4e0e2b8c4b7cea9f3a9" }
|
||||
}
|
||||
@ -8,7 +8,6 @@ return {
|
||||
lua = { "stylua" },
|
||||
rust = { "rustfmt", lsp_format = "fallback" },
|
||||
javascript = { "prettierd", "prettier", stop_after_first = true },
|
||||
python = { "ruff_format" },
|
||||
},
|
||||
format_on_save = {
|
||||
lsp_format = "fallback",
|
||||
@ -46,6 +45,34 @@ 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" },
|
||||
@ -60,9 +87,6 @@ return {
|
||||
local configs = require("nvim-treesitter.configs")
|
||||
|
||||
configs.setup({
|
||||
modules = {},
|
||||
ignore_install = {},
|
||||
auto_install = true,
|
||||
ensure_installed = { "lua", "javascript", "typescript", "html", "tsx", "zig" },
|
||||
sync_install = false,
|
||||
highlight = { enable = true },
|
||||
@ -112,16 +136,13 @@ return {
|
||||
},
|
||||
{
|
||||
"neovim/nvim-lspconfig",
|
||||
dependencies = { "hrsh7th/cmp-nvim-lsp" },
|
||||
config = function()
|
||||
local lsp = require("lspconfig")
|
||||
|
||||
local clients = { "vtsls", "zls", "gopls", "tailwindcss", "ocamllsp", "svelte", "biome", "pylsp", "svelte" }
|
||||
|
||||
for _, value in pairs(clients) do
|
||||
lsp[value].setup({})
|
||||
end
|
||||
local capabilities = require("cmp_nvim_lsp").default_capabilities()
|
||||
|
||||
lsp.lua_ls.setup({
|
||||
capabilities = capabilities,
|
||||
settings = {
|
||||
Lua = {
|
||||
diagnostics = { globals = { "vim", "require" } },
|
||||
@ -133,34 +154,40 @@ return {
|
||||
},
|
||||
})
|
||||
|
||||
lsp.vtsls.setup({
|
||||
capabilities = capabilities,
|
||||
})
|
||||
|
||||
lsp.zls.setup({
|
||||
capabilities = capabilities,
|
||||
})
|
||||
|
||||
lsp.rust_analyzer.setup({
|
||||
capabilities = capabilities,
|
||||
diagnostic = {
|
||||
-- Prevents the annoying popup for cancalled requests
|
||||
refreshSupport = false,
|
||||
},
|
||||
})
|
||||
|
||||
lsp.gopls.setup({
|
||||
capabilities = capabilities,
|
||||
})
|
||||
lsp.tailwindcss.setup({
|
||||
capabilities = capabilities,
|
||||
})
|
||||
lsp.ocamllsp.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",
|
||||
},
|
||||
}
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
"disable-scroll": true
|
||||
},
|
||||
"tray": {
|
||||
"icon-size": 24,
|
||||
"icon-size": 36,
|
||||
"spacing": 16
|
||||
},
|
||||
"custom/music": {
|
||||
@ -50,7 +50,7 @@
|
||||
"format-source-muted": " src mute ",
|
||||
"format-icons": {
|
||||
"hdmi": ["", "", ""],
|
||||
"default": ["", "", ""]
|
||||
"default": ["", "", ""]
|
||||
},
|
||||
"on-click": "pavucontrol"
|
||||
},
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
* {
|
||||
font-family: "SpaceMono Nerd Font";
|
||||
font-size: 16px;
|
||||
font-size: 20px;
|
||||
min-height: 0;
|
||||
}
|
||||
|
||||
|
||||
@ -6,8 +6,8 @@ if [ -z $@ ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "metapac add --backend arch --packages $@"
|
||||
metapac add --backend arch --packages $@
|
||||
echo "metapac add --backend arch --package $@"
|
||||
metapac add --backend arch --package $@
|
||||
|
||||
rsync -av ~/.config/metapac config --delete
|
||||
|
||||
|
||||
Reference in New Issue
Block a user