diff --git a/flake.lock b/flake.lock index 97cf9fa..e02ff09 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1747742835, - "narHash": "sha256-kYL4GCwwznsypvsnA20oyvW8zB/Dvn6K5G/tgMjVMT4=", + "lastModified": 1748225455, + "narHash": "sha256-AzlJCKaM4wbEyEpV3I/PUq5mHnib2ryEy32c+qfj6xk=", "owner": "nix-community", "repo": "disko", - "rev": "df522e787fdffc4f32ed3e1fca9ed0968a384d62", + "rev": "a894f2811e1ee8d10c50560551e50d6ab3c392ba", "type": "github" }, "original": { @@ -88,11 +88,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1748163896, - "narHash": "sha256-IaLOUPFlgFLnj9BjaP1HqZ3EmX4O7jzR/Q9zxK9Yrl4=", + "lastModified": 1748276551, + "narHash": "sha256-UOIx190CqTMre9Ned9ClAHI00jBSXzGUJMNkPFpygQo=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "566f386a7e716cbde6b60c2cbf5e938655f29911", + "rev": "dbaa3636560e69e430edc5a340b37c69f8de7d28", "type": "github" }, "original": { @@ -376,11 +376,11 @@ ] }, "locked": { - "lastModified": 1748182899, - "narHash": "sha256-r6MHSalDFydlUmjorVTSsyhLjIt8VWNtGc5+mffXvFQ=", + "lastModified": 1748227609, + "narHash": "sha256-SaSdslyo6UGDpPUlmrPA4dWOEuxCy2ihRN9K6BnqYsA=", "owner": "nix-community", "repo": "home-manager", - "rev": "901f8fef7f349cf8a8e97b3230b22fd592df9160", + "rev": "d23d20f55d49d8818ac1f1b2783671e8a6725022", "type": "github" }, "original": { @@ -1638,11 +1638,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1747819961, - "narHash": "sha256-ZlXhPOAz/j3cte0K7uIr6+Qs/+4Y4c8N+d5W21E2eVY=", + "lastModified": 1748249183, + "narHash": "sha256-I+JvW3752iZq4QrTOUDvhVA++0LHq974XxHjQrjA6lM=", "owner": "sxyazi", "repo": "yazi", - "rev": "622ba09a803b4a38983339b027d420238affa3d6", + "rev": "74a8ea9bc0289f093c34b15755c05fa25a1c5ace", "type": "github" }, "original": { @@ -1659,11 +1659,11 @@ ] }, "locked": { - "lastModified": 1748143192, - "narHash": "sha256-KvP468pbSw0c6fXQmd4Q2tp/ywxvxrz5ijRT3odniaw=", + "lastModified": 1748229380, + "narHash": "sha256-ulYljT6A8/v9QsMWnTsDYxa1/bG/22Ufy+KfrN4jA74=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "04d982716fb6c1fc64e0de6e55103b15c892ceda", + "rev": "14207b0fc7caba6b6a9c7a9aecf7f901435daa93", "type": "github" }, "original": { diff --git a/homes/emenel/default.nix b/homes/emenel/default.nix index daf9b13..41000c2 100644 --- a/homes/emenel/default.nix +++ b/homes/emenel/default.nix @@ -31,6 +31,8 @@ in sops (btop.override { cudaSupport = true; rocmSupport = true; }) ispell + wordnet + artha (aspellWithDicts (dicts: with dicts; [ en en-computers en-science es fr ])) texlive.combined.scheme-full openrgb-with-all-plugins diff --git a/hosts/eddie/configuration.nix b/hosts/eddie/configuration.nix index 11bb27c..603847d 100644 --- a/hosts/eddie/configuration.nix +++ b/hosts/eddie/configuration.nix @@ -282,6 +282,16 @@ }; }; + services.dictd = { + enable = true; + DBs = with pkgs.dictdDBs; [ + wordnet + fra2eng + eng2fra + wiktionary + ]; + }; + services.fstrim.enable = true; services.udisks2.enable = true; services.rpcbind.enable = true; # needed for NFS diff --git a/modules/home/desktop.nix b/modules/home/desktop.nix index 7185880..70b5b28 100644 --- a/modules/home/desktop.nix +++ b/modules/home/desktop.nix @@ -143,6 +143,7 @@ gnome-online-accounts-gtk gnome-calculator gnome-calendar + evolution wordbook protonup @@ -197,6 +198,7 @@ "org/gnome/desktop/interface" = { color-scheme = "prefer-dark"; gtk-theme = lib.mkForce "Colloid-Grey-Dark-Nord"; + clock-format = "12h"; }; }; @@ -229,6 +231,25 @@ xdg.configFile."wpaperd/config.toml".source = ../../homes/emenel/dotfiles/dot_config/wpaperd/config.toml; home.file.".local/wallpapers".source = ../../assets/wallpapers; + xdg.mime = { + enable = true; + }; + + xdg.mimeApps = { + enable = true; + defaultApplications = { + "application/pdf" = [ "zen-twilight.desktop" ]; + }; + associations = { + added = { + "application/pdf" = [ "zen-twilight.desktop" ]; + }; + removed = { + "application/pdf" = [ "chromium-browser.desktop" ]; + }; + }; + }; + xdg.desktopEntries = { rmpc = { name = "rmpc (music player)"; diff --git a/modules/home/niri.nix b/modules/home/niri.nix index b02cb66..1ceb353 100644 --- a/modules/home/niri.nix +++ b/modules/home/niri.nix @@ -187,7 +187,7 @@ in { app-id = "Create new document — Krita"; } { app-id = "polkit-kde-authentication-agent-1"; } { app-id = "Zoom Workdplace"; title = ".*menu.*"; } - { app-id = "r#\"librewolf$\"# title=\"^Picture-in-Picture$\""; } + { app-id = "org.gnome.Evolution"; title = "Appointment$"; } ]; open-floating = true; } diff --git a/modules/home/yazi.nix b/modules/home/yazi.nix index d652619..dd17dd4 100644 --- a/modules/home/yazi.nix +++ b/modules/home/yazi.nix @@ -82,7 +82,7 @@ settings = { manager = { sort_dir_first = false; - linemode = "mtime"; + linemode = "time_and_size"; show_symlink = true; }; opener = { diff --git a/modules/home/yazi/init.lua b/modules/home/yazi/init.lua index 2e339cc..14d035c 100644 --- a/modules/home/yazi/init.lua +++ b/modules/home/yazi/init.lua @@ -10,7 +10,7 @@ require("dir-rules"):setup() require("restore"):setup({ position = { "center", w = 70, h = 40 }, show_confirm = true, -}) + }) Status:children_add(function() local h = cx.active.current.hovered @@ -18,28 +18,28 @@ Status:children_add(function() 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 + 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 + 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")) + 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")) + table.insert(elements, ui.Span("M:"):fg("cyan")) + table.insert(elements, ui.Span(mtime_formatted.. " "):fg("blue")) end return ui.Line(elements) @@ -67,3 +67,28 @@ Status:children_add(function(self) return "" end end, 3300, Status.LEFT) + + +function Linemode:time_and_size() + local time = math.floor(self._file.cha.mtime or 0) + if time == 0 then + time = "" + elseif os.date("%Y", time) == os.date("%Y") then + time = os.date("%b %d %H:%M", time) + else + time = os.date("%b %d %Y", time) + end + + local size_str + local size = self._file:size() + if size then + size_str = ya.readable_size(size) + else + -- file count for dirs + local folder = cx.active:history(self._file.url) + size_str = folder and tostring(#folder.files) or "-" + end + local size_formatted = string.format("%6s", size_str) + + return string.format("%s %s", time, size_formatted) +end diff --git a/modules/system/kanata.nix b/modules/system/kanata.nix index 8253e18..df6183a 100644 --- a/modules/system/kanata.nix +++ b/modules/system/kanata.nix @@ -47,6 +47,57 @@ in enable = true; keyboards = { + raise = { + devices = [ "/dev/input/by-id/usb-DYGMA_RAISE2_012310010BFAE7C9-if02-event-kbd" ]; + extraDefCfg = '' +process-unmapped-keys yes +concurrent-tap-hold yes +allow-hardware-repeat false +''; + + config = '' +(defsrc + esc 1 2 3 4 5 6 7 8 9 0 - = bspc + tab q w e r t y u i o p [ ] \ + caps a s d f g h j k l ; ' ret + + lsft z x c v b n m , . / rsft + lctl lmet lalt f23 spc f24 ralt rmet menu rctrl + f19 f20 f21 f22) + +${k-vars} + +${shared-alias} + +(defalias + controls (layer-while-held media-controls)) + +(deflayer qwerty + grv 1 2 3 4 5 6 7 8 9 0 - = bspc + tab q w e r t y u i o p [ ] \ + @supesc @a @s @d f g h j k l ; ' ret + @sp-lsft z x c v b n m , . / @sp-rsft + lmet @controls lalt lctrl @spcnav rctrl ralt rmet menu @controls + ret del bspc ret) + +(deflayer navigation + grv f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 bspc + tab q w e r t home pgdn pgup end p [ ] \ + caps @a @s @d f g left down up right ; ' ret + @sp-lsft z x c v b n m , . / up + _ _ _ _ @spcnav _ _ left down right + _ _ _ _) + +(deflayer media-controls + grv VolumeMute VolumeDown VolumeUp f4 MediaTrackPrevious MediaPlayPause MediaTrackNext f8 f9 f10 f11 f12 bspc + tab q w e r t home pgdn pgup end p [ ] \ + caps @a @s @d f g MediaTrackPrevious VolumeDown VolumeUp MediaTrackNext MediaPlayPause ' ret + @sp-lsft z x c v b n m , . / up + lmet lmet lalt lctrl @spcnav _ _ left down right + _ _ _ _) + +''; + }; sinc = { devices = [ "/dev/input/by-id/usb-Keebio_Sinc_Rev._4-event-kbd" "/dev/input/by-id/usb-Keebio_Sinc_Rev._4-event-if02" @@ -92,8 +143,8 @@ ${shared-alias} (deflayer media-controls esc VolumeMute VolumeDown VolumeUp f4 MediaTrackPrevious MediaPlayPause MediaTrackNext f8 f9 f10 f11 f12 prtsc grv 1 2 3 4 5 6 7 8 9 0 - = \ del home - tab q w e r t y u i o MediaPlayPause [ ] bspc end - @supesc _ _ _ f g MediaTrackPrevious VolumeDown VolumeUp MediaTrackNext ; ' ret pgup + tab q w e r t y u i o p [ ] bspc end + @supesc _ _ _ f g MediaTrackPrevious VolumeDown VolumeUp MediaTrackNext MediaPlayPause ' ret pgup @sp-lsft z x c v b n VolumeMute , . / @sp-rsft pgup _ lmet lmet lalt lctrl _ rctrl ralt rmet home pgdn end) '';