diff --git a/configuration.nix b/configuration.nix index 97c5c70..3dce2a1 100644 --- a/configuration.nix +++ b/configuration.nix @@ -25,7 +25,7 @@ users.users.julien = { isNormalUser = true; extraGroups = [ "wheel" ]; - home = "/home/julien"; + home = "/home/julien"; shell = pkgs.fish; }; diff --git a/home-manager-modules/git/default.nix b/home-manager-modules/git/default.nix new file mode 100644 index 0000000..9c167cb --- /dev/null +++ b/home-manager-modules/git/default.nix @@ -0,0 +1,18 @@ +{ config, pkgs, lib, ... }: +let + cfg = config.luj.programs.git; +in +with lib; +{ + options.luj.programs.git = { + enable = mkEnableOption "Enable git program"; + }; + + config = mkIf cfg.enable { + programs.git = { + enable = true; + userName = "Julien Malka"; + userEmail = "julien.malka@me.com"; + }; + }; +} diff --git a/home-manager-modules/neovim/default.nix b/home-manager-modules/neovim/default.nix index 212bc77..e7d5ad9 100644 --- a/home-manager-modules/neovim/default.nix +++ b/home-manager-modules/neovim/default.nix @@ -18,8 +18,8 @@ with lib; enable = mkEnableOption "activate neovim program"; }; - config = mkIf cfg.enable{ - programs.neovim = { + config = mkIf cfg.enable { + programs.neovim = { enable = true; package = pkgs.neovim-unwrapped; plugins = with pkgs.vimPlugins; [ @@ -47,7 +47,7 @@ with lib; telescope-nvim # Indent lines - indent-blankline-nvim + #indent-blankline-nvim ]; extraPackages = with pkgs; [ gcc @@ -62,7 +62,7 @@ with lib; luafile ${./lua}/settings.lua ''; }; -}; + }; } diff --git a/machines/lisa.nix b/machines/lisa.nix index 99232fd..b8fcd3d 100644 --- a/machines/lisa.nix +++ b/machines/lisa.nix @@ -17,8 +17,9 @@ home.username = "julien"; home.homeDirectory = "/home/julien"; home.stateVersion = "21.11"; - imports = [ ../home-manager-modules/mails/default.nix ../home-manager-modules/neovim/default.nix ]; + imports = [ ../home-manager-modules/mails/default.nix ../home-manager-modules/neovim/default.nix ../home-manager-modules/git/default.nix ]; luj.programs.neovim.enable = true; + luj.programs.git.enable = true; }; diff --git a/machines/newton.nix b/machines/newton.nix index cd3894a..bc3bcc3 100644 --- a/machines/newton.nix +++ b/machines/newton.nix @@ -9,13 +9,14 @@ in home.username = "julien"; home.homeDirectory = "/home/julien"; home.stateVersion = "21.11"; - imports = [../home-manager-modules/mails/default.nix ../home-manager-modules/neovim/default.nix]; + imports = [../home-manager-modules/mails/default.nix ../home-manager-modules/neovim/default.nix ../home-manager-modules/git/default.nix ]; luj.emails = { enable = true; backend.enable = true; }; luj.programs.neovim.enable = true; + luj.programs.git.enable = true; }; boot.loader.grub.enable = true;