diff --git a/home-manager/common.nix b/home-manager/common.nix index 9344c0b..afc6fad 100644 --- a/home-manager/common.nix +++ b/home-manager/common.nix @@ -13,6 +13,9 @@ # The home.packages option allows you to install Nix packages into your # environment. home.packages = with pkgs; [ + nil + nixfmt + devenv direnv @@ -66,25 +69,23 @@ # Shell configurations programs.fish = { - enable = true; - shellInit = '' - fish_add_path $HOME/.emacs.d/bin/ - fish_add_path $HOME/.cargo/bin/ - ''; + enable = true; + shellInit = '' + fish_add_path $HOME/.emacs.d/bin/ + fish_add_path $HOME/.cargo/bin/ + ''; - loginShellInit = '' - set -x XDG_DATA_DIRS $HOME/.nix-profile/share:$XDG_DATA_DIRS - set -x DIRENV_LOG_FORMAT - set -x SSH_AUTH_SOCK /run/user/1000/keyring/ssh - ''; + loginShellInit = '' + set -x XDG_DATA_DIRS $HOME/.nix-profile/share:$XDG_DATA_DIRS + set -x DIRENV_LOG_FORMAT + set -x SSH_AUTH_SOCK /run/user/1000/keyring/ssh + ''; - interactiveShellInit = '' - set fish_greeting - ''; + interactiveShellInit = '' + set fish_greeting + ''; - functions = { - update = "nix-channel --update && home-manager switch"; - }; + functions = { update = "nix-channel --update && home-manager switch"; }; }; programs.mise.enable = true; @@ -93,36 +94,27 @@ # Programming configurations programs.git = { + enable = true; + userName = "Roman Godmaire"; + userEmail = "godmaire@twilit.io"; + + delta = { enable = true; - userName = "Roman Godmaire"; - userEmail = "godmaire@twilit.io"; - - delta = { - enable = true; - options = { - side-by-side = true; - }; - }; - - extraConfig = { - init = { - defaultBranch = "main"; - }; - }; + options = { side-by-side = true; }; }; + extraConfig = { init = { defaultBranch = "main"; }; }; + }; + programs.emacs = { - enable = true; - package = pkgs.emacs29-pgtk; + enable = true; + package = pkgs.emacs29-pgtk; - extraPackages = epkgs: with epkgs; [ - pdf-tools - vterm - ]; - }; + extraPackages = epkgs: with epkgs; [ pdf-tools vterm ]; + }; programs.neovim = { - enable = true; - defaultEditor = true; - }; + enable = true; + defaultEditor = true; + }; }