Use common module

Remove shelvacu's flake from inputs

Remove sm64coopdx

configuration.nix

@@ -1,4 +1,4 @@
-{ pkgs, inputs, secrets, ... }:
+{ pkgs, secrets, phps, ... }:
 let
   fortune = pkgs.writeShellScript "cgi" ''
     echo "Content-type: text/html"
@@ -21,7 +21,6 @@ in {
       "fossar.cachix.org-1:Zv6FuqIboeHPWQS7ysLCJ7UT7xExb4OE8c4LyGb5AsE="
       "nixcache.shelvacu.com:73u5ZGBpPRoVZfgNJQKYYBt9K9Io/jPwgUfuOLsJbsM="
     ];
-    trusted-users = [ "@wheel" ];
   };
 
   nix.gc = {
@@ -30,18 +29,7 @@ in {
     options = "--delete-older-than 30d";
   };
 
-  users.users.nettika = {
+  environment.variables.VISUAL = "code --wait";
-    isNormalUser = true;
-    extraGroups = [ "wheel" "networkmanager" ];
-    shell = pkgs.fish;
-  };
-
-  security.sudo.wheelNeedsPassword = false;
-
-  environment.variables = {
-    EDITOR = "nano";
-    VISUAL = "code --wait";
-  };
 
   networking = {
     hostName = "marauder";
@@ -95,9 +83,7 @@ in {
     };
   };
 
-  environment = {
+  environment.systemPackages = with pkgs; [
-    systemPackages = [ inputs.shelvacu.packages.x86_64-linux.sm64coopdx ]
-      ++ (with pkgs; [
     # Chat clients
     discord
     slack
@@ -128,7 +114,7 @@ in {
 
     # Dev Tools
     nixd
-        nixfmt
+    nixfmt-classic
     nixpkgs-fmt
     pyenv
     rustup
@@ -153,8 +139,7 @@ in {
     mullvad-vpn
     qbittorrent
     system-config-printer
-      ]);
+  ];
-  };
 
   programs.steam = {
     enable = true;
@@ -162,48 +147,6 @@ in {
     dedicatedServer.openFirewall = true;
   };
 
-  programs.git = {
-    enable = true;
-    lfs.enable = true;
-    config = {
-      init.defaultBranch = "master";
-      user = {
-        email = "git@nettika.cat";
-        name = "Nettika";
-      };
-      credential.helper = "store";
-    };
-  };
-
-  programs.nano = {
-    enable = true;
-    nanorc = ''
-      set autoindent
-      set linenumbers
-    '';
-  };
-
-  programs.fish = {
-    enable = true;
-    promptInit = ''
-      function fish_prompt
-        echo -n '💜 '
-        set_color brgreen
-        echo -n (prompt_pwd)
-        set_color normal
-        echo -n ' > '
-      end
-      function fish_right_prompt
-        set_color bryellow
-        echo -n (git branch --show-current 2>/dev/null)
-      end
-    '';
-    shellInit = ''
-      set -g fish_greeting
-      set -g fish_prompt_pwd_full_dirs 999
-    '';
-  };
-
   programs.direnv.enable = true;
 
   programs.ssh.extraConfig = ''
@@ -213,10 +156,6 @@ in {
 
     Host monolith
       HostName 10.243.210.154
-
-    Host fennbox
-      HostName 10.243.109.199
-      User fenn
   '';
 
   services.mysql = {
@@ -227,7 +166,7 @@ in {
   services.httpd = {
     enable = true;
     enablePHP = true;
-    phpPackage = inputs.phps.packages.x86_64-linux.php80;
+    phpPackage = phps.packages.x86_64-linux.php80;
     extraConfig = ''
       ScriptAlias /fortune ${fortune}/bin/fortune
     '';
@@ -237,7 +176,7 @@ in {
     };
   };
 
-  programs.nix-ld = { enable = true; };
+  programs.nix-ld.enable = true;
 
   services.xserver = {
     enable = true;
@@ -274,6 +213,8 @@ in {
     package = pkgs.mullvad-vpn; # Include GUI
   };
 
+  promptSymbol = "💜";
+
   time.timeZone = "America/Los_Angeles";
 
   system.stateVersion = "24.05";

flake.nix

@@ -3,17 +3,21 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
-    shelvacu.url = "git+https://git.uninsane.org/shelvacu/nix-stuff";
+    phps = {
-    phps.url = "github:fossar/nix-phps";
+      url = "github:fossar/nix-phps";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    common.url = "git+https://git.uninsane.org/nettika/nettika-common";
   };
 
-  outputs = { self, nixpkgs, ... }@inputs:
+  outputs = { nixpkgs, phps, common, ... }: {
-    let secrets = builtins.fromJSON (builtins.readFile ./secrets.json);
-    in {
     nixosConfigurations.marauder = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
-        modules = [ ./configuration.nix ];
+      modules = [ ./configuration.nix common.nixosModule ];
-        specialArgs = { inherit self inputs secrets; };
+      specialArgs = {
+        inherit phps;
+        secrets = builtins.fromJSON (builtins.readFile ./secrets.json);
+      };
     };
   };
 }