diff options
| -rw-r--r-- | flake/nixosConfigurations/default.nix | 2 | ||||
| -rw-r--r-- | hm/sils/default.nix | 4 | ||||
| -rw-r--r-- | modules/nixos/sils/docker.nix | 2 | ||||
| -rw-r--r-- | modules/nixos/sils/firejail.nix | 4 | ||||
| -rw-r--r-- | modules/nixos/sils/sudo.nix | 4 | ||||
| -rw-r--r-- | secrets/secrets.nix | 4 | ||||
| -rw-r--r-- | sys/users/default.nix | 8 |
7 files changed, 14 insertions, 14 deletions
diff --git a/flake/nixosConfigurations/default.nix b/flake/nixosConfigurations/default.nix index 2961eb9..ec7d3ce 100644 --- a/flake/nixosConfigurations/default.nix +++ b/flake/nixosConfigurations/default.nix @@ -22,7 +22,7 @@ backupFileExtension = "backup"; useGlobalPkgs = true; useUserPackages = true; - users.sils = import ../../hm/sils; + users.jaki = import ../../hm/sils; extraSpecialArgs = attrs; }; } diff --git a/hm/sils/default.nix b/hm/sils/default.nix index 073fc94..6fd1a71 100644 --- a/hm/sils/default.nix +++ b/hm/sils/default.nix @@ -18,8 +18,8 @@ ]; home = { - username = "sils"; - homeDirectory = "/home/sils"; + username = "jaki"; + homeDirectory = "/home/jaki"; stateVersion = "23.05"; }; diff --git a/modules/nixos/sils/docker.nix b/modules/nixos/sils/docker.nix index 7d6f046..131b857 100644 --- a/modules/nixos/sils/docker.nix +++ b/modules/nixos/sils/docker.nix @@ -11,7 +11,7 @@ in { enable = true; storageDriver = "btrfs"; }; - users.users.sils.extraGroups = ["docker"]; + users.users.jaki.extraGroups = ["docker"]; environment.persistence."/srv".directories = [ { directory = "/var/lib/docker"; diff --git a/modules/nixos/sils/firejail.nix b/modules/nixos/sils/firejail.nix index d5df71f..5886918 100644 --- a/modules/nixos/sils/firejail.nix +++ b/modules/nixos/sils/firejail.nix @@ -13,12 +13,12 @@ in { enable = true; wrappedBinaries = { firefox = { - executable = "${lib.getExe pkgs.firefox}"; # config.home-manager.users.sils.programs.firefox.package}"; + executable = "${lib.getExe pkgs.firefox}"; # config.home-manager.users.jaki.programs.firefox.package}"; profile = "${pkgs.firejail}/etc/firejail/firefox.profile"; }; }; }; - home-manager.users.sils.programs.firefox.package = null; + home-manager.users.jaki.programs.firefox.package = null; }; } diff --git a/modules/nixos/sils/sudo.nix b/modules/nixos/sils/sudo.nix index a1904bd..2ad117f 100644 --- a/modules/nixos/sils/sudo.nix +++ b/modules/nixos/sils/sudo.nix @@ -12,10 +12,10 @@ in { }; environment.persistence.${config.sils.meta.globalDataDir}.files = lib.mkIf persistentLecture [ { - file = "/var/db/sudo/lectured/${builtins.toString config.users.users.sils.uid}"; + file = "/var/db/sudo/lectured/${builtins.toString config.users.users.jaki.uid}"; parentDirectory = { user = "root"; - group = config.users.users.sils.group; + group = config.users.users.jaki.group; mode = "0600"; }; } diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 86c7324..32903ce 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -1,9 +1,9 @@ let - sils = "age1vuhaey7kd9l76y6f9weeqmde3s4kjw38869ju6u3027yece2r3rqssjxst"; + jaki = "age1vuhaey7kd9l76y6f9weeqmde3s4kjw38869ju6u3027yece2r3rqssjxst"; thinklappi = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGtOvWH5GgVhCAUsHTlKI/N2w7rK+uODMro0VZYWWdZJ root@thinklappi"; hpserver = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBt5Tt9bjK6tMvBL4E2WUByHYbMkCempaY8cGso33QMD root@hpserver"; allSecrets = [ - sils + jaki thinklappi hpserver ]; diff --git a/sys/users/default.nix b/sys/users/default.nix index b1ff018..c03c1b6 100644 --- a/sys/users/default.nix +++ b/sys/users/default.nix @@ -1,14 +1,14 @@ {pkgs, ...}: { users = { - groups.sils = { + groups.jaki = { gid = 1111; }; mutableUsers = false; - users.sils = { + users.jaki = { isNormalUser = true; uid = 1000; - group = "sils"; - home = "/home/sils"; + group = "jaki"; + home = "/home/jaki"; shell = pkgs.zsh; initialHashedPassword = "$y$j9T$r4578Hy9jZHmUH9uSr9OI.$SuR2anRq7EJ1gUJ6vi9qYmZrhLP.o3O5643IG6r5Ap/"; extraGroups = [ |