diff --git a/system/machines/desktop/system.nix b/system/machines/desktop/system.nix index 7b6a061..080e157 100644 --- a/system/machines/desktop/system.nix +++ b/system/machines/desktop/system.nix @@ -66,7 +66,12 @@ in }; }; - programs.nix-ld.enable = true; + programs.nix-ld = { + enable = true; + libraries = with pkgs; [ + icu + ]; + }; boot.loader = { systemd-boot = { diff --git a/user/modules/git/default.nix b/user/modules/git/default.nix index 26baea5..8d95730 100644 --- a/user/modules/git/default.nix +++ b/user/modules/git/default.nix @@ -8,9 +8,6 @@ in { options.modules.user.git = { enable = mkEnableOption "user.git"; }; config = mkIf cfg.enable { programs = { - git = { - enable = true; - }; gh = { enable = true; settings.git_protocol = "ssh"; @@ -19,6 +16,7 @@ in home = { packages = with pkgs; [ + git git-crypt ]; file.".config/git" = { diff --git a/user/modules/gui/alacritty/config/alacritty.nix b/user/modules/gui/alacritty/config/alacritty.nix index b396d7c..4df8cff 100644 --- a/user/modules/gui/alacritty/config/alacritty.nix +++ b/user/modules/gui/alacritty/config/alacritty.nix @@ -25,29 +25,29 @@ in colors = { primary = { background = "#000000"; - foreground = "#cdd6f4"; + foreground = "#dadada"; }; normal = { - black = "#1e2127"; - red = "#e06c75"; - green = "#98c379"; - yellow = "#d19a66"; - blue = "#61afef"; - magenta = "#c678dd"; - cyan = "#56b6c2"; - white = "#abb2bf"; + black = "#181818"; + red = "#ff6b6b"; + green = "#00b300"; + yellow = "#e8a060"; + blue = "#88ddcc"; + magenta = "#c490d0"; + cyan = "#b3f6c0"; + white = "#dadada"; }; bright = { - black = "#5c6370"; - red = "#e06c75"; - green = "#98c379"; - yellow = "#d19a66"; - blue = "#61afef"; - magenta = "#c678dd"; - cyan = "#56b6c2"; - white = "#ffffff"; + black = "#5a5a5a"; + red = "#ff6b6b"; + green = "#00b300"; + yellow = "#ffcc00"; + blue = "#88ddcc"; + magenta = "#c490d0"; + cyan = "#b3f6c0"; + white = "#ffffff"; }; }; diff --git a/user/modules/neovim/default.nix b/user/modules/neovim/default.nix index 361bf65..3f5b8cf 100644 --- a/user/modules/neovim/default.nix +++ b/user/modules/neovim/default.nix @@ -14,9 +14,11 @@ in vimdiffAlias = true; extraPackages = with pkgs; [ lazygit + cargo + rustc gcc fzf - rg + ripgrep ]; }; diff --git a/user/modules/neovim/nvim b/user/modules/neovim/nvim index 22675bf..14a67ba 160000 --- a/user/modules/neovim/nvim +++ b/user/modules/neovim/nvim @@ -1 +1 @@ -Subproject commit 22675bf8a44bcc9f166a850f4827374a538dfab3 +Subproject commit 14a67ba7d3210d915e26588da9d0326e8118d353