felschr/nixos-config
1
1
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

feat: remove obelisk

Browse source
This commit is contained in:
Felix Schröter 2021-12-22 17:15:29 +01:00
parent fbe344b001
commit 3d8045fa8e
No known key found for this signature in database
GPG key ID: 910ACB9F6BD26F58
2 changed files with 4 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
flake.nix
View file

@ -18,11 +18,6 @@
inputs.flake-utils.follows = "flake-utils"; inputs.flake-utils.follows = "flake-utils";
}; };
inputs.obelisk = {
url = "github:obsidiansystems/obelisk";
flake = false;
};
inputs.photoprism2nix = { inputs.photoprism2nix = {
url = "github:GTrunSec/photoprism2nix"; url = "github:GTrunSec/photoprism2nix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -51,7 +46,7 @@
}; };
outputs = { self, nixpkgs, nixos-hardware, flake-utils, home-manager, nur outputs = { self, nixpkgs, nixos-hardware, flake-utils, home-manager, nur
, neovim, obelisk, photoprism2nix, pre-commit-hooks, nvim-ts-autotag , neovim, photoprism2nix, pre-commit-hooks, nvim-ts-autotag
, nvim-ts-context-commentstring, nvim-lspfuzzy }@inputs: , nvim-ts-context-commentstring, nvim-lspfuzzy }@inputs:
let let
overlays = { overlays = {
@ -78,9 +73,6 @@
deconz = self: super: { deconz = self: super: {
deconz = self.qt5.callPackage ./pkgs/deconz { }; deconz = self.qt5.callPackage ./pkgs/deconz { };
}; };
obelisk = self: super: {
obelisk = (import obelisk { inherit (self) system; }).command;
};
# custom overlay so it's using the flake's nixpkgs # custom overlay so it's using the flake's nixpkgs
photoprism = self: super: { photoprism = self: super: {
photoprism = photoprism2nix.defaultPackage.${self.system}; photoprism = photoprism2nix.defaultPackage.${self.system};
@ -90,13 +82,8 @@
homeManagerModules = { git = import ./home/modules/git.nix; }; homeManagerModules = { git = import ./home/modules/git.nix; };
systemDefaults = { systemDefaults = {
modules = [ nixosModules.flakeDefaults ]; modules = [ nixosModules.flakeDefaults ];
overlays = [ overlays =
nur.overlay [ nur.overlay overlays.neovim overlays.deconz overlays.photoprism ];
overlays.neovim
overlays.deconz
overlays.photoprism
overlays.obelisk
];
}; };
lib = rec { lib = rec {
createSystem = hostName: createSystem = hostName:

7
system/nix.nix
View file

@ -8,14 +8,9 @@
options = "--delete-older-than 30d"; options = "--delete-older-than 30d";
}; };
nix.binaryCaches = [ nix.binaryCaches = [ "https://hydra.iohk.io" "https://shajra.cachix.org" ];
"https://hydra.iohk.io"
"https://nixcache.reflex-frp.org"
"https://shajra.cachix.org"
];
nix.binaryCachePublicKeys = [ nix.binaryCachePublicKeys = [
"hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=" "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ="
"ryantrinkle.com-1:JJiAKaRv9mWgpVAz8dwewnZe0AzzEAzPkagE9SP5NWI="
"shajra.cachix.org-1:V0x7Wjgd/mHGk2KQwzXv8iydfIgLupbnZKLSQt5hh9o=" "shajra.cachix.org-1:V0x7Wjgd/mHGk2KQwzXv8iydfIgLupbnZKLSQt5hh9o="
]; ];
} }