diff --git a/.github/workflows/nix-build.yml b/.github/workflows/nix-build.yml index 30c17b22..c2856446 100644 --- a/.github/workflows/nix-build.yml +++ b/.github/workflows/nix-build.yml @@ -70,6 +70,22 @@ jobs: authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - name: Build mauville run: nix build --accept-flake-config .#nixosConfigurations.mauville.config.system.build.toplevel + pacifidlog-build: + runs-on: ubuntu-latest + steps: + - name: Free Disk Space (Ubuntu) + uses: jlumbroso/free-disk-space@main + - uses: actions/checkout@main + with: + fetch-depth: 1 + - uses: DeterminateSystems/nix-installer-action@main + - uses: DeterminateSystems/magic-nix-cache-action@main + - uses: cachix/cachix-action@master + with: + name: alyraffauf + authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' + - name: Build pacifidlog + run: nix build --accept-flake-config .#nixosConfigurations.pacifidlog.config.system.build.toplevel petalburg-build: runs-on: ubuntu-latest steps: diff --git a/common/base.nix b/common/base.nix index 4c0a2ad0..02e9131b 100644 --- a/common/base.nix +++ b/common/base.nix @@ -53,8 +53,6 @@ ''; }; - sound.enable = true; - zramSwap = { enable = lib.mkDefault true; memoryPercent = lib.mkDefault 50; diff --git a/common/nix.nix b/common/nix.nix index 081b214f..0dee0fb7 100644 --- a/common/nix.nix +++ b/common/nix.nix @@ -23,12 +23,16 @@ substituters = [ "https://alyraffauf.cachix.org" "https://cache.nixos.org/" + "https://jovian-nixos.cachix.org" "https://nix-community.cachix.org" + "https://nix-gaming.cachix.org" ]; trusted-public-keys = [ "alyraffauf.cachix.org-1:GQVrRGfjTtkPGS8M6y7Ik0z4zLt77O0N25ynv2gWzDM=" + "jovian-nixos.cachix.org-1:mAWLjAxLNlfxAnozUjOqGj4AxQwCl7MXwOfu7msVlAo=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4=" ]; trusted-users = ["aly"]; diff --git a/common/overlays.nix b/common/overlays.nix index a6bb8011..56688ca7 100644 --- a/common/overlays.nix +++ b/common/overlays.nix @@ -1,21 +1,9 @@ -{ - pkgs, - self, - ... -}: let - unstable = import self.inputs.nixpkgs-unstable { - system = pkgs.system; - }; -in { +{pkgs, ...}: { nixpkgs = { config.allowUnfree = true; # Allow unfree packages overlays = [ (final: prev: { - fractal = unstable.fractal; - - power-profiles-daemon = unstable.power-profiles-daemon; - rofi-bluetooth = prev.rofi-bluetooth.overrideAttrs (old: { @@ -28,8 +16,6 @@ in { sha256 = "sha256-o0Sr3/888L/2KzZZP/EcXx+8ZUzdHB/I/VIeVuJvJks="; }; }); - - zed-editor = unstable.zed-editor; }) ]; }; diff --git a/flake.lock b/flake.lock index 35838c11..3b9dd254 100644 --- a/flake.lock +++ b/flake.lock @@ -57,30 +57,14 @@ "type": "github" } }, - "base16-foot": { - "flake": false, - "locked": { - "lastModified": 1696725948, - "narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=", - "owner": "tinted-theming", - "repo": "base16-foot", - "rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-foot", - "type": "github" - } - }, "base16-helix": { "flake": false, "locked": { - "lastModified": 1696727917, - "narHash": "sha256-FVrbPk+NtMra0jtlC5oxyNchbm8FosmvXIatkRbYy1g=", + "lastModified": 1725860795, + "narHash": "sha256-Z2o8VBPW3I+KKTSfe25kskz0EUj7MpUh8u355Z1nVsU=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "dbe1480d99fe80f08df7970e471fac24c05f2ddb", + "rev": "7f795bf75d38e0eea9fed287264067ca187b88a9", "type": "github" }, "original": { @@ -89,50 +73,18 @@ "type": "github" } }, - "base16-kitty": { - "flake": false, - "locked": { - "lastModified": 1665001328, - "narHash": "sha256-aRaizTYPpuWEcvoYE9U+YRX+Wsc8+iG0guQJbvxEdJY=", - "owner": "kdrag0n", - "repo": "base16-kitty", - "rev": "06bb401fa9a0ffb84365905ffbb959ae5bf40805", - "type": "github" - }, - "original": { - "owner": "kdrag0n", - "repo": "base16-kitty", - "type": "github" - } - }, - "base16-tmux": { - "flake": false, - "locked": { - "lastModified": 1696725902, - "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=", - "owner": "tinted-theming", - "repo": "base16-tmux", - "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7", - "type": "github" - }, - "original": { - "owner": "tinted-theming", - "repo": "base16-tmux", - "type": "github" - } - }, "base16-vim": { "flake": false, "locked": { - "lastModified": 1663659192, - "narHash": "sha256-uJvaYYDMXvoo0fhBZUhN8WBXeJ87SRgof6GEK2efFT0=", - "owner": "chriskempson", + "lastModified": 1716150083, + "narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=", + "owner": "tinted-theming", "repo": "base16-vim", - "rev": "3be3cd82cd31acfcab9a41bad853d9c68d30478d", + "rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d", "type": "github" }, "original": { - "owner": "chriskempson", + "owner": "tinted-theming", "repo": "base16-vim", "type": "github" } @@ -187,11 +139,11 @@ ] }, "locked": { - "lastModified": 1728334376, - "narHash": "sha256-CTKEKPzD/j8FK6H4DO3EjyixZd3HHvgAgfnCwpGFP5c=", + "lastModified": 1728763831, + "narHash": "sha256-KOp33tls7jRAhcmu77aVxKpSMou8QgK0BC+Y3sYLuGo=", "owner": "nix-community", "repo": "disko", - "rev": "d39ee334984fcdae6244f5a8e6ab857479cbaefe", + "rev": "b6215392ec3bd05e9ebfbb2f7945c414096fce8f", "type": "github" }, "original": { @@ -253,6 +205,24 @@ "type": "github" } }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1727826117, + "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems_3" @@ -271,6 +241,27 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": [ + "stylix", + "systems" + ] + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "fromYaml": { "flake": false, "locked": { @@ -354,16 +345,16 @@ ] }, "locked": { - "lastModified": 1726989464, - "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", + "lastModified": 1728791962, + "narHash": "sha256-nr5QiXwQcZmf6/auC1UpX8iAtINMtdi2mH+OkqJQVmU=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", + "rev": "64c6325b28ebd708653dd41d88f306023f296184", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", + "ref": "master", "repo": "home-manager", "type": "github" } @@ -376,11 +367,11 @@ ] }, "locked": { - "lastModified": 1714981474, - "narHash": "sha256-b3/U21CJjCjJKmA9WqUbZGZgCvospO3ArOUTgJugkOY=", + "lastModified": 1724435763, + "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", "owner": "nix-community", "repo": "home-manager", - "rev": "6ebe7be2e67be7b9b54d61ce5704f6fb466c536f", + "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", "type": "github" }, "original": { @@ -410,6 +401,27 @@ "type": "github" } }, + "jovian": { + "inputs": { + "nix-github-actions": "nix-github-actions", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1728679815, + "narHash": "sha256-3IXvY30zzFq7lHFujMupPz3TiPXo8o8qiIjkXUvznCI=", + "owner": "Jovian-Experiments", + "repo": "Jovian-NixOS", + "rev": "e4f4d7832cc559389b93798c1f0d615e3816f4ef", + "type": "github" + }, + "original": { + "owner": "Jovian-Experiments", + "repo": "Jovian-NixOS", + "type": "github" + } + }, "lanzaboote": { "inputs": { "crane": "crane", @@ -437,22 +449,78 @@ "type": "github" } }, + "nix-gaming": { + "inputs": { + "flake-parts": "flake-parts_2", + "nixpkgs": [ + "nixpkgs" + ], + "umu": "umu" + }, + "locked": { + "lastModified": 1728783634, + "narHash": "sha256-kh4rf1WWFzx1wcHf6lToksRm1Qu/abEYiojs/sCxAYQ=", + "owner": "fufexan", + "repo": "nix-gaming", + "rev": "6accf747c4a29c2ef26ee1a61e9b2466bc9da7b2", + "type": "github" + }, + "original": { + "owner": "fufexan", + "repo": "nix-gaming", + "type": "github" + } + }, + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "jovian", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1690328911, + "narHash": "sha256-fxtExYk+aGf2YbjeWQ8JY9/n9dwuEt+ma1eUFzF8Jeo=", + "owner": "zhaofengli", + "repo": "nix-github-actions", + "rev": "96df4a39c52f53cb7098b923224d8ce941b64747", + "type": "github" + }, + "original": { + "owner": "zhaofengli", + "ref": "matrix-name", + "repo": "nix-github-actions", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1728500571, - "narHash": "sha256-dOymOQ3AfNI4Z337yEwHGohrVQb4yPODCW9MDUyAc4w=", + "lastModified": 1728492678, + "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d51c28603def282a24fa034bcb007e2bcb5b5dd0", + "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1727825735, + "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1710695816, @@ -469,29 +537,13 @@ "type": "github" } }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1728492678, - "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nur": { "locked": { - "lastModified": 1728626853, - "narHash": "sha256-fqL5vpxgPJa8rU8/leTKnhraXFhIytbTgsYd+o0KUgI=", + "lastModified": 1728857807, + "narHash": "sha256-7zRl4QJD5iK1Y4jyyysUEHcsx+v1jI1C3vP+q3IKLps=", "owner": "nix-community", "repo": "NUR", - "rev": "249b147c8b96ea9bfc873723f82f88f61f685bb0", + "rev": "8952169dd073e0cd2c482c346a088868f61cfb77", "type": "github" }, "original": { @@ -533,9 +585,10 @@ "disko": "disko", "home-manager": "home-manager_2", "iio-hyprland": "iio-hyprland", + "jovian": "jovian", "lanzaboote": "lanzaboote", + "nix-gaming": "nix-gaming", "nixpkgs": "nixpkgs", - "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur", "stylix": "stylix", "wallpapers": "wallpapers" @@ -570,29 +623,31 @@ "inputs": { "base16": "base16", "base16-fish": "base16-fish", - "base16-foot": "base16-foot", "base16-helix": "base16-helix", - "base16-kitty": "base16-kitty", - "base16-tmux": "base16-tmux", "base16-vim": "base16-vim", "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_2", "gnome-shell": "gnome-shell", "home-manager": "home-manager_3", "nixpkgs": [ "nixpkgs" - ] + ], + "systems": "systems_4", + "tinted-foot": "tinted-foot", + "tinted-kitty": "tinted-kitty", + "tinted-tmux": "tinted-tmux" }, "locked": { - "lastModified": 1718122552, - "narHash": "sha256-A+dBkSwp8ssHKV/WyXb9uqIYrHBqHvtSedU24Lq9lqw=", + "lastModified": 1728640680, + "narHash": "sha256-JH2+RXJNooFtZIN6ZhaGZWn2KChMrso4H7Fkp1Ujrdo=", "owner": "danth", "repo": "stylix", - "rev": "e59d2c1725b237c362e4a62f5722f5b268d566c7", + "rev": "f95022bb6e74f726a87975aec982a5aa9fad8691", "type": "github" }, "original": { "owner": "danth", - "ref": "release-24.05", + "ref": "master", "repo": "stylix", "type": "github" } @@ -642,6 +697,95 @@ "type": "github" } }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "tinted-foot": { + "flake": false, + "locked": { + "lastModified": 1696725948, + "narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=", + "owner": "tinted-theming", + "repo": "tinted-foot", + "rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-foot", + "type": "github" + } + }, + "tinted-kitty": { + "flake": false, + "locked": { + "lastModified": 1716423189, + "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=", + "owner": "tinted-theming", + "repo": "tinted-kitty", + "rev": "eb39e141db14baef052893285df9f266df041ff8", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-kitty", + "rev": "eb39e141db14baef052893285df9f266df041ff8", + "type": "github" + } + }, + "tinted-tmux": { + "flake": false, + "locked": { + "lastModified": 1696725902, + "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=", + "owner": "tinted-theming", + "repo": "tinted-tmux", + "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-tmux", + "type": "github" + } + }, + "umu": { + "inputs": { + "nixpkgs": [ + "nix-gaming", + "nixpkgs" + ] + }, + "locked": { + "dir": "packaging/nix", + "lastModified": 1728772489, + "narHash": "sha256-6sHjXNhPrRXIV1au5jlSXHeqn/QHb9wyRt7V0F5p4PA=", + "ref": "refs/heads/main", + "rev": "475e2b37e34a663b11f8c92b79dd45637a3e848c", + "revCount": 770, + "submodules": true, + "type": "git", + "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" + }, + "original": { + "dir": "packaging/nix", + "submodules": true, + "type": "git", + "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix" + } + }, "wallpapers": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 332e7468..4a3a7a79 100644 --- a/flake.nix +++ b/flake.nix @@ -2,8 +2,7 @@ description = "Aly's NixOS flake."; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; - nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; agenix = { inputs.nixpkgs.follows = "nixpkgs"; @@ -17,7 +16,7 @@ home-manager = { inputs.nixpkgs.follows = "nixpkgs"; - url = "github:nix-community/home-manager/release-24.05"; + url = "github:nix-community/home-manager/master"; }; iio-hyprland = { @@ -25,16 +24,26 @@ url = "github:JeanSchoeller/iio-hyprland"; }; + jovian = { + url = "github:Jovian-Experiments/Jovian-NixOS"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + lanzaboote = { inputs.nixpkgs.follows = "nixpkgs"; url = "github:nix-community/lanzaboote/v0.4.1"; }; + nix-gaming = { + inputs.nixpkgs.follows = "nixpkgs"; + url = "github:fufexan/nix-gaming"; + }; + nur.url = "github:nix-community/NUR"; stylix = { inputs.nixpkgs.follows = "nixpkgs"; - url = "github:danth/stylix/release-24.05"; + url = "github:danth/stylix/master"; }; wallpapers = { @@ -48,12 +57,16 @@ extra-substituters = [ "https://alyraffauf.cachix.org" + "https://jovian-nixos.cachix.org" "https://nix-community.cachix.org" + "https://nix-gaming.cachix.org" ]; extra-trusted-public-keys = [ "alyraffauf.cachix.org-1:GQVrRGfjTtkPGS8M6y7Ik0z4zLt77O0N25ynv2gWzDM=" + "jovian-nixos.cachix.org-1:mAWLjAxLNlfxAnozUjOqGj4AxQwCl7MXwOfu7msVlAo=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4=" ]; }; @@ -86,6 +99,7 @@ "fallarbor" "lavaridge" "mauville" + "pacifidlog" "petalburg" "rustboro" "slateport" @@ -147,11 +161,11 @@ hw-common-intel-cpu = import ./hwModules/common/cpu/intel; hw-common-intel-gpu = import ./hwModules/common/gpu/intel; hw-common-laptop = import ./hwModules/common/laptop; - hw-common-laptop-amd-gpu = import ./hwModules/common/laptop/amd-gpu.nix; hw-common-laptop-intel-cpu = import ./hwModules/common/laptop/intel-cpu.nix; hw-common-ssd = import ./hwModules/common/ssd; hw-framework-13-amd-7000 = import ./hwModules/framework/13/amd-7000; hw-framework-13-intel-11th = import ./hwModules/framework/13/intel-11th; + hw-lenovo-legion-go = import ./hwModules/lenovo/legion/go; hw-lenovo-yoga-9i-intel-13th = import ./hwModules/lenovo/yoga-9i/intel-13th; hw-thinkpad-t440p = import ./hwModules/thinkpad/t440p; diff --git a/homeManagerModules/apps/firefox/default.nix b/homeManagerModules/apps/firefox/default.nix index 8c041860..14eef966 100644 --- a/homeManagerModules/apps/firefox/default.nix +++ b/homeManagerModules/apps/firefox/default.nix @@ -7,6 +7,7 @@ config = lib.mkIf config.ar.home.apps.firefox.enable { programs.firefox = { enable = true; + nativeMessagingHosts = lib.optionals (config.ar.home.desktop.gnome.enable) [pkgs.gnome-browser-connector] ++ lib.optional (config.ar.home.apps.keepassxc.enable) pkgs.keepassxc; diff --git a/homeManagerModules/apps/nemo/default.nix b/homeManagerModules/apps/nemo/default.nix index 0688d782..b0c11f98 100644 --- a/homeManagerModules/apps/nemo/default.nix +++ b/homeManagerModules/apps/nemo/default.nix @@ -5,7 +5,7 @@ ... }: { config = lib.mkIf config.ar.home.apps.nemo.enable { - home.packages = [pkgs.cinnamon.nemo]; + home.packages = [pkgs.nemo]; dconf = { enable = true; diff --git a/homeManagerModules/desktop/wayland/default.nix b/homeManagerModules/desktop/wayland/default.nix index f5c95646..d54e4943 100644 --- a/homeManagerModules/desktop/wayland/default.nix +++ b/homeManagerModules/desktop/wayland/default.nix @@ -23,7 +23,7 @@ home.packages = with pkgs; [ blueberry - gnome.file-roller + file-roller libnotify networkmanagerapplet ]; diff --git a/homeManagerModules/options.nix b/homeManagerModules/options.nix index 407e53b6..cc12458b 100644 --- a/homeManagerModules/options.nix +++ b/homeManagerModules/options.nix @@ -38,7 +38,7 @@ in { nemo.enable = lib.mkOption { description = "Cinnamon Nemo file manager."; - default = cfg.defaultApps.fileManager == pkgs.cinnamon.nemo; + default = cfg.defaultApps.fileManager == pkgs.nemo; type = lib.types.bool; }; @@ -79,13 +79,18 @@ in { enable = lib.mkEnableOption "Declaratively set default apps and file associations."; audioPlayer = lib.mkPackageOption pkgs "audio player" {default = ["celluloid"];}; editor = lib.mkPackageOption pkgs "text editor" {default = ["vscodium"];}; - fileManager = lib.mkPackageOption pkgs "file manager" {default = ["cinnamon" "nemo"];}; - imageViewer = lib.mkPackageOption pkgs "image viewer" {default = ["gnome" "eog"];}; + fileManager = lib.mkPackageOption pkgs "file manager" {default = ["nemo"];}; + imageViewer = lib.mkPackageOption pkgs "image viewer" {default = ["eog"];}; pdfViewer = lib.mkPackageOption pkgs "pdf viewer" {default = ["evince"];}; terminal = lib.mkPackageOption pkgs "terminal emulator" {default = ["kitty"];}; terminalEditor = lib.mkPackageOption pkgs "terminal text editor" {default = ["vim"];}; videoPlayer = lib.mkPackageOption pkgs "video player" {default = ["celluloid"];}; - webBrowser = lib.mkPackageOption pkgs "web browser" {default = ["firefox"];}; + + webBrowser = lib.mkOption { + description = "web browser"; + default = config.programs.firefox.finalPackage; + type = lib.types.package; + }; }; desktop = { diff --git a/homeManagerModules/theme.nix b/homeManagerModules/theme.nix index 5ee9e912..6335f836 100644 --- a/homeManagerModules/theme.nix +++ b/homeManagerModules/theme.nix @@ -8,7 +8,7 @@ in { config = lib.mkIf cfg.theme.enable { home.packages = [ - pkgs.gnome.adwaita-icon-theme + pkgs.adwaita-icon-theme pkgs.liberation_ttf ]; diff --git a/homes/aly/default.nix b/homes/aly/default.nix index 4e514709..b1ff86da 100644 --- a/homes/aly/default.nix +++ b/homes/aly/default.nix @@ -58,7 +58,7 @@ self: {pkgs, ...}: { }; }; - systemd.user.startServices = "legacy"; # Needed for auto-mounting agenix secrets. + systemd.user.startServices = true; # Needed for auto-mounting agenix secrets. ar.home = { apps = { diff --git a/hosts/lavaridge/default.nix b/hosts/lavaridge/default.nix index e0d9fd1c..b2057759 100644 --- a/hosts/lavaridge/default.nix +++ b/hosts/lavaridge/default.nix @@ -38,7 +38,6 @@ environment.variables.GDK_SCALE = "2"; networking.hostName = "lavaridge"; - programs.firefox.policies.Preferences."media.ffmpeg.vaapi.enabled" = lib.mkForce false; system.stateVersion = "24.05"; ar = { diff --git a/hosts/lavaridge/home.nix b/hosts/lavaridge/home.nix index 836b38cf..ae180195 100644 --- a/hosts/lavaridge/home.nix +++ b/hosts/lavaridge/home.nix @@ -10,7 +10,7 @@ }; ar.home = { - desktop.hyprland.laptopMonitors = ["eDP-1,2880x1920@60, 0x0, 2, vrr, 0"]; + desktop.hyprland.laptopMonitors = ["desc:BOE NE135A1M-NY1,2880x1920@60, 0x0, 2, vrr, 0"]; services = { easyeffects = { diff --git a/hosts/mauville/default.nix b/hosts/mauville/default.nix index 00b73df5..5413205e 100644 --- a/hosts/mauville/default.nix +++ b/hosts/mauville/default.nix @@ -52,19 +52,19 @@ in { samba = { enable = true; openFirewall = true; - securityType = "user"; - extraConfig = '' - read raw = Yes - write raw = Yes - socket options = TCP_NODELAY IPTOS_LOWDELAY SO_RCVBUF=131072 SO_SNDBUF=131072 - min receivefile size = 16384 - use sendfile = true - aio read size = 16384 - aio write size = 16384 - ''; + settings = { + global = { + security = "user"; + "read raw" = "Yes"; + "write raw" = "Yes"; + "socket options" = "TCP_NODELAY IPTOS_LOWDELAY SO_RCVBUF=131072 SO_SNDBUF=131072"; + "min receivefile size" = 16384; + "use sendfile" = true; + "aio read size" = 16384; + "aio write size" = 16384; + }; - shares = { Media = { "create mask" = "0755"; "directory mask" = "0755"; diff --git a/hosts/mauville/raffauflabs.nix b/hosts/mauville/raffauflabs.nix index b872ac5e..dfe4feb5 100644 --- a/hosts/mauville/raffauflabs.nix +++ b/hosts/mauville/raffauflabs.nix @@ -91,6 +91,13 @@ in { }; }; + immich = { + enable = true; + host = "0.0.0.0"; + mediaLocation = "${mediaDirectory}/Pictures"; + openFirewall = true; + }; + # k3s = { # enable = true; # role = "server"; diff --git a/hosts/pacifidlog/README.md b/hosts/pacifidlog/README.md new file mode 100644 index 00000000..aeb9d0fd --- /dev/null +++ b/hosts/pacifidlog/README.md @@ -0,0 +1,30 @@ +# pacifidlog + +## Overview + +Lenovo Legion Go with AMD Z1 Extreme. Gaming beast. Uses Jovian for Steam Deck-like interface. + +## Todo + +- \[x\] update hdd-ui and adjustor. +- \[ \] upgrade to large SSD. + +## Specs + +| Model | Legion Go | +|---------|---------------------------| +| Display | 8.8" 1600x2560 144Hz | +| CPU | AMD Z1 Extreme | +| RAM | 16GB LPDDR5 (soldered) | +| GPU | AMD Z1 Extreme | +| Disks | 512GB M.2 2242 NVMe | + +## Filesystems + +### / + +Encrypted LUKS btrfs volume. + +## Display + +Vertical-turned-horizontal 1600x2560 display running at 144Hz. Scales perfectly to 2x. diff --git a/hosts/pacifidlog/default.nix b/hosts/pacifidlog/default.nix new file mode 100644 index 00000000..4ae2645f --- /dev/null +++ b/hosts/pacifidlog/default.nix @@ -0,0 +1,156 @@ +# Lenovo Legion Go +{ + config, + pkgs, + lib, + self, + ... +}: let + adjustor = pkgs.callPackage ./../../pkgs/adjustor.nix {}; + hhd-ui = pkgs.callPackage ./../../pkgs/hhd-ui.nix {}; +in { + imports = [ + ./home.nix + ./secrets.nix + ./stylix.nix + (import ./../../disko/luks-btrfs-subvolumes.nix {disks = ["/dev/nvme0n1"];}) + self.inputs.jovian.nixosModules.default + self.inputs.nix-gaming.nixosModules.pipewireLowLatency + self.inputs.nix-gaming.nixosModules.platformOptimizations + self.nixosModules.common-base + self.nixosModules.common-locale + self.nixosModules.common-mauville-share + self.nixosModules.common-nix + self.nixosModules.common-overlays + self.nixosModules.common-pkgs + self.nixosModules.common-tailscale + self.nixosModules.common-wifi-profiles + self.nixosModules.hw-lenovo-legion-go + ]; + + boot = { + initrd.systemd.enable = true; + + lanzaboote = { + enable = true; + pkiBundle = "/etc/secureboot"; + }; + + loader = { + efi.canTouchEfiVariables = true; + + systemd-boot = { + enable = lib.mkForce false; + consoleMode = "1"; + }; + }; + }; + + environment = { + systemPackages = [ + hhd-ui + pkgs.heroic + pkgs.lutris + ]; + + variables.GDK_SCALE = "2"; + }; + + hardware.pulseaudio.enable = lib.mkForce false; + + jovian = { + decky-loader = { + enable = true; + user = "aly"; + }; + + hardware.has.amd.gpu = true; + + steam = { + enable = true; + + environment = { + STEAM_GAMESCOPE_COLOR_MANAGED = "0"; + }; + + autoStart = true; + desktopSession = "hyprland"; + user = "aly"; + }; + + steamos.useSteamOSConfig = true; + }; + + networking.hostName = "pacifidlog"; + + nixpkgs.overlays = [ + (final: prev: { + brave = prev.brave.override {commandLineArgs = "--gtk-version=4 --enable-wayland-ime";}; + + obsidian = prev.obsidian.overrideAttrs (old: { + installPhase = + builtins.replaceStrings ["--ozone-platform=wayland"] + ["--ozone-platform=wayland --enable-wayland-ime"] + old.installPhase; + }); + + vscodium = prev.vscodium.override {commandLineArgs = "--enable-wayland-ime";}; + + webcord = prev.webcord.overrideAttrs (old: { + installPhase = + builtins.replaceStrings ["--ozone-platform-hint=auto"] + ["--ozone-platform-hint=auto --enable-wayland-ime"] + old.installPhase; + }); + }) + ]; + + programs.steam.platformOptimizations.enable = true; + + services = { + handheld-daemon = { + enable = true; + user = "aly"; + + package = with pkgs; + handheld-daemon.overrideAttrs (oldAttrs: { + propagatedBuildInputs = + oldAttrs.propagatedBuildInputs + ++ [ + adjustor + ]; + }); + }; + + pipewire.lowLatency = { + enable = true; + quantum = 256; + rate = 48000; + }; + }; + + system.stateVersion = "24.11"; + systemd.services.handheld-daemon.path = [hhd-ui pkgs.lsof]; + zramSwap.memoryPercent = 100; + + ar = { + apps = { + firefox.enable = true; + steam.enable = true; + }; + + desktop.hyprland.enable = true; + + users.aly = { + enable = true; + password = "$y$j9T$CXjk5Z9e2PXbSsWh5CK.81$I9Hm/Oa4KcYMqPi8KMBfsEv5NzoXCgaCK5xhyGeikH7"; + + syncthing = { + enable = true; + certFile = config.age.secrets.syncthingCert.path; + keyFile = config.age.secrets.syncthingKey.path; + syncMusic = false; + }; + }; + }; +} diff --git a/hosts/pacifidlog/home.nix b/hosts/pacifidlog/home.nix new file mode 100644 index 00000000..24ed60dd --- /dev/null +++ b/hosts/pacifidlog/home.nix @@ -0,0 +1,27 @@ +{self, ...}: { + home-manager = { + sharedModules = [ + { + wayland.windowManager = { + hyprland.settings = { + input = { + touchdevice = { + transform = 1; + output = "eDP-1"; + }; + }; + }; + }; + + ar.home = { + desktop.hyprland = { + laptopMonitors = ["desc:Lenovo Group Limited Go Display 0x00888888, 1600x2560@144, 0x0, 2, transform, 1"]; + tabletMode.enable = true; + }; + }; + } + ]; + + users.aly = self.homeManagerModules.aly; + }; +} diff --git a/hosts/pacifidlog/secrets.nix b/hosts/pacifidlog/secrets.nix new file mode 100644 index 00000000..cb448683 --- /dev/null +++ b/hosts/pacifidlog/secrets.nix @@ -0,0 +1,6 @@ +{ + age.secrets = { + syncthingCert.file = ../../secrets/aly/syncthing/pacifidlog/cert.age; + syncthingKey.file = ../../secrets/aly/syncthing/pacifidlog/key.age; + }; +} diff --git a/hosts/pacifidlog/stylix.nix b/hosts/pacifidlog/stylix.nix new file mode 100644 index 00000000..194f2331 --- /dev/null +++ b/hosts/pacifidlog/stylix.nix @@ -0,0 +1,50 @@ +{ + pkgs, + self, + ... +}: { + stylix = { + enable = true; + base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml"; + image = "${self.inputs.wallpapers}/wallhaven-3lyrvy.png"; + imageScalingMode = "fill"; + polarity = "dark"; + + cursor = { + name = "Bibata-Modern-Classic"; + package = pkgs.bibata-cursors; + size = 24; + }; + + fonts = { + monospace = { + name = "CaskaydiaCove Nerd Font"; + package = pkgs.nerdfonts.override {fonts = ["CascadiaCode"];}; + }; + + sansSerif = { + name = "UbuntuSans Nerd Font"; + package = pkgs.nerdfonts.override {fonts = ["UbuntuSans"];}; + }; + + serif = { + name = "Source Serif Pro"; + package = pkgs.source-serif-pro; + }; + + sizes = { + applications = 12; + desktop = 11; + popups = 12; + terminal = 13; + }; + }; + + opacity = { + applications = 1.0; + desktop = 0.8; + terminal = 0.8; + popups = 0.8; + }; + }; +} diff --git a/hosts/slateport/raffauflabs.nix b/hosts/slateport/raffauflabs.nix index fbcf4c11..3479bfa1 100644 --- a/hosts/slateport/raffauflabs.nix +++ b/hosts/slateport/raffauflabs.nix @@ -32,7 +32,7 @@ in { passwordFile = config.age.secrets.cloudflare.path; protocol = "cloudflare"; ssl = true; - use = "web, web=dynamicdns.park-your-domain.com/getip, web-skip='Current IP Address: '"; + usev4 = "web, web=dynamicdns.park-your-domain.com/getip, web-skip='Current IP Address: '"; username = "token"; zone = domain; }; diff --git a/hwModules/common/cpu/amd/default.nix b/hwModules/common/cpu/amd/default.nix index ea8f5069..04e922b7 100644 --- a/hwModules/common/cpu/amd/default.nix +++ b/hwModules/common/cpu/amd/default.nix @@ -1,9 +1,5 @@ {lib, ...}: { - boot = { - kernelModules = ["kvm-amd"]; - kernelParams = ["amd_pstate=active"]; - }; - + boot.kernelModules = ["kvm-amd"]; hardware.cpu.amd.updateMicrocode = true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; } diff --git a/hwModules/common/gpu/amd/default.nix b/hwModules/common/gpu/amd/default.nix index a3d3cc3f..0e9baf52 100644 --- a/hwModules/common/gpu/amd/default.nix +++ b/hwModules/common/gpu/amd/default.nix @@ -1,14 +1,18 @@ {...}: { environment.variables.VDPAU_DRIVER = "radeonsi"; - hardware.amdgpu = { - initrd.enable = true; + hardware = { + amdgpu = { + initrd.enable = true; - amdvlk = { - enable = true; - support32Bit.enable = true; + amdvlk = { + enable = true; + support32Bit.enable = true; + }; + + opencl.enable = true; }; - opencl.enable = true; + graphics.enable = true; }; } diff --git a/hwModules/common/gpu/intel/default.nix b/hwModules/common/gpu/intel/default.nix index 8671a797..8819e2e0 100644 --- a/hwModules/common/gpu/intel/default.nix +++ b/hwModules/common/gpu/intel/default.nix @@ -9,10 +9,8 @@ hardware = { intel-gpu-tools.enable = true; - opengl = { + graphics = { enable = true; - driSupport = true; - driSupport32Bit = true; extraPackages = [ pkgs.intel-media-driver # LIBVA_DRIVER_NAME=iHD diff --git a/hwModules/common/laptop/amd-gpu.nix b/hwModules/common/laptop/amd-gpu.nix deleted file mode 100644 index ea8f50d4..00000000 --- a/hwModules/common/laptop/amd-gpu.nix +++ /dev/null @@ -1,2 +0,0 @@ -{...}: { -} diff --git a/hwModules/framework/13/amd-7000/default.nix b/hwModules/framework/13/amd-7000/default.nix index 09c55be4..50109a36 100644 --- a/hwModules/framework/13/amd-7000/default.nix +++ b/hwModules/framework/13/amd-7000/default.nix @@ -1,17 +1,17 @@ { lib, pkgs, + self, ... }: { imports = [ - ../../../common/bluetooth - ../../../common/cpu/amd - ../../../common/gpu/amd - ../../../common/laptop - ../../../common/laptop/amd-gpu.nix - ../../../common/ssd ../../common.nix ../common.nix + self.nixosModules.hw-common-amd-cpu + self.nixosModules.hw-common-amd-gpu + self.nixosModules.hw-common-bluetooth + self.nixosModules.hw-common-laptop + self.nixosModules.hw-common-ssd ]; boot = { diff --git a/hwModules/framework/13/intel-11th/default.nix b/hwModules/framework/13/intel-11th/default.nix index 28c2c772..103ab0f3 100644 --- a/hwModules/framework/13/intel-11th/default.nix +++ b/hwModules/framework/13/intel-11th/default.nix @@ -1,17 +1,18 @@ { lib, pkgs, + self, ... }: { imports = [ - ../../../common/bluetooth - ../../../common/cpu/intel - ../../../common/gpu/intel - ../../../common/laptop - ../../../common/laptop/intel-cpu.nix - ../../../common/ssd ../../common.nix ../common.nix + self.nixosModules.hw-common-bluetooth + self.nixosModules.hw-common-intel-cpu + self.nixosModules.hw-common-intel-gpu + self.nixosModules.hw-common-laptop + self.nixosModules.hw-common-laptop-intel-cpu + self.nixosModules.hw-common-ssd ]; boot = { diff --git a/hwModules/lenovo/common.nix b/hwModules/lenovo/common.nix deleted file mode 100644 index abb1e686..00000000 --- a/hwModules/lenovo/common.nix +++ /dev/null @@ -1,3 +0,0 @@ -{...}: { - hardware.enableAllFirmware = true; -} diff --git a/hwModules/lenovo/legion/go/default.nix b/hwModules/lenovo/legion/go/default.nix new file mode 100644 index 00000000..9ef5d2cc --- /dev/null +++ b/hwModules/lenovo/legion/go/default.nix @@ -0,0 +1,44 @@ +{ + config, + lib, + pkgs, + self, + ... +}: { + imports = [ + self.nixosModules.hw-common-amd-cpu + self.nixosModules.hw-common-amd-gpu + self.nixosModules.hw-common-bluetooth + self.nixosModules.hw-common-ssd + ]; + + boot = { + initrd = { + availableKernelModules = [ + "amdgpu" + "nvme" + "rtsx_pci_sdmmc" + "sd_mod" + "sdhci_pci" + "thunderbolt" + "usb_storage" + "usbhid" + "xhci_pci" + ]; + + kernelModules = ["amdgpu"]; + }; + + blacklistedKernelModules = ["k10temp"]; + extraModulePackages = with config.boot.kernelPackages; [acpi_call zenpower]; + kernelModules = ["zenpower"]; + kernelPackages = lib.mkDefault pkgs.linuxPackages_xanmod_latest; + }; + + hardware = { + enableAllFirmware = true; + sensor.iio.enable = true; + }; + + services.upower.enable = true; +} diff --git a/hwModules/lenovo/yoga-9i/intel-13th/default.nix b/hwModules/lenovo/yoga-9i/intel-13th/default.nix index 7cc1c0db..5d2e827d 100644 --- a/hwModules/lenovo/yoga-9i/intel-13th/default.nix +++ b/hwModules/lenovo/yoga-9i/intel-13th/default.nix @@ -1,21 +1,23 @@ { lib, pkgs, + self, ... }: { imports = [ - ../../../common/bluetooth - ../../../common/cpu/intel - ../../../common/gpu/intel - ../../../common/laptop - ../../../common/laptop/intel-cpu.nix - ../../../common/ssd - ../../common.nix ../common.nix + self.nixosModules.hw-common-bluetooth + self.nixosModules.hw-common-intel-cpu + self.nixosModules.hw-common-intel-gpu + self.nixosModules.hw-common-laptop + self.nixosModules.hw-common-laptop-intel-cpu + self.nixosModules.hw-common-ssd ]; boot = { initrd.availableKernelModules = ["nvme" "sd_mod" "thunderbolt" "usb_storage" "xhci_pci"]; kernelPackages = lib.mkDefault pkgs.linuxPackages_latest; }; + + hardware.enableAllFirmware = true; } diff --git a/hwModules/thinkpad/t440p/default.nix b/hwModules/thinkpad/t440p/default.nix index 7858b514..e23dbdea 100644 --- a/hwModules/thinkpad/t440p/default.nix +++ b/hwModules/thinkpad/t440p/default.nix @@ -1,12 +1,12 @@ -{...}: { +{self, ...}: { imports = [ - ../../common/bluetooth - ../../common/cpu/intel - ../../common/gpu/intel - ../../common/laptop - ../../common/laptop/intel-cpu.nix - ../../common/ssd ../common.nix + self.nixosModules.hw-common-bluetooth + self.nixosModules.hw-common-intel-cpu + self.nixosModules.hw-common-intel-gpu + self.nixosModules.hw-common-laptop + self.nixosModules.hw-common-laptop-intel-cpu + self.nixosModules.hw-common-ssd ]; boot = { @@ -27,6 +27,5 @@ }; powerManagement.cpuFreqGovernor = "ondemand"; - services.fwupd.enable = true; } diff --git a/nixosModules/apps/steam/default.nix b/nixosModules/apps/steam/default.nix index 32ddd189..c83d19b5 100644 --- a/nixosModules/apps/steam/default.nix +++ b/nixosModules/apps/steam/default.nix @@ -17,6 +17,7 @@ steam = { enable = true; dedicatedServer.openFirewall = true; + extest.enable = true; extraCompatPackages = with pkgs; [proton-ge-bin]; gamescopeSession.enable = config.ar.desktop.steam.enable; localNetworkGameTransfers.openFirewall = true; diff --git a/nixosModules/services/flatpak/default.nix b/nixosModules/services/flatpak/default.nix index 9bfaacb2..13749b3c 100644 --- a/nixosModules/services/flatpak/default.nix +++ b/nixosModules/services/flatpak/default.nix @@ -5,7 +5,7 @@ ... }: { config = lib.mkIf config.ar.services.flatpak.enable { - environment.systemPackages = with pkgs; [gnome.gnome-software]; + environment.systemPackages = with pkgs; [gnome-software]; fileSystems = let mkRoSymBind = path: { @@ -18,8 +18,8 @@ name = "system-icons"; paths = (with pkgs; [ - gnome.adwaita-icon-theme - gnome.gnome-themes-extra + adwaita-icon-theme + gnome-themes-extra ]) ++ lib.optional (config.stylix.enable) config.stylix.cursor.package; diff --git a/pkgs/adjustor.nix b/pkgs/adjustor.nix new file mode 100644 index 00000000..a31b3f98 --- /dev/null +++ b/pkgs/adjustor.nix @@ -0,0 +1,36 @@ +{ + fetchFromGitHub, + lib, + python3, +}: +python3.pkgs.buildPythonApplication rec { + pname = "adjustor"; + version = "3.5.2"; + pyproject = true; + + src = fetchFromGitHub { + owner = "hhd-dev"; + repo = "adjustor"; + rev = "v${version}"; + hash = "sha256-9ONWKI68Llh36giIS6nVKNrZYmNAGMfwW2vgPMFuwXM="; + }; + + propagatedBuildInputs = with python3.pkgs; [ + setuptools + rich + pyroute2 + fuse + pygobject3 + dbus-python + ]; + + # This package doesn't have upstream tests. + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/hhd-dev/adjustor/"; + description = "Allows for TDP control of AMD Handhelds under handheld-daemon support"; + platforms = platforms.linux; + license = licenses.mit; + }; +} diff --git a/pkgs/hhd-ui.nix b/pkgs/hhd-ui.nix new file mode 100644 index 00000000..aabb0a93 --- /dev/null +++ b/pkgs/hhd-ui.nix @@ -0,0 +1,21 @@ +{ + appimageTools, + fetchurl, + lib, +}: +appimageTools.wrapType2 rec { + pname = "hhd-ui"; + version = "3.2.2"; + src = fetchurl { + url = "https://github.com/hhd-dev/hhd-ui/releases/download/v${version}/${pname}.AppImage"; + hash = "sha256-AFFQBhvWUimNW+LZvIf7bTyOX5GEc60kFSUwpsKqG5A="; + }; + + meta = with lib; { + homepage = "https://github.com/hhd-dev/hhd-ui/"; + description = "A UI app that can manage Handheld Daemon settings from Steam, the Desktop, and the Web."; + platforms = platforms.linux; + license = licenses.mit; + mainProgram = "hhd-ui"; + }; +} diff --git a/secrets/aly/backblaze/key.age b/secrets/aly/backblaze/key.age index 6e735981..84d01f30 100644 --- a/secrets/aly/backblaze/key.age +++ b/secrets/aly/backblaze/key.age @@ -1,27 +1,32 @@ age-encryption.org/v1 --> ssh-ed25519 xIeYNQ e4a52T52W+D5deV889+lW6h/TwDUjT0WvKlp3cXHi2I -Ic6lryVXE1wPnrdfE+AWiqiecoV+bfLs7wU3a6OrnRA --> ssh-ed25519 g+apXg 57ldDgcAs6wWXs8YVdT2NtcyuyQigu3sHFt/FS3b/g8 -367RXP9/bPCSDCNI2nMP+/njuCbO6jUDVNP1+6NkKPc --> ssh-ed25519 xZaw4A n0+7GtwGe1v27sKFbyfgtYuoa6yKLeFCdh7ZMkQuf3o -9aeHxp3cmTwUo5hxzNQUp8xf8e+G4cqgO5DSONXMEps --> ssh-ed25519 GrlIbA jgYPSYmjui+7vmLtox/Iq+fYKpvivzHRqUoJ+eS9t3I -IrHAhXIPeQodgYkXGLD9b74HkM27fGyVqlPquwY8OQY --> ssh-ed25519 1GkM5g rgS6v8tJgLWBYQ4sP85Kdbv1ZR4F1go1jpa4gXFt8kE -7Rg7cp4qZkjZqoqaXi4qAIG2xTtPfhKtQ5DbwCdszUQ --> ssh-ed25519 d5QLRA FgEy5yD5QgeuvUj5Lr4TdhxbcCbNoPuJpCZ07kbWZkU -0wzmpL5oJUdG37b/Jpw9vYmH528renV5Zo+SYGlv6Zc --> ssh-ed25519 nrny8w ustQrk9A+VJr5Rafa8F0zYKNAUO5Oc9X2ddyxMyfvzc -NgJwSycZmZVzi2ubTqAMV/+EfjppUW/p97d/MWmteKY --> ssh-ed25519 c7E/gQ zAB97GLKQk7ziOKsvqkBY15r/QQ9O8R1pRUdch3LjTM -Y2uDTssLQMR9/ZSy6tZ9VeGLXCPZrppdse4RlIhmOls --> ssh-ed25519 IghKlQ 9h9j2VY8nv2Nt8eP/MCQBOrWVi3GhS15fYUZK6WuV2Y -TlZBD0Rq6EB19RbelRJFADRO9moj10cK5nLAKRd0dMI --> ssh-ed25519 1mX44w kUqkxU0i8a7SfVE59/jcnj1UnTKPKYO9iQMa7C49DHI -Tzv8E+Vl3D0IQOiq06p9sSsGfe3YNZeNwUuZIhTGPSU --> ssh-ed25519 t3ooSw 3k+VwIl3uKgBEg7payx+gCSL2+lNMpBrdGtvXsHmc1c -XHXAnyHyhl6ozi4Nd0ZtSun6O8lvUb2JLox5NSDCLKI --> ssh-ed25519 aWdXQA BR/Br95ZedPRWVvwxywt8C8tBV5s99wAJ/6x+EmVnBo -FTk6GOFvw0NfS1Ow1fbZyZGTLOb7r/N5PFWXHOtEH9I ---- ii3Aqvhkoiehl4Q9EMrV23nkaN+texgrYGyTer5n7sQ -/K^#m$ KE;w )G߹EԽ%C9v?Q v ` \ No newline at end of file +-> ssh-ed25519 xIeYNQ 4mJ/3J2A1yMVfBIJ/V2wW+HWkvDyU5a+YYKFy2Bvj1U +wiwadKJuXHw9sVMrFtKEdYHVn/da/gCoF8/hcJWk4CU +-> ssh-ed25519 g+apXg oxUhKBL3ux1SdjPgQkPfQHsKfJko6aJ4LsGBxwLGbAg +14b7e1tlYnCdhi1fUIFW3+RFcbf0+K+caOzfPTI45rw +-> ssh-ed25519 xZaw4A oZsPH0p9l64uBruCdUXMeSlo8PrL2cxaGgQcC4yr+Do +57FZyJfbnjVte+Le+jej4Z26aCeV1FLP6ps2KKdasvs +-> ssh-ed25519 qRKpEg 9okAJr1hF0J0UuI6DUqe4w1uYZPChpqWUjRXmg9qfC8 +/QZ+Q2jPLj2HIRBstSVLI5sXg0Qs3NIkgKq9mIVXkbM +-> ssh-ed25519 GrlIbA ebx95Lh0L4aEoabguODm2eoQFx5kaZTltMbdNRlrIG8 +HROx2NqdrrEzHA6i5rJ6fANDk9Ie+vpkrICwWILt5Es +-> ssh-ed25519 1GkM5g BwzG7weq45MLG4yRJssb2mIuQB31Q3LbH1C+phiuywE +fH4aTwdyPvZwNa8/QBu1KlkvPLcvKI9/0NPjL2Pu4oU +-> ssh-ed25519 d5QLRA cViolntrNZ/6tciumiUuXOvAMwTlAsSBDglyPHGcjkE +wxcfU6gwrDwGbxAUl/i8b21Yd1DGYzThvG/C+N/16eo +-> ssh-ed25519 nrny8w AtHHxgpEtRrsBVIiVj92Gy5SSExsFag1EnKuuWp2DnI ++ehOm2sh6fiLbsYc1p6wlCIq8ADX3uGFHciZf/C2hOU +-> ssh-ed25519 c7E/gQ LteNCMNVSaIPDVXpUFx1qLIOQI37U+6UTsb0gpM7uhQ +8GkZ3uLo52fgPkv6A4boRfNAfmmmbfUAS1kv8Bn6/Ww +-> ssh-ed25519 IghKlQ X0GSmdo+hOQfDrlCKtSypOzpYTmtDCy5+LyMe+Pyvgc +UTfbvd8uuBzhZ8PXwNV5cJBJvDAWoFhMU2Xp+RO8M0w +-> ssh-ed25519 ShThzg fBMzbHsO80f2k4TFnQeVosC1tdGT4tbtAHFNkqRbkDQ +Td4xPHpcjleP72UrGWKVQzlI120S8HozT1K/hz9Joho +-> ssh-ed25519 1mX44w 8WcjZDD9weDNhYdIfJKHVwJ4ITsWv1m7FlsvxNc3QiI +di6FXIDpZ3L3U8Uvophq+AsxBkxZ4CUc20IZb2slBEo +-> ssh-ed25519 t3ooSw 9MW0wy+JxUgdNam0hDFO7colbt5RsL2vWSnR6r+/5DI +qJFuj2TeAQfrlhF+klYNve+zeH3QGeuSolNAEHzX4sM +-> ssh-ed25519 aWdXQA LWy8FpCsbnYJ3gPc1RNvSAd11XUXEfknWDlFohtdIGQ +6iUn7P+VMyJGRYKuM00c0H8wgO9N9EvdDq1+m4M0RLQ +--- OIjjEjDq8iT2cJ3jGB6canUTZekUcNm66O6BfCWbxn4 +jp@eAIX&ߥ0*xm-본 +b¤P߸-8 \ No newline at end of file diff --git a/secrets/aly/backblaze/keyId.age b/secrets/aly/backblaze/keyId.age index e2c0b5bc..e6f32ab1 100644 Binary files a/secrets/aly/backblaze/keyId.age and b/secrets/aly/backblaze/keyId.age differ diff --git a/secrets/aly/mail/achacega_gmail.age b/secrets/aly/mail/achacega_gmail.age index d88f34fe..335d29d1 100644 --- a/secrets/aly/mail/achacega_gmail.age +++ b/secrets/aly/mail/achacega_gmail.age @@ -1,29 +1,31 @@ age-encryption.org/v1 --> ssh-ed25519 xIeYNQ FPpSh3MfWNxhCDWkYWCThy3zH1MC3b7+dK9PuAwDjjA -A9E51BOJKV/7+BEgoQKrOb59dQpIdgkscz5XLc8g08I --> ssh-ed25519 g+apXg v81OkJXxVtasYpjwii7etf/aLIZ2pDeTBjWYY7Yeigc -Elh9+oVxqqaxmzyvTL2Yoo1FEDqI1S2vXooqZJUKXDw --> ssh-ed25519 xZaw4A 8NekS6Gjrkj63850Hrmhx3kpHlNPJbI6g6SHorQ6bng -pOeXW503/GIya+aXTopjkEohNwi7IHysSzOLDbmGACQ --> ssh-ed25519 GrlIbA RchOI/rMb/CaG7UKj9oHLtD/4e4Vtw5D1noVdMG/PEY -OlYHOOiiu/hSIXW7wRAAx83S/V2SGxlEZenGFcsCouY --> ssh-ed25519 1GkM5g uh+jg1as2DMd7PzYTiYjWxO+9WeXLUpCwMDEgzWOfmo -rapMAW16Yg9jVP/R0QOi0THsDsw33KyRJFg1Cnyjyps --> ssh-ed25519 d5QLRA dZAkm3/kiHCBnCw9TLt9aVfnYyW18ZYkd6NLplUv8yE -nvUuEXayMzzGEfGNJcCmkjtXISNhnTSKSK4JwJ7iYTg --> ssh-ed25519 nrny8w tLdxkzu2Q960N5MJS9jNhWDw9Z5NmxNQu7qHvhQzpCc -9fwr1wSj+U7gwt3LWifsjo4bXNOq/MiZLc76blDBFPs --> ssh-ed25519 c7E/gQ LELI/QlxLpsGYjQRZ/Z3Wqod2OcE4xcjylfZg8lEIh0 -SBSG45RploMBDL8W8vZJXvPBdNa3sYcarWgBsiMs3DM --> ssh-ed25519 IghKlQ 6d7EAV8bkMwN1jk8T0KLZsNAMGOOo5qdm6Ncwt+uEHk -ZDDHs7CPkJu3sMrggV5dnRlQ3zmigFmYW7inubms5U4 --> ssh-ed25519 1mX44w aGaCTe/PYZuzFhhZZidt4m0rxRGPAJWC0UuywKhe1CY -O5OhF2Xyn+T+PVutWYcN6/cN8LMtn3uV1AAqx9cvbc4 --> ssh-ed25519 t3ooSw tBWJo1mTvaznGaRBTGMltqZcFyYugP/N9Lgwafc0aXQ -4qa2iI31WLKdGVMxBym+O6pgPfxdCudZjAzsbS3uf8s --> ssh-ed25519 aWdXQA tWMj+JbBSiEe9M7TsuTTFxSUQlDmcBRBWSlInG3qygU -Hj35Gk2WvtFGX4fqJ5tavLey8UPSIlQOO6Jqz1KupgA ---- lhg/y8GZt53I1co3yrhLnp9nLk+0lH3t6bq4oqr7/2s -"*'7qYO3 -`nRނf -˟Z5Y%(m= \ No newline at end of file +-> ssh-ed25519 xIeYNQ WV3tVe5AP8RtQbORc/bY2Tn71YCJ7JYitHCuGZlfikw ++5CmmvPMUKyWltN/1dzgJHkW7x/kd3imnkH9KO34oi4 +-> ssh-ed25519 g+apXg CuNatMvNybiqMNbe0wDibcZFk1M8ZbNzUfJSlCof7gw +y3pK+w8nkOQBK5f8g3NLJdx0yF/t75h9ZZI2QNOozPQ +-> ssh-ed25519 xZaw4A eZ/cmDfV3nQ3AFNJ6mL/BxT8f4GH35CHQ10k219EvFY +XCZL/6V3uMDQO5Eav0hg+/ZXWIeA9Syuu6seSIyIbjk +-> ssh-ed25519 qRKpEg NLgGE6QHxl8qARchfxwlE8LCh08DH3rv8ELhodLkHWk +L8M3W8HZHJ1SjfIo5RCE+NUO69SRwDQj4AJHcmL+eRY +-> ssh-ed25519 GrlIbA qSlObU7yZnFEG3GG6aTqa74cKOVqN3mbAxIS4BTNRns +JzE5T5wdAscks6qgtLD0HhOU6AztzFG99H2RuzQ6aEk +-> ssh-ed25519 1GkM5g dG+NZnhNKaqXGqzcLL+MDS3n0Z/jJT+fcAxuPpgweXY +ywt5yA5W5kbkKnBPncq+QmpAsHWn19KRxGveXKWIXtw +-> ssh-ed25519 d5QLRA MyOAc0s83BAPlrjuoQNFQVMdTq+nHSYwx5qNuOAM11o +Y1ajw74EEwHJStTJsh28EWoUS4sliCuCWqywSRCfpbk +-> ssh-ed25519 nrny8w WhcFYfH3NdqaVpijJZIc6Aqd6eC+1A8UKKuEvAACGRQ +b9Gm2OI/mJd416olopUWrQoJ1qjrb+9ll9wxV4ALKnE +-> ssh-ed25519 c7E/gQ IM+akedlYZ2lT+J5n9QRWYxdpbpV89954r9kT0XVI0U +PV6mRDfp/8ZfYYrlonbFU4KZGlwrZIfTnNLfho90dEA +-> ssh-ed25519 IghKlQ 5WNLbphOkSKItsU+BasadoNS7+a65GXVz8HWPC0yFWg +4vD3HR4f+xJx4nSf5UIJlBKDzmv7dV2WQqBtlKJURcA +-> ssh-ed25519 ShThzg sC+vQpxxTXdmXB5dktZnnh9jyMuVIJrY7gip7PbfvwY +DmsRHVl2cSuLcfpwsfiuhdVCri7xlBeaAze9AC88TP4 +-> ssh-ed25519 1mX44w hOWtOGr/Ya4Ga5ndRyRpxHomah5tK0hRRjIunBo653M +CC0huoDeP7s0J9RsKvfSCUE7CAYURkMpf2IcF9gwziQ +-> ssh-ed25519 t3ooSw 9Oz+SVogTHGsP5VpveczAtmhuvveoWnc15QqC+8PCC8 +5VyJqF8R4xxFfg4mhrvZhRNQcW1ICqHL8CvV2NaxU88 +-> ssh-ed25519 aWdXQA YxYtpYun3SnPSF02d8ENlr1EIzQLxsgJnxW7cN7MvVs +eHvgo5xEem1JrBQznGvE98MbQYQ/KfASMrDfR/ri1FQ +--- Fvo95dgBg4Wje8rQoOwUbYC1sHwAiVOVQNeBxCu3e5E +s:Ø xW+?EỞO`@\$\HS mK>0i \ No newline at end of file diff --git a/secrets/aly/mail/alyraffauf_fastmail.age b/secrets/aly/mail/alyraffauf_fastmail.age index e4844f41..f2482ce7 100644 --- a/secrets/aly/mail/alyraffauf_fastmail.age +++ b/secrets/aly/mail/alyraffauf_fastmail.age @@ -1,27 +1,31 @@ age-encryption.org/v1 --> ssh-ed25519 xIeYNQ 0hYkAmHKP5jrSz5AFkyw2YQxBdWg2iovucT1RMxcfiI -UAPsQfkYnxm2oTYQW8hAtcV81gt4+f9V6g/8TsJEVfE --> ssh-ed25519 g+apXg BoP7y6Crmhq3oyJmksXuiGALOsXepg4Lra03bEPsKk8 -LH7wu19ZuoIOsC8vXm9yL1txguwUkyCWiMsRi635xcw --> ssh-ed25519 xZaw4A o/uCpho4J6R9uhUKQYkYwIhgii/wSEbz9s4D6AhAhA8 -mAss4IX7DYgtJs2b9aD6CpZRcrSIkY6oHGyP97hL0IY --> ssh-ed25519 GrlIbA y7LtvefjcS47Fp7up3v4wBMOAgaJhV4PcqBipjWLcTQ -kwrSW+X1dX86y+2Myg8jngvdFCMlXxkHrKaqi1SMD9M --> ssh-ed25519 1GkM5g 5WL5bHy8TEskAvFKjA1lj79a0miFPoTE83ThcqeP+V8 -0VQ+bRCoACb4ztzyGtxaOL1vQvdYn8J1lqSk/Wef7HU --> ssh-ed25519 d5QLRA /IiYtOwCh0W5lNqBHN0aZD5zvFkZvMAqdyontOmDaSU -wyoxeW3Vt9NRj42iYHdr9dExorx1j+dPoZB4FwW9yP0 --> ssh-ed25519 nrny8w VfPIOhD95+J/K2blVImOg8sTzD2/Yk2wUDfUe/JoTBI -m8D88vPV0EyuAxJspZMLW46R0te8uxZ7PByi1WQvUJw --> ssh-ed25519 c7E/gQ cVdZxUSxBagmWvRWllP0hi/cQsClKkdnWFsJqmxq2j8 -Q3zTzdXlNKVDY1sxSz+Aknmhtl4y/9H2xDCkSKrTO3c --> ssh-ed25519 IghKlQ kX1IOQ/HxutbMTOqQH3WHoozsOql2ZKZnKTRXgWFF2U -8kqbsvi7FxSUQVZ9QcHo13x3nnOUwO2AzlJuTbuT8WU --> ssh-ed25519 1mX44w N9HKw9nbChUlDqEUt5afMgFYFPiN5ULqeFXs2uebpls -qjX4sMlCAIrqy+5/g7AzNGmXz5pk/knOi+FvoJ9GEyA --> ssh-ed25519 t3ooSw PtM09E6wHx3yJTch9j/NhFWBY6nIrWZqlcNQLHApvz8 -aN1nYRQHAv3BT3EIClRIcUv13gNy7ao5LiC6VTHlmU8 --> ssh-ed25519 aWdXQA DoGHcYqycxuBF3MWTNHvHHZCfBw5ovvlDgeUKoZfjww -viTesA4vLT6fMcCVqu0936rMaYYAukIJVVG88OilRnI ---- 95IA4SuQZsp+cigxQHM5AsMG/SFtV0haEeaz2QHPzeU -$,PZ+8P{;w)[JC{E\@S >l \ No newline at end of file +-> ssh-ed25519 xIeYNQ NX2WlS4mB8E02wFsz/K1WvZn/d6jqMQ0Ezq6cmY4JH4 +qNwMTNULLfeBgQ9wVny86Frp7oK1f3GBL8u90QtQm68 +-> ssh-ed25519 g+apXg shzV9hDRQHlk7iMNmIznTtnyzPb9uDGn78OQji1z+js +Q39lNdE42CmciIF6P5lQ2It9kInaZyt1J8FqsQDjHr4 +-> ssh-ed25519 xZaw4A O2LCMuU89jft4lQNDjA4YlgpfJKhY+TzBrq0B6ItVQ0 +NymMonsfcJWCUws9B5fjcjstB7SUOd4nL4rUBIu+Sqs +-> ssh-ed25519 qRKpEg U+Gpg2uwMNW3IMoQHGJHrQT649VYjLT3zXQAOrMvGBM +dzQxjrjrPT1YqVrNcVxgEGnKuE/5xGgaCi3wLKQZX4U +-> ssh-ed25519 GrlIbA lneS3dhAdHla1O+E67YlE8zuQQ4SaCS7FxcD3Tb4Wgo +IIxoCV2csxLU3fl9pT89bmr70tSccwxgIzLzKEZkIa8 +-> ssh-ed25519 1GkM5g /vQDCY/gzUrm5sd2GE/DYxoVh9pnIURlrVN0j+Qyrz8 +fAy5ZNOdyYVKODMasYMe5mK7n18tGHIR+B/woZUBn7w +-> ssh-ed25519 d5QLRA UABSpUQX7LUBLuOn+L/JbSPV5ZO4oe+oRF5MrN/H+S4 +JS3/dajBXWItF5+/+lPhZSlKYAP17LfNL9bDvnUdCzk +-> ssh-ed25519 nrny8w CHZXrOvndAEREXZ3UmZzHSm/RBbcKbm/7Sx/ihCSE0M +BV9TQk1Ic+VNXbyVGksFwwGmU9BfKd2v17bdn0k/CMg +-> ssh-ed25519 c7E/gQ 2aHba8skllPUJxxtJjIHM+YIe6L/mBAHjHk2ZqXW5Xk +PHDItbYyHMP9kPQc58rzX9egQXmXzf76AsU8mvZ9Xo4 +-> ssh-ed25519 IghKlQ IkKztyEqhfWIXDl7rm5tLeZIVH+3oJThFIHGf+JWSUw +pX5evcod1W4Q8+NK8ngFU582NKSX6m/32XC+348fz7o +-> ssh-ed25519 ShThzg osQCzMb5Vr1aXO7ONA19qMBZfIuy+64wFlrJd07v2Ew +DAi8wY9KPClTMS1wE2DMnqL/qrQmO+1lMeyydLQNHaQ +-> ssh-ed25519 1mX44w xa+N35Mee10ZaekIGPiGHODNPavqOL2XoLq0Ja3GT18 +v4pTP9zAocWHc01P++6U7yRUhPSN1/isPeEDP8ByCa8 +-> ssh-ed25519 t3ooSw oTTyTIhDX93YXI8/vWs69tzOG8Emkzem3XOxG86xeFY +TgOMDZg1DMr7QoNBqxR+xZRVQGSPLh2GGB8Kr/Do0E0 +-> ssh-ed25519 aWdXQA zEXm+Mp4tOKdfWmlJfOBXuDLf/FTi/+nqaz/YYP7R0s +qFULAMj0BdvWx1oouaQT2//G5yvmELnC3mwGeHMYBB0 +--- QO10IwByQqQOs9KXlWX/ecz7r3muphuFSNI5zjU8v1o +%@xH 1ޑ˪{ěF[mSԴ-d(~T \ No newline at end of file diff --git a/secrets/aly/syncthing/fallarbor/cert.age b/secrets/aly/syncthing/fallarbor/cert.age index 6ea266c3..731e1dab 100644 Binary files a/secrets/aly/syncthing/fallarbor/cert.age and b/secrets/aly/syncthing/fallarbor/cert.age differ diff --git a/secrets/aly/syncthing/fallarbor/key.age b/secrets/aly/syncthing/fallarbor/key.age index 0f657a95..ec11c78e 100644 Binary files a/secrets/aly/syncthing/fallarbor/key.age and b/secrets/aly/syncthing/fallarbor/key.age differ diff --git a/secrets/aly/syncthing/lavaridge/cert.age b/secrets/aly/syncthing/lavaridge/cert.age index 619248b9..7e2855d2 100644 Binary files a/secrets/aly/syncthing/lavaridge/cert.age and b/secrets/aly/syncthing/lavaridge/cert.age differ diff --git a/secrets/aly/syncthing/lavaridge/key.age b/secrets/aly/syncthing/lavaridge/key.age index b61b586f..af0d8be6 100644 Binary files a/secrets/aly/syncthing/lavaridge/key.age and b/secrets/aly/syncthing/lavaridge/key.age differ diff --git a/secrets/aly/syncthing/mauville/cert.age b/secrets/aly/syncthing/mauville/cert.age index 4d480499..dafb411d 100644 Binary files a/secrets/aly/syncthing/mauville/cert.age and b/secrets/aly/syncthing/mauville/cert.age differ diff --git a/secrets/aly/syncthing/mauville/key.age b/secrets/aly/syncthing/mauville/key.age index 83237c79..a95ff04d 100644 Binary files a/secrets/aly/syncthing/mauville/key.age and b/secrets/aly/syncthing/mauville/key.age differ diff --git a/secrets/aly/syncthing/pacifidlog/cert.age b/secrets/aly/syncthing/pacifidlog/cert.age new file mode 100644 index 00000000..b0a0669f Binary files /dev/null and b/secrets/aly/syncthing/pacifidlog/cert.age differ diff --git a/secrets/aly/syncthing/pacifidlog/key.age b/secrets/aly/syncthing/pacifidlog/key.age new file mode 100644 index 00000000..3642794c Binary files /dev/null and b/secrets/aly/syncthing/pacifidlog/key.age differ diff --git a/secrets/aly/syncthing/petalburg/cert.age b/secrets/aly/syncthing/petalburg/cert.age index 61622a43..f23a28dd 100644 Binary files a/secrets/aly/syncthing/petalburg/cert.age and b/secrets/aly/syncthing/petalburg/cert.age differ diff --git a/secrets/aly/syncthing/petalburg/key.age b/secrets/aly/syncthing/petalburg/key.age index b4617ec0..449c1150 100644 Binary files a/secrets/aly/syncthing/petalburg/key.age and b/secrets/aly/syncthing/petalburg/key.age differ diff --git a/secrets/aly/syncthing/rustboro/cert.age b/secrets/aly/syncthing/rustboro/cert.age index e91680a6..b23fb511 100644 Binary files a/secrets/aly/syncthing/rustboro/cert.age and b/secrets/aly/syncthing/rustboro/cert.age differ diff --git a/secrets/aly/syncthing/rustboro/key.age b/secrets/aly/syncthing/rustboro/key.age index 2faf7f5a..1d293a11 100644 Binary files a/secrets/aly/syncthing/rustboro/key.age and b/secrets/aly/syncthing/rustboro/key.age differ diff --git a/secrets/aly/syncthing/slateport/cert.age b/secrets/aly/syncthing/slateport/cert.age index 0a196434..89603f5b 100644 Binary files a/secrets/aly/syncthing/slateport/cert.age and b/secrets/aly/syncthing/slateport/cert.age differ diff --git a/secrets/aly/syncthing/slateport/key.age b/secrets/aly/syncthing/slateport/key.age index 50e5912d..715339ae 100644 Binary files a/secrets/aly/syncthing/slateport/key.age and b/secrets/aly/syncthing/slateport/key.age differ diff --git a/secrets/aly/transmissionRemote.age b/secrets/aly/transmissionRemote.age index 3a7f7b71..d082786a 100644 Binary files a/secrets/aly/transmissionRemote.age and b/secrets/aly/transmissionRemote.age differ diff --git a/secrets/cloudflare.age b/secrets/cloudflare.age index 5e065c7c..2276e2b4 100644 Binary files a/secrets/cloudflare.age and b/secrets/cloudflare.age differ diff --git a/secrets/homepage.age b/secrets/homepage.age index de3db563..547007cf 100644 Binary files a/secrets/homepage.age and b/secrets/homepage.age differ diff --git a/secrets/k3s.age b/secrets/k3s.age index 14eb29c7..4ed6d775 100644 Binary files a/secrets/k3s.age and b/secrets/k3s.age differ diff --git a/secrets/lastFM/apiKey.age b/secrets/lastFM/apiKey.age index c939e50a..b9e49a0e 100644 --- a/secrets/lastFM/apiKey.age +++ b/secrets/lastFM/apiKey.age @@ -1,27 +1,31 @@ age-encryption.org/v1 --> ssh-ed25519 xIeYNQ CKuLCea+cFpq7x87zgi7kd4EcUFZ/HfBFgyJ82wQwig -5oFnMBFiptm+EhcPifzel236JJepQYv1pYFUq28TzY0 --> ssh-ed25519 g+apXg igdhyjEhOFE9pUjaCKcHiePv1bljkQmy/qMzRkPOuVU -fxX9cpMR3j49cz7T+PqXgMcCael6TfE3kyNpZ1HMc5w --> ssh-ed25519 xZaw4A 8LmsYKzK6tHAc+a1Pai7bxwFZwIn5dDAzMuhJct76yo -mpU08WbmwQsnAguCmLdEqAx8pMAvGqtbXcVDi2SoBng --> ssh-ed25519 GrlIbA 0MNp+4wSHMPysPuma6PoKGOW4Nd+7qNUjPFSeQMHKgA -SIW0dtZcKLay7l2jPVVrCtOidKznnNEMGNsFfuOdH2M --> ssh-ed25519 1GkM5g sULXpcBZ/pnGPlxQsRa3kPg/JIydqW0rVVbePHuZWjQ -HzQ/elqH31e6DXW6DuXuthHS/IHYRyNOt2JFSeHFzFA --> ssh-ed25519 d5QLRA 0m0n7gy8QU5va6q8gqyZ+cpfqO1eAp9m2M6c2Mer0n8 -ygh/P4jddbO5wZMd9ffQR4eq7xn+TLVj4Qxya2npfis --> ssh-ed25519 nrny8w MOo3n6xn+rsV0xMiVepKV7I2En2zm3Un/iVUYFQVly4 -Se+bt1qQ8ZjpQ3g4m/Xcx9hh6KCv5BUBG7ZqeRfve7o --> ssh-ed25519 c7E/gQ Aoe8EFh035Hz848xQsd3Sd+IzkFpM7l0C6pyN2/mjhQ -JE/Nl1CnYS/kQk9XI4rA26STHQ7OmcjoL1AUt3gnSQo --> ssh-ed25519 IghKlQ 6sWF08AgM960SUDFtzCIuW2pHAGs0klMHUzW8WCiYEQ -ALfHcGDQHditJWM5QoIdxZXOTXk1cpVqiaebyhkId7Q --> ssh-ed25519 1mX44w hbx0xO7alO2WULwzNib4TIP29uRdzKV/Sxa8wfpS3kw -vguNnW/BdT5Lf1YyX4P3JISp9TL5TaZ0VwkRCw+LJeU --> ssh-ed25519 t3ooSw eakkRFHfXBvvU48zNnQZIwL0sdeoGR49y3vL7wa5Ngw -JcC70CdSS7MiRUuiaLaFIS/nMmnaz7Me1hOZHQkIHvs --> ssh-ed25519 aWdXQA XkO9zPOGRyHzEJl2lyWhjGDgJ9B3WKrNOCw85oXIDko -HSJ7D0G3zr1++TBaOPndlwoTNNlW9PEJlAENTlv/rrU ---- Im+qp3l05JG9bzjj27amVNC7GAvrf2H9SNIt18+k7n8 -ֆNGf{*ĺYG>g'VOh|ܨQERh h8 \ No newline at end of file +-> ssh-ed25519 xIeYNQ Rduh/FETJHCY5sHhaYWOgnyYgH/9xygiFn3VjI+BXnM +Kttonv1W10An4dGENViJG9SGx3HHG9+VydyAQ+qUGjc +-> ssh-ed25519 g+apXg CWJOOxhNfPZSIpngcuub52rxjB23KQrKLPii0PiqGWU +UWMz2a+I8uzGwYUAz+4kirrem6UShqDV/WjKpU1Rf/4 +-> ssh-ed25519 xZaw4A VAxgd8RKs7g2/Xxdv9ziykOZo7G690tXadNKpkDjZxo +Y0h6lem4zLknjrDKArcu9mugFrxxQgNPvcds3DCoxNA +-> ssh-ed25519 qRKpEg Z2EiZIjzWuJx/AwiBpQCaOQUsPWNeJ/6t0N2TYHKeEg +0TevPvVhOnleTgdL2gtHeTnfPL0eyhs0L0xfAFwkGOg +-> ssh-ed25519 GrlIbA 2a6dKB9oIxpofdLdZKFir8iCHGwlb/qATiU81eGGj38 +E+eXOYUPVw1FVnHSjSAzaF5C5jYlupz5liF9Oisnlcw +-> ssh-ed25519 1GkM5g 6s3AoZxk2WMllydFkp7FKR0ns0kaHfoJM+i5lR/RxU8 +KgpQuCSRpQp140b92P3xdusg2BSvH+fQOGnqqO9etuI +-> ssh-ed25519 d5QLRA iJSy8IIVYyqEEoGmvQoVIopjQCHjwGmAocT6IULOkmU +WfkobOS0WLQ2eE91uE51QIEJfYvVtUuN9ntBCdhpW/g +-> ssh-ed25519 nrny8w kVczW8a9AuTE35CqzZRhIW/N4C9UaxQsZRFGwojJvTs +rU6AwmrN1K5hMpab+ilhoZNytPYaCKAlnmZMWp3vTVM +-> ssh-ed25519 c7E/gQ p0AC63OAQ3meiQPXR5ZoeUgagIgXNdTEXaE2NiLaoG0 +NrISIAuC0waHZhZZYgT2ESnMdhs+BaRNEREmF5q6a/8 +-> ssh-ed25519 IghKlQ Dm4QXhoJ1uuN5Fm0NZ55iuYWdHCB7zG3uWEiHzTSgiI +vXQFrZWW7UaBEKIwQXD57TyYWhbuN7XSX1awTcbxUoM +-> ssh-ed25519 ShThzg bfdRmmFNwC6opIdvbCIdGVSborbq1HtClY8NONRlOT0 +6Xr047hDwuCc9+BF8kV1UdiTjgET0dbRby2i1rAnN6s +-> ssh-ed25519 1mX44w aKEmVPNVAFCfJthJFGZyeSJpVkLBSJn9VU4Sz8KToB0 +7fut6tPQTrIVmkEpk9rnNA1GO3aaoVb8Uq6ofJ5PX4A +-> ssh-ed25519 t3ooSw sBidvisXGzyQKuFBHdV5woiubEugebpUwFOevWny2iY +/iSNs1PQrqdjhgofh3aIwTyCSFlMT/SqO55NnV9G0Xg +-> ssh-ed25519 aWdXQA /DwhlOkJ1YencPHVNkjKe2rsUSo0KGjL445PjC9fNyI +mnK7BOtSs2VKmDeN1ZRrzoNaPiH7klASKbyz77MelAc +--- NYtJjMH1CEG/H2y0fn3G+FZo5ch2lr3Pex94uDq9qMk +`Mr']t]->/O=ID̨̓qVͭXο \ No newline at end of file diff --git a/secrets/lastFM/secret.age b/secrets/lastFM/secret.age index 01b34521..1af2a891 100644 --- a/secrets/lastFM/secret.age +++ b/secrets/lastFM/secret.age @@ -1,27 +1,31 @@ age-encryption.org/v1 --> ssh-ed25519 xIeYNQ HAOMbpeJFYTMud0jmrrw9FsUIXisG8ouLDcRf5+cV2I -TpsknfnL2oVsMp6G8HbhcOhW56ZxPryhysNcj93x60A --> ssh-ed25519 g+apXg RPeXzsWySgXaOl28cdBuS0iGV/Bw/LDlSoLwBpCBsVc -ISBLxX8aUAWEpBEv+Z/LycypUnF1LlN0H0TuorHU44U --> ssh-ed25519 xZaw4A rgcDREVApUHQLk6IyBuu1jVH1zhJDSkc9JpKXbOWLhQ -mJw5Ne0SjWHziMy7WrcgIQ+lT9FCnk4FLlwVBAZ5+ew --> ssh-ed25519 GrlIbA ZbD90Rb62vFvQJuQdQxI9cJ+wdEd44S0fFm+3OsUeyE -4dr+du+PGAGPLMwk6B5qjqeX6/NIXohdrcT7BEs2eW4 --> ssh-ed25519 1GkM5g gjm5s9HAe6LqA2UlEejTjHqyLmVGEg3WiNQwOhnZcDk -k2AOoWuA3Sp4I4F5fEYJO/WXhHaFLAqeXWGYt6hd4qQ --> ssh-ed25519 d5QLRA DRfBFH9AHGn6MFDBL+1g6YVcY+4uPjq8y0swOatYtnQ -GLKMLROJZS4qmjpG58IRP9CDYTzwHu/vaIOO5o2LxMc --> ssh-ed25519 nrny8w JT3N366ss2r0zO2GJUv2BKv82Vj9S3K8zK3Ptm+g0HE -3PDW12DvDve4MA6XHmgtmIJKXvxgssDnW2RPAs5doh4 --> ssh-ed25519 c7E/gQ DerESEbPfJSy1es4ehPyWSe3Kt3TM2LghNyCr5ujlkY -6guZApY6xy8aoQseihP6lGkCas1Q/TWYAYaUzs39IRI --> ssh-ed25519 IghKlQ 7DBcD+bWlobFGUITwNFiDLsppyZw3+dFNv4hIjHq3Ho -V6gBCp1qbE5N4dqIkEFam33eFCRM6gTy+HUjYrZjWMw --> ssh-ed25519 1mX44w lhlm9IaLy2TV8MkXMJh9IxOkAkzEfybxWQdPG//nc0w -LEwFHuVEIBva1g1MqgpdQiWbp4px8FAyG3487uYuOV0 --> ssh-ed25519 t3ooSw 5auH/If+or20wQEyRD5WMckR4lK8MeevPCJiI+ex4XE -kN9hhHDxzTO7dcORG0k5yTXhSTvtQ9VgtWxseFQl/I4 --> ssh-ed25519 aWdXQA 7b6dK3iSOQSvc4SsThpwWhGSw367t/bnbuUfWd6q1Xc -ApeSftJ5qRyI126qn1hKhQIQJfCa1FXtii9WBgOYtLw ---- Lp5bj73fCIM2fRtgIP5AdjKdNyZH4MDOuJkTE271qkE -JBr_G?v1D@VsBHȝc}s:NRDW  \ No newline at end of file +-> ssh-ed25519 xIeYNQ duA/by8ixH3CxYDvO83qW7YSKNLeHja/UrPObOeVq0o +bXDtalypHjclQJ22cA2Y1henp8UJtx++cjxyf21IQek +-> ssh-ed25519 g+apXg gmz/XRWCLUnQaRWqDhIGOtAy786d6vbXWvGjHYFu8zk +6DfdK6hLx8nR89xjwLaPuNKfj6mnNueuyVG5RiEOgkw +-> ssh-ed25519 xZaw4A rxmxYnH8XSSDBW++eQ7tZYoIrN+Q+dXY25i6Sb2tuHg +Ft3m2jSCdjsB/U9qPW2kx51l64cNndbrmrivft3Ecs0 +-> ssh-ed25519 qRKpEg NoFx1akm37pA4/JOF5NwOygr9NmxWPfs6GGEGqYXnkA +qRhvvlJRJ4dlctkbbATfUBvvm8+atLux+tnR7gypM28 +-> ssh-ed25519 GrlIbA r/TD0/wx/jNc0hqXmNAO77wMTVbOR6vessnXUumyK2Q +jNBMgy3j7aoNzYNRaO2ykcwdBR3pRPp5Gia1CAcwVTw +-> ssh-ed25519 1GkM5g On55fmnaoFx523UmPXiltVnCC70Mfa5J63d1TG4quUA +F7jhY5XoJYPYmZi/FsZvb0Z380MFfxzV5/J7NvOj0bs +-> ssh-ed25519 d5QLRA PVfpeDvJoaVhu8CF8lOs9ywtiAR3iZsGGovLjgbMVWc +QtxMmaKhPWpaOdOu8rQ+Dz5Jlq9WDqgbBCHpj5wz00U +-> ssh-ed25519 nrny8w A30WxLWxZBlyDftdUpR7e0JfaBgNDOIH8AgE8+5XllI +gYVx4+dYlmgodLfC48FKtupFuVdl4WqR/kFNmYiqCeE +-> ssh-ed25519 c7E/gQ wJAxF+RVwm8IbuaaUKEqbgCVSMUE5Q2LmSzrfQexcCE +WXLc3Fj1tqgaUsRRImIVjbBebWXWWNy96tp5lxukT5E +-> ssh-ed25519 IghKlQ DOtONWbpqlaXdH75qt8Vp8+u/4+OGZGccwR2TKyzKRk +CFbAiJU22sG6EEnGiXCN9Qagny67IwEoOKjJ2CrZxe8 +-> ssh-ed25519 ShThzg Pa/u2pM/4YkrbpfOzfU2K39/1/AvQ4UXU34KPcAt9Xw +9vNcSZHbM/pp0NcNNvUCwj8QLx0zcv+G91xHoKFNs+4 +-> ssh-ed25519 1mX44w 8szQJqk+rk0aTPLjNqPybc8TUf85LaSyHsw30HgaX0E +j0V8f9tfwmFLMysedBk06QKJpiQGY9h2+Sh15Qz2QZ0 +-> ssh-ed25519 t3ooSw R/dVNGeQO51xYCeemb1XhL7XSWvAALNqYp2SgGxXclo +OUZXzf2kzfP2ELqmJV45t0KVoq0ToO7sD7VwhHB+8EQ +-> ssh-ed25519 aWdXQA kYrNtrB4vaRzxUk5zlOia8Ofl9yBIzin1QGCWdHRmCA +/veoeW1VBBraRdCbkg3OS7N01oCvRAKgtmy4OD08IDk +--- p6AzADx+znDhkB08cJEJtYV35hPikX31utSgxMfmJIk +鋬FFCDg5xIB2$ ɵ~ >s4o nܷIVX \ No newline at end of file diff --git a/secrets/publicKeys/aly_pacifidlog.pub b/secrets/publicKeys/aly_pacifidlog.pub new file mode 100644 index 00000000..f398b569 --- /dev/null +++ b/secrets/publicKeys/aly_pacifidlog.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJtnQmWW2nijquHLEtj3wlfdxaJQnISSVJyDwP+7eF2B aly@pacifidlog \ No newline at end of file diff --git a/secrets/publicKeys/root_pacifidlog.pub b/secrets/publicKeys/root_pacifidlog.pub new file mode 100644 index 00000000..5abba9be --- /dev/null +++ b/secrets/publicKeys/root_pacifidlog.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPjnbYTjL+RvpDdweij7tvHXO/jjKkoswKyZIUEefGyh root@pacifidlog \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 2bc697f3..a0f2e7a6 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -3,6 +3,7 @@ let "fallarbor" "lavaridge" "mauville" + "pacifidlog" "petalburg" "rustboro" "slateport" @@ -11,6 +12,7 @@ let "aly_fallarbor" "aly_lavaridge" "aly_mauville" + "aly_pacifidlog" "aly_petalburg" "aly_rustboro" "aly_slateport" @@ -29,6 +31,8 @@ in { "aly/syncthing/lavaridge/key.age".publicKeys = keys; "aly/syncthing/mauville/cert.age".publicKeys = keys; "aly/syncthing/mauville/key.age".publicKeys = keys; + "aly/syncthing/pacifidlog/cert.age".publicKeys = keys; + "aly/syncthing/pacifidlog/key.age".publicKeys = keys; "aly/syncthing/petalburg/cert.age".publicKeys = keys; "aly/syncthing/petalburg/key.age".publicKeys = keys; "aly/syncthing/rustboro/cert.age".publicKeys = keys; diff --git a/secrets/spotify/clientId.age b/secrets/spotify/clientId.age index e563faf9..205a7c36 100644 --- a/secrets/spotify/clientId.age +++ b/secrets/spotify/clientId.age @@ -1,29 +1,31 @@ age-encryption.org/v1 --> ssh-ed25519 xIeYNQ DLXTuEUaG/Hk8CY+m4WMSCiNuTBdyTjRWJo9otT0/lA -YSmacmuzgzdWeBgEjs6mDC1PD4wyyA4pJPewJZ8U+Zk --> ssh-ed25519 g+apXg 63i5Nh1WgDhEXersJjyEPwLbrSy+NlIsl2Qin5+AW2o -Y2AVFCRcs1Z0sK7RFHkRqp31As1Woaib09uphJXNNC8 --> ssh-ed25519 xZaw4A BjVjr/9QLgnhUe7pW4SjZBeUTHJaekPy/cjlgXS8XHs -IIMN+RmEhJv5l3Msuj4KfJBod8zkqiN6VNdVKMa0GqA --> ssh-ed25519 GrlIbA 2Aycfxkt3LhOmZkrBemZ/FWfFJH47czGO6Nj3wf8iCk -MMTEqeSU/wXtmbGR5p2XysdVfS1cF1HmGIvC/5BoEzU --> ssh-ed25519 1GkM5g 1c3eZUOv0dM72+ykavV3oaBum5j4kmFtKoXjWaX2wjw -ZVVze2cVGFNcDl6yYbOtrQt+jV2wMN88W52Glsiycg0 --> ssh-ed25519 d5QLRA AAjedyuS3VgtezdUSZcRlI//axbgr4b2EZMn7uX95Bc -GeQJO3Eb4e51cktRLyNZnNas+O2dhOW6YI/6K9wj59o --> ssh-ed25519 nrny8w EfL8blEJLOGwI1vR2Ef6mbiAtnEd+RbdvloTsexbwH0 -kOiMPlcRroIqcYe+6IaOtSsQV+I3qRSTe+S7GxplIxc --> ssh-ed25519 c7E/gQ kkEd77CboZIbiBYTj2C8aLytWXGS8saqaHfejTxleQ0 -Bow6vl7Hqux9ZwBH8uPLyIVnh74jJ4U1blgwJ61/xYw --> ssh-ed25519 IghKlQ BV2BytHmwk2c3yBGDUrM9hp1G9tBk7NTO1e60xrAOFE -p1NFdE3TxVmR79ipf/yvla2EPwEZlfA+yRnEKO06wVc --> ssh-ed25519 1mX44w 2HJKrguDtoS6t3g6DA9iE5t2qVmrzqogLm9FEI/wsT4 -/WXUqrpmUAUaGoFI35/5l/JwhQ+U+73xdRuueEsVnAM --> ssh-ed25519 t3ooSw 3Fg6l+OjwGUrTsXXZJnr8g4ALRzLp70AClk3SyjkujY -Kh6lAV1+uoYpcNvIkPE4HjSDvgsldBZl5TT/E4EYzVc --> ssh-ed25519 aWdXQA e4Q9sqzRfVhoDpP27wQfF6FuiK/vnD8HesVI8KQ7ERc -aJebJrp4dchwcjoqM3n7TtflUiUgWtT/e5+gcUGEOEU ---- aRHLSpxEESuG12HdRSigr5lUgKTZKQbiplmKXjPkmoY -G!Mא -\C`P-'Ǵg7{j$Dj -*caV?`]r \ No newline at end of file +-> ssh-ed25519 xIeYNQ 8V3cHyJy4EVqIQEOQ4ojmYhj47UIk4EhvrK7W0sgQAE +1SfRR0LPm2a4H+DyL5P/DQKIGw2q8wpr5P4vzJr7QNg +-> ssh-ed25519 g+apXg M5w5q8WLYVr2DDa/mehArNlffqeiJF3jDWoDL+HVuE8 +OqQBrqMYz1Py5nxAcWJoqfQaSB6N7jH/5fFsR1nS3p4 +-> ssh-ed25519 xZaw4A BvmpB1A3C8pIG01+KblMKQDlpVk3o9/NSuVlUFkS62o +TZ2IcJBM0s3TgsV1yRXqkWNmjVK4tL9FCEmwZkpDwIw +-> ssh-ed25519 qRKpEg lTcx+R8DFvSgaiwoKyfz+0Ir01QTZ2liloBSWCGgpHs +nEUEq2USFfn0PTThFczF9ixVporSOVt0zpAak9zhNw8 +-> ssh-ed25519 GrlIbA lGJEHd/QwePBnNGUp5HN720SwlzXAkhHZK1dqJ+xACw +bvHnVqv5JWn5UkoFC5B6OOtFDqoyJok3dqqa1MvAVxs +-> ssh-ed25519 1GkM5g m/HKHWrJIjRz9YDFIlGKmUpXdKoTx65meehM+imK7AM +NDv0qGDTMANSFRcCwFBEU4cN9FGhEWkLaPlKrG8YuHQ +-> ssh-ed25519 d5QLRA xRD6ajYe8TTI+vISLIU9GO0mN4ZGy4Ls+JgB2+SqXjU +snfmxe3KceDG0NEzuU7Tq+iV2DjQg3Kj5sSu+zqUH1E +-> ssh-ed25519 nrny8w E0WT+N8nlDbyEYyIEYbQ1szD+msfmkxc7ShGYbGWiCI +tT/rCZcfHEHUb4mhLm9MqNWBqWSsvicpzdjyTNXqv24 +-> ssh-ed25519 c7E/gQ J6WGJySFpuSYSX2EumhHD+bFWFXJ/+5MP0w3pasaKA8 +CRxEcqrM7rpwlw6kObLuR1R3kg42NdVsGhDHAlQG/ig +-> ssh-ed25519 IghKlQ u/HW2JP+ne3GY1RnatlfwkGnLR/Qc//w2c6nJ0zJUHE +xZD7Iq16xXx1eRApCGaxeGRvrNlTB00tqljDT3TiHSw +-> ssh-ed25519 ShThzg dQV/bc2LakHgDIMuJZUt4Vhz5f//oRmLyXa0IF9io1Q +b1pMQ2c+ZArirrUOxN9Um+bSeioZi2Xp/W8SnEmFyR8 +-> ssh-ed25519 1mX44w 1/0EYc3893hdRmL9gmuM0xV2Xo9if4t7LyKke4WziQI +aK4Fj3gnZpLSapEs1XNP4Bt+Spuxx9iKvl2giNFBEe8 +-> ssh-ed25519 t3ooSw Dl2/4u1ccqRP11+6e+nUXs0Ly0tLjd/zTWKQe87gfHw +9T+QY0zlAWyM5Axk24b8uYMUOVP/Ty60a8mF05LiNv8 +-> ssh-ed25519 aWdXQA Qt6GnCxXFd51akMYzW3gUyUB+3hpZcsPB9QOifOTQCY +2mCb5i4FF2963Yashcm2YCPZKmAXkp1dovMTVHKpMyo +--- g3KK/+8kbByG0bAtCr5d8D56h5Hx41/dYHTvdv3yHGI +v4 ssh-ed25519 xIeYNQ oj3KrZ+UGqEvtWcXP0YfQXuzLN1H9TAoDVIXSUZxTnk -ZfFB+fFDbxfm4njKCL47R8BHFRNx0XbJwrJHLG25KnI --> ssh-ed25519 g+apXg szTxJ8Vcty7VWoxur/vIg9C1TKdKrrOFiO829WoTngU -n85mWz+DKBj5m7QuTv2OlyJmLcvb5pw/+T5PoKhjhMM --> ssh-ed25519 xZaw4A ISwjQ48f1qyp0+HI7xj1GiMVBruJQYhGSsPa7tS/jQY -zw0t/RTLJU+oEm22aAJtmh4u5kHhGmZOYpfyt6DCkIQ --> ssh-ed25519 GrlIbA P6v/eHk9rcDRECaf2xZQdYEm+fMQpyM3qGqn+0LOY1U -sNrmaobDfEHlSQoNalUTgmmlY06s1e/LEKkzxBP6PZw --> ssh-ed25519 1GkM5g PpC9TosuGLFjxS6schUZoezt+zsHfQTzHMRY4pjpKg0 -5Ueruul0Gy/aumFxq0+yMpgROCCD+eQI+pxX4SHUe2k --> ssh-ed25519 d5QLRA 1CJ0dljTIg0F7St2S4tAV+0e3U/o76M435JI67dwexU -jFOktlN9ZkHSUd6MLXFzhhDwnlQ8bODlwRw/RkD2ZSg --> ssh-ed25519 nrny8w ecrVZEVoHOvJbzM5PTMCiUUxgrE6U6pu++pjRNLcDR8 -03XCfl02Dua3HU5dL4TURLqmXNq0k/23GUh94bdeU/g --> ssh-ed25519 c7E/gQ 4CAqakAg25f6pGde9yJ4VczrNYdFP+uio8JJ1krjgDY -Ch/gvyu7FZ+UJnjYcMWRe2Bqrxmso/XNJdVM3aLFVSc --> ssh-ed25519 IghKlQ VK4AWuSJb1lNdES/u4y0IuZhu6oyF4BZ5AJDJR/R1C4 -mPVjNkhkxZCEgcM9/+zKQTg9acxqBnmMQNX5k/mc334 --> ssh-ed25519 1mX44w MCidgF4pc389nz+Q4rcwi7qifVU9XnMyvm4tgRqFinw -fgOZZrCgowIe44LcYt8Msw7syqEnM71i17KyPAmgvK0 --> ssh-ed25519 t3ooSw RcncILQAdymCiIh058cjku4iusFg0xChz617lm1oqUM -4IdLMBm3AUv8Y75LHUBdISld3M22yGdV168EUybtYH4 --> ssh-ed25519 aWdXQA AmMd91q8q99IpydwRVo2dCEj5LW1zD3G5dde1DiuyFU -ePoHHGl7mrr1KmUYY63x60lAYP2txUgOoEr1VmPvu2M ---- XGhTp5mSDBSDLsGHLEDPhpsmZhW2c3PFE+EBx03fMtI -Zi9TM41`{o$J/~W8f oԘԓt"@M1 \ No newline at end of file +-> ssh-ed25519 xIeYNQ NoSi3IcUXv14iuk3rSV8DwqzDjKqj7kyztK8Ym5hUD0 +EkXAQNoi/PtSKC1mTpKvvmbKagU3A1sL5prlIBRUpPA +-> ssh-ed25519 g+apXg z9zUV8AwYcHPGU7WKXVfsZF7nzbiE7S0cr6NSJvvhEM +/6FS/o3lLXqHlweceO8z3WASBV++gv/skaKlGXFCeNo +-> ssh-ed25519 xZaw4A 67tu7XOQBvrkyXrQ1tK95oQ5ySbalA6k4+v51uB3qBA +JR6IvCGSbzHlpBaZP+mcp7Vxo+L82gEXX36jd15NQQ4 +-> ssh-ed25519 qRKpEg nC/fmk6Vj5eb2zIhkYevXcRiJAk7oZn5SC0Xior5nHk +rrCTI76wRyVKoWiAtIW2P2KBvLSGVgpXTEm1fseIfzI +-> ssh-ed25519 GrlIbA IztVlFSc6YhRCuh7I2dH8+SFfb+345XnaeryQMkGJyc +Svl2y0mkfrvZLpj3CbIso+0JOXDRSAJq+JhmSe/rvZQ +-> ssh-ed25519 1GkM5g 052aAqBZAeSdLLA4tBYyvGUaTaw95jxy01s0HZlwIUA +J2b8gVrnvj5NEs4UIeh3UtYRcw9Z0lH2PSPGSZqnnOQ +-> ssh-ed25519 d5QLRA TB2jQ6rKBK6Wt0yNWmioxxbmyGNNGa4tI3y2WI7O7ik ++fgymOesDUMHvNxsKZjzgRjufFjkUYM2QpviD8Qctqs +-> ssh-ed25519 nrny8w Xdo+cLrfgW82smiGKEVZ1H6QIy4I7Fsmn9ESVFkogHQ +J2J3uth9K3qiOij828KoPHyBPiQhT0qop+LajaMNHls +-> ssh-ed25519 c7E/gQ b+2g596Nej8bRxwEi6Hjhk9OZcqV15FO6hgAa6scCx4 +fQUy3IgyKZL7E79NTypMjjUHFG4rkl1QPols38JPH7E +-> ssh-ed25519 IghKlQ MHdt0223/0t2VychPS0HTQ3SdQDNUAr/ddrt9rCr4gU +B1CRDC1hTb5jXum574f6JbuuZqHhIUcJIaYsPxctkFQ +-> ssh-ed25519 ShThzg tPTJSClbTHxwNdAYqnzVhT6WNtk8L4RNDW/rxhTNsRU +Q9fnINSGdAUdq4NcVI+kWFSu68axZ4w4hUqTnqkkPXc +-> ssh-ed25519 1mX44w l6+3pYvE+Abh3dzvcipOqLKSZYAdv2LL6E2tzplrRXY +8S0Na0ZbVMqfoSCh169yZReJwEiuyTJyJFuxtRVcayM +-> ssh-ed25519 t3ooSw wv2JYvp7EycLGxlKdsOF53pMHe5RxfJEqfGXu8FKPko +mscR1hDtkdiYJz9ILyIxGRmIsYSVtb8GIhz4nBJFuXA +-> ssh-ed25519 aWdXQA nHmKw3gbE77opKvEmdxrTNn9HvGx6a6KEmsarGjN8Hk +orsYmxorW8L/4hbhaey+Kx75I9SezD+wVaX3pO8/lfk +--- asS+srlFGPWzi5KQg5GGsAs77JlCo3vnAd6yD0N7Eac +ɧ7)p6""<)T**f7=Ə<2fVmd%G*{#Ӄ \ No newline at end of file diff --git a/secrets/tailscale/authKeyFile.age b/secrets/tailscale/authKeyFile.age index e14674aa..0473a281 100644 --- a/secrets/tailscale/authKeyFile.age +++ b/secrets/tailscale/authKeyFile.age @@ -1,28 +1,31 @@ age-encryption.org/v1 --> ssh-ed25519 xIeYNQ BlkZ04hv8a2mcG3K5rfDdeOisAUTvWkGjwuZ8DFEBQU -5inc9zhip+QEPCJeSs9hbIxh8JkB3YMXhaWBPZnqJQ0 --> ssh-ed25519 g+apXg yfOoKmYVVhy9ldQTAuySpLgPP2SxeS/WoNh6z5SkqCI -spfN7zfKTPWCyOJP4SkLTS9wLvx8PUzGXdjQlpspHvI --> ssh-ed25519 xZaw4A ocwKguQJ/LPWBgrbBNE8IqLwxAMTbscZlkTPiRDl0SU -s7oTyv2VzGSIuJaPOF4Cbjxs9keQjypLx65B0VksZr0 --> ssh-ed25519 GrlIbA HBcGtVFOyAPtmA9HxQwiJKZzAXlvtgS/MBdlBd12zgU -kUkoaJp/070tiPWnCT4Dx9ZxmFC7m9FMc810u7GG/DI --> ssh-ed25519 1GkM5g qe9i+s9u7qNSbhm/inX3p5Es1TbVShVjBK01LovpIQs -S/yFdGMArpPWxZTGAeDoYOOY/9BCZjiZyrxHbgZyo7w --> ssh-ed25519 d5QLRA TSzFP7qN0xpKn18eYBx9RmKXgfp/JyyOPyL4pJpnyAE -RvdfFW9cIOntPyiliGpZURTHMDWa4F3fhTHZE5EJogM --> ssh-ed25519 nrny8w IuqWWB2FF2PS8auCpDzbR5sQGAmO9iAELYytc5y1Pzc -uGKqqbaRKY9bgyl4KrL3Cw1jGyojkEJGIf+X2jZloow --> ssh-ed25519 c7E/gQ 5E1vLioo1oN41w7uK2f2tKvlrhX0n8WxIfFafD1jUkA -OfyU3m/NbDGEm5Qc3UIS0d8O/IOIysHq1KBFlKp650c --> ssh-ed25519 IghKlQ z98a0JBWTn9H4fLUj+rKygt3diXY9S5kjmwJeTsaMFc -KV+re+o6j/8zzUN8a3WbrLgA+dDCw+TGsIZopP42JG0 --> ssh-ed25519 1mX44w iiV4Q9GNCohV1TrFINXqX0geIy/M86iJfz56tU4prDY -qgeamCWz8r7P2ksDxvDt93tv28ZH9nYDvct0POpOlzk --> ssh-ed25519 t3ooSw INW0CG1NigjlGvAlSLttQcRosyY5Y3wMnrwNgs4GFRI -xxjVoMg7hrVWVVpAMGg616o7JzuoQVGsrkTJSknVxLo --> ssh-ed25519 aWdXQA 7Hkg1Moowdtdz3Sk+Rp27kcj3j54FMmeJncpXYkCxjk -jZWbS6rbzsjd05tAkfjw8eY6NW0wCTtT2o4TWkcZ888 ---- UL0Qq4bSeQVBpGVn144zOfqIhmsZLTJRATb3ye14pZA -g}ѣ8+T?a;2'xBXyuѳAW>xU)}Ipd5 -oT}Zg2Q `XsrM ssh-ed25519 xIeYNQ Q2UYb1uy0zbzFCLxsuIgDLt5quaWLHiZBKN9eq0ern8 +PPBxzeE9XD4rf7NBw6Rd2RWGDAeC1w7Oqn2lVZnjGKo +-> ssh-ed25519 g+apXg 1PY6NFkSa925ctUCSOfiWG+ksMkTlJyhHVLMtvJzJg4 +q848PHw8809TJx3MHLdIC97a9JS4br5FrZz46V5EcIk +-> ssh-ed25519 xZaw4A SxcVMRIDbBqWTmAUxu8g49j0Q5ZxqhLvnPLqTAr96UQ +It/QjTa/gb3NrJsttb/GRx6s9rrFkq/vOAnjneP1HsY +-> ssh-ed25519 qRKpEg LbhT2U1VeGONovwHgHQBcPgEfojJIggX29UE1Vs+anE +t7FNBlbdEccA+BGBNTLRGylYTjNm1tPTUdVYXzK5OWM +-> ssh-ed25519 GrlIbA 6XENZhQ0xlGh7WCNkPliG6maOpdKICiT3YhvrAFSkhI +pTUG4MnbdUUuLJYH7nlw7XkJDji9MgLxOffWUe9dYm8 +-> ssh-ed25519 1GkM5g IQRIN/jLo9As/28AZXwmWiwFkkjvB92m6fZ8qwFPlSc +ZzJthnkuCjK/EDqH91SVa6W4BTIn/6G/emSgyGyjZMQ +-> ssh-ed25519 d5QLRA df0t/hktVb5892grW2hTzghYRiuUzak6BkA6bffiimk +oRiKAZzHO8aY/SQwatk/TrNzuwJcyiA9WLXUYfAAdRA +-> ssh-ed25519 nrny8w bPNvJDfmlpDNcscJo6y730LcwKAOTW+EN1bGKL3sgw8 +rSxHskwG+sZe+KAvJExjG3cqw9V62w++/qc81/28MDg +-> ssh-ed25519 c7E/gQ e3KhEeaSOLyF0kSR7lF15p0WYk3mbvaoKGjPlayKsQk +gjdW/tC2rIb7QTGaVfZkDUHI+PqnwrBwNGqaguJTvqQ +-> ssh-ed25519 IghKlQ TJYxY4EDluP27b73xLWPHV4SVjD33vnuMF3lBWv0Lgs +qMeIFaqXK06K3X5DkT7lSrDqDPc1aGYyqSgTqKt8UYA +-> ssh-ed25519 ShThzg k/uUnZyhSaRl5ulWoRgng5yr/DfhyiJxbsYdEI0LFXA +SLpWmVC13MtZrI/LfQSWZ9Ua5Or1Iz9KNH7ydLO/LQ0 +-> ssh-ed25519 1mX44w dGIN9lVJnUsC20zOQKGNo5KJZj+graZzDbXKUjSw324 +sRFQrpsqM/LBwckfqPrG6pAJFd1PH1ulSxtFicjis0c +-> ssh-ed25519 t3ooSw HBs6R7yikfJZfObI6VCQ7k02Vfc55Ypte+Xlv/1O5Tg +foBH7tr2x7pd92W6miHl7+JbET+qaDFi4k/He69+Go0 +-> ssh-ed25519 aWdXQA 9ztm69dxDttZeMgCneW9YaqCXHIdZDtofBKwl1Z4vQg +h8r/DKAVtoe+/M8A0lbmj8iAZH6CjbBXdclGXjpIew4 +--- ENgUEuaJOXxlIWdAK3G8OifGZnb4Lj0R72dubYDBgqA +vU~X7AFަU~!TIfr&Ba) 1iyrǵTd̨Zg7ycYY\6ي_< \ No newline at end of file diff --git a/secrets/transmission.age b/secrets/transmission.age index 4046e2ef..f34e8a63 100644 Binary files a/secrets/transmission.age and b/secrets/transmission.age differ diff --git a/secrets/wifi.age b/secrets/wifi.age index afbcb490..4b2a262e 100644 Binary files a/secrets/wifi.age and b/secrets/wifi.age differ diff --git a/userModules/aly/syncthing.nix b/userModules/aly/syncthing.nix index 463fcea2..55449728 100644 --- a/userModules/aly/syncthing.nix +++ b/userModules/aly/syncthing.nix @@ -29,8 +29,8 @@ in { "gsgmba" = {id = "V2YCZSL-XY7H72L-FGJFWP2-JNYX72O-OJ5V2HY-V4SSSJM-77A7E3Z-7EJFAAV";}; # Work Macbook Air "iphone12" = {id = "SBQNUXS-H4XDJ3E-RBHJPT5-45WDJJA-2U43M4P-23XGUJ7-E3CNNKZ-BXSGIA3";}; # iPhone 12 Pro Max "lavaridge" = {id = "TMMSCVA-MDJTDPC-PC47NUA-2VPLAIB-6S6MEU7-KALIGUJ-AWDUOUU-XD73MAY";}; # Framework 13 AMD - "mauville" = {id = "52MTCMC-PKEWSAU-HADMTZU-DY5EKFO-B323P7V-OBXLNTQ-EJY7F7Y-EUWFBQX";}; # Desktop/homelab b - "mossdeep" = {id = "3DODR5S-WU6DTH6-Y35QZX7-7OZEOGG-CYVGGCJ-TJ6AOZX-MFDSRCR-NM727A6";}; # Yoga Slim 7x + "mauville" = {id = "52MTCMC-PKEWSAU-HADMTZU-DY5EKFO-B323P7V-OBXLNTQ-EJY7F7Y-EUWFBQX";}; # Desktop/homelab + "pacifidlog" = {id = "6EBVXYI-HZW4LQI-T6L3TTI-DZEBXJM-RP3DW7N-BCAG6FC-G2654DN-XJFSLQD";}; # Lenovo Legion Go "petalburg" = {id = "ECTD3LW-YZTJIXX-HLQYXT7-UGZSGST-3DDKF72-DJPMDHE-SUYDWIT-ASTKTAE";}; # Yoga 9i "rustboro" = {id = "7CXGPQN-7DYDYJN-DKELOR3-RD4HZUW-SSUDGLZ-WVXYFUT-DPT2MGD-6PO5BQF";}; # Thinkpad t440p "slateport" = {id = "MDJFDUG-UJAXQXI-AMEF2AR-PBMD5QK-Z5ZG6AA-RCJCU3M-GZHQQEA-X2JGOAK";}; # homelab a @@ -43,7 +43,7 @@ in { "sync" = { id = "default"; path = "/home/aly/sync"; - devices = ["brawly" "fallarbor" "gsgmba" "iphone12" "lavaridge" "mauville" "mossdeep" "petalburg" "rustboro" "slateport" "wallace" "winona"]; + devices = ["brawly" "fallarbor" "gsgmba" "iphone12" "lavaridge" "mauville" "pacifidlog" "petalburg" "rustboro" "slateport" "wallace" "winona"]; versioning = { type = "staggered"; params = {