From 4548020dc204e0e1f5865105ae57ad2939c1c985 Mon Sep 17 00:00:00 2001 From: Bruce Wang Date: Mon, 18 Nov 2024 10:50:40 +1100 Subject: [PATCH] use unstable eww instead of git version --- flake.lock | 102 +++------------------- flake.nix | 7 -- home/modules/wayland/eww/default.nix | 3 +- home/modules/wayland/hyprland/default.nix | 1 - 4 files changed, 14 insertions(+), 99 deletions(-) diff --git a/flake.lock b/flake.lock index 018ffed..886ab11 100644 --- a/flake.lock +++ b/flake.lock @@ -51,47 +51,7 @@ "type": "github" } }, - "eww": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": [ - "rust-overlay" - ] - }, - "locked": { - "lastModified": 1728712190, - "narHash": "sha256-GxbKoS2TQNMeD4dbZn1IU+/BOiYGeVALHVAbZnFc3UU=", - "owner": "elkowar", - "repo": "eww", - "rev": "50ec181fc7ff2a68d6330e8897de2c5179575935", - "type": "github" - }, - "original": { - "owner": "elkowar", - "repo": "eww", - "type": "github" - } - }, "flake-compat": { - "locked": { - "lastModified": 1709944340, - "narHash": "sha256-xr54XK0SjczlUxRo5YwodibUSlpivS9bqHt8BNyWVQA=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "baa7aa7bd0a570b3b9edd0b8da859fee3ffaa4d4", - "type": "github" - }, - "original": { - "owner": "edolstra", - "ref": "refs/pull/65/head", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { "flake": false, "locked": { "lastModified": 1696426674, @@ -107,7 +67,7 @@ "type": "github" } }, - "flake-compat_3": { + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1696426674, @@ -123,7 +83,7 @@ "type": "github" } }, - "flake-compat_4": { + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1673956053, @@ -139,7 +99,7 @@ "type": "github" } }, - "flake-compat_5": { + "flake-compat_4": { "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", @@ -284,7 +244,7 @@ }, "git-hooks": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "gitignore": "gitignore", "nixpkgs": [ "neovim-nightly-overlay", @@ -360,11 +320,11 @@ ] }, "locked": { - "lastModified": 1731832479, - "narHash": "sha256-icDDuYwJ0avTMZTxe1qyU/Baht5JOqw4pb5mWpR+hT0=", + "lastModified": 1731887066, + "narHash": "sha256-uw7K/RsYioJicV79Nl39yjtfhdfTDU2aRxnBgvFhkZ8=", "owner": "nix-community", "repo": "home-manager", - "rev": "5056a1cf0ce7c2a08ab50713b6c4af77975f6111", + "rev": "f3a2ff69586f3a54b461526e5702b1a2f81e740a", "type": "github" }, "original": { @@ -567,7 +527,7 @@ }, "neovim-nightly-overlay": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "flake-parts": "flake-parts", "git-hooks": "git-hooks", "hercules-ci-effects": "hercules-ci-effects", @@ -608,7 +568,7 @@ }, "nix-minecraft": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_3", "flake-utils": "flake-utils", "nixpkgs": [ "nixpkgs" @@ -630,7 +590,7 @@ }, "nix-search": { "inputs": { - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_4", "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" @@ -794,22 +754,6 @@ "url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.%2A.tar.gz" } }, - "nixpkgs_5": { - "locked": { - "lastModified": 1728538411, - "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nuenv": { "inputs": { "nixpkgs": "nixpkgs_4", @@ -855,11 +799,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1731857647, - "narHash": "sha256-leXdE4up8vM3ZqASBh1DxrD3k8UtME8IfJMmmfAVFVI=", + "lastModified": 1731881740, + "narHash": "sha256-obDKjh401AZjMUq1FxErpXaqe5lqfECEgBoTGftVigE=", "owner": "wamserma", "repo": "flake-programs-sqlite", - "rev": "bc88db88edf5842edf3e21de200e6b6bf6946ef1", + "rev": "d3d3cf5ec1d7b609b814207b7a1bf9dc9bd98179", "type": "github" }, "original": { @@ -873,7 +817,6 @@ "catppuccin": "catppuccin", "disko": "disko", "dotzsh": "dotzsh", - "eww": "eww", "home-manager": "home-manager", "hyprland-contrib": "hyprland-contrib", "hyprpaper": "hyprpaper", @@ -890,7 +833,6 @@ "nuenv": "nuenv", "parts": "parts", "programsdb": "programsdb", - "rust-overlay": "rust-overlay_2", "sops-nix": "sops-nix", "unstable": [ "nixpkgs-unstable" @@ -919,24 +861,6 @@ "type": "github" } }, - "rust-overlay_2": { - "inputs": { - "nixpkgs": "nixpkgs_5" - }, - "locked": { - "lastModified": 1731820690, - "narHash": "sha256-/hHFMTD+FGURXZ4JtfXoIgpy87zL505pVi6AL76Wc+U=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "bbab2ab9e1932133b1996baa1dc00fefe924ca81", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "sops-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 909f35c..f502855 100644 --- a/flake.nix +++ b/flake.nix @@ -49,13 +49,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - # eww - rust-overlay.url = "github:oxalica/rust-overlay"; - eww = { - url = "github:elkowar/eww"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.rust-overlay.follows = "rust-overlay"; - }; disko = { url = "github:nix-community/disko"; diff --git a/home/modules/wayland/eww/default.nix b/home/modules/wayland/eww/default.nix index 076c61a..b51f8d9 100644 --- a/home/modules/wayland/eww/default.nix +++ b/home/modules/wayland/eww/default.nix @@ -1,6 +1,5 @@ { self, - eww, ... }: { pkgs, @@ -18,7 +17,7 @@ in { # eww package home.packages = [ - eww.packages.${pkgs.system}.eww + pkgs.eww pkgs.pamixer pkgs.brightnessctl (pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];}) diff --git a/home/modules/wayland/hyprland/default.nix b/home/modules/wayland/hyprland/default.nix index 6e63f84..539b08c 100644 --- a/home/modules/wayland/hyprland/default.nix +++ b/home/modules/wayland/hyprland/default.nix @@ -1,6 +1,5 @@ { self, - eww, nix-search, ... }: {