lots of updates from the past few months

This commit is contained in:
Callum Leslie 2026-01-29 15:37:13 +00:00
parent d400e84092
commit ba4f1bcfcc
Signed by: cleslie
GPG key ID: 5A944DF89B6F65AC
12 changed files with 228 additions and 420 deletions

View file

@ -1,39 +1,41 @@
{...}: {
programs.git = {
enable = true;
programs = {
git = {
enable = true;
userName = "Callum Leslie";
userEmail = "git@cleslie.uk";
signing.key = "03B01F427831BCFD!";
signing.signByDefault = true;
userName = "Callum Leslie";
userEmail = "git@cleslie.uk";
signing.key = "03B01F427831BCFD!";
signing.signByDefault = true;
ignores = [".direnv/"];
ignores = [".direnv/"];
includes = [
{
condition = "gitdir:~/repos/projects.cs.nott.ac.uk/";
contents = {
user = {
email = "psycl6@nottingham.ac.uk";
signingKey = "14861F1282EFB5C8!";
includes = [
{
condition = "gitdir:~/repos/projects.cs.nott.ac.uk/";
contents = {
user = {
email = "psycl6@nottingham.ac.uk";
signingKey = "14861F1282EFB5C8!";
};
credential = {helper = "store";};
};
credential = {helper = "store";};
}
];
extraConfig = {
core = {
longpaths = true;
autocrlf = false;
};
}
];
extraConfig = {
core = {
longpaths = true;
autocrlf = false;
init = {defaultBranch = "main";};
push = {autoSetupRemote = true;};
ghq = {root = "~/repos";};
};
init = {defaultBranch = "main";};
push = {autoSetupRemote = true;};
ghq = {root = "~/repos";};
};
delta.enable = true;
delta.enableGitIntegration = true;
};
}

View file

@ -11,7 +11,7 @@
chat = getProgFor "discord";
media = getProgFor "spotify";
terminal = getProgFor "alacritty";
runner = getProgFor' "rofi-wayland" "rofi";
runner = getProgFor "rofi";
rofi-rbw = getProgFor' "rofi-rbw-wayland" "rofi-rbw";
tmux = getProgFor "tmux";
slurp = getProgFor "slurp";

View file

@ -1,7 +1,7 @@
{pkgs, ...}: {
programs.rofi = {
enable = true;
package = pkgs.rofi-wayland;
package = pkgs.rofi;
#theme = "Arc-Dark";
};
}