Compare commits

..

4 Commits

2 changed files with 13 additions and 10 deletions

View File

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

View File

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