diff --git a/flake.nix b/flake.nix index 2c06763..581d289 100644 --- a/flake.nix +++ b/flake.nix @@ -72,29 +72,34 @@ till = { imports = [ - ./home/desktop-full.nix + ./home/profiles/desktop-full.nix ./users/till/home.nix ]; }; alt = { imports = [ - ./home/desktop-slim.nix + ./home/profiles/desktop-slim.nix ./users/alt/home.nix ]; }; guest = { imports = [ - ./home/desktop-slim.nix + ./home/profiles/desktop-slim.nix ./users/guest/home.nix ]; }; }; }; } - { + + # firefox-addons.config.allowUnfreePredicate = pkg: + # builtins.elem (nixpkgs.lib.getName pkg) [ + # "tampermonkey" + # ]; + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (nixpkgs.lib.getName pkg) [ "corefonts" @@ -102,6 +107,7 @@ "keymapp" "steam" "steam-unwrapped" + # "tampermonkey" ]; } ]; diff --git a/home/profiles/desktop-slim.nix b/home/profiles/desktop-slim.nix index 15dac09..c2936c4 100644 --- a/home/profiles/desktop-slim.nix +++ b/home/profiles/desktop-slim.nix @@ -7,7 +7,7 @@ ../devel.nix ../firefox.nix ../fonts.nix - ../foot.nix + # ../foot.nix ../media.nix ../user-dirs.nix ../gpg.nix diff --git a/home/profiles/minimal.nix b/home/profiles/minimal.nix index 6fbf2a8..e4e5828 100644 --- a/home/profiles/minimal.nix +++ b/home/profiles/minimal.nix @@ -25,7 +25,6 @@ ../vifm.nix ../nvim ../tmux.nix - ../ssh.nix ]; programs.nix-index = { diff --git a/users/guest/system.nix b/users/guest/system.nix index ddfbf5e..610bce2 100644 --- a/users/guest/system.nix +++ b/users/guest/system.nix @@ -7,7 +7,7 @@ extraGroups = [ "networkmanager" ]; shell = pkgs.fish; openssh.authorizedKeys.keyFiles = [ - ../till/ssh/till${"@"}nova.pub + ../till/pubkeys/till${"@"}nova.pub ]; }; } diff --git a/users/till/home.nix b/users/till/home.nix index b14b24c..ab32419 100644 --- a/users/till/home.nix +++ b/users/till/home.nix @@ -6,4 +6,9 @@ name = "Till"; email = "till@ktiu.net"; }; + + imports = [ + ./ssh.nix + ]; + } diff --git a/users/till/ssh/till@nova.pub b/users/till/pubkeys/till@nova.pub similarity index 100% rename from users/till/ssh/till@nova.pub rename to users/till/pubkeys/till@nova.pub diff --git a/home/ssh.nix b/users/till/ssh.nix similarity index 89% rename from home/ssh.nix rename to users/till/ssh.nix index 7836029..a04ca2d 100644 --- a/home/ssh.nix +++ b/users/till/ssh.nix @@ -41,7 +41,7 @@ in identityFile = certs.uni; }; - "arielle arielle.ktiu.net" = { + "arielle (arielle|git).ktiu.net" = { hostname = "arielle.ktiu.net"; user = "till"; identityFile = certs.personal; @@ -65,11 +65,11 @@ in identityFile = certs.personal; }; - # "mila" = { - # hostname = "mila"; - # user = "till"; - # identityFile = certs.personal; - # }; + "mila" = { + hostname = "mila"; + user = "tstraube"; + identityFile = certs.uni; + }; }; }; diff --git a/users/till/system.nix b/users/till/system.nix index fd25636..e4c413e 100644 --- a/users/till/system.nix +++ b/users/till/system.nix @@ -10,7 +10,7 @@ ]; shell = pkgs.fish; openssh.authorizedKeys.keyFiles = [ - ./ssh/till${"@"}nova.pub + ./pubkeys/till${"@"}nova.pub ]; }; }