Kabbone/nixos-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

flake: remove hyprland since it's in nixpkgs now

Browse Source
This commit is contained in:
Kabbone 2023-07-21 21:27:26 +02:00
parent e039610163
commit 19b91aebd9
Signed by: Kabbone
SSH Key Fingerprint: SHA256:A5zPB5I6u5V78V51c362BBdCwhDhfDUVbt7NfKdjWBY
3 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
flake.nix
View File

@ -24,18 +24,13 @@
url = "github:nix-community/NUR"; # NUR Packages url = "github:nix-community/NUR"; # NUR Packages
}; };
hyprland = { # Official Hyprland flake
url = "github:vaxerski/Hyprland";
inputs.nixpkgs.follows = "nixpkgs";
};
agenix = { agenix = {
url = "github:ryantm/agenix"; url = "github:ryantm/agenix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
}; };
outputs = inputs @ { self, nixpkgs, nixpkgs-stable, nixos-hardware, home-manager, nur, hyprland, agenix, ... }: # Function that tells my flake which to use and what do what to do with the dependencies. outputs = inputs @ { self, nixpkgs, nixpkgs-stable, nixos-hardware, home-manager, nur, agenix, ... }: # Function that tells my flake which to use and what do what to do with the dependencies.
let # Variables that can be used in the config files let # Variables that can be used in the config files
user = "kabbone"; user = "kabbone";
location = "$HOME/.setup"; location = "$HOME/.setup";
@ -44,7 +39,7 @@
nixosConfigurations = ( # NixOS configurations nixosConfigurations = ( # NixOS configurations
import ./hosts { # Imports ./hosts/default.nix import ./hosts { # Imports ./hosts/default.nix
inherit (nixpkgs) lib; inherit (nixpkgs) lib;
inherit inputs nixpkgs nixpkgs-stable nixos-hardware home-manager nur user location hyprland agenix; # Also inherit home-manager so it does not need to be defined here. inherit inputs nixpkgs nixpkgs-stable nixos-hardware home-manager nur user location agenix; # Also inherit home-manager so it does not need to be defined here.
} }
); );
}; };

2
hosts/configuration_desktop.nix
View File

@ -166,8 +166,6 @@
nix = { # Nix Package Manager settings nix = { # Nix Package Manager settings
settings ={ settings ={
auto-optimise-store = true; # Optimise syslinks auto-optimise-store = true; # Optimise syslinks
substituters = ["https://hyprland.cachix.org"];
trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="];
}; };
gc = { # Automatic garbage collection gc = { # Automatic garbage collection
automatic = true; automatic = true;

11
hosts/default.nix
View File

@ -11,7 +11,7 @@
# └─ ./home.nix # └─ ./home.nix
# #
{ lib, inputs, nixpkgs, nixos-hardware, home-manager, nur, user, location, hyprland, agenix, ... }: { lib, inputs, nixpkgs, nixos-hardware, home-manager, nur, user, location, agenix, ... }:
let let
system = "x86_64-linux"; # System architecture system = "x86_64-linux"; # System architecture
@ -27,11 +27,10 @@ in
{ {
desktop = lib.nixosSystem { # Desktop profile desktop = lib.nixosSystem { # Desktop profile
inherit system; inherit system;
specialArgs = { inherit inputs user location hyprland nixos-hardware nur agenix; }; specialArgs = { inherit inputs user location nixos-hardware nur agenix; };
modules = [ modules = [
agenix.nixosModules.default agenix.nixosModules.default
nur.nixosModules.nur nur.nixosModules.nur
#hyprland.nixosModules.default
./desktop ./desktop
./configuration_desktop.nix ./configuration_desktop.nix
nixos-hardware.nixosModules.common-cpu-amd nixos-hardware.nixosModules.common-cpu-amd
@ -55,11 +54,10 @@ in
laptop = lib.nixosSystem { # Laptop profile laptop = lib.nixosSystem { # Laptop profile
inherit system; inherit system;
specialArgs = { inherit inputs user location hyprland nixos-hardware nur agenix; }; specialArgs = { inherit inputs user location nixos-hardware nur agenix; };
modules = [ modules = [
agenix.nixosModules.default agenix.nixosModules.default
nur.nixosModules.nur nur.nixosModules.nur
#hyprland.nixosModules.default
./laptop ./laptop
./configuration_desktop.nix ./configuration_desktop.nix
nixos-hardware.nixosModules.common-cpu-intel nixos-hardware.nixosModules.common-cpu-intel
@ -135,9 +133,8 @@ in
q920 = lib.nixosSystem { # Laptop profile q920 = lib.nixosSystem { # Laptop profile
inherit system; inherit system;
specialArgs = { inherit inputs user location hyprland; }; specialArgs = { inherit inputs user location ; };
modules = [ modules = [
hyprland.nixosModules.default
./q920 ./q920
./configuration.nix ./configuration.nix