diff --git a/hosts/ankaa/dotfiles/ssh/config b/hosts/ankaa/dotfiles/ssh/config index fec2be9..e69de29 100644 --- a/hosts/ankaa/dotfiles/ssh/config +++ b/hosts/ankaa/dotfiles/ssh/config @@ -1,2 +0,0 @@ -Host git.simmer505.com -Port 222 diff --git a/hosts/ankaa/home.nix b/hosts/ankaa/home.nix index 49917e4..6250343 100644 --- a/hosts/ankaa/home.nix +++ b/hosts/ankaa/home.nix @@ -24,7 +24,6 @@ home.file.".config/waybar".source = ./dotfiles/waybar; home.file.".config/alacritty/alacritty.toml".source = ./dotfiles/alacritty/alacritty.toml; - home.file.".ssh/config".source = ./dotfiles/ssh/config; # Fix for slow steam download speeds https://old.reddit.com/r/linux_gaming/comments/16e1l4h/slow_steam_downloads_try_this/ home.file.".steam/steam/steam_dev.cfg".source = ./dotfiles/steam/steam_dev.cfg; diff --git a/modules/home/git.nix b/modules/home/git.nix index ad15dfe..83fc6bf 100644 --- a/modules/home/git.nix +++ b/modules/home/git.nix @@ -14,13 +14,32 @@ in type = types.bool; default = true; }; + + jujutsu = { + enable = mkOption { + description = "Whether to install and configure jujutsu"; + type = types.bool; + default = true; + }; + }; }; - config = mkIf cfg.enable { - programs.git = { + + config = { + programs.git = mkIf cfg.enable { enable = true; userName = "Ethan Simmons"; - userEmail = "eesimmons9105@gmail.com"; + userEmail = "contact@esimmons.me"; + }; + programs.jujutsu = mkIf cfg.jujutsu.enable { + enable = true; + settings = { + user = { + name = "Ethan Simmons"; + email = "contact@esimmons.me"; + }; + ui.paginate = "never"; + }; }; }; } diff --git a/modules/nix/common.nix b/modules/nix/common.nix index 898d9c0..686477b 100644 --- a/modules/nix/common.nix +++ b/modules/nix/common.nix @@ -15,6 +15,7 @@ in curl wget git + jujutsu killall vim eza diff --git a/modules/nix/school/default.nix b/modules/nix/school/default.nix index 479ba68..ccca6b0 100644 --- a/modules/nix/school/default.nix +++ b/modules/nix/school/default.nix @@ -14,7 +14,6 @@ in environment.systemPackages = with pkgs; [ xournalpp libreoffice - anki ] ++ optional cfg.citrix citrix; }; }