diff --git a/configuration.nix b/configuration.nix index ec24bcc..9134aad 100755 --- a/configuration.nix +++ b/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 = { - isNormalUser = true; - extraGroups = [ "wheel" "networkmanager" ]; - shell = pkgs.fish; - }; - - security.sudo.wheelNeedsPassword = false; - - environment.variables = { - EDITOR = "nano"; - VISUAL = "code --wait"; - }; + environment.variables.VISUAL = "code --wait"; networking = { hostName = "marauder"; @@ -95,66 +83,63 @@ in { }; }; - environment = { - systemPackages = [ inputs.shelvacu.packages.x86_64-linux.sm64coopdx ] - ++ (with pkgs; [ - # Chat clients - discord - slack - element-desktop - telegram-desktop - signal-desktop + environment.systemPackages = with pkgs; [ + # Chat clients + discord + slack + element-desktop + telegram-desktop + signal-desktop - # Browsers - firefox - filezilla + # Browsers + firefox + filezilla - # Creative - inkscape - gimp - krita - openscad-unstable - bambu-studio + # Creative + inkscape + gimp + krita + openscad-unstable + bambu-studio - # Multimedia - vlc - ffmpeg - ffcheck - aonsoku + # Multimedia + vlc + ffmpeg + ffcheck + aonsoku - # Code Editors - vscode - arduino-ide + # Code Editors + vscode + arduino-ide - # Dev Tools - nixd - nixfmt - nixpkgs-fmt - pyenv - rustup - electron + # Dev Tools + nixd + nixfmt-classic + nixpkgs-fmt + pyenv + rustup + electron - # Languages - gcc - kotlin - nodejs - php + # Languages + gcc + kotlin + nodejs + php - # Command line - git-crypt - htop - jq + # Command line + git-crypt + htop + jq - # Misc - obsidian - intiface-central - prismlauncher - blender - mullvad-vpn - qbittorrent - system-config-printer - ]); - }; + # Misc + obsidian + intiface-central + prismlauncher + blender + 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"; diff --git a/flake.lock b/flake.lock index 5f4b574..3972ea6 100755 --- a/flake.lock +++ b/flake.lock @@ -1,177 +1,18 @@ { "nodes": { - "crane": { - "flake": false, + "common": { "locked": { - "lastModified": 1727316705, - "narHash": "sha256-/mumx8AQ5xFuCJqxCIOFCHTVlxHkMT21idpbgbm/TIE=", - "owner": "ipetkov", - "repo": "crane", - "rev": "5b03654ce046b5167e7b0bccbd8244cb56c16f0e", - "type": "github" + "lastModified": 1750666369, + "narHash": "sha256-9dYxGbteo+8Gan0ESKxqq89RDDJYGBD3/85Ea4yOkT8=", + "ref": "refs/heads/master", + "rev": "1aef458842d9ff13ef4fca6b81d9e0cb6c6471de", + "revCount": 1, + "type": "git", + "url": "https://git.uninsane.org/nettika/nettika-common" }, "original": { - "owner": "ipetkov", - "ref": "v0.19.0", - "repo": "crane", - "type": "github" - } - }, - "crane_2": { - "flake": false, - "locked": { - "lastModified": 1727316705, - "narHash": "sha256-/mumx8AQ5xFuCJqxCIOFCHTVlxHkMT21idpbgbm/TIE=", - "owner": "ipetkov", - "repo": "crane", - "rev": "5b03654ce046b5167e7b0bccbd8244cb56c16f0e", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "ref": "v0.19.0", - "repo": "crane", - "type": "github" - } - }, - "devshell": { - "inputs": { - "nixpkgs": [ - "shelvacu", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1728330715, - "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", - "owner": "numtide", - "repo": "devshell", - "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "devshell_2": { - "inputs": { - "nixpkgs": [ - "shelvacu", - "nixvim-unstable", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1728330715, - "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", - "owner": "numtide", - "repo": "devshell", - "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "disko-unstable": { - "inputs": { - "nixpkgs": [ - "shelvacu", - "nixpkgs-unstable" - ] - }, - "locked": { - "lastModified": 1733168902, - "narHash": "sha256-8dupm9GfK+BowGdQd7EHK5V61nneLfr9xR6sc5vtDi0=", - "owner": "nix-community", - "repo": "disko", - "rev": "785c1e02c7e465375df971949b8dcbde9ec362e5", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "disko", - "type": "github" - } - }, - "dns": { - "inputs": { - "flake-utils": [ - "shelvacu", - "flake-utils" - ], - "nixpkgs": [ - "shelvacu", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1726867691, - "narHash": "sha256-IK3r16N9pizf53AipOmrcrcyjVsPJwC4PI5hIqEyKwQ=", - "owner": "nix-community", - "repo": "dns.nix", - "rev": "a3196708a56dee76186a9415c187473b94e6cbae", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "dns.nix", - "type": "github" - } - }, - "dream2nix": { - "inputs": { - "nixpkgs": [ - "shelvacu", - "nix-inspect", - "nci", - "nixpkgs" - ], - "purescript-overlay": "purescript-overlay", - "pyproject-nix": "pyproject-nix" - }, - "locked": { - "lastModified": 1732214960, - "narHash": "sha256-ViyEMSYwaza6y55XTDrsRi2K4YKCLsefMTorjWSE27s=", - "owner": "nix-community", - "repo": "dream2nix", - "rev": "a8dac99db44307fdecead13a39c584b97812d0d4", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "dream2nix", - "type": "github" - } - }, - "dream2nix_2": { - "inputs": { - "nixpkgs": [ - "shelvacu", - "nix-inspect-unstable", - "nci", - "nixpkgs" - ], - "purescript-overlay": "purescript-overlay_2", - "pyproject-nix": "pyproject-nix_2" - }, - "locked": { - "lastModified": 1732214960, - "narHash": "sha256-ViyEMSYwaza6y55XTDrsRi2K4YKCLsefMTorjWSE27s=", - "owner": "nix-community", - "repo": "dream2nix", - "rev": "a8dac99db44307fdecead13a39c584b97812d0d4", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "dream2nix", - "type": "github" + "type": "git", + "url": "https://git.uninsane.org/nettika/nettika-common" } }, "flake-compat": { @@ -190,853 +31,6 @@ "type": "github" } }, - "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_4": { - "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_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=", - "owner": "nix-community", - "repo": "flake-compat", - "rev": "8bf105319d44f6b9f0d764efa4fdef9f1cc9ba1c", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_7": { - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" - } - }, - "flake-compat_8": { - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" - } - }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "shelvacu", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "shelvacu", - "nixvim-unstable", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-utils": { - "inputs": { - "systems": "systems_2" - }, - "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" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_3" - }, - "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" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_4" - }, - "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" - } - }, - "git-hooks": { - "inputs": { - "flake-compat": [ - "shelvacu", - "nixvim", - "flake-compat" - ], - "gitignore": "gitignore", - "nixpkgs": [ - "shelvacu", - "nixvim", - "nixpkgs" - ], - "nixpkgs-stable": [ - "shelvacu", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1732021966, - "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "git-hooks_2": { - "inputs": { - "flake-compat": [ - "shelvacu", - "nixvim-unstable", - "flake-compat" - ], - "gitignore": "gitignore_2", - "nixpkgs": [ - "shelvacu", - "nixvim-unstable", - "nixpkgs" - ], - "nixpkgs-stable": [ - "shelvacu", - "nixvim-unstable", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1732021966, - "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "shelvacu", - "nixvim", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_2": { - "inputs": { - "nixpkgs": [ - "shelvacu", - "nixvim-unstable", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "shelvacu", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733050161, - "narHash": "sha256-lYnT+EYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "62d536255879be574ebfe9b87c4ac194febf47c5", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-24.11", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager-unstable": { - "inputs": { - "nixpkgs": [ - "shelvacu", - "nixpkgs-unstable" - ] - }, - "locked": { - "lastModified": 1733389730, - "narHash": "sha256-KZMu4ddMll5khS0rYkJsVD0hVqjMNHlhTM3PCQar0Ag=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "65912bc6841cf420eb8c0a20e03df7cbbff5963f", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "ixx": { - "inputs": { - "flake-utils": [ - "shelvacu", - "nixvim", - "nuschtosSearch", - "flake-utils" - ], - "nixpkgs": [ - "shelvacu", - "nixvim", - "nuschtosSearch", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1729958008, - "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", - "owner": "NuschtOS", - "repo": "ixx", - "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "ref": "v0.0.6", - "repo": "ixx", - "type": "github" - } - }, - "ixx_2": { - "inputs": { - "flake-utils": [ - "shelvacu", - "nixvim-unstable", - "nuschtosSearch", - "flake-utils" - ], - "nixpkgs": [ - "shelvacu", - "nixvim-unstable", - "nuschtosSearch", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1729958008, - "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", - "owner": "NuschtOS", - "repo": "ixx", - "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "ref": "v0.0.6", - "repo": "ixx", - "type": "github" - } - }, - "jovian-unstable": { - "inputs": { - "nix-github-actions": "nix-github-actions", - "nixpkgs": [ - "shelvacu", - "nixpkgs-unstable" - ] - }, - "locked": { - "lastModified": 1732739177, - "narHash": "sha256-iL32+TA/8geCzcL1r3uthrH/GPvbUak5QE++WJUkaiI=", - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", - "rev": "8d7b2149e618696d5100c2683af1ffa893f02a75", - "type": "github" - }, - "original": { - "owner": "Jovian-Experiments", - "repo": "Jovian-NixOS", - "type": "github" - } - }, - "mk-naked-shell": { - "flake": false, - "locked": { - "lastModified": 1681286841, - "narHash": "sha256-3XlJrwlR0nBiREnuogoa5i1b4+w/XPe0z8bbrJASw0g=", - "owner": "yusdacra", - "repo": "mk-naked-shell", - "rev": "7612f828dd6f22b7fb332cc69440e839d7ffe6bd", - "type": "github" - }, - "original": { - "owner": "yusdacra", - "repo": "mk-naked-shell", - "type": "github" - } - }, - "mk-naked-shell_2": { - "flake": false, - "locked": { - "lastModified": 1681286841, - "narHash": "sha256-3XlJrwlR0nBiREnuogoa5i1b4+w/XPe0z8bbrJASw0g=", - "owner": "yusdacra", - "repo": "mk-naked-shell", - "rev": "7612f828dd6f22b7fb332cc69440e839d7ffe6bd", - "type": "github" - }, - "original": { - "owner": "yusdacra", - "repo": "mk-naked-shell", - "type": "github" - } - }, - "most-winningest": { - "inputs": { - "flake-utils": [ - "shelvacu", - "flake-utils" - ], - "nixpkgs": [ - "shelvacu", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1723251737, - "narHash": "sha256-zq2CIJwLrEkFh6BoZ1j8jUGBc4bFQuQofjsnYFYZBMM=", - "owner": "captain-jean-luc", - "repo": "most-winningest", - "rev": "670b36aabfa2c7f8fe04e930f94291c4c76e9d17", - "type": "github" - }, - "original": { - "owner": "captain-jean-luc", - "repo": "most-winningest", - "type": "github" - } - }, - "nci": { - "inputs": { - "crane": "crane", - "dream2nix": "dream2nix", - "mk-naked-shell": "mk-naked-shell", - "nixpkgs": [ - "shelvacu", - "nix-inspect", - "nixpkgs" - ], - "parts": "parts", - "rust-overlay": "rust-overlay", - "treefmt": "treefmt" - }, - "locked": { - "lastModified": 1732342495, - "narHash": "sha256-7qfvmnJQByEtl5bS+rTydLCe3Saz9kMRaJxPCdqb1wQ=", - "owner": "yusdacra", - "repo": "nix-cargo-integration", - "rev": "ae9de2d06519a3bb26b649e1c0d1cfa22c20dc0e", - "type": "github" - }, - "original": { - "owner": "yusdacra", - "repo": "nix-cargo-integration", - "type": "github" - } - }, - "nci_2": { - "inputs": { - "crane": "crane_2", - "dream2nix": "dream2nix_2", - "mk-naked-shell": "mk-naked-shell_2", - "nixpkgs": [ - "shelvacu", - "nix-inspect-unstable", - "nixpkgs" - ], - "parts": "parts_3", - "rust-overlay": "rust-overlay_2", - "treefmt": "treefmt_2" - }, - "locked": { - "lastModified": 1732342495, - "narHash": "sha256-7qfvmnJQByEtl5bS+rTydLCe3Saz9kMRaJxPCdqb1wQ=", - "owner": "yusdacra", - "repo": "nix-cargo-integration", - "rev": "ae9de2d06519a3bb26b649e1c0d1cfa22c20dc0e", - "type": "github" - }, - "original": { - "owner": "yusdacra", - "repo": "nix-cargo-integration", - "type": "github" - } - }, - "nix-darwin": { - "inputs": { - "nixpkgs": [ - "shelvacu", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733105089, - "narHash": "sha256-Qs3YmoLYUJ8g4RkFj2rMrzrP91e4ShAioC9s+vG6ENM=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "c6b65d946097baf3915dd51373251de98199280d", - "type": "github" - }, - "original": { - "owner": "lnl7", - "repo": "nix-darwin", - "type": "github" - } - }, - "nix-darwin_2": { - "inputs": { - "nixpkgs": [ - "shelvacu", - "nixvim-unstable", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733105089, - "narHash": "sha256-Qs3YmoLYUJ8g4RkFj2rMrzrP91e4ShAioC9s+vG6ENM=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "c6b65d946097baf3915dd51373251de98199280d", - "type": "github" - }, - "original": { - "owner": "lnl7", - "repo": "nix-darwin", - "type": "github" - } - }, - "nix-filter": { - "locked": { - "lastModified": 1710156097, - "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "3342559a24e85fc164b295c3444e8a139924675b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "nix-filter", - "type": "github" - } - }, - "nix-filter_2": { - "locked": { - "lastModified": 1710156097, - "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "3342559a24e85fc164b295c3444e8a139924675b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "nix-filter", - "type": "github" - } - }, - "nix-formatter-pack": { - "inputs": { - "nixpkgs": [ - "shelvacu", - "nix-on-droid", - "nixpkgs" - ], - "nmd": [ - "shelvacu", - "nix-on-droid", - "nmd" - ], - "nmt": "nmt" - }, - "locked": { - "lastModified": 1705252799, - "narHash": "sha256-HgSTREh7VoXjGgNDwKQUYcYo13rPkltW7IitHrTPA5c=", - "owner": "Gerschtli", - "repo": "nix-formatter-pack", - "rev": "2de39dedd79aab14c01b9e2934842051a160ffa5", - "type": "github" - }, - "original": { - "owner": "Gerschtli", - "repo": "nix-formatter-pack", - "type": "github" - } - }, - "nix-github-actions": { - "inputs": { - "nixpkgs": [ - "shelvacu", - "jovian-unstable", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1729697500, - "narHash": "sha256-VFTWrbzDlZyFHHb1AlKRiD/qqCJIripXKiCSFS8fAOY=", - "owner": "zhaofengli", - "repo": "nix-github-actions", - "rev": "e418aeb728b6aa5ca8c5c71974e7159c2df1d8cf", - "type": "github" - }, - "original": { - "owner": "zhaofengli", - "ref": "matrix-name", - "repo": "nix-github-actions", - "type": "github" - } - }, - "nix-inspect": { - "inputs": { - "nci": "nci", - "nixpkgs": [ - "shelvacu", - "nixpkgs" - ], - "parts": "parts_2" - }, - "locked": { - "lastModified": 1733357226, - "narHash": "sha256-ArwdTtlIje7yOTblkZs4aQ1+HBtEwJKkfKOiA9tY8nA=", - "owner": "bluskript", - "repo": "nix-inspect", - "rev": "2938c8e94acca6a7f1569f478cac6ddc4877558e", - "type": "github" - }, - "original": { - "owner": "bluskript", - "repo": "nix-inspect", - "type": "github" - } - }, - "nix-inspect-unstable": { - "inputs": { - "nci": "nci_2", - "nixpkgs": [ - "shelvacu", - "nixpkgs-unstable" - ], - "parts": "parts_4" - }, - "locked": { - "lastModified": 1733357226, - "narHash": "sha256-ArwdTtlIje7yOTblkZs4aQ1+HBtEwJKkfKOiA9tY8nA=", - "owner": "bluskript", - "repo": "nix-inspect", - "rev": "2938c8e94acca6a7f1569f478cac6ddc4877558e", - "type": "github" - }, - "original": { - "owner": "bluskript", - "repo": "nix-inspect", - "type": "github" - } - }, - "nix-on-droid": { - "inputs": { - "home-manager": [ - "shelvacu", - "home-manager" - ], - "nix-formatter-pack": "nix-formatter-pack", - "nixpkgs": [ - "shelvacu", - "nixpkgs" - ], - "nixpkgs-docs": "nixpkgs-docs", - "nixpkgs-for-bootstrap": "nixpkgs-for-bootstrap", - "nmd": "nmd" - }, - "locked": { - "lastModified": 1725658585, - "narHash": "sha256-P29z4Gt89n5ps1U7+qmIrj0BuRXGZQSIaOe2+tsPgfw=", - "owner": "nix-community", - "repo": "nix-on-droid", - "rev": "5d88ff2519e4952f8d22472b52c531bb5f1635fc", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-on-droid", - "type": "github" - } - }, - "nix-search-cli": { - "inputs": { - "flake-compat": "flake-compat_4", - "flake-utils": [ - "shelvacu", - "flake-utils" - ], - "nix-filter": "nix-filter", - "nixpkgs": [ - "shelvacu", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1727123507, - "narHash": "sha256-0Zms/QVCUKxILLLJYsaodSW64DJrVr/yB13SnNL8+Wg=", - "owner": "peterldowns", - "repo": "nix-search-cli", - "rev": "7d6b4c501ee448dc2e5c123aa4c6d9db44a6dd12", - "type": "github" - }, - "original": { - "owner": "peterldowns", - "repo": "nix-search-cli", - "type": "github" - } - }, - "nix-search-cli-unstable": { - "inputs": { - "flake-compat": "flake-compat_5", - "flake-utils": [ - "shelvacu", - "flake-utils" - ], - "nix-filter": "nix-filter_2", - "nixpkgs": [ - "shelvacu", - "nixpkgs-unstable" - ] - }, - "locked": { - "lastModified": 1727123507, - "narHash": "sha256-0Zms/QVCUKxILLLJYsaodSW64DJrVr/yB13SnNL8+Wg=", - "owner": "peterldowns", - "repo": "nix-search-cli", - "rev": "7d6b4c501ee448dc2e5c123aa4c6d9db44a6dd12", - "type": "github" - }, - "original": { - "owner": "peterldowns", - "repo": "nix-search-cli", - "type": "github" - } - }, - "nixos-apple-silicon-unstable": { - "inputs": { - "flake-compat": "flake-compat_6", - "nixpkgs": [ - "shelvacu", - "nixpkgs-unstable" - ], - "rust-overlay": "rust-overlay_3" - }, - "locked": { - "lastModified": 1733377410, - "narHash": "sha256-tZ9JEAaHIs3TPdRZeZzHsnJmUilkcnVaUTvyprbRb1A=", - "owner": "tpwrules", - "repo": "nixos-apple-silicon", - "rev": "e8c07c3ae199b55a8c1c35a7c067c5cef9c7e929", - "type": "github" - }, - "original": { - "owner": "tpwrules", - "repo": "nixos-apple-silicon", - "type": "github" - } - }, - "nixos-hardware": { - "locked": { - "lastModified": 1733217105, - "narHash": "sha256-fc6jTzIwCIVWTX50FtW6AZpuukuQWSEbPiyg6ZRGWFY=", - "owner": "nixos", - "repo": "nixos-hardware", - "rev": "cceee0a31d2f01bcc98b2fbd591327c06a4ea4f9", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixos-hardware", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1748437600, @@ -1053,351 +47,12 @@ "type": "github" } }, - "nixpkgs-docs": { - "locked": { - "lastModified": 1705957679, - "narHash": "sha256-Q8LJaVZGJ9wo33wBafvZSzapYsjOaNjP/pOnSiKVGHY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9a333eaa80901efe01df07eade2c16d183761fa3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-for-bootstrap": { - "locked": { - "lastModified": 1720244366, - "narHash": "sha256-WrDV0FPMVd2Sq9hkR5LNHudS3OSMmUrs90JUTN+MXpA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40", - "type": "github" - } - }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1733380312, - "narHash": "sha256-ywntxT10Om755wkB9tYgJwEwELQZKYAO5WcNuHv1vjI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a772498086eac57d97065a980a21fc0f304e3192", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-unstable-small", - "type": "indirect" - } - }, - "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=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9ecb50d2fae8680be74c08bb0a995c5383747f89", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-24.11-small", - "type": "indirect" - } - }, - "nixvim": { - "inputs": { - "devshell": "devshell", - "flake-compat": "flake-compat_7", - "flake-parts": "flake-parts", - "git-hooks": "git-hooks", - "home-manager": [ - "shelvacu", - "home-manager" - ], - "nix-darwin": "nix-darwin", - "nixpkgs": [ - "shelvacu", - "nixpkgs" - ], - "nuschtosSearch": "nuschtosSearch", - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1733221381, - "narHash": "sha256-6y4BxKhPNlsBZStrOLkZR5fUgJ1wMPH0zZiS7/CCLqA=", - "owner": "nix-community", - "repo": "nixvim", - "rev": "667b2a5f7a7925fb3247fd3201f4a9e0bcebcd48", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "nixos-24.11", - "repo": "nixvim", - "type": "github" - } - }, - "nixvim-unstable": { - "inputs": { - "devshell": "devshell_2", - "flake-compat": "flake-compat_8", - "flake-parts": "flake-parts_2", - "git-hooks": "git-hooks_2", - "home-manager": [ - "shelvacu", - "home-manager-unstable" - ], - "nix-darwin": "nix-darwin_2", - "nixpkgs": [ - "shelvacu", - "nixpkgs-unstable" - ], - "nuschtosSearch": "nuschtosSearch_2", - "treefmt-nix": "treefmt-nix_2" - }, - "locked": { - "lastModified": 1733369744, - "narHash": "sha256-b2atMLs0myUiD5qnIxEko/gO/+ViNOGLNZnUFnYQ3bM=", - "owner": "nix-community", - "repo": "nixvim", - "rev": "38885227461de58a712362c1c484803d6c90a8b2", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixvim", - "type": "github" - } - }, - "nmd": { - "inputs": { - "nixpkgs": [ - "shelvacu", - "nix-on-droid", - "nixpkgs-docs" - ], - "scss-reset": "scss-reset" - }, - "locked": { - "lastModified": 1705050560, - "narHash": "sha256-x3zzcdvhJpodsmdjqB4t5mkVW22V3wqHLOun0KRBzUI=", - "owner": "~rycee", - "repo": "nmd", - "rev": "66d9334933119c36f91a78d565c152a4fdc8d3d3", - "type": "sourcehut" - }, - "original": { - "owner": "~rycee", - "repo": "nmd", - "type": "sourcehut" - } - }, - "nmt": { - "flake": false, - "locked": { - "lastModified": 1648075362, - "narHash": "sha256-u36WgzoA84dMVsGXzml4wZ5ckGgfnvS0ryzo/3zn/Pc=", - "owner": "rycee", - "repo": "nmt", - "rev": "d83601002c99b78c89ea80e5e6ba21addcfe12ae", - "type": "gitlab" - }, - "original": { - "owner": "rycee", - "repo": "nmt", - "type": "gitlab" - } - }, - "nuschtosSearch": { - "inputs": { - "flake-utils": "flake-utils_2", - "ixx": "ixx", - "nixpkgs": [ - "shelvacu", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733006402, - "narHash": "sha256-BC1CecAQISV5Q4LZK72Gx0+faemOwaChiD9rMVfDPoA=", - "owner": "NuschtOS", - "repo": "search", - "rev": "16307548b7a1247291c84ae6a12c0aacb07dfba2", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "repo": "search", - "type": "github" - } - }, - "nuschtosSearch_2": { - "inputs": { - "flake-utils": "flake-utils_3", - "ixx": "ixx_2", - "nixpkgs": [ - "shelvacu", - "nixvim-unstable", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733006402, - "narHash": "sha256-BC1CecAQISV5Q4LZK72Gx0+faemOwaChiD9rMVfDPoA=", - "owner": "NuschtOS", - "repo": "search", - "rev": "16307548b7a1247291c84ae6a12c0aacb07dfba2", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "repo": "search", - "type": "github" - } - }, - "padtype-unstable": { - "inputs": { - "nixpkgs": [ - "shelvacu", - "nixpkgs-unstable" - ] - }, - "locked": { - "lastModified": 1713650007, - "narHash": "sha256-PerC2Nw3yQLBsTKrb10HdWCtdUTw4RxmR1ZUTzjy8Jg=", - "owner": "shelvacu", - "repo": "padtype", - "rev": "4765c8d752b41c691ac830034f9b7b0be3b6a3f4", - "type": "gitlab" - }, - "original": { - "owner": "shelvacu", - "repo": "padtype", - "type": "gitlab" - } - }, - "parts": { - "inputs": { - "nixpkgs-lib": [ - "shelvacu", - "nix-inspect", - "nci", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "parts_2": { - "inputs": { - "nixpkgs-lib": [ - "shelvacu", - "nix-inspect", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "parts_3": { - "inputs": { - "nixpkgs-lib": [ - "shelvacu", - "nix-inspect-unstable", - "nci", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "parts_4": { - "inputs": { - "nixpkgs-lib": [ - "shelvacu", - "nix-inspect-unstable", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "phps": { "inputs": { "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs_2", + "nixpkgs": [ + "nixpkgs" + ], "utils": "utils" }, "locked": { @@ -1414,302 +69,11 @@ "type": "github" } }, - "purescript-overlay": { - "inputs": { - "flake-compat": "flake-compat_2", - "nixpkgs": [ - "shelvacu", - "nix-inspect", - "nci", - "dream2nix", - "nixpkgs" - ], - "slimlock": "slimlock" - }, - "locked": { - "lastModified": 1728546539, - "narHash": "sha256-Sws7w0tlnjD+Bjck1nv29NjC5DbL6nH5auL9Ex9Iz2A=", - "owner": "thomashoneyman", - "repo": "purescript-overlay", - "rev": "4ad4c15d07bd899d7346b331f377606631eb0ee4", - "type": "github" - }, - "original": { - "owner": "thomashoneyman", - "repo": "purescript-overlay", - "type": "github" - } - }, - "purescript-overlay_2": { - "inputs": { - "flake-compat": "flake-compat_3", - "nixpkgs": [ - "shelvacu", - "nix-inspect-unstable", - "nci", - "dream2nix", - "nixpkgs" - ], - "slimlock": "slimlock_2" - }, - "locked": { - "lastModified": 1728546539, - "narHash": "sha256-Sws7w0tlnjD+Bjck1nv29NjC5DbL6nH5auL9Ex9Iz2A=", - "owner": "thomashoneyman", - "repo": "purescript-overlay", - "rev": "4ad4c15d07bd899d7346b331f377606631eb0ee4", - "type": "github" - }, - "original": { - "owner": "thomashoneyman", - "repo": "purescript-overlay", - "type": "github" - } - }, - "pyproject-nix": { - "flake": false, - "locked": { - "lastModified": 1702448246, - "narHash": "sha256-hFg5s/hoJFv7tDpiGvEvXP0UfFvFEDgTdyHIjDVHu1I=", - "owner": "davhau", - "repo": "pyproject.nix", - "rev": "5a06a2697b228c04dd2f35659b4b659ca74f7aeb", - "type": "github" - }, - "original": { - "owner": "davhau", - "ref": "dream2nix", - "repo": "pyproject.nix", - "type": "github" - } - }, - "pyproject-nix_2": { - "flake": false, - "locked": { - "lastModified": 1702448246, - "narHash": "sha256-hFg5s/hoJFv7tDpiGvEvXP0UfFvFEDgTdyHIjDVHu1I=", - "owner": "davhau", - "repo": "pyproject.nix", - "rev": "5a06a2697b228c04dd2f35659b4b659ca74f7aeb", - "type": "github" - }, - "original": { - "owner": "davhau", - "ref": "dream2nix", - "repo": "pyproject.nix", - "type": "github" - } - }, "root": { "inputs": { + "common": "common", "nixpkgs": "nixpkgs", - "phps": "phps", - "shelvacu": "shelvacu" - } - }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "shelvacu", - "nix-inspect", - "nci", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1732328983, - "narHash": "sha256-RHt12f/slrzDpSL7SSkydh8wUE4Nr4r23HlpWywed9E=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "ed8aa5b64f7d36d9338eb1d0a3bb60cf52069a72", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_2": { - "inputs": { - "nixpkgs": [ - "shelvacu", - "nix-inspect-unstable", - "nci", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1732328983, - "narHash": "sha256-RHt12f/slrzDpSL7SSkydh8wUE4Nr4r23HlpWywed9E=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "ed8aa5b64f7d36d9338eb1d0a3bb60cf52069a72", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "rust-overlay_3": { - "flake": false, - "locked": { - "lastModified": 1686795910, - "narHash": "sha256-jDa40qRZ0GRQtP9EMZdf+uCbvzuLnJglTUI2JoHfWDc=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "5c2b97c0a9bc5217fc3dfb1555aae0fb756d99f9", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "scss-reset": { - "flake": false, - "locked": { - "lastModified": 1631450058, - "narHash": "sha256-muDlZJPtXDIGevSEWkicPP0HQ6VtucbkMNygpGlBEUM=", - "owner": "andreymatin", - "repo": "scss-reset", - "rev": "0cf50e27a4e95e9bb5b1715eedf9c54dee1a5a91", - "type": "github" - }, - "original": { - "owner": "andreymatin", - "repo": "scss-reset", - "type": "github" - } - }, - "shelvacu": { - "inputs": { - "disko-unstable": "disko-unstable", - "dns": "dns", - "flake-utils": "flake-utils", - "home-manager": "home-manager", - "home-manager-unstable": "home-manager-unstable", - "jovian-unstable": "jovian-unstable", - "most-winningest": "most-winningest", - "nix-inspect": "nix-inspect", - "nix-inspect-unstable": "nix-inspect-unstable", - "nix-on-droid": "nix-on-droid", - "nix-search-cli": "nix-search-cli", - "nix-search-cli-unstable": "nix-search-cli-unstable", - "nixos-apple-silicon-unstable": "nixos-apple-silicon-unstable", - "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_3", - "nixpkgs-unstable": "nixpkgs-unstable", - "nixvim": "nixvim", - "nixvim-unstable": "nixvim-unstable", - "padtype-unstable": "padtype-unstable", - "sm64baserom": "sm64baserom", - "sops-nix": "sops-nix", - "treefmt-nix": "treefmt-nix_3", - "vscode-server": "vscode-server", - "vscode-server-unstable": "vscode-server-unstable" - }, - "locked": { - "lastModified": 1734579304, - "narHash": "sha256-NBmRwbXdW1F3NY6rwLruTfjN15Gl9fUTKb7p0+nqbZo=", - "ref": "refs/heads/master", - "rev": "aff3058af0fa1ed2ed7bce31ad79111707be25ba", - "revCount": 689, - "type": "git", - "url": "https://git.uninsane.org/shelvacu/nix-stuff" - }, - "original": { - "type": "git", - "url": "https://git.uninsane.org/shelvacu/nix-stuff" - } - }, - "slimlock": { - "inputs": { - "nixpkgs": [ - "shelvacu", - "nix-inspect", - "nci", - "dream2nix", - "purescript-overlay", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1688756706, - "narHash": "sha256-xzkkMv3neJJJ89zo3o2ojp7nFeaZc2G0fYwNXNJRFlo=", - "owner": "thomashoneyman", - "repo": "slimlock", - "rev": "cf72723f59e2340d24881fd7bf61cb113b4c407c", - "type": "github" - }, - "original": { - "owner": "thomashoneyman", - "repo": "slimlock", - "type": "github" - } - }, - "slimlock_2": { - "inputs": { - "nixpkgs": [ - "shelvacu", - "nix-inspect-unstable", - "nci", - "dream2nix", - "purescript-overlay", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1688756706, - "narHash": "sha256-xzkkMv3neJJJ89zo3o2ojp7nFeaZc2G0fYwNXNJRFlo=", - "owner": "thomashoneyman", - "repo": "slimlock", - "rev": "cf72723f59e2340d24881fd7bf61cb113b4c407c", - "type": "github" - }, - "original": { - "owner": "thomashoneyman", - "repo": "slimlock", - "type": "github" - } - }, - "sm64baserom": { - "locked": { - "lastModified": 1727217362, - "narHash": "sha256-Ws5dVa/7kFnesEkZsRPJmqnYKNlBYm7fx49KgT73bS8=", - "ref": "refs/heads/master", - "rev": "aeb2d33ee623ede8c88f0f492c80f437889adfe1", - "revCount": 1, - "type": "git", - "url": "https://git.uninsane.org/shelvacu/sm64baserom.git" - }, - "original": { - "type": "git", - "url": "https://git.uninsane.org/shelvacu/sm64baserom.git" - } - }, - "sops-nix": { - "inputs": { - "nixpkgs": [ - "shelvacu", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733128155, - "narHash": "sha256-m6/qwJAJYcidGMEdLqjKzRIjapK4nUfMq7rDCTmZajc=", - "owner": "Mic92", - "repo": "sops-nix", - "rev": "c6134b6fff6bda95a1ac872a2a9d5f32e3c37856", - "type": "github" - }, - "original": { - "owner": "Mic92", - "repo": "sops-nix", - "type": "github" + "phps": "phps" } }, "systems": { @@ -1727,162 +91,6 @@ "type": "github" } }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "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": [ - "shelvacu", - "nix-inspect", - "nci", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1732292307, - "narHash": "sha256-5WSng844vXt8uytT5djmqBCkopyle6ciFgteuA9bJpw=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "705df92694af7093dfbb27109ce16d828a79155f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "shelvacu", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1732894027, - "narHash": "sha256-2qbdorpq0TXHBWbVXaTqKoikN4bqAtAplTwGuII+oAc=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "6209c381904cab55796c5d7350e89681d3b2a8ef", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "treefmt-nix_2": { - "inputs": { - "nixpkgs": [ - "shelvacu", - "nixvim-unstable", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1732894027, - "narHash": "sha256-2qbdorpq0TXHBWbVXaTqKoikN4bqAtAplTwGuII+oAc=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "6209c381904cab55796c5d7350e89681d3b2a8ef", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "treefmt-nix_3": { - "inputs": { - "nixpkgs": [ - "shelvacu", - "nixpkgs-unstable" - ] - }, - "locked": { - "lastModified": 1733662930, - "narHash": "sha256-9qOp6jNdezzLMxwwXaXZWPXosHbNqno+f7Ii/xftqZ8=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "357cda84af1d74626afb7fb3bc12d6957167cda9", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "treefmt_2": { - "inputs": { - "nixpkgs": [ - "shelvacu", - "nix-inspect-unstable", - "nci", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1732292307, - "narHash": "sha256-5WSng844vXt8uytT5djmqBCkopyle6ciFgteuA9bJpw=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "705df92694af7093dfbb27109ce16d828a79155f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, "utils": { "inputs": { "systems": "systems" @@ -1900,56 +108,6 @@ "repo": "flake-utils", "type": "github" } - }, - "vscode-server": { - "inputs": { - "flake-utils": [ - "shelvacu", - "flake-utils" - ], - "nixpkgs": [ - "shelvacu", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1729422940, - "narHash": "sha256-DlvJv33ml5UTKgu4b0HauOfFIoDx6QXtbqUF3vWeRCY=", - "owner": "nix-community", - "repo": "nixos-vscode-server", - "rev": "8b6db451de46ecf9b4ab3d01ef76e59957ff549f", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixos-vscode-server", - "type": "github" - } - }, - "vscode-server-unstable": { - "inputs": { - "flake-utils": [ - "shelvacu", - "flake-utils" - ], - "nixpkgs": [ - "shelvacu", - "nixpkgs-unstable" - ] - }, - "locked": { - "lastModified": 1729422940, - "narHash": "sha256-DlvJv33ml5UTKgu4b0HauOfFIoDx6QXtbqUF3vWeRCY=", - "owner": "nix-community", - "repo": "nixos-vscode-server", - "rev": "8b6db451de46ecf9b4ab3d01ef76e59957ff549f", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixos-vscode-server", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index f3ed312..2aa7c0f 100755 --- a/flake.nix +++ b/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.url = "github:fossar/nix-phps"; + phps = { + url = "github:fossar/nix-phps"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + common.url = "git+https://git.uninsane.org/nettika/nettika-common"; }; - outputs = { self, nixpkgs, ... }@inputs: - let secrets = builtins.fromJSON (builtins.readFile ./secrets.json); - in { - nixosConfigurations.marauder = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - modules = [ ./configuration.nix ]; - specialArgs = { inherit self inputs secrets; }; + outputs = { nixpkgs, phps, common, ... }: { + nixosConfigurations.marauder = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + modules = [ ./configuration.nix common.nixosModule ]; + specialArgs = { + inherit phps; + secrets = builtins.fromJSON (builtins.readFile ./secrets.json); }; }; + }; }