haipkgs

flake.lock

@@ -120,9 +120,7 @@
     },
     "disko": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs_3"
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1738148035,
@@ -133,10 +131,8 @@
         "type": "github"
       },
       "original": {
-        "owner": "nix-community",
+        "id": "disko",
-        "ref": "master",
+        "type": "indirect"
-        "repo": "disko",
-        "type": "github"
       }
     },
     "fenix": {
@@ -229,27 +225,6 @@
         "type": "github"
       }
     },
-    "flake-parts_2": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "nur",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1733312601,
-        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
     "flake-schemas": {
       "locked": {
         "lastModified": 1721999734,
@@ -408,6 +383,26 @@
         "type": "github"
       }
     },
+    "haipkgs": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1738550671,
+        "narHash": "sha256-yflgQxwzIzqHRVSd6GEkvm8VQ2TP94V1pZh6ivp9LnQ=",
+        "ref": "refs/heads/main",
+        "rev": "66268d8ed5154969c7387194dad3129602bb3c0c",
+        "revCount": 21,
+        "type": "git",
+        "url": "https://git.blahai.gay/blahai/haipkgs.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.blahai.gay/blahai/haipkgs.git"
+      }
+    },
     "haivim": {
       "inputs": {
         "flake-utils": "flake-utils",
@@ -578,17 +573,17 @@
         "hyprlang": "hyprlang",
         "hyprutils": "hyprutils",
         "hyprwayland-scanner": "hyprwayland-scanner",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_5",
         "pre-commit-hooks": "pre-commit-hooks",
         "systems": "systems_4",
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1738534828,
+        "lastModified": 1738546470,
-        "narHash": "sha256-aSCJwTpOxNfPiNJS7MnA7id0pRyN5L4cLOnPNTbbavY=",
+        "narHash": "sha256-pyMFj2IBeiRDnYoHD9XtbFiwBzvXJCavdFoVPnZ1YB0=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "44004abc0189b9ba49444431e2a39d2df7e930bb",
+        "rev": "708d16636047c6a311c4e44424cf7d2090219a47",
         "type": "github"
       },
       "original": {
@@ -932,6 +927,22 @@
       }
     },
     "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1737879851,
+        "narHash": "sha256-H+FXIKj//kmFHTTW4DFeOjR7F1z2/3eb2iwN6Me4YZk=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "5d3221fd57cc442a1a522a15eb5f58230f45a304",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1738297584,
         "narHash": "sha256-AYvaFBzt8dU0fcSK2jKD0Vg23K2eIRxfsVXIPCW9a0E=",
@@ -947,33 +958,17 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1738410390,
-        "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "3a228057f5b619feb3186e986dbe76278d707b6e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs_5": {
       "locked": {
         "lastModified": 1738410390,
         "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=",
-        "owner": "nixos",
+        "owner": "NixOS",
         "repo": "nixpkgs",
         "rev": "3a228057f5b619feb3186e986dbe76278d707b6e",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
+        "owner": "NixOS",
         "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
@@ -981,11 +976,11 @@
     },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1738142207,
+        "lastModified": 1738410390,
-        "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=",
+        "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9d3ae807ebd2981d593cddd0080856873139aa40",
+        "rev": "3a228057f5b619feb3186e986dbe76278d707b6e",
         "type": "github"
       },
       "original": {
@@ -1035,7 +1030,7 @@
         "git-hooks": "git-hooks",
         "home-manager": "home-manager_2",
         "nix-darwin": "nix-darwin",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_4",
         "nuschtosSearch": "nuschtosSearch",
         "treefmt-nix": "treefmt-nix"
       },
@@ -1053,26 +1048,6 @@
         "type": "github"
       }
     },
-    "nur": {
-      "inputs": {
-        "flake-parts": "flake-parts_2",
-        "nixpkgs": "nixpkgs_6",
-        "treefmt-nix": "treefmt-nix_2"
-      },
-      "locked": {
-        "lastModified": 1738362438,
-        "narHash": "sha256-EO2dVkMVLThWqv4hobEZEZGWBEuH2Z9SYqQDrbLSclU=",
-        "owner": "nix-community",
-        "repo": "NUR",
-        "rev": "95ddad0ff0e67c90314c6ca46324dce5f9a910d2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "NUR",
-        "type": "github"
-      }
-    },
     "nuschtosSearch": {
       "inputs": {
         "flake-utils": "flake-utils_2",
@@ -1126,13 +1101,12 @@
         "catppuccin": "catppuccin",
         "chaotic": "chaotic",
         "disko": "disko",
+        "haipkgs": "haipkgs",
         "haivim": "haivim",
         "home-manager": "home-manager_3",
         "hyprland": "hyprland",
-        "nixpkgs": "nixpkgs_5",
+        "nixpkgs": "nixpkgs_6",
         "nixpkgs-smol": "nixpkgs-smol",
-        "nur": "nur",
-        "sops-nix": "sops-nix",
         "spicetify-nix": "spicetify-nix",
         "wezterm": "wezterm",
         "zen-browser": "zen-browser"
@@ -1176,26 +1150,6 @@
         "type": "github"
       }
     },
-    "sops-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1738291974,
-        "narHash": "sha256-wkwYJc8cKmmQWUloyS9KwttBnja2ONRuJQDEsmef320=",
-        "owner": "Mic92",
-        "repo": "sops-nix",
-        "rev": "4c1251904d8a08c86ac6bc0d72cc09975e89aef7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Mic92",
-        "repo": "sops-nix",
-        "type": "github"
-      }
-    },
     "spicetify-nix": {
       "inputs": {
         "flake-compat": "flake-compat_3",
@@ -1330,27 +1284,6 @@
         "type": "github"
       }
     },
-    "treefmt-nix_2": {
-      "inputs": {
-        "nixpkgs": [
-          "nur",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1733222881,
-        "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "49717b5af6f80172275d47a418c9719a31a78b53",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "type": "github"
-      }
-    },
     "wezterm": {
       "inputs": {
         "flake-utils": "flake-utils_3",

flake.nix

@@ -9,7 +9,13 @@
     nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
     nixpkgs-smol.url = "github:nixos/nixpkgs?ref=nixos-unstable-small";
     chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
-    nur.url = "github:nix-community/NUR";
+
+    haipkgs = {
+      url = "git+https://git.blahai.gay/blahai/haipkgs.git";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+      };
+    };
 
     haivim = {
       url = "github:blahai/haivim";
@@ -26,16 +32,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    disko = {
-      url = "github:nix-community/disko/master";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    sops-nix = {
-      url = "github:Mic92/sops-nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -70,7 +66,7 @@
         };
         modules = [
           ./hosts/nyx/configuration.nix
-          inputs.home-manager.nixosModules.default
+          home-manager.nixosModules.default
           chaotic.nixosModules.default
         ];
       };

hosts/epimetheus/configuration.nix

@@ -24,7 +24,6 @@
   environment.systemPackages = with pkgs; [
     # The essentials
     neovim
-    disko
     parted
     git
     nixd

hosts/nyx/configuration.nix

@@ -103,7 +103,7 @@
       shell = pkgs.bash;
       packages = with pkgs; [
         floorp
-        vesktop
+        vesktop-git
         equibop
         element-desktop
       ];
@@ -170,8 +170,12 @@
     };
   };
 
-  nixpkgs.config.allowUnfree = true;
+  nixpkgs = {
-
+    config.allowUnfree = true;
+    overlays = [
+      inputs.haipkgs.overlays.default
+    ];
+  };
   nix = {
     nixPath = ["nixpkgs=${inputs.nixpkgs}"];
     package = pkgs.lix;
@@ -188,6 +192,7 @@
       substituters = [
         "https://nix-community.cachix.org"
         "https://nixpkgs-unfree.cachix.org"
+        "https://haipkgs.cachix.org"
         "https://hyprland.cachix.org"
         "https://anyrun.cachix.org"
         "https://wezterm.cachix.org"
@@ -195,6 +200,7 @@
       trusted-public-keys = [
         "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
         "nixpkgs-unfree.cachix.org-1:hqvoInulhbV4nJ9yJOEr+4wxhDV4xq2d1DK7S6Nj6rs="
+        "haipkgs.cachix.org-1:AcjMqIafTEQ7dw99RpeTJU2ywNUn1h8yIxz2+zjpK/A="
         "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
         "anyrun.cachix.org-1:pqBobmOjI7nKlsUMV25u9QHa9btJK65/C8vnO3p346s="
         "wezterm.cachix.org-1:kAbhjYUC9qvblTE+s7S+kl5XM1zVa4skO+E/1IDWdH0="
@@ -235,7 +241,6 @@
       mpv
       age
       ssh-to-age
-      sops
       inputs.zen-browser.packages."${pkgs.system}".default
       cava
       socat

modules/home-manager/cli/wezterm/default.nix

@@ -1,12 +1,10 @@
 {
-  inputs,
   pkgs,
-  lib,
   config,
   ...
 }: {
   home.packages = with pkgs; [
-    inputs.wezterm.packages.${pkgs.system}.default
+    wezterm-git
   ];
 
   xdg.configFile."wezterm" = {

modules/home-manager/hypr/default.nix

@@ -30,7 +30,6 @@
     configPackages = [config.wayland.windowManager.hyprland.package];
     extraPortals = [
       pkgs.xdg-desktop-portal-gtk
-      inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland
     ];
   };
 

modules/home-manager/hypr/hyprland/execs.nix

@@ -9,7 +9,7 @@
       "${pkgs.swww}/bin/swww-daemon --format xrgb"
       "${pkgs.floorp}/bin/floorp"
       "${pkgs.qbittorrent}/bin/qbittorrent"
-      "${pkgs.vesktop}/bin/vesktop --ozone-platform-hint=auto --enable-blink-features=MiddleClickAutoscroll --enable-wayland-ime=true"
+      "vesktop"
       "wl-paste --type text --watch cliphist store"
       "wl-paste --type image --watch cliphist store"
       "JKPS"

modules/nixos/games/default.nix

@@ -5,7 +5,6 @@
   ...
 }: {
   nixpkgs = {
-    overlays = [inputs.nur.overlays.default];
     config = {allowUnfree = true;};
   };
 
@@ -14,7 +13,7 @@
     prismlauncher
     osu-lazer-bin
     # davinci-resolve
-    nur.repos.reedrw.jkps
+    inputs.haipkgs.packages.${pkgs.system}.jkps
   ];
 
   programs = {