remove nixpkgs master

flake.lock

@@ -56,11 +56,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1711096360,
+        "lastModified": 1711207981,
-        "narHash": "sha256-hqjRGQIBmiWpQPhvix8L5rcxeuJ2z0KZS6A6RbmTB/o=",
+        "narHash": "sha256-P013JnwcmgMqPXetak42OSKXhi3GTy2JqXHdx7i5eJ0=",
         "owner": "famedly",
         "repo": "conduit",
-        "rev": "b11855e7a1fc00074a13f9d1b9ab04462931332f",
+        "rev": "9176474513481a035c63c85b7dc6c0025b950dcf",
         "type": "gitlab"
       },
       "original": {
@@ -163,11 +163,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1711225514,
+        "lastModified": 1711228222,
-        "narHash": "sha256-bjYx6jdT9Xsq7/8/FUElYiMYEcXynrEf0HJLRNsDb70=",
+        "narHash": "sha256-lMaTKsgRpGy7b9Hn4CAqvlMijlKGZIZMF3YHc5IWkQs=",
         "ref": "refs/heads/main",
-        "rev": "3ea8e0e7f321941a8219151a21b40cf91afa68a4",
+        "rev": "1881b03da738ed7d450622ab6e1a0b10e061ea5f",
-        "revCount": 1,
+        "revCount": 2,
         "type": "git",
         "url": "https://codeberg.org/noe/doll.repair"
       },
@@ -507,11 +507,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1710974515,
+        "lastModified": 1711133180,
-        "narHash": "sha256-jZpdsypecYTOO9l12Vy77otGmh9uz8tGzcguifA30Vs=",
+        "narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "1c2acec99933f9835cc7ad47e35303de92d923a4",
+        "rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb",
         "type": "github"
       },
       "original": {
@@ -662,22 +662,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-master": {
-      "locked": {
-        "lastModified": 1711178010,
-        "narHash": "sha256-/nARqr8LVTAzLot0tjh+8uNWqhVT88sm4vm3G0UdMYI=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "a986eec15c397b90595c633c3c1bdce06997c582",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "master",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs-stable": {
       "locked": {
         "lastModified": 1702780907,
@@ -744,11 +728,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1711001935,
+        "lastModified": 1711163522,
-        "narHash": "sha256-URtGpHue7HHZK0mrHnSf8wJ6OmMKYSsoLmJybrOLFSQ=",
+        "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "20f77aa09916374aa3141cbc605c955626762c9a",
+        "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4",
         "type": "github"
       },
       "original": {
@@ -808,11 +792,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1711001935,
+        "lastModified": 1711163522,
-        "narHash": "sha256-URtGpHue7HHZK0mrHnSf8wJ6OmMKYSsoLmJybrOLFSQ=",
+        "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "20f77aa09916374aa3141cbc605c955626762c9a",
+        "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4",
         "type": "github"
       },
       "original": {
@@ -851,11 +835,11 @@
         "pre-commit-hooks": "pre-commit-hooks_2"
       },
       "locked": {
-        "lastModified": 1711124705,
+        "lastModified": 1711199922,
-        "narHash": "sha256-vgFQxvs6T9RcaV9sd9Io+RxQuRKovauMvueGajWWanw=",
+        "narHash": "sha256-Oz5WNOPp95K4JLyoNQKyEdaUM5JzliC62jwTpGPqYNE=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "822ec15646b8f7b621468b503118921d644acf39",
+        "rev": "7170aad28139cd3629b2b6ce4c9272bf41c2ad45",
         "type": "github"
       },
       "original": {
@@ -951,7 +935,6 @@
         "kde2nix": "kde2nix",
         "nixos-generators": "nixos-generators",
         "nixpkgs": "nixpkgs_5",
-        "nixpkgs-master": "nixpkgs-master",
         "nixpkgs-stable": "nixpkgs-stable_3",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "nixvim": "nixvim",

flake.nix

@@ -6,7 +6,7 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.11";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
-    nixpkgs-master.url = "github:nixos/nixpkgs/master";
+    # nixpkgs-master.url = "github:nixos/nixpkgs/master";
 
     # Home manageKr
     home-manager = {

home-manager/noe/common/default.nix

@@ -34,6 +34,10 @@
 
     packages = with pkgs; [
       w3m
+      dig
+      traceroute
+      whois
+      nmap
     ];
   };
   

nixos/features/dns-cache.nix

@@ -1,10 +1,15 @@
-{...}: {
+{ config, ... }: {
-  networking.nameservers = [ "1.1.1.1#one.one.one.one" "1.0.0.1#one.one.one.one" ];
+  networking.nameservers = [
+    "2606:4700:4700::1111#one.one.one.one"
+    "2606:4700:4700::1001#one.one.one.one"
+    "1.1.1.1#one.one.one.one" 
+    "1.0.0.1#one.one.one.one" 
+  ];
   services.resolved = {
     enable = true;
     dnssec = "true";
     domains = [ "~." ];
-    fallbackDns = [ "1.1.1.1#one.one.one.one" "1.0.0.1#one.one.one.one" ];
+    fallbackDns = config.networking.nameservers;
     extraConfig = ''
       DNSOverTLS=yes
     '';

nixos/features/nvidia.nix

@@ -1,6 +1,4 @@
-{ lib, config, pkgs, inputs, ... }: let
+{ lib, config, pkgs, inputs, ... }: {
-  pkgsMaster = import inputs.nixpkgs-master { inherit (pkgs) system; config.allowUnfree = true;  };
-in {
   
   hardware.opengl = {
     enable = true;
@@ -19,7 +17,6 @@ in {
     virtualglLib
     vulkan-loader
     vulkan-tools
-
   ];
 
   services.xserver.videoDrivers = ["nvidia"];
@@ -38,5 +35,5 @@ in {
     package = config.boot.kernelPackages.nvidiaPackages.beta;
   };
 
-  boot.kernelPackages = pkgsMaster.linuxPackages_latest;
+  boot.kernelPackages = pkgs.linuxPackages_latest;
 }

nixos/hosts/ingress-proxy/default.nix

@@ -1,5 +1,6 @@
 { lib, pkgs, config, inputs, ... }: let
   tsHost = name: port: "${name}.hoki-porgy.ts.net:${toString port}";
+  flakePackage = flake: inputs.${flake}.packages.${pkgs.system}.default;
 in {
   imports = [
     ../../templates/proxmox-lxc.nix
@@ -13,8 +14,8 @@ in {
   system.stateVersion = "24.05"; 
   nixpkgs.hostPlatform = "x86_64-linux";
   
-  networking.firewall.allowedTCPPorts = [ 80 443 8448 ];
+  networking.firewall.allowedTCPPorts = [ 80 443 ];
-  networking.firewall.allowedUDPPorts = [ 80 443 8448 ];
+  networking.firewall.allowedUDPPorts = [ 80 443 ];
 
   services.nginx = {
     recommendedTlsSettings = true;
@@ -50,7 +51,7 @@ in {
         };
       } // defaultConfig;
 
-      mekanoesh = static { src = inputs.noe-sh.packages.${pkgs.system}.default; };
+      mekanoesh = static { src = flakePackage "noe-sh"; };
 
       ps2live = upstream: {
         locations."/" = {
@@ -59,51 +60,6 @@ in {
         };
       } // defaultConfig;
     in {
-      # Matrix (main)
-      # "mx.sapphic.engineer" = defaultConfig // {
-      #   listen = [
-      #     { addr = "0.0.0.0"; port = 443; ssl = true; }
-      #     { addr = "[::]"; port = 443; ssl = true; }
-      #     { addr = "0.0.0.0"; port = 8448; ssl = true; }
-      #     { addr = "[::]"; port = 8448; ssl = true; }
-      #   ];
-
-      #   locations."/_matrix/" = {
-      #     proxyPass = "http://mango";
-      #     proxyWebsockets = true;
-      #     extraConfig = ''
-      #       proxy_set_header Host $host;
-      #       proxy_buffering off;
-      #     '';
-      #   };
-
-      #   extraConfig = ''
-      #     merge_slashes off;
-      #     client_max_body_size 100M;
-      #   '';
-      # };
-
-      # "happ.ystatic.buzz" = defaultConfig // {
-      #   locations."/" = {
-      #     proxyPass = "http://hsb";
-      #     proxyWebsockets = true;
-      #   };
-      #   extraConfig = ''
-      #     client_max_body_size 40M;
-      #   '';
-      # };
-
-      # "keysmash.xn--q9jyb4c" = defaultConfig // {
-      #   locations."/" = {
-      #     proxyPass = "http://ks";
-      #     proxyWebsockets = true;
-      #   };
-
-      #   extraConfig = ''
-      #     client_max_body_size 40M;
-      #   '';
-      # };
-
       "mekanoe.com" = mekanoesh;
 
       "noe.sh" = mekanoesh;
@@ -123,39 +79,8 @@ in {
         serverAliases = [ "metagame-new.ps2.live" ];
       };
 
-      "doll.repair" = static {
+      "doll.repair" = static { src = flakePackage "doll-repair"; };
-        src = inputs.doll-repair.packages.${pkgs.system}.default;
-      };
-
       "porcelain.doll.repair" = placeholder;
-
-      # Generic store for /.well-known/ paths.
-      # "well-known.sapphic.engineer" = defaultConfig // {
-      #   locations."=/.well-known/matrix/server" = let 
-      #     alias = pkgs.writeText "well-known-matrix-server" (builtins.toJSON {
-      #       "m.server" = "mx.sapphic.engineer";
-      #     });
-      #   in {
-      #     alias = "${alias}";
-      #     extraConfig = ''
-      #       default_type application/json;
-      #     '';
-      #   };
-
-      #   locations."=/.well-known/matrix/client" = let
-      #     alias = pkgs.writeText "well-known-matrix-client" (builtins.toJSON {
-      #       "m.homeserver" = {
-      #         base_url = "https://mx.sapphic.engineer";
-      #       };
-      #     });
-      #   in {
-      #     alias = "${alias}";
-      #     extraConfig = ''
-      #       default_type application/json;
-      #       add_header Access-Control-Allow-Origin "*";
-      #     '';
-      #   };
-      # };
     };
   };
 

overlays/default.nix

@@ -30,9 +30,9 @@
       config.allowUnfree = true;
     };
 
-    master = import inputs.nixpkgs-unstable {
+    # master = import inputs.nixpkgs-unstable {
-      system = final.system;
+    #   system = final.system;
-      config.allowUnfree = true;
+    #   config.allowUnfree = true;
-    };
+    # };
   };
 }