diff --git a/flake.lock b/flake.lock index b2609155..423f3781 100644 --- a/flake.lock +++ b/flake.lock @@ -270,22 +270,6 @@ } }, "flake-compat_10": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_11": { "flake": false, "locked": { "lastModified": 1696426674, @@ -302,22 +286,6 @@ } }, "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", @@ -331,7 +299,7 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, - "flake-compat_4": { + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1696426674, @@ -347,7 +315,7 @@ "type": "github" } }, - "flake-compat_5": { + "flake-compat_4": { "flake": false, "locked": { "lastModified": 1696426674, @@ -363,7 +331,7 @@ "type": "github" } }, - "flake-compat_6": { + "flake-compat_5": { "flake": false, "locked": { "lastModified": 1696426674, @@ -380,7 +348,7 @@ "type": "github" } }, - "flake-compat_7": { + "flake-compat_6": { "flake": false, "locked": { "lastModified": 1650374568, @@ -396,7 +364,7 @@ "type": "github" } }, - "flake-compat_8": { + "flake-compat_7": { "flake": false, "locked": { "lastModified": 1650374568, @@ -412,7 +380,7 @@ "type": "github" } }, - "flake-compat_9": { + "flake-compat_8": { "flake": false, "locked": { "lastModified": 1696426674, @@ -428,6 +396,22 @@ "type": "github" } }, + "flake-compat_9": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -512,11 +496,11 @@ "systems": "systems_6" }, "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -527,7 +511,7 @@ }, "flake-utils-plus": { "inputs": { - "flake-utils": "flake-utils_3" + "flake-utils": "flake-utils_2" }, "locked": { "lastModified": 1715533576, @@ -546,7 +530,7 @@ }, "flake-utils-plus_2": { "inputs": { - "flake-utils": "flake-utils_4" + "flake-utils": "flake-utils_3" }, "locked": { "lastModified": 1715533576, @@ -564,24 +548,6 @@ } }, "flake-utils_2": { - "inputs": { - "systems": "systems_7" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { "locked": { "lastModified": 1644229661, "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", @@ -596,9 +562,9 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_3": { "inputs": { - "systems": "systems_8" + "systems": "systems_7" }, "locked": { "lastModified": 1694529238, @@ -614,7 +580,7 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_4": { "inputs": { "systems": [ "stylix", @@ -635,9 +601,9 @@ "type": "github" } }, - "flake-utils_6": { + "flake-utils_5": { "inputs": { - "systems": "systems_12" + "systems": "systems_11" }, "locked": { "lastModified": 1710146030, @@ -1043,7 +1009,7 @@ "xdg-desktop-portal-hyprland", "nixpkgs" ], - "systems": "systems_10" + "systems": "systems_9" }, "locked": { "lastModified": 1721324361, @@ -1290,26 +1256,6 @@ "type": "github" } }, - "nix-minecraft": { - "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1724722703, - "narHash": "sha256-5xhQLp0tLY/1nWlcU5uYsCUawxcwqEzAGi0b8wAQKxA=", - "owner": "Infinidoge", - "repo": "nix-minecraft", - "rev": "f74de364f4354e509cc12399de4d4df834a0a45f", - "type": "github" - }, - "original": { - "owner": "Infinidoge", - "repo": "nix-minecraft", - "type": "github" - } - }, "nixos-hardware": { "locked": { "lastModified": 1724575805, @@ -1431,22 +1377,6 @@ } }, "nixpkgs_3": { - "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_4": { "locked": { "lastModified": 1724479785, "narHash": "sha256-pP3Azj5d6M5nmG68Fu4JqZmdGt4S4vqI5f8te+E/FTw=", @@ -1462,7 +1392,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1724819573, "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", @@ -1478,7 +1408,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1723703277, "narHash": "sha256-nk0RaUB5f68BwtXAYy3WAjqFhVKqIl9Z89RGycTa2vk=", @@ -1497,7 +1427,7 @@ "nixvim": { "inputs": { "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nixvim": "nixvim_2", "pre-commit-hooks": "pre-commit-hooks" }, @@ -1518,7 +1448,7 @@ "nixvim_2": { "inputs": { "devshell": "devshell", - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "flake-parts": "flake-parts_4", "git-hooks": "git-hooks", "home-manager": "home-manager_2", @@ -1561,7 +1491,7 @@ }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": [ "nixvim", "nixvim", @@ -1584,7 +1514,7 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_3", "gitignore": "gitignore_2", "nixpkgs": [ "nixvim", @@ -1608,7 +1538,7 @@ }, "pre-commit-hooks_2": { "inputs": { - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_4", "gitignore": "gitignore_3", "nixpkgs": [ "nixpkgs" @@ -1642,9 +1572,8 @@ "hyprspace": "hyprspace", "nh": "nh", "nix-index-database": "nix-index-database", - "nix-minecraft": "nix-minecraft", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nixvim": "nixvim", "nur": "nur", "pre-commit-hooks": "pre-commit-hooks_2", @@ -1681,7 +1610,7 @@ }, "snowfall-flake": { "inputs": { - "flake-compat": "flake-compat_6", + "flake-compat": "flake-compat_5", "nixpkgs": [ "nixpkgs" ], @@ -1703,7 +1632,7 @@ }, "snowfall-lib": { "inputs": { - "flake-compat": "flake-compat_7", + "flake-compat": "flake-compat_6", "flake-utils-plus": "flake-utils-plus", "nixpkgs": [ "snowfall-flake", @@ -1727,7 +1656,7 @@ }, "snowfall-lib_2": { "inputs": { - "flake-compat": "flake-compat_8", + "flake-compat": "flake-compat_7", "flake-utils-plus": "flake-utils-plus_2", "nixpkgs": [ "nixpkgs" @@ -1770,7 +1699,7 @@ }, "spicetify": { "inputs": { - "flake-compat": "flake-compat_9", + "flake-compat": "flake-compat_8", "nixpkgs": [ "nixpkgs" ] @@ -1798,14 +1727,14 @@ "base16-kitty": "base16-kitty", "base16-tmux": "base16-tmux", "base16-vim": "base16-vim", - "flake-compat": "flake-compat_10", - "flake-utils": "flake-utils_5", + "flake-compat": "flake-compat_9", + "flake-utils": "flake-utils_4", "gnome-shell": "gnome-shell", "home-manager": "home-manager_3", "nixpkgs": [ "nixpkgs" ], - "systems": "systems_9" + "systems": "systems_8" }, "locked": { "lastModified": 1724702977, @@ -1852,21 +1781,6 @@ } }, "systems_11": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_12": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1988,16 +1902,16 @@ }, "systems_9": { "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" } }, @@ -2043,7 +1957,7 @@ }, "waybar": { "inputs": { - "flake-compat": "flake-compat_11", + "flake-compat": "flake-compat_10", "nixpkgs": [ "nixpkgs" ] @@ -2069,7 +1983,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_11" + "systems": "systems_10" }, "locked": { "lastModified": 1724073926, @@ -2118,8 +2032,8 @@ "zjstatus": { "inputs": { "crane": "crane", - "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_6", + "flake-utils": "flake-utils_5", + "nixpkgs": "nixpkgs_5", "rust-overlay": "rust-overlay" }, "locked": { diff --git a/flake.nix b/flake.nix index 1f86baf1..4ec03d04 100644 --- a/flake.nix +++ b/flake.nix @@ -58,15 +58,11 @@ snowfall-lib.url = "github:snowfallorg/lib"; snowfall-lib.inputs.nixpkgs.follows = "nixpkgs"; - snowfall-flake = { - url = "github:snowfallorg/flake"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + snowfall-flake.url = "github:snowfallorg/flake"; + snowfall-flake.inputs.nixpkgs.follows = "nixpkgs"; - deploy-rs = { - url = "github:serokell/deploy-rs"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + deploy-rs.url = "github:serokell/deploy-rs"; + deploy-rs.inputs.nixpkgs.follows = "nixpkgs"; pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix"; pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs"; @@ -134,16 +130,11 @@ # My personal nixvim config nixvim.url = "github:elythh/nixvim"; - # Minecraft Servers - nix-minecraft.url = "github:Infinidoge/nix-minecraft"; + nix-index-database.url = "github:nix-community/nix-index-database"; + nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; + + xdg-desktop-portal-hyprland.url = "github:hyprwm/xdg-desktop-portal-hyprland"; + xdg-desktop-portal-hyprland.inputs.nixpkgs.follows = "nixpkgs"; - nix-index-database = { - url = "github:nix-community/nix-index-database"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - xdg-desktop-portal-hyprland = { - url = "github:hyprwm/xdg-desktop-portal-hyprland"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; } diff --git a/homes/x86_64-linux/gwen@grovetender/default.nix b/homes/x86_64-linux/gwen@grovetender/default.nix index e2695614..a1bb4c42 100644 --- a/homes/x86_64-linux/gwen@grovetender/default.nix +++ b/homes/x86_64-linux/gwen@grovetender/default.nix @@ -85,10 +85,8 @@ in enable = true; dockerEnable = false; - gameEnable = false; kubernetesEnable = true; nixEnable = true; - sqlEnable = false; }; music = enabled; diff --git a/modules/home/programs/graphical/launchers/anyrun/default.nix b/modules/home/programs/graphical/launchers/anyrun/default.nix index a83bbe51..51a76049 100644 --- a/modules/home/programs/graphical/launchers/anyrun/default.nix +++ b/modules/home/programs/graphical/launchers/anyrun/default.nix @@ -38,7 +38,6 @@ in stdin translate websearch - ]; # the x coordinate of the runner diff --git a/modules/home/programs/graphical/launchers/rofi/default.nix b/modules/home/programs/graphical/launchers/rofi/default.nix new file mode 100644 index 00000000..cfbe9146 --- /dev/null +++ b/modules/home/programs/graphical/launchers/rofi/default.nix @@ -0,0 +1,362 @@ +{ + config, + lib, + namespace, + pkgs, + ... +}: +let + inherit (lib) mkIf mkEnableOption; + + cfg = config.${namespace}.programs.graphical.launchers.rofi; + +in +{ + options.${namespace}.programs.graphical.launchers.rofi.enable = mkEnableOption "Rofi"; + + config = mkIf cfg.enable { + programs.rofi = { + enable = true; + package = pkgs.rofi-wayland; + font = "Product Sans 12"; + extraConfig = { + modi = "drun"; + display-drun = ""; + show-icons = true; + drun-display-format = "{name}"; + sidebar-mode = false; + }; + }; + xdg = { + configFile."rofi/config.rasi".text = '' + /** + * + * Author : Aditya Shakya (adi1090x) + * Github : @adi1090x + * + * Rofi Theme File + * Rofi Version: 1.7.3 + **/ + + /*****----- Configuration -----*****/ + configuration { + modi: "drun,run,filebrowser,window"; + show-icons: false; + display-drun: " "; + display-run: " "; + display-filebrowser: " "; + display-window: " "; + drun-display-format: "{name}"; + window-format: "{w} · {c} · {t}"; + } + + /*****----- Global Properties -----*****/ + @import "./colors.rasi" + @import "./fonts.rasi" + + * { + border-colour: var(selected); + handle-colour: var(selected); + background-colour: var(background); + foreground-colour: var(foreground); + alternate-background: var(background-alt); + normal-background: var(background); + normal-foreground: var(foreground); + urgent-background: var(urgent); + urgent-foreground: var(background); + active-background: var(active); + active-foreground: var(background); + selected-normal-background: var(selected); + selected-normal-foreground: var(background); + selected-urgent-background: var(active); + selected-urgent-foreground: var(background); + selected-active-background: var(urgent); + selected-active-foreground: var(background); + alternate-normal-background: var(background); + alternate-normal-foreground: var(foreground); + alternate-urgent-background: var(urgent); + alternate-urgent-foreground: var(background); + alternate-active-background: var(active); + alternate-active-foreground: var(background); + } + + /*****----- Main Window -----*****/ + window { + /* properties for window widget */ + transparency: "real"; + location: center; + anchor: center; + fullscreen: false; + width: 400px; + x-offset: 0px; + y-offset: 0px; + + /* properties for all widgets */ + enabled: true; + margin: 0px; + padding: 0px; + border: 0px solid; + border-radius: 10px; + border-color: #89B4FA; + cursor: "default"; + /* Backgroud Colors */ + background-color: @background-colour; + /* Backgroud Image */ + //background-image: url("/path/to/image.png", none); + /* Simple Linear Gradient */ + //background-image: linear-gradient(red, orange, pink, purple); + /* Directional Linear Gradient */ + //background-image: linear-gradient(to bottom, pink, yellow, magenta); + /* Angle Linear Gradient */ + //background-image: linear-gradient(45, cyan, purple, indigo); + } + + /*****----- Main Box -----*****/ + mainbox { + enabled: true; + spacing: 10px; + margin: 0px; + padding: 30px; + border: 0px solid; + border-radius: 15px; + border-color: #6f91c9; + background-color: transparent; + transparency : "real"; + children: [ "inputbar", "message", "listview" ]; + } + + /*****----- Inputbar -----*****/ + inputbar { + enabled: true; + spacing: 10px; + margin: 0px; + padding: 0px; + border: 0px solid; + border-radius: 0px; + border-color: @border-colour; + background-color: transparent; + text-color: @foreground-colour; + children: [ "textbox-prompt-colon", "entry", "mode-switcher" ]; + } + + prompt { + enabled: true; + background-color: inherit; + text-color: inherit; + } + textbox-prompt-colon { + enabled: true; + padding: 5px 0px; + expand: false; + str: ""; + background-color: inherit; + text-color: inherit; + } + entry { + enabled: true; + padding: 5px 0px; + background-color: inherit; + text-color: inherit; + cursor: text; + placeholder: "Search..."; + placeholder-color: inherit; + } + num-filtered-rows { + enabled: true; + expand: false; + background-color: inherit; + text-color: inherit; + } + textbox-num-sep { + enabled: true; + expand: false; + str: "/"; + background-color: inherit; + text-color: inherit; + } + num-rows { + enabled: true; + expand: false; + background-color: inherit; + text-color: inherit; + } + case-indicator { + enabled: true; + background-color: inherit; + text-color: inherit; + } + + /*****----- Listview -----*****/ + listview { + enabled: true; + columns: 1; + lines: 8; + cycle: true; + dynamic: true; + scrollbar: true; + layout: vertical; + reverse: false; + fixed-height: true; + fixed-columns: true; + + spacing: 5px; + margin: 0px; + padding: 0px; + border: 0px solid; + border-radius: 0px; + border-color: @border-colour; + background-color: transparent; + text-color: @foreground-colour; + cursor: "default"; + } + scrollbar { + handle-width: 3px ; + handle-color: @handle-colour; + border-radius: 10px; + background-color: @alternate-background; + } + + /*****----- Elements -----*****/ + element { + enabled: true; + spacing: 10px; + margin: 0px; + padding: 5px 10px; + border: 0px solid; + border-radius: 10px; + border-color: @border-colour; + background-color: transparent; + text-color: @foreground-colour; + cursor: pointer; + } + element normal.normal { + background-color: var(normal-background); + text-color: var(normal-foreground); + } + element normal.urgent { + background-color: var(urgent-background); + text-color: var(urgent-foreground); + } + element normal.active { + background-color: var(active-background); + text-color: var(active-foreground); + } + element selected.normal { + background-color: var(selected-normal-background); + text-color: var(selected-normal-foreground); + } + element selected.urgent { + background-color: var(selected-urgent-background); + text-color: var(selected-urgent-foreground); + } + element selected.active { + background-color: var(selected-active-background); + text-color: var(selected-active-foreground); + } + element alternate.normal { + background-color: var(alternate-normal-background); + text-color: var(alternate-normal-foreground); + } + element alternate.urgent { + background-color: var(alternate-urgent-background); + text-color: var(alternate-urgent-foreground); + } + element alternate.active { + background-color: var(alternate-active-background); + text-color: var(alternate-active-foreground); + } + element-icon { + background-color: transparent; + text-color: inherit; + size: 24px; + cursor: inherit; + } + element-text { + background-color: transparent; + text-color: inherit; + highlight: inherit; + cursor: inherit; + vertical-align: 0.5; + horizontal-align: 0.0; + } + + /*****----- Mode Switcher -----*****/ + mode-switcher{ + enabled: true; + spacing: 10px; + margin: 0px; + padding: 0px; + border: 0px solid; + border-radius: 0px; + border-color: @border-colour; + background-color: transparent; + text-color: @foreground-colour; + } + button { + padding: 5px 10px; + border: 0px solid; + border-radius: 10px; + border-color: @border-colour; + background-color: @alternate-background; + text-color: inherit; + cursor: pointer; + } + button selected { + background-color: var(selected-normal-background); + text-color: var(selected-normal-foreground); + } + + /*****----- Message -----*****/ + message { + enabled: true; + margin: 0px; + padding: 0px; + border: 0px solid; + border-radius: 0px 0px 0px 0px; + border-color: @border-colour; + background-color: transparent; + text-color: @foreground-colour; + } + textbox { + padding: 8px 10px; + border: 0px solid; + border-radius: 10px; + border-color: @border-colour; + background-color: @alternate-background; + text-color: @foreground-colour; + vertical-align: 0.5; + horizontal-align: 0.0; + highlight: none; + placeholder-color: @foreground-colour; + blink: true; + markup: true; + } + error-message { + padding: 10px; + border: 2px solid; + border-radius: 10px; + border-color: @border-colour; + background-color: @background-colour; + text-color: @foreground-colour; + } + + ''; + configFile."rofi/colors.rasi".text = '' + * { + background: #${config.lib.stylix.colors.base00}; + background-alt: #${config.lib.stylix.colors.base01}; + foreground: #${config.lib.stylix.colors.base05}; + selected: #${config.lib.stylix.colors.base08}; + active: #${config.lib.stylix.colors.base04}; + urgent: #${config.lib.stylix.colors.base03}; + } + ''; + + configFile."rofi/fonts.rasi".text = '' + * { + font: "ZedMono NF 11.6"; + } + ''; + }; + }; +} diff --git a/modules/home/programs/graphical/wms/hyprland/default.nix b/modules/home/programs/graphical/wms/hyprland/default.nix index 799ffe61..6410b6ef 100644 --- a/modules/home/programs/graphical/wms/hyprland/default.nix +++ b/modules/home/programs/graphical/wms/hyprland/default.nix @@ -172,6 +172,7 @@ in graphical = { launchers = { anyrun = enabled; + rofi = enabled; }; screenlockers = { diff --git a/modules/home/programs/terminal/tools/azure/default.nix b/modules/home/programs/terminal/tools/azure/default.nix deleted file mode 100644 index ad5cdb93..00000000 --- a/modules/home/programs/terminal/tools/azure/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - config, - lib, - pkgs, - namespace, - ... -}: -let - inherit (lib) mkIf; - inherit (lib.${namespace}) mkBoolOpt; - - cfg = config.${namespace}.programs.terminal.tools.azure; -in -{ - options.${namespace}.programs.terminal.tools.azure = { - enable = mkBoolOpt false "Whether or not to enable common Azure utilities."; - }; - - config = mkIf cfg.enable { - home.packages = - with pkgs; - [ - azure-cli - azure-functions-core-tools - azure-storage-azcopy - ] - ++ lib.optionals pkgs.stdenv.isLinux [ azuredatastudio ]; - }; -} diff --git a/modules/home/programs/terminal/tools/k9s/default.nix b/modules/home/programs/terminal/tools/k9s/default.nix index 4458769e..7eca1680 100644 --- a/modules/home/programs/terminal/tools/k9s/default.nix +++ b/modules/home/programs/terminal/tools/k9s/default.nix @@ -50,5 +50,10 @@ in kubectl = "kubecolor"; }; }; + sops.secrets.kubernetes = { + sopsFile = lib.snowfall.fs.get-file "secrets/gwen/secrets.yaml"; + path = "${config.home.homeDirectory}/.kube/config"; + mode = "0700"; + }; }; } diff --git a/modules/home/programs/terminal/tools/oh-my-posh/config.json b/modules/home/programs/terminal/tools/oh-my-posh/config.json deleted file mode 100644 index 62964182..00000000 --- a/modules/home/programs/terminal/tools/oh-my-posh/config.json +++ /dev/null @@ -1,211 +0,0 @@ -{ - "$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json", - "blocks": [ - { - "alignment": "left", - "segments": [ - { - "background": "#333333", - "foreground": "p:os", - "leading_diamond": "<#e4e4e4,transparent>╭─", - "style": "diamond", - "template": " {{ if .WSL }}WSL at {{ end }}{{.Icon}} ", - "type": "os" - }, - { - "background": "#3465a4", - "foreground": "#e4e4e4", - "powerline_symbol": "", - "properties": { - "home_icon": "~", - "style": "full" - }, - "style": "powerline", - "template": "  {{ .Path }} ", - "type": "path" - }, - { - "background": "#4e9a06", - "background_templates": [ - "{{ if or (.Working.Changed) (.Staging.Changed) }}#c4a000{{ end }}", - "{{ if and (gt .Ahead 0) (gt .Behind 0) }}#f26d50{{ end }}", - "{{ if gt .Ahead 0 }}#89d1dc{{ end }}", - "{{ if gt .Behind 0 }}#4e9a06{{ end }}" - ], - "foreground": "#000000", - "powerline_symbol": "", - "properties": { - "branch_icon": " ", - "fetch_stash_count": true, - "fetch_status": true, - "fetch_upstream_icon": true - }, - "style": "powerline", - "template": " {{ .UpstreamIcon }}{{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }}  {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }}  {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }}  {{ .StashCount }}{{ end }} ", - "type": "git" - } - ], - "type": "prompt" - }, - { - "alignment": "right", - "filler": "<#686869,transparent>.", - "segments": [ - { - "background": "#689f63", - "foreground": "#ffffff", - "invert_powerline": true, - "powerline_symbol": "", - "properties": { - "fetch_version": true - }, - "style": "powerline", - "template": " {{ if .PackageManagerIcon }}{{ .PackageManagerIcon }} {{ end }}{{ .Full }}  ", - "type": "node" - }, - { - "background": "#00acd7", - "foreground": "#111111", - "invert_powerline": true, - "powerline_symbol": "", - "properties": { - "fetch_version": true - }, - "style": "powerline", - "template": " {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }}  ", - "type": "go" - }, - { - "background": "#4063D8", - "foreground": "#111111", - "invert_powerline": true, - "powerline_symbol": "", - "properties": { - "fetch_version": true - }, - "style": "powerline", - "template": " {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }}  ", - "type": "julia" - }, - { - "background": "#FFDE57", - "foreground": "#111111", - "invert_powerline": true, - "powerline_symbol": "", - "properties": { - "display_mode": "files", - "fetch_virtual_env": false - }, - "style": "powerline", - "template": " {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }}  ", - "type": "python" - }, - { - "background": "#AE1401", - "foreground": "#ffffff", - "invert_powerline": true, - "powerline_symbol": "", - "properties": { - "display_mode": "files", - "fetch_version": true - }, - "style": "powerline", - "template": " {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }}  ", - "type": "ruby" - }, - { - "background": "#FEAC19", - "foreground": "#ffffff", - "invert_powerline": true, - "powerline_symbol": "", - "properties": { - "display_mode": "files", - "fetch_version": false - }, - "style": "powerline", - "template": " {{ if .Error }}{{ .Error }}{{ else }}{{ .Full }}{{ end }} ", - "type": "azfunc" - }, - { - "background_templates": [ - "{{if contains \"default\" .Profile}}#FFA400{{end}}", - "{{if contains \"jan\" .Profile}}#f1184c{{end}}" - ], - "foreground": "#ffffff", - "invert_powerline": true, - "powerline_symbol": "", - "properties": { - "display_default": false - }, - "style": "powerline", - "template": " {{ .Profile }}{{ if .Region }}@{{ .Region }}{{ end }}  ", - "type": "aws" - }, - { - "background": "#ffff66", - "foreground": "#111111", - "invert_powerline": true, - "powerline_symbol": "", - "style": "powerline", - "template": "  ", - "type": "root" - }, - { - "background": "#c4a000", - "foreground": "#000000", - "invert_powerline": true, - "powerline_symbol": "", - "style": "powerline", - "template": " {{ .FormattedMs }}  ", - "type": "executiontime" - }, - { - "background": "#333333", - "foreground": "#4e9a06", - "invert_powerline": true, - "powerline_symbol": "", - "properties": { - "always_enabled": true - }, - "style": "powerline", - "foreground_templates": [ - "{{ if gt .Code 0 }}#fffe00{{ end }}" - ], - "background_templates": [ - "{{ if gt .Code 0 }}#f1184c{{ end }}" - ], - "template": " {{ if gt .Code 0 }} {{ .Code }} {{ else }}✔ {{ end }}", - "type": "exit" - }, - { - "background": "#d3d7cf", - "foreground": "#000000", - "invert_powerline": true, - "style": "diamond", - "template": " {{ .CurrentDate | date .Format }}  ", - "type": "time", - "properties": { - "time_format": "03:04:05 PM" - } - } - ], - "type": "prompt" - }, - { - "alignment": "left", - "newline": true, - "segments": [ - { - "foreground": "#d3d7cf", - "style": "plain", - "template": "╰─", - "type": "text" - } - ], - "type": "prompt" - } - ], - "console_title_template": "{{ .Shell }} in {{ .Folder }}", - "final_space": true, - "version": 2 -} diff --git a/modules/home/programs/terminal/tools/oh-my-posh/default.nix b/modules/home/programs/terminal/tools/oh-my-posh/default.nix deleted file mode 100644 index 1a61dccd..00000000 --- a/modules/home/programs/terminal/tools/oh-my-posh/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ - config, - lib, - pkgs, - namespace, - ... -}: -let - inherit (lib) mkIf; - inherit (lib.${namespace}) mkBoolOpt; - - cfg = config.${namespace}.programs.terminal.tools.oh-my-posh; -in -{ - options.${namespace}.programs.terminal.tools.oh-my-posh = { - enable = mkBoolOpt false "Whether or not to enable oh-my-posh."; - }; - - config = mkIf cfg.enable { - programs.oh-my-posh = { - enable = true; - enableBashIntegration = true; - enableFishIntegration = true; - enableZshIntegration = true; - package = pkgs.oh-my-posh; - settings = builtins.fromJSON ( - builtins.unsafeDiscardStringContext (builtins.readFile ./config.json) - ); - }; - }; -} diff --git a/modules/home/programs/terminal/tools/prisma/default.nix b/modules/home/programs/terminal/tools/prisma/default.nix deleted file mode 100644 index 67d1f2a8..00000000 --- a/modules/home/programs/terminal/tools/prisma/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - lib, - pkgs, - config, - namespace, - ... -}: -let - inherit (lib) types mkIf getExe'; - inherit (lib.${namespace}) mkBoolOpt mkOpt; - - cfg = config.${namespace}.programs.terminal.tools.prisma; -in -{ - options.${namespace}.programs.terminal.tools.prisma = with types; { - enable = mkBoolOpt false "Whether or not to install Prisma"; - pkgs = { - npm = mkOpt package pkgs.nodePackages.prisma "The NPM package to install"; - engines = mkOpt package pkgs.prisma-engines "The package to get prisma engines from"; - }; - }; - - config = mkIf cfg.enable { - home.packages = [ cfg.pkgs.npm ]; - - programs.zsh.initExtra = # bash - '' - export PRISMA_MIGRATION_ENGINE_BINARY="${getExe' cfg.pkgs.engines "migration-engine"}" - export PRISMA_QUERY_ENGINE_BINARY="${getExe' cfg.pkgs.engines "query-engine"}" - export PRISMA_QUERY_ENGINE_LIBRARY="${cfg.pkgs.engines}/lib/libquery_engine.node" - export PRISMA_INTROSPECTION_ENGINE_BINARY="${getExe' cfg.pkgs.engines "introspection-engine"}" - export PRISMA_FMT_BINARY="${getExe' cfg.pkgs.engines "prisma-fmt"}" - ''; - }; -} diff --git a/modules/home/programs/terminal/tools/tmux/config/general.tmux b/modules/home/programs/terminal/tools/tmux/config/general.tmux deleted file mode 100644 index f8659f0e..00000000 --- a/modules/home/programs/terminal/tools/tmux/config/general.tmux +++ /dev/null @@ -1,16 +0,0 @@ -# Key bindings overrides -bind-key -T copy-mode-vi v send-keys -X begin-selection -bind-key -T copy-mode-vi y send-keys -X copy-selection-and-cancel -bind-key -T copy-mode-vi Escape send-keys -X cancel -bind-key -T copy-mode-vi C-v send-keys -X rectangle-toggle -bind '"' split-window -v -c '#{pane_current_path}' -bind '%' split-window -h -c '#{pane_current_path}' - -set-option -sa terminal-features ",*xterm*:RGB" -set -ga terminal-overrides ",xterm-kitty:Tc" - -set -g allow-passthrough on -set -ga update-environment TERM -set -ga update-environment TERM_PROGRAM - -set -g set-titles diff --git a/modules/home/programs/terminal/tools/tmux/default.nix b/modules/home/programs/terminal/tools/tmux/default.nix deleted file mode 100644 index 01613cda..00000000 --- a/modules/home/programs/terminal/tools/tmux/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ - config, - lib, - pkgs, - namespace, - ... -}: -let - inherit (lib) mkIf; - inherit (lib.${namespace}) mkBoolOpt; - - cfg = config.${namespace}.programs.terminal.tools.tmux; - configFiles = lib.snowfall.fs.get-files ./config; - - plugins = with pkgs.tmuxPlugins; [ - { - plugin = resurrect; - extraConfig = '' - set -g @resurrect-strategy-vim 'session' - set -g @resurrect-strategy-nvim 'session' - set -g @resurrect-capture-pane-contents 'on' - set -g @resurrect-processes 'ssh lazygit yazi' - set -g @resurrect-dir '~/.tmux/resurrect' - ''; - } - { - plugin = continuum; - extraConfig = '' - set -g @continuum-restore 'on' - ''; - } - { plugin = tmux-fzf; } - # { plugin = vim-tmux-navigator; } - ]; -in -{ - options.${namespace}.programs.terminal.tools.tmux = { - enable = mkBoolOpt false "Whether or not to enable tmux."; - }; - - config = mkIf cfg.enable { - programs.tmux = { - enable = true; - aggressiveResize = true; - baseIndex = 1; - clock24 = false; - escapeTime = 0; - historyLimit = 2000; - keyMode = "vi"; - mouse = true; - newSession = true; - prefix = "C-a"; - sensibleOnTop = true; - terminal = "xterm-256color"; - extraConfig = builtins.concatStringsSep "\n" (builtins.map lib.strings.fileContents configFiles); - - inherit plugins; - }; - }; -} diff --git a/modules/home/programs/terminal/tools/wine/default.nix b/modules/home/programs/terminal/tools/wine/default.nix deleted file mode 100644 index 50f42324..00000000 --- a/modules/home/programs/terminal/tools/wine/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ - config, - lib, - pkgs, - namespace, - ... -}: -let - inherit (lib) mkIf; - inherit (lib.${namespace}) mkBoolOpt; - - cfg = config.${namespace}.programs.terminal.tools.wine; -in -{ - options.${namespace}.programs.terminal.tools.wine = { - enable = mkBoolOpt false "Whether or not to enable Wine."; - }; - - config = mkIf cfg.enable { - home.packages = with pkgs; [ - # winePackages.waylandFull - winetricks - wine64Packages.waylandFull - ]; - }; -} diff --git a/modules/home/programs/terminal/tools/yazi/configs/init.lua b/modules/home/programs/terminal/tools/yazi/configs/init.lua deleted file mode 100644 index 6a08b4e7..00000000 --- a/modules/home/programs/terminal/tools/yazi/configs/init.lua +++ /dev/null @@ -1,92 +0,0 @@ --- Cross session yank -require("session"):setup({ - sync_yanked = true, -}) - -require("full-border"):setup() - -Header:children_add(function() - if ya.target_family() ~= "unix" then - return ui.Line({}) - end - return ui.Span(ya.user_name() .. "@" .. ya.host_name() .. ":"):fg("blue") -end, 500, Header.LEFT) - --- Filename and symbolic link path -function Status:name() - local h = cx.active.current.hovered - if not h then - return ui.Span("") - end - - local linked = "" - if h.link_to ~= nil then - linked = " -> " .. tostring(h.link_to) - end - return ui.Span(" " .. h.name .. linked) -end - --- File Owner -Status:children_add(function() - local h = cx.active.current.hovered - if h == nil or ya.target_family() ~= "unix" then - return ui.Line({}) - end - - return ui.Line({ - ui.Span(ya.user_name(h.cha.uid) or tostring(h.cha.uid)):fg("magenta"), - ui.Span(":"), - ui.Span(ya.group_name(h.cha.gid) or tostring(h.cha.gid)):fg("magenta"), - ui.Span(" "), - }) -end, 500, Status.RIGHT) - --- File creation and modified date -Status:children_add(function() - local h = cx.active.current.hovered - local formatted_date = "" - - if h == nil then - return ui.Line({}) - end - - if h.cha then - local formatted_created = nil - local formatted_modified = nil - - if h.cha.created then - formatted_created = tostring(os.date("%Y-%m-%d %H:%M:%S", math.floor(h.cha.created))) - end - - if h.cha.modified then - formatted_modified = tostring(os.date("%Y-%m-%d %H:%M:%S", math.floor(h.cha.modified))) - end - - if formatted_created and formatted_modified then - formatted_date = formatted_created .. ":" .. formatted_modified - else - if formatted_modified then - formatted_date = formatted_modified - end - end - end - - return ui.Line({ - ui.Span(formatted_date):fg("green"), - ui.Span(" "), - }) -end, 400, Status.RIGHT) - -function Linemode:custom() - local year = os.date("%Y") - local time = (self._file.cha.modified or 0) // 1 - - if time > 0 and os.date("%Y", time) == year then - time = os.date("%b %d %H:%M", time) - else - time = time and os.date("%b %d %Y", time) or "" - end - - local size = self._file:size() - return ui.Line(string.format(" %s %s ", size and ya.readable_size(size):gsub(" ", "") or "-", time)) -end diff --git a/modules/home/programs/terminal/tools/yazi/configs/plugins/chmod.yazi/LICENSE b/modules/home/programs/terminal/tools/yazi/configs/plugins/chmod.yazi/LICENSE deleted file mode 100644 index fb5b1d62..00000000 --- a/modules/home/programs/terminal/tools/yazi/configs/plugins/chmod.yazi/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2023 yazi-rs - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/modules/home/programs/terminal/tools/yazi/configs/plugins/chmod.yazi/README.md b/modules/home/programs/terminal/tools/yazi/configs/plugins/chmod.yazi/README.md deleted file mode 100644 index 95fab171..00000000 --- a/modules/home/programs/terminal/tools/yazi/configs/plugins/chmod.yazi/README.md +++ /dev/null @@ -1,24 +0,0 @@ -# chmod.yazi - -Execute `chmod` on the selected files to change their mode. This plugin is only available on Unix platforms since it relies on [`chmod(2)`](https://man7.org/linux/man-pages/man2/chmod.2.html). - -https://github.com/yazi-rs/plugins/assets/17523360/7aa3abc2-d057-498c-8473-a6282c59c464 - -## Installation - -```sh -ya pack -a yazi-rs/plugins#chmod -``` - -## Usage - -Add this to your `~/.config/yazi/keymap.toml`: - -```toml -[[manager.prepend_keymap]] -on = [ "c", "m" ] -run = "plugin chmod" -desc = "Chmod on selected files" -``` - -Make sure the c => m key is not used elsewhere. diff --git a/modules/home/programs/terminal/tools/yazi/configs/plugins/chmod.yazi/init.lua b/modules/home/programs/terminal/tools/yazi/configs/plugins/chmod.yazi/init.lua deleted file mode 100644 index bfb09706..00000000 --- a/modules/home/programs/terminal/tools/yazi/configs/plugins/chmod.yazi/init.lua +++ /dev/null @@ -1,39 +0,0 @@ -local selected_or_hovered = ya.sync(function() - local tab, paths = cx.active, {} - for _, u in pairs(tab.selected) do - paths[#paths + 1] = tostring(u) - end - if #paths == 0 and tab.current.hovered then - paths[1] = tostring(tab.current.hovered.url) - end - return paths -end) - -return { - entry = function() - ya.manager_emit("escape", { visual = true }) - - local urls = selected_or_hovered() - if #urls == 0 then - return ya.notify { title = "Chmod", content = "No file selected", level = "warn", timeout = 5 } - end - - local value, event = ya.input { - title = "Chmod:", - position = { "top-center", y = 3, w = 40 }, - } - if event ~= 1 then - return - end - - local status, err = Command("chmod"):arg(value):args(urls):spawn():wait() - if not status or not status.success then - ya.notify { - title = "Chmod", - content = string.format("Chmod with selected files failed, exit code %s", status and status.code or err), - level = "error", - timeout = 5, - } - end - end, -} diff --git a/modules/home/programs/terminal/tools/yazi/configs/plugins/diff.yazi/LICENSE b/modules/home/programs/terminal/tools/yazi/configs/plugins/diff.yazi/LICENSE deleted file mode 100644 index fb5b1d62..00000000 --- a/modules/home/programs/terminal/tools/yazi/configs/plugins/diff.yazi/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2023 yazi-rs - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/modules/home/programs/terminal/tools/yazi/configs/plugins/diff.yazi/README.md b/modules/home/programs/terminal/tools/yazi/configs/plugins/diff.yazi/README.md deleted file mode 100644 index cc21344b..00000000 --- a/modules/home/programs/terminal/tools/yazi/configs/plugins/diff.yazi/README.md +++ /dev/null @@ -1,24 +0,0 @@ -# diff.yazi - -Diff the selected file with the hovered file, create a living patch, and copy it to the clipboard. - -https://github.com/yazi-rs/plugins/assets/17523360/eff5e949-386a-44ea-82f9-4cb4a2c37aad - -## Installation - -```sh -ya pack -a yazi-rs/plugins#diff -``` - -## Usage - -Add this to your `~/.config/yazi/keymap.toml`: - -```toml -[[manager.prepend_keymap]] -on = "" -run = "plugin diff" -desc = "Diff the selected with the hovered file" -``` - -Make sure the C + d key is not used elsewhere. diff --git a/modules/home/programs/terminal/tools/yazi/configs/plugins/diff.yazi/init.lua b/modules/home/programs/terminal/tools/yazi/configs/plugins/diff.yazi/init.lua deleted file mode 100644 index 32eb5fcb..00000000 --- a/modules/home/programs/terminal/tools/yazi/configs/plugins/diff.yazi/init.lua +++ /dev/null @@ -1,37 +0,0 @@ -local function info(content) - return ya.notify { - title = "Diff", - content = content, - timeout = 5, - } -end - -local selected_url = ya.sync(function() - for _, u in pairs(cx.active.selected) do - return u - end -end) - -local hovered_url = ya.sync(function() - local h = cx.active.current.hovered - return h and h.url -end) - -return { - entry = function() - local a, b = selected_url(), hovered_url() - if not a then - return info("No file selected") - elseif not b then - return info("No file hovered") - end - - local output, err = Command("diff"):arg("-Naur"):arg(tostring(a)):arg(tostring(b)):output() - if not output then - return info("Failed to run diff, error: " .. err) - end - - ya.clipboard(output.stdout) - info("Diff copied to clipboard") - end, -} diff --git a/modules/home/programs/terminal/tools/yazi/configs/plugins/full-border.yazi/LICENSE b/modules/home/programs/terminal/tools/yazi/configs/plugins/full-border.yazi/LICENSE deleted file mode 100644 index fb5b1d62..00000000 --- a/modules/home/programs/terminal/tools/yazi/configs/plugins/full-border.yazi/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2023 yazi-rs - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/modules/home/programs/terminal/tools/yazi/configs/plugins/full-border.yazi/init.lua b/modules/home/programs/terminal/tools/yazi/configs/plugins/full-border.yazi/init.lua deleted file mode 100644 index e6c89176..00000000 --- a/modules/home/programs/terminal/tools/yazi/configs/plugins/full-border.yazi/init.lua +++ /dev/null @@ -1,45 +0,0 @@ -local function setup(_, opts) - local type = opts and opts.type or ui.Border.ROUNDED - local old_build = Tab.build - - Tab.build = function(self, ...) - local bar = function(c, x, y) - if x <= 0 or x == self._area.w - 1 then - return ui.Bar(ui.Rect.default, ui.Bar.TOP) - end - - return ui.Bar( - ui.Rect({ - x = x, - y = math.max(0, y), - w = ya.clamp(0, self._area.w - x, 1), - h = math.min(1, self._area.h), - }), - ui.Bar.TOP - ):symbol(c) - end - - local c = self._chunks - self._chunks = { - c[1]:padding(ui.Padding.y(1)), - c[2]:padding(ui.Padding(c[1].w > 0 and 0 or 1, c[3].w > 0 and 0 or 1, 1, 1)), - c[3]:padding(ui.Padding.y(1)), - } - - local style = THEME.manager.border_style - self._base = ya.list_merge(self._base or {}, { - ui.Border(self._area, ui.Border.ALL):type(type):style(style), - ui.Bar(self._chunks[1], ui.Bar.RIGHT):style(style), - ui.Bar(self._chunks[3], ui.Bar.LEFT):style(style), - - bar("┬", c[1].right - 1, c[1].y), - bar("┴", c[1].right - 1, c[1].bottom - 1), - bar("┬", c[2].right, c[2].y), - bar("┴", c[2].right, c[2].bottom - 1), - }) - - old_build(self, ...) - end -end - -return { setup = setup } diff --git a/modules/home/programs/terminal/tools/yazi/configs/plugins/glow.nix b/modules/home/programs/terminal/tools/yazi/configs/plugins/glow.nix deleted file mode 100644 index f6623c29..00000000 --- a/modules/home/programs/terminal/tools/yazi/configs/plugins/glow.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ - config, - lib, - pkgs, - namespace, - ... -}: -let - inherit (lib) mkIf; - cfg = config.${namespace}.programs.terminal.tools.yazi; -in -{ - config = mkIf cfg.enable { - home.packages = with pkgs; [ glow ]; - - xdg.configFile = { - "yazi/plugins/glow.yazi/init.lua".text = # lua - '' - -- - -- https://github.com/Reledia/glow.yazi - -- - - local M = {} - - function M:peek() - local child = Command("glow") - :args({ - "--style", - "$GLAMOUR_STYLE", - "--width", - tostring(self.area.w), - tostring(self.file.url), - }) - :stdout(Command.PIPED) - :stderr(Command.PIPED) - :spawn() - - if not child then - return self:fallback_to_builtin() - end - - local limit = self.area.h - local i, lines = 0, "" - repeat - local next, event = child:read_line() - if event == 1 then - return self:fallback_to_builtin() - elseif event ~= 0 then - break - end - - i = i + 1 - if i > self.skip then - lines = lines .. next - end - until i >= self.skip + limit - - child:start_kill() - if self.skip > 0 and i < self.skip + limit then - ya.manager_emit( - "peek", - { tostring(math.max(0, i - limit)), only_if = tostring(self.file.url), upper_bound = "" } - ) - else - lines = lines:gsub("\t", string.rep(" ", PREVIEW.tab_size)) - ya.preview_widgets(self, { ui.Paragraph.parse(self.area, lines) }) - end - end - - function M:seek(units) - local h = cx.active.current.hovered - if h and h.url == self.file.url then - local step = math.floor(units * self.area.h / 10) - ya.manager_emit("peek", { - tostring(math.max(0, cx.active.preview.skip + step)), - only_if = tostring(self.file.url), - }) - end - end - - function M:fallback_to_builtin() - local _, bound = ya.preview_code(self) - if bound then - ya.manager_emit("peek", { tostring(bound), only_if = tostring(self.file.url), upper_bound = "" }) - end - end - - return M - ''; - }; - }; -} diff --git a/modules/home/programs/terminal/tools/yazi/configs/plugins/hide-preview.yazi/LICENSE b/modules/home/programs/terminal/tools/yazi/configs/plugins/hide-preview.yazi/LICENSE deleted file mode 100644 index fb5b1d62..00000000 --- a/modules/home/programs/terminal/tools/yazi/configs/plugins/hide-preview.yazi/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2023 yazi-rs - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/modules/home/programs/terminal/tools/yazi/configs/plugins/hide-preview.yazi/README.md b/modules/home/programs/terminal/tools/yazi/configs/plugins/hide-preview.yazi/README.md deleted file mode 100644 index 999db112..00000000 --- a/modules/home/programs/terminal/tools/yazi/configs/plugins/hide-preview.yazi/README.md +++ /dev/null @@ -1,24 +0,0 @@ -# hide-preview.yazi - -Switch the preview pane between hidden and shown. - -https://github.com/yazi-rs/plugins/assets/17523360/c4f0b5c4-ff9f-4be8-ba73-4d8e7902e383 - -## Installation - -```sh -ya pack -a yazi-rs/plugins#hide-preview -``` - -## Usage - -Add this to your `~/.config/yazi/keymap.toml`: - -```toml -[[manager.prepend_keymap]] -on = "T" -run = "plugin --sync hide-preview" -desc = "Hide or show preview" -``` - -Make sure the T key is not used elsewhere. diff --git a/modules/home/programs/terminal/tools/yazi/configs/plugins/hide-preview.yazi/init.lua b/modules/home/programs/terminal/tools/yazi/configs/plugins/hide-preview.yazi/init.lua deleted file mode 100644 index 50403216..00000000 --- a/modules/home/programs/terminal/tools/yazi/configs/plugins/hide-preview.yazi/init.lua +++ /dev/null @@ -1,21 +0,0 @@ -local function entry(st) - if st.old then - Tab.layout, st.old = st.old, nil - else - st.old = Tab.layout - Tab.layout = function(self) - local all = MANAGER.ratio.parent + MANAGER.ratio.current - self._chunks = ui.Layout() - :direction(ui.Layout.HORIZONTAL) - :constraints({ - ui.Constraint.Ratio(MANAGER.ratio.parent, all), - ui.Constraint.Ratio(MANAGER.ratio.current, all), - ui.Constraint.Length(1), - }) - :split(self._area) - end - end - ya.app_emit("resize", {}) -end - -return { entry = entry } diff --git a/modules/home/programs/terminal/tools/yazi/configs/plugins/jump-to-char.yazi/LICENSE b/modules/home/programs/terminal/tools/yazi/configs/plugins/jump-to-char.yazi/LICENSE deleted file mode 100644 index fb5b1d62..00000000 --- a/modules/home/programs/terminal/tools/yazi/configs/plugins/jump-to-char.yazi/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2023 yazi-rs - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/modules/home/programs/terminal/tools/yazi/configs/plugins/jump-to-char.yazi/README.md b/modules/home/programs/terminal/tools/yazi/configs/plugins/jump-to-char.yazi/README.md deleted file mode 100644 index 9f50f7a8..00000000 --- a/modules/home/programs/terminal/tools/yazi/configs/plugins/jump-to-char.yazi/README.md +++ /dev/null @@ -1,24 +0,0 @@ -# jump-to-char.yazi - -Vim-like `f`, jump to the next file whose name starts with ``. - -https://github.com/yazi-rs/plugins/assets/17523360/aac9341c-b416-4e0c-aaba-889d48389869 - -## Installation - -```sh -ya pack -a yazi-rs/plugins#jump-to-char -``` - -## Usage - -Add this to your `~/.config/yazi/keymap.toml`: - -```toml -[[manager.prepend_keymap]] -on = "f" -run = "plugin jump-to-char" -desc = "Jump to char" -``` - -Make sure the f key is not used elsewhere. diff --git a/modules/home/programs/terminal/tools/yazi/configs/plugins/jump-to-char.yazi/init.lua b/modules/home/programs/terminal/tools/yazi/configs/plugins/jump-to-char.yazi/init.lua deleted file mode 100644 index 827cde97..00000000 --- a/modules/home/programs/terminal/tools/yazi/configs/plugins/jump-to-char.yazi/init.lua +++ /dev/null @@ -1,30 +0,0 @@ -local AVAILABLE_CHARS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789." - -local changed = ya.sync(function(st, new) - local b = st.last ~= new - st.last = new - return b or not cx.active.finder -end) - -local escape = function(s) return s == "." and "\\." or s end - -return { - entry = function() - local cands = {} - for i = 1, #AVAILABLE_CHARS do - cands[#cands + 1] = { on = AVAILABLE_CHARS:sub(i, i) } - end - - local idx = ya.which { cands = cands, silent = true } - if not idx then - return - end - - local kw = escape(cands[idx].on) - if changed(kw) then - ya.manager_emit("find_do", { "^" .. kw }) - else - ya.manager_emit("find_arrow", {}) - end - end, -} diff --git a/modules/home/programs/terminal/tools/yazi/configs/plugins/max-preview.yazi/LICENSE b/modules/home/programs/terminal/tools/yazi/configs/plugins/max-preview.yazi/LICENSE deleted file mode 100644 index fb5b1d62..00000000 --- a/modules/home/programs/terminal/tools/yazi/configs/plugins/max-preview.yazi/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2023 yazi-rs - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/modules/home/programs/terminal/tools/yazi/configs/plugins/max-preview.yazi/README.md b/modules/home/programs/terminal/tools/yazi/configs/plugins/max-preview.yazi/README.md deleted file mode 100644 index ba11df18..00000000 --- a/modules/home/programs/terminal/tools/yazi/configs/plugins/max-preview.yazi/README.md +++ /dev/null @@ -1,24 +0,0 @@ -# max-preview.yazi - -Maximize or restore the preview pane. - -https://github.com/yazi-rs/plugins/assets/17523360/8976308e-ebfe-4e9e-babe-153eb1f87d61 - -## Installation - -```sh -ya pack -a yazi-rs/plugins#max-preview -``` - -## Usage - -Add this to your `~/.config/yazi/keymap.toml`: - -```toml -[[manager.prepend_keymap]] -on = "T" -run = "plugin --sync max-preview" -desc = "Maximize or restore preview" -``` - -Make sure the T key is not used elsewhere. diff --git a/modules/home/programs/terminal/tools/yazi/configs/plugins/max-preview.yazi/init.lua b/modules/home/programs/terminal/tools/yazi/configs/plugins/max-preview.yazi/init.lua deleted file mode 100644 index d3d6083c..00000000 --- a/modules/home/programs/terminal/tools/yazi/configs/plugins/max-preview.yazi/init.lua +++ /dev/null @@ -1,20 +0,0 @@ -local function entry(st) - if st.old then - Tab.layout, st.old = st.old, nil - else - st.old = Tab.layout - Tab.layout = function(self) - self._chunks = ui.Layout() - :direction(ui.Layout.HORIZONTAL) - :constraints({ - ui.Constraint.Percentage(0), - ui.Constraint.Percentage(0), - ui.Constraint.Percentage(100), - }) - :split(self._area) - end - end - ya.app_emit("resize", {}) -end - -return { entry = entry } diff --git a/modules/home/programs/terminal/tools/yazi/configs/plugins/miller.yazi/LICENSE b/modules/home/programs/terminal/tools/yazi/configs/plugins/miller.yazi/LICENSE deleted file mode 100644 index de882e53..00000000 --- a/modules/home/programs/terminal/tools/yazi/configs/plugins/miller.yazi/LICENSE +++ /dev/null @@ -1,7 +0,0 @@ -Copyright © 2024 Reledia - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/modules/home/programs/terminal/tools/yazi/configs/plugins/miller.yazi/init.lua b/modules/home/programs/terminal/tools/yazi/configs/plugins/miller.yazi/init.lua deleted file mode 100644 index f7582031..00000000 --- a/modules/home/programs/terminal/tools/yazi/configs/plugins/miller.yazi/init.lua +++ /dev/null @@ -1,75 +0,0 @@ --- --- https://github.com/Reledia/miller.yazi --- - -local M = {} - -function M:peek() - local child = Command("mlr") - :args({ - "--icsv", - "--implicit-csv-headers", - "--opprint", - "-C", - "--key-color", - "skyblue2", - "--value-color", - "lightsteelblue1", - "cat", - tostring(self.file.url), - }) - :stdout(Command.PIPED) - :stderr(Command.PIPED) - :spawn() - - if not child then - return self:fallback_to_builtin() - end - - local limit = self.area.h - local i, lines = 0, "" - repeat - local next, event = child:read_line() - if event == 1 then - return self:fallback_to_builtin() - elseif event ~= 0 then - break - end - - i = i + 1 - if i > self.skip then - lines = lines .. next - end - until i >= self.skip + limit - - child:start_kill() - if self.skip > 0 and i < self.skip + limit then - ya.manager_emit( - "peek", - { tostring(math.max(0, i - limit)), only_if = tostring(self.file.url), upper_bound = "" } - ) - else - lines = lines:gsub("\t", string.rep(" ", PREVIEW.tab_size)) - ya.preview_widgets(self, { ui.Paragraph.parse(self.area, lines) }) - end -end - -function M:seek(units) - local h = cx.active.current.hovered - if h and h.url == self.file.url then - local step = math.floor(units * self.area.h / 10) - ya.manager_emit("peek", { - tostring(math.max(0, cx.active.preview.skip + step)), - only_if = tostring(self.file.url), - }) - end -end - -function M:fallback_to_builtin() - local _, bound = ya.preview_code(self) - if bound then - ya.manager_emit("peek", { tostring(bound), only_if = tostring(self.file.url), upper_bound = "" }) - end -end - -return M diff --git a/modules/home/programs/terminal/tools/yazi/configs/plugins/ouch.yazi/LICENSE b/modules/home/programs/terminal/tools/yazi/configs/plugins/ouch.yazi/LICENSE deleted file mode 100644 index 3f9d766f..00000000 --- a/modules/home/programs/terminal/tools/yazi/configs/plugins/ouch.yazi/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2024 ndtoan96 - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/modules/home/programs/terminal/tools/yazi/configs/plugins/ouch.yazi/init.lua b/modules/home/programs/terminal/tools/yazi/configs/plugins/ouch.yazi/init.lua deleted file mode 100644 index fd828adb..00000000 --- a/modules/home/programs/terminal/tools/yazi/configs/plugins/ouch.yazi/init.lua +++ /dev/null @@ -1,59 +0,0 @@ --- --- https://github.com/ndtoan96/ouch.yazi --- - -local M = {} - -function M:peek() - local child = Command("ouch") - :args({ "l", "-t", "-y", tostring(self.file.url) }) - :stdout(Command.PIPED) - :stderr(Command.PIPED) - :spawn() - local limit = self.area.h - local file_name = string.match(tostring(self.file.url), ".*[/\\](.*)") - local lines = string.format("\x1b[2m %s\x1b[0m\n", file_name) - local num_lines = 1 - local num_skip = 0 - repeat - local line, event = child:read_line() - if event == 1 then - ya.err(tostring(event)) - elseif event ~= 0 then - break - end - - if line:find("Archive", 1, true) ~= 1 and line:find("[INFO]", 1, true) ~= 1 then - if num_skip >= self.skip then - lines = lines .. line - num_lines = num_lines + 1 - else - num_skip = num_skip + 1 - end - end - until num_lines >= limit - - child:start_kill() - if self.skip > 0 and num_lines < limit then - ya.manager_emit("peek", { - tostring(math.max(0, self.skip - (limit - num_lines))), - only_if = tostring(self.file.url), - upper_bound = "", - }) - else - ya.preview_widgets(self, { ui.Paragraph.parse(self.area, lines) }) - end -end - -function M:seek(units) - local h = cx.active.current.hovered - if h and h.url == self.file.url then - local step = math.floor(units * self.area.h / 10) - ya.manager_emit("peek", { - math.max(0, cx.active.preview.skip + step), - only_if = tostring(self.file.url), - }) - end -end - -return M diff --git a/modules/home/programs/terminal/tools/yazi/configs/plugins/smart-enter.yazi/init.lua b/modules/home/programs/terminal/tools/yazi/configs/plugins/smart-enter.yazi/init.lua deleted file mode 100644 index 9971bfbb..00000000 --- a/modules/home/programs/terminal/tools/yazi/configs/plugins/smart-enter.yazi/init.lua +++ /dev/null @@ -1,6 +0,0 @@ -return { - entry = function() - local h = cx.active.current.hovered - ya.manager_emit(h and h.cha.is_dir and "enter" or "open", {}) - end, -} diff --git a/modules/home/programs/terminal/tools/yazi/configs/plugins/smart-filter.yazi/LICENSE b/modules/home/programs/terminal/tools/yazi/configs/plugins/smart-filter.yazi/LICENSE deleted file mode 100644 index fb5b1d62..00000000 --- a/modules/home/programs/terminal/tools/yazi/configs/plugins/smart-filter.yazi/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2023 yazi-rs - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/modules/home/programs/terminal/tools/yazi/configs/plugins/smart-filter.yazi/README.md b/modules/home/programs/terminal/tools/yazi/configs/plugins/smart-filter.yazi/README.md deleted file mode 100644 index 382852d0..00000000 --- a/modules/home/programs/terminal/tools/yazi/configs/plugins/smart-filter.yazi/README.md +++ /dev/null @@ -1,24 +0,0 @@ -# smart-filter.yazi - -A Yazi plugin that makes filters smarter: continuous filtering, automatically enter unique directory, open file on submitting. - -https://github.com/yazi-rs/plugins/assets/17523360/72aaf117-1378-4f7e-93ba-d425a79deac5 - -## Installation - -```sh -ya pack -a yazi-rs/plugins#smart-filter -``` - -## Usage - -Add this to your `~/.config/yazi/keymap.toml`: - -```toml -[[manager.prepend_keymap]] -on = "F" -run = "plugin smart-filter" -desc = "Smart filter" -``` - -Make sure the F key is not used elsewhere. diff --git a/modules/home/programs/terminal/tools/yazi/configs/plugins/smart-filter.yazi/init.lua b/modules/home/programs/terminal/tools/yazi/configs/plugins/smart-filter.yazi/init.lua deleted file mode 100644 index 39198db9..00000000 --- a/modules/home/programs/terminal/tools/yazi/configs/plugins/smart-filter.yazi/init.lua +++ /dev/null @@ -1,47 +0,0 @@ -local hovered = ya.sync(function() - local h = cx.active.current.hovered - if not h then - return {} - end - - return { - url = h.url, - is_dir = h.cha.is_dir, - unique = #cx.active.current.files == 1, - } -end) - -local function prompt() - return ya.input { - title = "Smart filter:", - position = { "center", w = 50 }, - realtime = true, - debounce = 0.1, - } -end - -local function entry() - local input = prompt() - - while true do - local value, event = input:recv() - if event ~= 1 and event ~= 3 then - ya.manager_emit("escape", { filter = true }) - break - end - - ya.manager_emit("filter_do", { value, smart = true }) - - local h = hovered() - if h.unique and h.is_dir then - ya.manager_emit("escape", { filter = true }) - ya.manager_emit("enter", { h.url }) - input = prompt() - elseif event == 1 then - ya.manager_emit("escape", { filter = true }) - ya.manager_emit(h.is_dir and "enter" or "open", { h.url }) - end - end -end - -return { entry = entry } diff --git a/modules/home/programs/terminal/tools/yazi/default.nix b/modules/home/programs/terminal/tools/yazi/default.nix deleted file mode 100644 index 0e57217a..00000000 --- a/modules/home/programs/terminal/tools/yazi/default.nix +++ /dev/null @@ -1,74 +0,0 @@ -{ - config, - lib, - pkgs, - namespace, - ... -}: -let - inherit (lib) mkIf; - inherit (lib.${namespace}) mkBoolOpt; - - completion = import ./keymap/completion.nix { }; - help = import ./keymap/help.nix { }; - input = import ./keymap/input.nix { }; - manager = import ./keymap/manager.nix { inherit config namespace; }; - select = import ./keymap/select.nix { }; - tasks = import ./keymap/tasks.nix { }; - - cfg = config.${namespace}.programs.terminal.tools.yazi; -in -{ - imports = lib.snowfall.fs.get-non-default-nix-files ./configs/plugins; - - options.${namespace}.programs.terminal.tools.yazi = { - enable = mkBoolOpt false "Whether or not to enable yazi."; - }; - - config = mkIf cfg.enable { - home.packages = with pkgs; [ - miller - ouch - config.programs.ripgrep.package - xdragon - zoxide - ]; - - programs.yazi = { - enable = true; - package = pkgs.yazi; - - # NOTE: wrapper alias is yy - enableBashIntegration = true; - enableFishIntegration = true; - enableNushellIntegration = true; - enableZshIntegration = true; - - keymap = lib.mkMerge [ - completion - help - input - manager - select - tasks - ]; - settings = import ./yazi.nix { inherit lib pkgs; }; - }; - - xdg.configFile = { - "yazi" = { - source = lib.cleanSourceWith { - filter = - name: _type: - let - baseName = baseNameOf (toString name); - in - !lib.hasSuffix ".nix" baseName; - src = lib.cleanSource ./configs/.; - }; - - recursive = true; - }; - }; - }; -} diff --git a/modules/home/programs/terminal/tools/yazi/keymap/completion.nix b/modules/home/programs/terminal/tools/yazi/keymap/completion.nix deleted file mode 100644 index 6b3af905..00000000 --- a/modules/home/programs/terminal/tools/yazi/keymap/completion.nix +++ /dev/null @@ -1,52 +0,0 @@ -_: { - completion = { - keymap = [ - { - on = [ "" ]; - run = "close"; - desc = "Cancel completion"; - } - { - on = [ "" ]; - run = "close --submit"; - desc = "Submit the completion"; - } - { - on = [ "" ]; - run = [ - "close --submit" - "close_input --submit" - ]; - desc = "Submit the completion and input"; - } - - { - on = [ "" ]; - run = "arrow -1"; - desc = "Move cursor up"; - } - { - on = [ "" ]; - run = "arrow 1"; - desc = "Move cursor down"; - } - - { - on = [ "" ]; - run = "arrow -1"; - desc = "Move cursor up"; - } - { - on = [ "" ]; - run = "arrow 1"; - desc = "Move cursor down"; - } - - { - on = [ "~" ]; - run = "help"; - desc = "Open help"; - } - ]; - }; -} diff --git a/modules/home/programs/terminal/tools/yazi/keymap/help.nix b/modules/home/programs/terminal/tools/yazi/keymap/help.nix deleted file mode 100644 index 2ef0afa8..00000000 --- a/modules/home/programs/terminal/tools/yazi/keymap/help.nix +++ /dev/null @@ -1,74 +0,0 @@ -_: { - help = { - keymap = [ - # Exiting & Hiding - { - on = [ "" ]; - run = "escape"; - desc = "Clear the filter, or hide the help"; - } - { - on = [ "q" ]; - run = "close"; - desc = "Exit the process"; - } - { - on = [ "" ]; - run = "close"; - desc = "Hide the help"; - } - - # Navigation - { - on = [ "k" ]; - run = "arrow -1"; - desc = "Move cursor up"; - } - { - on = [ "j" ]; - run = "arrow 1"; - desc = "Move cursor down"; - } - - { - on = [ "K" ]; - run = "arrow -5"; - desc = "Move cursor up 5 lines"; - } - { - on = [ "J" ]; - run = "arrow 5"; - desc = "Move cursor down 5 lines"; - } - - { - on = [ "" ]; - run = "arrow -1"; - desc = "Move cursor up"; - } - { - on = [ "" ]; - run = "arrow 1"; - desc = "Move cursor down"; - } - - { - on = [ "" ]; - run = "arrow -5"; - desc = "Move cursor up 5 lines"; - } - { - on = [ "" ]; - run = "arrow 5"; - desc = "Move cursor down 5 lines"; - } - - # Filtering - { - on = [ "/" ]; - run = "filter"; - desc = "Apply a filter for the help items"; - } - ]; - }; -} diff --git a/modules/home/programs/terminal/tools/yazi/keymap/input.nix b/modules/home/programs/terminal/tools/yazi/keymap/input.nix deleted file mode 100644 index 31ba6ae2..00000000 --- a/modules/home/programs/terminal/tools/yazi/keymap/input.nix +++ /dev/null @@ -1,259 +0,0 @@ -_: { - input = { - keymap = [ - { - on = [ "" ]; - run = "close"; - desc = "Cancel input"; - } - { - on = [ "" ]; - run = "close --submit"; - desc = "Submit the input"; - } - { - on = [ "" ]; - run = "escape"; - desc = "Go back to normal mode, or cancel input"; - } - - # Mode - { - on = [ "i" ]; - run = "insert"; - desc = "Enter insert mode"; - } - { - on = [ "a" ]; - run = "insert --append"; - desc = "Enter append mode"; - } - { - on = [ "v" ]; - run = "visual"; - desc = "Enter visual mode"; - } - { - on = [ "V" ]; - run = [ - "move -999" - "visual" - "move 999" - ]; - desc = "Enter visual mode and select all"; - } - - # Character-wise movement - { - on = [ "h" ]; - run = "move -1"; - desc = "Move cursor left"; - } - { - on = [ "l" ]; - run = "move 1"; - desc = "Move cursor right"; - } - { - on = [ "" ]; - run = "move -1"; - desc = "Move cursor left"; - } - { - on = [ "" ]; - run = "move 1"; - desc = "Move cursor right"; - } - - # Line-wise movement - { - on = [ "0" ]; - run = "move -999"; - desc = "Move to the BOL"; - } - { - on = [ "$" ]; - run = "move 999"; - desc = "Move to the EOL"; - } - { - on = [ "I" ]; - run = [ - "move -999" - "insert" - ]; - desc = "Move to the BOL, and enter insert mode"; - } - { - on = [ "A" ]; - run = [ - "move 999" - "insert --append" - ]; - desc = "Move to the EOL, and enter append mode"; - } - - # Word-wise movement - { - on = [ "b" ]; - run = "backward"; - desc = "Move to the beginning of the previous word"; - } - { - on = [ "w" ]; - run = "forward"; - desc = "Move to the beginning of the next word"; - } - { - on = [ "e" ]; - run = "forward --end-of-word"; - desc = "Move to the end of the next word"; - } - - # Delete - { - on = [ "" ]; - run = "backspace"; - desc = "Delete the character before the cursor"; - } - { - on = [ "" ]; - run = "backspace"; - desc = "Delete the character before the cursor"; - } - { - on = [ "" ]; - run = "backspace --under"; - desc = "Delete the character under the cursor"; - } - - # Deletion - { - on = [ "d" ]; - run = "delete --cut"; - desc = "Cut the selected characters"; - } - { - on = [ "D" ]; - run = [ - "delete --cut" - "move 999" - ]; - desc = "Cut until the EOL"; - } - { - on = [ "c" ]; - run = "delete --cut --insert"; - desc = "Cut the selected characters, and enter insert mode"; - } - { - on = [ "C" ]; - run = [ - "delete --cut --insert" - "move 999" - ]; - desc = "Cut until the EOL, and enter insert mode"; - } - { - on = [ "x" ]; - run = [ - "delete --cut" - "move 1 --in-operating" - ]; - desc = "Cut the current character"; - } - - # Kill - { - on = [ "" ]; - run = "kill bol"; - desc = "Kill backwards to the BOL"; - } - { - on = [ "" ]; - run = "kill eol"; - desc = "Kill forwards to the EOL"; - } - { - on = [ "" ]; - run = "kill backward"; - desc = "Kill backwards to the start of the current word"; - } - { - on = [ "" ]; - run = "kill forward"; - desc = "Kill forwards to the end of the current word"; - } - - # Cut/Yank/Paste - { - on = [ "d" ]; - run = "delete --cut"; - desc = "Cut the selected characters"; - } - { - on = [ "D" ]; - run = [ - "delete --cut" - "move 999" - ]; - desc = "Cut until the EOL"; - } - { - on = [ "c" ]; - run = "delete --cut --insert"; - desc = "Cut the selected characters and enter insert mode"; - } - { - on = [ "C" ]; - run = [ - "delete --cut --insert" - "move 999" - ]; - desc = "Cut until the EOL and enter insert mode"; - } - { - on = [ "x" ]; - run = [ - "delete --cut" - "move 1 --in-operating" - ]; - desc = "Cut the current character"; - } - { - on = [ "y" ]; - run = "yank"; - desc = "Copy the selected characters"; - } - { - on = [ "p" ]; - run = "paste"; - desc = "Paste the copied characters after the cursor"; - } - { - on = [ "P" ]; - run = "paste --before"; - desc = "Paste the copied characters before the cursor"; - } - - # Undo/Redo - { - on = [ "u" ]; - run = "undo"; - desc = "Undo the last operation"; - } - { - on = [ "" ]; - run = "redo"; - desc = "Redo the last operation"; - } - - # Help - { - on = [ "~" ]; - run = "help"; - desc = "Open help"; - } - ]; - }; -} diff --git a/modules/home/programs/terminal/tools/yazi/keymap/manager.nix b/modules/home/programs/terminal/tools/yazi/keymap/manager.nix deleted file mode 100644 index 573cdf0b..00000000 --- a/modules/home/programs/terminal/tools/yazi/keymap/manager.nix +++ /dev/null @@ -1,120 +0,0 @@ -{ config, namespace, ... }: -let - copy = import ./manager/copy.nix { }; - find = import ./manager/find.nix { }; - goto = import ./manager/goto.nix { inherit config namespace; }; - navigation = import ./manager/navigation.nix { }; - operation = import ./manager/operation.nix { }; - selection = import ./manager/selection.nix { }; - sorting = import ./manager/sorting.nix { }; - tabs = import ./manager/tabs.nix { inherit config; }; -in -{ - manager = { - prepend_keymap = [ - { - on = [ "l" ]; - run = "plugin --sync smart-enter"; - desc = "Enter the child directory, or open the file"; - } - { - on = [ "" ]; - run = "plugin --sync smart-enter"; - desc = "Enter the child directory, or open the file"; - } - { - on = [ "" ]; - run = "shell 'dragon -x -i -T \"$1\"' --confirm"; - desc = "Drag and drop files"; - } - { - on = [ "" ]; - run = "plugin diff"; - desc = "Diff the selected with the hovered file"; - } - { - on = [ "" ]; - run = "plugin diff"; - desc = "Diff the selected with the hovered file"; - } - { - on = [ - "c" - "m" - ]; - run = "plugin chmod"; - desc = "Chmod on selected files"; - } - { - on = [ "T" ]; - run = "plugin --sync hide-preview"; - desc = "Hide or show preview"; - } - # { - # on = [ "T" ]; - # run = "plugin --sync max-preview"; - # desc = "Maximize or restore preview"; - # } - { - on = [ "f" ]; - run = "plugin jump-to-char"; - desc = "Jump to char"; - } - { - on = [ "F" ]; - run = "plugin smart-filter"; - desc = "Smart filter"; - } - ]; - - keymap = - copy.keymap - ++ find.keymap - ++ goto.keymap - ++ navigation.keymap - ++ operation.keymap - ++ selection.keymap - ++ sorting.keymap - ++ tabs.keymap - ++ [ - # Exit - { - on = [ "" ]; - run = "escape"; - desc = "Exit visual mode, clear selected, or cancel search"; - } - { - on = [ "q" ]; - run = "close"; - desc = "Close the current tab; if it's the last tab, exit the process instead."; - } - { - on = [ "Q" ]; - run = "quit --no-cwd-file"; - desc = "Exit the process without writing cwd-file"; - } - { - on = [ "" ]; - run = "close"; - desc = "Close the current tab, or quit if it is last tab"; - } - { - on = [ "" ]; - run = "suspend"; - desc = "Suspend the process"; - } - # Tasks - { - on = [ "w" ]; - run = "tasks_show"; - desc = "Show the tasks manager"; - } - # Help - { - on = [ "~" ]; - run = "help"; - desc = "Open help"; - } - ]; - }; -} diff --git a/modules/home/programs/terminal/tools/yazi/keymap/manager/copy.nix b/modules/home/programs/terminal/tools/yazi/keymap/manager/copy.nix deleted file mode 100644 index 8861ad9f..00000000 --- a/modules/home/programs/terminal/tools/yazi/keymap/manager/copy.nix +++ /dev/null @@ -1,37 +0,0 @@ -_: { - keymap = [ - # Copy - { - on = [ - "c" - "c" - ]; - run = "copy path"; - desc = "Copy the absolute path"; - } - { - on = [ - "c" - "d" - ]; - run = "copy dirname"; - desc = "Copy the path of the parent directory"; - } - { - on = [ - "c" - "f" - ]; - run = "copy filename"; - desc = "Copy the name of the file"; - } - { - on = [ - "c" - "n" - ]; - run = "copy name_without_ext"; - desc = "Copy the name of the file without the extension"; - } - ]; -} diff --git a/modules/home/programs/terminal/tools/yazi/keymap/manager/find.nix b/modules/home/programs/terminal/tools/yazi/keymap/manager/find.nix deleted file mode 100644 index c0cfb386..00000000 --- a/modules/home/programs/terminal/tools/yazi/keymap/manager/find.nix +++ /dev/null @@ -1,21 +0,0 @@ -_: { - keymap = [ - # Find - { - on = [ "/" ]; - run = "find --smart"; - } - { - on = [ "?" ]; - run = "find --previous --smart"; - } - { - on = [ "n" ]; - run = "find_arrow"; - } - { - on = [ "N" ]; - run = "find_arrow --previous"; - } - ]; -} diff --git a/modules/home/programs/terminal/tools/yazi/keymap/manager/goto.nix b/modules/home/programs/terminal/tools/yazi/keymap/manager/goto.nix deleted file mode 100644 index f6130c95..00000000 --- a/modules/home/programs/terminal/tools/yazi/keymap/manager/goto.nix +++ /dev/null @@ -1,198 +0,0 @@ -{ config, namespace, ... }: -{ - keymap = [ - # Goto - { - on = [ - "g" - "/" - ]; - run = "cd /"; - desc = "Go to the root directory"; - } - { - on = [ - "g" - "h" - ]; - run = "cd ~"; - desc = "Go to the home directory"; - } - { - on = [ - "g" - "c" - ]; - run = "cd ~/.config"; - desc = "Go to the config directory"; - } - { - on = [ - "g" - "t" - ]; - run = "cd /tmp"; - desc = "Go to the temporary directory"; - } - { - on = [ - "g" - "" - ]; - run = "cd --interactive"; - desc = "Go to a directory interactively"; - } - { - on = [ - "g" - "D" - ]; - run = "cd ~/Downloads"; - desc = "Go to the downloads directory"; - } - { - on = [ - "g" - "G" - ]; - run = "cd ~/Documents/gitlab"; - desc = "Go to the GitLab directory"; - } - { - on = [ - "g" - "M" - ]; - run = "cd /mnt"; - desc = "Go to the /mnt directory"; - } - { - on = [ - "g" - "c" - ]; - run = "cd ~/.config"; - desc = "Go to the ~/.config directory"; - } - { - on = [ - "g" - "d" - ]; - run = "cd ~/Documents"; - desc = "Go to the Documents directory"; - } - { - on = [ - "g" - "e" - ]; - run = "cd /etc"; - desc = "Go to the /etc directory"; - } - { - on = [ - "g" - "g" - ]; - run = "cd ~/Documents/github"; - desc = "Go to the GitHub directory"; - } - { - on = [ - "g" - "h" - ]; - run = "cd ~"; - desc = "Go to the home directory"; - } - { - on = [ - "g" - "i" - ]; - run = "cd /run/media/${config.${namespace}.user.name}"; - desc = "Run command to change to media directory"; - } - { - on = [ - "g" - "l" - ]; - run = "cd ~/.local/"; - desc = "Go to the ~/.local/ directory"; - } - { - on = [ - "g" - "m" - ]; - run = "cd /media"; - desc = "Go to the /media directory"; - } - { - on = [ - "g" - "o" - ]; - run = "cd /opt"; - desc = "Go to the /opt directory"; - } - { - on = [ - "g" - "t" - ]; - run = "cd /tmp"; - desc = "Go to the /tmp directory"; - } - { - on = [ - "g" - "p" - ]; - run = "cd ~/Pictures"; - desc = "Go to the Pictures directory"; - } - { - on = [ - "g" - "r" - ]; - run = "cd /run"; - desc = "Go to the /run directory"; - } - { - on = [ - "g" - "s" - ]; - run = "cd /srv"; - desc = "Go to the /srv directory"; - } - { - on = [ - "g" - "u" - ]; - run = "cd /usr"; - desc = "Go to the /usr directory"; - } - { - on = [ - "g" - "v" - ]; - run = "cd /var"; - desc = "Go to the /var directory"; - } - { - on = [ - "g" - "w" - ]; - run = "cd ~/.local/share/wallpapers"; - desc = "Go to the wallpapers directory"; - } - ]; -} diff --git a/modules/home/programs/terminal/tools/yazi/keymap/manager/navigation.nix b/modules/home/programs/terminal/tools/yazi/keymap/manager/navigation.nix deleted file mode 100644 index 801b9ea6..00000000 --- a/modules/home/programs/terminal/tools/yazi/keymap/manager/navigation.nix +++ /dev/null @@ -1,108 +0,0 @@ -_: { - keymap = [ - # Navigation - { - on = [ "k" ]; - run = "arrow -1"; - desc = "Move cursor up"; - } - { - on = [ "j" ]; - run = "arrow 1"; - desc = "Move cursor down"; - } - { - on = [ "K" ]; - run = "arrow -5"; - desc = "Move cursor up 5 lines"; - } - { - on = [ "J" ]; - run = "arrow 5"; - desc = "Move cursor down 5 lines"; - } - { - on = [ "" ]; - run = "arrow -50%"; - desc = "Move cursor up half page"; - } - { - on = [ "" ]; - run = "arrow 50%"; - desc = "Move cursor down half page"; - } - { - on = [ "" ]; - run = "arrow -100%"; - desc = "Move cursor up one page"; - } - { - on = [ "" ]; - run = "arrow 100%"; - desc = "Move cursor down one page"; - } - { - on = [ "h" ]; - run = "leave"; - desc = "Go back to the parent directory"; - } - { - on = [ "l" ]; - run = "enter"; - desc = "Enter the child directory"; - } - { - on = [ "H" ]; - run = "back"; - desc = "Go back to the previous directory"; - } - { - on = [ "L" ]; - run = "forward"; - desc = "Go forward to the next directory"; - } - { - on = [ "" ]; - run = "peek -5"; - desc = "Peek up 5 units in the preview"; - } - { - on = [ "" ]; - run = "peek 5"; - desc = "Peek down 5 units in the preview"; - } - { - on = [ "" ]; - run = "arrow -1"; - desc = "Move cursor up"; - } - { - on = [ "" ]; - run = "arrow 1"; - desc = "Move cursor down"; - } - { - on = [ "" ]; - run = "leave"; - desc = "Go back to the parent directory"; - } - { - on = [ "" ]; - run = "enter"; - desc = "Enter the child directory"; - } - { - on = [ - "g" - "T" - ]; - run = "arrow -99999999"; - desc = "Move cursor to the top"; - } - { - on = [ "G" ]; - run = "arrow 99999999"; - desc = "Move cursor to the bottom"; - } - ]; -} diff --git a/modules/home/programs/terminal/tools/yazi/keymap/manager/operation.nix b/modules/home/programs/terminal/tools/yazi/keymap/manager/operation.nix deleted file mode 100644 index d6a3cdea..00000000 --- a/modules/home/programs/terminal/tools/yazi/keymap/manager/operation.nix +++ /dev/null @@ -1,115 +0,0 @@ -_: { - keymap = [ - # Operation - { - on = [ "o" ]; - run = "open"; - desc = "Open the selected files"; - } - { - on = [ "O" ]; - run = "open --interactive"; - desc = "Open the selected files interactively"; - } - { - on = [ "" ]; - run = "open"; - desc = "Open the selected files"; - } - { - on = [ "" ]; - run = "open --interactive"; - desc = "Open the selected files interactively"; - } - { - on = [ "y" ]; - run = "yank"; - desc = "Copy the selected files"; - } - { - on = [ "x" ]; - run = "yank --cut"; - desc = "Cut the selected files"; - } - { - on = [ "p" ]; - run = "paste"; - desc = "Paste the files"; - } - { - on = [ "P" ]; - run = "paste --force"; - desc = "Paste the files (overwrite if the destination exists)"; - } - { - on = [ "-" ]; - run = "link"; - desc = "Symlink the absolute path of files"; - } - { - on = [ "_" ]; - run = "link --relative"; - desc = "Symlink the relative path of files"; - } - { - on = [ "d" ]; - run = "remove"; - desc = "Move the files to the trash"; - } - { - on = [ "D" ]; - run = "remove --permanently"; - desc = "Permanently delete the files"; - } - { - on = [ "a" ]; - run = "create"; - desc = "Create a file or directory (ends with / for directories)"; - } - { - on = [ "r" ]; - run = "rename"; - desc = "Rename a file or directory"; - } - { - on = [ "," ]; - run = "shell --interactive"; - desc = "Run a shell command"; - } - { - on = [ ":" ]; - run = "shell --block --interactive"; - desc = "Run a shell command (block the UI until the command finishes)"; - } - { - on = [ "." ]; - run = "hidden toggle"; - desc = "Toggle the visibility of hidden files"; - } - { - on = [ "s" ]; - run = "search fd"; - desc = "Search files by name using fd"; - } - { - on = [ "S" ]; - run = "search rg"; - desc = "Search files by content using ripgrep"; - } - { - on = [ "" ]; - run = "search none"; - desc = "Cancel the ongoing search"; - } - { - on = [ "z" ]; - run = "plugin zoxide"; - desc = "Jump to a directory using zoxide"; - } - { - on = [ "Z" ]; - run = "plugin fzf"; - desc = "Jump to a directory, or reveal a file using fzf"; - } - ]; -} diff --git a/modules/home/programs/terminal/tools/yazi/keymap/manager/selection.nix b/modules/home/programs/terminal/tools/yazi/keymap/manager/selection.nix deleted file mode 100644 index d493dadb..00000000 --- a/modules/home/programs/terminal/tools/yazi/keymap/manager/selection.nix +++ /dev/null @@ -1,34 +0,0 @@ -_: { - - keymap = [ - # Selection - { - on = [ "" ]; - run = [ - "select --state=none" - "arrow 1" - ]; - desc = "Toggle the current selection state"; - } - { - on = [ "v" ]; - run = "visual_mode"; - desc = "Enter visual mode (selection mode)"; - } - { - on = [ "V" ]; - run = "visual_mode --unset"; - desc = "Enter visual mode (unset mode)"; - } - { - on = [ "" ]; - run = "select_all --state=true"; - desc = "Select all files"; - } - { - on = [ "" ]; - run = "select_all --state=none"; - desc = "Inverse selection of all files"; - } - ]; -} diff --git a/modules/home/programs/terminal/tools/yazi/keymap/manager/sorting.nix b/modules/home/programs/terminal/tools/yazi/keymap/manager/sorting.nix deleted file mode 100644 index 098ada42..00000000 --- a/modules/home/programs/terminal/tools/yazi/keymap/manager/sorting.nix +++ /dev/null @@ -1,85 +0,0 @@ -_: { - keymap = [ - # Sorting - { - on = [ - "," - "a" - ]; - run = "sort alphabetical --reverse=no"; - desc = "Sort alphabetically"; - } - { - on = [ - "," - "A" - ]; - run = "sort alphabetical --reverse"; - desc = "Sort alphabetically (reverse)"; - } - { - on = [ - "," - "c" - ]; - run = "sort created --reverse=no"; - desc = "Sort by creation time"; - } - { - on = [ - "," - "C" - ]; - run = "sort created --reverse"; - desc = "Sort by creation time (reverse)"; - } - { - on = [ - "," - "m" - ]; - run = "sort modified --reverse=no"; - desc = "Sort by modified time"; - } - { - on = [ - "," - "M" - ]; - run = "sort modified --reverse"; - desc = "Sort by modified time (reverse)"; - } - { - on = [ - "," - "n" - ]; - run = "sort natural --reverse=no"; - desc = "Sort naturally"; - } - { - on = [ - "," - "N" - ]; - run = "sort natural --reverse"; - desc = "Sort naturally (reverse)"; - } - { - on = [ - "," - "s" - ]; - run = "sort size --reverse=no"; - desc = "Sort by size"; - } - { - on = [ - "," - "S" - ]; - run = "sort size --reverse"; - desc = "Sort by size (reverse)"; - } - ]; -} diff --git a/modules/home/programs/terminal/tools/yazi/keymap/manager/tabs.nix b/modules/home/programs/terminal/tools/yazi/keymap/manager/tabs.nix deleted file mode 100644 index 2939cc7b..00000000 --- a/modules/home/programs/terminal/tools/yazi/keymap/manager/tabs.nix +++ /dev/null @@ -1,90 +0,0 @@ -_: { - keymap = [ - # Tabs - { - on = [ "t" ]; - run = "tab_create --current"; - desc = "Create a new tab using the current path"; - } - { - on = [ "" ]; - run = "tab_create --current"; - desc = "Create a new tab using the current path"; - } - { - on = [ "1" ]; - run = "tab_switch 0"; - desc = "Switch to the first tab"; - } - { - on = [ "2" ]; - run = "tab_switch 1"; - desc = "Switch to the second tab"; - } - { - on = [ "3" ]; - run = "tab_switch 2"; - desc = "Switch to the third tab"; - } - { - on = [ "4" ]; - run = "tab_switch 3"; - desc = "Switch to the fourth tab"; - } - { - on = [ "5" ]; - run = "tab_switch 4"; - desc = "Switch to the fifth tab"; - } - { - on = [ "6" ]; - run = "tab_switch 5"; - desc = "Switch to the sixth tab"; - } - { - on = [ "7" ]; - run = "tab_switch 6"; - desc = "Switch to the seventh tab"; - } - { - on = [ "8" ]; - run = "tab_switch 7"; - desc = "Switch to the eighth tab"; - } - { - on = [ "9" ]; - run = "tab_switch 8"; - desc = "Switch to the ninth tab"; - } - { - on = [ "[" ]; - run = "tab_switch -1 --relative"; - desc = "Switch to the previous tab"; - } - { - on = [ "]" ]; - run = "tab_switch 1 --relative"; - desc = "Switch to the next tab"; - } - { - on = [ "" ]; - run = "tab_switch -1 --relative"; - desc = "Switch to the previous tab"; - } - { - on = [ "" ]; - run = "tab_switch 1 --relative"; - desc = "Switch to the next tab"; - } - { - on = [ "{" ]; - run = "tab_swap -1"; - desc = "Swap the current tab with the previous tab"; - } - { - on = [ "}" ]; - run = "tab_swap 1"; - desc = "Swap the current tab with the next tab"; - } - ]; -} diff --git a/modules/home/programs/terminal/tools/yazi/keymap/select.nix b/modules/home/programs/terminal/tools/yazi/keymap/select.nix deleted file mode 100644 index b1fe4427..00000000 --- a/modules/home/programs/terminal/tools/yazi/keymap/select.nix +++ /dev/null @@ -1,60 +0,0 @@ -_: { - select = { - keymap = [ - { - on = [ "" ]; - run = "close"; - desc = "Cancel selection"; - } - { - on = [ "" ]; - run = "close"; - desc = "Cancel selection"; - } - { - on = [ "" ]; - run = "close --submit"; - desc = "Submit the selection"; - } - - { - on = [ "k" ]; - run = "arrow -1"; - desc = "Move cursor up"; - } - { - on = [ "j" ]; - run = "arrow 1"; - desc = "Move cursor down"; - } - - { - on = [ "K" ]; - run = "arrow -5"; - desc = "Move cursor up 5 lines"; - } - { - on = [ "J" ]; - run = "arrow 5"; - desc = "Move cursor down 5 lines"; - } - - { - on = [ "" ]; - run = "arrow -1"; - desc = "Move cursor up"; - } - { - on = [ "" ]; - run = "arrow 1"; - desc = "Move cursor down"; - } - - { - on = [ "~" ]; - run = "help"; - desc = "Open help"; - } - ]; - }; -} diff --git a/modules/home/programs/terminal/tools/yazi/keymap/tasks.nix b/modules/home/programs/terminal/tools/yazi/keymap/tasks.nix deleted file mode 100644 index 69227376..00000000 --- a/modules/home/programs/terminal/tools/yazi/keymap/tasks.nix +++ /dev/null @@ -1,60 +0,0 @@ -_: { - tasks = { - keymap = [ - { - on = [ "" ]; - run = "close"; - desc = "Hide the task manager"; - } - { - on = [ "" ]; - run = "close"; - desc = "Hide the task manager"; - } - { - on = [ "w" ]; - run = "close"; - desc = "Hide the task manager"; - } - - { - on = [ "k" ]; - run = "arrow -1"; - desc = "Move cursor up"; - } - { - on = [ "j" ]; - run = "arrow 1"; - desc = "Move cursor down"; - } - - { - on = [ "" ]; - run = "arrow -1"; - desc = "Move cursor up"; - } - { - on = [ "" ]; - run = "arrow 1"; - desc = "Move cursor down"; - } - - { - on = [ "" ]; - run = "inspect"; - desc = "Inspect the task"; - } - { - on = [ "x" ]; - run = "cancel"; - desc = "Cancel the task"; - } - - { - on = [ "~" ]; - run = "help"; - desc = "Open help"; - } - ]; - }; -} diff --git a/modules/home/programs/terminal/tools/yazi/yazi.nix b/modules/home/programs/terminal/tools/yazi/yazi.nix deleted file mode 100644 index 5d793ef5..00000000 --- a/modules/home/programs/terminal/tools/yazi/yazi.nix +++ /dev/null @@ -1,579 +0,0 @@ -{ lib, pkgs }: -{ - manager = { - layout = [ - 1 - 3 - 4 - ]; - linemode = "custom"; - show_hidden = true; - show_symlink = true; - sort_by = "alphabetical"; - sort_dir_first = true; - sort_reverse = false; - sort_sensitive = false; - }; - - opener = { - edit = [ - { - run = "nvim \"$@\""; - desc = "$EDITOR"; - block = true; - for = "unix"; - } - { - run = "code \"%*\""; - orphan = true; - desc = "code"; - for = "windows"; - } - { - run = "code -w \"%*\""; - block = true; - desc = "code (block)"; - for = "windows"; - } - ]; - open = [ - { - run = "xdg-open \"$@\""; - desc = "Open"; - for = "linux"; - } - { - run = "open \"$@\""; - desc = "Open"; - for = "macos"; - } - { - run = "start \"\" \"%1\""; - orphan = true; - desc = "Open"; - for = "windows"; - } - ]; - reveal = [ - { - run = "open -R \"$1\""; - desc = "Reveal"; - for = "macos"; - } - { - run = "explorer /select, \"%1\""; - orphan = true; - desc = "Reveal"; - for = "windows"; - } - { - run = "${lib.getExe pkgs.exiftool} \"$1\"; echo \"Press enter to exit\"; read _"; - block = true; - desc = "Show EXIF"; - for = "unix"; - } - ]; - dmg = [ - { - run = "${lib.getExe pkgs.undmg} \"$1\""; - desc = "Extract here"; - for = "unix"; - } - ]; - extract = [ - { - desc = "Extract with atool"; - run = "${lib.getExe pkgs.atool} --extract --each --subdir --quiet -- \"$@\""; - block = true; - } - { - run = "${lib.getExe pkgs.unar} \"$1\""; - desc = "Extract here"; - for = "unix"; - } - { - run = "${lib.getExe pkgs.unar} \"%1\""; - desc = "Extract here"; - for = "windows"; - } - ]; - play = [ - { - run = "${lib.getExe pkgs.mpv} \"$@\""; - orphan = true; - for = "unix"; - } - { - run = "${lib.getExe pkgs.mpv} \"%1\""; - orphan = true; - for = "windows"; - } - { - run = "${lib.getExe pkgs.mediainfo} \"$1\"; echo \"Press enter to exit\"; read _"; - block = true; - desc = "Show media info"; - for = "unix"; - } - ]; - }; - - open = - let - archiveExtensions = [ - "7z" - "ace" - "ar" - "arc" - "bz2" - "cab" - "cpio" - "cpt" - "deb" - "dgc" - "dmg" - "gz" - "iso" - "jar" - "msi" - "pkg" - "rar" - "shar" - "tar" - "tgz" - "xar" - "xpi" - "xz" - "zip" - ]; - - generateArchiveRule = ext: { - name = "*.${ext}"; - use = [ - "extract" - "reveal" - ]; - }; - - archiveRules = map generateArchiveRule archiveExtensions; - in - { - rules = archiveRules ++ [ - { - name = "*.dmg"; - use = [ - "dmg" - "reveal" - ]; - } - { - name = "*/"; - use = [ - "edit" - "open" - "reveal" - ]; - } - { - mime = "text/*"; - use = [ - "edit" - "reveal" - ]; - } - { - mime = "image/*"; - use = [ - "open" - "reveal" - ]; - } - { - mime = "video/*"; - use = [ - "play" - "reveal" - ]; - } - { - mime = "audio/*"; - use = [ - "play" - "reveal" - ]; - } - { - mime = "inode/x-empty"; - use = [ - "edit" - "reveal" - ]; - } - { - mime = "application/json"; - use = [ - "edit" - "reveal" - ]; - } - { - mime = "*/javascript"; - use = [ - "edit" - "reveal" - ]; - } - { - mime = "application/zip"; - use = [ - "extract" - "reveal" - ]; - } - { - mime = "application/gzip"; - use = [ - "extract" - "reveal" - ]; - } - { - mime = "application/x-tar"; - use = [ - "extract" - "reveal" - ]; - } - { - mime = "application/x-bzip"; - use = [ - "extract" - "reveal" - ]; - } - { - mime = "application/x-bzip2"; - use = [ - "extract" - "reveal" - ]; - } - { - mime = "application/x-7z-compressed"; - use = [ - "extract" - "reveal" - ]; - } - { - mime = "application/x-rar"; - use = [ - "extract" - "reveal" - ]; - } - { - mime = "application/xz"; - use = [ - "extract" - "reveal" - ]; - } - { - mime = "*"; - use = [ - "open" - "reveal" - ]; - } - ]; - }; - - preview = { - tab_size = 2; - max_width = 600; - max_height = 900; - cache_dir = ""; - image_filter = "triangle"; - image_quality = 75; - sixel_fraction = 15; - ueberzug_scale = 1; - ueberzug_offset = [ - 0 - 0 - 0 - 0 - ]; - }; - - tasks = { - micro_workers = 10; - macro_workers = 25; - bizarre_retry = 5; - image_alloc = 536870912; # 512MB - image_bound = [ - 0 - 0 - ]; - suppress_preload = false; - }; - - plugin = { - preloaders = [ - # Image - { - mime = "image/vnd.djvu"; - run = "noop"; - } - { - mime = "image/*"; - run = "image"; - } - # Video - { - mime = "video/*"; - run = "video"; - } - # PDF - { - mime = "application/pdf"; - run = "pdf"; - } - ]; - - previewers = [ - { - name = "*.md"; - run = "glow"; - } - { - mime = "text/csv"; - run = "miller"; - } - { - name = "*/"; - run = "folder"; - sync = true; - } - # Code - { - mime = "text/*"; - run = "code"; - } - { - mime = "*/xml"; - run = "code"; - } - { - mime = "*/javascript"; - run = "code"; - } - { - mime = "*/x-wine-extension-ini"; - run = "code"; - } - # JSON - { - mime = "application/json"; - run = "json"; - } - # Image - { - mime = "image/vnd.djvu"; - run = "noop"; - } - { - mime = "image/*"; - run = "image"; - } - # Video - { - mime = "video/*"; - run = "video"; - } - # PDF - { - mime = "application/pdf"; - run = "pdf"; - } - # Archive - { - mime = "application/zip"; - run = "ouch"; - } - { - mime = "application/gzip"; - run = "archive"; - } - { - mime = "application/x-tar"; - run = "ouch"; - } - { - mime = "application/x-bzip"; - run = "ouch"; - } - { - mime = "application/x-bzip2"; - run = "ouch"; - } - { - mime = "application/x-7z-compressed"; - run = "ouch"; - } - { - mime = "application/x-rar"; - run = "ouch"; - } - { - mime = "application/xz"; - run = "ouch"; - } - # Fallback - { - name = "*"; - run = "file"; - } - ]; - }; - - input = { - # cd - cd_title = "Change directory:"; - cd_origin = "top-center"; - cd_offset = [ - 0 - 2 - 50 - 3 - ]; - - # create - create_title = "Create:"; - create_origin = "top-center"; - create_offset = [ - 0 - 2 - 50 - 3 - ]; - - # rename - rename_title = "Rename:"; - rename_origin = "hovered"; - rename_offset = [ - 0 - 1 - 50 - 3 - ]; - - # trash - trash_title = "Move {n} selected file{s} to trash? (y/N)"; - trash_origin = "top-center"; - trash_offset = [ - 0 - 2 - 50 - 3 - ]; - - # delete - delete_title = "Delete {n} selected file{s} permanently? (y/N)"; - delete_origin = "top-center"; - delete_offset = [ - 0 - 2 - 50 - 3 - ]; - - # filter - filter_title = "Filter:"; - filter_origin = "top-center"; - filter_offset = [ - 0 - 2 - 50 - 3 - ]; - - # find - find_title = [ - "Find next:" - "Find previous:" - ]; - find_origin = "top-center"; - find_offset = [ - 0 - 2 - 50 - 3 - ]; - - # search - search_title = "Search via {n}:"; - search_origin = "top-center"; - search_offset = [ - 0 - 2 - 50 - 3 - ]; - - # shell - shell_title = [ - "Shell:" - "Shell (block):" - ]; - shell_origin = "top-center"; - shell_offset = [ - 0 - 2 - 50 - 3 - ]; - - # overwrite - overwrite_title = "Overwrite an existing file? (y/N)"; - overwrite_origin = "top-center"; - overwrite_offset = [ - 0 - 2 - 50 - 3 - ]; - - # quit - quit_title = "{n} task{s} running, sure to quit? (y/N)"; - quit_origin = "top-center"; - quit_offset = [ - 0 - 2 - 50 - 3 - ]; - }; - - select = { - open_title = "Open with:"; - open_origin = "hovered"; - open_offset = [ - 0 - 1 - 50 - 7 - ]; - }; - - which = { - sort_by = "none"; - sort_sensitive = false; - sort_reverse = false; - }; - - log = { - enabled = false; - }; - - # [headsup] -} diff --git a/modules/home/services/hyprpaper/default.nix b/modules/home/services/hyprpaper/default.nix index 1eef3136..4caa828d 100644 --- a/modules/home/services/hyprpaper/default.nix +++ b/modules/home/services/hyprpaper/default.nix @@ -20,6 +20,10 @@ in }; config = mkIf cfg.enable { + xdg.configFile."hypr/hyprpaper.conf".text = '' + preload = ${config.stylix.image} + wallpaper = , ${config.stylix.image} + ''; systemd.user.services.hyprpaper = { Unit = { Description = "Hyprland wallpaper daemon"; diff --git a/modules/home/suites/common/default.nix b/modules/home/suites/common/default.nix index 82f30101..bc0ca649 100644 --- a/modules/home/suites/common/default.nix +++ b/modules/home/suites/common/default.nix @@ -59,14 +59,10 @@ in fzf = enabled; fup-repl = enabled; git = enabled; - glxinfo.enable = pkgs.stdenv.isLinux; jq = enabled; lsd = enabled; - # oh-my-posh = enabled; ripgrep = enabled; - # tmux = enabled; topgrade = enabled; - # yazi = enabled; zellij = enabled; zoxide = enabled; }; diff --git a/modules/home/suites/development/default.nix b/modules/home/suites/development/default.nix index 0efbba3a..63631fe7 100644 --- a/modules/home/suites/development/default.nix +++ b/modules/home/suites/development/default.nix @@ -14,13 +14,9 @@ in { options.${namespace}.suites.development = { enable = mkBoolOpt false "Whether or not to enable common development configuration."; - azureEnable = mkBoolOpt false "Whether or not to enable azure development configuration."; dockerEnable = mkBoolOpt false "Whether or not to enable docker development configuration."; - gameEnable = mkBoolOpt false "Whether or not to enable game development configuration."; - goEnable = mkBoolOpt false "Whether or not to enable go development configuration."; kubernetesEnable = mkBoolOpt false "Whether or not to enable kubernetes development configuration."; nixEnable = mkBoolOpt false "Whether or not to enable nix development configuration."; - sqlEnable = mkBoolOpt false "Whether or not to enable sql development configuration."; }; config = mkIf cfg.enable { @@ -41,15 +37,6 @@ in nixpkgs-lint-community nixpkgs-review nix-update - ] - ++ lib.optionals cfg.gameEnable [ - godot_4 - # NOTE: removed from nixpkgs - # ue4 - unityhub - ] - ++ lib.optionals cfg.sqlEnable [ - dbeaver-bin ]; shellAliases = { @@ -69,9 +56,7 @@ in }; tools = { - azure.enable = cfg.azureEnable; git-crypt = enabled; - go.enable = cfg.goEnable; k9s.enable = cfg.kubernetesEnable; lazydocker.enable = cfg.dockerEnable; lazygit = enabled; diff --git a/modules/home/suites/games/default.nix b/modules/home/suites/games/default.nix deleted file mode 100644 index 69ae0369..00000000 --- a/modules/home/suites/games/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - config, - lib, - pkgs, - namespace, - ... -}: -let - inherit (lib) mkIf; - inherit (lib.${namespace}) mkBoolOpt enabled; - - cfg = config.${namespace}.suites.games; -in -{ - options.${namespace}.suites.games = { - enable = mkBoolOpt false "Whether or not to enable common games configuration."; - }; - - config = mkIf cfg.enable { - home.packages = with pkgs; [ - bottles - heroic - lutris - prismlauncher - proton-caller - protontricks - protonup-ng - protonup-qt - ]; - - elyth = { - programs = { - terminal = { - tools = { - wine = enabled; - }; - }; - }; - }; - }; -} diff --git a/modules/nixos/suites/development/default.nix b/modules/nixos/suites/development/default.nix index f82b9693..ecf6739f 100644 --- a/modules/nixos/suites/development/default.nix +++ b/modules/nixos/suites/development/default.nix @@ -13,13 +13,9 @@ in { options.${namespace}.suites.development = { enable = mkBoolOpt false "Whether or not to enable common development configuration."; - azureEnable = mkBoolOpt false "Whether or not to enable azure development configuration."; dockerEnable = mkBoolOpt false "Whether or not to enable docker development configuration."; - gameEnable = mkBoolOpt false "Whether or not to enable game development configuration."; - goEnable = mkBoolOpt false "Whether or not to enable go development configuration."; kubernetesEnable = mkBoolOpt false "Whether or not to enable kubernetes development configuration."; nixEnable = mkBoolOpt false "Whether or not to enable nix development configuration."; - sqlEnable = mkBoolOpt false "Whether or not to enable sql development configuration."; }; config = mkIf cfg.enable { @@ -33,7 +29,7 @@ in elyth = { user = { - extraGroups = [ "git" ] ++ lib.optionals cfg.sqlEnable [ "mysql" ]; + extraGroups = [ "git" ]; }; }; }; diff --git a/systems/x86_64-linux/grovetender/default.nix b/systems/x86_64-linux/grovetender/default.nix index a8afe502..c6269557 100644 --- a/systems/x86_64-linux/grovetender/default.nix +++ b/systems/x86_64-linux/grovetender/default.nix @@ -85,7 +85,6 @@ in dockerEnable = true; kubernetesEnable = true; nixEnable = true; - sqlEnable = true; }; };