router: add glance (very pretty)

.gitattributes

@@ -1 +0,0 @@
-private.nix  filter=crypt diff=crypt merge=crypt

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1747793476,
-        "narHash": "sha256-2qAOSixSrbb9l6MI+SI4zGineOzDcc2dgOOFK9Dx+IY=",
+        "lastModified": 1747009742,
+        "narHash": "sha256-TNhbM7R45fpq2cdWzvFj+H5ZTcE//I5XSe78GFh0cDY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2468b2d35512d093aeb04972a1d8c20a0735793f",
+        "rev": "c74665abd6e4e37d3140e68885bc49a994ffa53c",
         "type": "github"
       },
       "original": {
@@ -43,11 +43,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1747663185,
-        "narHash": "sha256-Obh50J+O9jhUM/FgXtI3he/QRNiV9+J53+l+RlKSaAk=",
+        "lastModified": 1742568034,
+        "narHash": "sha256-QaMEhcnscfF2MqB7flZr+sLJMMYZPnvqO4NYf9B4G38=",
         "owner": "nix-community",
         "repo": "nixos-generators",
-        "rev": "ee07ba0d36c38e9915c55d2ac5a8fb0f05f2afcc",
+        "rev": "42ee229088490e3777ed7d1162cb9e9d8c3dbb11",
         "type": "github"
       },
       "original": {
@@ -58,11 +58,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1747744144,
-        "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=",
+        "lastModified": 1746904237,
+        "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f",
+        "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956",
         "type": "github"
       },
       "original": {

flake.nix

@@ -34,7 +34,6 @@
           ./modules
           ./hosts/common.nix
           ./hosts/Yura-PC
-          ./users/cazzzer
           # https://nix-community.github.io/home-manager/index.xhtml#sec-flakes-nixos-module
           home-manager.nixosModules.home-manager
           {
@@ -53,9 +52,7 @@
         modules = [
           ./modules
           ./hosts/common.nix
-          ./hosts/hw-vm.nix
           ./hosts/vm
-          ./users/cazzzer
         ];
       };
       router = nixpkgs.lib.nixosSystem {
@@ -65,7 +62,6 @@
           ./modules
           ./hosts/common.nix
           ./hosts/router
-          ./users/cazzzer
         ];
       };
     };
@@ -76,25 +72,11 @@
         modules = [
           ./modules
           ./hosts/common.nix
-          ./hosts/hw-proxmox.nix
+          ./hosts/vm/proxmox.nix
           ./hosts/vm
-          ./users/cazzzer
         ];
         format = "proxmox";
       };
-      vm-proxmox = let
-        image = nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
-          modules = [
-            ./modules
-            ./hosts/common.nix
-            ./hosts/hw-proxmox.nix
-            ./hosts/vm
-            ./users/cazzzer
-          ];
-        };
-      in
-        image.config.system.build.VMA;
     };
   };
 }

home/default.nix

@@ -1,12 +1,15 @@
 { config, lib, pkgs, ... }:
 let
-  username = "cazzzer";
+  defaultFont = {
+    family = "Noto Sans";
+    pointSize = 14;
+  };
 in
 {
   # Home Manager needs a bit of information about you and the paths it should
   # manage.
-  home.username = username;
-  home.homeDirectory = "/home/${username}";
+  home.username = "cazzzer";
+  home.homeDirectory = "/home/cazzzer";
 
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;
@@ -123,15 +126,8 @@ in
   programs.plasma = {
     enable = true;
     overrideConfig = true;
-    # TODO: figure out how to enable tela-circle icon theme if installed in systemPackages
-    # workspace.iconTheme = if builtins.elem pkgs.tela-circle-icon-theme config.environment.systemPackages then "Tela-circle" else null;
     workspace.iconTheme = "Tela-circle";
-    fonts = let
-      defaultFont = {
-        family = "Noto Sans";
-        pointSize = 14;
-      };
-    in {
+    fonts = {
       general = defaultFont;
       fixedWidth = defaultFont // { family = "Hack"; };
       small = defaultFont // { pointSize = defaultFont.pointSize - 2; };

hosts/Yura-PC/default.nix

@@ -32,7 +32,7 @@
 
   boot.loader.timeout = 3;
   boot.loader.systemd-boot.configurationLimit = 5;
-  boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_14;
+  boot.kernelPackages = pkgs.linuxKernel.packages.linux_6_13;
 
   # https://nixos.wiki/wiki/Accelerated_Video_Playback
   hardware.graphics = {
@@ -88,7 +88,7 @@
   services.openssh.enable = true;
   services.flatpak.enable = true;
   # services.geoclue2.enable = true;
-  # location.provider = "geoclue2";
+  location.provider = "geoclue2";
   # services.gnome.gnome-keyring.enable = true;
   security.pam.services.sddm.enableGnomeKeyring = true;
   # security.pam.services.sddm.gnupg.enable = true;
@@ -97,6 +97,42 @@
   # Enable touchpad support (enabled default in most desktopManager).
   # services.xserver.libinput.enable = true;
 
+  # Define a user account. Don't forget to set a password with ‘passwd’.
+  users.groups = {
+    cazzzer = {
+      gid = 1000;
+    };
+  };
+  users.users.cazzzer = {
+    isNormalUser = true;
+    description = "Yura";
+    uid = 1000;
+    group = "cazzzer";
+    extraGroups = [ "networkmanager" "wheel" "docker" "wireshark" "geoclue" ];
+    packages = with pkgs; [
+      # Python
+      python3
+      poetry
+
+      # Haskell
+      haskellPackages.ghc
+      haskellPackages.stack
+
+      # Node
+      nodejs_22
+      pnpm
+      bun
+
+      # Nix
+      nixd
+      nil
+
+      # Gleam
+      gleam
+      beamMinimal26Packages.erlang
+    ];
+  };
+
   hardware.bluetooth.enable = true;
   hardware.bluetooth.powerOnBoot = false;
   # Install firefox.
@@ -132,6 +168,9 @@
     # };
   # };
 
+  # Allow unfree packages
+  nixpkgs.config.allowUnfree = true;
+
   # List packages installed in system profile. To search, run:
   # $ nix search wget
 
@@ -177,11 +216,9 @@
     fd
     helix
     micro
-    openssl
     ripgrep
     starship
     tealdeer
-    transcrypt
   ] ++ [
     efibootmgr
     ffmpeg

hosts/hw-proxmox.nix

@@ -1,16 +0,0 @@
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
-  imports = [
-    "${modulesPath}/virtualisation/proxmox-image.nix"
-  ];
-
-  # boot.kernelParams = [ "console=tty0" ];
-  proxmox.qemuConf.bios = "ovmf";
-  proxmox.qemuExtraConf = {
-    machine = "q35";
-    # efidisk0 = "local-lvm:vm-9999-disk-1";
-    cpu = "host";
-  };
-  proxmox.cloudInit.enable = false;
-}

hosts/hw-vm.nix

@@ -1,26 +0,0 @@
-{ config, lib, pkgs, modulesPath, ... }: {
-  imports = [
-    "${modulesPath}/profiles/qemu-guest.nix"
-  ];
-
-  boot.initrd.availableKernelModules = lib.mkDefault [ "uhci_hcd" "ehci_pci" "ahci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
-
-  fileSystems."/" = lib.mkDefault {
-    device = "/dev/disk/by-label/nixos";
-    autoResize = true;
-    fsType = "ext4";
-  };
-  fileSystems."/boot" = lib.mkDefault {
-    device = "/dev/disk/by-label/ESP";
-    fsType = "vfat";
-  };
-
-  # 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.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp6s18.useDHCP = lib.mkDefault true;
-
-  # nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-}

hosts/router/default.nix

@@ -53,6 +53,24 @@ in
 
   security.sudo.wheelNeedsPassword = false;
 
+  users.groups = {
+    cazzzer = {
+      gid = 1000;
+    };
+  };
+  users.users.cazzzer = {
+    password = "";
+    openssh.authorizedKeys.keys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPWgEzbEjbbu96MVQzkiuCrw+UGYAXN4sRe2zM6FVopq cazzzer@Yura-PC"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIApFeLVi3BOquL0Rt+gQK2CutNHaBDQ0m4PcGWf9Bc43 cazzzer@Yura-TPX13"
+    ];
+    isNormalUser = true;
+    description = "Yura";
+    uid = 1000;
+    group = "cazzzer";
+    extraGroups = [ "wheel" "wireshark" ];
+  };
+
   programs.firefox.enable = true;
   programs.fish.enable = true;
   programs.git.enable = true;
@@ -72,12 +90,10 @@ in
     lsof
     micro
     mpv
-    openssl
     ripgrep
     rustscan
     starship
     tealdeer
-    transcrypt
     waypipe
     whois
   ];

hosts/router/private.nix

@@ -1,2 +0,0 @@
-U2FsdGVkX1/98w32OE1ppwT0I5A3UOTKCLJfvk+TQdrbf0TLfYNZ9TC9n8cH2hC9
-ObKVuFlOLwHlzeBy7MXaLg==

hosts/router/services.nix

@@ -58,7 +58,7 @@ in
     enable = true;
     package = pkgs.caddy.withPlugins {
       plugins = [ "github.com/caddy-dns/cloudflare@v0.2.1" ];
-      hash = "sha256-Gsuo+ripJSgKSYOM9/yl6Kt/6BFCA6BuTDvPdteinAI=";
+      hash = "sha256-saKJatiBZ4775IV2C5JLOmZ4BwHKFtRZan94aS5pO90=";
     };
     virtualHosts."grouter.${domain}".extraConfig = ''
       encode

hosts/router/vars.nix

@@ -1,6 +1,4 @@
 let
-  private = import ./private.nix;
-
   mkIfConfig = {
     name_,
     domain_,
@@ -45,7 +43,7 @@ rec {
   };
 
   p4 = "10.17";                      # .0.0/16
-  pdFromWan = private.pdFromWan;  # ::/60
+  pdFromWan = "";  # ::/60
   ulaPrefix = "fdab:07d3:581d";      # ::/48
   ifs = rec {
     wan = rec {

hosts/vm/default.nix

@@ -7,7 +7,7 @@
 {
   imports =
     [ # Include the results of the hardware scan.
-      # ./hardware-configuration.nix
+#      ./hardware-configuration-vm.nix
     ];
   mods.kb-input.enable = false;
 
@@ -47,8 +47,8 @@
   services.flatpak.enable = true;
 
   # VM services
-  # services.cloud-init.enable = false;
-  # services.cloud-init.network.enable = false;
+  services.cloud-init.enable = true;
+#  services.cloud-init.network.enable = false;
   services.qemuGuest.enable = true;
   services.spice-vdagentd.enable = true;
   services.openssh.enable = true;
@@ -57,6 +57,24 @@
 
   security.sudo.wheelNeedsPassword = false;
 
+  users.groups = {
+    cazzzer = {
+      gid = 1000;
+    };
+  };
+  users.users.cazzzer = {
+    password = "";
+    openssh.authorizedKeys.keys = [
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPWgEzbEjbbu96MVQzkiuCrw+UGYAXN4sRe2zM6FVopq cazzzer@Yura-PC"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIApFeLVi3BOquL0Rt+gQK2CutNHaBDQ0m4PcGWf9Bc43 cazzzer@Yura-TPX13"
+    ];
+    isNormalUser = true;
+    description = "Yura";
+    uid = 1000;
+    group = "cazzzer";
+    extraGroups = [ "wheel" "docker" "wireshark" ];
+  };
+
   # Install firefox.
   programs.firefox.enable = true;
   programs.fish.enable = true;
@@ -95,11 +113,9 @@
     ldns
     micro
     mpv
-    openssl
     ripgrep
     starship
     tealdeer
-    transcrypt
     waypipe
     whois
     zfs

hosts/vm/hardware-configuration.nix

@@ -0,0 +1,37 @@
+# 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 + "/profiles/qemu-guest.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/da85e220-e2b0-443a-9a0c-a9516b8e5030";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/3F96-8974";
+      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
+    };
+
+  swapDevices = [ ];
+
+  # 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.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp6s18.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+}

hosts/vm/proxmox.nix

@@ -0,0 +1,11 @@
+{ ... }:
+
+{
+#  boot.kernelParams = [ "console=tty0" ];
+  proxmox.qemuConf.bios = "ovmf";
+  proxmox.qemuExtraConf = {
+    machine = "q35";
+#    efidisk0 = "local-lvm:vm-9999-disk-1";
+    cpu = "host";
+  };
+}

users/cazzzer/default.nix

@@ -1,42 +0,0 @@
-{ config, lib, pkgs, ... }: {
-  users.groups.cazzzer.gid = 1000;
-  users.users.cazzzer = {
-    uid = 1000;
-    isNormalUser = true;
-    description = "Yura";
-    group = "cazzzer";
-    extraGroups = [ "wheel" ]
-      ++ lib.optionals config.networking.networkmanager.enable [ "networkmanager" ]
-      ++ lib.optionals config.virtualisation.docker.enable [ "docker" ]
-      ++ lib.optionals config.programs.wireshark.enable [ "wireshark" ]
-    ;
-    openssh.authorizedKeys.keys = [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE02AhJIZtrtZ+5sZhna39LUUCEojQzmz2BDWguT9ZHG yuri@tati.sh"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHczlipzGWv8c6oYwt2/9ykes5ElfneywDXBTOYbfSfn Pixel7Pro"
-    ];
-    # TODO: think of a better way to do this
-    packages = with pkgs; lib.optionals (config.networking.hostName == "Yura-PC") [
-      # Python
-      python3
-      poetry
-
-      # Haskell
-      haskellPackages.ghc
-      haskellPackages.stack
-
-      # Node
-      nodejs_22
-      pnpm
-      bun
-
-      # Nix
-      nil
-      nixd
-      nixfmt-rfc-style
-
-      # Gleam
-      gleam
-      beamMinimal26Packages.erlang
-    ];
-  };
-}