From 385725af95d1018360fe422c95f9e16cdd78b9a6 Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Wed, 5 Feb 2025 01:26:40 -0500 Subject: [PATCH] continuing refactor --- flake.lock | 135 +++--------------- flake.nix | 8 +- homes/emenel/default.nix | 7 +- .../dotfiles/dot_config/wezterm/wezterm.lua | 26 ++-- modules/home/{yazi/default.nix => yazi.nix} | 4 +- modules/home/yazi/init.lua | 23 --- 6 files changed, 43 insertions(+), 160 deletions(-) rename modules/home/{yazi/default.nix => yazi.nix} (85%) delete mode 100644 modules/home/yazi/init.lua diff --git a/flake.lock b/flake.lock index 2fe96ad..2fa2828 100644 --- a/flake.lock +++ b/flake.lock @@ -251,7 +251,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1710146030, @@ -269,7 +269,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1710146030, @@ -286,7 +286,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_7" + "systems": "systems_6" }, "locked": { "lastModified": 1710146030, @@ -325,7 +325,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_9" + "systems": "systems_8" }, "locked": { "lastModified": 1731533236, @@ -343,7 +343,7 @@ }, "flake-utils_6": { "inputs": { - "systems": "systems_10" + "systems": "systems_9" }, "locked": { "lastModified": 1731533236, @@ -683,29 +683,6 @@ "type": "github" } }, - "hyprpicker": { - "inputs": { - "hyprutils": "hyprutils_3", - "hyprwayland-scanner": "hyprwayland-scanner_3", - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems_3" - }, - "locked": { - "lastModified": 1737635601, - "narHash": "sha256-/Jb/9HqC5Ou5JtsLHY2MJtj/c0aDG3kaeh4RLvc2X2U=", - "owner": "hyprwm", - "repo": "hyprpicker", - "rev": "c3777320b358bb28a0f2112441377fe452d77ea8", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprpicker", - "type": "github" - } - }, "hyprutils": { "inputs": { "nixpkgs": [ @@ -756,31 +733,6 @@ "type": "github" } }, - "hyprutils_3": { - "inputs": { - "nixpkgs": [ - "hyprpicker", - "nixpkgs" - ], - "systems": [ - "hyprpicker", - "systems" - ] - }, - "locked": { - "lastModified": 1737632363, - "narHash": "sha256-X9I8POSlHxBVjD0fiX1O2j7U9Zi1+4rIkrsyHP0uHXY=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "006620eb29d54ea9086538891404c78563d1bae1", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, "hyprwayland-scanner": { "inputs": { "nixpkgs": [ @@ -831,31 +783,6 @@ "type": "github" } }, - "hyprwayland-scanner_3": { - "inputs": { - "nixpkgs": [ - "hyprpicker", - "nixpkgs" - ], - "systems": [ - "hyprpicker", - "systems" - ] - }, - "locked": { - "lastModified": 1735493474, - "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, "isd": { "inputs": { "nix-appimage": "nix-appimage", @@ -866,7 +793,7 @@ "pyproject-build-systems": "pyproject-build-systems", "pyproject-nix": "pyproject-nix", "systemd-nix": "systemd-nix", - "systems": "systems_5", + "systems": "systems_4", "uv2nix": "uv2nix" }, "locked": { @@ -1222,7 +1149,6 @@ "home-manager": "home-manager", "hypridle": "hypridle", "hyprlock": "hyprlock", - "hyprpicker": "hyprpicker", "isd": "isd", "kmonad": "kmonad", "musnix": "musnix", @@ -1378,7 +1304,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_8", + "systems": "systems_7", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-tmux": "tinted-tmux", @@ -1434,21 +1360,6 @@ "type": "github" } }, - "systems_10": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "systems_2": { "locked": { "lastModified": 1689347949, @@ -1465,21 +1376,6 @@ } }, "systems_3": { - "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_4": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1494,7 +1390,7 @@ "type": "github" } }, - "systems_5": { + "systems_4": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -1509,6 +1405,21 @@ "type": "github" } }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_6": { "locked": { "lastModified": 1681028828, diff --git a/flake.nix b/flake.nix index 23cdc7c..1b603d0 100644 --- a/flake.nix +++ b/flake.nix @@ -38,11 +38,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - hyprpicker = { - url = "github:hyprwm/hyprpicker"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - hyprlock = { url = "github:hyprwm/hyprlock"; inputs.nixpkgs.follows = "nixpkgs"; @@ -117,7 +112,8 @@ name: import ./modules/system/${name}.nix ); - homeModules = genAttrs (map nameOf (listFilesRecursive ./modules/home)) (name: import ./modules/home/${name}.nix); + homeModules = genAttrs (map nameOf (listFilesRecursive ./modules/home)) ( + name: import ./modules/home/${name}.nix); overlays = genAttrs (map nameOf (listFilesRecursive ./overlays)) ( name: import ./overlays/${name}.nix diff --git a/homes/emenel/default.nix b/homes/emenel/default.nix index 78bbbf1..413885a 100644 --- a/homes/emenel/default.nix +++ b/homes/emenel/default.nix @@ -11,6 +11,7 @@ imports = with nix-config.homeModules; [ mako mpv + yazi ]; home = { @@ -21,8 +22,6 @@ inputs.affinity-nix.packages.x86_64-linux.designer inputs.shikane.packages.x86_64-linux.default inputs.isd.packages.x86_64-linux.default - inputs.hyprpicker.packages.x86_64-linux.default - inputs.hyprlock.packages.x86_64-linux.default ] (with nix-config.packages.x86_64-linux; [ @@ -525,7 +524,7 @@ wezterm = { enable = true; package = inputs.wezterm.packages.${pkgs.system}.default; - extraConfig = lib.readFile ./dotfiles/dot_config/wezterm/wezterm.lua; + # extraConfig = lib.readFile ./dotfiles/dot_config/wezterm/wezterm.lua; }; bat = { enable = true; @@ -724,7 +723,7 @@ xdg.configFile."starship.toml".source = ./dotfiles/dot_config/starship.toml; xdg.configFile."niri/config.kdl".source = ./dotfiles/dot_config/niri/config.kdl; - xdg.configFile."wezterm/launcher.lua".source = ./dotfiles/dot_config/wezterm/launcher.lua; + xdg.configFile."wezterm".source = ./dotfiles/dot_config/wezterm; xdg.configFile."just/justfile".source = ./dotfiles/dot_config/just/justfile; xdg.configFile."git".source = ./dotfiles/dot_config/git; xdg.configFile."rbw".source = ./dotfiles/dot_config/rbw; diff --git a/homes/emenel/dotfiles/dot_config/wezterm/wezterm.lua b/homes/emenel/dotfiles/dot_config/wezterm/wezterm.lua index 40826fc..41f5ba3 100644 --- a/homes/emenel/dotfiles/dot_config/wezterm/wezterm.lua +++ b/homes/emenel/dotfiles/dot_config/wezterm/wezterm.lua @@ -176,19 +176,19 @@ tabline.setup({ b = { bg = "#222222", fg = "#eeeeee" } } }, - section_separators = { - left = wezterm.nerdfonts.ple_right_half_circle_thick, - right = wezterm.nerdfonts.ple_left_half_circle_thick, - }, - component_separators = { - left = wezterm.nerdfonts.ple_right_half_circle_thin, - right = wezterm.nerdfonts.ple_left_half_circle_thin, - }, - tab_separators = { - left = wezterm.nerdfonts.ple_right_half_circle_thick, - right = wezterm.nerdfonts.ple_left_half_circle_thick, - }, - icons_enabled = true, + -- section_separators = { + -- left = wezterm.nerdfonts.ple_right_half_circle_thick, + -- right = wezterm.nerdfonts.ple_left_half_circle_thick, + -- }, + -- component_separators = { + -- left = wezterm.nerdfonts.ple_right_half_circle_thin, + -- right = wezterm.nerdfonts.ple_left_half_circle_thin, + -- }, + -- tab_separators = { + -- left = wezterm.nerdfonts.ple_right_half_circle_thick, + -- right = wezterm.nerdfonts.ple_left_half_circle_thick, + -- }, + -- icons_enabled = true, tabs_enabled = true, }, sections = { diff --git a/modules/home/yazi/default.nix b/modules/home/yazi.nix similarity index 85% rename from modules/home/yazi/default.nix rename to modules/home/yazi.nix index 360b810..a857e3f 100644 --- a/modules/home/yazi/default.nix +++ b/modules/home/yazi.nix @@ -1,10 +1,10 @@ { inputs, ... }: { - yazi = { + programs.yazi = { enable = true; enableFishIntegration = true; package = inputs.yazi.packages.x86_64-linux.default; - initLua = ./init.lua; + initLua = ../../homes/emenel/dotfiles/dot_config/yazi/init.lua; keymap = { input.prepend_keymap = [ { on = ""; run = "shell 'ripdrag \"$@\" -x 2>/dev/null &' --confirm"; } diff --git a/modules/home/yazi/init.lua b/modules/home/yazi/init.lua deleted file mode 100644 index 5828a5e..0000000 --- a/modules/home/yazi/init.lua +++ /dev/null @@ -1,23 +0,0 @@ --- adds user and group of hovered file/dir to status bar -Status:children_add(function(self) - local h = self._current.hovered - if h and h.link_to then - return " -> " .. tostring(h.link_to) - else - return "" - end -end, 3300, Status.LEFT) - -Status:children_add(function() - local h = cx.active.current.hovered - if h == nil or ya.target_family() ~= "unix" then - return "" - end - - return ui.Line { - ui.Span(ya.user_name(h.cha.uid) or tostring(h.cha.uid)):fg("magenta"), - ":", - ui.Span(ya.group_name(h.cha.gid) or tostring(h.cha.gid)):fg("magenta"), - " ", - } -end, 500, Status.RIGHT)