add website (caddy) config, add mpd, add pc config, remove 9p mount from run.sh, improve greet mixin

4 files changed, 114 insertions, 6 deletions

diff --git a/hosts/pc/cfg.nix b/hosts/pc/cfg.nix
new file mode 100644
index 0000000..10267b5
--- /dev/null
+++ b/hosts/pc/cfg.nix
@@ -0,0 +1,93 @@
+{config, lib, pkgs, ...}: {
+  imports = [
+    ../../profiles/core.nix
+    ../../profiles/user.nix
+    ../../profiles/ssh.nix
+    ../../profiles/graphical.nix
+    ../../mixins/tailscale.nix
+    ../../mixins/cli.nix
+    ../../mixins/greet.nix
+    # ../../mixins/hyprland.nix
+    ../../mixins/sway.nix
+  ];
+
+  config = {
+    _module.args.nixinate = {
+      host = "pc";
+      sshUser = "tzlil";
+      buildOn = "remote"; # valid args are "local" or "remote"
+      substituteOnTarget = true; # if buildOn is "local" then it will substitute on the target, "-s"
+      hermetic = false;
+    };
+    networking.hostName = "pc";
+
+    
+    boot = {
+      initrd = {
+        supportedFilesystems = ["btrfs"];
+        availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" ];
+      };
+      kernelModules = [ "kvm-amd" ];
+      kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
+      kernelParams = [
+        "console=ttyS0"
+        "init_on_free=1"
+        "page_poison=1"
+        "page_alloc.shuffle=1"
+        "slab_nomerge"
+        "vsyscall=none"
+      ];
+      cleanTmpDir = true;
+      loader = {
+        systemd-boot = {
+          enable = true;
+        };
+        efi = {
+          canTouchEfiVariables = true;
+          efiSysMountPoint = "/boot";
+        };
+      };
+    };
+
+    time.timeZone = lib.mkDefault "Israel";
+
+    fileSystems = {
+      "/" =
+        { device = "/dev/disk/by-uuid/3fe7d38b-bb95-41ca-afce-1b0b89cbcd8b";
+          fsType = "btrfs";
+          options = [ "subvol=root" ];
+        };
+
+      "/nix" =
+        { device = "/dev/disk/by-uuid/3fe7d38b-bb95-41ca-afce-1b0b89cbcd8b";
+          fsType = "btrfs";
+          options = [ "subvol=nix" ];
+        };
+
+      "/home" =
+        { device = "/dev/disk/by-uuid/3fe7d38b-bb95-41ca-afce-1b0b89cbcd8b";
+          fsType = "btrfs";
+          options = [ "subvol=home" ];
+        };
+
+      "/swap" =
+        { device = "/dev/disk/by-uuid/3fe7d38b-bb95-41ca-afce-1b0b89cbcd8b";
+          fsType = "btrfs";
+          options = [ "subvol=swap" ];
+        };
+      "/boot" =
+        { device = "/dev/disk/by-uuid/D999-2D99";
+          fsType = "vfat";
+        };
+    };
+
+    zramSwap = {
+      enable = true;
+      algorithm = "zstd";
+    };
+
+    hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+    hardware.video.hidpi.enable = lib.mkDefault true;
+    # greeter.initialSession = "sh -c hyprland";
+  };
+}
\ No newline at end of file
diff --git a/hosts/vm/cfg.nix b/hosts/vm/cfg.nix
index 4084ef9..4af1667 100644
--- a/hosts/vm/cfg.nix
+++ b/hosts/vm/cfg.nix
@@ -3,12 +3,12 @@
     ../../profiles/core.nix
     ../../profiles/user.nix
     ../../profiles/ssh.nix
-    # ../../profiles/graphical.nix
+    ../../profiles/graphical.nix
     ../../mixins/tailscale.nix
     ../../mixins/cli.nix
-    # ../../mixins/greet.nix
+    ../../mixins/greet.nix
     # ../../mixins/hyprland.nix
-    # ../../mixins/sway.nix
+    ../../mixins/sway.nix
   ];
 
   config = {
@@ -72,6 +72,6 @@
       algorithm = "zstd";
     };
 
-    # greeter.initialSession = "sh -c hyprland";
+    # greeter.initialSession = "sh -c sway";
   };
 }
\ No newline at end of file
diff --git a/hosts/vps/cfg.nix b/hosts/vps/cfg.nix
index 25da42b..3e220c3 100644
--- a/hosts/vps/cfg.nix
+++ b/hosts/vps/cfg.nix
@@ -9,8 +9,8 @@
 
   config = {
     _module.args.nixinate = {
-      host = "100.67.217.90";
-      sshUser = "nixos";
+      host = "vps";
+      sshUser = "tzlil";
       buildOn = "remote"; # valid args are "local" or "remote"
       substituteOnTarget = true; # if buildOn is "local" then it will substitute on the target, "-s"
       hermetic = false;
diff --git a/hosts/vps/website.nix b/hosts/vps/website.nix
new file mode 100644
index 0000000..156e5da
--- /dev/null
+++ b/hosts/vps/website.nix
@@ -0,0 +1,15 @@
+{ pkgs, config, ... }:
+
+{
+  config = {
+    services.caddy = {
+      enable = true;
+      virtualHosts."https://tzlil.club".extraConfig = ''
+        try_files ${pkgs.writeText "index.html" ''
+          hello world
+        ''} /
+      '';
+    };
+    networking.firewall.allowedTCPPorts = [443];
+  };
+}
\ No newline at end of file