From b7fba1c6ba5379cbad60728541259538df5096ec Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Sun, 3 Sep 2023 11:45:42 +0200
Subject: l shodan.r: remove containers, add trusted users

---
 lass/1systems/shodan/config.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'lass/1systems/shodan')

diff --git a/lass/1systems/shodan/config.nix b/lass/1systems/shodan/config.nix
index 5e48c216a..0bea37e5c 100644
--- a/lass/1systems/shodan/config.nix
+++ b/lass/1systems/shodan/config.nix
@@ -13,13 +13,9 @@
     <stockholm/lass/2configs/programs.nix>
     <stockholm/lass/2configs/wine.nix>
     <stockholm/lass/2configs/bitcoin.nix>
-    <stockholm/lass/2configs/blue-host.nix>
-    <stockholm/lass/2configs/green-host.nix>
-    <stockholm/krebs/2configs/news-host.nix>
     <stockholm/lass/2configs/yellow-mounts/samba.nix>
     <stockholm/lass/2configs/fetchWallpaper.nix>
     <stockholm/lass/2configs/consul.nix>
-    <stockholm/lass/2configs/red-host.nix>
     <stockholm/lass/2configs/snapclient.nix>
   ];
 
@@ -27,4 +23,6 @@
 
   services.logind.lidSwitch = "ignore";
   services.logind.lidSwitchDocked = "ignore";
+  nix.trustedUsers = [ "root" "lass" ];
+  system.stateVersion = "22.05";
 }
-- 
cgit v1.2.3


From f55307fd73af235069744dd5155fda0bc73fe613 Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Thu, 7 Sep 2023 12:26:31 +0200
Subject: lass: migrate away

---
 lass/1systems/shodan/config.nix   | 28 ------------------------
 lass/1systems/shodan/physical.nix | 45 ---------------------------------------
 2 files changed, 73 deletions(-)
 delete mode 100644 lass/1systems/shodan/config.nix
 delete mode 100644 lass/1systems/shodan/physical.nix

(limited to 'lass/1systems/shodan')

diff --git a/lass/1systems/shodan/config.nix b/lass/1systems/shodan/config.nix
deleted file mode 100644
index 0bea37e5c..000000000
--- a/lass/1systems/shodan/config.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  imports = [
-    <stockholm/lass>
-
-    <stockholm/lass/2configs/mouse.nix>
-    <stockholm/lass/2configs/retiolum.nix>
-    <stockholm/lass/2configs/baseX.nix>
-    <stockholm/lass/2configs/pipewire.nix>
-    <stockholm/lass/2configs/exim-retiolum.nix>
-    <stockholm/lass/2configs/browsers.nix>
-    <stockholm/lass/2configs/programs.nix>
-    <stockholm/lass/2configs/wine.nix>
-    <stockholm/lass/2configs/bitcoin.nix>
-    <stockholm/lass/2configs/yellow-mounts/samba.nix>
-    <stockholm/lass/2configs/fetchWallpaper.nix>
-    <stockholm/lass/2configs/consul.nix>
-    <stockholm/lass/2configs/snapclient.nix>
-  ];
-
-  krebs.build.host = config.krebs.hosts.shodan;
-
-  services.logind.lidSwitch = "ignore";
-  services.logind.lidSwitchDocked = "ignore";
-  nix.trustedUsers = [ "root" "lass" ];
-  system.stateVersion = "22.05";
-}
diff --git a/lass/1systems/shodan/physical.nix b/lass/1systems/shodan/physical.nix
deleted file mode 100644
index f94edcf9b..000000000
--- a/lass/1systems/shodan/physical.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  #TODO reinstall with correct layout and use lass/hw/x220
-  imports = [
-    ./config.nix
-    <stockholm/krebs/2configs/hw/x220.nix>
-  ];
-
-  boot = {
-    loader.grub.enable = true;
-    loader.grub.version = 2;
-    loader.grub.device = "/dev/sda";
-
-    initrd.luks.devices.lusksroot.device = "/dev/sda2";
-    initrd.availableKernelModules = [ "xhci_hcd" "ehci_pci" "ahci" "usb_storage" ];
-  };
-  fileSystems = {
-    "/" = {
-      device = "/dev/pool/nix";
-      fsType = "btrfs";
-    };
-
-    "/boot" = {
-      device = "/dev/sda1";
-    };
-    "/home" = {
-      device = "/dev/mapper/pool-home";
-      fsType = "btrfs";
-      options = ["defaults" "noatime" "ssd" "compress=lzo"];
-    };
-    "/bku" = {
-      device = "/dev/pool/bku";
-      fsType = "btrfs";
-    };
-    "/backups" = {
-      device = "/dev/pool/backup";
-      fsType = "ext4";
-    };
-  };
-
-  services.udev.extraRules = ''
-    SUBSYSTEM=="net", ATTR{address}=="a0:88:b4:29:26:bc", NAME="wl0"
-    SUBSYSTEM=="net", ATTR{address}=="f0:de:f1:0c:a7:63", NAME="et0"
-    SUBSYSTEM=="net", ATTR{address}=="00:e0:4c:69:ea:71", NAME="int0"
-  '';
-}
-- 
cgit v1.2.3