From 524c4c156662b9d87343bd8503592c1127a2b57b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Av=C3=A9?= Date: Fri, 14 Feb 2025 13:14:10 +0100 Subject: [PATCH] Better fzgo config --- flake.lock | 4 ++-- home/Aloria.nix | 18 ++++++++++++------ home/Arendia.nix | 22 ++++++++++++++-------- home/Kell.nix | 18 ++++++++++++------ home/Mallorea.nix | 20 +++++++++++++------- home/Riva.nix | 18 ++++++++++++------ home/hyprland/default.nix | 2 +- home/rofi/default.nix | 1 + home/utils/fzgo_links.nix | 4 ++-- 9 files changed, 69 insertions(+), 38 deletions(-) diff --git a/flake.lock b/flake.lock index d6e5e21..46563bb 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-DuhR3y0gPZG0AJ2FDd+nUKzQMwT+c/DFIUWNDQ5Uyx4=", - "path": "/nix/store/ixr36hzwj4vg8wrmjkpi96idpchpbk2j-source/home/ags", + "path": "/nix/store/z6zfs7pfc5d3p3kw4y0gkzad54lnkr4c-source/home/ags", "type": "path" }, "original": { - "path": "/nix/store/ixr36hzwj4vg8wrmjkpi96idpchpbk2j-source/home/ags", + "path": "/nix/store/z6zfs7pfc5d3p3kw4y0gkzad54lnkr4c-source/home/ags", "type": "path" } }, diff --git a/home/Aloria.nix b/home/Aloria.nix index 9c5d359..0eaa9e2 100644 --- a/home/Aloria.nix +++ b/home/Aloria.nix @@ -1,11 +1,17 @@ { inputs, config, pkgs, ... }: let - fzgo_paths = [ - "/home/user/.dotfiles" - "/home/server/.cache/fzgo/entries/d/|home|server|Workspace" - "/home/server/.cache/fzgo/entries/d/|home|server|Storage|Thomas" - "/home/server/.cache/fzgo/entries/d/|home|server|Storage|Shared" - ]; + fzgo_paths = { + files = [ + "/home/user/.dotfiles" + "/home/server/.cache/fzgo/entries/f/|home|server|Workspace" + ]; + dirs = [ + "/home/user/.dotfiles" + "/home/server/.cache/fzgo/entries/d/|home|server|Workspace" + "/home/server/.cache/fzgo/entries/d/|home|server|Storage|Thomas" + "/home/server/.cache/fzgo/entries/d/|home|server|Storage|Shared" + ]; + }; in { imports = [ diff --git a/home/Arendia.nix b/home/Arendia.nix index cd4b05b..9b2ffb9 100644 --- a/home/Arendia.nix +++ b/home/Arendia.nix @@ -1,11 +1,17 @@ { inputs, config, pkgs, ... }: let - fzgo_paths = [ - "/home/user/.dotfiles" - "/home/server/.cache/fzgo/entries/d/|home|server|Workspace" - "/home/server/.cache/fzgo/entries/d/|home|server|Storage|Thomas" - "/home/server/.cache/fzgo/entries/d/|home|server|Storage|Shared" - ]; + fzgo_paths = { + files = [ + "/home/user/.dotfiles" + "/home/server/.cache/fzgo/entries/f/|home|server|Workspace" + ]; + dirs = [ + "/home/user/.dotfiles" + "/home/server/.cache/fzgo/entries/d/|home|server|Workspace" + "/home/server/.cache/fzgo/entries/d/|home|server|Storage|Thomas" + "/home/server/.cache/fzgo/entries/d/|home|server|Storage|Shared" + ]; + }; in { imports = [ @@ -37,7 +43,7 @@ in wayland.windowManager.hyprland.settings = { monitor = [ - "eDP-1,2560x1440@60.01,0x0,1.25" + "eDP-1,2560x1440@60.01,0x0,1" "HDMI-A-1,1920x1080@60,0x-1080,1" ]; bind = [ @@ -49,5 +55,5 @@ in }; programs.alacritty.settings.font.size = 13; - programs.kitty.font.size = 13; + programs.kitty.font.size = 15; } diff --git a/home/Kell.nix b/home/Kell.nix index fdc1839..79031ce 100644 --- a/home/Kell.nix +++ b/home/Kell.nix @@ -1,11 +1,17 @@ { inputs, config, pkgs, ... }: let - fzgo_paths = [ - "/home/user/.dotfiles" - "/home/server/.cache/fzgo/entries/d/|home|server|Workspace" - "/home/server/.cache/fzgo/entries/d/|home|server|Storage|Thomas" - "/home/server/.cache/fzgo/entries/d/|home|server|Storage|Shared" - ]; + fzgo_paths = { + files = [ + "/home/user/.dotfiles" + "/home/server/.cache/fzgo/entries/f/|home|server|Workspace" + ]; + dirs = [ + "/home/user/.dotfiles" + "/home/server/.cache/fzgo/entries/d/|home|server|Workspace" + "/home/server/.cache/fzgo/entries/d/|home|server|Storage|Thomas" + "/home/server/.cache/fzgo/entries/d/|home|server|Storage|Shared" + ]; + }; in { imports = [ diff --git a/home/Mallorea.nix b/home/Mallorea.nix index 1632212..3aa22ba 100644 --- a/home/Mallorea.nix +++ b/home/Mallorea.nix @@ -55,13 +55,19 @@ let ''); }; }; - fzgo_paths = [ - "${home_dir}/.dotfiles" - "${home_dir}/Workspace" - "${home_dir}/Containers" - "${home_dir}/Storage/Thomas" - "${home_dir}/Storage/Shared" - ]; + fzgo_paths = { + files = [ + "${home_dir}/.dotfiles" + "${home_dir}/Workspace" + ]; + dirs = [ + "${home_dir}/.dotfiles" + "${home_dir}/Workspace" + "${home_dir}/Containers" + "${home_dir}/Storage/Thomas" + "${home_dir}/Storage/Shared" + ]; + }; in { home.username = username; home.homeDirectory = home_dir; diff --git a/home/Riva.nix b/home/Riva.nix index f250dad..c89159b 100644 --- a/home/Riva.nix +++ b/home/Riva.nix @@ -1,11 +1,17 @@ { inputs, config, pkgs, ... }: let - fzgo_paths = [ - "/home/user/.dotfiles" - "/home/server/.cache/fzgo/entries/d/|home|server|Workspace" - "/home/server/.cache/fzgo/entries/d/|home|server|Storage|Thomas" - "/home/server/.cache/fzgo/entries/d/|home|server|Storage|Shared" - ]; + fzgo_paths = { + files = [ + "/home/user/.dotfiles" + "/home/server/.cache/fzgo/entries/f/|home|server|Workspace" + ]; + dirs = [ + "/home/user/.dotfiles" + "/home/server/.cache/fzgo/entries/d/|home|server|Workspace" + "/home/server/.cache/fzgo/entries/d/|home|server|Storage|Thomas" + "/home/server/.cache/fzgo/entries/d/|home|server|Storage|Shared" + ]; + }; in { imports = [ diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix index 9d25a66..e4e170d 100644 --- a/home/hyprland/default.nix +++ b/home/hyprland/default.nix @@ -7,7 +7,7 @@ let wpctl = "${pkgs.wireplumber}/bin/wpctl"; terminal-name = ".kitty-wrapped"; terminal = "${pkgs.kitty}/bin/kitty"; - rofi = "${pkgs.rofi}/bin/rofi"; + rofi = "${pkgs.rofi-wayland}/bin/rofi"; jq = "${pkgs.jq}/bin/jq"; rofi-ykman = pkgs.writeShellScriptBin "rofi-ykman" '' accounts=$(${pkgs.yubikey-manager}/bin/ykman oath accounts list) diff --git a/home/rofi/default.nix b/home/rofi/default.nix index 8da8144..3a15eb9 100644 --- a/home/rofi/default.nix +++ b/home/rofi/default.nix @@ -5,6 +5,7 @@ programs.rofi = { enable = true; + package = pkgs.rofi-wayland; font = "SF Pro Rounded 13"; extraConfig = { show-icons = true; diff --git a/home/utils/fzgo_links.nix b/home/utils/fzgo_links.nix index 33cf05b..bb1a45f 100644 --- a/home/utils/fzgo_links.nix +++ b/home/utils/fzgo_links.nix @@ -6,7 +6,7 @@ let target = ".config/fzgo/entries/${file_type}/${pkgs.lib.strings.replaceStrings [ "/" ] [ "|" ] source_path}"; }; }; - mkLinks = source_path: (mkLink source_path "d") // (mkLink source_path "f"); + links = (map (source_path: mkLink source_path "f") fzgo_paths.files) ++ (map (source_path: mkLink source_path "d") fzgo_paths.dirs); in { - home.file = pkgs.lib.mkMerge (map mkLinks fzgo_paths); + home.file = pkgs.lib.mkMerge links; }