diff --git a/machines/foxbox/default.nix b/machines/foxbox/default.nix index 68e287a..87540ac 100644 --- a/machines/foxbox/default.nix +++ b/machines/foxbox/default.nix @@ -61,9 +61,6 @@ documentation.dev.enable = true; environment.systemPackages = with pkgs; [ - micro wl-clipboard - curlHTTP3 - wget fzf cnping # this has to be here because security.wrappers.* htop diff --git a/users/chfour/home.nix b/users/chfour/home.nix index 046c3d3..767f785 100644 --- a/users/chfour/home.nix +++ b/users/chfour/home.nix @@ -34,13 +34,12 @@ in { programs.git = { enable = true; - userName = "chfour"; - userEmail = "chfourchfour@protonmail.com"; - signing.signByDefault = true; signing.key = "BD2EC4C0608DED53"; - extraConfig = { + settings = { + user.name = "chfour"; + user.email = "chfourchfour@protonmail.com"; commit.verbose = true; init.defaultBranch = "main"; }; @@ -114,7 +113,8 @@ in { home.packages = builtins.concatLists (with pkgs; [ [ # universal btop - micro + micro wl-clipboard + curl wget fzf tree file usbutils pciutils jq ffmpeg-full imagemagick sqlite-interactive @@ -165,7 +165,7 @@ in { monaspace geist-font ]) - (lib.optionals config.services.mpd.enable [ mpdevil mpc-cli ]) + (lib.optionals config.services.mpd.enable [ plattenalbum mpc ]) ]); fonts.fontconfig = {