feat(aspen/system): Switch linux user login to aspen
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:
parent
55ab8b1e6a
commit
1cebb775f1
17 changed files with 30 additions and 30 deletions
|
@ -14,12 +14,12 @@
|
|||
../modules/lib/cloneRepo.nix
|
||||
];
|
||||
|
||||
home.username = "grfn";
|
||||
home.homeDirectory = "/home/grfn";
|
||||
home.username = "aspen";
|
||||
home.homeDirectory = "/home/aspen";
|
||||
|
||||
programs.password-store.enable = true;
|
||||
|
||||
grfn.impure.clonedRepos.passwordStore = {
|
||||
aspen.impure.clonedRepos.passwordStore = {
|
||||
github = "glittershark/pass";
|
||||
path = ".local/share/password-store";
|
||||
};
|
||||
|
|
|
@ -38,8 +38,8 @@
|
|||
gtk = {
|
||||
enable = true;
|
||||
gtk3.bookmarks = [
|
||||
"file:///home/grfn/code"
|
||||
"file:///home/grfn/notes"
|
||||
"file:///home/aspen/code"
|
||||
"file:///home/aspen/notes"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -33,7 +33,7 @@ with lib;
|
|||
imports = [
|
||||
./lib/zshFunctions.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/rust.nix
|
||||
];
|
||||
|
@ -68,7 +68,7 @@ with lib;
|
|||
|
||||
nodePackages.prettier
|
||||
] ++ 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
|
||||
julia_16-bin
|
||||
valgrind
|
||||
|
|
|
@ -29,7 +29,7 @@ in
|
|||
]))
|
||||
];
|
||||
|
||||
grfn.impure.clonedRepos = {
|
||||
aspen.impure.clonedRepos = {
|
||||
agda-stdlib = {
|
||||
github = "agda/agda-stdlib";
|
||||
path = "code/agda-stdlib";
|
||||
|
@ -51,8 +51,8 @@ in
|
|||
'';
|
||||
|
||||
home.file.".agda/libraries".text = ''
|
||||
/home/grfn/code/agda-stdlib/standard-library.agda-lib
|
||||
/home/grfn/code/agda-categories/agda-categories.agda-lib
|
||||
/home/aspen/code/agda-stdlib/standard-library.agda-lib
|
||||
/home/aspen/code/agda-categories/agda-categories.agda-lib
|
||||
'';
|
||||
|
||||
}
|
||||
|
|
|
@ -76,7 +76,7 @@ in
|
|||
);
|
||||
};
|
||||
|
||||
grfn.impure.clonedRepos = {
|
||||
aspen.impure.clonedRepos = {
|
||||
orgClubhouse = {
|
||||
github = "glittershark/org-clubhouse";
|
||||
path = "code/org-clubhouse";
|
||||
|
|
|
@ -16,7 +16,7 @@ let
|
|||
personal = {
|
||||
primary = true;
|
||||
address = "root@gws.fyi";
|
||||
aliases = [ "grfn@gws.fyi" "aspen@gws.fyi" ];
|
||||
aliases = [ "aspen@gws.fyi" "aspen@gws.fyi" ];
|
||||
passEntry = "root-gws-msmtp";
|
||||
};
|
||||
};
|
||||
|
|
|
@ -290,14 +290,14 @@ in
|
|||
}
|
||||
|
||||
external_script inbox {
|
||||
script_path = '${emacsclient "(grfn/num-inbox-items-message)"}'
|
||||
script_path = '${emacsclient "(aspen/num-inbox-items-message)"}'
|
||||
format = 'Inbox: {output}'
|
||||
cache_timeout = 120
|
||||
color = "#93a1a1"
|
||||
}
|
||||
|
||||
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}'
|
||||
cache_timeout = 60
|
||||
color = "#93a1a1"
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
with lib;
|
||||
{
|
||||
options = {
|
||||
grfn.impure.clonedRepos = mkOption {
|
||||
aspen.impure.clonedRepos = mkOption {
|
||||
description = "Repositories to clone";
|
||||
default = { };
|
||||
type = with types; attrsOf (
|
||||
|
@ -71,6 +71,6 @@ with lib;
|
|||
fi
|
||||
fi
|
||||
'')
|
||||
config.grfn.impure.clonedRepos;
|
||||
config.aspen.impure.clonedRepos;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -9,10 +9,10 @@
|
|||
### Recommended options
|
||||
|
||||
# Tarsnap cache directory
|
||||
cachedir /home/grfn/.cache/tarsnap
|
||||
cachedir /home/aspen/.cache/tarsnap
|
||||
|
||||
# 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.
|
||||
nodump
|
||||
|
|
|
@ -38,7 +38,7 @@ in
|
|||
pandoc
|
||||
barrier
|
||||
depot.tools.nsfv-setup
|
||||
gimp # TODO(grfn): use glimpse once it build again
|
||||
gimp # TODO(aspen): use glimpse once it build again
|
||||
|
||||
# System utilities
|
||||
powertop
|
||||
|
@ -55,7 +55,7 @@ in
|
|||
keybase
|
||||
openssl
|
||||
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
|
||||
|
||||
# Spotify...etc
|
||||
|
|
|
@ -16,7 +16,7 @@ rec {
|
|||
# Use the same nixpkgs as everything else
|
||||
home-manager.useGlobalPkgs = true;
|
||||
|
||||
home-manager.users.grfn = { config, lib, ... }: {
|
||||
home-manager.users.aspen = { config, lib, ... }: {
|
||||
imports = [ ../home/machines/roswell.nix ];
|
||||
lib.depot = depot;
|
||||
};
|
||||
|
|
|
@ -12,7 +12,7 @@ let
|
|||
networking.firewall.enable = 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
|
||||
environment.noXlibs = false;
|
||||
};
|
||||
|
|
|
@ -73,7 +73,7 @@ with lib;
|
|||
|
||||
nix.gc.dates = "monthly";
|
||||
|
||||
users.users.grfn.openssh.authorizedKeys.keys = [
|
||||
users.users.aspen.openssh.authorizedKeys.keys = [
|
||||
depot.users.aspen.keys.whitby
|
||||
];
|
||||
|
||||
|
|
|
@ -49,7 +49,7 @@ with lib;
|
|||
settings = { X11Forwarding = true; };
|
||||
};
|
||||
|
||||
users.users.grfn.openssh.authorizedKeys.keys =
|
||||
users.users.aspen.openssh.authorizedKeys.keys =
|
||||
[ depot.users.aspen.keys.main ];
|
||||
|
||||
programs.ssh.startAgent = true;
|
||||
|
@ -59,7 +59,7 @@ with lib;
|
|||
users.mutableUsers = true;
|
||||
programs.zsh.enable = true;
|
||||
environment.pathsToLink = [ "/share/zsh" ];
|
||||
users.users.grfn = {
|
||||
users.users.aspen = {
|
||||
isNormalUser = true;
|
||||
initialPassword = "password";
|
||||
extraGroups = [
|
||||
|
@ -71,7 +71,7 @@ with lib;
|
|||
};
|
||||
|
||||
nix = {
|
||||
settings.trusted-users = [ "grfn" ];
|
||||
settings.trusted-users = [ "aspen" ];
|
||||
distributedBuilds = true;
|
||||
|
||||
gc = {
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
programs.nm-applet.enable = true;
|
||||
|
||||
users.users.grfn.extraGroups = [
|
||||
users.users.aspen.extraGroups = [
|
||||
"audio"
|
||||
"video"
|
||||
];
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
{
|
||||
virtualisation.docker.enable = true;
|
||||
users.users.grfn.extraGroups = [ "docker" ];
|
||||
users.users.aspen.extraGroups = [ "docker" ];
|
||||
|
||||
security.pam.loginLimits = [
|
||||
{
|
||||
domain = "grfn";
|
||||
domain = "aspen";
|
||||
type = "soft";
|
||||
item = "nofile";
|
||||
value = "65535";
|
||||
|
|
|
@ -5,5 +5,5 @@
|
|||
enable = true;
|
||||
package = pkgs.wireshark;
|
||||
};
|
||||
users.users.grfn.extraGroups = [ "wireshark" ];
|
||||
users.users.aspen.extraGroups = [ "wireshark" ];
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue