Remove lazygit, move some package definitions around

This commit is contained in:
Evie Litherland-Smith 2023-07-18 15:04:58 +01:00
parent e65675da02
commit e66aeab392
6 changed files with 3 additions and 33 deletions

View file

@ -1,5 +1,5 @@
{pkgs, ...}: { {pkgs, ...}: {
home.packages = with pkgs; [(nerdfonts.override {fonts = ["FiraCode"];})]; home.packages = with pkgs; [dig silver-searcher gnumake];
programs = { programs = {
direnv = { direnv = {
enable = true; enable = true;

View file

@ -1,10 +1,8 @@
{pkgs, ...}: { {pkgs, ...}: {
imports = [./default.nix]; imports = [./default.nix];
home.packages = with pkgs; [dig silver-searcher gnumake];
programs = { programs = {
fish = { fish = {
enable = true; enable = true;
shellAbbrs = {lg = "lazygit";};
plugins = [ plugins = [
{ {
name = "tokyonight"; name = "tokyonight";
@ -19,7 +17,6 @@
} }
]; ];
}; };
# direnv.enableFishIntegration = true;
fzf.enableFishIntegration = true; fzf.enableFishIntegration = true;
keychain.enableFishIntegration = true; keychain.enableFishIntegration = true;
starship.enableFishIntegration = true; starship.enableFishIntegration = true;

View file

@ -3,6 +3,5 @@
./neovim.nix ./neovim.nix
./bat.nix ./bat.nix
./gitui.nix ./gitui.nix
./lazygit.nix
]; ];
} }

View file

@ -1,26 +0,0 @@
{...}: {
programs.lazygit = {
enable = true;
settings = {
gui = {
showFileTree = true;
showCommandLog = false;
showIcons = true;
theme = {
lightTheme = false;
activeBorderColor = ["#a6da95" "bold"];
inactiveBorderColor = ["#cad3f5"];
optionsTextColor = ["#8aadf4"];
selectedLineBgColor = ["#363a4f"];
selectedRangeBgColor = ["#363a4f"];
cherryPickedCommitBgColor = ["#8bd5ca"];
cherryPickedCommitFgColor = ["#8aadf4"];
unstagedChangesColor = ["red"];
};
};
update.method = "never";
promptToReturnFromSubprocess = false;
notARepository = "quit";
};
};
}

View file

@ -1,4 +1,5 @@
{...}: { {pkgs, ...}: {
home.packages = [(pkgs.nerdfonts.override {fonts = ["FiraCode"];})];
programs.wezterm = { programs.wezterm = {
enable = true; enable = true;
extraConfig = builtins.readFile ./wezterm.lua; extraConfig = builtins.readFile ./wezterm.lua;

View file

@ -22,7 +22,6 @@ in {
shellAliases = { shellAliases = {
ll = "ls -laF"; ll = "ls -laF";
gg = "gitui"; gg = "gitui";
lg = "lazygit";
nv = "WAYLAND_DISPLAY= neovide --multigrid --maximized"; nv = "WAYLAND_DISPLAY= neovide --multigrid --maximized";
nosu = "sudo nixos-rebuild switch --flake ${flakeURL}"; nosu = "sudo nixos-rebuild switch --flake ${flakeURL}";
hms = "${pkgs.home-manager}/bin/home-manager switch --flake ${flakeURL}"; hms = "${pkgs.home-manager}/bin/home-manager switch --flake ${flakeURL}";