From 050f8fb0bef56d1a5a387a7048343421032d0995 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Av=C3=A9?= Date: Thu, 1 Aug 2024 20:20:49 +0200 Subject: [PATCH] Thu 1 Aug 20:20:49 CEST 2024 --- flake.lock | 97 ++++++++++++++++++++++++++++-------- flake.nix | 1 + home/zsh/default.nix | 6 ++- home/zsh/files/functions.zsh | 2 +- 4 files changed, 84 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index aebf493..77f8dbb 100644 --- a/flake.lock +++ b/flake.lock @@ -53,6 +53,27 @@ } }, "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "fzgo", + "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-parts_2": { "inputs": { "nixpkgs-lib": [ "walker", @@ -73,6 +94,25 @@ "type": "github" } }, + "fzgo": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1722536311, + "narHash": "sha256-w+E16Kq58F8ORdGYSz/zz0mGYeW+WKousiCO/N8rhWs=", + "ref": "refs/heads/master", + "rev": "3d70252c20a48f7a4e7ed27963320d2791c81b64", + "revCount": 12, + "type": "git", + "url": "https://git.thomasave.be/thomasave/fzgo.git" + }, + "original": { + "type": "git", + "url": "https://git.thomasave.be/thomasave/fzgo.git" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -80,11 +120,11 @@ ] }, "locked": { - "lastModified": 1722407237, - "narHash": "sha256-wcpVHUc2nBSSgOM7UJSpcRbyus4duREF31xlzHV5T+A=", + "lastModified": 1722462338, + "narHash": "sha256-ss0G8t8RJVDewA3MyqgAlV951cWRK6EtVhVKEZ7J5LU=", "owner": "nix-community", "repo": "home-manager", - "rev": "58cef3796271aaeabaed98884d4abaab5d9d162d", + "rev": "6e090576c4824b16e8759ebca3958c5b09659ee8", "type": "github" }, "original": { @@ -129,16 +169,16 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "systems": "systems_2", "xdph": "xdph" }, "locked": { - "lastModified": 1722375236, - "narHash": "sha256-8yrkwPN3TbCrtZSD/7GSV2kW9hruIZUQymnpyV15TI4=", + "lastModified": 1722519799, + "narHash": "sha256-NXeB/KgCbklksgTfHNef0/CfTXmw88YOrh2Q/87S2RM=", "ref": "refs/heads/main", - "rev": "3b9b5346b830554aa7470ccf1202a7f3be72d1b4", - "revCount": 5029, + "rev": "ab0a3268e04f2295ec4455be90ce8d0c2b107b8d", + "revCount": 5040, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -288,11 +328,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1722185531, - "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=", + "lastModified": 1722421184, + "narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d", + "rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58", "type": "github" }, "original": { @@ -319,6 +359,22 @@ } }, "nixpkgs_4": { + "locked": { + "lastModified": 1722421184, + "narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { "locked": { "lastModified": 1720957393, "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=", @@ -336,11 +392,11 @@ }, "nur": { "locked": { - "lastModified": 1722415350, - "narHash": "sha256-YiAEzp39fp4DBzKVtpsgg0feYyAqyKpI8gAD8OwBwpc=", + "lastModified": 1722530076, + "narHash": "sha256-bOnX9S0+uMIUG0Id11XmRGWQbplmlcICDfJPQd2xafk=", "owner": "nix-community", "repo": "NUR", - "rev": "37eb139cf80798ecdb946d1cf8c3e6cee7e9d0d9", + "rev": "2ddd2a9cd9b4be56055dfda21bb9f44e7ec9699e", "type": "github" }, "original": { @@ -352,9 +408,10 @@ "root": { "inputs": { "ags": "ags", + "fzgo": "fzgo", "home-manager": "home-manager", "hyprland": "hyprland", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nur": "nur", "split-monitor-workspaces": "split-monitor-workspaces", "walker": "walker" @@ -414,15 +471,15 @@ }, "walker": { "inputs": { - "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_4" + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1722360328, - "narHash": "sha256-QRHtYHB9srpmdLFxxVCW0g5EDupzgrLDpknXrxL50SU=", + "lastModified": 1722532764, + "narHash": "sha256-crbBLK/xcdOkWtoLoV1gEK8UB3oyqnDk3zwbX+RR1Yk=", "owner": "abenz1267", "repo": "walker", - "rev": "605c8728d28684ddd23fcaec38a1b846ab7a1a0d", + "rev": "735b1b413978668eec5ef2cddce1cdc1f4eef0a2", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index bcb3a92..d2727a4 100644 --- a/flake.nix +++ b/flake.nix @@ -19,6 +19,7 @@ nur.url = "github:nix-community/NUR"; ags.url = "github:Aylur/ags"; walker.url = "github:abenz1267/walker"; + fzgo.url = "git+https://git.thomasave.be/thomasave/fzgo.git"; }; outputs = { nixpkgs, home-manager, nur, ... }@inputs: diff --git a/home/zsh/default.nix b/home/zsh/default.nix index 34d45f9..f410f64 100644 --- a/home/zsh/default.nix +++ b/home/zsh/default.nix @@ -1,6 +1,9 @@ -{ config, pkgs, ... }: +{ config, inputs, pkgs, ... }: { + imports = [ + inputs.fzgo.packages + ]; home.packages = with pkgs; [ fzy lf @@ -12,6 +15,7 @@ ripgrep rsync moreutils + fzgo.${system}.default ]; home.sessionVariables = { BROWSER = "firefox"; diff --git a/home/zsh/files/functions.zsh b/home/zsh/files/functions.zsh index 67e2e9a..2ea7b14 100644 --- a/home/zsh/files/functions.zsh +++ b/home/zsh/files/functions.zsh @@ -39,7 +39,7 @@ function find_global() { done echo "$PATHS" > $FZY_CACHE fi - file="$(cat $FZY_CACHE | /home/user/Workspace/Projects/fzgo/fzgo)" + file="$(/home/user/Workspace/Projects/fzgo/fzgo < $FZY_CACHE)" echo "$file" | cat - $FZY_CACHE | awk '!x[$0]++' > /tmp/fzy_paths_$file_type && mv /tmp/fzy_paths_$file_type $FZY_CACHE echo "$file" }