From 78d028f2a57edb1da8f0dc2ac1091fbe8dd78545 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leon=20Schwarz=C3=A4ugl?= Date: Mon, 14 Jul 2025 01:31:16 +0200 Subject: [PATCH] chore: private hostnames --- .github/README.md | 9 ++--- SwarselSystems.org | 33 ++++++++++--------- files/emacs/init.el | 8 ++--- .../{nbm-imba-166 => machpizza}/default.nix | 0 .../secrets/pii.nix.enc | 0 .../nixos/{nbl-imba-2 => pyramid}/default.nix | 0 .../{nbl-imba-2 => pyramid}/disk-config.nix | 0 .../hardware-configuration.nix | 0 .../secrets/pii.nix.enc | 6 ++-- nix/topology.nix | 4 +-- secrets/{nbl-imba-2 => pyramid}/secrets.yaml | 0 11 files changed, 31 insertions(+), 29 deletions(-) rename hosts/darwin/{nbm-imba-166 => machpizza}/default.nix (100%) rename hosts/darwin/{nbm-imba-166 => machpizza}/secrets/pii.nix.enc (100%) rename hosts/nixos/{nbl-imba-2 => pyramid}/default.nix (100%) rename hosts/nixos/{nbl-imba-2 => pyramid}/disk-config.nix (100%) rename hosts/nixos/{nbl-imba-2 => pyramid}/hardware-configuration.nix (100%) rename hosts/nixos/{nbl-imba-2 => pyramid}/secrets/pii.nix.enc (62%) rename secrets/{nbl-imba-2 => pyramid}/secrets.yaml (100%) diff --git a/.github/README.md b/.github/README.md index a8e9428..d5d7313 100644 --- a/.github/README.md +++ b/.github/README.md @@ -149,16 +149,17 @@ Alternatively, to install this from any NixOS live ISO, run `nix run --experimen | Name | Hardware | Use | |--------------------|-----------------------------------------------------|------------------------------------------------------| -|💻 **nbl-imba-2** | Framework Laptop 16, AMD 7940HS, RX 7700S, 64GB RAM | Work laptop | -|💻 **nbm-imba-166** | MacBook Pro 2016 | MacOS Sandbox | +|💻 **pyramid** | Framework Laptop 16, AMD 7940HS, RX 7700S, 64GB RAM | Work laptop | +|💻 **bakery** | Lenovo Ideapad 720S-13IKB | Personal lapto | +|💻 **machpizza** | MacBook Pro 2016 | MacOS sandbox | |🖥️ **winters** | ASRock J4105-ITX, 32GB RAM | Main homeserver and data storgae | -|🖥️ **milkywell** | Oracle Cloud: VM.Standard.E2.1.Micro | Server for lightweight synchronization tasks | +|🖥️ **milkywell** | Oracle Cloud: VM.Standard.E2.1.Micro | Server for lightweight synchronization tasks | |🖥️ **moonside** | Oracle Cloud: VM.Standard.A1.Flex, 4 OCPUs, 24GB RAM| Proxy for local services, some lightweight services | |📱 **magicant** | Samsung Galaxy Z Flip 6 | Phone | |💿 **drugstore** | - | ISO installer configuration | |❔ **chaotheatre** | - | Demo config for checking out my configurtion | |❔ **toto** | - | Helper configuration for bootstrapping a new system | -|🏠 **Treehouse** | - | Reference configuration for a home-manager only host | +|🏠 **treehouse** | - | Reference configuration for a home-manager only host | ## General Nix tips & useful links diff --git a/SwarselSystems.org b/SwarselSystems.org index 134dddd..14d08ba 100644 --- a/SwarselSystems.org +++ b/SwarselSystems.org @@ -221,16 +221,17 @@ Here I give a brief overview over the hostmachines that I am using. This is held #+begin_src markdown :tangle no :noweb-ref hosts | Name | Hardware | Use | |--------------------|-----------------------------------------------------|------------------------------------------------------| - |💻 **nbl-imba-2** | Framework Laptop 16, AMD 7940HS, RX 7700S, 64GB RAM | Work laptop | - |💻 **nbm-imba-166** | MacBook Pro 2016 | MacOS Sandbox | + |💻 **pyramid** | Framework Laptop 16, AMD 7940HS, RX 7700S, 64GB RAM | Work laptop | + |💻 **bakery** | Lenovo Ideapad 720S-13IKB | Personal lapto | + |💻 **machpizza** | MacBook Pro 2016 | MacOS sandbox | |🖥️ **winters** | ASRock J4105-ITX, 32GB RAM | Main homeserver and data storgae | - |🖥️ **milkywell** | Oracle Cloud: VM.Standard.E2.1.Micro | Server for lightweight synchronization tasks | + |🖥️ **milkywell** | Oracle Cloud: VM.Standard.E2.1.Micro | Server for lightweight synchronization tasks | |🖥️ **moonside** | Oracle Cloud: VM.Standard.A1.Flex, 4 OCPUs, 24GB RAM| Proxy for local services, some lightweight services | |📱 **magicant** | Samsung Galaxy Z Flip 6 | Phone | |💿 **drugstore** | - | ISO installer configuration | |❔ **chaotheatre** | - | Demo config for checking out my configurtion | |❔ **toto** | - | Helper configuration for bootstrapping a new system | - |🏠 **Treehouse** | - | Reference configuration for a home-manager only host | + |🏠 **treehouse** | - | Reference configuration for a home-manager only host | #+end_src ** Programs @@ -1007,7 +1008,7 @@ The structure of =globals.nix.enc= requires a toplevel =globals=. connections = { eth2 = mkConnection "nswitch" "eth1"; eth7 = mkConnection "pc" "eth1"; - eth8 = mkConnection "nbl-imba-2" "eth1"; + eth8 = mkConnection "pyramid" "eth1"; }; }; @@ -1023,7 +1024,7 @@ The structure of =globals.nix.enc= requires a toplevel =globals=. interfaces.eth1 = { }; }; - nbl-imba-2.interfaces.eth1 = { }; + pyramid.interfaces.eth1 = { }; switch-bedroom = mkSwitch "Switch Bedroom" { info = "TL-SG1005D"; @@ -1708,7 +1709,7 @@ Acceptance of arbitraty argumments is here needed because =disko= passes =diskoF This is a list of all physical machines that I maintain. -**** nbl-imba-2 (Framework Laptop 16) +**** pyramid (Framework Laptop 16) :PROPERTIES: :CUSTOM_ID: h:6c6e9261-dfa1-42d8-ab2a-8b7c227be6d9 :END: @@ -1719,7 +1720,7 @@ My work machine. Built for more security, this is the gold standard of my config :PROPERTIES: :CUSTOM_ID: h:567c0055-f5f7-4e53-8f13-d767d7166e9d :END: -#+begin_src nix-ts :tangle hosts/nixos/nbl-imba-2/default.nix +#+begin_src nix-ts :tangle hosts/nixos/pyramid/default.nix { self, config, inputs, lib, minimal, ... }: let primaryUser = config.swarselsystems.mainUser; @@ -1808,7 +1809,7 @@ My work machine. Built for more security, this is the gold standard of my config :CUSTOM_ID: h:25115a54-c634-4896-9a41-254064ce9fcc :END: -#+begin_src nix-ts :tangle hosts/nixos/nbl-imba-2/hardware-configuration.nix +#+begin_src nix-ts :tangle hosts/nixos/pyramid/hardware-configuration.nix { config, lib, pkgs, modulesPath, ... }: { imports = @@ -1885,7 +1886,7 @@ My work machine. Built for more security, this is the gold standard of my config :CUSTOM_ID: h:e0da04c7-4199-44b0-b525-6cfc64072b45 :END: -#+begin_src nix-ts :tangle hosts/nixos/nbl-imba-2/disk-config.nix +#+begin_src nix-ts :tangle hosts/nixos/pyramid/disk-config.nix { disko.devices = { disk = { @@ -2326,14 +2327,14 @@ This is my main server that I run at home. It handles most tasks that require bi hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } #+end_src -**** nbm-imba-166 (MacBook Pro) +**** machpizza (MacBook Pro) :PROPERTIES: :CUSTOM_ID: h:28e1a7eb-356b-4015-83f7-9c552c8c0e9d :END: A Mac notebook that I have received from work. I use this machine for getting accustomed to the Apple ecosystem as well as as a sandbox for nix-darwin configurations. -#+begin_src nix-ts :tangle hosts/darwin/nbm-imba-166/default.nix +#+begin_src nix-ts :tangle hosts/darwin/machpizza/default.nix { lib, config, ... }: let inherit (config.repo.secrets.local) workUser; @@ -18813,8 +18814,8 @@ This adds a rudimentary nix-mode to Emacs. I have not really tried this out, as (setq lsp-nix-nixd-server-path "nixd" lsp-nix-nixd-formatting-command [ "nixpkgs-fmt" ] lsp-nix-nixd-nixpkgs-expr "import (builtins.getFlake \"/home/swarsel/.dotfiles\").inputs.nixpkgs { }" - lsp-nix-nixd-nixos-options-expr "(builtins.getFlake \"/home/swarsel/.dotfiles\").nixosConfigurations.nbl-imba-2.options" - lsp-nix-nixd-home-manager-options-expr "(builtins.getFlake \"/home/swarsel/.dotfiles\").nixosConfigurations.nbl-imba-2.options.home-manager.users.type.getSubOptions []" + lsp-nix-nixd-nixos-options-expr "(builtins.getFlake \"/home/swarsel/.dotfiles\").nixosConfigurations.pyramid.options" + lsp-nix-nixd-home-manager-options-expr "(builtins.getFlake \"/home/swarsel/.dotfiles\").nixosConfigurations.pyramid.options.home-manager.users.type.getSubOptions []" )) (use-package nix-ts-mode @@ -18829,8 +18830,8 @@ This adds a rudimentary nix-mode to Emacs. I have not really tried this out, as (setq lsp-nix-nixd-server-path "nixd" lsp-nix-nixd-formatting-command [ "nixpkgs-fmt" ] lsp-nix-nixd-nixpkgs-expr "import (builtins.getFlake \"/home/swarsel/.dotfiles\").inputs.nixpkgs { }" - lsp-nix-nixd-nixos-options-expr "(builtins.getFlake \"/home/swarsel/.dotfiles\").nixosConfigurations.nbl-imba-2.options" - lsp-nix-nixd-home-manager-options-expr "(builtins.getFlake \"/home/swarsel/.dotfiles\").nixosConfigurations.nbl-imba-2.options.home-manager.users.type.getSubOptions []" + lsp-nix-nixd-nixos-options-expr "(builtins.getFlake \"/home/swarsel/.dotfiles\").nixosConfigurations.pyramid.options" + lsp-nix-nixd-home-manager-options-expr "(builtins.getFlake \"/home/swarsel/.dotfiles\").nixosConfigurations.pyramid.options.home-manager.users.type.getSubOptions []" )) diff --git a/files/emacs/init.el b/files/emacs/init.el index 1dbe854..e1e6cd9 100644 --- a/files/emacs/init.el +++ b/files/emacs/init.el @@ -1019,8 +1019,8 @@ create a new one." (setq lsp-nix-nixd-server-path "nixd" lsp-nix-nixd-formatting-command [ "nixpkgs-fmt" ] lsp-nix-nixd-nixpkgs-expr "import (builtins.getFlake \"/home/swarsel/.dotfiles\").inputs.nixpkgs { }" - lsp-nix-nixd-nixos-options-expr "(builtins.getFlake \"/home/swarsel/.dotfiles\").nixosConfigurations.nbl-imba-2.options" - lsp-nix-nixd-home-manager-options-expr "(builtins.getFlake \"/home/swarsel/.dotfiles\").nixosConfigurations.nbl-imba-2.options.home-manager.users.type.getSubOptions []" + lsp-nix-nixd-nixos-options-expr "(builtins.getFlake \"/home/swarsel/.dotfiles\").nixosConfigurations.pyramid.options" + lsp-nix-nixd-home-manager-options-expr "(builtins.getFlake \"/home/swarsel/.dotfiles\").nixosConfigurations.pyramid.options.home-manager.users.type.getSubOptions []" )) (use-package nix-ts-mode @@ -1035,8 +1035,8 @@ create a new one." (setq lsp-nix-nixd-server-path "nixd" lsp-nix-nixd-formatting-command [ "nixpkgs-fmt" ] lsp-nix-nixd-nixpkgs-expr "import (builtins.getFlake \"/home/swarsel/.dotfiles\").inputs.nixpkgs { }" - lsp-nix-nixd-nixos-options-expr "(builtins.getFlake \"/home/swarsel/.dotfiles\").nixosConfigurations.nbl-imba-2.options" - lsp-nix-nixd-home-manager-options-expr "(builtins.getFlake \"/home/swarsel/.dotfiles\").nixosConfigurations.nbl-imba-2.options.home-manager.users.type.getSubOptions []" + lsp-nix-nixd-nixos-options-expr "(builtins.getFlake \"/home/swarsel/.dotfiles\").nixosConfigurations.pyramid.options" + lsp-nix-nixd-home-manager-options-expr "(builtins.getFlake \"/home/swarsel/.dotfiles\").nixosConfigurations.pyramid.options.home-manager.users.type.getSubOptions []" )) diff --git a/hosts/darwin/nbm-imba-166/default.nix b/hosts/darwin/machpizza/default.nix similarity index 100% rename from hosts/darwin/nbm-imba-166/default.nix rename to hosts/darwin/machpizza/default.nix diff --git a/hosts/darwin/nbm-imba-166/secrets/pii.nix.enc b/hosts/darwin/machpizza/secrets/pii.nix.enc similarity index 100% rename from hosts/darwin/nbm-imba-166/secrets/pii.nix.enc rename to hosts/darwin/machpizza/secrets/pii.nix.enc diff --git a/hosts/nixos/nbl-imba-2/default.nix b/hosts/nixos/pyramid/default.nix similarity index 100% rename from hosts/nixos/nbl-imba-2/default.nix rename to hosts/nixos/pyramid/default.nix diff --git a/hosts/nixos/nbl-imba-2/disk-config.nix b/hosts/nixos/pyramid/disk-config.nix similarity index 100% rename from hosts/nixos/nbl-imba-2/disk-config.nix rename to hosts/nixos/pyramid/disk-config.nix diff --git a/hosts/nixos/nbl-imba-2/hardware-configuration.nix b/hosts/nixos/pyramid/hardware-configuration.nix similarity index 100% rename from hosts/nixos/nbl-imba-2/hardware-configuration.nix rename to hosts/nixos/pyramid/hardware-configuration.nix diff --git a/hosts/nixos/nbl-imba-2/secrets/pii.nix.enc b/hosts/nixos/pyramid/secrets/pii.nix.enc similarity index 62% rename from hosts/nixos/nbl-imba-2/secrets/pii.nix.enc rename to hosts/nixos/pyramid/secrets/pii.nix.enc index f8cb576..7feeec1 100644 --- a/hosts/nixos/nbl-imba-2/secrets/pii.nix.enc +++ b/hosts/nixos/pyramid/secrets/pii.nix.enc @@ -1,5 +1,5 @@ { - "data": "ENC[AES256_GCM,data:M+eOn0Sw85cFlTD3SwkbOKwYDovKbOjyHdqp1Z+sCdWrc4Ewo7upSoBozeotp7SRzXkw1rMhTWZSah/1emjtIoXK54w/tB5R4sNXKCcastC8ptkFdVAW9r7rTP7rwiS+qenPq35tO9whe3ejPeODyBnG6CPSWm0jnZVCyMGN00Jlxsa7FtP1k11OgvfxQ+gZ4NVDDCe55NSFVIlqSB5MfKsQ9d9yws5j8TY3afJQZ2hSSjhQrIpyy3DIKswljqfYKeKFoy9Akd7D9biV3t6rTzXBk8NLLC4CpjOYuatjouUntuIFQmk9JwTBox1dAU86hQxv5BxiIPRU1LElWWYlyEw7Wb80izlnMDlZvi6mrHPGJBySplY11idIVI0AruzV2UjgZcNc5ofVjWMkqJ72ma4XQiVioVs7iBBVHvo+hFMlxRchFCoKA87MfEjWqBKVH7P4ZtTvP3ss1QmRffh2ME/oPMGHFcuTwEa44clhlNP84vwKb2BnLn71akbXjQHRsny39+4S0DpCQRHw/CWqXGR3rpJpQ0xDfDd/NTgsz2EmyiDYj6FavuZ6mtVuVzVkwC+nXouCMpVqJe3J1O8PgjGoG5hjVw0IxbSV0JwSbAMryLjxWgr6FLPbhxQesT8JenHlYDN11kTj2amgGQiUbVzI6oBV9GjnKAkER8FbKR17XekDW6vP6obDY2qWuY3h+wHE/tGzaYN+8TGSqUK4+iGiCJTMLHOY+w/0qPcX2G6Y6vfDyGL/dAmCaZsEqGjh1Ajxjj1RJFDInDBJbpqjbOylojFKv6nieImAWvWGoQHmUI8uV+i+B6cd07u24G8xNp3DPiCZ+LYS0V+va/c6SqZfXzr1P/3wC+jxgo81opD2czsx4k52obL1/sh+2l5ExVWTtEmwlsIoLkK6q9n9ZZ0rVJFR7WHxUHrBYn0/ZpeuSy9svjEePIHXSfqswBg0fYCbOaXl5UXgNIa90CYrXVBomGpi00es3utGBmDHAdA6Noo9vSzagkAgz5HVP8VSZF0cSBUIFmW4rrKHSAllVrvUVNxlOuJNDC+8OlKrb+QwydEiZvrjqlYcVMNQjMrmY5uWNYNAng+10FCctpttWV2k0siemiSJ7Z7ivCLJghErk7EimSq5KKGYuKSYsc8eBPPMIVTNUOThfkDSHbmlsBCaTKsDRmgq0g+C1mbMkB6yfJMiRgwCIoIsOLQ16q/pmMopEX7t7FUCOb8SiOSfQikK2EE72A8oSTdoYnUsrBNzl8y1NSGQVA==,iv:zbR0Sq8Ka8HEQw+8H71OFv3Yv6CL1zR55jHbZg7oSYs=,tag:y97EhzsNkSZhk8TldYW+og==,type:str]", + "data": "ENC[AES256_GCM,data:SEQIHMS8xUj6vsC1+1zTRG+h5BbqL0miA77UEh0UbiFOP7RgqhUlZgq+LmO7BRiIf4RHO13BZ5PXdKiZ96lgGcaquVnaEEQqv2NvkstXpwm3eLjUTJryMxfVupeir5g/FNXHETzhN425KD93EyMr4g7INJW4N4mHXmDnHJOJgS8rlKnSLG64cpgrlef8GAsGfp+i3ky2dig4jNQG8Ijdc46qtiyH9bs7k0d/YuNNmcZSaSIukNyyIMVTqlt6MV+9iUQ4Lj5h0pxgDLfjM1TNQAHRkWW4eozt7SO17U9td1DxvBF9TUdj3xbFCVo4c1OGw4hrjahvUAF8u1TEXBhhJfLqApDUBddRMxybk8Dy98jOHcb6Qwu3qUcgRt9XgkOktwgovS/B2WWAIWMTIZhyKm5ENriaTZWSp6n7hzkw1C1wXyCaP6YT0A4SSPPJt/DuTcBZ5BOFM10237NNgZA0Q7B5J5C57W88bhtzZ2aJZexyQYqQPrr5c38RwR00OAVGJeCgcq70JqeA5EpTuud20rBE0/dHHEPeVUBkrq8pjBHh4SYeMOh8g85CnlF31cxAcnrVJbO14hQQ8sQd4ZmkRNcY3EL981ruDy6Okd3K5AifmF/E9IEZwbvCSLY8EYANA+NV97ZsL4zJOWC6tnA1QHFDoqCR/POsupvGQetYpembrUY0WoB5XkfAvMicQCeLJe2H7S6pOVMDOIIZLx57vcO855LlIJiCpMw2ytqbBXRZolM2WXEBZDEL6BnrEydUnoiUCxqsUrdvQE3HTzktXKQww9jc6HLfBV1MvfScWq2fisGDlkrC2rI5VcWamm8Xbke4uTVcdbKlDpgbpC8NaWmmgNhFe50VNf7M/L5etnvuWWbY68epLZo7dsaaWVE584pdVFT+2K2GwWmGnMHKW+KKA6O9hFfdPUOsJj+eJiF9JX7OwLPAJILTjesWfHXivILBwjDyY5CBCHg91fsrPF37222O/HPPukveY/u6WBOt+co3Ch9mq9usdD7fhieo59IZ7aOJb7dxHSa99nBD8NZbwn6nJkgn3hpLfP9q/2TWcF/zSD1oGY7f1GVbEKEHj2hHv+OHMhFzgRhi5NtvGOO4l0aa1QE1eyRJgHLeqS5aL119Fh1+PSSN9/+v1q6l2JjYuQAV1BqzVdG2GS64J4PBxVqmZ3M9Qv2ZvH0Zwjs64M3MDUMNa5+HZAkPpThvrUWSCEFivIfiOi4Bt/h+HmyQb04LB5QuNFSiRpuF+fQcA+MmMQ==,iv:PL7Z5mKqbNbPfptREw9xFTiOQ1qiVkyxLPvDSoPvbbY=,tag:OPlhVLtN5IDdL/nkkj8+CQ==,type:str]", "sops": { "age": [ { @@ -11,8 +11,8 @@ "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA0Z2tONmQxTUhZUW12Z2Jm\nUnoxSnpYcnZDNGNzSko1ckl2RDh3NG1VS2dFCmIwUXhmSk1OUk02S0JPVDR5UWJ4\na0gwWlg0V005ZWxYa29PZ0laS2VqM0kKLS0tIHN5SU9pQ090eHljeXJGWm5hRFQ4\nZ001Nzkyb29RYkNUMDNDNlo4YnVQeTQK34bNIBgxId2+DHKQNVV3Iro3KGkE03Sp\niB1+dADT6nRvGvoyPqnLq/NYfw7eQ6XqYt55zkdCta8v6L1UNUkw8g==\n-----END AGE ENCRYPTED FILE-----\n" } ], - "lastmodified": "2025-07-05T10:52:55Z", - "mac": "ENC[AES256_GCM,data:qqct7oB1UmnwAnJ64U4eV7nCQIGGVU82ROidWlexNCb/zrl5+1mzJ1d5oeHojoi42g2jlKU8fAdTKdpewaOsmG+udiqwxsjrlxeXok6vvvVKBfeusA7rhqhQoF2Ct24PSY9PMGD8Nnwd43bVSlZLbHFfQyRtUbzsQ5YkivJtUo4=,iv:hle/CYmxHx1IcH7z4cxZmqMHE5VotOg/ethipEtsXoo=,tag:uM8luDulFJrZm3OfiSRH5Q==,type:str]", + "lastmodified": "2025-07-13T23:20:32Z", + "mac": "ENC[AES256_GCM,data:ibG9NVwVLf4UgdxnHbAToq5n12v4PPgPmnTn8PYg0LZfU2x6GaxRtNvWoFxDa9bEWMRzrlC5oV+hXsTxzJdYliafNTOxWjtOI/ME/HgEE8cU17HuJViWkR+CL+kzCelgFjCD3XajbTRzdTBtcI9icsUvnaManjlSvsgWmqNP36Y=,iv:uCy8Mv5HM611Qd4cvvEiDovnv1uuLZVSN7p7SV10zRA=,tag:fRjfyRkIIh5L97WVyNyxSQ==,type:str]", "pgp": [ { "created_at": "2025-06-14T22:31:01Z", diff --git a/nix/topology.nix b/nix/topology.nix index dd9ed27..9d1afd2 100644 --- a/nix/topology.nix +++ b/nix/topology.nix @@ -123,7 +123,7 @@ connections = { eth2 = mkConnection "nswitch" "eth1"; eth7 = mkConnection "pc" "eth1"; - eth8 = mkConnection "nbl-imba-2" "eth1"; + eth8 = mkConnection "pyramid" "eth1"; }; }; @@ -139,7 +139,7 @@ interfaces.eth1 = { }; }; - nbl-imba-2.interfaces.eth1 = { }; + pyramid.interfaces.eth1 = { }; switch-bedroom = mkSwitch "Switch Bedroom" { info = "TL-SG1005D"; diff --git a/secrets/nbl-imba-2/secrets.yaml b/secrets/pyramid/secrets.yaml similarity index 100% rename from secrets/nbl-imba-2/secrets.yaml rename to secrets/pyramid/secrets.yaml