diff --git a/.gitignore b/.gitignore index 8b0e0fb..988e532 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ result-* # sops age keys (never commit private keys) *.age keys.txt +!key.txt.age # macOS .DS_Store diff --git a/assets/avatar/Miku/^ b/assets/avatar/Miku/^ new file mode 100644 index 0000000..755ccfb Binary files /dev/null and b/assets/avatar/Miku/^ differ diff --git a/assets/avatar/Miku/avatar.png b/assets/avatar/Miku/avatar.png new file mode 100644 index 0000000..635e4a8 Binary files /dev/null and b/assets/avatar/Miku/avatar.png differ diff --git a/assets/avatar/Miku/avatar_bg.jpg b/assets/avatar/Miku/avatar_bg.jpg new file mode 100644 index 0000000..f51cf22 Binary files /dev/null and b/assets/avatar/Miku/avatar_bg.jpg differ diff --git a/assets/avatar/Miku/avatar_bg.png b/assets/avatar/Miku/avatar_bg.png new file mode 100644 index 0000000..755ccfb Binary files /dev/null and b/assets/avatar/Miku/avatar_bg.png differ diff --git a/assets/avatar/Miku/avatar_no_bg-0.png b/assets/avatar/Miku/avatar_no_bg-0.png new file mode 100644 index 0000000..f6c136b Binary files /dev/null and b/assets/avatar/Miku/avatar_no_bg-0.png differ diff --git a/assets/avatar/Miku/avatar_no_bg-1.png b/assets/avatar/Miku/avatar_no_bg-1.png new file mode 100644 index 0000000..f6c136b Binary files /dev/null and b/assets/avatar/Miku/avatar_no_bg-1.png differ diff --git a/assets/avatar/Miku/avatar_no_bg-2.png b/assets/avatar/Miku/avatar_no_bg-2.png new file mode 100644 index 0000000..755ccfb Binary files /dev/null and b/assets/avatar/Miku/avatar_no_bg-2.png differ diff --git a/assets/avatar/Miku/avatar_no_bg-3.png b/assets/avatar/Miku/avatar_no_bg-3.png new file mode 100644 index 0000000..755ccfb Binary files /dev/null and b/assets/avatar/Miku/avatar_no_bg-3.png differ diff --git a/assets/avatar/Miku/avatar_no_bg.png b/assets/avatar/Miku/avatar_no_bg.png new file mode 100644 index 0000000..9949650 Binary files /dev/null and b/assets/avatar/Miku/avatar_no_bg.png differ diff --git a/assets/avatar/Miku/avatar_transparent.png b/assets/avatar/Miku/avatar_transparent.png new file mode 100644 index 0000000..93bf03c Binary files /dev/null and b/assets/avatar/Miku/avatar_transparent.png differ diff --git a/home/default.nix b/home/default.nix index aa38f6d..b58f1e5 100644 --- a/home/default.nix +++ b/home/default.nix @@ -101,9 +101,9 @@ defaultSopsFile = ../secrets/secrets.yaml; defaultSopsFormat = "yaml"; age.keyFile = if pkgs.stdenv.isDarwin then - "/Users/${primaryUser}/.config/sops/age/keys.txt" + "/Users/${primaryUser}/.config/nix/secrets/keys.txt" else - "/home/${primaryUser}/.config/sops/age/keys.txt"; + "/home/${primaryUser}/.config/nix/secrets/keys.txt"; secrets = { GROQ_API_KEY = { }; diff --git a/nixos/default.nix b/nixos/default.nix index 6302e4d..3422670 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -93,7 +93,7 @@ home = "/home/${primaryUser}"; shell = pkgs.fish; isNormalUser = true; - openssh.authorizedKeys.keyFiles = [ ./ssh-key ]; + openssh.authorizedKeys.keyFiles = [ ../secrets/ssh-key ]; extraGroups = [ "wheel" "video" "audio" "libvirtd" ]; }; } diff --git a/nixos/sops.nix b/nixos/sops.nix index 8e95ed4..2e91486 100644 --- a/nixos/sops.nix +++ b/nixos/sops.nix @@ -1,18 +1,7 @@ -{ primaryUser, ... }: -{ +{ primaryUser, ... }: { sops = { defaultSopsFile = ../secrets/secrets.yaml; defaultSopsFormat = "yaml"; - age.keyFile = "/home/phil/.config/sops/age/keys.txt"; - - secrets = { - GROQ_API_KEY = { }; - OPENWEATHER_API_KEY = { }; - ssh_private_key = { - path = "/home/${primaryUser}/.ssh/ssh"; - owner = primaryUser; - mode = "0600"; - }; - }; + age.keyFile = "/home/${primaryUser}/.config/nix/secrets/keys.txt"; }; } diff --git a/nixos/webcam.nix b/nixos/webcam.nix index d330e3f..7d6d768 100644 --- a/nixos/webcam.nix +++ b/nixos/webcam.nix @@ -1,5 +1,6 @@ -{ pkgs, ... }: -{ +{ pkgs, ... }: { + + # TODO: This need to be tested against the cam and kernel rules need to be refined services.udev.extraRules = '' ACTION=="add", \ SUBSYSTEM=="usb", \ diff --git a/nixos/ssh-key b/secrets/ssh-key similarity index 100% rename from nixos/ssh-key rename to secrets/ssh-key