From bb9f71b3ccc8050f6a8e8463991a1654b0ad0b5d Mon Sep 17 00:00:00 2001 From: "Alexandre Cavalheiro S. Tiago da Silva" Date: Thu, 24 Oct 2024 22:45:54 -0300 Subject: [PATCH] chore: flake update --- flake.lock | 231 ++++++++++++++++++++++++++++--- modules/home-manager/theming.nix | 10 +- modules/nixos/desktop.nix | 3 +- 3 files changed, 214 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index 6e2c15f..192231c 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1728902391, - "narHash": "sha256-44bnoY0nAvbBQ/lVjmn511yL39Sv7SknV0BDxn34P3Q=", + "lastModified": 1729527199, + "narHash": "sha256-D5/YksfRga8Akd04ZtIkuYSIOjXVrAzQIQBSeplokzU=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "9874e08eec85b5542ca22494e127b0cdce46b786", + "rev": "8d732fa8aff8b12ef2b1e2f00fc8153e41312b72", "type": "github" }, "original": { @@ -114,11 +114,11 @@ ] }, "locked": { - "lastModified": 1729321331, - "narHash": "sha256-KVyQq+ez/oB30/WbdNgVD8g/bda34z8NiU187QKQb74=", + "lastModified": 1729716953, + "narHash": "sha256-FbRKGRRd0amsk/WS/UV9ukJ8jT1dZ2pJBISxkX+uq6A=", "owner": "nix-community", "repo": "home-manager", - "rev": "122f70545b29ccb922e655b08acfe05bfb44ec68", + "rev": "a4353cc43d1b4dd6bdeacea90eb92a8b7b78a9d7", "type": "github" }, "original": { @@ -170,11 +170,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1729378105, - "narHash": "sha256-pcrrLHaHXct4I985PZhNZVYLghwZvQnnjGNToL56DFY=", + "lastModified": 1729781453, + "narHash": "sha256-vSZSNXXNEPN5JJcUobCBl6FaDvXjmLHhAJWoX3ZmHUQ=", "ref": "refs/heads/main", - "rev": "08cc063e175e48cea44d26b7e3762f4b8611f0c5", - "revCount": 5362, + "rev": "3cec45d82113051d35e846e5d80719d8ea0f7002", + "revCount": 5372, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -210,6 +210,31 @@ "type": "github" } }, + "hyprland-protocols_2": { + "inputs": { + "nixpkgs": [ + "xdph", + "nixpkgs" + ], + "systems": [ + "xdph", + "systems" + ] + }, + "locked": { + "lastModified": 1721326555, + "narHash": "sha256-zCu4R0CSHEactW9JqYki26gy8h9f6rHmSwj4XJmlHgg=", + "owner": "hyprwm", + "repo": "hyprland-protocols", + "rev": "5a11232266bf1a1f5952d5b179c3f4b2facaaa84", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-protocols", + "type": "github" + } + }, "hyprlang": { "inputs": { "hyprutils": [ @@ -239,6 +264,32 @@ "type": "github" } }, + "hyprlang_2": { + "inputs": { + "hyprutils": "hyprutils_2", + "nixpkgs": [ + "xdph", + "nixpkgs" + ], + "systems": [ + "xdph", + "systems" + ] + }, + "locked": { + "lastModified": 1725997860, + "narHash": "sha256-d/rZ/fHR5l1n7PeyLw0StWMNLXVU9c4HFyfskw568so=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "dfeb5811dd6485490cce18d6cc1e38a055eea876", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, "hyprutils": { "inputs": { "nixpkgs": [ @@ -264,6 +315,58 @@ "type": "github" } }, + "hyprutils_2": { + "inputs": { + "nixpkgs": [ + "xdph", + "hyprlang", + "nixpkgs" + ], + "systems": [ + "xdph", + "hyprlang", + "systems" + ] + }, + "locked": { + "lastModified": 1721324102, + "narHash": "sha256-WAZ0X6yJW1hFG6otkHBfyJDKRpNP5stsRqdEuHrFRpk=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "962582a090bc233c4de9d9897f46794280288989", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, + "hyprutils_3": { + "inputs": { + "nixpkgs": [ + "xdph", + "nixpkgs" + ], + "systems": [ + "xdph", + "systems" + ] + }, + "locked": { + "lastModified": 1724966483, + "narHash": "sha256-WXDgKIbzjYKczxSZOsJplCS1i1yrTUpsDPuJV/xpYLo=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "8976e3f6a5357da953a09511d0c7f6a890fb6ec2", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, "hyprwayland-scanner": { "inputs": { "nixpkgs": [ @@ -289,13 +392,38 @@ "type": "github" } }, + "hyprwayland-scanner_2": { + "inputs": { + "nixpkgs": [ + "xdph", + "nixpkgs" + ], + "systems": [ + "xdph", + "systems" + ] + }, + "locked": { + "lastModified": 1726840673, + "narHash": "sha256-HIPEXyRRVZoqD6U+lFS1B0tsIU7p83FaB9m7KT/x6mQ=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "b68dab23fc922eae99306988133ee80a40b39ca5", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1728888510, - "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", + "lastModified": 1729413321, + "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", + "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26", "type": "github" }, "original": { @@ -323,11 +451,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1729256560, - "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", + "lastModified": 1729665710, + "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", + "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", "type": "github" }, "original": { @@ -337,6 +465,22 @@ "type": "github" } }, + "nixpkgs_3": { + "locked": { + "lastModified": 1726463316, + "narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat", @@ -348,11 +492,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1728778939, - "narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=", + "lastModified": 1729104314, + "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "ff68f91754be6f3427e4986d7949e6273659be1d", + "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", "type": "github" }, "original": { @@ -367,7 +511,8 @@ "home-manager": "home-manager", "hyprland": "hyprland", "nixpkgs": "nixpkgs_2", - "spicetify-nix": "spicetify-nix" + "spicetify-nix": "spicetify-nix", + "xdph": "xdph_2" } }, "spicetify-nix": { @@ -378,11 +523,11 @@ ] }, "locked": { - "lastModified": 1729311378, - "narHash": "sha256-EJieGv/hQr3EIo5hEvYHjvi8dMZc8fdT1nXrq6I0Ob0=", + "lastModified": 1729743437, + "narHash": "sha256-MvidoEC3xJA7wp6Fjs15CuJ81uXzRHJK0VRSzNsfzcM=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "3dd5c8c33ee1b8d20d855e9fa425361719931b04", + "rev": "933469d5d0bc50bcc3918aa0f425d68fdd7c0736", "type": "github" }, "original": { @@ -406,6 +551,21 @@ "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" + } + }, "xdph": { "inputs": { "hyprland-protocols": [ @@ -446,6 +606,31 @@ "repo": "xdg-desktop-portal-hyprland", "type": "github" } + }, + "xdph_2": { + "inputs": { + "hyprland-protocols": "hyprland-protocols_2", + "hyprlang": "hyprlang_2", + "hyprutils": "hyprutils_3", + "hyprwayland-scanner": "hyprwayland-scanner_2", + "nixpkgs": "nixpkgs_3", + "systems": "systems_2" + }, + "locked": { + "lastModified": 1729674499, + "narHash": "sha256-GA/TwnvPsZqrem8wHZvlsk39WYkeyJnCizHk6/V7L3c=", + "ref": "refs/heads/master", + "rev": "8f8619fe032b6250b061c75fc194658fc3bcf04f", + "revCount": 413, + "submodules": true, + "type": "git", + "url": "https://github.com/hyprwm/xdg-desktop-portal-hyprland" + }, + "original": { + "submodules": true, + "type": "git", + "url": "https://github.com/hyprwm/xdg-desktop-portal-hyprland" + } } }, "root": "root", diff --git a/modules/home-manager/theming.nix b/modules/home-manager/theming.nix index 0b07453..54e98cd 100644 --- a/modules/home-manager/theming.nix +++ b/modules/home-manager/theming.nix @@ -20,18 +20,18 @@ ".config/fish/themes/Catppuccin-Frappe.theme".source = ./theming/Catppuccin-Frappe.theme; ## Kvantum's theme configuration. - ".config/Kvantum/Catppuccin-Frappe-Lavender" = { + ".config/Kvantum/catppuccin-frappe-lavender" = { source = "${ pkgs.catppuccin-kvantum.override { - accent = "Lavender"; - variant = "Frappe"; + accent = "lavender"; + variant = "frappe"; } - }/share/Kvantum/Catppuccin-Frappe-Lavender"; + }/share/Kvantum/catppuccin-frappe-lavender"; }; ".config/Kvantum/kvantum.kvconfig".text = '' [General] - theme=Catppuccin-Frappe-Lavender + theme=catppuccin-frappe-lavender ''; ## diff --git a/modules/nixos/desktop.nix b/modules/nixos/desktop.nix index d66e563..b5c385d 100644 --- a/modules/nixos/desktop.nix +++ b/modules/nixos/desktop.nix @@ -51,8 +51,7 @@ in package32 = hyprland-pkgs.pkgsi686Linux.mesa.drivers; extraPackages = with pkgs; [ - rocm-opencl-icd # OpenGL hwa - rocm-opencl-runtime + rocmPackages.clr.icd # OpenGL hwa ]; };