mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(aspen/system): Switch linux user login to aspen

Browse source 
Change-Id: I10369a20db3f1be92caf0bace94e8beb6af1dbaa
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11302
Tested-by: BuildkiteCI
Autosubmit: aspen <root@gws.fyi>
Reviewed-by: aspen <root@gws.fyi>
This commit is contained in:
Aspen Smith 2024-03-31 14:11:01 -04:00 committed by clbot
parent 55ab8b1e6a
commit 1cebb775f1
17 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
users/aspen/system/home/modules/common.nix
View file

@ -14,12 +14,12 @@
../modules/lib/cloneRepo.nix ../modules/lib/cloneRepo.nix
]; ];
home.username = "grfn"; home.username = "aspen";
home.homeDirectory = "/home/grfn"; home.homeDirectory = "/home/aspen";
programs.password-store.enable = true; programs.password-store.enable = true;
grfn.impure.clonedRepos.passwordStore = { aspen.impure.clonedRepos.passwordStore = {
github = "glittershark/pass"; github = "glittershark/pass";
path = ".local/share/password-store"; path = ".local/share/password-store";
}; };

4
users/aspen/system/home/modules/desktop.nix
View file

@ -38,8 +38,8 @@
gtk = { gtk = {
enable = true; enable = true;
gtk3.bookmarks = [ gtk3.bookmarks = [
"file:///home/grfn/code" "file:///home/aspen/code"
"file:///home/grfn/notes" "file:///home/aspen/notes"
]; ];
}; };
} }

4
users/aspen/system/home/modules/development.nix
View file

@ -33,7 +33,7 @@ with lib;
imports = [ imports = [
./lib/zshFunctions.nix ./lib/zshFunctions.nix
./development/kube.nix ./development/kube.nix
# TODO(grfn): agda build is broken in the nixpkgs checkout # TODO(aspen): agda build is broken in the nixpkgs checkout
# ./development/agda.nix # ./development/agda.nix
./development/rust.nix ./development/rust.nix
]; ];
@ -68,7 +68,7 @@ with lib;
nodePackages.prettier nodePackages.prettier
] ++ optionals (stdenv.isLinux) [ ] ++ optionals (stdenv.isLinux) [
# TODO(grfn): replace with stable again once the current julia debacle # TODO(aspen): replace with stable again once the current julia debacle
# is resolved upstream, see https://github.com/NixOS/nixpkgs/pull/121114 # is resolved upstream, see https://github.com/NixOS/nixpkgs/pull/121114
julia_16-bin julia_16-bin
valgrind valgrind

6
users/aspen/system/home/modules/development/agda.nix
View file

@ -29,7 +29,7 @@ in
])) ]))
]; ];
grfn.impure.clonedRepos = { aspen.impure.clonedRepos = {
agda-stdlib = { agda-stdlib = {
github = "agda/agda-stdlib"; github = "agda/agda-stdlib";
path = "code/agda-stdlib"; path = "code/agda-stdlib";
@ -51,8 +51,8 @@ in
''; '';
home.file.".agda/libraries".text = '' home.file.".agda/libraries".text = ''
/home/grfn/code/agda-stdlib/standard-library.agda-lib /home/aspen/code/agda-stdlib/standard-library.agda-lib
/home/grfn/code/agda-categories/agda-categories.agda-lib /home/aspen/code/agda-categories/agda-categories.agda-lib
''; '';
} }

2
users/aspen/system/home/modules/emacs.nix
View file

@ -76,7 +76,7 @@ in
); );
}; };
grfn.impure.clonedRepos = { aspen.impure.clonedRepos = {
orgClubhouse = { orgClubhouse = {
github = "glittershark/org-clubhouse"; github = "glittershark/org-clubhouse";
path = "code/org-clubhouse"; path = "code/org-clubhouse";

2
users/aspen/system/home/modules/email.nix
View file

@ -16,7 +16,7 @@ let
personal = { personal = {
primary = true; primary = true;
address = "root@gws.fyi"; address = "root@gws.fyi";
aliases = [ "grfn@gws.fyi" "aspen@gws.fyi" ]; aliases = [ "aspen@gws.fyi" "aspen@gws.fyi" ];
passEntry = "root-gws-msmtp"; passEntry = "root-gws-msmtp";
}; };
}; };

4
users/aspen/system/home/modules/i3.nix
View file

@ -290,14 +290,14 @@ in
} }
external_script inbox { external_script inbox {
script_path = '${emacsclient "(grfn/num-inbox-items-message)"}' script_path = '${emacsclient "(aspen/num-inbox-items-message)"}'
format = 'Inbox: {output}' format = 'Inbox: {output}'
cache_timeout = 120 cache_timeout = 120
color = "#93a1a1" color = "#93a1a1"
} }
external_script current_task { external_script current_task {
script_path = '${emacsclient "(grfn/org-current-clocked-in-task-message)"}' script_path = '${emacsclient "(aspen/org-current-clocked-in-task-message)"}'
# format = '{output}' # format = '{output}'
cache_timeout = 60 cache_timeout = 60
color = "#93a1a1" color = "#93a1a1"

4
users/aspen/system/home/modules/lib/cloneRepo.nix
View file

@ -2,7 +2,7 @@
with lib; with lib;
{ {
options = { options = {
grfn.impure.clonedRepos = mkOption { aspen.impure.clonedRepos = mkOption {
description = "Repositories to clone"; description = "Repositories to clone";
default = { }; default = { };
type = with types; attrsOf ( type = with types; attrsOf (
@ -71,6 +71,6 @@ with lib;
fi fi
fi fi
'') '')
config.grfn.impure.clonedRepos; config.aspen.impure.clonedRepos;
}; };
} }

4
users/aspen/system/home/modules/tarsnap.nix
View file

@ -9,10 +9,10 @@
### Recommended options ### Recommended options
# Tarsnap cache directory # Tarsnap cache directory
cachedir /home/grfn/.cache/tarsnap cachedir /home/aspen/.cache/tarsnap
# Tarsnap key file # Tarsnap key file
keyfile /home/grfn/.private/tarsnap.key keyfile /home/aspen/.private/tarsnap.key
# Don't archive files which have the nodump flag set. # Don't archive files which have the nodump flag set.
nodump nodump

4
users/aspen/system/home/platforms/linux.nix
View file

@ -38,7 +38,7 @@ in
pandoc pandoc
barrier barrier
depot.tools.nsfv-setup depot.tools.nsfv-setup
gimp # TODO(grfn): use glimpse once it build again gimp # TODO(aspen): use glimpse once it build again
# System utilities # System utilities
powertop powertop
@ -55,7 +55,7 @@ in
keybase keybase
openssl openssl
yubikey-manager yubikey-manager
# TODO(grfn): lagging behind yubikey-manager and doesn't support cryptography >= 39 # TODO(aspen): lagging behind yubikey-manager and doesn't support cryptography >= 39
# yubikey-manager-qt # yubikey-manager-qt
# Spotify...etc # Spotify...etc

2
users/aspen/system/system/default.nix
View file

@ -16,7 +16,7 @@ rec {
# Use the same nixpkgs as everything else # Use the same nixpkgs as everything else
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.users.grfn = { config, lib, ... }: { home-manager.users.aspen = { config, lib, ... }: {
imports = [ ../home/machines/roswell.nix ]; imports = [ ../home/machines/roswell.nix ];
lib.depot = depot; lib.depot = depot;
}; };

2
users/aspen/system/system/iso.nix
View file

@ -12,7 +12,7 @@ let
networking.firewall.enable = false; networking.firewall.enable = false;
networking.wireless.enable = lib.mkForce false; networking.wireless.enable = lib.mkForce false;
# TODO(grfn): enabling this (in the minimal profile) fails the iso build, # TODO(aspen): enabling this (in the minimal profile) fails the iso build,
# since gtk+3 needs to be built which fails due to cairo without xlibs # since gtk+3 needs to be built which fails due to cairo without xlibs
environment.noXlibs = false; environment.noXlibs = false;
}; };

2
users/aspen/system/system/machines/mugwump.nix
View file

@ -73,7 +73,7 @@ with lib;
nix.gc.dates = "monthly"; nix.gc.dates = "monthly";
users.users.grfn.openssh.authorizedKeys.keys = [ users.users.aspen.openssh.authorizedKeys.keys = [
depot.users.aspen.keys.whitby depot.users.aspen.keys.whitby
]; ];

6
users/aspen/system/system/modules/common.nix
View file

@ -49,7 +49,7 @@ with lib;
settings = { X11Forwarding = true; }; settings = { X11Forwarding = true; };
}; };
users.users.grfn.openssh.authorizedKeys.keys = users.users.aspen.openssh.authorizedKeys.keys =
[ depot.users.aspen.keys.main ]; [ depot.users.aspen.keys.main ];
programs.ssh.startAgent = true; programs.ssh.startAgent = true;
@ -59,7 +59,7 @@ with lib;
users.mutableUsers = true; users.mutableUsers = true;
programs.zsh.enable = true; programs.zsh.enable = true;
environment.pathsToLink = [ "/share/zsh" ]; environment.pathsToLink = [ "/share/zsh" ];
users.users.grfn = { users.users.aspen = {
isNormalUser = true; isNormalUser = true;
initialPassword = "password"; initialPassword = "password";
extraGroups = [ extraGroups = [
@ -71,7 +71,7 @@ with lib;
}; };
nix = { nix = {
settings.trusted-users = [ "grfn" ]; settings.trusted-users = [ "aspen" ];
distributedBuilds = true; distributedBuilds = true;
gc = { gc = {

2
users/aspen/system/system/modules/desktop.nix
View file

@ -10,7 +10,7 @@
programs.nm-applet.enable = true; programs.nm-applet.enable = true;
users.users.grfn.extraGroups = [ users.users.aspen.extraGroups = [
"audio" "audio"
"video" "video"
]; ];

4
users/aspen/system/system/modules/development.nix
View file

@ -2,11 +2,11 @@
{ {
virtualisation.docker.enable = true; virtualisation.docker.enable = true;
users.users.grfn.extraGroups = [ "docker" ]; users.users.aspen.extraGroups = [ "docker" ];
security.pam.loginLimits = [ security.pam.loginLimits = [
{ {
domain = "grfn"; domain = "aspen";
type = "soft"; type = "soft";
item = "nofile"; item = "nofile";
value = "65535"; value = "65535";

2
users/aspen/system/system/modules/wireshark.nix
View file

@ -5,5 +5,5 @@
enable = true; enable = true;
package = pkgs.wireshark; package = pkgs.wireshark;
}; };
users.users.grfn.extraGroups = [ "wireshark" ]; users.users.aspen.extraGroups = [ "wireshark" ];
} }