From 849d8ad8d0b3a1ad0e5502c52f5dab5038f7ee6a Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Wed, 21 May 2025 15:51:19 -0400 Subject: [PATCH] removed gnome --- flake.lock | 18 +++---- hosts/eddie/configuration.nix | 12 ++++- modules/home/yazi.nix | 92 ++++++++--------------------------- modules/home/yazi/init.lua | 33 +++++++++++++ 4 files changed, 73 insertions(+), 82 deletions(-) diff --git a/flake.lock b/flake.lock index 7e3d403..9fbb9eb 100644 --- a/flake.lock +++ b/flake.lock @@ -785,11 +785,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1747842926, - "narHash": "sha256-1DUbdZgI1uLNF8L7cw5QC50npHmC0v0hdVkjK2ezj00=", + "lastModified": 1747849848, + "narHash": "sha256-xudin/slzGV56pD/1Kmy9DaiFUJHu9+ZZHqGXPIcnbo=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "dda83db99c3c6ca2c047183db19533ab6a34ce15", + "rev": "bbb4d213c9f7f57f6886d6f39485657aefbf4ae8", "type": "github" }, "original": { @@ -818,11 +818,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1747837522, - "narHash": "sha256-6zDhnqL7PTK+w/58ZdLZ3+M8fl/zRbvILAIboC/nMMU=", + "lastModified": 1747846213, + "narHash": "sha256-uepcnOQyj7VgiEAgr+Q8uDdpoLSuiSD4MQ5L8zyjJfg=", "owner": "YaLTeR", "repo": "niri", - "rev": "2415346caaa4121ed202b8e376fb40b2a44eb61f", + "rev": "71251a700308fbdb719e697b633f5a0483cd3f12", "type": "github" }, "original": { @@ -1659,11 +1659,11 @@ ] }, "locked": { - "lastModified": 1747826223, - "narHash": "sha256-6UmRXJYEA5EBwTBBVoo5eomW9vPRdddeNMqzAIlrwQ0=", + "lastModified": 1747852083, + "narHash": "sha256-AitWK0alpojxNu3pFiLDbT5DVQWZXV3i8BlWkfQPET0=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "76a162a24feb27ee242f1d1df72f71970abb52af", + "rev": "8a9ca8f89923eeda6c1a9ce164a1c0eb6f712420", "type": "github" }, "original": { diff --git a/hosts/eddie/configuration.nix b/hosts/eddie/configuration.nix index ee905aa..df813a1 100644 --- a/hosts/eddie/configuration.nix +++ b/hosts/eddie/configuration.nix @@ -149,6 +149,12 @@ openrazer-daemon openrgb-with-all-plugins xdg-desktop-portal-termfilechooser + + adwaita-icon-theme + adwaita-fonts + gnome-themes-extra + gnomeExtensions.appindicator + gnome-settings-daemon ]; # Bootloader. @@ -302,6 +308,8 @@ pkgs.utsushi pkgs.openrgb-with-all-plugins + pkgs.gnome-settings-daemon + (pkgs.writeTextFile { name = "on-battery"; text = '' @@ -405,7 +413,8 @@ # Enable the GNOME Desktop Environment. # services.xserver.displayManager.gdm.enable = true; - services.xserver.desktopManager.gnome.enable = true; + # services.xserver.desktopManager.gnome.enable = true; + services.xserver.deviceSection = ''Option "TearFree" "true"''; # For amdgpu. services.gnome.gnome-keyring.enable = true; services.gnome.gnome-settings-daemon.enable = true; @@ -415,7 +424,6 @@ vSync = true; }; - programs.labwc.enable = true; programs.ssh.startAgent = true; programs.npm = { diff --git a/modules/home/yazi.nix b/modules/home/yazi.nix index 48ed81d..d652619 100644 --- a/modules/home/yazi.nix +++ b/modules/home/yazi.nix @@ -6,80 +6,30 @@ package = inputs.yazi.packages.x86_64-linux.default; initLua = ./yazi/init.lua; - plugins = let - officialPluginsNames = [ - "chmod" - "diff" - "git" - "mount" - "smart-paste" - "toggle-pane" - ]; + plugins = with pkgs.yaziPlugins; { + git = git; + chmod = chmod; + diff = diff; + mount = mount; + smart-paste = smart-paste; + toggle-pane = toggle-pane; + restore = restore; + lazygit = lazygit; + ouch = ouch; + rich-preview = rich-preview; + mediainfo= mediainfo; + starship = starship; - officialPluginsSrc = pkgs.fetchgit { - url = "https://github.com/yazi-rs/plugins.git"; - sparseCheckout = map (p: "${p}.yazi") officialPluginsNames; - hash = "sha256-bre666Z5qEqkt3c2wLfX5tI2+JMoeRdP4721bJeanKs="; + office = pkgs.fetchFromGitHub { + owner = "macydnah"; + repo = "office.yazi"; + rev = "HEAD"; + sha256 = "sha256-ORcexu1f7hb7G4IyzQIfGlCkH3OWlk4w5FtZrbXkR40="; }; - officialPlugins = - lib.lists.fold ( - a: b: - { - ${a} = "${officialPluginsSrc}/${a}.yazi"; - } - // b - ) - {} - officialPluginsNames; - in - officialPlugins // { - restore = pkgs.fetchFromGitHub { - owner = "boydaihungst"; - repo = "restore.yazi"; - rev = "HEAD"; - sha256 = "sha256-3Z8P25u9bffdjrPjxLRWUQn6MdBS+vyElUBkgV4EUwY="; - }; - lazygit = pkgs.fetchFromGitHub { - owner = "Lil-Dank"; - repo = "lazygit.yazi"; - rev = "HEAD"; - sha256 = "sha256-OJJPgpSaUHYz8a9opVLCds+VZsK1B6T+pSRJyVgYNy8="; - }; - ouch = pkgs.fetchFromGitHub { - owner = "ndtoan96"; - repo = "ouch.yazi"; - rev = "HEAD"; - sha256 = "sha256-7X8uAiJ8vBXYBXOgyKhVVikOnTBGrdCcXOJemjQNolI="; - }; - rich-preview = pkgs.fetchFromGitHub { - owner = "AnirudhG07"; - repo = "rich-preview.yazi"; - rev = "HEAD"; - sha256 = "sha256-dW2gAAv173MTcQdqMV32urzfrsEX6STR+oCJoRVGGpA="; - }; - mediainfo= pkgs.fetchFromGitHub { - owner = "boydaihungst"; - repo = "mediainfo.yazi"; - rev = "HEAD"; - sha256 = "sha256-U6rr3TrFTtnibrwJdJ4rN2Xco4Bt4QbwEVUTNXlWRps="; - }; - starship = pkgs.fetchFromGitHub { - owner = "Rolv-Apneseth"; - repo = "starship.yazi"; - rev = "HEAD"; - sha256 = "sha256-+CSdghcIl50z0MXmFwbJ0koIkWIksm3XxYvTAwoRlDY="; - }; - office = pkgs.fetchFromGitHub { - owner = "macydnah"; - repo = "office.yazi"; - rev = "HEAD"; - sha256 = "sha256-ORcexu1f7hb7G4IyzQIfGlCkH3OWlk4w5FtZrbXkR40="; - }; - - dir-rules = ./yazi/plugins/dir-rules.yazi; - smart-tab = ./yazi/plugins/smart-tab.yazi; - }; + dir-rules = ./yazi/plugins/dir-rules.yazi; + smart-tab = ./yazi/plugins/smart-tab.yazi; + }; keymap = { manager.prepend_keymap = [ diff --git a/modules/home/yazi/init.lua b/modules/home/yazi/init.lua index c8165cd..2e339cc 100644 --- a/modules/home/yazi/init.lua +++ b/modules/home/yazi/init.lua @@ -12,6 +12,39 @@ require("restore"):setup({ show_confirm = true, }) +Status:children_add(function() + local h = cx.active.current.hovered + local elements = {} + + local btime_formatted = nil + if h and h.cha and h.cha.btime then + local timestamp_num = tonumber(h.cha.btime) + if timestamp_num and timestamp_num > 0 then + btime_formatted = os.date("%Y-%m-%d %H:%M", math.floor(timestamp_num)) + end + end + + local mtime_formatted = nil + if h and h.cha and h.cha.mtime then + local timestamp_num = tonumber(h.cha.mtime) + if timestamp_num and timestamp_num > 0 then + mtime_formatted = os.date("%Y-%m-%d %H:%M", math.floor(timestamp_num)) + end + end + + if btime_formatted then + table.insert(elements, ui.Span("B:"):fg("cyan")) + table.insert(elements, ui.Span(btime_formatted.. " "):fg("blue")) + end + + if mtime_formatted then + table.insert(elements, ui.Span("M:"):fg("cyan")) + table.insert(elements, ui.Span(mtime_formatted.. " "):fg("blue")) + end + + return ui.Line(elements) +end, 500, Status.RIGHT) + Status:children_add(function() local h = cx.active.current.hovered if h == nil or ya.target_family() ~= "unix" then