From ec56959779dab29cf2d7f718c3c1ac3d6b2bffc1 Mon Sep 17 00:00:00 2001 From: Anthony Rodriguez Date: Thu, 28 Nov 2024 21:51:20 +0100 Subject: [PATCH] treewide: add anyrun, remove unused dependencies --- flake.lock | 166 ++++++++++++++++++----------------- flake.nix | 5 +- home/programs/anyrun.nix | 30 +++++++ home/programs/fuzzel.nix | 20 ----- home/programs/niri/binds.nix | 6 +- hosts/solaire/default.nix | 4 +- hosts/vamos/default.nix | 5 +- 7 files changed, 127 insertions(+), 109 deletions(-) create mode 100644 home/programs/anyrun.nix delete mode 100644 home/programs/fuzzel.nix diff --git a/flake.lock b/flake.lock index b10988c..408abfe 100644 --- a/flake.lock +++ b/flake.lock @@ -23,51 +23,33 @@ "type": "github" } }, - "ags": { - "inputs": { - "astal": "astal", - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1732307740, - "narHash": "sha256-ZDsYdZOtg5qkK/wfLLB83B3SI+fE32S+/6Ey0ggHODM=", - "owner": "Aylur", - "repo": "ags", - "rev": "81159966eb8b39b66c3efc133982fd76920c9605", - "type": "github" - }, - "original": { - "owner": "Aylur", - "repo": "ags", - "type": "github" - } - }, - "astal": { + "anyrun": { "inputs": { + "flake-parts": "flake-parts", "nixpkgs": [ - "ags", "nixpkgs" - ] + ], + "systems": "systems_2" }, "locked": { - "lastModified": 1731952585, - "narHash": "sha256-Sh1E7sJd8JJM3PCU1ZOei/QWz97OLCENIi2rTRoaniw=", - "owner": "aylur", - "repo": "astal", - "rev": "664c7a4ddfcf48c6e8accd3c33bb94424b0e8609", + "lastModified": 1731092955, + "narHash": "sha256-L1hLXf4IDZ0KoXbFiSNNZJ7IrReEr/J+CLt6Rl4Ea3M=", + "owner": "anyrun-org", + "repo": "anyrun", + "rev": "d2017f224b2bfd7e33573c7070e7c3e2960c7dcc", "type": "github" }, "original": { - "owner": "aylur", - "repo": "astal", + "owner": "anyrun-org", + "repo": "anyrun", "type": "github" } }, "basix": { "inputs": { "flake-compat": "flake-compat", - "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_2" + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1731727882, @@ -129,7 +111,7 @@ "deploy-rs": { "inputs": { "flake-compat": "flake-compat_2", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "utils": "utils" }, "locked": { @@ -218,6 +200,27 @@ } }, "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" }, @@ -235,7 +238,7 @@ "type": "github" } }, - "flake-parts_2": { + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "lanzaboote", @@ -256,7 +259,7 @@ "type": "github" } }, - "flake-parts_3": { + "flake-parts_4": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_2" }, @@ -291,7 +294,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1710146030, @@ -309,7 +312,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1710146030, @@ -327,7 +330,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_7" + "systems": "systems_8" }, "locked": { "lastModified": 1726560853, @@ -444,7 +447,7 @@ "inputs": { "crane": "crane", "flake-compat": "flake-compat_3", - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts_3", "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" @@ -575,7 +578,7 @@ "inputs": { "niri-stable": "niri-stable", "niri-unstable": "niri-unstable", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "nixpkgs-stable": "nixpkgs-stable_2", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" @@ -664,15 +667,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731676054, - "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", - "owner": "nixos", + "lastModified": 1715266358, + "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", + "rev": "f1010e0469db743d14519a1efd37e23f8513d714", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -735,22 +738,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1715266358, - "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f1010e0469db743d14519a1efd37e23f8513d714", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1702272962, "narHash": "sha256-D+zHwkwPc6oYQ4G3A1HuadopqRwUY/JkMwHz1YF7j4Q=", @@ -766,7 +753,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1726871744, "narHash": "sha256-V5LpfdHyQkUF7RfOaDPrZDP+oqz88lTJrMT1+stXNwo=", @@ -782,7 +769,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1656753965, "narHash": "sha256-BCrB3l0qpJokOnIVc3g2lHiGhnjUi0MoXiw6t1o8H1E=", @@ -798,7 +785,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1732521221, "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", @@ -814,7 +801,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1732521221, "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", @@ -829,7 +816,7 @@ "type": "indirect" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1731531548, "narHash": "sha256-sz8/v17enkYmfpgeeuyzniGJU0QQBfmAjlemAUYhfy8=", @@ -845,7 +832,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1731890469, "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=", @@ -879,11 +866,11 @@ }, "nvf": { "inputs": { - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_4", "flake-utils": "flake-utils_3", "mnw": "mnw", "nil": "nil", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nmd": "nmd", "plugin-alpha-nvim": "plugin-alpha-nvim", "plugin-bufdelete-nvim": "plugin-bufdelete-nvim", @@ -988,7 +975,7 @@ "plugin-vim-vsnip": "plugin-vim-vsnip", "plugin-which-key": "plugin-which-key", "rnix-lsp": "rnix-lsp", - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1731058322, @@ -2662,7 +2649,7 @@ }, "portfolio": { "inputs": { - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_7", "sam-zola": "sam-zola" }, "locked": { @@ -2709,7 +2696,7 @@ "rnix-lsp": { "inputs": { "naersk": "naersk", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "utils": "utils_2" }, "locked": { @@ -2729,7 +2716,7 @@ "root": { "inputs": { "agenix": "agenix", - "ags": "ags", + "anyrun": "anyrun", "basix": "basix", "deploy-rs": "deploy-rs", "firefox-addons": "firefox-addons", @@ -2739,10 +2726,10 @@ "niri": "niri", "nix-index-db": "nix-index-db", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_6", "plasma-manager": "plasma-manager", "portfolio": "portfolio", - "systems": "systems_6", + "systems": "systems_7", "treefmt-nix": "treefmt-nix", "wezterm": "wezterm" } @@ -2855,16 +2842,16 @@ }, "systems_2": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, @@ -2914,6 +2901,21 @@ } }, "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=", @@ -2928,7 +2930,7 @@ "type": "github" } }, - "systems_7": { + "systems_8": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -2945,7 +2947,7 @@ }, "treefmt-nix": { "inputs": { - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1732643199, @@ -2963,7 +2965,7 @@ }, "utils": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1701680307, diff --git a/flake.nix b/flake.nix index 34f8190..72a1089 100644 --- a/flake.nix +++ b/flake.nix @@ -52,7 +52,10 @@ url = "github:ryantm/agenix"; inputs.nixpkgs.follows = "nixpkgs"; }; - ags.url = "github:Aylur/ags"; + anyrun = { + url = "github:anyrun-org/anyrun"; + inputs.nixpkgs.follows = "nixpkgs"; + }; basix.url = "github:notashelf/basix"; deploy-rs.url = "github:serokell/deploy-rs"; firefox-addons = { diff --git a/home/programs/anyrun.nix b/home/programs/anyrun.nix new file mode 100644 index 0000000..e276613 --- /dev/null +++ b/home/programs/anyrun.nix @@ -0,0 +1,30 @@ +{ + inputs, + pkgs, + ... +}: { + imports = [inputs.anyrun.homeManagerModules.default]; + programs.anyrun = { + enable = true; + config = { + x = {fraction = 0.5;}; + y = {fraction = 0.4;}; + width = {fraction = 0.3;}; + height = {fraction = 0.5;}; + hideIcons = false; + ignoreExclusiveZones = false; + layer = "overlay"; + + plugins = [ + inputs.anyrun.packages.${pkgs.system}.applications + inputs.anyrun.packages.${pkgs.system}.dictionary + inputs.anyrun.packages.${pkgs.system}.rink + ]; + }; + extraCss = '' + #window { + background: transparent; + } + ''; + }; +} diff --git a/home/programs/fuzzel.nix b/home/programs/fuzzel.nix deleted file mode 100644 index 3c88624..0000000 --- a/home/programs/fuzzel.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ - inputs, - osConfig, - lib, - pkgs, - ... -}: { - programs.fuzzel = { - enable = true; - settings = { - main = { - terminal = lib.getExe pkgs.foot; - use-bold = true; - dpi-aware = "auto"; - font = "monospace:size=14"; - }; - border.width = 5; - }; - }; -} diff --git a/home/programs/niri/binds.nix b/home/programs/niri/binds.nix index aa190a9..dc63e1d 100644 --- a/home/programs/niri/binds.nix +++ b/home/programs/niri/binds.nix @@ -4,10 +4,10 @@ lib, ... }: let - appLauncher = "fuzzel"; + appLauncher = "anyrun"; terminal = "foot"; browser = "firefox"; - prefix = "Alt"; + prefix = "Mod"; guiFileManager = "nautilus"; cliFileManager = "yazi"; in { @@ -125,7 +125,7 @@ in { "Ctrl+Print".action = config.lib.niri.actions.screenshot; # System - "${prefix}+Mod+L".action.spawn = [ + "${prefix}+Alt+L".action.spawn = [ "${lib.getExe' pkgs.systemd "loginctl"}" "lock-session" ]; diff --git a/hosts/solaire/default.nix b/hosts/solaire/default.nix index ce8e887..23006e5 100644 --- a/hosts/solaire/default.nix +++ b/hosts/solaire/default.nix @@ -20,6 +20,7 @@ in { "${system}/services/greetd.nix" "${system}/programs/niri" + "${system}/programs/gnome" "${system}/services/documentation.nix" ]; @@ -32,8 +33,9 @@ in { "${home}/programs/niri" "${home}/programs/waybar" + "${home}/programs/anyrun.nix" + "${home}/services/swaync" - "${home}/programs/fuzzel.nix" "${home}/programs/swaybg.nix" "${home}/programs/swaylock.nix" "${home}/programs/swayidle.nix" diff --git a/hosts/vamos/default.nix b/hosts/vamos/default.nix index b89b402..a869694 100644 --- a/hosts/vamos/default.nix +++ b/hosts/vamos/default.nix @@ -25,7 +25,7 @@ in { "${system}/services/gnome.nix" "${system}/services/mail.nix" - "${system}/services/syncthing.nix" + "${system}/services/documentation.nix" ]; home-manager = { @@ -35,8 +35,9 @@ in { "${home}/programs/niri" "${home}/programs/waybar" + "${home}/programs/anyrun.nix" + "${home}/services/swaync" - "${home}/programs/fuzzel.nix" "${home}/programs/swaybg.nix" "${home}/programs/swaylock.nix" "${home}/programs/swayidle.nix"