some small changes for new user

flake.nix

@@ -40,7 +40,7 @@
       homeConfigurations = {
         ivand = home-manager.lib.homeManagerConfiguration {
           modules = [
-            ./home/laptop
+            ./home/ivand
           ];
           pkgs = import nixpkgs {
             inherit system;

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; }; };

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;
+    };
+  };
+}

home/laptop/programs/neovim/default.nix

@@ -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;
-  };
-}

sys/laptop/default.nix

@@ -110,7 +110,8 @@
 
   users = {
     defaultUserShell = pkgs.zsh;
-    users.ivand = {
+    users = {
+      ivand = {
         isNormalUser = true;
         extraGroups = [
           "wheel"
@@ -125,6 +126,14 @@
           "dialout"
         ];
       };
+      vid = {
+        isNormalUser = true;
+        extraGroups = [
+          "video"
+          "mlocate"
+        ];
+      };
+    };
     extraGroups = { mlocate = { }; };
   };