ops: tewi init

darwin/systems/sumireko.nix

@@ -3,7 +3,7 @@
     hardware.aarch64-darwin
       darwin.base
       darwin.kat
-    home.emacs
+      home.work
   ];
 
   security.pam.enableSudoTouchIdAuth = true;
@@ -54,29 +54,30 @@
   homebrew = {
     brewPrefix = "/opt/homebrew/bin";
     casks = [
-      "element"
-      "visual-studio-code"
-      "firefox"
-      "telegram"
-      "discord"
       "utm"
         "mullvadvpn"
+        "android-studio"
         "bitwarden"
+        "telegram"
+        "deluge"
+        "element"
+        "discord"
+        "firefox"
         "gimp"
         "cyberduck"
+        "docker"
+        "google-chrome"
+        "android-studio"
+        "linear-linear"
+        "pycharm-ce"
+        "parsec"
+        "nextcloud"
+        "slack"
     ];
     masApps = {
       Tailscale = 1475387142;
     };
   };
 
-  environment.systemPackages = with pkgs; [
-    terraform
-    yt-dlp
-    k2tf
-    awscli
-    jq
-  ];
-
   system.stateVersion = 4;
-}
+                                          }

home/default.nix

@@ -44,5 +44,13 @@ in
         qt
       ];
 		};
+    work = {
+			imports = with dirImports; [
+			work
+			wezterm
+			emacs
+			];
+		};
+
   services = serviceImports;
 }

home/vim/init.lua

@@ -84,7 +84,7 @@ opt.hlsearch = true                           -- Highlight matches with last sea
 -----------------------------------------------------------
 -- Tabs, indent
 -----------------------------------------------------------
-opt.expandtab = false       -- Use spaces instead of tabs
+opt.expandtab = true       -- Use spaces instead of tabs
 opt.shiftwidth = 2          -- Shift 2 spaces when tab
 opt.tabstop = 2             -- 1 tab == 2 spaces
 opt.smartindent = true      -- Autoindent new lines

home/work/packages.nix

@@ -0,0 +1,4 @@
+{ config, pkgs, ... }: {
+	home.packages = with pkgs; [
+	];
+}

modules/darwin/applications.nix

@@ -0,0 +1,13 @@
+{config, pkgs, ... }: {
+	system.activationScripts.applications.text = pkgs.lib.mkForce (
+    ''
+      echo "setting up ~/Applications..." >&2
+      rm -rf ~/Applications/Nix\ Apps
+      mkdir -p ~/Applications/Nix\ Apps
+      for app in $(find ${config.system.build.applications}/Applications -maxdepth 1 -type l); do
+        src="$(/usr/bin/stat -f%Y "$app")"
+        cp -r "$src" ~/Applications/Nix\ Apps
+      done
+    ''
+  );
+}

nixos/systems/tewi.nix

@@ -0,0 +1,71 @@
+{ meta, config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
+
+  ];
+
+  deploy.tf = {
+    resources.tewi = {
+      provider = "null";
+      type = "resource";
+      connection = {
+        port = lib.head config.services.openssh.ports;
+        host = config.network.addresses.private.nixos.ipv4.address;
+      };
+    };
+  };
+
+  networking = {
+    useDHCP = false;
+    interfaces = {
+      eno1 = {
+        useDHCP = true;
+      };
+    };
+  };
+
+  network = {
+    addresses = {
+      private = {
+        enable = true;
+        nixos = {
+          ipv4.address = "10.1.1.38";
+        };
+      };
+    };
+  };
+
+  boot = {
+    loader = {
+      systemd-boot = {
+        enable = true;
+      };
+      efi = {
+        canTouchEfiVariables = true;
+      };
+    };
+    initrd = {
+      availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+    };
+    kernelModules = [ "kvm-intel" ];
+  };
+
+  fileSystems = {
+    "/" = {
+      device = "/dev/disk/by-uuid/6c5d82b1-5d11-4c72-96c6-5f90e6ce57f5";
+      fsType = "ext4";
+    };
+    "/boot" = {
+      device = "/dev/disk/by-uuid/85DC-72FA";
+      fsType = "vfat";
+    };
+  };
+
+  swapDevices = lib.singleton ({
+    device = "/dev/disk/by-uuid/137605d3-5e3f-47c8-8070-6783ce651932";
+  });
+
+  system.stateVersion = "21.05";
+}

overlays/local/default.nix

@@ -12,6 +12,6 @@ final: prev: {
   gensokyoZone = final.callPackage ./gensokyoZone { };
 	oomox = final.callPackage ./oomox.nix { };
 	wezterm = final.callPackage ./wezterm {
-    inherit (final.darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation;
+    inherit (final.darwin.apple_sdk.frameworks) Cocoa CoreGraphics Foundation UserNotifications;
 	};
 }

overlays/local/wezterm/default.nix

@@ -21,6 +21,7 @@
 , CoreGraphics
 , Cocoa
 , Foundation
+, UserNotifications
 , libiconv
 , nixosTests
 , runCommand
@@ -69,6 +70,7 @@ rustPlatform.buildRustPackage rec {
   ] ++ lib.optionals stdenv.isDarwin [
     Cocoa
     CoreGraphics
+		UserNotifications
     Foundation
     libiconv
   ];

services/tvheadend.nix

@@ -7,9 +7,14 @@
   users.users.tvheadend.group = "tvheadend";
   users.groups.tvheadend = {};
 
-  network.firewall.public = {
+  network.firewall = {
+		private = {
     tcp.ports = [ 9981 9982 ];
 		};
+		public = {
+    tcp.ports = [ 9981 9982 ];
+		};
+	};
 
   systemd.services.antennas = {
     wantedBy = [ "plex.service" ];

tf

@@ -1 +1 @@
-Subproject commit f16be2a91179d35803e30d3f4a8233156a8faa3f
+Subproject commit 68e0630db630afab4152e4a3ae8a6837675c016f