summary refs log tree commit diff
path: root/flake.nix
diff options
context:
space:
mode:
Diffstat (limited to 'flake.nix')
-rwxr-xr-xflake.nix18
1 files changed, 9 insertions, 9 deletions
diff --git a/flake.nix b/flake.nix

index e2fdeaa..e658f21 100755 --- a/flake.nix +++ b/flake.nix
@@ -7,13 +7,13 @@ "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=" @@ -33,7 +33,7 @@ # 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: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"; @@ -44,7 +44,7 @@ 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"; @@ -155,7 +155,7 @@ home-manager.nixosModules.home-manager lix-module.nixosModules.default - grapevine.nixosModules.default + #grapevine.nixosModules.default #drasl.nixosModules.drasl ooye.modules.default @@ -183,7 +183,7 @@ specialArgs = { inherit botcore-v4; inherit home-manager; - inherit grapevine; + #inherit grapevine; inherit conduit; #inherit nixpkgs-Draupnir; #inherit nixpkgs-DraupnirPkg; @@ -236,7 +236,7 @@ # }; #}; - Rory-desktop = nixpkgs-master.lib.nixosSystem { + Rory-desktop = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ ./host/Rory-desktop/configuration.nix @@ -249,8 +249,8 @@ { ... }: { nix = { - registry.nixpkgs.flake = nixpkgs-master; - nixPath = [ "nixpkgs=${nixpkgs-master.outPath}" ]; + registry.nixpkgs.flake = nixpkgs; + nixPath = [ "nixpkgs=${nixpkgs.outPath}" ]; }; } )