Compare commits

..

No commits in common. "650c50889ea1f1de8dd426af492409defcb60d47" and "77e24e385a766fc68ed94de7163c8dcfbbaf6ffd" have entirely different histories.

2 changed files with 10 additions and 13 deletions

View File

@ -124,7 +124,6 @@ in
python3Packages.west python3Packages.west
remmina remmina
river river
rizin
rtorrent rtorrent
sbcl sbcl
screen screen

View File

@ -7,9 +7,6 @@
zremap, zremap,
... ...
}: }:
let
USER = "akill";
in
{ {
imports = [ ]; imports = [ ];
@ -48,12 +45,12 @@ in
"borgbase_enc_key" = { "borgbase_enc_key" = {
sopsFile = ./secrets/borgbase_enc_key.yaml; sopsFile = ./secrets/borgbase_enc_key.yaml;
owner = config.users.users.${USER}.name; owner = config.users.users.akill.name;
}; };
"borgbase_ssh_key" = { "borgbase_ssh_key" = {
sopsFile = ./secrets/borgbase_ssh_key.yaml; sopsFile = ./secrets/borgbase_ssh_key.yaml;
owner = config.users.users.${USER}.name; owner = config.users.users.akill.name;
}; };
}; };
}; };
@ -100,6 +97,7 @@ in
}; };
readOnlyNixStore = true; readOnlyNixStore = true;
supportedFilesystems = [ supportedFilesystems = [
"f2fs"
"xfs" "xfs"
]; ];
tmp.useTmpfs = true; tmp.useTmpfs = true;
@ -112,7 +110,7 @@ in
doas.enable = true; doas.enable = true;
doas.extraRules = [ doas.extraRules = [
{ {
users = [ USER ]; users = [ "akill" ];
keepEnv = true; keepEnv = true;
persist = true; persist = true;
} }
@ -439,7 +437,7 @@ in
{ {
keys = [ 113 ]; keys = [ 113 ];
events = [ "key" ]; events = [ "key" ];
command = "/run/current-system/sw/bin/runuser -l ${USER} -c 'amixer -q set Master toggle'"; command = "/run/current-system/sw/bin/runuser -l akill -c 'amixer -q set Master toggle'";
} }
{ {
@ -448,7 +446,7 @@ in
"key" "key"
"rep" "rep"
]; ];
command = "/run/current-system/sw/bin/runuser -l ${USER} -c 'amixer -q set Master 5%- unmute'"; command = "/run/current-system/sw/bin/runuser -l akill -c 'amixer -q set Master 5%- unmute'";
} }
{ {
@ -457,7 +455,7 @@ in
"key" "key"
"rep" "rep"
]; ];
command = "/run/current-system/sw/bin/runuser -l ${USER} -c 'amixer -q set Master 5%+ unmute'"; command = "/run/current-system/sw/bin/runuser -l akill -c 'amixer -q set Master 5%+ unmute'";
} }
{ {
@ -488,7 +486,7 @@ in
"https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/public-resolvers.md" "https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/public-resolvers.md"
"https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md" "https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md"
]; ];
cache_file = "/var/lib/dnscrypt-proxy/public-resolvers.md"; cache_file = "public-resolvers.md";
minisign_key = "RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3"; minisign_key = "RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3";
}; };
}; };
@ -496,7 +494,7 @@ in
borgbackup.jobs."borgbase" = borgbackup.jobs."borgbase" =
let let
user = config.users.users.${USER}; user = config.users.users.akill;
home = user.home; home = user.home;
in in
{ {
@ -633,7 +631,7 @@ in
algorithm = "zstd"; algorithm = "zstd";
}; };
users.users.${USER} = { users.users.akill = {
isNormalUser = true; isNormalUser = true;
shell = pkgs.zsh; shell = pkgs.zsh;
extraGroups = [ extraGroups = [