From 9a5cb97ade4b6692b24e66b5fc8651a5c398a07a Mon Sep 17 00:00:00 2001 From: Ivan Dimitrov Date: Tue, 14 Nov 2023 16:40:34 +0200 Subject: [PATCH] some small changes for new user --- flake.nix | 2 +- home/{laptop => ivand}/default.nix | 0 home/{laptop => ivand}/packages/default.nix | 0 home/{laptop => ivand}/programs/default.nix | 1 + .../{laptop => ivand}/programs/lf/default.nix | 0 home/{laptop => ivand}/programs/lf/lfrc | 0 .../programs/neomutt/default.nix | 0 .../programs/neovim/bash.nix | 0 home/ivand/programs/neovim/default.nix | 56 +++++++++++++++++++ .../programs/neovim/firenvim.nix | 0 home/{laptop => ivand}/programs/neovim/hs.nix | 0 home/{laptop => ivand}/programs/neovim/js.nix | 0 .../{laptop => ivand}/programs/neovim/lua.nix | 0 .../{laptop => ivand}/programs/neovim/nix.nix | 0 .../programs/neovim/nvim/default.lua | 0 .../programs/neovim/nvim/util.lua | 0 home/{laptop => ivand}/programs/neovim/py.nix | 0 .../programs/neovim/util.nix | 0 home/{laptop => ivand}/programs/sway/config | 0 .../programs/sway/default.nix | 0 home/{laptop => ivand}/programs/tmux.nix | 0 home/{laptop => ivand}/programs/zsh.nix | 0 home/laptop/programs/neovim/default.nix | 48 ---------------- sys/laptop/default.nix | 37 +++++++----- 24 files changed, 81 insertions(+), 63 deletions(-) rename home/{laptop => ivand}/default.nix (100%) rename home/{laptop => ivand}/packages/default.nix (100%) rename home/{laptop => ivand}/programs/default.nix (97%) rename home/{laptop => ivand}/programs/lf/default.nix (100%) rename home/{laptop => ivand}/programs/lf/lfrc (100%) rename home/{laptop => ivand}/programs/neomutt/default.nix (100%) rename home/{laptop => ivand}/programs/neovim/bash.nix (100%) create mode 100644 home/ivand/programs/neovim/default.nix rename home/{laptop => ivand}/programs/neovim/firenvim.nix (100%) rename home/{laptop => ivand}/programs/neovim/hs.nix (100%) rename home/{laptop => ivand}/programs/neovim/js.nix (100%) rename home/{laptop => ivand}/programs/neovim/lua.nix (100%) rename home/{laptop => ivand}/programs/neovim/nix.nix (100%) rename home/{laptop => ivand}/programs/neovim/nvim/default.lua (100%) rename home/{laptop => ivand}/programs/neovim/nvim/util.lua (100%) rename home/{laptop => ivand}/programs/neovim/py.nix (100%) rename home/{laptop => ivand}/programs/neovim/util.nix (100%) rename home/{laptop => ivand}/programs/sway/config (100%) rename home/{laptop => ivand}/programs/sway/default.nix (100%) rename home/{laptop => ivand}/programs/tmux.nix (100%) rename home/{laptop => ivand}/programs/zsh.nix (100%) delete mode 100644 home/laptop/programs/neovim/default.nix diff --git a/flake.nix b/flake.nix index b5a8a81..3b465f1 100644 --- a/flake.nix +++ b/flake.nix @@ -40,7 +40,7 @@ homeConfigurations = { ivand = home-manager.lib.homeManagerConfiguration { modules = [ - ./home/laptop + ./home/ivand ]; pkgs = import nixpkgs { inherit system; diff --git a/home/laptop/default.nix b/home/ivand/default.nix similarity index 100% rename from home/laptop/default.nix rename to home/ivand/default.nix diff --git a/home/laptop/packages/default.nix b/home/ivand/packages/default.nix similarity index 100% rename from home/laptop/packages/default.nix rename to home/ivand/packages/default.nix diff --git a/home/laptop/programs/default.nix b/home/ivand/programs/default.nix similarity index 97% rename from home/laptop/programs/default.nix rename to home/ivand/programs/default.nix index b73500f..6eb1f71 100644 --- a/home/laptop/programs/default.nix +++ b/home/ivand/programs/default.nix @@ -2,6 +2,7 @@ imports = [ ./neovim ./neomutt ./sway ./tmux.nix ./zsh.nix ./lf ]; programs = { + nv.enable = true; thunderbird = { enable = true; profiles = { ivan = { isDefault = true; }; }; diff --git a/home/laptop/programs/lf/default.nix b/home/ivand/programs/lf/default.nix similarity index 100% rename from home/laptop/programs/lf/default.nix rename to home/ivand/programs/lf/default.nix diff --git a/home/laptop/programs/lf/lfrc b/home/ivand/programs/lf/lfrc similarity index 100% rename from home/laptop/programs/lf/lfrc rename to home/ivand/programs/lf/lfrc diff --git a/home/laptop/programs/neomutt/default.nix b/home/ivand/programs/neomutt/default.nix similarity index 100% rename from home/laptop/programs/neomutt/default.nix rename to home/ivand/programs/neomutt/default.nix diff --git a/home/laptop/programs/neovim/bash.nix b/home/ivand/programs/neovim/bash.nix similarity index 100% rename from home/laptop/programs/neovim/bash.nix rename to home/ivand/programs/neovim/bash.nix diff --git a/home/ivand/programs/neovim/default.nix b/home/ivand/programs/neovim/default.nix new file mode 100644 index 0000000..67ac7e7 --- /dev/null +++ b/home/ivand/programs/neovim/default.nix @@ -0,0 +1,56 @@ +{ pkgs, lib, config, ... }: +let + grammars = with pkgs.vimPlugins.nvim-treesitter-parsers; [ + diff + regex + vimdoc + comment + markdown + ungrammar + gitignore + gitcommit + git_rebase + git_config + gitattributes + dockerfile + ]; + cfg = config.programs.nv; +in +{ + imports = [ ./firenvim.nix ./py.nix ./hs.nix ./bash.nix ./nix.nix ./lua.nix ./js.nix ./util.nix ]; + + options.programs.nv = { + enable = lib.mkEnableOption "nv"; + }; + + config = lib.mkIf cfg.enable { + programs.neovim = { + enable = true; + viAlias = true; + extraPackages = with pkgs; [ + ripgrep + ]; + plugins = with pkgs.vimPlugins; grammars ++ [ + nvim-treesitter + nvim-surround + nvim-ts-autotag + autoclose-nvim + barbar-nvim + cmp-nvim-lsp + comment-nvim + gitsigns-nvim + luasnip + catppuccin-nvim + nvim-cmp + nvim-lspconfig + nvim-web-devicons + plenary-nvim + telescope-nvim + toggleterm-nvim + vim-vinegar + lualine-nvim + ]; + extraLuaConfig = lib.fileContents ./nvim/default.lua; + }; + }; +} diff --git a/home/laptop/programs/neovim/firenvim.nix b/home/ivand/programs/neovim/firenvim.nix similarity index 100% rename from home/laptop/programs/neovim/firenvim.nix rename to home/ivand/programs/neovim/firenvim.nix diff --git a/home/laptop/programs/neovim/hs.nix b/home/ivand/programs/neovim/hs.nix similarity index 100% rename from home/laptop/programs/neovim/hs.nix rename to home/ivand/programs/neovim/hs.nix diff --git a/home/laptop/programs/neovim/js.nix b/home/ivand/programs/neovim/js.nix similarity index 100% rename from home/laptop/programs/neovim/js.nix rename to home/ivand/programs/neovim/js.nix diff --git a/home/laptop/programs/neovim/lua.nix b/home/ivand/programs/neovim/lua.nix similarity index 100% rename from home/laptop/programs/neovim/lua.nix rename to home/ivand/programs/neovim/lua.nix diff --git a/home/laptop/programs/neovim/nix.nix b/home/ivand/programs/neovim/nix.nix similarity index 100% rename from home/laptop/programs/neovim/nix.nix rename to home/ivand/programs/neovim/nix.nix diff --git a/home/laptop/programs/neovim/nvim/default.lua b/home/ivand/programs/neovim/nvim/default.lua similarity index 100% rename from home/laptop/programs/neovim/nvim/default.lua rename to home/ivand/programs/neovim/nvim/default.lua diff --git a/home/laptop/programs/neovim/nvim/util.lua b/home/ivand/programs/neovim/nvim/util.lua similarity index 100% rename from home/laptop/programs/neovim/nvim/util.lua rename to home/ivand/programs/neovim/nvim/util.lua diff --git a/home/laptop/programs/neovim/py.nix b/home/ivand/programs/neovim/py.nix similarity index 100% rename from home/laptop/programs/neovim/py.nix rename to home/ivand/programs/neovim/py.nix diff --git a/home/laptop/programs/neovim/util.nix b/home/ivand/programs/neovim/util.nix similarity index 100% rename from home/laptop/programs/neovim/util.nix rename to home/ivand/programs/neovim/util.nix diff --git a/home/laptop/programs/sway/config b/home/ivand/programs/sway/config similarity index 100% rename from home/laptop/programs/sway/config rename to home/ivand/programs/sway/config diff --git a/home/laptop/programs/sway/default.nix b/home/ivand/programs/sway/default.nix similarity index 100% rename from home/laptop/programs/sway/default.nix rename to home/ivand/programs/sway/default.nix diff --git a/home/laptop/programs/tmux.nix b/home/ivand/programs/tmux.nix similarity index 100% rename from home/laptop/programs/tmux.nix rename to home/ivand/programs/tmux.nix diff --git a/home/laptop/programs/zsh.nix b/home/ivand/programs/zsh.nix similarity index 100% rename from home/laptop/programs/zsh.nix rename to home/ivand/programs/zsh.nix diff --git a/home/laptop/programs/neovim/default.nix b/home/laptop/programs/neovim/default.nix deleted file mode 100644 index 97eb988..0000000 --- a/home/laptop/programs/neovim/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ pkgs, lib, ... }: -let grammars = with pkgs.vimPlugins.nvim-treesitter-parsers; [ - diff - regex - vimdoc - comment - markdown - ungrammar - gitignore - gitcommit - git_rebase - git_config - gitattributes - dockerfile -]; -in -{ - imports = [ ./firenvim.nix ./py.nix ./hs.nix ./bash.nix ./nix.nix ./lua.nix ./js.nix ./util.nix ]; - - programs.neovim = { - enable = true; - viAlias = true; - extraPackages = with pkgs; [ - ripgrep - ]; - plugins = with pkgs.vimPlugins; grammars ++ [ - nvim-treesitter - nvim-surround - nvim-ts-autotag - autoclose-nvim - barbar-nvim - cmp-nvim-lsp - comment-nvim - gitsigns-nvim - luasnip - catppuccin-nvim - nvim-cmp - nvim-lspconfig - nvim-web-devicons - plenary-nvim - telescope-nvim - toggleterm-nvim - vim-vinegar - lualine-nvim - ]; - extraLuaConfig = lib.fileContents ./nvim/default.lua; - }; -} diff --git a/sys/laptop/default.nix b/sys/laptop/default.nix index daf834f..dea4aa9 100644 --- a/sys/laptop/default.nix +++ b/sys/laptop/default.nix @@ -110,20 +110,29 @@ users = { defaultUserShell = pkgs.zsh; - users.ivand = { - isNormalUser = true; - extraGroups = [ - "wheel" - "adm" - "audio" - "video" - "kvm" - "render" - "flatpak" - "bluetooth" - "mlocate" - "dialout" - ]; + users = { + ivand = { + isNormalUser = true; + extraGroups = [ + "wheel" + "adm" + "audio" + "video" + "kvm" + "render" + "flatpak" + "bluetooth" + "mlocate" + "dialout" + ]; + }; + vid = { + isNormalUser = true; + extraGroups = [ + "video" + "mlocate" + ]; + }; }; extraGroups = { mlocate = { }; }; };