From af12ea65e3b2a7270931c8ffa05f1bfde3b17bce Mon Sep 17 00:00:00 2001 From: Julia Lange Date: Fri, 22 Mar 2024 02:54:25 -0700 Subject: [PATCH] Reformat flake.nix for cleaner management --- flake.lock | 85 +++++++++++++++++--- flake.nix | 28 +++---- modules/window_managers/hyprland/default.nix | 11 +++ systems/shared/default.nix | 6 +- 4 files changed, 98 insertions(+), 32 deletions(-) create mode 100644 modules/window_managers/hyprland/default.nix diff --git a/flake.lock b/flake.lock index b9e574c..f283cae 100644 --- a/flake.lock +++ b/flake.lock @@ -4,7 +4,7 @@ "inputs": { "flake-compat": "flake-compat", "nixpkgs": [ - "nixpkgs" + "nixpkgs-stable" ] }, "locked": { @@ -74,11 +74,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1710611769, - "narHash": "sha256-gM4cDw45J8mBmM0aR5Ko/zMAA8UWnQhc4uZ5Ydvc4uo=", + "lastModified": 1711070930, + "narHash": "sha256-jKOAO/NlfaTC/OcZkPoT87gsfVqt/+Ye+KcaIv6e2mU=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "0e87a08e15c023325b64920d9e1159f38a090695", + "rev": "9bad62b85f179ad2c95c6e7f734768ef060a604b", "type": "github" }, "original": { @@ -176,13 +176,44 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs-stable": { "locked": { - "lastModified": 1710451336, - "narHash": "sha256-pP86Pcfu3BrAvRO7R64x7hs+GaQrjFes+mEPowCfkxY=", + "lastModified": 1710951922, + "narHash": "sha256-FOOBJ3DQenLpTNdxMHR2CpGZmYuctb92gF0lpiirZ30=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d691274a972b3165335d261cc4671335f5c67de9", + "rev": "f091af045dff8347d66d186a62d42aceff159456", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-23.11", + "type": "indirect" + } + }, + "nixpkgs-stable_2": { + "locked": { + "lastModified": 1710628718, + "narHash": "sha256-y+l3eH53UlENaYa1lmnCBHusZb1kxBEFd2/c7lDsGpw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6dc11d9859d6a18ab0c5e5829a5b8e4810658de3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "release-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1710806803, + "narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3", "type": "github" }, "original": { @@ -191,11 +222,47 @@ "type": "indirect" } }, + "nixpkgs_3": { + "locked": { + "lastModified": 1710534455, + "narHash": "sha256-huQT4Xs0y4EeFKn2BTBVYgEwJSv8SDlm82uWgMnCMmI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9af9c1c87ed3e3ed271934cb896e0cdd33dae212", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "aagl": "aagl", "hyprland": "hyprland", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_2", + "nixpkgs-stable": "nixpkgs-stable", + "sops-nix": "sops-nix" + } + }, + "sops-nix": { + "inputs": { + "nixpkgs": "nixpkgs_3", + "nixpkgs-stable": "nixpkgs-stable_2" + }, + "locked": { + "lastModified": 1710644594, + "narHash": "sha256-RquCuzxfy4Nr8DPbdp3D/AsbYep21JgQzG8aMH9jJ4A=", + "owner": "Mic92", + "repo": "sops-nix", + "rev": "83b68a0e8c94b72cdd0a6e547a14ca7eb1c03616", + "type": "github" + }, + "original": { + "id": "sops-nix", + "type": "indirect" } }, "systems": { diff --git a/flake.nix b/flake.nix index b304f4e..6996e97 100644 --- a/flake.nix +++ b/flake.nix @@ -1,34 +1,26 @@ { inputs = { nixpkgs.url = "nixpkgs/nixos-unstable"; + nixpkgs-stable.url = "nixpkgs/nixos-23.11"; hyprland.url = "github:hyprwm/Hyprland"; aagl = { url = "github:ezKEa/aagl-gtk-on-nix"; - inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs.follows = "nixpkgs-stable"; }; }; - outputs = { self, nixpkgs, hyprland, aagl, ... }@inputs: - { - nixosConfigurations.onizuka = nixpkgs.lib.nixosSystem { + outputs = { self, nixpkgs, hyprland, aagl, sops-nix, ... }@inputs: + let + defaultConfig = extraModules: nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs; }; system = "x86_64-linux"; modules = [ - hyprland.nixosModules.default - { programs.hyprland.enable = true; } ./systems/shared - ./systems/onizuka - ]; - }; - - nixosConfigurations.jibril = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - modules = [ - hyprland.nixosModules.default - { programs.hyprland.enable = true; } - ./systems/shared - ./systems/jibril - ]; + ] ++ extraModules; }; + in + { + nixosConfigurations.onizuka = defaultConfig [ ./systems/onizuka ]; + nixosConfigurations.jibril = defaultConfig [ ./systems/jibril ]; }; } diff --git a/modules/window_managers/hyprland/default.nix b/modules/window_managers/hyprland/default.nix new file mode 100644 index 0000000..72babdb --- /dev/null +++ b/modules/window_managers/hyprland/default.nix @@ -0,0 +1,11 @@ +{ inputs, pkgs, lib, ... }: + +{ + imports = [ inputs.hyprland.nixosModules.default ]; + programs.hyprland.enable = true; + nix.settings = { + substituters = [ "https://hyprland.cachix.org" ]; + trusted-public-keys = [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ]; + experimental-features = [ "nix-command" "flakes" ]; + }; +} diff --git a/systems/shared/default.nix b/systems/shared/default.nix index 3a62bd3..46bcf0e 100644 --- a/systems/shared/default.nix +++ b/systems/shared/default.nix @@ -21,14 +21,10 @@ ../../modules/network/syncthing ../../modules/login/greetd + ../../modules/window_managers/hyprland ]; nixpkgs.config.allowUnfree = true; - nix.settings = { - substituters = [ "https://hyprland.cachix.org" ]; - trusted-public-keys = [ "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ]; - experimental-features = [ "nix-command" "flakes" ]; - }; system.stateVersion = "23.05"; }