Configure www services

Add electron tools
Make htop a globally common package
2025-05-25 21:52:10 -07:00 · 2025-05-25 21:11:31 -07:00 · 2025-04-22 15:34:08 -07:00 · 2025-04-22 14:21:01 -07:00 · 2025-04-19 01:18:00 -07:00 · 2025-04-19 01:17:15 -07:00
7 changed files with 194 additions and 26 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -177,11 +177,11 @@
    "flake-compat": {
      "flake": false,
      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "lastModified": 1733328505,
+        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
        "owner": "edolstra",
        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
        "type": "github"
      },
      "original": {
@@ -209,11 +209,11 @@
    "flake-compat_3": {
      "flake": false,
      "locked": {
-        "lastModified": 1673956053,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "lastModified": 1696426674,
+        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
        "owner": "edolstra",
        "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
        "type": "github"
      },
      "original": {
@@ -239,6 +239,22 @@
      }
    },
    "flake-compat_5": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1673956053,
+        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_6": {
      "locked": {
        "lastModified": 1688025799,
        "narHash": "sha256-ktpB4dRtnksm9F5WawoIkEneh1nrEvuxb5lJFt1iOyw=",
@@ -253,7 +269,7 @@
        "type": "github"
      }
    },
-    "flake-compat_6": {
+    "flake-compat_7": {
      "locked": {
        "lastModified": 1696426674,
        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
@@ -267,7 +283,7 @@
        "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
      }
    },
-    "flake-compat_7": {
+    "flake-compat_8": {
      "locked": {
        "lastModified": 1696426674,
        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
@@ -327,7 +343,7 @@
    },
    "flake-utils": {
      "inputs": {
-        "systems": "systems"
+        "systems": "systems_2"
      },
      "locked": {
        "lastModified": 1731533236,
@@ -345,7 +361,7 @@
    },
    "flake-utils_2": {
      "inputs": {
-        "systems": "systems_2"
+        "systems": "systems_3"
      },
      "locked": {
        "lastModified": 1731533236,
@@ -363,7 +379,7 @@
    },
    "flake-utils_3": {
      "inputs": {
-        "systems": "systems_3"
+        "systems": "systems_4"
      },
      "locked": {
        "lastModified": 1731533236,
@@ -931,7 +947,7 @@
    },
    "nix-search-cli": {
      "inputs": {
-        "flake-compat": "flake-compat_3",
+        "flake-compat": "flake-compat_4",
        "flake-utils": [
          "shelvacu",
          "flake-utils"
@@ -958,7 +974,7 @@
    },
    "nix-search-cli-unstable": {
      "inputs": {
-        "flake-compat": "flake-compat_4",
+        "flake-compat": "flake-compat_5",
        "flake-utils": [
          "shelvacu",
          "flake-utils"
@@ -985,7 +1001,7 @@
    },
    "nixos-apple-silicon-unstable": {
      "inputs": {
-        "flake-compat": "flake-compat_5",
+        "flake-compat": "flake-compat_6",
        "nixpkgs": [
          "shelvacu",
          "nixpkgs-unstable"
@@ -1085,6 +1101,22 @@
      }
    },
    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1744502386,
+        "narHash": "sha256-QAd1L37eU7ktL2WeLLLTmI6P9moz9+a/ONO8qNBYJgM=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "f6db44a8daa59c40ae41ba6e5823ec77fe0d2124",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
      "locked": {
        "lastModified": 1733348545,
        "narHash": "sha256-b4JrUmqT0vFNx42aEN9LTWOHomkTKL/ayLopflVf81U=",
@@ -1102,7 +1134,7 @@
    "nixvim": {
      "inputs": {
        "devshell": "devshell",
-        "flake-compat": "flake-compat_6",
+        "flake-compat": "flake-compat_7",
        "flake-parts": "flake-parts",
        "git-hooks": "git-hooks",
        "home-manager": [
@@ -1135,7 +1167,7 @@
    "nixvim-unstable": {
      "inputs": {
        "devshell": "devshell_2",
-        "flake-compat": "flake-compat_7",
+        "flake-compat": "flake-compat_8",
        "flake-parts": "flake-parts_2",
        "git-hooks": "git-hooks_2",
        "home-manager": [
@@ -1362,9 +1394,29 @@
        "type": "github"
      }
    },
-    "purescript-overlay": {
+    "phps": {
      "inputs": {
        "flake-compat": "flake-compat",
+        "nixpkgs": "nixpkgs_2",
+        "utils": "utils"
+      },
+      "locked": {
+        "lastModified": 1744610086,
+        "narHash": "sha256-weX7WoOM/Gn8aIO81dgA94Msalch6nUpjssIJOPuWK8=",
+        "owner": "fossar",
+        "repo": "nix-phps",
+        "rev": "931af19caf5fbe50ea8b568c2fbfa1c8b35174e8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "fossar",
+        "repo": "nix-phps",
+        "type": "github"
+      }
+    },
+    "purescript-overlay": {
+      "inputs": {
+        "flake-compat": "flake-compat_2",
        "nixpkgs": [
          "shelvacu",
          "nix-inspect",
@@ -1390,7 +1442,7 @@
    },
    "purescript-overlay_2": {
      "inputs": {
-        "flake-compat": "flake-compat_2",
+        "flake-compat": "flake-compat_3",
        "nixpkgs": [
          "shelvacu",
          "nix-inspect-unstable",
@@ -1451,6 +1503,7 @@
    "root": {
      "inputs": {
        "nixpkgs": "nixpkgs",
+        "phps": "phps",
        "shelvacu": "shelvacu"
      }
    },
@@ -1548,7 +1601,7 @@
        "nix-search-cli-unstable": "nix-search-cli-unstable",
        "nixos-apple-silicon-unstable": "nixos-apple-silicon-unstable",
        "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_3",
        "nixpkgs-unstable": "nixpkgs-unstable",
        "nixvim": "nixvim",
        "nixvim-unstable": "nixvim-unstable",
@@ -1704,6 +1757,21 @@
        "type": "github"
      }
    },
+    "systems_4": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
    "treefmt": {
      "inputs": {
        "nixpkgs": [
@@ -1815,6 +1883,24 @@
        "type": "github"
      }
    },
+    "utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
    "vscode-server": {
      "inputs": {
        "flake-utils": [
--- a/flake.nix
+++ b/flake.nix
@@ -4,6 +4,7 @@
  inputs = {
    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
    shelvacu.url = "git+https://git.uninsane.org/shelvacu/nix-stuff";
+    phps.url = "github:fossar/nix-phps";
  };

  outputs = { self, nixpkgs, ... }@inputs:
--- a/hosts/marauder/default.nix
+++ b/hosts/marauder/default.nix
@@ -6,6 +6,7 @@
    self.nixosModules.zerotier
    ./backup.nix
    ./dev.nix
+    ./www.nix
    ./printing.nix
  ];

--- a/hosts/marauder/dev.nix
+++ b/hosts/marauder/dev.nix
@@ -5,16 +5,30 @@
  };

  environment.systemPackages = with pkgs; [
+    # Code Editors
    vscode
-    kotlin
-    rustup
-    pyenv
-    gcc
+    arduino-ide
+
+    # Dev Tools
    nixd
    nixpkgs-fmt
+    pyenv
+    rustup
+    electron-fiddle
+    electron
+
+    # Languages
+    gcc
+    kotlin
+    nodejs
+    php
  ];

  programs.direnv = {
    enable = true;
  };
+
+  nixpkgs.config.permittedInsecurePackages = [
+    "electron-24.8.6"
+  ];
 }
--- a/hosts/marauder/www.nix
+++ b/hosts/marauder/www.nix
@@ -0,0 +1,60 @@
+{ pkgs, config, inputs, ... }:
+{
+  services.mysql = {
+    enable = true;
+    package = pkgs.mariadb;
+  };
+
+  users.groups.www = {};
+
+  users.users.www = {
+    isSystemUser = true;
+    home = "/var/www";
+    group = "www";
+  };
+
+  services.phpfpm = {
+    pools = {
+      php = {
+        user = "www";
+        settings = {
+          "listen.owner" = config.services.caddy.user;
+          "pm" = "static";
+          "pm.max_children" = 1;
+          "php_admin_value[error_log]" = "stderr";
+          "php_admin_flag[log_errors]" = true;
+          "php_flag[display_errors]" = true;
+          "catch_workers_output" = true;
+        };
+      };
+      php56 = {
+        user = "www";
+        phpPackage = inputs.phps.packages.x86_64-linux.php56;
+        settings = {
+          "listen.owner" = config.services.caddy.user;
+          "pm" = "static";
+          "pm.max_children" = 1;
+          "php_admin_value[error_log]" = "stderr";
+          "php_admin_flag[log_errors]" = true;
+          "php_flag[display_errors]" = false;
+          "catch_workers_output" = true;
+        };
+      };
+    };
+  };
+
+  services.caddy = {
+    enable = true;
+    virtualHosts."localhost".extraConfig = ''
+      root * /var/www
+      file_server
+      tls internal
+      handle /phpmyadmin/* {
+        php_fastcgi unix/${config.services.phpfpm.pools.php56.socket}
+      }
+      handle {
+        php_fastcgi unix/${config.services.phpfpm.pools.php.socket}
+      }
+    '';
+  };
+}
--- a/hosts/monolith/default.nix
+++ b/hosts/monolith/default.nix
@@ -49,7 +49,6 @@
    rustup
    gcc
    (callPackage ../marauder/ffcheck.nix { })
-    htop
    mp3val
  ];

--- a/modules/common.nix
+++ b/modules/common.nix
@@ -4,8 +4,14 @@

  nix.settings = {
    experimental-features = [ "nix-command" "flakes" ];
-    substituters = [ "https://nixcache.shelvacu.com" ];
-    trusted-public-keys = [ "nixcache.shelvacu.com:73u5ZGBpPRoVZfgNJQKYYBt9K9Io/jPwgUfuOLsJbsM=" ];
+    substituters = [
+      "https://fossar.cachix.org"
+      # "https://nixcache.shelvacu.com"
+    ];
+    trusted-public-keys = [
+      "fossar.cachix.org-1:Zv6FuqIboeHPWQS7ysLCJ7UT7xExb4OE8c4LyGb5AsE="
+      "nixcache.shelvacu.com:73u5ZGBpPRoVZfgNJQKYYBt9K9Io/jPwgUfuOLsJbsM="
+    ];
    trusted-users = [ "@wheel" ];
  };

@@ -43,6 +49,7 @@

  environment.systemPackages = with pkgs; [
    git-crypt
+    htop
    jq
  ];
 }
Author	SHA1	Message	Date
Nettika	f21f543976	Configure www services	2025-05-25 21:52:10 -07:00
Nettika	fc28b23995	Add electron tools	2025-05-25 21:11:31 -07:00
Nettika	d9b0d8d4cb	Make htop a globally common package	2025-04-22 15:34:08 -07:00
Nettika	e40f929abe	Add cachix substituter and disable shelvacu's	2025-04-22 14:21:01 -07:00
Nettika	493d9962ef	Setup php7.2 dev tools	2025-04-19 01:18:00 -07:00
Nettika	3ee2d1dd84	Use cachix	2025-04-19 01:17:15 -07:00
Nettika	1ac3895177	Install Arduino IDE on Marauder	2025-04-05 20:57:20 -07:00