From e08a6f7d23102965bd22b77041360b4bb7869aa9 Mon Sep 17 00:00:00 2001 From: notohh Date: Tue, 30 Jan 2024 07:44:05 -0500 Subject: [PATCH] home: remove neovim --- home/README.md | 1 + home/default.nix | 3 +- home/editors/neovim/config.lua | 63 ------------------- home/editors/neovim/default.nix | 5 -- home/editors/neovim/lua/presence.lua | 27 -------- home/{editors => }/helix/default.nix | 0 home/{editors => }/helix/languages.nix | 0 .../helix/themes/catppuccin_mocha.nix | 0 .../{editors => }/helix/themes/tokyonight.nix | 0 home/nushell/config.nu | 2 - 10 files changed, 2 insertions(+), 99 deletions(-) delete mode 100644 home/editors/neovim/config.lua delete mode 100644 home/editors/neovim/default.nix delete mode 100644 home/editors/neovim/lua/presence.lua rename home/{editors => }/helix/default.nix (100%) rename home/{editors => }/helix/languages.nix (100%) rename home/{editors => }/helix/themes/catppuccin_mocha.nix (100%) rename home/{editors => }/helix/themes/tokyonight.nix (100%) diff --git a/home/README.md b/home/README.md index a4c9486..c34b775 100644 --- a/home/README.md +++ b/home/README.md @@ -12,6 +12,7 @@ name | description `default` | used for commonly shared modules, for multiple home-manager configs `git` | version control system `gtk` | themes +`helix` | modal text editor `ironbar` | wayland specific bar, written in Rust `lazygit` | terminal based git command system `mako` | a lightweight wayland notification daemon diff --git a/home/default.nix b/home/default.nix index 69facb6..6a9e1be 100644 --- a/home/default.nix +++ b/home/default.nix @@ -1,7 +1,6 @@ {pkgs, ...}: { imports = [ - ./editors/helix - ./editors/neovim + ./helix ./neofetch ./nushell ./starship diff --git a/home/editors/neovim/config.lua b/home/editors/neovim/config.lua deleted file mode 100644 index c4cb82c..0000000 --- a/home/editors/neovim/config.lua +++ /dev/null @@ -1,63 +0,0 @@ -vim.opt.shiftwidth = 2 -vim.opt.tabstop = 2 -vim.opt.relativenumber = true - --- general -lvim.log.level = "info" -lvim.format_on_save.enabled = true -lvim.format_on_save.pattern = { "*.lua", "*.nix", "*.rs", "*.go" } - --- keymappings -lvim.leader = "space" - --- add your own keymapping -lvim.keys.normal_mode[""] = ":w" - --- -- Change theme settings -lvim.colorscheme = "tokyonight" -lvim.transparent_window = true - -lvim.builtin.alpha.active = true -lvim.builtin.alpha.mode = "dashboard" -lvim.builtin.terminal.active = true -lvim.builtin.nvimtree.setup.view.side = "left" -lvim.builtin.nvimtree.setup.renderer.icons.show.git = true -lvim.builtin.treesitter.auto_install = true - - --- plugins - -lvim.plugins = { - { - "andweeb/presence.nvim", - config = function() require("user.presence").config() end - }, - { - "folke/tokyonight.nvim", lazy = false, priority = 1000, opts = {} - }, - { - "windwp/nvim-spectre", - event = "BufRead", - config = function() require("spectre").setup() end - }, - { - "ggandor/leap.nvim", - name = "leap", - config = function() - require("leap").add_default_mappings() - end, - }, -} - -local formatters = require "lvim.lsp.null-ls.formatters" -formatters.setup { - { - name = "alejandra", - command = "alejandra", - args = { "--quiet" }, - filetypes = { "nix" } - } -} - -local function open_nvim_tree() require("nvim-tree.api").tree.open() end -vim.api.nvim_create_autocmd({ "VimEnter" }, { callback = open_nvim_tree }) diff --git a/home/editors/neovim/default.nix b/home/editors/neovim/default.nix deleted file mode 100644 index 56c389a..0000000 --- a/home/editors/neovim/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{pkgs, ...}: { - home.packages = [pkgs.lunarvim]; - xdg.configFile."lvim/config.lua".source = ./config.lua; - xdg.configFile."lvim/lua/user/presence.lua".source = ./lua/presence.lua; -} diff --git a/home/editors/neovim/lua/presence.lua b/home/editors/neovim/lua/presence.lua deleted file mode 100644 index d49d7b5..0000000 --- a/home/editors/neovim/lua/presence.lua +++ /dev/null @@ -1,27 +0,0 @@ -local M = {} - -M.config = function() - local status_ok, presence = pcall(require, "presence") - if not status_ok then return end - - presence:setup { - auto_update = true, - neovim_image_text = "LunarVim", - main_image = "file", - client_id = "793271441293967371", - buttons = true, - show_time = true, - log_level = nil, - debounce_timeout = 10, - enable_line_number = true, -- Displays the current line number instead of the current project - editing_text = "Editing %s", -- string rendered when an editable file is loaded in the buffer - file_explorer_text = "Browsing %s", -- Format string rendered when browsing a file explorer - git_commit_text = "Committing changes", -- string rendered when commiting changes in git - plugin_manager_text = "Managing plugins", -- Format string rendered when managing plugins - reading_text = "Reading %s", -- string rendered when a read-only file is loaded in the buffer - workspace_text = "Working on %s", -- Workspace format string (either string or function(git_project_name: string|nil, buffer: string): string) - line_number_text = "Line %s out of %s" -- Line number string (for when enable_line_number is set to true) - } -end - -return M diff --git a/home/editors/helix/default.nix b/home/helix/default.nix similarity index 100% rename from home/editors/helix/default.nix rename to home/helix/default.nix diff --git a/home/editors/helix/languages.nix b/home/helix/languages.nix similarity index 100% rename from home/editors/helix/languages.nix rename to home/helix/languages.nix diff --git a/home/editors/helix/themes/catppuccin_mocha.nix b/home/helix/themes/catppuccin_mocha.nix similarity index 100% rename from home/editors/helix/themes/catppuccin_mocha.nix rename to home/helix/themes/catppuccin_mocha.nix diff --git a/home/editors/helix/themes/tokyonight.nix b/home/helix/themes/tokyonight.nix similarity index 100% rename from home/editors/helix/themes/tokyonight.nix rename to home/helix/themes/tokyonight.nix diff --git a/home/nushell/config.nu b/home/nushell/config.nu index b26c760..4c5ce8f 100755 --- a/home/nushell/config.nu +++ b/home/nushell/config.nu @@ -9,7 +9,6 @@ alias la = eza -alughH --git --icons alias calc = eva alias c = clear alias f = yazi -alias v = lvim alias cat = bat alias rm = rm -i alias cp = cp -i @@ -36,7 +35,6 @@ alias shorten = rpaste -s "https://i.flake.sh/" -e 1day -u alias send = croc --relay "100.104.42.96:9009" send alias tail = tspin alias grep = rg -alias code = codium "." nitch $env.config = {