diff --git a/home-manager/init.lua b/home-manager/init.lua new file mode 100644 index 0000000..b72c66b --- /dev/null +++ b/home-manager/init.lua @@ -0,0 +1,52 @@ +local g = vim.g +local o = vim.o +-- settings +-- keybind modifier +g.mapleader = "'" +o.updatetime = 300 +o.incsearch = true +-- backups bad +o.swapfile = false +o.backup = false +o.writebackup = false +--formatting +o.expandtab = true +o.shiftwidth = true +o.tabstop = 2 +-- pretty numbers +o.signcolumn = "number" +o.number = true +--easy keybinds +local function map(mode, lhs, rhs, opts) + local options = { noremap = true } + if opts then + options = vim.tbl_extend("force", options, opts) + end + vim.api.nvim_set_keymap(mode, lhs, rhs, options) +end +-- show tree +map("n", "t", ":NvimTreeToggle") +-- coc completion +map("i", "", 'pumvisible() ? coc#_select_confirm() : \"\\u\\\"', {silent = true, expr = true}) + +-- plugin setups +require("nvim-tree").setup { + open_on_setup = true, + sort_by = "case_sensitive", + actions = { + open_file = { + quit_on_open = true, + }, + }, +} +require("nvim-web-devicons").setup() +require("nvim-treesitter.configs").setup { + ensure_installed = "all", + sync_install = false, + auto_install = true, + highlight = { + enable = true, + additional_vim_regex_highlighting = false + } +} + diff --git a/home-manager/neovim.nix b/home-manager/neovim.nix index 51e8638..e8e08c2 100644 --- a/home-manager/neovim.nix +++ b/home-manager/neovim.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{pkgs, ... }: { programs.neovim = { enable = true; @@ -12,26 +12,16 @@ package = pkgs.vimPlugins.coc-nvim; }; plugins = with pkgs.vimPlugins; [ - vim-nix - vim-polyglot - vim-smoothie - nvim-tree-lua - nvim-web-devicons - tokyonight-nvim - rainbow - indentLine - undotree + vim-smoothie #smooth scrolling + tokyonight-nvim #color scheme + undotree # better undos + #extra stuff + nvim-tree-lua # file browser + nvim-web-devicons # for tree-lua +# telescope-nvim # file finder + indentLine # indentlines + nvim-treesitter #syntax highlighting ]; - extraConfig = '' - :lua require("nvim-tree").setup() - set tabstop=2 - set expandtab - set shiftwidth=2 - set ignorecase - set incsearch - set number - set noswapfile - let mapleader = "'" - ''; + extraConfig = "lua << EOF\n" + builtins.readFile ./init.lua + "\nEOF"; }; } diff --git a/home-manager/spicetify.nix b/home-manager/spicetify.nix index d00dc97..ccf39ac 100644 --- a/home-manager/spicetify.nix +++ b/home-manager/spicetify.nix @@ -9,6 +9,6 @@ "adblock.js" "hidePodcasts.js" ]; - theme = "SpotifyNoPremium"; + theme = spicetify-nix.pkgs.themes.SpotifyNoPremium; }; } diff --git a/modules/packages.nix b/modules/packages.nix index 47937ea..de7ccbb 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -5,7 +5,6 @@ environment.systemPackages = with pkgs; [ htop #view tasks efibootmgr #efi editor maim #screenshooter - curlFull #lightm stuff lightdm lightdm-mini-greeter @@ -42,7 +41,7 @@ environment.systemPackages = with pkgs; [ polkit_fix #for thunar root qsudo - + gcc #for neovim tree-sitter nix-tree ]; }