From 30a34d07d50e2b01b59382487c059d744b1ef314 Mon Sep 17 00:00:00 2001 From: Deepak Mallubhotla Date: Fri, 26 Apr 2024 16:01:51 -0500 Subject: [PATCH] fmt: tabs instead of spaces for home config yay --- home/deepak/home.nix | 293 ++++++++---------- .../deepak/neovim/init-vim.nix | 0 2 files changed, 132 insertions(+), 161 deletions(-) rename init-vim.nix => home/deepak/neovim/init-vim.nix (100%) diff --git a/home/deepak/home.nix b/home/deepak/home.nix index 406390b..041e872 100644 --- a/home/deepak/home.nix +++ b/home/deepak/home.nix @@ -2,179 +2,150 @@ { - programs.home-manager.enable = true; - home.packages = [ - pkgs.hello - (pkgs.writeScriptBin "nixFlakes" '' - exec ${pkgs.nixUnstable}/bin/nix --experimental-features "nix-command flakes" "$@" - '') - pkgs.cachix - pkgs.kubectl - pkgs.bat - pkgs.eza - pkgs.fd - pkgs.ripgrep - pkgs.just + programs.home-manager.enable = true; + home.packages = [ + pkgs.hello + (pkgs.writeScriptBin "nixFlakes" '' + exec ${pkgs.nixUnstable}/bin/nix --experimental-features "nix-command flakes" "$@" + '') + pkgs.cachix + pkgs.kubectl + pkgs.bat + pkgs.eza + pkgs.fd + pkgs.ripgrep + pkgs.just - # lsps - pkgs.nil - ] ++ pkgs.lib.optionals specialArgs.withGUI [ - pkgs.discord - pkgs.obsidian - pkgs.audacity - pkgs.nextcloud-client - ]; + # lsps + pkgs.nil + ] ++ pkgs.lib.optionals specialArgs.withGUI [ + pkgs.discord + pkgs.obsidian + pkgs.audacity + pkgs.nextcloud-client + ]; - home.homeDirectory = "/home/deepak"; - home.username = "deepak"; + home.homeDirectory = "/home/deepak"; + home.username = "deepak"; - # required, was previously default - home.stateVersion = "18.09"; + # required, was previously default + home.stateVersion = "18.09"; - programs.direnv.enable = true; - programs.direnv.nix-direnv.enable = true; + programs.direnv.enable = true; + programs.direnv.nix-direnv.enable = true; - xdg.enable = true; + xdg.enable = true; - services.nextcloud-client = pkgs.lib.mkIf specialArgs.withGUI { - enable = true; - }; + services.nextcloud-client = pkgs.lib.mkIf specialArgs.withGUI { + enable = true; + }; - programs.git = { - enable = true; - userName = "Deepak Mallubhotla"; - userEmail = "dmallubhotla+github@gmail.com"; - signing = { - key = specialArgs.gitSigningKey; - signByDefault = true; - }; - extraConfig = { - core = { - fileMode = false; - }; - }; - includes = [ - # this allows us to have a local gitconfig maybe? - { path = "~/.gitconfig.local"; } - ]; - }; + programs.git = { + enable = true; + userName = "Deepak Mallubhotla"; + userEmail = "dmallubhotla+github@gmail.com"; + signing = { + key = specialArgs.gitSigningKey; + signByDefault = true; + }; + extraConfig = { + core = { + fileMode = false; + }; + }; + includes = [ + # this allows us to have a local gitconfig maybe? + { path = "~/.gitconfig.local"; } + ]; + }; - programs.neovim = { - enable = true; - defaultEditor = true; - vimAlias = true; + programs.neovim = { + enable = true; + defaultEditor = true; + vimAlias = true; - plugins = with pkgs.vimPlugins; [ - { - plugin = vimtex; - config = "let g:nix_recommended_style = 0"; - } - vim-nix - # plenary and stuff for telescope - plenary-nvim telescope-nvim telescope-file-browser-nvim - ctrlp-vim - # lsp stuff - lsp-zero-nvim - nvim-cmp - cmp-nvim-lsp - cmp_luasnip - nvim-lspconfig - wiki-vim - vim-markdown - cmp-buffer - vim-airline - vim-fugitive - flash-nvim - gitsigns-nvim - friendly-snippets - luasnip - which-key-nvim - rose-pine - pkgs.customVimPlugins.cmp-vimtex - pkgs.customVimPlugins.spaceport-nvim + plugins = with pkgs.vimPlugins; [ + { + plugin = vimtex; + config = "let g:nix_recommended_style = 0"; + } + vim-nix + # plenary and stuff for telescope + plenary-nvim telescope-nvim telescope-file-browser-nvim + ctrlp-vim + # lsp stuff + lsp-zero-nvim + nvim-cmp + cmp-nvim-lsp + cmp_luasnip + nvim-lspconfig + wiki-vim + vim-markdown + cmp-buffer + vim-airline + vim-fugitive + flash-nvim + gitsigns-nvim + friendly-snippets + luasnip + which-key-nvim + rose-pine + pkgs.customVimPlugins.cmp-vimtex + pkgs.customVimPlugins.spaceport-nvim - # syntax highlighting - vim-just - ]; - extraConfig = '' - inoremap jj - inoremap kk + # syntax highlighting + vim-just + ]; + extraConfig = import ./neovim/init-vim.nix; + }; - lua << EOF - - vim.opt.tabstop = 4 - vim.opt.shiftwidth = 4 - vim.opt.expandtab = false - vim.opt.list = true - vim.opt.listchars = { eol = "¬", tab = "▸┈" , trail = '·', multispace = '·' } - - vim.keymap.set("n", "n", "R") - - ${builtins.readFile ./neovim/spaceport.lua} - require('gitsigns').setup() - - -- color scheme - require("rose-pine").setup({}) - vim.cmd("colorscheme rose-pine") - - require('flash').setup() - - require('which-key').setup({}) - ${builtins.readFile ./neovim/lsp.lua} - vim.g.vim_markdown_folding_level = 2 - ${builtins.readFile ./neovim/wiki-vim.lua} - - EOF - ''; - }; - - programs.zsh = { - enable = true; - shellAliases = { - doo="./do.sh"; - wttr="curl wttr.in"; - }; - history = { - size = 10000; - path = "${lib.removePrefix "/home/deepak/" config.xdg.dataHome}/zsh/history"; - }; - oh-my-zsh = { - enable = true; - plugins = [ - "git" - "poetry" - "themes" - "emoji-clock" - "screen" - "ssh-agent" - ]; - theme = "random"; - }; - plugins = [ - { - name = "sd"; - src = pkgs.fetchFromGitHub { - owner = "ianthehenry"; - repo = "sd"; - rev = "ecd1ab8d3fc3a829d8abfb8bf1e3722c9c99407b"; - sha256 = "0fm1r8w73vaab5r9dj5jdxsfc7pbddxf4dvvasfq8rry2dxaf7sy"; - }; - } - { - name = "zsh-z"; - src = pkgs.fetchFromGitHub { - owner = "agkozak"; - repo = "zsh-z"; - rev = "b5e61d03a42a84e9690de12915a006b6745c2a5f"; - sha256 = "1gsgmsvl1sl9m3yfapx6bp0y15py8610kywh56bgsjf9wxkrc3nl"; - }; - } - ]; - initExtra = '' - eval "$(${pkgs.direnv}/bin/direnv hook zsh)" - ''; - }; + programs.zsh = { + enable = true; + shellAliases = { + doo="./do.sh"; + wttr="curl wttr.in"; + }; + history = { + size = 10000; + path = "${lib.removePrefix "/home/deepak/" config.xdg.dataHome}/zsh/history"; + }; + oh-my-zsh = { + enable = true; + plugins = [ + "git" + "poetry" + "themes" + "emoji-clock" + "screen" + "ssh-agent" + ]; + theme = "random"; + }; + plugins = [ + { + name = "sd"; + src = pkgs.fetchFromGitHub { + owner = "ianthehenry"; + repo = "sd"; + rev = "ecd1ab8d3fc3a829d8abfb8bf1e3722c9c99407b"; + sha256 = "0fm1r8w73vaab5r9dj5jdxsfc7pbddxf4dvvasfq8rry2dxaf7sy"; + }; + } + { + name = "zsh-z"; + src = pkgs.fetchFromGitHub { + owner = "agkozak"; + repo = "zsh-z"; + rev = "b5e61d03a42a84e9690de12915a006b6745c2a5f"; + sha256 = "1gsgmsvl1sl9m3yfapx6bp0y15py8610kywh56bgsjf9wxkrc3nl"; + }; + } + ]; + initExtra = '' + eval "$(${pkgs.direnv}/bin/direnv hook zsh)" + ''; + }; } diff --git a/init-vim.nix b/home/deepak/neovim/init-vim.nix similarity index 100% rename from init-vim.nix rename to home/deepak/neovim/init-vim.nix