+2 -1

modules/fonts.nix

··· 10 10 nixos.always = { 11 11 fonts = { 12 12 packages = [ 13 13 - pkgs.ubuntu_font_family 13 13 + pkgs.ubuntu-classic 14 14 + pkgs.ubuntu-sans 14 15 pkgs.inter 15 16 # Only needed for one specific thing and now can't download from sourceforge for some reason 16 17 # pkgs.corefonts

+1 -1

modules/graphics.nix

··· 20 20 opencl.enable = true; 21 21 }; 22 22 23 23 - environment.systemPackages = with pkgs; [amdgpu_top lact nvtopPackages.full]; 23 23 + environment.systemPackages = with pkgs; [amdgpu_top lact]; 24 24 25 25 systemd.services.lactd = { 26 26 description = "AMDGPU Control Daemon";

+1 -1

modules/programs/core-cli.nix

··· 65 65 home.always = { 66 66 home.packages = with pkgs; [ 67 67 curlie 68 68 - du-dust 68 68 + dust 69 69 duf 70 70 fd 71 71 jq

+13 -5

modules/programs/git.nix

··· 15 15 16 16 programs.git = { 17 17 enable = true; 18 18 - userName = userfullname; 19 19 - userEmail = useremail; 20 20 - delta.enable = true; 21 18 22 19 signing = { 23 20 signByDefault = true; ··· 25 22 key = "~/.ssh/id_ed25519_sk_rk"; 26 23 }; 27 24 28 28 - extraConfig = { 25 25 + settings = { 26 26 + user = { 27 27 + name = userfullname; 28 28 + email = useremail; 29 29 + }; 30 30 + 29 31 # TODO: custom pretty stuff? 30 32 blame.showEmail = true; 31 33 init.defaultBranch = "main"; ··· 89 91 default-command = "log"; 90 92 show-cryptographic-signatures = true; 91 93 conflict-marker-style = "git"; 92 92 - diff-formatter = "delta"; 94 94 + # diff-formatter = "delta"; 93 95 editor = "codium -w"; 94 96 merge-editor = "vscodium"; 95 97 }; ··· 130 132 backends.ssh.allowed-signers = "~/.config/git/allowed_signers"; 131 133 }; 132 134 }; 135 135 + }; 136 136 + 137 137 + programs.delta = { 138 138 + enable = true; 139 139 + enableGitIntegration = true; 140 140 + enableJujutsuIntegration = true; 133 141 }; 134 142 135 143 programs.mergiraf.enable = true;

+2

modules/programs/ssh.nix

··· 4 4 5 5 home.always.programs.ssh = { 6 6 enable = true; 7 7 + enableDefaultConfig = false; 8 8 + 7 9 matchBlocks = { 8 10 "*" = { 9 11 identitiesOnly = true;