From 0192c8ed42811e904036a33525b022cd43c5969b Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Mon, 21 Apr 2025 11:23:12 -0400 Subject: [PATCH] many updates --- flake.lock | 42 +++++++++++++++++----------------- homes/emenel/default.nix | 5 ++-- modules/home/beets/config.yaml | 8 ++++--- modules/home/desktop.nix | 36 +++++++++++++++-------------- modules/home/niri.nix | 2 ++ 5 files changed, 49 insertions(+), 44 deletions(-) diff --git a/flake.lock b/flake.lock index 5410081..0f1b0c1 100644 --- a/flake.lock +++ b/flake.lock @@ -30,11 +30,11 @@ ] }, "locked": { - "lastModified": 1744940522, - "narHash": "sha256-TNoetfICvd29DhxRPpmyKItQBDlqSvKcV+wGNkn14jk=", + "lastModified": 1745224732, + "narHash": "sha256-0OWgbEKhpMLpk3WQi3ugOwxWW4Y6JVpKiQ+o0nuNzus=", "owner": "nix-community", "repo": "disko", - "rev": "51d33bbb7f1e74ba5f9d9a77357735149da99081", + "rev": "1770bf1ae5da05564f86b969ef21c7228cc1a70b", "type": "github" }, "original": { @@ -90,11 +90,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1745025586, - "narHash": "sha256-K7fHVouOe/1tYSQrpuy97zhwA2Wvc00w9hly3VqBRlQ=", + "lastModified": 1745227425, + "narHash": "sha256-T7GsvCoFDjzGYsn0ekjClRClYirZih1O1VvNRkME5eI=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "112e4f326dbd814cbd78a7997ee6cdb24420eed1", + "rev": "1b9c9238adead881769a70346f9f17207dbcea13", "type": "github" }, "original": { @@ -362,11 +362,11 @@ ] }, "locked": { - "lastModified": 1744919155, - "narHash": "sha256-IJksPW32V9gid9vDxoloJMRk+YGjxq5drFHBFeBkKU8=", + "lastModified": 1745205007, + "narHash": "sha256-k67bEcLkSo13TIBfs0CGYkJjG12aaikabMtxWbSeqr0=", "owner": "nix-community", "repo": "home-manager", - "rev": "72526a5f7cde2ef9075637802a1e2a8d2d658f70", + "rev": "3fbe9a2b76ff5c4dcb2a2a2027dac31cfc993c8c", "type": "github" }, "original": { @@ -1048,11 +1048,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1744463964, - "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", + "lastModified": 1744932701, + "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", + "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", "type": "github" }, "original": { @@ -1207,11 +1207,11 @@ ] }, "locked": { - "lastModified": 1737080704, - "narHash": "sha256-n+J2h9GM9ZpFOQUmtZoCr1+DFF/iO5UlmLJeHIxbZGY=", + "lastModified": 1745116541, + "narHash": "sha256-5xzA6dTfqCfTTDCo3ipPZzrg3wp01xmcr73y4cTNMP8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "f9953fe89f8b65401fc4d4a288940bc2cb072949", + "rev": "e2142ef330a61c02f274ac9a9cb6f8487a5d0080", "type": "github" }, "original": { @@ -1456,11 +1456,11 @@ }, "locked": { "dir": "nix", - "lastModified": 1744993922, - "narHash": "sha256-x83fDHZYG3rt9EqS0b80Y2d2joJJkTsYjZkTvI4lUh0=", + "lastModified": 1745073452, + "narHash": "sha256-VXHkFw9lvywxmubg4M56IY9pV7WlBC3A9fD0y7OOkbc=", "owner": "wez", "repo": "wezterm", - "rev": "3463d5d81b96b2c20017c4098ea9aa352407d80e", + "rev": "3bfe6df191af37bc33fe5fe6de12a40f7067f101", "type": "github" }, "original": { @@ -1534,11 +1534,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1744997500, - "narHash": "sha256-RFt9jUjfTWfyymBFGxeUIWVMiZ6+onEx2xCpIV30JDI=", + "lastModified": 1745240671, + "narHash": "sha256-6r2Qmk7XsZtfPEod9Jh07Wp85bkm10yZi+LqO+GMGR8=", "owner": "sxyazi", "repo": "yazi", - "rev": "ce23dcd81bc42833ec7726228efcf92be02c2349", + "rev": "7169e19ff01458b25dc6d0a0489bcac3b6c02904", "type": "github" }, "original": { diff --git a/homes/emenel/default.nix b/homes/emenel/default.nix index 14d2fff..c0af3ea 100644 --- a/homes/emenel/default.nix +++ b/homes/emenel/default.nix @@ -9,7 +9,8 @@ desktop music langs - # mpd + mpd + beets emacs ]; @@ -21,8 +22,6 @@ designer ]) - # [ nix-config.packages.x86_64-linux.tasklite ] - (with pkgs; [ dconf cifs-utils diff --git a/modules/home/beets/config.yaml b/modules/home/beets/config.yaml index 363301f..4ed09d4 100644 --- a/modules/home/beets/config.yaml +++ b/modules/home/beets/config.yaml @@ -14,7 +14,7 @@ import: none_rec_action: asis duplicate_action: merge default_action: asis -plugins: fish discogs the duplicates embedart fetchart mbsync missing unimported inline lastgenre albumtypes ftintitle plexupdate +plugins: fish discogs the duplicates embedart fetchart mbsync missing unimported inline lastgenre albumtypes ftintitle plexupdate importadded edit info match: ignored_media: ['Data CD', 'DVD', 'DVD-Video', 'Blu-ray', 'HD-DVD', 'VCD', 'SVCD', 'UMD', 'VHS'] @@ -61,13 +61,15 @@ lastgenre: fallback: 'Unclassified' whitelist: yes plex: - host: "localhost" + host: "media-server" port: 32400 token: "DpUEsDtn43fiMEyzsTZ3" paths: default: %the{$albumartist}%ifdef{artistdisambig,(${artistdisambig})}/$album%aunique{}/%if{$multidisc,$disc-}$track - $title comp: Various Artists/$album%aunique{}/$album%aunique{}/%if{$multidisc,$disc-}$track - $title - +importadded: + preserve_mtimes: yes + preserve_write_mtimes: yes ui: color: yes diff --git a/modules/home/desktop.nix b/modules/home/desktop.nix index 041b4eb..319a3b1 100644 --- a/modules/home/desktop.nix +++ b/modules/home/desktop.nix @@ -28,7 +28,7 @@ rpi-imager freecad flatpak - # gst_all_1.gstreamer + gst_all_1.gstreamer prusa-slicer via vial @@ -43,8 +43,11 @@ wl-mirror soundconverter wmctrl - godot_4 - gdtoolkit_4 + + # godot_4 + # gdtoolkit_4 + + # epsonscan2 # sane-airscan # xsane @@ -84,17 +87,17 @@ blender davinci-resolve-studio - # steam processing zotero fractal handbrake + gmic krita + krita-plugin-gmic rawtherapee inkscape gimp - # epsonscan2 - kicad + # kicad turbocase openscad-unstable openscad-lsp @@ -112,7 +115,6 @@ fstl librewolf - # vivaldi wl-color-picker @@ -173,16 +175,16 @@ }; }; - qt = { - enable = true; - platformTheme = { - name = "gtk"; - }; - style = { - package = pkgs.adwaita-qt; - name = "adwaita-dark"; - }; - }; + # qt = { + # enable = true; + # platformTheme = { + # name = "gtk"; + # }; + # style = { + # package = pkgs.adwaita-qt; + # name = "adwaita-dark"; + # }; + # }; dconf.settings = { "org/gnome/desktop/interface" = { diff --git a/modules/home/niri.nix b/modules/home/niri.nix index ae7a49b..881fbad 100644 --- a/modules/home/niri.nix +++ b/modules/home/niri.nix @@ -178,6 +178,8 @@ in { app-id = "Open File$"; } { app-id = "Save File$"; } { app-id = "Open Folder$"; } + { app-id = "Configure Krita"; } + { app-id = "Create new document — Krita"; } ]; open-floating = true; }