From e639338307626795ab177900244444b397ffd6b8 Mon Sep 17 00:00:00 2001 From: jolheiser Date: Tue, 26 Dec 2023 15:13:51 -0600 Subject: [PATCH] feat: masala Signed-off-by: jolheiser --- flake.lock | 43 ++++++++++++- flake.nix | 94 +++++++++++++++++------------ machines/masala/default.nix | 34 +++++++++++ secrets/secrets.nix | 11 ++-- secrets/shared/gist-pw.age | 28 +++++---- secrets/shared/git-send-email.age | Bin 756 -> 903 bytes secrets/shared/irc-pw.age | 27 +++++---- secrets/shared/spotify.age | Bin 860 -> 921 bytes secrets/shared/ssh-config-work.age | Bin 2622 -> 2771 bytes secrets/shared/ssh-config.age | Bin 1625 -> 1636 bytes secrets/work/cifs.age | Bin 485 -> 558 bytes secrets/work/netrc.age | 18 +++--- secrets/work/pip.conf.age | 20 +++--- secrets/work/pypirc.age | Bin 589 -> 765 bytes 14 files changed, 190 insertions(+), 85 deletions(-) create mode 100644 machines/masala/default.nix diff --git a/flake.lock b/flake.lock index 1e5670d..8d92749 100644 --- a/flake.lock +++ b/flake.lock @@ -22,6 +22,22 @@ "type": "github" } }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -356,7 +372,8 @@ "tclip": "tclip", "templ": "templ", "tmpl": "tmpl", - "website": "website" + "website": "website", + "wsl": "wsl" } }, "systems": { @@ -510,6 +527,30 @@ "url": "https://git.jojodev.com/jolheiser/jolheiser.com" } }, + "wsl": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": [ + "flake-utils" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1703521177, + "narHash": "sha256-V95s2ypDpdaFGbeG3pvazEE7qdjwZknoauv89DJQvz0=", + "owner": "nix-community", + "repo": "NixOS-WSL", + "rev": "ec53b11f0c78572a2b0b5263ae1c46293daaf55f", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "NixOS-WSL", + "type": "github" + } + }, "xc": { "inputs": { "flake-utils": "flake-utils_2", diff --git a/flake.nix b/flake.nix index b5b15ed..62328cf 100644 --- a/flake.nix +++ b/flake.nix @@ -85,6 +85,12 @@ url = "github:a-h/templ"; inputs.nixpkgs.follows = "nixpkgs"; }; + # WSL + wsl = { + url = "github:nix-community/NixOS-WSL"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.flake-utils.follows = "flake-utils"; + }; }; outputs = { @@ -92,6 +98,7 @@ home-manager, agenix, nixpkgs-py36, + wsl, ... } @ inputs: let overlays = [ @@ -148,49 +155,62 @@ }; }; }; + workModules = [ + home-manager.nixosModules.home-manager + agenix.nixosModules.default + (commonConfig {}) + ({pkgs, ...}: { + config = { + nixpkgs.overlays = [ + (_: _: { + py36 = import nixpkgs-py36 {inherit (pkgs) system;}; + }) + ]; + home-manager.users.${username}.programs = { + git.package = pkgs.gitSVN; + firefox.profiles.default.bookmarks = [(import ./apps/gui/firefox/work.nix)]; + }; + age.secrets = { + netrc = { + file = ./secrets/work/netrc.age; + owner = username; + path = "/home/${username}/.netrc"; + }; + pipconf = { + file = ./secrets/work/pip.conf.age; + owner = username; + path = "/home/${username}/.config/pip/pip.conf"; + }; + pypirc = { + file = ./secrets/work/pypirc.age; + owner = username; + path = "/home/${username}/.pypirc"; + }; + cifs = userSecret ./secrets/work/cifs.age; + }; + }; + }) + ]; username = "jolheiser"; in { nixosConfigurations = { "chai" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - modules = [ - home-manager.nixosModules.home-manager - agenix.nixosModules.default - ./machines/chai - (commonConfig {}) - ({pkgs, ...}: { - config = { - nixpkgs.overlays = [ - (_: _: { - py36 = import nixpkgs-py36 {inherit (pkgs) system;}; - }) - ]; - home-manager.users.${username}.programs = { - git.package = pkgs.gitSVN; - firefox.profiles.default.bookmarks = [(import ./apps/gui/firefox/work.nix)]; - }; - age.secrets = { - netrc = { - file = ./secrets/work/netrc.age; - owner = username; - path = "/home/${username}/.netrc"; - }; - pipconf = { - file = ./secrets/work/pip.conf.age; - owner = username; - path = "/home/${username}/.config/pip/pip.conf"; - }; - pypirc = { - file = ./secrets/work/pypirc.age; - owner = username; - path = "/home/${username}/.pypirc"; - }; - cifs = userSecret ./secrets/work/cifs.age; - }; - }; - }) - ]; + modules = + workModules + ++ [ + ./machines/chai + ]; + }; + "masala" = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + modules = + workModules + ++ [ + wsl.nixosModules.wsl + ./machines/masala + ]; }; "matcha" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; diff --git a/machines/masala/default.nix b/machines/masala/default.nix new file mode 100644 index 0000000..54e8526 --- /dev/null +++ b/machines/masala/default.nix @@ -0,0 +1,34 @@ +{pkgs, ...}: let + username = "jolheiser"; +in { + imports = [../common/gui]; + + networking.hostName = "masala"; + + wsl = { + enable = true; + defaultUser = username; + startMenuLaunchers = true; + }; + + users.users."${username}" = { + extraGroups = ["wheel" "docker"]; + isNormalUser = true; + }; + + services.openssh.enable = true; + + environment.systemPackages = with pkgs; [ + libxcrypt + py36.python36 + py36.python36Packages.virtualenv + py36.python36Packages.psycopg2 + py36.python36Packages.wheel + py36.python36Packages.setuptools + py36.python36Packages.pip + python3Packages.twine + subversion + ]; + + system.stateVersion = "23.11"; +} diff --git a/secrets/secrets.nix b/secrets/secrets.nix index cf1a436..b2fb11a 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -2,9 +2,10 @@ let jolheiser = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKrPUqk9v7FE7OgMDaOMdlnItiXSDkmS+eU94RzQFiMS nix"; matcha = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILZxjkZLj/9xvmg1enK+B7k8qf6Px0j4kTZ2caQfYmB1 root@matcha"; chai = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA7PS9SJ+OVrUku9dPUQZigioy+r3VlFHVntsa/F7AdM root@chai"; + masala = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH0bnlygiFqNwl0mHxcD+t78bTsn1NcHm6L2B4le4FtS root@nixos"; dragonwell = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN32Cwxer2AOGvEqSqXSPp49gj1VtR7G2XmPnmXj6o53 root@dragonwell"; - all = [jolheiser matcha chai dragonwell]; + all = [jolheiser matcha chai masala dragonwell]; in { "shared/ssh-config.age".publicKeys = all; "shared/ssh-config-work.age".publicKeys = all; @@ -12,8 +13,8 @@ in { "shared/irc-pw.age".publicKeys = all; "shared/gist-pw.age".publicKeys = all; "shared/git-send-email.age".publicKeys = all; - "work/netrc.age".publicKeys = [jolheiser chai]; - "work/pip.conf.age".publicKeys = [jolheiser chai]; - "work/pypirc.age".publicKeys = [jolheiser chai]; - "work/cifs.age".publicKeys = [jolheiser chai]; + "work/netrc.age".publicKeys = [jolheiser chai masala]; + "work/pip.conf.age".publicKeys = [jolheiser chai masala]; + "work/pypirc.age".publicKeys = [jolheiser chai masala]; + "work/cifs.age".publicKeys = [jolheiser chai masala]; } diff --git a/secrets/shared/gist-pw.age b/secrets/shared/gist-pw.age index 82a3a1d..50b30a7 100644 --- a/secrets/shared/gist-pw.age +++ b/secrets/shared/gist-pw.age @@ -1,13 +1,17 @@ age-encryption.org/v1 --> ssh-ed25519 E8j6/g r0iWFrtSeUT6qVFrQhLCba6rZfsaFynSC8Rb3EuGoFg -JzeAiUCWhojQa5mRvqT+SrR3VqSW2k4anUSv9/DBC2s --> ssh-ed25519 xUMv2w oCscH65NfnZyMvSwHXsK/TvgnpWNq5+7DjiYMrIL6xk -GdXBCV88GpOBfadA3w3CXuVf/U5Q2u3SgnEPesPBAgA --> ssh-ed25519 jo1MPA 37bTADVSe/ztBINGlXjDgTWMcchKycTP83MIvpIZNDc -TDJOpE9KrE3DrTD4OM5ikL8mU85WbvrsId3lRp507Yk --> ssh-ed25519 f31uNA sX0XTVf+92VqUA7Hdd6x6fxVqmWqHj1l9eOSE6yUlAU -hc1ZeagJ4w/jRKXtCHZxHcs0k+JafopzU3s4/Z44cuM --> C2|J-grease |je;R;d -V1hB5+X/bsklAn8HeRPukBNz5efwE0bT8pL9P58jWb0ZdkBXRpPXUacCjbm1njk ---- WpYUFBbDJptLs3YK9UBQfgfRngN7MFaTrmmWLMMKWxE -pbIWo, kZQ\P;neAC_64'p \ No newline at end of file +-> ssh-ed25519 E8j6/g MoQ+KiKt+A1JLrO7Xdo/EUY1/RXgT02IT5KdDIrBFnI +ivOpO8f87yAm1k/1FL3qhiaS5G/eW7jYV19Mz5QoEXc +-> ssh-ed25519 xUMv2w xht8LuQJaV0yhzvwbmYjUsgn3KdUqj8BtumeNRqrP10 +0WlxPmL1t8GqRMX+ll0nnDDPDDhEAOqkJFZKwwFYZ10 +-> ssh-ed25519 jo1MPA XPE2K3xYt5ECbDQP5T5VMTsGkIg9awvvLflpPSc522E +G4xPLpMYsOz+5au7BaNk1n5naS5SWaxFKYue6f0gHWA +-> ssh-ed25519 JBrabQ QFUSyS+N63P5XCJTbD32yfZ2GIh5J4A1YYL5T3CWDgg +i/+qf3N+/p/34jW4of+YaQzQZI/Glab91Gu540ePDI8 +-> ssh-ed25519 f31uNA eP9MiIZQs8j6/PocSCyRvNUFQXdPZetJPjrz4ReZbwA +cV/u5ijihDRgpOF9PaV5oxzkTpuo972S+ekPzPs4LT4 +-> vA-grease { +smNSOi0Et4PW98y+miaCzQtIJp4B+Z5mKMPKc4Vf8eU0q24RtCR8YryrVuxlF7WH +myDH7dBP3MGhltMuMpzi/9rQIYjmPol5BSjDjANVhrgj2E7hfPBw3DjcXKiSaZMW +YTOf +--- PcaNjf88InU5siJmdazbEPYDJd1YeTDVFkrYzZcsJgM +RQ){َŊ vZQ8#oRPYGw֋ h7 \ No newline at end of file diff --git a/secrets/shared/git-send-email.age b/secrets/shared/git-send-email.age index 7553e5dde02fcfa3943814d1b2af5a99555960a5..84c7d8d7dcfb7903872a85842d6f8bd43e984536 100644 GIT binary patch literal 903 zcmZ9_Nvqrh007{Ef;9FZJ!nORh)}5Mm`NtfL`6DF-b*I?GI=vY5t5lClVq~ItdjvR zqNN27J*byQtwr1p>P223r96A_Ae5@ulVC+`Ed^I-K}%im`o2H#nXcWiqiI?vxfe&z z#HkCH2+()|%(8jIo}oC7P$1p*3D^buIMxZv314(MMpsEBL`D?{S&A0#-Ihb4L@UsjB&tP7 zytE)Ja_SgK=*%izz%5Uun~Eb7Wr8xpHF;*RKpo@urn1qi%HblQP*0)-SgxndJmeg{ z+4OZEQsZbrKyzX5=EsO2cR+X6LA@ecwLPCjgZ`2ldq!x=?lecHQq2nF3K@!>9%Y9e zz=KWPI+28)n*ZvtaKw=%%KnfO@UW1(I&MBWN)c zFt+xjHnwhcMU$voGdH&qX_#56#`c>4t(zH}twLAQBf1)-WT%Xs1a7sNp+wOF&U2yJ zw57xqmA#wOLJF}1`Y9LTNmw9N7z8VVmWuAcR?7tzhz2V9Sj=@XXw0xF(gp^kXcs)P zN~GSr+s+BJT-lVjYN{J4?ijGb$%GcA5+c~x{~OwHQ`^jJ@NkVRpFJGB2*wOlg9U#S zq{c@!=log*NHHlAA~rYhF0Mv0CUmiwF-(QiG-v`XrK$ztv|5V`mxkkDGEdpmYUYHN z<@_{YXrR$(fR>OG`f3yz3ukRbiU^jB>X44PNiWIQbXF-^>zFX?PkM3;1m30RPrh@r zHT~uGLvP;QNnXm{d-U!j&wa3S<8SKPrFSpfJbUf&TW5auzx(9MmuJ4%|IwX8(Kht? zh4cDr$KF`)KS}K#-1pTh-TPRMJYSrCHI}|PV*m8pxluB@u|56v?cKAFefH_(Y501j zojY(5KCpAUH#^>*p4$J^t=)efc=+GTz>lY}`|pj7t$im?y#B{qAD=kgp!(lGF}nKT h_OYv@>%YtCJqY>h5Ht002;jpXB5&D##>WhNJ7+W=+y5bF@v;G)>>=M1yNAnPk2+Of1bSCJ*g9%8pP2c z-W#dpvP9Ih70!ywG;9|zvm6it1mXz2Rw_?M0oZ92R9~VYhQc8sPa$MRq7}ooJ$yPN zXll%XQOyt-nQEAT`#NabIk%jJVA$6O)`yrHK( zPm-wYMd}=y49hkbpe5RIL{HKzCJZg;O7f!~8P^5gq>>FB807TPh^}SDB3B&p=b%gh zDHZF6;42{|e~Hl)JQ8y$IEHbvAKETV5*5`O@^e)m6AsqJSlLG8I+Dqz`*awST3e)kBs^f^kqTz)4KS}M3yVbHR z*)n)DL1!Z#P?EaGBjGGK;WCEH-~a`sCJ}c(05hmoQ9Lkbh?rr-fdxxZ)RY@@Y(;`?5+XP!L%_MCI@ z@UXMBReLkdwwh7=Xy(De?T=?@W?kIrdQ3dO7CGoyp37}qTBx>rTT5%df1KK1-aU;d GZPZ`SH~`oH diff --git a/secrets/shared/irc-pw.age b/secrets/shared/irc-pw.age index 2ee514e..8bef121 100644 --- a/secrets/shared/irc-pw.age +++ b/secrets/shared/irc-pw.age @@ -1,13 +1,16 @@ age-encryption.org/v1 --> ssh-ed25519 E8j6/g L6JKvzM29Su9WrpTXYds709Im89Bn1mIb5XUNi/P6wk -R7OjLQqaqvffrwSB/K43IAGYYiLmO9y+0BFKv65Rc8w --> ssh-ed25519 xUMv2w A+XITd1k+ZbRENhYT7D+llj8s432GNHi5iCVGf5R+g4 -3gb8GpE721I1iOhzlo23T2lkIBZk93iPjGc3jByogLQ --> ssh-ed25519 jo1MPA obUysJUglKrJ/oEHCp6zKljoL3ihi+bENlqp45saCFs -Q2h23BFO7cNkp2XmDpoE03U86N83Jsryf6GNMzLy2EI --> ssh-ed25519 f31uNA xv/hgJrLtbX7qRBpkHs0fwa29xaozdywuLWeOsHZFyQ -PLgZwEqyiueLoLfppOMBhp0S+gwunPEB3j+VRNcML4o --> `T!`LPM5-grease -3Q ---- 9W+QAbKfdMBX119Hf8t1ZdNbQ8QUN1as6qL6eSvIh34 -\#!s6^ ɑ,1!h0giHQ؂{оV \ No newline at end of file +-> ssh-ed25519 E8j6/g d1zXFjUit7YPN55uV8l2k3CVDFcKIdKBlSAwmUHY+nw +Y+W5puz47ItyxU6eMYh/2C/s+Qs+CWfA+80tp14ZiZY +-> ssh-ed25519 xUMv2w /pGFstD9CQoIfQ++vK4xsacup4DmJLrAbJc8DhbPyG0 +BT9/wTt4UYUPQJL/ZJXNVBfAUUykiyXt2Pc2FQe9Dm4 +-> ssh-ed25519 jo1MPA +GG0hnR/eBw122D4dZvbMcsIfQitviv2UUv3I4yiYAs +KCsDTbnfxRyY8xXBtaEg9GHMF0eHrF9Ss5OgSSQWDq8 +-> ssh-ed25519 JBrabQ KGZMHVVEwuGMkEqa5wM4/cZo7A9lnbySp1Sn2bA3wi4 +NlPafvcnBfs1S0iDKqG0zAg7/grGI3VVkWOWhFF5iHQ +-> ssh-ed25519 f31uNA tEh1lMZ5BM/T1kuAJS3a9uirZ37atm+SRoDFHlOnKBA +ip6L5nl7gXVD7UqkwFVfUWpUM0htLnVmBHIFUtnK5K4 +-> Gh,!h[-grease Bqfg 5Mp&F< * +mxpybjNX +--- TyFKdTP94CXHZg3iL0zb+OdKWLB1FbPwMXaNEkzdAHM +<6anOQ^YPq2j +zFgc \ No newline at end of file diff --git a/secrets/shared/spotify.age b/secrets/shared/spotify.age index 1b760f021836e9cf922899c0cc05fd8bbee12f4c..8367be420aaa352e41d00088b765aba568ce5037 100644 GIT binary patch delta 852 zcmZY6?~l`D0KjoEc*fl+hTswO%`_PC#%$Ma>z4CQ*7kZ`x2}8EZe0(BtlQHcw{_jM zyLDTTy%52iF;NsFs4<7pLx_O{PZ3X#Xoyi0CB_%VAR2>r#zb?#5hNj^zV=V}e!l1X z4&MI!)}F~u)@(f-&vVUMhQY~N2ZJ&tL0!&(YLQ1|&%zW^lS8EK(;+B!v!QZ5tOG5F z-~uV39#;>rEg>bai~@y*TJHdb%p`olQNQaNL0G{ekx<;<&hstI^VhX5tTJG-$=B^- zx(FkLEhOMnR03=O&je!Ot`XAlR$v@->a5WLx~J76H6owz0ii3F0xVPI zC)Dw9)I_vYMzfek%B0X52g#Of%2>xV@D%uO3ZWxG-GL<+`n%Q+pD!2;`gO?FL^TsF zB7Dp&3)LQl$|c&?AVt$8h2=w#>^A;|w<-nR_xE)2^IL3UXlVVK!G#ZwKX+zHQ)#Uq%jjU*uN@Pi%RhU)iyL^Q?CDj&GHB_U>Gk z4ji7@J+IBp-v37OasHz7)w*$ZY5DS=E4X-DZ*ZlZKZ$_;hiA6mwfp7mU;cJrS8)YV z_Z?ZP9KQ8jO1xOsK22&wu_Z+{mVc^I4 zGw|1^WAEt~eja&iv^xLfX=Cw;V}Ee(ULdoN_C@AC`4gQfet7dK{>);uyb}KA{A-Vm Q@bS0B4Sg#gAN_jvAEjGD0ssI2 delta 790 zcmV+x1L^#k2iyjbEPqZ=FmX^dWO!LZHcMJDS7A9}IWbssR5)r-HC0ngD@}GWaZo~f zHA_N5K?-ttZEP<_aw~OZId*hpc5qoyHA7=TT1;7UcusLIFk@#mS}DD{MDNcX4(wD|vBmZD?t1VnKCQVQO_|PI_87aCtFy zG)Hb(k?|K-QA=<#PDVpSac3`gcx883OjvJXIc8XJVnI`LX+?Ktc5+o>S#>i^O=o8c zPjzf=Lp4+{R&Pa1WKUCMD{(nbb74($GfF~ZN;q{$c5pR%a&vT4bTMa>%>fsGRWep# zN;7UuWN%YeF-&!EOgTkLWlcFuOhaQYI9E(bNP1dkNN!kqWJ65~Pj+)oQAJBPNjYju zX)#SZtS2<={Ie1BTH%&b7cxJdUjc+3W?W4<{L{D z_I9}5p3E~@->T3in|VR=5*llJjW#X#I1-ueiZ2~?APTqK&0ov~MVKLfXmmNpVTTux zs2}u92Yh(B%X{_rscAU>;9m8@B-5}fRatVHkX3ErBQ}8|laFpdHxR{eR*vC@J@E{A zgiVLS41-oXeFKuHLe3sofwQDIcXJ+jnaI{jmXqj04L+emrP6ppEmZ>PcV56&-!J1q@~Xlj-$IKE2HT9cEf5|v UJvo#jk_FGeKBO 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 diff --git a/secrets/shared/ssh-config.age b/secrets/shared/ssh-config.age index 80eb15da2d00f9cb444c7a3bb0d3bc69eb36c3fc..36801698ebb3e18261b010d254b304a76fae46c3 100644 GIT binary patch delta 1573 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 LZkF}O7P4Tf!Sasj diff --git a/secrets/work/cifs.age b/secrets/work/cifs.age index a6afadbaa0419d2ca4f0064a0e3ddca16bbd31d0..35eb63b6b47b9e7ac328d93b66eb1f5a279926ce 100644 GIT binary patch literal 558 zcmZ9_J&%)M007|4fy6jC=xyvAQd($1lS@hq9Q}fpQlQaGfP5IKq9dnklH?jAO2 znq*O)3EBieeNqDgS#Ug8h3znlS$4CZloD;tXM_}uG7j7FKxl)GRv?}b*KyYpjk?TO zpQ(df>c>+%aq^blqbviwDxv51*u?_Y0WsK6~<4d-Lki@$t{I$0yvkum1p5jKppL delta 451 zcmWm7yNlCs007`SbdbOar;BdELDU+XG>;~D9He=)O_MfhUTueiOY_USm*mpd6||$c zsJJ+ZgMy3b<|sIx>wzFR_#B)>>ZBg1|G@V>Kl$~NpeGG1UDUu%V7$09qq&_E?r%<8_D_+rA*_K<*( zZMY}`1h^HF#27eAF-2wJqFPVKj_C!hd1F8nzPIdmg7_aKlvK$wT|C~c;hJtFt*C%7 zBXK-_3KF-TaXnY2qiCYd+G)F5o&m*DIZTW#mlh9n|9>~1fD6Oz?lr{U2fGD;uPgq| zJp#VubzqyjanW!u!}%3mf;=@St1gF5U7HVU`+Q5fAYpb8;ND9LINf*|l{A`8T*jE^fB#w zb6?WrurC1CE}*Ta4*;sK-Y^eeG)wPRk2a3Bz?%Q<{i*MVkMAU#Pd@*=ef;)twf-Zl pJNSoRXEw*jug ssh-ed25519 E8j6/g hgdVbcQfIHvJiJRe9r3q/v7NxC4iZSIt7S4h8ssg8z0 -m8m8yBCLpDN35B0rQC4Ku09TH96Qnzkm33db6KJaU3g --> ssh-ed25519 jo1MPA Sdr/lN+YUF5HTHgJgzya5dGlSy3aJOPnSn8+tPiqUyI -vNyotaaDLjLb8un4mB4VwK99ufmpqfH8JcGBQ8zfFqI --> nu:d]-grease -Cf35v94eity+boz3dhzFWtQEjnz68ot/m7Q ---- ILAAgk4TZ8C+Bimy1GqNWGGw7MB9ArhdCt/fN4uDbII -yV)=/;o8v]=m0j..Ǻ" Ȑn <O]$'ϏS1fXÐ声EdcS:SEV-\5np',6?"`i \ No newline at end of file +-> ssh-ed25519 E8j6/g Qz7+yH51tMzj1uY98P9MV0tXEf1DCSDCO2lIr/C5Bjc +1B8DKpZVzVQfevZ1xfalrpaM40hZiBjL3rKBOwmueE0 +-> ssh-ed25519 jo1MPA ZsuqgFfcyKEZINlcqBqc3mnmtM8yE7Vh6dtj4i/D5TI +GAw5T8Mqd8LqGXtLZqJ+ADewL5H4wctHHbgIOZOZflg +-> ssh-ed25519 JBrabQ Zvf0y/ZYm9ogPC0fZV+J/FCIyRrP48X4ccoVTeV5bFQ +uKIKyKDnrAdnDjPBP0oY3NktEBQK9O9VSAykFrjC+24 +-> yC7d,N9-grease eFX(X HYK 7L:a +oj6ihhdnlM6qHEUSBecee/K563PIko1Krw8YNoO16cRHtt8y9w +--- i+jG579wY+HL4+iSuVU6naQJLiTbWonfzZvuJgyYl7o + UISFi & mrI!##{B%sM]k \eWJ ='+Jd@8\pz ~,1oSrn+ 2D=K֌PTY-S2Mփ"2 \ No newline at end of file diff --git a/secrets/work/pip.conf.age b/secrets/work/pip.conf.age index fc7b9d6..5262b33 100644 --- a/secrets/work/pip.conf.age +++ b/secrets/work/pip.conf.age @@ -1,11 +1,11 @@ age-encryption.org/v1 --> ssh-ed25519 E8j6/g F7h/Mq3rogVymYRt3IOzkDjbBK7I3sD1T4ceCmEDEXo -zUUHdvIyxF3rLEVl1jSDS7hAt4j+gYF3NHfhTKpppj0 --> ssh-ed25519 jo1MPA Dq0CaqxGF3fWSLNQMmGnLBrxd71YWMn4XHGH0gHUWXY -RCC6r7JQHEqT93qSLkRIEV00E0JiIZCipjcSgREw0GQ --> O*-grease LdJ1E\ =rA~m=U\ tRE$^ Sp!>@ -qWkYBMCMgMuc32E7aU3dOzC9tZx9cTob4q1BaOpwaayn88/u17e4HRiNWsZDZ0Fj -FpRD7dVE3isCLpJoKzSSbVRwnZdkKWLeoEZlCQUcGmA ---- SYU6o/b687IysT9BbpE4ah3Ux2eLXdP2v1tIIoJS/pg -Ǣ9M5%%l/T-K̉Fv]ŷzI!|&QW*,#I \ No newline at end of file +-> ssh-ed25519 E8j6/g NZuccuIuBc6BV6hSYzyNZlzreL6m+ny6CpopOk23IXU +9Ql8ZvhLUmtoSPGyd6kXVQ0VZdhFae50NiCcfhYsr4E +-> ssh-ed25519 jo1MPA 7Uzs08jqKXGNDKRLlN8RfEUlCgdrX5rB42GMO+DZCHk +YqBJyeRPepYrV32ENUvIlco5qjpFcbwIxnfGUxrbTME +-> ssh-ed25519 JBrabQ lNBa2QQK3kvaIhQsSuOrIC/MZI+OLGb+62yF53uGqik +JRZKfqjo35uXYqb30A6XmQuBGQlDaMXTuQXVrjSK9Oc +-> o&4Y>`-grease 3VH RqXPQ_E < +mZGs +--- t/cD29ZAnpVX6+vdvjsOgMTpzoiML46trO2I/+NDqe0 +/w,Ӫ?k= R|4ۦCJO ؄wtis .JɥM KƆQ2o,6oY\;3,1`4Qq)vĠ]k#1zz \ No newline at end of file diff --git a/secrets/work/pypirc.age b/secrets/work/pypirc.age index 8b61bab4706ec97de78ba28d0bcf4b5c8f950c88..479a227fae3a1f7baf7714ede04c025e90604d56 100644 GIT binary patch delta 733 zcmZ9_OKZ~r003ZNJ}?e-2cS&}wwBU4QJO4_bT+BJRXHq$mu+qH>F({!y! zQN)Yl2HWrrZWFz@O(vq-K}AtPH^u}-P()<&!N8k>I8nU%{ef?0`R^5d%{8krYYr>2 z60#R_Nf}KQ(*-J1RcOLi#&kahmyOkS&2Cmi&H|KNct&wMQ(~2HgbV(xGf1S(?lSDn z3#gspTA(m0s=;_rBU!+-A1oF#CLx8OD2#zQ8E#{6u)r`v3xY{Bq}gDRCgZhid)CH_ zxo$FA5;(N_bkqU}A@L zFL<<&?*h^|XAKI3%cE*|gyPy+JTF30)vDqNnvEfPQfBnH8zpP$3}%c+EP6|nXOo!S zp=(J8?4U@1)m-g?l2lZWa2#MVnZT^5MuaNIKa*M=95kB3@S>Sphz`NC$T61I*$xtmybYvflkADtT6*-uD;?OUVNkG_}K^VySA z3+t9$_*TDV=G-5%zS0neY^c>7`h#nr*F%hxVVY*;yRFl%VqOV{3~(O7b1 z@Jo0LY5qJs5cFCPJRN$UgRH!cqC?jIFsVSRBv F^%s?q5-9)x delta 556 zcmV+{0@MBd1>{YdJDZOG0NvRbfXsH8Xl`FH~1-NJ(*7ayLPE zFKtbDGzw@qFiB7~OHXk$O?fm*Id4;ORccgFYDq~?PE&bncSu1mGgeMPN>NKfFbXX` zAaiqQEoEdfH8n9gAZl+hO;AA~ab;#kMsrt5R(C`)PDgb&bAL`uYidM7W^_VkSxHPt zZFFpJR!m89FFATR3UV}JO=x;aY%n)VOKfCDOEXSMacpBSOJYM!R$(z{OIlBAD{g9d zOLs*y3N1b$MJ;D?Wnpt=AX#yGAUGr`b~Q~PWOF7UW-B;2VhTY=cr!v+YI9R;Q3@?B zEg)n}HfB<4WPe&wXE|bGO)zdrY*j`xM|DU>G(}fcQ#eC8HEvc~b!$a(Z$S!o4adFj zd($PEI1u%WVB+rH#fu2f53JoU>k=L&rr4u3(_1$l$u(q6i1>YPtDttVu~N?-T-pc{ z#OU&cL*#-BG(K5s;dt#xsBqSS+MU4cLsdHUCE^bB+<$yf=Vb;}5~}VGn59LrppM0m zm@MRNARl^_A_%7}vx?rtQ(zSfOE#)9tFo+R=d@fe_FChFu%@&V-sRAf;@Wm}Ou_E~ zMM4KOtCV3w