From 3bfe822aa3a7ea32606cae2cf40c6ecda6e590d6 Mon Sep 17 00:00:00 2001 From: Kyler Clay Date: Wed, 25 Sep 2024 03:24:43 -0400 Subject: [PATCH] Commit for generation 71 --- flake.lock | 109 +++++++++++++++++- flake.nix | 2 + glasshouse-desktop/configuration.nix | 1 + .../dotfiles/packages/hyprland/hyprland.conf | 2 - glasshouse-desktop/home.nix | 3 +- 5 files changed, 113 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 3bbe57e..0788dcd 100644 --- a/flake.lock +++ b/flake.lock @@ -230,6 +230,28 @@ "type": "github" } }, + "hyprlang": { + "inputs": { + "nixpkgs": [ + "rose-pine-hyprcursor", + "nixpkgs" + ], + "systems": "systems_2" + }, + "locked": { + "lastModified": 1709914708, + "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -313,6 +335,22 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1710272261, + "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1726937504, "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=", @@ -427,9 +465,30 @@ "home-manager": "home-manager", "nixpkgs": "nixpkgs", "nvim": "nvim", + "rose-pine-hyprcursor": "rose-pine-hyprcursor", "toilet": "toilet" } }, + "rose-pine-hyprcursor": { + "inputs": { + "hyprlang": "hyprlang", + "nixpkgs": "nixpkgs_3", + "utils": "utils" + }, + "locked": { + "lastModified": 1718180692, + "narHash": "sha256-J5IYvKcdGRL/sBuST5WaoESEIl7KPv8aJK8aLY6C91E=", + "owner": "ndom91", + "repo": "rose-pine-hyprcursor", + "rev": "40ce26cb29206722ff73839ead0d871d94751e90", + "type": "github" + }, + "original": { + "owner": "ndom91", + "repo": "rose-pine-hyprcursor", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -445,9 +504,39 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "toilet": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1727237241, @@ -481,6 +570,24 @@ "repo": "treefmt-nix", "type": "github" } + }, + "utils": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 08b9104..c517e6c 100644 --- a/flake.nix +++ b/flake.nix @@ -8,11 +8,13 @@ #glasshouse-desktop dots nvim.url = "path:/home/pagedmov/sysflakes/glasshouse-desktop/dotfiles/packages/nixvim"; toilet.url = "path:/home/pagedmov/sysflakes/glasshouse-desktop/dotfiles/packages/toilet"; + rose-pine-hyprcursor.url = "github:ndom91/rose-pine-hyprcursor"; }; outputs = { nixpkgs, home-manager, nvim, toilet, ... }@inputs: { nixosConfigurations = { glasshouse = nixpkgs.lib.nixosSystem { + specialArgs = { inherit inputs; }; system = "x86_64-linux"; modules = [ ./glasshouse-desktop/configuration.nix diff --git a/glasshouse-desktop/configuration.nix b/glasshouse-desktop/configuration.nix index 7fac3ef..f094d2c 100644 --- a/glasshouse-desktop/configuration.nix +++ b/glasshouse-desktop/configuration.nix @@ -51,6 +51,7 @@ nixpkgs.config.allowUnfree = true; environment.systemPackages = with pkgs; [ + inputs.rose-pine-hyprcursor.packages.${pkgs.system}.default parted vim gnumake diff --git a/glasshouse-desktop/dotfiles/packages/hyprland/hyprland.conf b/glasshouse-desktop/dotfiles/packages/hyprland/hyprland.conf index 90ac9bc..cfe7bda 100644 --- a/glasshouse-desktop/dotfiles/packages/hyprland/hyprland.conf +++ b/glasshouse-desktop/dotfiles/packages/hyprland/hyprland.conf @@ -35,8 +35,6 @@ $browser = firefox env = qt_qpa_platformtheme,qt6ct env = XDG_CURRENT_DESKTOP,hyprland - env = HYPRCURSOR_THEME,Hackneyed-Dark - env = HYPRCURSOR_SIZE,24 # settings input { diff --git a/glasshouse-desktop/home.nix b/glasshouse-desktop/home.nix index 6b2547c..ea9f1e1 100644 --- a/glasshouse-desktop/home.nix +++ b/glasshouse-desktop/home.nix @@ -55,7 +55,7 @@ gtk.enable = true; x11.enable = true; name = name; - size = 8; + size = 24; package = pkgs.runCommand "moveUp" {} '' mkdir -p $out/share/icons ln -s ${pkgs.fetchzip { @@ -67,6 +67,7 @@ in getFrom "https://gitlab.com/-/project/6703061/uploads/013137de48e6da3edc32bba068cf4c52/Hackneyed-Dark-24px-0.9.2-right-handed.tar.bz2" + "sha256-fEAyeeEEknbGEGycmvMcU4M77x1InsQCuIBwcSasOcw=" "Hackneyed-Dark"; home.file = { # dotfiles