diff --git a/flake.nix b/flake.nix
index af72a47..d82486e 100755
--- a/flake.nix
+++ b/flake.nix
@@ -5,16 +5,18 @@
extra-substituters = [
# private
"http://nix-bincache.rory-desktop.local"
+ "http://nix-bincache.rory-laptop.local"
# public
- "https://attic.computer.surgery/grapevine"
+ #"https://attic.computer.surgery/grapevine"
"https://hyprland.cachix.org"
"https://nix-bincache.rory.gay"
];
extra-trusted-public-keys = [
"nix-bincache.rory-desktop.local:LDcVGNQoaprWeggWcRE1N0jjEqdjOR1D0kOI3fZne24="
- "grapevine:nYiZ0Qz9nT7Y7kNC/2NdoS3+J9gwTyWxOvlwZnFgceA="
+ #"grapevine:nYiZ0Qz9nT7Y7kNC/2NdoS3+J9gwTyWxOvlwZnFgceA="
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
"nix-bincache.rory.gay:663PIW8xxgIImxLcsokODWI2PHFWXvzJEfjX6TaIjxQ="
+ "nix-bincache.rory-laptop.local:IbXbNC8ok5YYj9HKYU/5GCec5HE/aixgW/+3sRHP2nE="
];
};
@@ -30,10 +32,10 @@
};
# Draupnir module/package
- #nixpkgs-override-synapse.url = "github:teutat3s/nixpkgs/matrix-synapse-1.136.0";
-# nixpkgs-override-draupnir.url = "github:NixOS/nixpkgs/master";
-# nixpkgs-override-draupnir.url = "github:r-ryantm/nixpkgs/auto-update/draupnir";
-# nixpkgs-override-jetbrains.url = "github:TheArcaneBrony/nixpkgs/jetbrains-2025-4";
+ # nixpkgs-override-synapse.url = "github:teutat3s/nixpkgs/matrix-synapse-1.136.0";
+ nixpkgs-override-draupnir.url = "github:NixOS/nixpkgs/master";
+ # nixpkgs-override-draupnir.url = "github:r-ryantm/nixpkgs/auto-update/draupnir";
+ # nixpkgs-override-jetbrains.url = "github:theCapypara/nixpkgs/jetbrains/update-26.1-ssl";
# Base modules
home-manager.url = "github:nix-community/home-manager/master";
@@ -42,12 +44,12 @@
nix-jetbrains-plugins.url = "github:nix-community/nix-jetbrains-plugins";
# Packages
- grapevine.url = "gitlab:matrix/grapevine-fork?host=gitlab.computer.surgery";
+ #grapevine.url = "gitlab:matrix/grapevine-fork?host=gitlab.computer.surgery";
conduit.url = "gitlab:famedly/conduit/next";
- drasl = {
- url = "github:unmojang/drasl";
- inputs.nixpkgs.follows = "nixpkgs";
- };
+ #drasl = {
+ # url = "github:unmojang/drasl";
+ # inputs.nixpkgs.follows = "nixpkgs";
+ #};
# - AUR imports
# aur-visual-paradigm = {
# url = "git+https://aur.archlinux.org/visual-paradigm.git";
@@ -104,10 +106,10 @@
flake = false;
};
- ffmpegSrc = {
- url = "git+https://git.ffmpeg.org/ffmpeg.git";
- flake = false;
- };
+ #ffmpegSrc = {
+ # url = "git+https://git.ffmpeg.org/ffmpeg.git";
+ # flake = false;
+ #};
draupnirSrc = {
url = "github:the-draupnir-project/Draupnir/main";
@@ -119,11 +121,14 @@
flake = false;
};
- hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1&ref=refs/tags/v0.50.1";
- hy3 = {
- url = "github:outfoxxed/hy3?ref=hl0.50.0";
- inputs.hyprland.follows = "hyprland";
+ hyprland = {
+ url = "git+https://github.com/hyprwm/Hyprland?submodules=1&ref=refs/tags/v0.54.0";
+ inputs.nixpkgs.follows = "nixpkgs";
};
+ #hy3 = {
+ # url = "github:outfoxxed/hy3?ref=hl0.53.3";
+ # inputs.hyprland.follows = "hyprland";
+ #};
};
@@ -150,8 +155,8 @@
home-manager.nixosModules.home-manager
lix-module.nixosModules.default
- grapevine.nixosModules.default
- drasl.nixosModules.drasl
+ #grapevine.nixosModules.default
+ #drasl.nixosModules.drasl
ooye.modules.default
(
@@ -178,7 +183,7 @@
specialArgs = {
inherit botcore-v4;
inherit home-manager;
- inherit grapevine;
+ #inherit grapevine;
inherit conduit;
#inherit nixpkgs-Draupnir;
#inherit nixpkgs-DraupnirPkg;
@@ -291,7 +296,7 @@
./packages/overlays/lldb.nix
(
- { ... }:
+ { pkgs, ... }:
{
nix = {
registry.nixpkgs.flake = nixpkgs;
@@ -306,7 +311,8 @@
inherit (inputs) mtxclientSrc;
inherit (inputs) nhekoSrc;
inherit hyprland;
- inherit hy3;
+ inherit (inputs) nom;
+ inherit (inputs) nix-jetbrains-plugins;
};
};
@@ -338,6 +344,29 @@
};
};
+ AspireTC705 = nixpkgs.lib.nixosSystem {
+ system = "x86_64-linux";
+ modules = [
+ ./host/AspireTC705/configuration.nix
+ ./hardware-configuration.nix
+ home-manager.nixosModules.home-manager
+ (
+ { ... }:
+ {
+ nix = {
+ registry.nixpkgs.flake = nixpkgs;
+ nixPath = [ "nixpkgs=${nixpkgs.outPath}" ];
+ };
+ }
+ )
+ ];
+ specialArgs = {
+ inherit home-manager;
+ inherit nixpkgs-stable;
+ inherit (inputs) nom;
+ };
+ };
+
Rory-portable = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
@@ -458,7 +487,7 @@
inherit (oldAttrs) src;
inherit patches;
name = "${oldAttrs.pname}-${oldAttrs.version}";
- hash = "sha256-CKvdWo9/f8Uhi5idgRhyuZwYua6gQzoKz21XNMaXdl0=";
+ hash = "sha256-RwUsiS6JM5dmqquKVtyaBp67DYZys6Uecy0V6AabTk4=";
};
#doInstallCheck = false;
@@ -476,8 +505,19 @@
'';
});
- packages.ffmpeg-git = self.inputs.nixpkgs-master.legacyPackages.${system}.ffmpeg-full.overrideAttrs (oldAttrs: rec {
- src = ffmpegSrc;
+ #packages.ffmpeg-git = self.inputs.nixpkgs-master.legacyPackages.${system}.ffmpeg-full.overrideAttrs (oldAttrs: rec {
+ # src = ffmpegSrc;
+ # version = "git";
+ # patches = [];
+ #});
+
+ packages.openrgb-3200 = self.inputs.nixpkgs-master.legacyPackages.${system}.openrgb.overrideAttrs (oldAttrs: rec {
+ src = pkgs.fetchFromGitLab {
+ owner = "CalcProgrammer1";
+ repo = "OpenRGB";
+ rev = "2b7b1b4ddb3db3104a7021dbcf44a2a6b24c0f7c";
+ hash = "sha256-tQt9Ej04GTYAcHeAwwvD4Idn+5FcZxRjdgMOMjvQj1E=";
+ };
version = "git";
patches = [];
});
|
