nest home-manager programs

common/home-manager.nix

@@ -14,85 +14,85 @@
     nixpkgs.config.allowUnfree = true;
     home.stateVersion = config.system.stateVersion;
 
-    programs.git = {
+    programs = {
-      enable = true;
+      git = {
-      lfs.enable = true;
+        enable = true;
+        lfs.enable = true;
 
-      userName = "Sijmen";
+        userName = "Sijmen";
-      userEmail = "me@sijman.nl";
+        userEmail = "me@sijman.nl";
 
-      signing = {
+        signing = {
-        signByDefault = true;
+          signByDefault = true;
-        key = "0xDAF7821E067D9C48";
+          key = "0xDAF7821E067D9C48";
+        };
+
+        extraConfig = {
+          fetch.prune = true;
+          init.defaultBranch = "main";
+          pull.rebase = true;
+          push.autoSetupRemote = true;
+          safe.directory = [ "/etc/nixos" ];
+        };
       };
 
-      extraConfig = {
+      firefox = {
-        fetch.prune = true;
+        enable = true;
-        init.defaultBranch = "main";
+        package = pkgs.wrapFirefox pkgs.firefox-unwrapped { forceWayland = true; };
-        pull.rebase = true;
-        push.autoSetupRemote = true;
-        safe.directory = [ "/etc/nixos" ];
       };
-    };
 
-    programs.firefox = {
+      neovim = {
-      enable = true;
+        enable = true;
-      package = pkgs.wrapFirefox pkgs.firefox-unwrapped {
+        vimAlias = true;
-        forceWayland = true;
+
+        extraConfig = ''
+          luafile /etc/nixos/common/nvim.lua
+        '';
+
+        extraPackages = with pkgs; [
+          gcc
+          rnix-lsp
+          nodePackages.pyright
+        ];
+
+        plugins = with pkgs.vimPlugins; [
+          bufferline-nvim
+          galaxyline-nvim
+          indentLine
+          lualine-nvim
+          neorg
+          nvim-colorizer-lua
+          nvim-compe
+          nvim-lspconfig
+          nvim-tree-lua
+          nvim-treesitter
+          nvim-web-devicons
+          onehalf
+          pears-nvim
+          plenary-nvim
+          vim-closetag
+          vim-nix
+        ];
       };
-    };
 
-    programs.neovim = {
+      alot.enable = true;
-      enable = true;
+      gpg.enable = true;
-      vimAlias = true;
+      home-manager.enable = true;
+      mbsync.enable = true;
+      password-store.enable = true;
 
-      extraConfig = ''
+      bash = {
-        luafile /etc/nixos/common/nvim.lua
+        enable = true;
-      '';
+        initExtra = ''
+          source ${pkgs.fetchurl { url = "https://raw.githubusercontent.com/rupa/z/v1.11/z.sh"; sha256 = "f24e0791ba10f6a8301461da3fc50333eee2e009a19e5d0e9f3661f0d0446767"; }}
+        '';
+      };
 
-      extraPackages = with pkgs; [
+      notmuch = {
-        gcc
+        enable = true;
-        rnix-lsp
+        hooks = {
-        nodePackages.pyright
+          preNew = "mbsync --all";
-      ];
+        };
-
-      plugins = with pkgs.vimPlugins; [
-        bufferline-nvim
-        galaxyline-nvim
-        indentLine
-        lualine-nvim
-        neorg
-        nvim-colorizer-lua
-        nvim-compe
-        nvim-lspconfig
-        nvim-tree-lua
-        nvim-treesitter
-        nvim-web-devicons
-        onehalf
-        pears-nvim
-        plenary-nvim
-        vim-closetag
-        vim-nix
-      ];
-    };
-
-    programs.alot.enable = true;
-    programs.gpg.enable = true;
-    programs.home-manager.enable = true;
-    programs.mbsync.enable = true;
-    programs.password-store.enable = true;
-
-    programs.bash = {
-      enable = true;
-      initExtra = ''
-        source ${pkgs.fetchurl { url = "https://raw.githubusercontent.com/rupa/z/v1.11/z.sh"; sha256 = "f24e0791ba10f6a8301461da3fc50333eee2e009a19e5d0e9f3661f0d0446767"; }}
-      '';
-    };
-
-    programs.notmuch = {
-      enable = true;
-      hooks = {
-        preNew = "mbsync --all";
       };
     };