updating website

flake.lock

@@ -390,11 +390,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1724050814,
+        "lastModified": 1731920409,
-        "narHash": "sha256-THf50ZcBPY6r7/cyvE8bxYDvrctHrWbYaMx4udr4OUM=",
+        "narHash": "sha256-bMjdNGoWJXaWIGtfxcODmmrNoONnwN3hS73cDTRC1Pk=",
         "ref": "main",
-        "rev": "7628c26fd92f684ab5c7572c63de4af8b4b3a7b4",
+        "rev": "a87e348a46fd04dbe35ee9accf710eeec42ecbb6",
-        "revCount": 1464,
+        "revCount": 1530,
         "type": "git",
         "url": "ssh://gitea@git.sealight.xyz/aynish/kitaab"
       },

flake.nix

@@ -27,7 +27,8 @@
     poonam.url = "git+ssh://gitea@git.sealight.xyz/aynish/kitaab?ref=main";
     poonam.inputs.nixpkgs.follows = "nixpkgs";
     basant.url = "git+ssh://gitea@git.sealight.xyz/aynish/basant?ref=main";
-    vimwikicli.url = "git+ssh://gitea@git.sealight.xyz/aynish/vimwiki-cli?ref=main";
+    vimwikicli.url =
+      "git+ssh://gitea@git.sealight.xyz/aynish/vimwiki-cli?ref=main";
     basant.inputs.nixpkgs.follows = "nixpkgs";
     basant.inputs.poonam.follows = "poonam";
     vimwikicli.inputs.nixpkgs.follows = "nixpkgs";
@@ -54,24 +55,9 @@
     # muneem.inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs =
+  outputs = { self, nixpkgs, unstable, nixos-hardware, home-manager, deploy-rs
-    { self
+    , agenix, disko, basant, grasp, nix-matrix-appservices, nur, tidalcycles
-    , nixpkgs
+    , rust-overlay, vimwikicli, ... }@inputs:
-    , unstable
-    , nixos-hardware
-    , home-manager
-    , deploy-rs
-    , agenix
-    , disko
-    , basant
-    , grasp
-    , nix-matrix-appservices
-    , nur
-    , tidalcycles
-    , rust-overlay
-    , vimwikicli
-    , ...
-    }@inputs:
     let
       forAllSystems = nixpkgs.lib.genAttrs [
         "aarch64-linux"
@@ -89,59 +75,59 @@
         vimwiki-cli = vimwikicli.packages.${prev.system}.vimwiki-cli;
       };
 
-      nixpkgsFor = forAllSystems (system: import nixpkgs {
+      nixpkgsFor = forAllSystems (system:
-        inherit system;
+        import nixpkgs {
-        config.allowUnfreePredicate = pkg: builtins.elem (nixpkgs.lib.getName pkg) [
+          inherit system;
-          "ripcord"
+          config.allowUnfreePredicate = pkg:
-          "vcv-rack"
+            builtins.elem (nixpkgs.lib.getName pkg) [
-          "SunVox"
+              "ripcord"
-          "renoise"
+              "vcv-rack"
-        ];
+              "SunVox"
-        # config.permittedInsecurePackages = [
+              "renoise"
-        #   "python3.10-django-3.1.14" # Needed for archivebox deployments on curve
+            ];
-        #   # Check when archive box updates it's dependeny
+          # config.permittedInsecurePackages = [
-        # ];
+          #   "python3.10-django-3.1.14" # Needed for archivebox deployments on curve
-        overlays = [
+          #   # Check when archive box updates it's dependeny
-          rust-overlay.overlays.default
+          # ];
-          tidalcycles.overlays.default
+          overlays = [
-          agenix.overlays.default
+            rust-overlay.overlays.default
-          nur.overlay
+            tidalcycles.overlays.default
-          nix-matrix-appservices.overlay
+            agenix.overlays.default
-          unstableOverlay
+            nur.overlay
-          vimwikiOverlay
+            nix-matrix-appservices.overlay
-          self.overlays.additions
+            unstableOverlay
-          self.overlays.modifications
+            vimwikiOverlay
-        ];
+            self.overlays.additions
-      });
+            self.overlays.modifications
+          ];
+        });
 
       # for when space matters
-      litePkgsFor = forAllSystems (system: import nixpkgs {
+      litePkgsFor = forAllSystems (system:
-        inherit system;
+        import nixpkgs {
-        # config.permittedInsecurePackages = [
+          inherit system;
-        #   "forgejo-1.19.4-0" # Needed for archivebox deployments on curve
+          # config.permittedInsecurePackages = [
-        #   # Check when archive box updates it's dependeny
+          #   "forgejo-1.19.4-0" # Needed for archivebox deployments on curve
-        # ];
+          #   # Check when archive box updates it's dependeny
-        overlays = [
+          # ];
-          agenix.overlays.default
+          overlays = [
-          self.overlays.additions
+            agenix.overlays.default
-          self.overlays.modifications
+            self.overlays.additions
-          tidalcycles.overlays.default # needed for nvim which comes pre-installed lol
+            self.overlays.modifications
-        ];
+            tidalcycles.overlays.default # needed for nvim which comes pre-installed lol
-      });
+          ];
-    in
+        });
-    {
+    in {
       # Your custom packages
       # Acessible through 'nix build', 'nix shell', etc
       packages = forAllSystems (system:
         let pkgs = nixpkgsFor.${system};
-        in import ./pkgs { pkgs = pkgs; }
+        in import ./pkgs { pkgs = pkgs; });
-      );
       # Devshell for bootstrapping
       # Acessible through 'nix develop' or 'nix-shell' (legacy)
       devShells = forAllSystems (system:
         let pkgs = nixpkgsFor.${system};
-        in import ./shell.nix { pkgs = pkgs; }
+        in import ./shell.nix { pkgs = pkgs; });
-      );
 
       # Your custom packages and modifications, exported as overlays
       overlays = import ./overlays;
@@ -233,7 +219,7 @@
               nix.registry.nixpkgs.flake = nixpkgs;
               home-manager.useGlobalPkgs = true;
               home-manager.useUserPackages = true;
-              home-manager.users.anish = import ./home/core;
+              home-manager.users.anish = import ./home/dev;
             }
           ];
         };
@@ -243,12 +229,10 @@
       # Available through 'home-manager --flake .#your-username@your-hostname'
       homeConfigurations = {
         "anish@work" = home-manager.lib.homeManagerConfiguration {
-          pkgs = nixpkgsFor."x86_64-linux"; # Home-manager requires 'pkgs' instance
+          pkgs =
+            nixpkgsFor."x86_64-linux"; # Home-manager requires 'pkgs' instance
           extraSpecialArgs = { inherit inputs; };
-          modules = [
+          modules = [ ./home/core.nix ./home/profiles/firefox ];
-            ./home/core.nix
-            ./home/profiles/firefox
-          ];
         };
       };
 
@@ -260,7 +244,8 @@
           remoteBuild = true;
           profiles.system = {
             user = "root";
-            path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.box;
+            path = deploy-rs.lib.x86_64-linux.activate.nixos
+              self.nixosConfigurations.box;
           };
         };
         lituus = {
@@ -268,7 +253,8 @@
           # autoRollback = false;
           profiles.system = {
             user = "root";
-            path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.lituus;
+            path = deploy-rs.lib.x86_64-linux.activate.nixos
+              self.nixosConfigurations.lituus;
           };
         };
         helix = {
@@ -277,11 +263,13 @@
           magicRollback = false;
           profiles.system = {
             user = "root";
-            path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.helix;
+            path = deploy-rs.lib.x86_64-linux.activate.nixos
+              self.nixosConfigurations.helix;
           };
         };
       };
 
-      checks = builtins.mapAttrs (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib;
+      checks = builtins.mapAttrs
+        (system: deployLib: deployLib.deployChecks self.deploy) deploy-rs.lib;
     };
 }

home/dev/default.nix

@@ -0,0 +1,5 @@
+{ self, pkgs, ... }: {
+  imports =
+    [ ../profiles/cli ../profiles/nvim ../profiles/direnv ../profiles/git ];
+  home.stateVersion = "22.05";
+}

hosts/box/default.nix

@@ -1,5 +1,4 @@
-{ self, pkgs, ... }:
+{ self, pkgs, ... }: {
-{
   imports = [
     ./configuration.nix
     ../profiles/core
@@ -48,7 +47,7 @@
       "/data/books" # calibre-web
       # "/home/anish/usr/nonfiction" # syncthing
       "/home/anish/usr/finance" # beancount
-      "/mnt/two/postgres" # sealight postgres backups TODO remove once moved to capsul 
+      "/mnt/two/postgres" # sealight postgres backups TODO remove once moved to capsul
     ];
     # seafile
   };
@@ -72,6 +71,18 @@
     };
   };
 
+  services.nginx.virtualHosts."mast.mossnet.lan" = {
+    enableACME = false;
+    forceSSL = false;
+
+    locations."/" = {
+      extraConfig = ''
+        proxy_pass http://localhost:5731/;
+        proxy_set_header X-Forwarded-Host $host;
+      '';
+    };
+  };
+
   age.secrets.box-wg.file = "${self}/secrets/box-wg.age";
   age.secrets.box-wg.owner = "anish";
   age.secrets.borg-key.file = "${self}/secrets/borg-key.age";

hosts/curve/default.nix

@@ -1,5 +1,4 @@
-{ self, pkgs, ... }:
+{ self, pkgs, ... }: {
-{
   imports = [
     ./configuration.nix
     ../users/anish
@@ -17,19 +16,26 @@
     # ../profiles/mount-mossnet
   ];
 
+  # temporarily allow ssh access for work, to be able to do deploy new services
+  services.openssh = {
+    enable = true;
+    settings.PasswordAuthentication = false;
+    settings.PermitRootLogin = "no";
+  };
+
   # import profiling tools
   programs.systemtap.enable = true;
 
   virtualisation.docker.enable = true;
   virtualisation.docker.storageDriver = "btrfs";
-  environment.systemPackages = with pkgs; [
+  environment.systemPackages = with pkgs; [ docker-compose ];
-    docker-compose  
-  ];
 
   # Speed up boot by removing dependency on network 
   systemd = {
-    targets.network-online.wantedBy = pkgs.lib.mkForce [ ]; # Normally ["multi-user.target"]
+    targets.network-online.wantedBy =
-    services.NetworkManager-wait-online.wantedBy = pkgs.lib.mkForce [ ]; # Normally ["network-online.target"]
+      pkgs.lib.mkForce [ ]; # Normally ["multi-user.target"]
+    services.NetworkManager-wait-online.wantedBy =
+      pkgs.lib.mkForce [ ]; # Normally ["network-online.target"]
   };
 
   programs.gnupg.agent.enable = true;
@@ -64,8 +70,15 @@
 
   # lazy enable of ports necessary for KDE connect which is installed via cli home profile (for some reason?)
   networking.firewall = {
-    allowedTCPPortRanges = [{ from = 1714; to = 1764; }];
+    allowedTCPPorts = [ 22 ]; # allow ssh
-    allowedUDPPortRanges = [{ from = 1714; to = 1764; }];
+    allowedTCPPortRanges = [{
+      from = 1714;
+      to = 1764;
+    }];
+    allowedUDPPortRanges = [{
+      from = 1714;
+      to = 1764;
+    }];
   };
 
   age.secrets.curve-wg.file = "${self}/secrets/curve-wg.age";
@@ -81,10 +94,7 @@
   mossnet.backup = {
     enable = true;
     name = "curve";
-    paths = [
+    paths = [ "/home/anish/usr" "/home/anish/.ssh" ];
-      "/home/anish/usr"
-      "/home/anish/.ssh"
-    ];
   };
 
   # enable adb 
@@ -93,7 +103,8 @@
   #virtualisation.docker.enable = true;
   boot.blacklistedKernelModules = [ "qcserial" ];
   # Used for packer Capsul
-  users.users.anish.extraGroups = [ "adbusers" "wheel" "plugdev" "libvertd" "docker" ];
+  users.users.anish.extraGroups =
+    [ "adbusers" "wheel" "plugdev" "libvertd" "docker" ];
   virtualisation.libvirtd.enable = true;
   hardware.keyboard.zsa.enable = true;
   services.udev.extraRules = ''

hosts/profiles/dns/default.nix

@@ -3,13 +3,12 @@ let
   adblockLocalZones = pkgs.stdenv.mkDerivation {
     name = "unbound-zones-adblock";
 
-    src = (pkgs.fetchFromGitHub
+    src = (pkgs.fetchFromGitHub {
-      {
+      owner = "StevenBlack";
-        owner = "StevenBlack";
+      repo = "hosts";
-        repo = "hosts";
+      rev = "3.12.21";
-        rev = "3.12.21";
+      sha256 = "Yzr6PY/zqQE+AHH0J6ioHTsgkikM+dz4aelbGpQJa1s=";
-        sha256 = "Yzr6PY/zqQE+AHH0J6ioHTsgkikM+dz4aelbGpQJa1s=";
+    } + "/hosts");
-      } + "/hosts");
 
     phases = [ "installPhase" ];
 
@@ -19,7 +18,7 @@ let
   };
 
   mossnet = "192.168.1.240"; # The local lan-ip for box
-  wg-mossnet = "10.0.69.4";  # The wireguard ip for box
+  wg-mossnet = "10.0.69.4"; # The wireguard ip for box
   mossnet-hosts = [
     "mossnet.lan"
     "headphones.mossnet.lan"
@@ -40,10 +39,10 @@ let
     "grasp.mossnet.lan"
     "photos.mossnet.lan"
     "pod.mossnet.lan"
+    "mast.mossnet.lan"
   ];
 
-in
+in {
-{
   services.unbound = {
     enable = true;
     settings = {
@@ -55,7 +54,8 @@ in
         cache-min-ttl = 0;
         serve-expired = "yes";
         interface = [ "0.0.0.0" ];
-        access-control = [ "127.0.0.0/8 allow" "192.168.1.0/24 allow" "10.0.69.0/24 allow" ];
+        access-control =
+          [ "127.0.0.0/8 allow" "192.168.1.0/24 allow" "10.0.69.0/24 allow" ];
         access-control-view = "10.0.69.0/24 wireguard";
         # so-reuseport = "yes";
         tls-upstream = "yes";
@@ -65,7 +65,10 @@ in
       };
       forward-zone = [{
         name = ".";
-        forward-addr = [ "45.90.28.0#6939b9.dns.nextdns.io" "1.1.1.1@853#cloudflare-dns.com" ];
+        forward-addr = [
+          "45.90.28.0#6939b9.dns.nextdns.io"
+          "1.1.1.1@853#cloudflare-dns.com"
+        ];
         # non-tls
         # forward-addr = ["45.90.30.49" "45.90.28.49" "1.1.1.1" "8.8.8.8"] 
       }];

hosts/users/anish/default.nix

@@ -4,17 +4,20 @@
   programs.zsh.enable = true;
   users.users.anish = {
     description = "Personal user for Anish";
-    hashedPassword = "$y$j9T$y3DPt/dWaPE.gRazQqw1w0$1RMH5sl/Nu8kW3ZMywYCPRniHD/jF5qRh0VKrdJ.bV2";
+    hashedPassword =
+      "$y$j9T$y3DPt/dWaPE.gRazQqw1w0$1RMH5sl/Nu8kW3ZMywYCPRniHD/jF5qRh0VKrdJ.bV2";
     shell = pkgs.zsh;
     isNormalUser = true;
     extraGroups = [ "wheel" "audio" "networkmanager" "video" ];
     openssh.authorizedKeys.keys = [
       # Curve
       "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDM0Zvei46x/yZl/IeBCq6+IYQQ0avulzVyBysF9cPigZMCybWRV7IEU+E3k9t6JrbdbdGfJkcZIWmsWDdKS8W8mBnZpVoT0ffLynu8JQ/TKdGm4Qv6bgUeKNrGsNv0ZPs2CDaGSLj0oJfRF7Ko10tcLP0vW+yujrh+y6TH/vVzJioaV4TGvtCUpn+wEQah9ROwPQLUUofsSWdnRsDJ/gp37zXWs4l5wyjSKtP3O9RZUP7kBekbSqEgSXiTk0oUQSVqIWl9NDiP6onk/gSOjXsR/JPqsSN/XI/c/yj6gyY0f51Ru2D7iBxuMJIJcWV+rU6coIj+ULcQWLzt/7TI8jq5AOOzI/ll4zbL24Eo84Rz+TP9tvMMhDZ0VaMN22AJ8qQEjc5P09tWKsX7Jg39XelyV1jHXncE4yvIE9F4RSCHzWCeKeXakizQNuzSaxTxIExRFYHjNW5bR6+3MTGwVrEIXU+qML+0yFTR86MT+tdY5AreAJQLwbog79O1NupeXJE= anish@curve"
-      # Line
-      "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDtU2GMYjXj6RGO1+mwM4TDGOo0qrKLTL4Di8+QgDX0p5vUEsnE1PS9wnuqCmSu75U8g0XIAMtvtdYyGk1N+Bx01erAZpT8DLYtIXFCyaiN28PVu5T1D0T+TQ7xgIH1qenXZR2DOQdf6kpvKEfm7+7bWhCo0N/KFMpmReubyzHDQcq/1qQasxTL+YALQFOjwKqsOTBXbHwZ103AEAcQX4ftBFEOfVli4/1aKIK4dNSZYB7J9Htq707YnsEqo9RLAMh0aOTTYgTx9AoSUDeqGuh/AGkcB7NcS7EEtI6d5YUGylwZh/gF6hqE0jl8kn2m5jMKXL3CRohZvjifue8x/GIjpu5WRabUuhBEbrfTQQaC7taHnt5rvYCGzKZx09TexUzhuz2CL480DRoxSG+P+lCNm1dIg/EZrnGEzXCSr36PlOqS5t5gm8tPkzCmZf2wU15A3ZIYUPmnYLqsn4WmIV7rKmdqt2ctWELUXow3PPiZXBucP9P3xpsYEfF1SB2SGNc= u0_a139@localhost"
       # Box
       "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKN8/SH55DBiwVoSnTU8k2Pen+wmovL9QaMyehxGEsJJv/8fzwsswGalD4C/4O51LOvdu4UKkZW5hG02uVSK+58p3UV3pOPyoqsu/aDeIsWsqmTeTzUrBIWOlNzcDKnohLz2oGC5YO+wyTJ9Iteq6aGJDjErsW7sG3h5lXCs551EmJNNGhtBQaaoytMNnWqSdlVjDNCijurH7WUpp40U/RjEp532l4rX6eIIj3jBKEFbhZkFSSjqbj4xM4SyFt+Jmigb1RMjsQjmpfY1vDtM84RcYfpTUte/T5w2dkD5H6kccmWnwKSJpm9wXfx4E7lR9APdUGnau2U1+XxiD3ytGl anish@box"
+      # Nix-on-droid line
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJOiXBPVvZAp1fY0a0Tupxj0Ml6MoA51lvqt/jAQq249 nix-on-droid@localhost"
+      # Work
+      "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC/vvh0i6+uAN0GWlK6ZfyTlc/AW54xe2CroUDsDSoGnFKeIUiSsWexobODlVakNhqwCKfsvUh6g+RdA8ZVcamATcYqxysP4X5fRksmAzRm5281O7ZBDHMB2BdcfHSTgiz7JvMRIQYWDlU8Ck6IL4wlN0b2GMUj9t/GeG37us8280rxpRNoIY7M27AJEZ7XNQhctBIVujxctVBgIMYmZiTwziU7ywJv4rNT5OAWvjRXSo1rkxdvx3VESv4y/mp8m7dEupZpIjIFsLs52+UG5LtadulUqtTWg05sCw8LEcmRhflgZSAvjw60RrKFCuWxc8+/Pmaw+zExeBMenqi0NzuTc3S3k2wCKVIZDh/0tlXzIwZ6WRqxDevUtEKfvbEFMXd8akhTfYs0dyszcFRevBxOBPbcKku+FK/HkdPLmEANvxYty3cv+Eipkz3c8JPJPvXNTXrjepXMm0LUKodO3c15hGogCOxUO38kykkyYnn+MxxHparoMfEr2+oHNpQoS5wA1G43ppqjVoRDgnhleu6ixwRkLZzphY3cnOd5jL9Ie5xIGbFWH1qSlQRdHBkHjuf85z7+QK8nFYAhmG1K3Vt3GNtF8LN1tYQkfwBJ/vsroMNzGPoq4PjVbqb80Eq+96cP89XKfU2/xw1g+p2lJDm/zC1WCjXVzf8NRwC7gqPavQ== anishlakhwara@anishs-mbp.lan"
     ];
   };
 }