From e01bfc514603e5ee28c96115b95015417a9d943a Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Fri, 13 Jun 2025 23:52:26 -0400 Subject: [PATCH] upower, yazi, and more --- flake.lock | 12 ++++---- hosts/eddie/configuration.nix | 4 +++ modules/home/waybar.nix | 1 - modules/home/yazi.nix | 54 +++++++++++++++++------------------ 4 files changed, 36 insertions(+), 35 deletions(-) diff --git a/flake.lock b/flake.lock index 2716f27..bf692ff 100644 --- a/flake.lock +++ b/flake.lock @@ -90,11 +90,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1749834408, - "narHash": "sha256-pJRH+MqfUZD/o8X/LvSrvalJksmeVhW2A5zfg0zzWfQ=", + "lastModified": 1749866857, + "narHash": "sha256-q85CNPVtaOwBUhyvaUKdDrUte0kaFd5NSB2VGkEUn00=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "e19ac914a186163a00640b5f9c7e1c776fe029c7", + "rev": "358d35f9c2725d54448e95e53426f793b0316448", "type": "github" }, "original": { @@ -1797,11 +1797,11 @@ ] }, "locked": { - "lastModified": 1749824378, - "narHash": "sha256-nIo7+VnvMgzgY+Jc7TEQV6hfbI3YcBc4vhNqsfvevl0=", + "lastModified": 1749849546, + "narHash": "sha256-iB3Xff4rJ6eoCZ/iranuW08EU7PQul1Ww3Mf0pZKBdo=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "8ecc9960f00fd30e35e6caec7c22461058bdee73", + "rev": "48f6dc52b5f85f6a48a734a8347be9f41cbdc171", "type": "github" }, "original": { diff --git a/hosts/eddie/configuration.nix b/hosts/eddie/configuration.nix index dc0d802..49b36bb 100644 --- a/hosts/eddie/configuration.nix +++ b/hosts/eddie/configuration.nix @@ -397,6 +397,10 @@ enable = true; }; + services.upower = { + enable = true; + }; + services.power-profiles-daemon = { enable = true; package = pkgs.power-profiles-daemon; diff --git a/modules/home/waybar.nix b/modules/home/waybar.nix index a22445f..4d1d9c0 100644 --- a/modules/home/waybar.nix +++ b/modules/home/waybar.nix @@ -29,7 +29,6 @@ in { "network" "wireplumber" "bluetooth" - "battery" "power-profiles-daemon" "upower" "idle_inhibitor" diff --git a/modules/home/yazi.nix b/modules/home/yazi.nix index b7324a4..2aab1b7 100644 --- a/modules/home/yazi.nix +++ b/modules/home/yazi.nix @@ -112,37 +112,35 @@ { on = "z"; run = "plugin zoxide"; } { on = "Z"; run = "plugin fzf"; } - # { on = "."; run = [ "hidden toggle" "plugin pref-by-location -- save" ]; desc = "Toggle the visibility of hidden files";} + { on = "."; run = [ "hidden toggle" "plugin pref-by-location -- save" ]; desc = "Toggle the visibility of hidden files";} - # # Linemod - # { on = [ "m" "s" ]; run = [ "linemode size" "plugin pref-by-location -- save" ]; desc = "Linemode: size"; } - # { on = [ "m" "p" ]; run = [ "linemode permissions" "plugin pref-by-location -- save" ]; desc = "Linemode: permissions"; } - # { on = [ "m" "b" ]; run = [ "linemode btime" "plugin pref-by-location -- save" ]; desc = "Linemode: btime"; } - # { on = [ "m" "m" ]; run = [ "linemode mtime" "plugin pref-by-location -- save" ]; desc = "Linemode: mtime"; } - # { on = [ "m" "o" ]; run = [ "linemode owner" "plugin pref-by-location -- save" ]; desc = "Linemode: owner"; } - # { on = [ "m" "n" ]; run = [ "linemode none" "plugin pref-by-location -- save" ]; desc = "Linemode: none"; } + { on = [ "m" "d" ]; run = [ "linemode time_and_size" "plugin pref-by-location -- save" ]; desc = "Linemode: time & size (default)"; } + { on = [ "m" "s" ]; run = [ "linemode size" "plugin pref-by-location -- save" ]; desc = "Linemode: size"; } + { on = [ "m" "p" ]; run = [ "linemode permissions" "plugin pref-by-location -- save" ]; desc = "Linemode: permissions"; } + { on = [ "m" "b" ]; run = [ "linemode btime" "plugin pref-by-location -- save" ]; desc = "Linemode: btime"; } + { on = [ "m" "m" ]; run = [ "linemode mtime" "plugin pref-by-location -- save" ]; desc = "Linemode: mtime"; } + { on = [ "m" "o" ]; run = [ "linemode owner" "plugin pref-by-location -- save" ]; desc = "Linemode: owner"; } + { on = [ "m" "n" ]; run = [ "linemode none" "plugin pref-by-location -- save" ]; desc = "Linemode: none"; } - # # Any changes during disabled state won't be saved to save file - # { on = [ "," "t" ]; run = "plugin pref-by-location -- toggle"; desc = "Tol auto-save preferences"; } - # { on = [ "," "d" ]; run = "plugin pref-by-location -- disable"; desc = "Dibe auto-save preferences"; } + { on = [ "," "t" ]; run = "plugin pref-by-location -- toggle"; desc = "Toggle auto-save preferences"; } + { on = [ "," "d" ]; run = "plugin pref-by-location -- disable"; desc = "Disable auto-save preferences"; } - # # This will reset any preference changes for the current working directory (CWD) - # # then fall back to the predefined preferences in init.lua or yazi.toml - # { on = [ "," "R" ]; run = [ "plugin pref-by-location -- reset" ]; desc = "Retpreference of cwd"; } - # { on = [ "," "m" ]; run = [ "sort mtime --reverse=no" "linemode mtime" "plugin pref-by-location -- save" ]; desc = "So y modified time"; } - # { on = [ "," "M" ]; run = [ "sort mtime --reverse" "linemode mtime" "plugin pref-by-location -- save" ]; desc = "So y modified time (reverse)"; } - # { on = [ "," "b" ]; run = [ "sort btime --reverse=no" "linemode btime" "plugin pref-by-location -- save" ]; desc = "So y birth time"; } - # { on = [ "," "B" ]; run = [ "sort btime --reverse" "linemode btime" "plugin pref-by-location -- save" ]; desc = "So y birth time (reverse)"; } - # { on = [ "," "e" ]; run = [ "sort extension --reverse=no" "plugin pref-by-location -- save" ]; desc = "So y extension"; } - # { on = [ "," "E" ]; run = [ "sort extension --reverse" "plugin pref-by-location -- save" ]; desc = "So y extension (reverse)"; } - # { on = [ "," "a" ]; run = [ "sort alphabetical --reverse=no" "plugin pref-by-location -- save" ]; desc = "So lphabetically"; } - # { on = [ "," "A" ]; run = [ "sort alphabetical --reverse" "plugin pref-by-location -- save" ]; desc = "So lphabetically (reverse)"; } - # { on = [ "," "n" ]; run = [ "sort natural --reverse=no" "plugin pref-by-location -- save" ]; desc = "So aturally"; } - # { on = [ "," "N" ]; run = [ "sort natural --reverse" "plugin pref-by-location -- save" ]; desc = "So aturally (reverse)"; } - # { on = [ "," "s" ]; run = [ "sort size --reverse=no" "linemode size" "plugin pref-by-location -- save" ]; desc = "So y size"; } - # { on = [ "," "S" ]; run = [ "sort size --reverse" "linemode size" "plugin pref-by-location -- save" ]; desc = "So y size (reverse)"; } - - # { on = [ "," "r" ]; run = [ "sort random --reverse=no" "plugin pref-by-location -- save" ]; desc = "So andomly"; } + # This will reset any preference changes for the current working directory (CWD) + # then fall back to the predefined preferences in init.lua or yazi.toml + { on = [ "," "R" ]; run = [ "plugin pref-by-location -- reset" ]; desc = "Retpreference of cwd"; } + { on = [ "," "m" ]; run = [ "sort mtime --reverse=no" "linemode mtime" "plugin pref-by-location -- save" ]; desc = "Sort by modified time"; } + { on = [ "," "M" ]; run = [ "sort mtime --reverse" "linemode mtime" "plugin pref-by-location -- save" ]; desc = "Sort by modified time (reverse)"; } + { on = [ "," "b" ]; run = [ "sort btime --reverse=no" "linemode btime" "plugin pref-by-location -- save" ]; desc = "Sort by birth time"; } + { on = [ "," "B" ]; run = [ "sort btime --reverse" "linemode btime" "plugin pref-by-location -- save" ]; desc = "Sort by birth time (reverse)"; } + { on = [ "," "e" ]; run = [ "sort extension --reverse=no" "plugin pref-by-location -- save" ]; desc = "Sort by extension"; } + { on = [ "," "E" ]; run = [ "sort extension --reverse" "plugin pref-by-location -- save" ]; desc = "Sort by extension (reverse)"; } + { on = [ "," "a" ]; run = [ "sort alphabetical --reverse=no" "plugin pref-by-location -- save" ]; desc = "Sort alphabetically"; } + { on = [ "," "A" ]; run = [ "sort alphabetical --reverse" "plugin pref-by-location -- save" ]; desc = "Sort alphabetically (reverse)"; } + { on = [ "," "n" ]; run = [ "sort natural --reverse=no" "plugin pref-by-location -- save" ]; desc = "Sort naturally"; } + { on = [ "," "N" ]; run = [ "sort natural --reverse" "plugin pref-by-location -- save" ]; desc = "Sort naturally (reverse)"; } + { on = [ "," "s" ]; run = [ "sort size --reverse=no" "linemode size" "plugin pref-by-location -- save" ]; desc = "Sort by size"; } + { on = [ "," "S" ]; run = [ "sort reverse" "linemode size" "plugin pref-by-location -- save" ]; desc = "Sort by size (reverse)"; } + { on = [ "," "r" ]; run = [ "sort random --reverse=no" "plugin pref-by-location -- save" ]; desc = "Sort randomly"; } ]; };