diff --git a/flake.nix b/flake.nix index 729e553ac18927cf591155362aa82d0c1a4083ab..fb09fd8b0663e8adf4b217673267278c7cd3ec3f 100644 --- a/flake.nix +++ b/flake.nix @@ -227,16 +227,6 @@ (commonConfig {}) ]; }; { - home-manager, - system = "x86_64-linux"; - modules = [ - home-manager.nixosModules.home-manager - agenix.nixosModules.default - ./machines/sencha - (commonConfig {}) - ]; - }; -{ home-manager = { colmena = { meta = { diff --git a/machines/sencha/default.nix b/machines/sencha/default.nix deleted file mode 100644 index 316d35c7f6ecbfd1a8b7f87e9868c0e959335968..0000000000000000000000000000000000000000 --- a/machines/sencha/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{pkgs, ...}: { - imports = [./hardware.nix ../common/gui]; - - boot = { - kernelPackages = pkgs.linuxPackages_latest; - kernelParams = ["quiet" "splash"]; - }; - - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - - boot.initrd.luks.devices."luks-c1c666de-2c68-4d50-98f1-3974ef424ff3".device = "/dev/disk/by-uuid/c1c666de-2c68-4d50-98f1-3974ef424ff3"; - - hardware = {bluetooth.enable = true;}; - - networking = { - hostName = "sencha"; - networkmanager.enable = true; - firewall.enable = true; - }; - - services = { - blueman.enable = true; - openssh.enable = true; - pcscd.enable = true; - }; - - virtualisation.docker.enable = true; - - users.users.olheiser.isNormalUser = true; - users.users.jolheiser = { - extraGroups = ["wheel" "docker" "storage"]; - isNormalUser = true; - }; - - environment.systemPackages = with pkgs; [ - firefox - ]; - - system.stateVersion = "22.11"; -} diff --git a/machines/sencha/hardware.nix b/machines/sencha/hardware.nix deleted file mode 100644 index 096e4e171a737edfdd9e0df4477366c5d35caea1..0000000000000000000000000000000000000000 --- a/machines/sencha/hardware.nix +++ /dev/null @@ -1,42 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sr_mod" "rtsx_usb_sdmmc" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/d1f561b1-bc50-4e34-9ca6-e973d2d9437a"; - fsType = "ext4"; - }; - - boot.initrd.luks.devices."luks-75db2e03-a875-43ee-8ca8-70507b421641".device = "/dev/disk/by-uuid/75db2e03-a875-43ee-8ca8-70507b421641"; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/A8A8-1D01"; - fsType = "vfat"; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/5c3eb124-674b-4315-890d-137275aab504"; } - ]; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.eno1.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 0cf619b5e1d7566ff587099241b2de24d504e501..b2fb11ac6a004a4a7c0bda1cf91634017ba802f3 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -1,12 +1,16 @@ let jolheiser = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKrPUqk9v7FE7OgMDaOMdlnItiXSDkmS+eU94RzQFiMS"; + jolheiser = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKrPUqk9v7FE7OgMDaOMdlnItiXSDkmS+eU94RzQFiMS"; + jolheiser = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKrPUqk9v7FE7OgMDaOMdlnItiXSDkmS+eU94RzQFiMS"; matcha = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILZxjkZLj/9xvmg1enK+B7k8qf6Px0j4kTZ2caQfYmB1"; + jolheiser = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKrPUqk9v7FE7OgMDaOMdlnItiXSDkmS+eU94RzQFiMS"; sencha = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJurjAMu4IXgpBwgUP0QvE2ySE5/Orn/yflkdWVvy6Am"; + jolheiser = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKrPUqk9v7FE7OgMDaOMdlnItiXSDkmS+eU94RzQFiMS"; chai = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA7PS9SJ+OVrUku9dPUQZigioy+r3VlFHVntsa/F7AdM"; + jolheiser = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKrPUqk9v7FE7OgMDaOMdlnItiXSDkmS+eU94RzQFiMS"; masala = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH0bnlygiFqNwl0mHxcD+t78bTsn1NcHm6L2B4le4FtS"; - dragonwell = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN32Cwxer2AOGvEqSqXSPp49gj1VtR7G2XmPnmXj6o53"; - all = [jolheiser matcha sencha chai masala dragonwell]; + all = [jolheiser matcha chai masala dragonwell]; in { "shared/ssh-config.age".publicKeys = all; "shared/ssh-config-work.age".publicKeys = all; diff --git a/secrets/shared/gist-pw.age b/secrets/shared/gist-pw.age index ab8a09b2d0f6824b98fab5c7ea0bb52494bfe75c..50b30a746d3b830a9678ca4ad7cadeaa4250a096 100644 --- a/secrets/shared/gist-pw.age +++ b/secrets/shared/gist-pw.age @@ -1,22 +1,29 @@ age-encryption.org/v1 +-> ssh-ed25519 E8j6/g MoQ+KiKt+A1JLrO7Xdo/EUY1/RXgT02IT5KdDIrBFnI +ivOpO8f87yAm1k/1FL3qhiaS5G/eW7jYV19Mz5QoEXc +-> ssh-ed25519 xUMv2w xht8LuQJaV0yhzvwbmYjUsgn3KdUqj8BtumeNRqrP10 +-> ssh-ed25519 E8j6/g wmOmVN/IOfp9tz1ygdCfGgaoQWCS7Xk6zMziXGLdImU -> ssh-ed25519 E8j6/g wmOmVN/IOfp9tz1ygdCfGgaoQWCS7Xk6zMziXGLdImU +-> ssh-ed25519 E8j6/g wmOmVN/IOfp9tz1ygdCfGgaoQWCS7Xk6zMziXGLdImU zwG/aHslBrylHAJ9IC5Y25id1GgTZuxzMr1F9e7WYOM +-> ssh-ed25519 E8j6/g wmOmVN/IOfp9tz1ygdCfGgaoQWCS7Xk6zMziXGLdImU -> ssh-ed25519 xUMv2w VvMh9TxfZfSSN9iB6BDaOUyV2FgvQWj+oUEoi5jOzFI +-> ssh-ed25519 E8j6/g wmOmVN/IOfp9tz1ygdCfGgaoQWCS7Xk6zMziXGLdImU AHlnXqzgAyFbXL8rgypA5Dv83xKMlbxtMFKKt5TA674 +-> ssh-ed25519 E8j6/g wmOmVN/IOfp9tz1ygdCfGgaoQWCS7Xk6zMziXGLdImU -> ssh-ed25519 Cuo7gw I/c93mKH8DXsIOwE50GchLlPGC/HdwPJmgzR7YCOz14 +-> ssh-ed25519 E8j6/g wmOmVN/IOfp9tz1ygdCfGgaoQWCS7Xk6zMziXGLdImU unK9udxesAbkrdseOF0dwtH4hdqSX12LobMTx9r3uC0 +-> ssh-ed25519 E8j6/g wmOmVN/IOfp9tz1ygdCfGgaoQWCS7Xk6zMziXGLdImU -> ssh-ed25519 jo1MPA NF3tbxtJovgNKQrxPrbd/sI/mk6N/hO42s/xqklncV4 +-> ssh-ed25519 E8j6/g wmOmVN/IOfp9tz1ygdCfGgaoQWCS7Xk6zMziXGLdImU J3j4m7kaDovwaGMvRfiBy3PwnDFNE9T2+VCzz3BhCSc -age-encryption.org/v1 +zwG/aHslBrylHAJ9IC5Y25id1GgTZuxzMr1F9e7WYOM -age-encryption.org/v1 +zwG/aHslBrylHAJ9IC5Y25id1GgTZuxzMr1F9e7WYOM age-encryption.org/v1 -age-encryption.org/v1 +zwG/aHslBrylHAJ9IC5Y25id1GgTZuxzMr1F9e7WYOM -> ssh-ed25519 E8j6/g wmOmVN/IOfp9tz1ygdCfGgaoQWCS7Xk6zMziXGLdImU -age-encryption.org/v1 +zwG/aHslBrylHAJ9IC5Y25id1GgTZuxzMr1F9e7WYOM zwG/aHslBrylHAJ9IC5Y25id1GgTZuxzMr1F9e7WYOM -age-encryption.org/v1 +zwG/aHslBrylHAJ9IC5Y25id1GgTZuxzMr1F9e7WYOM -> ssh-ed25519 xUMv2w VvMh9TxfZfSSN9iB6BDaOUyV2FgvQWj+oUEoi5jOzFI -XAb/4Yy9qqDJSrL37tR3rrtXDK6hPhzPEEtZVES9M/wxsA ---- a7kumv2O/NXVjxCPegwthcJM0H7Z/4rRCE7liF4qGn8 -da -+RhD ?܇/z v2J:w^C \ No newline at end of file diff --git a/secrets/shared/git-send-email.age b/secrets/shared/git-send-email.age index 632cac1f80ecc59fcd381abcdc83a3d18d46f0e1..84c7d8d7dcfb7903872a85842d6f8bd43e984536 100644 Binary files a/secrets/shared/git-send-email.age and b/secrets/shared/git-send-email.age differ diff --git a/secrets/shared/irc-pw.age b/secrets/shared/irc-pw.age index 4cc17df22a3d79f9f337430d53a1da0442eaf149..8bef1213e8c9fc3b70f2942cc947f27fbab4f7cf 100644 --- a/secrets/shared/irc-pw.age +++ b/secrets/shared/irc-pw.age @@ -1,21 +1,27 @@ age-encryption.org/v1 +-> ssh-ed25519 E8j6/g d1zXFjUit7YPN55uV8l2k3CVDFcKIdKBlSAwmUHY+nw +Y+W5puz47ItyxU6eMYh/2C/s+Qs+CWfA+80tp14ZiZY +-> ssh-ed25519 xUMv2w /pGFstD9CQoIfQ++vK4xsacup4DmJLrAbJc8DhbPyG0 +-> ssh-ed25519 E8j6/g ULhSVxSexfROyh7t/qo4LlBmVaRb116JzL9HsKAmLiE -> ssh-ed25519 E8j6/g ULhSVxSexfROyh7t/qo4LlBmVaRb116JzL9HsKAmLiE +-> ssh-ed25519 E8j6/g ULhSVxSexfROyh7t/qo4LlBmVaRb116JzL9HsKAmLiE Cva3JJ1W6Lgfj+O/QNxEWMpYbCFiTuTc+X5xZZw54uY +-> ssh-ed25519 E8j6/g ULhSVxSexfROyh7t/qo4LlBmVaRb116JzL9HsKAmLiE -> ssh-ed25519 xUMv2w F9mWX2Nd01z56bo1NgtKq++u9b5flpF5qE5ihBbn5GU +-> ssh-ed25519 E8j6/g ULhSVxSexfROyh7t/qo4LlBmVaRb116JzL9HsKAmLiE urQudyxjM9Fk71bKTol6aY8KnTD8hyAlv4561cfbo6I +-> ssh-ed25519 E8j6/g ULhSVxSexfROyh7t/qo4LlBmVaRb116JzL9HsKAmLiE -> ssh-ed25519 Cuo7gw xK29blvGUDpc+nIwIBeWzrvVWb3lOT6e5ocLl+1IvxM +-> ssh-ed25519 E8j6/g ULhSVxSexfROyh7t/qo4LlBmVaRb116JzL9HsKAmLiE z+ZIHcU8DIhwwxkBG/MKc/fzslmiOkVLv+8mDKewI9o +-> ssh-ed25519 E8j6/g ULhSVxSexfROyh7t/qo4LlBmVaRb116JzL9HsKAmLiE -> ssh-ed25519 jo1MPA ElgoPZ5citinilxgl7gf5yVc3tTWaSxFyH9YdKZaUmQ +-> ssh-ed25519 E8j6/g ULhSVxSexfROyh7t/qo4LlBmVaRb116JzL9HsKAmLiE prdCBsRnpe4dlyl3dqcVRlnPBmaJMLL67GEdS5+J7O0 -age-encryption.org/v1 +Cva3JJ1W6Lgfj+O/QNxEWMpYbCFiTuTc+X5xZZw54uY -age-encryption.org/v1 +Cva3JJ1W6Lgfj+O/QNxEWMpYbCFiTuTc+X5xZZw54uY age-encryption.org/v1 -age-encryption.org/v1 +Cva3JJ1W6Lgfj+O/QNxEWMpYbCFiTuTc+X5xZZw54uY -> ssh-ed25519 E8j6/g ULhSVxSexfROyh7t/qo4LlBmVaRb116JzL9HsKAmLiE -age-encryption.org/v1 Cva3JJ1W6Lgfj+O/QNxEWMpYbCFiTuTc+X5xZZw54uY --> 0u~Nv{E^-grease -NDxjcP11XXW/aWYh38yiOGOrmXkuO2pXVLIWi8YCTTSQxkQ76dzfV9uGP2qieaap -YFqg01EjxSyDkjo ---- MVu78w96WIW6Id6ef3k03fexGFPUVUHJ+hsel4egZe0 -!`^iz=6{VkD m[ 6׀Ol \ No newline at end of file +Cva3JJ1W6Lgfj+O/QNxEWMpYbCFiTuTc+X5xZZw54uY diff --git a/secrets/shared/spotify.age b/secrets/shared/spotify.age index dc8bfdded70b57af50c5f6a9a9eb8c60048269e7..8367be420aaa352e41d00088b765aba568ce5037 100644 Binary files a/secrets/shared/spotify.age and b/secrets/shared/spotify.age differ diff --git a/secrets/shared/ssh-config-work.age b/secrets/shared/ssh-config-work.age index b1136f4500f174ef4dd9bccf61f4ff94574babf9..05ab03313c7df8f6e88b2475207b524aa7d18c3d 100644 Binary files a/secrets/shared/ssh-config-work.age and b/secrets/shared/ssh-config-work.age differ diff --git a/secrets/shared/ssh-config.age b/secrets/shared/ssh-config.age index 1a94737a239ee484dc02610f5a8ffeb7439921cf..82cbe7362df27368a4547335d6f836bca660339d 100644 Binary files a/secrets/shared/ssh-config.age and b/secrets/shared/ssh-config.age differ diff --git a/secrets/work/cifs.age b/secrets/work/cifs.age index b322859d5599de36fe176c046cee52e0cf79a70a..35eb63b6b47b9e7ac328d93b66eb1f5a279926ce 100644 --- a/secrets/work/cifs.age +++ b/secrets/work/cifs.age @@ -1,12 +1,21 @@ age-encryption.org/v1 +age-encryption.org/v1 -> ssh-ed25519 E8j6/g JoEEhC3cHsaddOD/6wYur000ZXMtyUOBxx8OdwIh6nc +age-encryption.org/v1 /YSVnJVTZPzU2hU3iy3ME1R66GzA7OQ3NWlgx7w7kkc +age-encryption.org/v1 -> ssh-ed25519 jo1MPA Cft9zAzbd8p8+OyVLMTRQsI7b7/LZZYSWMQPDf2tTBE +age-encryption.org/v1 oXBW+w8+4chm0Dj4HKX4J3EiFh50Gfsr5pCGbwNDx+w +age-encryption.org/v1 -> ssh-ed25519 JBrabQ YDAu5lMYMkgT1TBCfy6GD4VKNjFwbokn+xvcTeVlaxg +age-encryption.org/v1 TE/rEzwVr+FiR5jhdCGegOiQd0V2tKRjdhYrs5YnJAo +age-encryption.org/v1 -> 1CVDqRl5-grease ` ssh-ed25519 E8j6/g JoEEhC3cHsaddOD/6wYur000ZXMtyUOBxx8OdwIh6nc +-> ssh-ed25519 E8j6/g JoEEhC3cHsaddOD/6wYur000ZXMtyUOBxx8OdwIh6nc age-encryption.org/v1 -age-encryption.org/v1 +XszHjٟ^4-^\,|L>{II|Vsv,U꾌B \ No newline at end of file diff --git a/secrets/work/netrc.age b/secrets/work/netrc.age index b17cbdf4d839aec38ed6180a71698fda8e24177c..65acd2f9404d02f18cd0061c2fca40713f58b2ff 100644 --- a/secrets/work/netrc.age +++ b/secrets/work/netrc.age @@ -1,14 +1,20 @@ age-encryption.org/v1 --> ssh-ed25519 E8j6/g uc5q95TtleinoAXuUQ5Z39TfZoJmgE57sl85Vulfzxw +age-encryption.org/v1 Zu7qaT9GpW3m5ZIsp6A0E88kFcknMdJadgiQFADOUto +age-encryption.org/v1 -> ssh-ed25519 jo1MPA YeTQvafosU8W0Ya8pc0b4+c6CeCvBWEKFwJnjfw0B1A +age-encryption.org/v1 dwwllbDifpu1x9Rn6DsGHgbGqqOc7GZeDUEdiPye5jY +age-encryption.org/v1 -> ssh-ed25519 JBrabQ 43n9QwF7MPXNVgsAntQxxzLzlyGhpv7ZfW2Yzvvn0iE +age-encryption.org/v1 70i88nY8N5roLOz2e+Ke6AOcUQHp1gpSTI58It/zHws +age-encryption.org/v1 -> d.rgT26Z-grease ![wAs= +age-encryption.org/v1 1zKWBJ2kgSBiYgwiExmCdHomuhrZEIRxDLOFfxL4Ior5QHo5yC673WM8a0wvZ7N3 -age-encryption.org/v1 +-> ssh-ed25519 E8j6/g uc5q95TtleinoAXuUQ5Z39TfZoJmgE57sl85Vulfzxw -age-encryption.org/v1 +-> ssh-ed25519 E8j6/g uc5q95TtleinoAXuUQ5Z39TfZoJmgE57sl85Vulfzxw age-encryption.org/v1 -age-encryption.org/v1 +-> ssh-ed25519 E8j6/g uc5q95TtleinoAXuUQ5Z39TfZoJmgE57sl85Vulfzxw -> ssh-ed25519 E8j6/g uc5q95TtleinoAXuUQ5Z39TfZoJmgE57sl85Vulfzxw diff --git a/secrets/work/pip.conf.age b/secrets/work/pip.conf.age index 0929ea12827b9a270aea247ad0899265c8e0d9a8..5262b33b02ec2703b7f0a1f35e9c6b0a46028f35 100644 Binary files a/secrets/work/pip.conf.age and b/secrets/work/pip.conf.age differ diff --git a/secrets/work/pypirc.age b/secrets/work/pypirc.age index ea2d082caaadd361d8fce8662a5a1a3ed5f0d0ce..479a227fae3a1f7baf7714ede04c025e90604d56 100644 Binary files a/secrets/work/pypirc.age and b/secrets/work/pypirc.age differ