From 89ca445f5f8c7bf846670299b266191039478c80 Mon Sep 17 00:00:00 2001 From: sadan <117494111+sadan4@users.noreply.github.com> Date: Sat, 26 Apr 2025 16:39:37 -0400 Subject: [PATCH 1/3] update --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 470a1ca..6d17d83 100644 --- a/flake.lock +++ b/flake.lock @@ -353,11 +353,11 @@ ] }, "locked": { - "lastModified": 1744117652, - "narHash": "sha256-t7dFCDl4vIOOUMhEZnJF15aAzkpaup9x4ZRGToDFYWI=", + "lastModified": 1745557122, + "narHash": "sha256-eqSo9ugzsqhFgaDFYUZj943nurlX4L6f+AW0skJ4W+M=", "owner": "nix-community", "repo": "home-manager", - "rev": "b4e98224ad1336751a2ac7493967a4c9f6d9cb3f", + "rev": "dd26f75fb4ec1c731d4b1396eaf4439ce40a91c1", "type": "github" }, "original": { @@ -374,11 +374,11 @@ ] }, "locked": { - "lastModified": 1744400600, - "narHash": "sha256-qYhUgA98mhq1QK13r9qVY+sG1ri6FBgyp+GApX6wS20=", + "lastModified": 1745593878, + "narHash": "sha256-Rq5qNnUWuhQTqzXDcminu7Z1FPSB1wUaKIEfPTyZkAs=", "owner": "nix-community", "repo": "home-manager", - "rev": "b74b22bb6167e8dff083ec6988c98798bf8954d3", + "rev": "542078066b1a99cdc5d5fce1365f98b847ca0b5a", "type": "github" }, "original": { @@ -478,11 +478,11 @@ ] }, "locked": { - "lastModified": 1743911143, - "narHash": "sha256-4j4JPwr0TXHH4ZyorXN5yIcmqIQr0WYacsuPA4ktONo=", + "lastModified": 1745120797, + "narHash": "sha256-owQ0VQ+7cSanTVPxaZMWEzI22Q4bGnuvhVjLAJBNQ3E=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "a36f6a7148aec2c77d78e4466215cceb2f5f4bfb", + "rev": "69716041f881a2af935021c1182ed5b0cc04d40e", "type": "github" }, "original": { @@ -501,11 +501,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1744308772, - "narHash": "sha256-gUOclfwgw/bSo3VMNmHrNXzIpaOgh1Yq9a3D3Dj/wgM=", + "lastModified": 1745545091, + "narHash": "sha256-300Y7RoU/wefVDmit6b89HvhBk6h8l1t9VVDo0diEK4=", "owner": "kaylorben", "repo": "nixcord", - "rev": "76c3b99646d12437ec7183939eca911549e4d18f", + "rev": "f5dd48df2e39d2b2cf9b5bad20997e88704f6a5e", "type": "github" }, "original": { @@ -568,11 +568,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1744232761, - "narHash": "sha256-gbl9hE39nQRpZaLjhWKmEu5ejtQsgI5TWYrIVVJn30U=", + "lastModified": 1745391562, + "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f675531bc7e6657c10a18b565cfebd8aa9e24c14", + "rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7", "type": "github" }, "original": { @@ -600,11 +600,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1744309437, - "narHash": "sha256-QZnNHM823am8apCqKSPdtnzPGTy2ZB4zIXOVoBp5+W0=", + "lastModified": 1745487689, + "narHash": "sha256-FQoi3R0NjQeBAsEOo49b5tbDPcJSMWc3QhhaIi9eddw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f9ebe33a928b5d529c895202263a5ce46bdf12f7", + "rev": "5630cf13cceac06cefe9fc607e8dfa8fb342dde3", "type": "github" }, "original": { @@ -632,11 +632,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1743689281, - "narHash": "sha256-y7Hg5lwWhEOgflEHRfzSH96BOt26LaYfrYWzZ+VoVdg=", + "lastModified": 1744868846, + "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2bfc080955153be0be56724be6fa5477b4eefabb", + "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", "type": "github" }, "original": { @@ -712,11 +712,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1744103455, - "narHash": "sha256-SR6+qjkPjGQG+8eM4dCcVtss8r9bre/LAxFMPJpaZeU=", + "lastModified": 1745310711, + "narHash": "sha256-ePyTpKEJTgX0gvgNQWd7tQYQ3glIkbqcW778RpHlqgA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "69d5a5a4635c27dae5a742f36108beccc506c1ba", + "rev": "5e3e92b16d6fdf9923425a8d4df7496b2434f39c", "type": "github" }, "original": { @@ -877,11 +877,11 @@ ] }, "locked": { - "lastModified": 1742370146, - "narHash": "sha256-XRE8hL4vKIQyVMDXykFh4ceo3KSpuJF3ts8GKwh5bIU=", + "lastModified": 1744961264, + "narHash": "sha256-aRmUh0AMwcbdjJHnytg1e5h5ECcaWtIFQa6d9gI85AI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "adc195eef5da3606891cedf80c0d9ce2d3190808", + "rev": "8d404a69efe76146368885110f29a2ca3700bee6", "type": "github" }, "original": { From dc4371c619a2249265ad572d1eb7c68933184b31 Mon Sep 17 00:00:00 2001 From: sadan <117494111+sadan4@users.noreply.github.com> Date: Sat, 26 Apr 2025 16:46:02 -0400 Subject: [PATCH 2/3] set clock font to comic sans --- common/users/homeModules/displays/_makePanel.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/common/users/homeModules/displays/_makePanel.nix b/common/users/homeModules/displays/_makePanel.nix index b75b65c..ad918a0 100644 --- a/common/users/homeModules/displays/_makePanel.nix +++ b/common/users/homeModules/displays/_makePanel.nix @@ -97,6 +97,11 @@ builtins.map (section: baseConfig // section) [ time = { format = "12h"; }; + font = { + family = "ComicShannsMono Nerd Font Mono"; + size = 14; + bold = false; + }; }; } ]; From d99ce4a2512e927cc95aacea66558cc5c2f3607f Mon Sep 17 00:00:00 2001 From: sadan <117494111+sadan4@users.noreply.github.com> Date: Sat, 26 Apr 2025 16:48:42 -0400 Subject: [PATCH 3/3] move hotkeys to the files of the programs they're for --- common/users/homeModules/flameshot.nix | 13 +++++++ common/users/homeModules/frog.nix | 15 +++++++- common/users/homeModules/plasma.nix | 25 +------------ common/users/homeModules/rofi.nix | 40 ++++++++++++++------- common/users/homeModules/terminal/kitty.nix | 13 ++++++- 5 files changed, 67 insertions(+), 39 deletions(-) diff --git a/common/users/homeModules/flameshot.nix b/common/users/homeModules/flameshot.nix index 9a802ca..bab9f36 100644 --- a/common/users/homeModules/flameshot.nix +++ b/common/users/homeModules/flameshot.nix @@ -7,6 +7,19 @@ Requires = [ "graphical-session-pre.target" ]; }; }; + programs = { + plasma = { + hotkeys = { + commands = { + "flameshot" = { + name = "flameshot"; + key = "Print"; + command = "flameshot gui"; + }; + }; + }; + }; + }; services = { flameshot = { enable = true; diff --git a/common/users/homeModules/frog.nix b/common/users/homeModules/frog.nix index 7979b1d..bf65160 100644 --- a/common/users/homeModules/frog.nix +++ b/common/users/homeModules/frog.nix @@ -4,8 +4,21 @@ ../../../customPackages ]; home = { - packages = with pkgs.cpkg;[ + packages = with pkgs.cpkg; [ frog ]; }; + programs = { + plasma = { + hotkeys = { + commands = { + "ocr" = { + name = "OCR"; + key = "Meta+Shift+T"; + command = "frog -e"; + }; + }; + }; + }; + }; } diff --git a/common/users/homeModules/plasma.nix b/common/users/homeModules/plasma.nix index fb7b2ad..61cc5b0 100644 --- a/common/users/homeModules/plasma.nix +++ b/common/users/homeModules/plasma.nix @@ -75,30 +75,7 @@ "Window Maximize" = [ "Meta+Up" ]; }; }; - hotkeys = { - commands = { - "ocr" = { - name = "OCR"; - key = "Meta+Shift+T"; - command = "frog -e"; - }; - "flameshot" = { - name = "flameshot"; - key = "Print"; - command = "flameshot gui"; - }; - "rofi" = { - name = "rofi"; - key = "Alt+P"; - command = "rofi -show drun"; - }; - "kitty" = { - name = "kitty"; - key = "Alt+Shift+Return"; - command = "kitty"; - }; - }; - }; + # Hotkeys are defined in programs that use them }; }; stylix = { diff --git a/common/users/homeModules/rofi.nix b/common/users/homeModules/rofi.nix index cc27b76..c30319c 100644 --- a/common/users/homeModules/rofi.nix +++ b/common/users/homeModules/rofi.nix @@ -1,14 +1,28 @@ -{pkgs, ...}: { - home = { - packages = with pkgs; [ - rofi - ]; - file = { - rofi = { - recursive = true; - source = ../../../dotfiles/rofi; - target = "./.config/rofi"; - }; - }; +{ pkgs, ... }: +{ + home = { + packages = with pkgs; [ + rofi + ]; + file = { + rofi = { + recursive = true; + source = ../../../dotfiles/rofi; + target = "./.config/rofi"; + }; }; -} \ No newline at end of file + }; + programs = { + plasma = { + hotkeys = { + commands = { + "rofi" = { + name = "rofi"; + key = "Alt+P"; + command = "rofi -show drun"; + }; + }; + }; + }; + }; +} diff --git a/common/users/homeModules/terminal/kitty.nix b/common/users/homeModules/terminal/kitty.nix index d76f45f..441a374 100644 --- a/common/users/homeModules/terminal/kitty.nix +++ b/common/users/homeModules/terminal/kitty.nix @@ -17,10 +17,21 @@ }; programs = { zsh = { - # Completion support for kitten + # Completion support for kitten initExtra = '' compdef _kitty kitten ''; }; + plasma = { + hotkeys = { + commands = { + "kitty" = { + name = "kitty"; + key = "Alt+Shift+Return"; + command = "kitty"; + }; + }; + }; + }; }; }