From 8b2de21c09ee81b142a9c808df78510badee256d Mon Sep 17 00:00:00 2001 From: Icy-Thought Date: Fri, 14 Jul 2023 12:49:24 +0200 Subject: [PATCH] =?UTF-8?q?[=F0=9D=9A=B5]=20(flake):=20system-update=20<-?= =?UTF-8?q?=20fixes=20FF=20crash?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/qtile/TODO.md | 77 +++++++++++++- config/qtile/todo.md | 74 ------------- config/xmonad/xmonad.hs | 5 - flake.lock | 151 ++++++++++++--------------- modules/desktop/editors/emacs.nix | 10 +- modules/desktop/toolset/graphics.nix | 27 +++-- modules/themes/kanagawa/default.nix | 6 +- packages/rose-pine-gtk/default.nix | 3 +- 8 files changed, 167 insertions(+), 186 deletions(-) delete mode 100644 config/qtile/todo.md diff --git a/config/qtile/TODO.md b/config/qtile/TODO.md index eeb1347f..a40cf5f8 100644 --- a/config/qtile/TODO.md +++ b/config/qtile/TODO.md @@ -1,3 +1,74 @@ -1. rounded borders -2. animations -4. dunst does not work for some odd reason +# Qtile +## Status-bar (qtile-extras) +- [ ] `UPowerWidget`: better battery <- icon + bg change on low level +- [ ] `CurrentLayoutIcon`: working foreground color with `use_mask = True` +- [ ] (Maybe) `BrightnessControl`: visual + clickable control. <- use only if + layout can change. + +# XMonad-like Setup +## Toggled spawns (rofi): +- [ ] MagicFocus (view window -> main window) +- [ ] Magnify (view window => grows larger) + +### `mod+alt` spawns: +- [ ] `m` = "ungoogled-chromium --new-window https://mail.proton.me/u/0/inbox" <- floating + - Make sure it floats for both firefox and ungoogled-chromium. + +```haskell +isProtonMailTitle t = isInfixOf "@proton.me" t && isInfixOf "Proton Mail" t +``` + +## Aesthetics +- [ ] Fix statusbar icon paths + apply whitsur icon theme to qtile.. seems to + not follow theme specifications from `modules.themes`.. +- [ ] Have bar show active applications inside workspaces, like taffybar + - Or, like Chromium, show what applicatiosn are in a certain workspace on + hover + +# Functionality +- [ ] When workspace has one active window -> toggle.maximum(), otherwise -> disabled. + - Ability to cycle + switch focus on fullscreen to other application. +- [ ] Add rofi power spawn on battery widget click. +- [ ] Tray == missing lanched applications???? +- [ ] ungoogled-chromium seems to lose focus on tab kill??? + +# Keymaps +```python +EzKey(["M-A-b", lazy.spawn("rofi -show window")), TODO: swap with X window +EzKey("M-g", lazy.spawn("rofi -show window")), TODO: go to X window +``` + +Migrate to Qtile +```haskell +[ ((modm, xK_g) , myGoToWindow) +, ((modm .|. shiftMask, xK_b) , myReplaceWindow) +, ((modm .|. controlMask, xK_space) , deactivateFullOr goFullscreen) +, ((modm, xK_x), addHiddenWorkspace "NSP" >> windows (W.shift "NSP")) +, ((modalt, xK_space), deactivateFullOr restoreOrMinimizeOtherClasses) +, ((hyper, xK_g) , gatherThisClass) +, +-- Focus/layout manipulation + ((modm, xK_e) , goToNextScreenX) +, ((modm, xK_slash) , sendMessage $ Toggle MIRROR) +, ( (modm, xK_backslash) + , cycleWorkspaceOnCurrentScreen [xK_Super_L] xK_backslash xK_slash + ) +, ((modm, xK_z) , shiftToNextScreenX) +, ((modm .|. shiftMask, xK_z) , shiftToEmptyNextScreen) +, ((modm .|. shiftMask, xK_h) , shiftToEmptyAndView) +, ((hyper, xK_5), getWorkspaceDmenu >>= windows . SW.swapWithCurrent) +, +-- These ought to be rebound for boringWindows support + ((hyper, xK_e) , moveTo Next emptyWS) +, +-- Miscellaneous XMonad + ((hyper, xK_1) , toggleFadingForActiveWindow) +, ((hyper .|. shiftMask, xK_1) , toggleFadingForActiveWorkspace) +, ((hyper .|. controlMask, xK_1), toggleFadingForActiveScreen) +, ((hyper, xK_t) , selectToggle) +, ((modalt, xK_4) , selectLimit) +, ((hyper, xK_3) , addWorkspacePrompt def) +, ((modalt, xK_3) , selectWorkspace def) +, ((hyper .|. mod1Mask, xK_3) , removeWorkspace) +, ((hyper, xK_l) , selectLayout) +``` diff --git a/config/qtile/todo.md b/config/qtile/todo.md deleted file mode 100644 index a40cf5f8..00000000 --- a/config/qtile/todo.md +++ /dev/null @@ -1,74 +0,0 @@ -# Qtile -## Status-bar (qtile-extras) -- [ ] `UPowerWidget`: better battery <- icon + bg change on low level -- [ ] `CurrentLayoutIcon`: working foreground color with `use_mask = True` -- [ ] (Maybe) `BrightnessControl`: visual + clickable control. <- use only if - layout can change. - -# XMonad-like Setup -## Toggled spawns (rofi): -- [ ] MagicFocus (view window -> main window) -- [ ] Magnify (view window => grows larger) - -### `mod+alt` spawns: -- [ ] `m` = "ungoogled-chromium --new-window https://mail.proton.me/u/0/inbox" <- floating - - Make sure it floats for both firefox and ungoogled-chromium. - -```haskell -isProtonMailTitle t = isInfixOf "@proton.me" t && isInfixOf "Proton Mail" t -``` - -## Aesthetics -- [ ] Fix statusbar icon paths + apply whitsur icon theme to qtile.. seems to - not follow theme specifications from `modules.themes`.. -- [ ] Have bar show active applications inside workspaces, like taffybar - - Or, like Chromium, show what applicatiosn are in a certain workspace on - hover - -# Functionality -- [ ] When workspace has one active window -> toggle.maximum(), otherwise -> disabled. - - Ability to cycle + switch focus on fullscreen to other application. -- [ ] Add rofi power spawn on battery widget click. -- [ ] Tray == missing lanched applications???? -- [ ] ungoogled-chromium seems to lose focus on tab kill??? - -# Keymaps -```python -EzKey(["M-A-b", lazy.spawn("rofi -show window")), TODO: swap with X window -EzKey("M-g", lazy.spawn("rofi -show window")), TODO: go to X window -``` - -Migrate to Qtile -```haskell -[ ((modm, xK_g) , myGoToWindow) -, ((modm .|. shiftMask, xK_b) , myReplaceWindow) -, ((modm .|. controlMask, xK_space) , deactivateFullOr goFullscreen) -, ((modm, xK_x), addHiddenWorkspace "NSP" >> windows (W.shift "NSP")) -, ((modalt, xK_space), deactivateFullOr restoreOrMinimizeOtherClasses) -, ((hyper, xK_g) , gatherThisClass) -, --- Focus/layout manipulation - ((modm, xK_e) , goToNextScreenX) -, ((modm, xK_slash) , sendMessage $ Toggle MIRROR) -, ( (modm, xK_backslash) - , cycleWorkspaceOnCurrentScreen [xK_Super_L] xK_backslash xK_slash - ) -, ((modm, xK_z) , shiftToNextScreenX) -, ((modm .|. shiftMask, xK_z) , shiftToEmptyNextScreen) -, ((modm .|. shiftMask, xK_h) , shiftToEmptyAndView) -, ((hyper, xK_5), getWorkspaceDmenu >>= windows . SW.swapWithCurrent) -, --- These ought to be rebound for boringWindows support - ((hyper, xK_e) , moveTo Next emptyWS) -, --- Miscellaneous XMonad - ((hyper, xK_1) , toggleFadingForActiveWindow) -, ((hyper .|. shiftMask, xK_1) , toggleFadingForActiveWorkspace) -, ((hyper .|. controlMask, xK_1), toggleFadingForActiveScreen) -, ((hyper, xK_t) , selectToggle) -, ((modalt, xK_4) , selectLimit) -, ((hyper, xK_3) , addWorkspacePrompt def) -, ((modalt, xK_3) , selectWorkspace def) -, ((hyper .|. mod1Mask, xK_3) , removeWorkspace) -, ((hyper, xK_l) , selectLayout) -``` diff --git a/config/xmonad/xmonad.hs b/config/xmonad/xmonad.hs index aab66ae9..a8d188df 100644 --- a/config/xmonad/xmonad.hs +++ b/config/xmonad/xmonad.hs @@ -976,8 +976,3 @@ addKeys conf@XConfig { modMask = modm } = where modalt = modm .|. mod1Mask hyper = controlMask .|. modalt - --- Local Variables: --- flycheck-ghc-args: ("-Wno-missing-signatures") --- haskell-indent-offset: 4 --- End: diff --git a/flake.lock b/flake.lock index 7001a250..fd99b1c0 100644 --- a/flake.lock +++ b/flake.lock @@ -114,7 +114,6 @@ "doom-snippets": "doom-snippets", "emacs-overlay": "emacs-overlay", "emacs-so-long": "emacs-so-long", - "evil-collection": "evil-collection", "evil-escape": "evil-escape", "evil-markdown": "evil-markdown", "evil-org-mode": "evil-org-mode", @@ -138,11 +137,11 @@ "ws-butler": "ws-butler" }, "locked": { - "lastModified": 1686959076, - "narHash": "sha256-tzwHJ8q9CMpIwxcyCM51i88arntNMARi1mFkAppMgqk=", + "lastModified": 1689075996, + "narHash": "sha256-NwBzz2CHNtT0oDqAGewByQ5OFnAWf+ewHUrK0F44xZk=", "owner": "nix-community", "repo": "nix-doom-emacs", - "rev": "2c4ba0d77fdfa4495929c8aee814936e722715c5", + "rev": "9a5b34d9ba30842eb8f0d7deb08bf03a75930471", "type": "github" }, "original": { @@ -158,11 +157,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1688696006, - "narHash": "sha256-lZFTHfl/DvgUJImm4sSpxS/29HIbCGiP+5aVi+pCGN0=", + "lastModified": 1689306175, + "narHash": "sha256-8A9V2m8SsHMmn2F7SAwsbwu5QVTRR9MkX9kF48T+Qsk=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "cba774729581c6e2d7494a3362c534653b3ac84e", + "rev": "a44ec998f6c8f04973f8e8630847157efec2bbfb", "type": "github" }, "original": { @@ -174,11 +173,11 @@ "emacs-dir": { "flake": false, "locked": { - "lastModified": 1689233981, - "narHash": "sha256-0ZHvduxDwyC011W82phuVoHkxpdHOUTpmf512SiKte0=", + "lastModified": 1689625225, + "narHash": "sha256-ohrJSLe3xHRUBYIvYyn1JV33rVL1WIpczNzfsDHAcTk=", "ref": "refs/heads/main", - "rev": "5170965462b67d7c7a14a3ef543286ab7ff34bcd", - "revCount": 194, + "rev": "7ae33fff3b7f0adca151460d13da621778433278", + "revCount": 195, "submodules": true, "type": "git", "url": "https://github.com/Icy-Thought/emacs.d.git" @@ -222,22 +221,6 @@ "type": "github" } }, - "evil-collection": { - "flake": false, - "locked": { - "lastModified": 1686801899, - "narHash": "sha256-wGJWF9t8yaxLyYQRf3hK+5/AIYYAS8qWXPDEvatzBlc=", - "owner": "emacs-evil", - "repo": "evil-collection", - "rev": "4a7d924dbd851ef1b2ccb85778be6e7a6a81ebd4", - "type": "github" - }, - "original": { - "owner": "emacs-evil", - "repo": "evil-collection", - "type": "github" - } - }, "evil-escape": { "flake": false, "locked": { @@ -450,11 +433,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1687709756, - "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", "owner": "numtide", "repo": "flake-utils", - "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", "type": "github" }, "original": { @@ -540,11 +523,11 @@ "systems": "systems_7" }, "locked": { - "lastModified": 1687709756, - "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", "owner": "numtide", "repo": "flake-utils", - "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", "type": "github" }, "original": { @@ -558,11 +541,11 @@ "systems": "systems_8" }, "locked": { - "lastModified": 1687709756, - "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", "owner": "numtide", "repo": "flake-utils", - "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", "type": "github" }, "original": { @@ -691,11 +674,11 @@ ] }, "locked": { - "lastModified": 1688552611, - "narHash": "sha256-pV/1/AU1l5CNFeKmdJ1jofcaKHhtKAbxY4gazeCyoSo=", + "lastModified": 1689134369, + "narHash": "sha256-0G9dutIvhS/WUr3Awcnqw71g8EVVvvkOhVDnDDbY4Fw=", "owner": "nix-community", "repo": "home-manager", - "rev": "b23c7501f7e0a001486c9a5555a6c53ac7b08e85", + "rev": "e42fb59768f0305085abde0dd27ab5e0cc15420c", "type": "github" }, "original": { @@ -713,11 +696,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1688653598, - "narHash": "sha256-gLNu5/SEw3gg5SjuAfkwFSR473Wnc6GaFvS7kmySi7A=", + "lastModified": 1689272440, + "narHash": "sha256-7LS9k6ef7d8W/UfTZPl/Q/VbZKe1vUIQIZ+UayOUD3Q=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "e632bf176b04968ca6a22f6e5d5f1a7bf77b6fa6", + "rev": "b159634ef974f3c63fbd6195c25493c78a4e872d", "type": "github" }, "original": { @@ -755,11 +738,11 @@ }, "locked": { "dir": "nix", - "lastModified": 1687153676, - "narHash": "sha256-Q0VJWVBxmmKe55V7Lb+oqoOWWr5vhB46kEzU7v4jVD8=", + "lastModified": 1688896102, + "narHash": "sha256-o8oo0tuRR6eYhh4IYnNaeQ810RdIeF9JJQdJHuzRN3U=", "owner": "kmonad", "repo": "kmonad", - "rev": "2c658f6fddca39686a5448a0207a4aba215f3be5", + "rev": "19cccbf8988a67ff2e1fab14341230b220e4e5c8", "type": "github" }, "original": { @@ -779,11 +762,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1688685672, - "narHash": "sha256-V9nDfCTc8Z6f6xuxrU9jfG1o9/Rv4bqcPnuZlulv6t0=", + "lastModified": 1689292633, + "narHash": "sha256-L5wDWbHt8DFSL/CSXKMQ9eJLa1LTX+5xaT8VDyWfuaM=", "owner": "neovim", "repo": "neovim", - "rev": "36941942d60915d9f78defd6aaf713a27952e16a", + "rev": "9176b5e10a6b32ff65c8ba3f532e3bd55c168ec6", "type": "github" }, "original": { @@ -844,11 +827,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1688594934, - "narHash": "sha256-3dUo20PsmUd57jVZRx5vgKyIN1tv+v/JQweZsve5q/A=", + "lastModified": 1689209875, + "narHash": "sha256-8AVcBV1DiszaZzHFd5iLc8HSLfxRAuqcU0QdfBEF3Ag=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e11142026e2cef35ea52c9205703823df225c947", + "rev": "fcc147b1e9358a8386b2c4368bd928e1f63a7df2", "type": "github" }, "original": { @@ -860,11 +843,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1688646010, - "narHash": "sha256-kCeza5eKI2NEi8k0EoeZfv3lN1r1Vwx+L/VA6I8tmG4=", + "lastModified": 1689261696, + "narHash": "sha256-LzfUtFs9MQRvIoQ3MfgSuipBVMXslMPH/vZ+nM40LkA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5daaa32204e9c46b05cd709218b7ba733d07e80c", + "rev": "df1eee2aa65052a18121ed4971081576b25d6b5c", "type": "github" }, "original": { @@ -875,10 +858,10 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1687807295, - "narHash": "sha256-7TUD0p0m4mZpIi1O+Cyk5NCqpJUnhv/CJOAuHOndjao=", - "path": "/nix/store/5wz1ky32g7vsid0p21anx0sl5lpa2p9g-source", - "rev": "6b3d1b1cf13f407fef5e634b224d575eb7211975", + "lastModified": 1688590700, + "narHash": "sha256-ZF055rIUP89cVwiLpG5xkJzx00gEuuGFF60Bs/LM3wc=", + "path": "/nix/store/qljn7zgvqlgn4hlrxni13mia3dyf87p9-source", + "rev": "f292b4964cb71f9dfbbd30dc9f511d6165cd109b", "type": "path" }, "original": { @@ -902,10 +885,10 @@ }, "nixpkgs_12": { "locked": { - "lastModified": 1687807295, - "narHash": "sha256-7TUD0p0m4mZpIi1O+Cyk5NCqpJUnhv/CJOAuHOndjao=", - "path": "/nix/store/5wz1ky32g7vsid0p21anx0sl5lpa2p9g-source", - "rev": "6b3d1b1cf13f407fef5e634b224d575eb7211975", + "lastModified": 1688590700, + "narHash": "sha256-ZF055rIUP89cVwiLpG5xkJzx00gEuuGFF60Bs/LM3wc=", + "path": "/nix/store/qljn7zgvqlgn4hlrxni13mia3dyf87p9-source", + "rev": "f292b4964cb71f9dfbbd30dc9f511d6165cd109b", "type": "path" }, "original": { @@ -915,11 +898,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1688590700, - "narHash": "sha256-ZF055rIUP89cVwiLpG5xkJzx00gEuuGFF60Bs/LM3wc=", + "lastModified": 1689192006, + "narHash": "sha256-QM0f0d8oPphOTYJebsHioR9+FzJcy1QNIzREyubB91U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f292b4964cb71f9dfbbd30dc9f511d6165cd109b", + "rev": "2de8efefb6ce7f5e4e75bdf57376a96555986841", "type": "github" }, "original": { @@ -947,11 +930,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1688590700, - "narHash": "sha256-ZF055rIUP89cVwiLpG5xkJzx00gEuuGFF60Bs/LM3wc=", + "lastModified": 1689192006, + "narHash": "sha256-QM0f0d8oPphOTYJebsHioR9+FzJcy1QNIzREyubB91U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f292b4964cb71f9dfbbd30dc9f511d6165cd109b", + "rev": "2de8efefb6ce7f5e4e75bdf57376a96555986841", "type": "github" }, "original": { @@ -978,11 +961,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1688646010, - "narHash": "sha256-kCeza5eKI2NEi8k0EoeZfv3lN1r1Vwx+L/VA6I8tmG4=", + "lastModified": 1689261696, + "narHash": "sha256-LzfUtFs9MQRvIoQ3MfgSuipBVMXslMPH/vZ+nM40LkA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5daaa32204e9c46b05cd709218b7ba733d07e80c", + "rev": "df1eee2aa65052a18121ed4971081576b25d6b5c", "type": "github" }, "original": { @@ -1057,11 +1040,11 @@ "nvim-dir": { "flake": false, "locked": { - "lastModified": 1689248872, - "narHash": "sha256-hR1usC/PAklNAwVH1txCqlu52ET9+nl8Qcoa0m17CQM=", + "lastModified": 1689624776, + "narHash": "sha256-kmvPtS2EzZaMHrvY6GXM9gwRCfmW8a+ouS0MCoUdcnE=", "ref": "refs/heads/main", - "rev": "8b89058769b42a663ff74efc29e46b90cc76ea4c", - "revCount": 296, + "rev": "c01519f5af329b3e993d5af130d6b5e492a73297", + "revCount": 297, "submodules": true, "type": "git", "url": "https://github.com/Icy-Thought/nvim.d.git" @@ -1081,11 +1064,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1688688289, - "narHash": "sha256-AwwFjWJzCfuEuR4Z8f+IsAIdAygZj93SGcaQsn2G2d8=", + "lastModified": 1689293131, + "narHash": "sha256-4uveb8JJtvSXUJgXcbosQCxnavAayZTP9bxXJvEgUS4=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "0c59fdc179b47cf13f7679b038e8cd683125b760", + "rev": "7ce34dd602c54fef84260342a204399c8ac82ba8", "type": "github" }, "original": { @@ -1254,11 +1237,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1688697203, - "narHash": "sha256-0dMSJzu2bFMr9mfkXGRqMr3aPviny4zD4h7yUPk1B0U=", + "lastModified": 1689302058, + "narHash": "sha256-yD74lcHTrw4niXcE9goJLbzsgyce48rQQoy5jK5ZK40=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "f95db88269e9a46c67cd442fb667c5ad05a6d962", + "rev": "7b8dbbf4c67ed05a9bf3d9e658c12d4108bc24c8", "type": "github" }, "original": { @@ -1465,11 +1448,11 @@ }, "unstable": { "locked": { - "lastModified": 1688590700, - "narHash": "sha256-ZF055rIUP89cVwiLpG5xkJzx00gEuuGFF60Bs/LM3wc=", + "lastModified": 1689192006, + "narHash": "sha256-QM0f0d8oPphOTYJebsHioR9+FzJcy1QNIzREyubB91U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f292b4964cb71f9dfbbd30dc9f511d6165cd109b", + "rev": "2de8efefb6ce7f5e4e75bdf57376a96555986841", "type": "github" }, "original": { diff --git a/modules/desktop/editors/emacs.nix b/modules/desktop/editors/emacs.nix index c8ed5eff..7decbb97 100644 --- a/modules/desktop/editors/emacs.nix +++ b/modules/desktop/editors/emacs.nix @@ -120,14 +120,14 @@ in { }; home.configFile = { - irkalla-conf = { + irkalla-lib = { target = "emacs/"; - source = "${inputs.emacs-dir}/irkalla/config"; + source = "${inputs.emacs-dir}/irkalla/lib"; recursive = true; }; irkalla-init = { - source = "${inputs.emacs-dir}/irkalla/init.org"; target = "emacs/init.org"; + source = "${inputs.emacs-dir}/irkalla/init.org"; onChange = let initFiles = "${config.hm.xdg.configHome}/emacs/init.org"; in '' @@ -143,10 +143,10 @@ in { (mkIf (cfg.template == "doomemacs") { hm.imports = [inputs.doomemacs.hmModule]; - hm.programs.doom-emacs = { + hm.programs.doomemacs = { enable = true; emacsPackage = cfg.transparency.package; - doomPrivateDir = "${inputs.emacs-dir}/doom-config"; + doomPrivateDir = "${inputs.emacs-dir}/doomconfig"; }; env.PATH = ["$XDG_CONFIG_HOME/emacs/bin"]; diff --git a/modules/desktop/toolset/graphics.nix b/modules/desktop/toolset/graphics.nix index e65d9fa6..1b27c45f 100644 --- a/modules/desktop/toolset/graphics.nix +++ b/modules/desktop/toolset/graphics.nix @@ -18,15 +18,22 @@ in { }; config = { - user.packages = attrValues ({} - // optionalAttrs cfg.base.enable { - inherit (pkgs) hyprpicker font-manager imagemagick; - } - // optionalAttrs cfg.vector.enable {inherit (pkgs) inkscape rnote;} - // optionalAttrs cfg.raster.enable { - inherit (pkgs) gimp; - inherit (pkgs.gimpPlugins) resynthesizer; - } - // optionalAttrs cfg.modeling.enable {inherit (pkgs) blender;}); + user.packages = let + envProto = config.modules.desktop.envProto; + in + attrValues ({} + // optionalAttrs cfg.base.enable { + inherit (pkgs) font-manager imagemagick upscayl; + colorPicker = + if (envProto == "wayland") + then pkgs.hyprpicker + else pkgs.xcolor; + } + // optionalAttrs cfg.vector.enable {inherit (pkgs) inkscape rnote;} + // optionalAttrs cfg.raster.enable { + inherit (pkgs) gimp; + inherit (pkgs.gimpPlugins) resynthesizer; + } + // optionalAttrs cfg.modeling.enable {inherit (pkgs) blender;}); }; } diff --git a/modules/themes/kanagawa/default.nix b/modules/themes/kanagawa/default.nix index ccf57336..4f07d888 100644 --- a/modules/themes/kanagawa/default.nix +++ b/modules/themes/kanagawa/default.nix @@ -15,12 +15,12 @@ in { modules.themes = { wallpaper = mkDefault ./assets/oceanlife-turtle.jpg; gtk = { - name = "Kanagawa-B"; - package = pkgs.my.kanagawa-gtk.override {themeVariants = ["B"];}; + name = "Kanagawa-BL"; + package = pkgs.my.kanagawa-gtk.override {themeVariants = ["BL"];}; }; iconTheme = { name = "Kanagawa"; - package = pkgs.my.kanagawa-gtk.override {themeVariants = ["B"];}; + package = pkgs.my.kanagawa-gtk.override {themeVariants = ["BL"];}; }; pointer = { name = "Bibata-Modern-Classic"; diff --git a/packages/rose-pine-gtk/default.nix b/packages/rose-pine-gtk/default.nix index 1e5d62b3..d6d9a37d 100644 --- a/packages/rose-pine-gtk/default.nix +++ b/packages/rose-pine-gtk/default.nix @@ -43,8 +43,7 @@ in in '' runHook preInstall - mkdir -p $out/share/themes - mkdir -p $out/share/icons + mkdir -p $out/share/{icons,themes} cp -r $src/themes/${gtkTheme} $out/share/themes cp -r $src/icons/${iconTheme} $out/share/icons