From 6b5565b10b8f8e6235d5e30aa0a7348ba66d8a22 Mon Sep 17 00:00:00 2001 From: Anthony Rodriguez Date: Sat, 30 Nov 2024 22:57:53 +0100 Subject: [PATCH] treewide: go back to fuzzel, change cursor to phinger --- flake.lock | 134 +++++------------------------------ flake.nix | 13 ---- home/programs/fuzzel.nix | 15 ++++ home/programs/niri/binds.nix | 2 +- home/programs/walker.nix | 7 -- hosts/solaire/default.nix | 2 +- hosts/vamos/default.nix | 2 +- modules/theme/default.nix | 26 ++++--- 8 files changed, 50 insertions(+), 151 deletions(-) create mode 100644 home/programs/fuzzel.nix delete mode 100644 home/programs/walker.nix diff --git a/flake.lock b/flake.lock index a895b64..bfda8dd 100644 --- a/flake.lock +++ b/flake.lock @@ -23,32 +23,10 @@ "type": "github" } }, - "anyrun": { - "inputs": { - "flake-parts": "flake-parts", - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems_2" - }, - "locked": { - "lastModified": 1731092955, - "narHash": "sha256-L1hLXf4IDZ0KoXbFiSNNZJ7IrReEr/J+CLt6Rl4Ea3M=", - "owner": "anyrun-org", - "repo": "anyrun", - "rev": "d2017f224b2bfd7e33573c7070e7c3e2960c7dcc", - "type": "github" - }, - "original": { - "owner": "anyrun-org", - "repo": "anyrun", - "type": "github" - } - }, "basix": { "inputs": { "flake-compat": "flake-compat", - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts", "nixpkgs": "nixpkgs" }, "locked": { @@ -200,27 +178,6 @@ } }, "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "anyrun", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, @@ -238,7 +195,7 @@ "type": "github" } }, - "flake-parts_3": { + "flake-parts_2": { "inputs": { "nixpkgs-lib": [ "lanzaboote", @@ -259,7 +216,7 @@ "type": "github" } }, - "flake-parts_4": { + "flake-parts_3": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_2" }, @@ -277,27 +234,6 @@ "type": "github" } }, - "flake-parts_5": { - "inputs": { - "nixpkgs-lib": [ - "walker", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-utils": { "locked": { "lastModified": 1629284811, @@ -315,7 +251,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1710146030, @@ -333,7 +269,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1710146030, @@ -416,7 +352,7 @@ "inputs": { "crane": "crane", "flake-compat": "flake-compat_3", - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_2", "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" @@ -818,7 +754,7 @@ }, "nvf": { "inputs": { - "flake-parts": "flake-parts_4", + "flake-parts": "flake-parts_3", "flake-utils": "flake-utils_3", "mnw": "mnw", "nil": "nil", @@ -927,7 +863,7 @@ "plugin-vim-vsnip": "plugin-vim-vsnip", "plugin-which-key": "plugin-which-key", "rnix-lsp": "rnix-lsp", - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1731058322, @@ -2668,7 +2604,6 @@ "root": { "inputs": { "agenix": "agenix", - "anyrun": "anyrun", "basix": "basix", "deploy-rs": "deploy-rs", "firefox-addons": "firefox-addons", @@ -2681,9 +2616,8 @@ "nixpkgs": "nixpkgs_6", "plasma-manager": "plasma-manager", "portfolio": "portfolio", - "systems": "systems_7", - "treefmt-nix": "treefmt-nix", - "walker": "walker" + "systems": "systems_6", + "treefmt-nix": "treefmt-nix" } }, "rust-overlay": { @@ -2773,16 +2707,16 @@ }, "systems_2": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -2832,21 +2766,6 @@ } }, "systems_6": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_7": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -2881,7 +2800,7 @@ }, "utils": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1701680307, @@ -2912,27 +2831,6 @@ "type": "github" } }, - "walker": { - "inputs": { - "flake-parts": "flake-parts_5", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1732983219, - "narHash": "sha256-RSMIhgR9T1ceDYtcHzUvaF7Lcuto8eHfjwCilvyFZAM=", - "owner": "abenz1267", - "repo": "walker", - "rev": "22107b2c922cb20245158e0f95d7586319b8b6d3", - "type": "github" - }, - "original": { - "owner": "abenz1267", - "repo": "walker", - "type": "github" - } - }, "xwayland-satellite-stable": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 48b1137..ebd8458 100644 --- a/flake.nix +++ b/flake.nix @@ -52,10 +52,6 @@ url = "github:ryantm/agenix"; inputs.nixpkgs.follows = "nixpkgs"; }; - anyrun = { - url = "github:anyrun-org/anyrun"; - inputs.nixpkgs.follows = "nixpkgs"; - }; basix.url = "github:notashelf/basix"; deploy-rs.url = "github:serokell/deploy-rs"; firefox-addons = { @@ -74,14 +70,5 @@ inputs.home-manager.follows = "home-manager"; }; treefmt-nix.url = "github:numtide/treefmt-nix"; - walker = { - url = "github:abenz1267/walker"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - }; - - nixConfig = { - extra-substituters = ["https://walker.cachix.org" "https://walker-git.cachix.org"]; - extra-trusted-public-keys = ["walker.cachix.org-1:fG8q+uAaMqhsMxWjwvk0IMb4mFPFLqHjuvfwQxE4oJM=" "walker-git.cachix.org-1:vmC0ocfPWh0S/vRAQGtChuiZBTAe4wiKDeyyXM0/7pM="]; }; } diff --git a/home/programs/fuzzel.nix b/home/programs/fuzzel.nix new file mode 100644 index 0000000..f6693c5 --- /dev/null +++ b/home/programs/fuzzel.nix @@ -0,0 +1,15 @@ +{ + pkgs, + lib, + ... +}: { + programs.fuzzel = { + enable = true; + settings = { + main = { + terminal = lib.getExe pkgs.foot; + layer = "overlay"; + }; + }; + }; +} diff --git a/home/programs/niri/binds.nix b/home/programs/niri/binds.nix index b17c3f1..98372c9 100644 --- a/home/programs/niri/binds.nix +++ b/home/programs/niri/binds.nix @@ -4,7 +4,7 @@ lib, ... }: let - appLauncher = "walker"; + appLauncher = "fuzzel"; terminal = "foot"; browser = "firefox"; prefix = "Mod"; diff --git a/home/programs/walker.nix b/home/programs/walker.nix deleted file mode 100644 index 920a94e..0000000 --- a/home/programs/walker.nix +++ /dev/null @@ -1,7 +0,0 @@ -{inputs, ...}: { - imports = [inputs.walker.homeManagerModules.default]; - programs.walker = { - enable = true; - runAsService = true; - }; -} diff --git a/hosts/solaire/default.nix b/hosts/solaire/default.nix index 71ce40f..2213c87 100644 --- a/hosts/solaire/default.nix +++ b/hosts/solaire/default.nix @@ -33,7 +33,7 @@ in { "${home}/programs/niri" "${home}/programs/waybar" - "${home}/programs/anyrun.nix" + "${home}/programs/fuzzel.nix" "${home}/services/swaync" "${home}/programs/swaybg.nix" diff --git a/hosts/vamos/default.nix b/hosts/vamos/default.nix index 2fef4db..e1f98c5 100644 --- a/hosts/vamos/default.nix +++ b/hosts/vamos/default.nix @@ -35,7 +35,7 @@ in { "${home}/programs/niri" "${home}/programs/waybar" - "${home}/programs/walker.nix" + "${home}/programs/fuzzel.nix" "${home}/services/swaync" "${home}/programs/swaybg.nix" diff --git a/modules/theme/default.nix b/modules/theme/default.nix index 58d6bf6..47dad4f 100644 --- a/modules/theme/default.nix +++ b/modules/theme/default.nix @@ -40,14 +40,14 @@ in { description = '' Name of the cursor theme. ''; - default = "Bibata-Modern-Classic"; + default = "phinger-cursors-dark"; }; package = mkOption { type = package; description = '' Package providing the cursor theme. ''; - default = pkgs.bibata-cursors; + default = pkgs.phinger-cursors; }; size = mkOption { description = '' @@ -175,14 +175,20 @@ in { waybar.style = generateGtkColors lib scheme.palette; - fuzzel.settings.colors = { - background = "${scheme.palette.base00}ff"; - text = "${scheme.palette.base05}ff"; - input = "${scheme.palette.base05}ff"; - selection = "${scheme.palette.base02}ff"; - selection-text = "${scheme.palette.base07}ff"; - selection-match = "${scheme.palette.base0D}ff"; - border = "${scheme.palette.base0E}ff"; + + fuzzel.settings = { + main = { + font = "sans-serif:size=16"; + }; + colors = { + background = "${scheme.palette.base00}ff"; + text = "${scheme.palette.base05}ff"; + input = "${scheme.palette.base05}ff"; + selection = "${scheme.palette.base02}ff"; + selection-text = "${scheme.palette.base07}ff"; + selection-match = "${scheme.palette.base0D}ff"; + border = "${scheme.palette.base0E}ff"; + }; }; swaylock.settings = {