diff options
Diffstat (limited to 'seth/programs')
23 files changed, 0 insertions, 634 deletions
diff --git a/seth/programs/MangoHud/MangoHud.conf b/seth/programs/MangoHud/MangoHud.conf deleted file mode 100644 index 8e02a99..0000000 --- a/seth/programs/MangoHud/MangoHud.conf +++ /dev/null @@ -1,9 +0,0 @@ -legacy_layout=false -cpu_stats -cpu_temp -gpu_stats -gpu_temp -fps -frametime -media_player -media_player_name = spotify diff --git a/seth/programs/default.nix b/seth/programs/default.nix deleted file mode 100644 index 2606b8c..0000000 --- a/seth/programs/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - imports = [ - ./git.nix - # ./mangohud.nix - ./neovim.nix - # ./npm.nix - ./starship.nix - ./vim.nix - ]; -} diff --git a/seth/programs/git.nix b/seth/programs/git.nix deleted file mode 100644 index 6164432..0000000 --- a/seth/programs/git.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ config, ...}: - -{ - programs.git = { - enable = true; - extraConfig = { - init = { defaultBranch = "main"; }; - }; - signing = { - key = "D31BD0D494BBEE86"; - signByDefault = true; - }; - userEmail = "[email protected]"; - userName = "seth"; - }; -} diff --git a/seth/programs/mangohud.nix b/seth/programs/mangohud.nix deleted file mode 100644 index 700647e..0000000 --- a/seth/programs/mangohud.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ config, pkgs, ...}: - -{ - home.packages = [ - pkgs.mangohud - ]; - - xdg.configFile."MangoHud" = { - source = ./MangoHud; - recursive = true; - }; -} diff --git a/seth/programs/neovim.nix b/seth/programs/neovim.nix deleted file mode 100644 index 0aa6799..0000000 --- a/seth/programs/neovim.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ config, lib, pkgs, ...}: - -{ - programs.neovim = { - enable = true; - extraPackages = with pkgs; [ - black - clang - codespell - nodePackages.alex - nodePackages.bash-language-server - nodePackages.prettier - nodePackages.pyright - python310Packages.flake8 - rust-analyzer - rustfmt - stylua - ]; - plugins = with pkgs.vimPlugins; [ - lualine-nvim - catppuccin-nvim - barbar-nvim - lightspeed-nvim - nvim-tree-lua - nvim-lspconfig - null-ls-nvim - plenary-nvim - nvim-treesitter - nvim-cmp - cmp-nvim-lsp - cmp-buffer - cmp-path - cmp-vsnip - vim-vsnip - luasnip - cmp_luasnip - trouble-nvim - nvim-web-devicons - telescope-nvim - gitsigns-nvim - editorconfig-nvim - ]; - }; - - xdg.configFile."nvim" = { - source = ./nvim; - recursive = true; - }; -} diff --git a/seth/programs/npm.nix b/seth/programs/npm.nix deleted file mode 100644 index 8f311f8..0000000 --- a/seth/programs/npm.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ config, ...}: - -{ - config.programs.npm = { - enable = true; - npmrc = '' - prefix=${config.xdg.dataHome}/npm - cache=${config.xdg.cacheHome}/npm - init-module=${config.xdg.configHome}/npm/config/npm-init.js - ''; - }; -} diff --git a/seth/programs/nvim/init.lua b/seth/programs/nvim/init.lua deleted file mode 100644 index e0fd064..0000000 --- a/seth/programs/nvim/init.lua +++ /dev/null @@ -1,22 +0,0 @@ --- --- getchoo's neovim config (but in lua :p) --- - -local cmd = vim.cmd -local opt = vim.opt - -require("getchoo") -require("getchoo.ftdetect") --- require("getchoo.lsp") - --- text options -opt.tabstop = 2 -opt.shiftwidth = 2 -opt.expandtab = false -opt.smartindent = true -opt.wrap = false - --- appearance -opt.syntax = "on" -cmd("filetype plugin indent on") -opt.termguicolors = true diff --git a/seth/programs/nvim/lua/getchoo/config.lua b/seth/programs/nvim/lua/getchoo/config.lua deleted file mode 100644 index a67f734..0000000 --- a/seth/programs/nvim/lua/getchoo/config.lua +++ /dev/null @@ -1,25 +0,0 @@ --- --- config for regular plugins --- - -local M = {} - -M.bufferline = { - animation = true, - auto_hide = true, - icons = true, - maximum_padding = 2, - semantic_letters = true, -} - -M.lualine = { - options = { - theme = "catppuccin", - }, - extensions = { "nvim-tree" }, -} - -M.tree = {} - -require("getchoo.keymap") -return M diff --git a/seth/programs/nvim/lua/getchoo/ftdetect.lua b/seth/programs/nvim/lua/getchoo/ftdetect.lua deleted file mode 100644 index 5dd569d..0000000 --- a/seth/programs/nvim/lua/getchoo/ftdetect.lua +++ /dev/null @@ -1,10 +0,0 @@ --- load custom file types - -local filetypes = { - filename = { - PKGBUILD = "text", - [".makepkg.conf"] = "text", - }, -} - -vim.filetype.add(filetypes) diff --git a/seth/programs/nvim/lua/getchoo/init.lua b/seth/programs/nvim/lua/getchoo/init.lua deleted file mode 100644 index f44f622..0000000 --- a/seth/programs/nvim/lua/getchoo/init.lua +++ /dev/null @@ -1,4 +0,0 @@ -local config = require("getchoo.config") -require("bufferline").setup(config.bufferline) -require("lualine").setup(config.lualine) -require("nvim-tree").setup(config.tree) diff --git a/seth/programs/nvim/lua/getchoo/keymap.lua b/seth/programs/nvim/lua/getchoo/keymap.lua deleted file mode 100644 index 9a4484c..0000000 --- a/seth/programs/nvim/lua/getchoo/keymap.lua +++ /dev/null @@ -1,27 +0,0 @@ --- --- keymaps for general plugins --- - -local opts = { noremap = true, silent = true } -local set = function(mode, key, cmd) - vim.keymap.set(mode, key, cmd, opts) -end - -set("n", "<leader>t", function() - vim.cmd("NvimTreeToggle") -end) - -for i = 1, 9 do - set("n", "<leader>" .. i, function() - local cmd = "BufferGoto " .. i - vim.cmd(cmd) - end) -end - -set("n", "<leader>p", function() - vim.cmd("BufferPick") -end) - -set("n", "<leader>q", function() - vim.cmd("BufferClose") -end) diff --git a/seth/programs/nvim/lua/getchoo/lsp/config/cmp.lua b/seth/programs/nvim/lua/getchoo/lsp/config/cmp.lua deleted file mode 100644 index 0f0f51f..0000000 --- a/seth/programs/nvim/lua/getchoo/lsp/config/cmp.lua +++ /dev/null @@ -1,67 +0,0 @@ -local cmp = require("cmp") -local mapping = cmp.mapping -local luasnip = require("luasnip") - -local M = {} - -local has_words_before = function() - local line, col = unpack(vim.api.nvim_win_get_cursor(0)) - return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil -end - -local feedkey = function(key, mode) - vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes(key, true, true, true), mode, true) -end - -M.config = { - snippet = { - expand = function(args) - vim.fn["vsnip#anonymous"](args.body) - luasnip.lsp_expand(args.body) - end, - }, - mapping = mapping.preset.insert({ - ["<Tab>"] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_next_item() - elseif luasnip.expand_or_jumpable() then - luasnip.expand_or_jump() - elseif vim.fn["vsnip#available"](1) == 1 then - feedkey("<Plug>(vsnip-expand-or-jump)", "") - elseif has_words_before() then - cmp.complete() - else - fallback() - end - end, { "i", "s" }), - ["<S-Tab>"] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_prev_item() - elseif luasnip.jumpable(-1) then - luasnip.jump(-1) - elseif vim.fn["vsnip#available"](-1) == 1 then - feedkey("<Plug>(vsnip-jump-prev)", "") - else - fallback() - end - end, { "i", "s" }), - }), - sources = cmp.config.sources({ - { name = "nvim_lsp" }, - { name = "luasnip" }, - { name = "vsnip" }, - { name = "buffer" }, - { name = "path" }, - }), -} - -local capabilities = require("cmp_nvim_lsp").default_capabilities() -capabilities.textDocument.completion.completionItem.snippetSupport = true - -M.capabilities = capabilities - -M.on_attach = function(_, bufnr) - vim.api.nvim_buf_set_option(bufnr, "omnifunc", "v:lua.vim.lsp.omnifunc") -end - -return M diff --git a/seth/programs/nvim/lua/getchoo/lsp/config/init.lua b/seth/programs/nvim/lua/getchoo/lsp/config/init.lua deleted file mode 100644 index 1c928d3..0000000 --- a/seth/programs/nvim/lua/getchoo/lsp/config/init.lua +++ /dev/null @@ -1,28 +0,0 @@ --- wrapper for all configs -local cmp = require("getchoo.lsp.config.cmp") -local lsp_config = require("getchoo.lsp.config.lsp_config") -local mason = require("getchoo.lsp.config.mason") -local null_ls = require("getchoo.lsp.config.null_ls") - -local M = {} - -M.cmp = cmp.config - -M.lsp_servers = lsp_config.servers - -M.mason_tool_installer = mason.mason_tool_installer -M.mason_lspconfig = mason.mason_lspconfig - -M.null_ls = null_ls.config - -M.treesitter = { - auto_install = true, - highlight = { - enable = true, - additional_vim_regex_highlighting = false, - }, -} - -M.trouble = {} - -return M diff --git a/seth/programs/nvim/lua/getchoo/lsp/config/lsp_config.lua b/seth/programs/nvim/lua/getchoo/lsp/config/lsp_config.lua deleted file mode 100644 index 4df3fe0..0000000 --- a/seth/programs/nvim/lua/getchoo/lsp/config/lsp_config.lua +++ /dev/null @@ -1,40 +0,0 @@ -local cmp = require("getchoo.lsp.config.cmp") -local sources = require("getchoo.lsp.config.sources") - -local M = {} - -local on_attach = function(client, bufnr) - cmp.on_attach(client, bufnr) -end - -local all_config = { - capabilities = cmp.capabilities, - on_attach = on_attach, -} - -local servers = {} -for _, server in ipairs(sources.lsp_servers) do - servers[server] = all_config -end - -servers["sumneko_lua"] = { - capabilities = cmp.capabilities, - on_attach = on_attach, - settings = { - Lua = { - runtime = { - version = "LuaJIT", - }, - diagnostics = { - globals = { "vim" }, - }, - workspace = { - library = vim.api.nvim_get_runtime_file("", true), - }, - }, - }, -} - -M.servers = servers - -return M diff --git a/seth/programs/nvim/lua/getchoo/lsp/config/mason.lua b/seth/programs/nvim/lua/getchoo/lsp/config/mason.lua deleted file mode 100644 index 6814697..0000000 --- a/seth/programs/nvim/lua/getchoo/lsp/config/mason.lua +++ /dev/null @@ -1,14 +0,0 @@ --- config for mason tools -local sources = require("getchoo.lsp.config.sources") - -local M = {} - -M.mason_tool_installer = { - ensure_installed = sources.mason, -} - -M.mason_lspconfig = { - automatic_installation = true, -} - -return M diff --git a/seth/programs/nvim/lua/getchoo/lsp/config/null_ls.lua b/seth/programs/nvim/lua/getchoo/lsp/config/null_ls.lua deleted file mode 100644 index 42cd30e..0000000 --- a/seth/programs/nvim/lua/getchoo/lsp/config/null_ls.lua +++ /dev/null @@ -1,38 +0,0 @@ -local sources = require("getchoo.lsp.config.sources") - -local M = {} - --- only use null-ls for formatting - --- for neovim >= 8 -local lsp_formatting = function(bufnr) - vim.lsp.buf.format({ - filter = function(client) - return client.name == "null-ls" - end, - bufnr = bufnr, - }) -end - -local augroup = vim.api.nvim_create_augroup("LspFormatting", {}) -local formatting_on_attach = function(client, bufnr) - if client.supports_method("textDocument/formatting") then - vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr }) - vim.api.nvim_create_autocmd("BufWritePre", { - group = augroup, - buffer = bufnr, - callback = function() - -- local params = require("vim.lsp.util").make_formatting_params({}) - -- client.request("textDocument/formatting", params, nil, bufnr) - lsp_formatting(bufnr) -- neovim >= 8 - end, - }) - end -end - -M.config = { - on_attach = formatting_on_attach, - sources = sources.null_ls, -} - -return M diff --git a/seth/programs/nvim/lua/getchoo/lsp/config/sources.lua b/seth/programs/nvim/lua/getchoo/lsp/config/sources.lua deleted file mode 100644 index 1898870..0000000 --- a/seth/programs/nvim/lua/getchoo/lsp/config/sources.lua +++ /dev/null @@ -1,27 +0,0 @@ -local null_ls = require("null-ls") -local diagnostics = null_ls.builtins.diagnostics -local formatting = null_ls.builtins.formatting - -local M = { - lsp_servers = { "rust_analyzer", "pyright", "bashls" }, - null_ls = { - diagnostics.alex, - diagnostics.codespell, - diagnostics.flake8, - formatting.black, - formatting.codespell, - formatting.prettier, - formatting.rustfmt, - formatting.stylua, - }, - mason = { - "alex", - "black", - "codespell", - "flake8", - "prettier", - "stylua", - }, -} - -return M diff --git a/seth/programs/nvim/lua/getchoo/lsp/init.lua b/seth/programs/nvim/lua/getchoo/lsp/init.lua deleted file mode 100644 index aa3dde5..0000000 --- a/seth/programs/nvim/lua/getchoo/lsp/init.lua +++ /dev/null @@ -1,10 +0,0 @@ --- --- setup lsp environment --- -require("getchoo.lsp.server") -require("getchoo.lsp.keymap") -local config = require("getchoo.lsp.config") - -require("gitsigns").setup() -require("nvim-treesitter.configs").setup(config.treesitter) -require("trouble").setup(config.trouble) diff --git a/seth/programs/nvim/lua/getchoo/lsp/keymap.lua b/seth/programs/nvim/lua/getchoo/lsp/keymap.lua deleted file mode 100644 index 9f34ffa..0000000 --- a/seth/programs/nvim/lua/getchoo/lsp/keymap.lua +++ /dev/null @@ -1,21 +0,0 @@ --- --- keymaps for lsp --- - -local opts = { noremap = true, silent = true } -local set = function(mode, key, cmd) - vim.keymap.set(mode, key, cmd, opts) -end - -set("n", "<space>e", vim.diagnostic.open_float) -set("n", "[d", vim.diagnostic.goto_prev) -set("n", "]d", vim.diagnostic.goto_next) -set("n", "<space>q", vim.diagnostic.setloclist) - -set("n", "<space>f", function() - vim.cmd("Telescope") -end) - -set("n", "<space>t", function() - vim.cmd("TroubleToggle") -end) diff --git a/seth/programs/nvim/lua/getchoo/lsp/server.lua b/seth/programs/nvim/lua/getchoo/lsp/server.lua deleted file mode 100644 index 325e1c7..0000000 --- a/seth/programs/nvim/lua/getchoo/lsp/server.lua +++ /dev/null @@ -1,22 +0,0 @@ --- --- initialize lsp servers --- - -local cmp = require("cmp") -local lspconfig = require("lspconfig") -local null_ls = require("null-ls") -local config = require("getchoo.lsp.config") - -if vim.g.use_mason then - require("mason").setup() - require("mason-lspconfig").setup(config.mason_lspconfig) - require("mason-tool-installer").setup(config.mason_tool_installer) - vim.opt.runtimepath:append("~/.local/share/nvim/mason/bin/") -end - -null_ls.setup(config.null_ls) -cmp.setup(config.cmp) - -for server, settings in pairs(config.lsp_servers) do - lspconfig[server].setup(settings) -end diff --git a/seth/programs/nvim/lua/getchoo/plugins.lua b/seth/programs/nvim/lua/getchoo/plugins.lua deleted file mode 100644 index fe510d0..0000000 --- a/seth/programs/nvim/lua/getchoo/plugins.lua +++ /dev/null @@ -1,111 +0,0 @@ --- --- plugins for neovim --- - -local fn = vim.fn -local cmd = vim.cmd - -local packer_path = fn.stdpath("data") .. "/site/pack/packer/start/packer.nvim" - -if fn.empty(fn.glob(packer_path)) > 0 then - Packer_bootstrap = fn.system({ - "git", - "clone", - "--depth", - "1", - "https://github.com/wbthomason/packer.nvim", - packer_path, - }) - cmd("packadd packer.nvim") -end - -require("packer").startup(function(use) - use("wbthomason/packer.nvim") - - -- comsetic plugins - use({ "nvim-lualine/lualine.nvim", requires = { "kyazdani42/nvim-web-devicons" } }) - - use({ - "catppuccin/nvim", - as = "catppuccin", - config = function() - require("catppuccin").setup({ - flavour = "mocha", -- mocha, macchiato, frappe, latte - integrations = { - barbar = true, - gitsigns = true, - lightspeed = true, - mason = true, - cmp = true, - nvimtree = true, - treesitter_context = true, - treesitter = true, - telescope = true, - lsp_trouble = true, - }, - }) - vim.api.nvim_command("colorscheme catppuccin") - end, - }) - - ---- use("shaunsingh/nord.nvim") - ---- use({ "rose-pine/neovim", as = "rose-pine" }) - - -- general use plugins - use({ - "romgrk/barbar.nvim", - requires = { "kyazdani42/nvim-web-devicons" }, - }) - - use("ggandor/lightspeed.nvim") - use("kyazdani42/nvim-tree.lua") - - -- lsp plugins - if vim.g.use_lsp_plugins then - use("neovim/nvim-lspconfig") - - use({ - "jose-elias-alvarez/null-ls.nvim", - requires = { "nvim-lua/plenary.nvim" }, - }) - - if vim.g.use_mason then - use("williamboman/mason.nvim") - use("williamboman/mason-lspconfig") - use("whoissethdaniel/mason-tool-installer.nvim") - end - - use({ - "nvim-treesitter/nvim-treesitter", - run = function() - require("nvim-treesitter.install").update({ with_sync = true }) - end, - }) - - use("hrsh7th/nvim-cmp") - use("hrsh7th/cmp-nvim-lsp") - use("hrsh7th/cmp-buffer") - use("hrsh7th/cmp-path") - use("hrsh7th/cmp-vsnip") - use("hrsh7th/vim-vsnip") - use("L3MON4D3/LuaSnip") - use("saadparwaiz1/cmp_luasnip") - - use({ - "folke/trouble.nvim", - requires = { "kyazdani42/nvim-web-devicons" }, - }) - use({ - "nvim-telescope/telescope.nvim", - requires = { "nvim-lua/plenary.nvim" }, - }) - - use("lewis6991/gitsigns.nvim") - use("editorconfig/editorconfig-vim") - end - - if Packer_bootstrap then - require("packer").sync() - end -end) - diff --git a/seth/programs/starship.nix b/seth/programs/starship.nix deleted file mode 100644 index 03af3a7..0000000 --- a/seth/programs/starship.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ config, ...}: - -{ - programs.starship = { - enable = false; - settings = { - format = """ - $username\ - $hostname\ - $directory\ - $vcsh\ - $git_branch\ - $git_commit\ - $git_state\ - $git_metrics\ - $git_status\ - $docker_context\ - $nix_shell\ - $env_var\ - $sudo\ - $cmd_duration\ - $line_break\ - $jobs\ - $status\ - $container\ - $shell\ - $character - """; - }; - }; -} diff --git a/seth/programs/vim.nix b/seth/programs/vim.nix deleted file mode 100644 index 35de9c5..0000000 --- a/seth/programs/vim.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ config, nix, ...}: - -{ - programs.vim = { - enable = true; - extraConfig = '' - set runtimepath^=$XDG_CONFIG_HOME/vim - set runtimepath+=$XDG_DATA_HOME/vim - set runtimepath+=$XDG_CONFIG_HOME/vim/after - - set packpath^=$XDG_DATA_HOME/vim,$XDG_CONFIG_HOME/vim - set packpath+=$XDG_CONFIG_HOME/vim/after,$XDG_DATA_HOME/vim/after - - let g:netrw_home = $XDG_DATA_HOME."/vim" - call mkdir($XDG_DATA_HOME."/vim/spell", 'p') - - set backupdir=$XDG_STATE_HOME/vim/backup | call mkdir(&backupdir, 'p') - set directory=$XDG_STATE_HOME/vim/swap | call mkdir(&directory, 'p') - set undodir=$XDG_STATE_HOME/vim/undo | call mkdir(&undodir, 'p') - set viewdir=$XDG_STATE_HOME/vim/view | call mkdir(&viewdir, 'p') - set viminfofile=$XDG_STATE_HOME/vim/viminfo - ''; - settings = { - expandtab = false; - shiftwidth = 2; - tabstop = 2; - }; - }; -} |