diff --git a/flake.lock b/flake.lock index 0dc7258..e6e4a30 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,24 @@ { "nodes": { + "ags": { + "inputs": { + "nixpkgs": "nixpkgs", + "systems": "systems" + }, + "locked": { + "lastModified": 1721306136, + "narHash": "sha256-VKPsIGf3/a+RONBipx4lEE4LXG2sdMNkWQu22LNQItg=", + "owner": "Aylur", + "repo": "ags", + "rev": "344ea72cd3b8d4911f362fec34bce7d8fb37028c", + "type": "github" + }, + "original": { + "owner": "Aylur", + "repo": "ags", + "type": "github" + } + }, "cachix": { "inputs": { "devenv": [ @@ -10,7 +29,7 @@ "niri", "crate2nix" ], - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "pre-commit-hooks": [ "niri", "crate2nix" @@ -43,7 +62,7 @@ "crate2nix", "crate2nix_stable" ], - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "pre-commit-hooks": [ "niri", "crate2nix", @@ -79,7 +98,7 @@ "crate2nix_stable", "crate2nix_stable" ], - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "pre-commit-hooks": [ "niri", "crate2nix", @@ -110,7 +129,7 @@ "flake-compat": "flake-compat_3", "flake-parts": "flake-parts_3", "nix-test-runner": "nix-test-runner_3", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "pre-commit-hooks": "pre-commit-hooks_3" }, "locked": { @@ -135,7 +154,7 @@ "flake-compat": "flake-compat_2", "flake-parts": "flake-parts_2", "nix-test-runner": "nix-test-runner_2", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "pre-commit-hooks": "pre-commit-hooks_2" }, "locked": { @@ -161,7 +180,7 @@ "flake-compat": "flake-compat", "flake-parts": "flake-parts", "nix-test-runner": "nix-test-runner", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "pre-commit-hooks": "pre-commit-hooks" }, "locked": { @@ -439,7 +458,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1710146030, @@ -457,7 +476,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1694529238, @@ -475,7 +494,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1701680307, @@ -493,7 +512,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1701680307, @@ -511,7 +530,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1701680307, @@ -529,7 +548,7 @@ }, "flake-utils_6": { "inputs": { - "systems": "systems_6" + "systems": "systems_7" }, "locked": { "lastModified": 1710146030, @@ -663,7 +682,7 @@ "flake-parts": "flake-parts_4", "niri-stable": "niri-stable", "niri-unstable": "niri-unstable", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "nixpkgs-stable": "nixpkgs-stable", "xwayland-satellite": "xwayland-satellite" }, @@ -786,11 +805,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1700612854, - "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=", + "lastModified": 1718714799, + "narHash": "sha256-FUZpz9rg3gL8NVPKbqU8ei1VkPLsTIfAJ2fdAf5qjak=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614", + "rev": "c00d587b1a1afbf200b1d8f0b0e4ba9deb1c7f0e", "type": "github" }, "original": { @@ -858,11 +877,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1715534503, - "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=", + "lastModified": 1700612854, + "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2057814051972fa1453ddfb0d98badbea9b83c06", + "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614", "type": "github" }, "original": { @@ -890,15 +909,18 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1719506693, - "narHash": "sha256-C8e9S7RzshSdHB7L+v9I51af1gDM5unhJ2xO1ywxNH8=", - "path": "/nix/store/4p0avw1s3vf27hspgqsrqs37gxk4i83i-source", - "rev": "b2852eb9365c6de48ffb0dc2c9562591f652242a", - "type": "path" + "lastModified": 1715534503, + "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2057814051972fa1453ddfb0d98badbea9b83c06", + "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs_5": { @@ -915,6 +937,19 @@ } }, "nixpkgs_6": { + "locked": { + "lastModified": 1719506693, + "narHash": "sha256-C8e9S7RzshSdHB7L+v9I51af1gDM5unhJ2xO1ywxNH8=", + "path": "/nix/store/4p0avw1s3vf27hspgqsrqs37gxk4i83i-source", + "rev": "b2852eb9365c6de48ffb0dc2c9562591f652242a", + "type": "path" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_7": { "locked": { "lastModified": 1712026416, "narHash": "sha256-N/3VR/9e1NlN49p7kCiATiEY6Tzdo+CbrAG8kqCQKcI=", @@ -928,7 +963,7 @@ "type": "indirect" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1724224976, "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=", @@ -944,7 +979,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1724098845, "narHash": "sha256-D5HwjQw/02fuXbR4LCTo64koglP2j99hkDR79/3yLOE=", @@ -1071,28 +1106,29 @@ }, "root": { "inputs": { + "ags": "ags", "disko": "disko", "flake-utils": "flake-utils", "home-manager": "home-manager", "nh": "nh", "niri": "niri", "nix-gaming": "nix-gaming", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_9", "nixpkgs-unstable": "nixpkgs-unstable" } }, "systems": { "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" } }, @@ -1171,6 +1207,21 @@ "type": "github" } }, + "systems_7": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "umu": { "inputs": { "nixpkgs": [ diff --git a/modules/home/dev/default.nix b/modules/home/dev/default.nix index d57b7ee..36b28df 100644 --- a/modules/home/dev/default.nix +++ b/modules/home/dev/default.nix @@ -23,6 +23,10 @@ unstable.cascadia-code unstable.jdk17 unstable.ncdu - unstable.httpie + unstable.gh-dash + unstable.hurl + unstable.jnv + unstable.rustscan + unstable.slides ]; } diff --git a/modules/home/term/default.nix b/modules/home/term/default.nix index dfaa34d..7acc317 100644 --- a/modules/home/term/default.nix +++ b/modules/home/term/default.nix @@ -10,64 +10,45 @@ wezterm = { enable = true; extraConfig = builtins.readFile ./wezterm.lua; }; - lf = { + broot = { enable = true; - commands = { - dragon-out = ''%${pkgs.xdragon}/bin/xdragon -a -x "$fx"''; - editor-open = ''$$EDITOR $f''; - mkdir = '' - ''${{ - printf "Directory Name: " - read DIR - mkdir $DIR - }} - ''; + enableZshIntegration = true; + settings = { + default_flags = "-gh"; + show_matching_characters_on_path_searches = false; + modal = true; }; - keybindings = { - "\\\"" = ""; - o = ""; - c = "mkdir"; - D = ''$rm -fr "$fx"''; - "." = "set hidden!"; - "`" = "mark-load"; - "\\'" = "mark-load"; - "" = "open"; - do = "dragon-out"; - "g~" = "cd"; - gh = "cd"; - "g/" = "/"; - ee = "editor-open"; - V = ''''$${pkgs.bat}/bin/bat --paging=always --theme=gruvbox "$f"''; + }; + yazi = { + enable = true; + enableZshIntegration = true; + flavors = { + tokyo-night = pkgs.fetchFromGitHub { + owner = "BennyOe"; + repo = "tokyo-night.yazi"; + rev = "024fb096821e7d2f9d09a338f088918d8cfadf34"; + hash = "sha256-IhCwP5v0qbuanjfMRbk/Uatu31rPNVChJn5Y9c5KWYQ="; + }; }; settings = { - preview = true; - hidden = true; - drawbox = true; - icons = true; - ignorecase = true; + manager = { + show_hidden = true; + show_dir_first = true; + show_symlink = true; + }; + flavor.use = "tokyo-night"; + opener = { + edit = [ + { run = ''nvim "$@"''; block = true; for = "unix";} + ]; + play = [ + { run = ''mpv "$@"''; orphan = true; for = "unix";} + ]; + open = [ + { run = ''xdg-open "$@"''; desc = "Open";} + ]; + }; }; - extraConfig = let - previewer = pkgs.writeShellScriptBin "pv.sh" '' - file=$1 - w=$2 - h=$3 - x=$4 - y=$5 - - if [[ "$( ${pkgs.file}/bin/file -Lb --mime-type "$file")" =~ ^image ]]; then - # ${pkgs.kitty}/bin/kitty +kitten icat --silent --stdin no --transfer-mode file --place "''${w}x''${h}@''${x}x''${y}" "$file" < /dev/null > /dev/tty - exit 1 - fi - - ${pkgs.pistol}/bin/pistol "$file" - ''; - cleaner = pkgs.writeShellScriptBin "clean.sh" '' - # ${pkgs.kitty}/bin/kitty +kitten icat --clear --stdin no --silent --transfer-mode file < /dev/null > /dev/tty - ''; - in '' - set cleaner ${cleaner}/bin/clean.sh - set previewer ${previewer}/bin/pv.sh - ''; }; tmux = { enable = true; @@ -129,10 +110,26 @@ xdg.configFile."lf/icons".source = ./lf-icons; programs.bat.enable = true; programs.eza.enable = true; programs.man.enable = true; - home.packages = [ - pkgs.unstable.steam-run - pkgs.delta - pkgs.bottom + home.packages = with pkgs; [ + ouch + unstable.curlie + unstable.gping + unstable.ov + unstable.tailspin + unstable.viddy + netscanner + atuin + kalker + unstable.steam-run + fd + ripgrep + await + procs + duf + dust + nurl + delta + bottom ]; programs.wezterm.enableZshIntegration = true; @@ -194,6 +191,7 @@ xdg.configFile."lf/icons".source = ./lf-icons; zinit light Aloxaf/fzf-tab zinit light zsh-users/zsh-syntax-highlighting zinit light zsh-users/zsh-autosuggestions + zinit light atuinsh/atuin # snippets zinit snippet OMZP::git @@ -292,7 +290,14 @@ xdg.configFile."lf/icons".source = ./lf-icons; free = "free -m"; j = "just"; ed = "code"; - n = "nvim"; + nv = "nvim"; + cdi = "broot"; + bd = "popd || cd .."; + lf = "yazi"; + lazygit = "gitui"; + ps = "procs"; + du = "dust"; + df= "duf"; cdr = "cd \$(git rev-parse --show-toplevel)"; l = "eza -al --no-time --group-directories-first"; ls = "eza -al --no-time --group-directories-first";