From dee0c41a0516e9322115223f67331e0ceea1d807 Mon Sep 17 00:00:00 2001 From: Eclypsed Date: Sat, 8 Nov 2025 12:14:23 -0500 Subject: [PATCH] Added Ghostty & Kitty, only using Ghostty --- flake.lock | 310 ++++++++++++++++++++------------- flake.nix | 5 +- modules/home/default.nix | 4 +- modules/home/ghostty.nix | 13 ++ modules/home/hypr/hyprland.nix | 1 + modules/home/hypr/keybinds.nix | 2 +- modules/home/kitty.nix | 14 ++ 7 files changed, 221 insertions(+), 128 deletions(-) create mode 100644 modules/home/ghostty.nix create mode 100644 modules/home/kitty.nix diff --git a/flake.lock b/flake.lock index d75a3f3..097104c 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1761656077, - "narHash": "sha256-lsNWuj4Z+pE7s0bd2OKicOFq9bK86JE0ZGeKJbNqb94=", + "lastModified": 1762618334, + "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=", "owner": "ryantm", "repo": "agenix", - "rev": "9ba0d85de3eaa7afeab493fed622008b6e4924f5", + "rev": "fcdea223397448d35d9b31f798479227e80183f6", "type": "github" }, "original": { @@ -43,11 +43,11 @@ ] }, "locked": { - "lastModified": 1761420899, - "narHash": "sha256-kxGCip6GNbcbNWKu4J2iKbNYfFTS8Zbjg9CWp0zmFoM=", + "lastModified": 1762356719, + "narHash": "sha256-qwd/xdoOya1m8FENle+4hWnydCtlXUWLAW/Auk6WL7s=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "62479232aae42c1ef09c2c027c8cfd91df060897", + "rev": "6d0b3567584691bf9d8fedb5d0093309e2f979c7", "type": "github" }, "original": { @@ -241,11 +241,11 @@ ] }, "locked": { - "lastModified": 1759362264, - "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", + "lastModified": 1760948891, + "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", + "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", "type": "github" }, "original": { @@ -358,11 +358,11 @@ ] }, "locked": { - "lastModified": 1761845621, - "narHash": "sha256-d+R4MHsGmdebvSMsYUFWONsZSlUbOo8Zq/wjMdMiIac=", + "lastModified": 1762463325, + "narHash": "sha256-33YUsWpPyeBZEWrKQ2a1gkRZ7i0XCC/2MYpU6BVeQSU=", "owner": "nix-community", "repo": "home-manager", - "rev": "97e3022a8d2c09313fa49847f6da4d76abcfc72d", + "rev": "0562fef070a1027325dd4ea10813d64d2c967b39", "type": "github" }, "original": { @@ -416,11 +416,11 @@ ] }, "locked": { - "lastModified": 1760445448, - "narHash": "sha256-fXGjL6dw31FPFRrmIemzGiNSlfvEJTJNsmadZi+qNhI=", + "lastModified": 1762462052, + "narHash": "sha256-6roLYzcDf4V38RUMSqycsOwAnqfodL6BmhRkUtwIgdA=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "50fb9f069219f338a11cf0bcccb9e58357d67757", + "rev": "ffc999d980c7b3bca85d3ebd0a9fbadf984a8162", "type": "github" }, "original": { @@ -434,22 +434,22 @@ "aquamarine": "aquamarine", "hyprcursor": "hyprcursor", "hyprgraphics": "hyprgraphics", + "hyprland-guiutils": "hyprland-guiutils", "hyprland-protocols": "hyprland-protocols", - "hyprland-qtutils": "hyprland-qtutils", "hyprlang": "hyprlang", "hyprutils": "hyprutils", - "hyprwayland-scanner": "hyprwayland-scanner", + "hyprwayland-scanner": "hyprwayland-scanner_2", "nixpkgs": "nixpkgs", "pre-commit-hooks": "pre-commit-hooks", "systems": "systems_2", "xdph": "xdph" }, "locked": { - "lastModified": 1762461128, - "narHash": "sha256-k3cAVyUq/c5trwfQIlrz9PHhUk8fOp27F6dIxQPOXvo=", + "lastModified": 1762542520, + "narHash": "sha256-hMWWVGEoJRNDaAJxHoL1YL+IXGxdQooEw8lABELVopg=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "1ca6058bda89291241b5ed4b1d8784094a21a556", + "rev": "522edc87126a48f3ce4891747b6a92a22385b1e7", "type": "github" }, "original": { @@ -458,6 +458,48 @@ "type": "github" } }, + "hyprland-guiutils": { + "inputs": { + "aquamarine": [ + "hyprland", + "aquamarine" + ], + "hyprgraphics": [ + "hyprland", + "hyprgraphics" + ], + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "hyprtoolkit": "hyprtoolkit", + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1762465111, + "narHash": "sha256-dS13YZdWjgGGLBjpT4FHB6xf8I/WiAU+mgNWXsZgDUs=", + "owner": "hyprwm", + "repo": "hyprland-guiutils", + "rev": "a415eba866a953f3096d661318f771aa0082eb98", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-guiutils", + "type": "github" + } + }, "hyprland-protocols": { "inputs": { "nixpkgs": [ @@ -483,74 +525,6 @@ "type": "github" } }, - "hyprland-qt-support": { - "inputs": { - "hyprlang": [ - "hyprland", - "hyprland-qtutils", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "hyprland-qtutils", - "nixpkgs" - ], - "systems": [ - "hyprland", - "hyprland-qtutils", - "systems" - ] - }, - "locked": { - "lastModified": 1749154592, - "narHash": "sha256-DO7z5CeT/ddSGDEnK9mAXm1qlGL47L3VAHLlLXoCjhE=", - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "rev": "4c8053c3c888138a30c3a6c45c2e45f5484f2074", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "type": "github" - } - }, - "hyprland-qtutils": { - "inputs": { - "hyprland-qt-support": "hyprland-qt-support", - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "hyprutils": [ - "hyprland", - "hyprland-qtutils", - "hyprlang", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1759080228, - "narHash": "sha256-RgDoAja0T1hnF0pTc56xPfLfFOO8Utol2iITwYbUhTk=", - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "rev": "629b15c19fa4082e4ce6be09fdb89e8c3312aed7", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "type": "github" - } - }, "hyprlang": { "inputs": { "hyprutils": [ @@ -580,6 +554,54 @@ "type": "github" } }, + "hyprtoolkit": { + "inputs": { + "aquamarine": [ + "hyprland", + "hyprland-guiutils", + "aquamarine" + ], + "hyprgraphics": [ + "hyprland", + "hyprland-guiutils", + "hyprgraphics" + ], + "hyprlang": [ + "hyprland", + "hyprland-guiutils", + "hyprlang" + ], + "hyprutils": [ + "hyprland", + "hyprland-guiutils", + "hyprutils" + ], + "hyprwayland-scanner": "hyprwayland-scanner", + "nixpkgs": [ + "hyprland", + "hyprland-guiutils", + "nixpkgs" + ], + "systems": [ + "hyprland", + "hyprland-guiutils", + "systems" + ] + }, + "locked": { + "lastModified": 1762463729, + "narHash": "sha256-2fYkU/mdz8WKY3dkDPlE/j6hTxIwqultsx4gMMsMns0=", + "owner": "hyprwm", + "repo": "hyprtoolkit", + "rev": "88483bdee5329ec985f0c8f834c519cd18cfe532", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprtoolkit", + "type": "github" + } + }, "hyprutils": { "inputs": { "nixpkgs": [ @@ -592,11 +614,11 @@ ] }, "locked": { - "lastModified": 1762208756, - "narHash": "sha256-hC1jb4tdjFfEuU18KQiMgz5XPAO+d5SfbjAUS7haLl4=", + "lastModified": 1762387740, + "narHash": "sha256-gQ9zJ+pUI4o+Gh4Z6jhJll7jjCSwi8ZqJIhCE2oqwhQ=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "164a30b3d8b3174a32ac7326782476f1188e6118", + "rev": "926689ddb9c0a8787e58c02c765a62e32d63d1f7", "type": "github" }, "original": { @@ -606,6 +628,35 @@ } }, "hyprwayland-scanner": { + "inputs": { + "nixpkgs": [ + "hyprland", + "hyprland-guiutils", + "hyprtoolkit", + "nixpkgs" + ], + "systems": [ + "hyprland", + "hyprland-guiutils", + "hyprtoolkit", + "systems" + ] + }, + "locked": { + "lastModified": 1755184602, + "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, + "hyprwayland-scanner_2": { "inputs": { "nixpkgs": [ "hyprland", @@ -633,22 +684,21 @@ "mango": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs_2", "scenefx": "scenefx" }, "locked": { - "lastModified": 1762008893, - "narHash": "sha256-GPtOS14e+R/1aKg/vqqrB6d3hBjUldgbcLgL659pTW8=", + "lastModified": 1762147045, + "narHash": "sha256-abMJkzCASBfJ4vPFZMM2jDaZEiwvq+FXk3uPFAH29DI=", "owner": "DreamMaoMao", "repo": "mango", - "rev": "12e5c03600d9df63bc85b70f78fc11b117edc5bd", + "rev": "1271832e947d3d4af27b36f687edd2f2e535f051", "type": "github" }, "original": { "owner": "DreamMaoMao", "repo": "mango", + "rev": "1271832e947d3d4af27b36f687edd2f2e535f051", "type": "github" } }, @@ -669,11 +719,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1761827175, - "narHash": "sha256-XdPVSYyIBK4/ruoqujaQmmSGg3J2/EenexV9IEXhr6o=", + "lastModified": 1762463231, + "narHash": "sha256-hv1mG5j5PTbnWbtHHomzTus77pIxsc4x8VrMjc7+/YE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "43ffe9ac82567512abb83187cb673de1091bdfa8", + "rev": "52113c4f5cfd1e823001310e56d9c8d0699a6226", "type": "github" }, "original": { @@ -684,11 +734,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1762111121, - "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", + "lastModified": 1762363567, + "narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", + "rev": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4", "type": "github" }, "original": { @@ -715,11 +765,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1761672384, - "narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=", + "lastModified": 1750386251, + "narHash": "sha256-1ovgdmuDYVo5OUC5NzdF+V4zx2uT8RtsgZahxidBTyw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c", + "rev": "076e8c6678d8c54204abcb4b1b14c366835a58bb", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1762363567, + "narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4", "type": "github" }, "original": { @@ -737,11 +803,11 @@ ] }, "locked": { - "lastModified": 1761842869, - "narHash": "sha256-2XOoc9HRYJzqKhYGmv/QQUdKW4RrbDV8Da19iC2N3/k=", + "lastModified": 1762618508, + "narHash": "sha256-tFRxHd/1cn0nnMHaz4r6WtAJDjujIF3NfIcNs57SOGE=", "owner": "nix-community", "repo": "NUR", - "rev": "128d91d240d42143bf6a065f75417926d153b620", + "rev": "1574446aca715072c9f7d53b14cfe3a1dc5d5a3f", "type": "github" }, "original": { @@ -786,11 +852,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1761486540, - "narHash": "sha256-O0VNqERaZ1H+4P3XwHNd8wVCqUcGtMPJT1z4cJodRFc=", + "lastModified": 1762353527, + "narHash": "sha256-67/sO6zaf02ZPz2s6k8swg6WMExz0gls7o4jmoljwl8=", "owner": "notashelf", "repo": "nvf", - "rev": "4b904de36157035fa3dddf0312a4242e5d0d9bd0", + "rev": "3d3cd879783be1457edfb42a38f392071335edd1", "type": "github" }, "original": { @@ -809,11 +875,11 @@ ] }, "locked": { - "lastModified": 1761078382, - "narHash": "sha256-JNJesbe9MMN1Brq41BHEpuH+Z+Zg74y/nI5AFZX84Vw=", + "lastModified": 1762274591, + "narHash": "sha256-Vbhluvk15qwiyNDyPd9tjJh9gxIfUjbKVT79c05Pd3I=", "owner": "nix-community", "repo": "plasma-manager", - "rev": "27dfa61b64d0cdb8e4ba6f3aaa4d4e067d64cb5c", + "rev": "6296d7100cc84b2ff732b7c103a50c2856974cf6", "type": "github" }, "original": { @@ -832,11 +898,11 @@ ] }, "locked": { - "lastModified": 1760663237, - "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=", + "lastModified": 1762441963, + "narHash": "sha256-j+rNQ119ffYUkYt2YYS6rnd6Jh/crMZmbqpkGLXaEt0=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37", + "rev": "8e7576e79b88c16d7ee3bbd112c8d90070832885", "type": "github" }, "original": { @@ -852,7 +918,7 @@ "hyprland": "hyprland", "mango": "mango", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nur": "nur", "nvf": "nvf", "plasma-manager": "plasma-manager", @@ -922,11 +988,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1761840967, - "narHash": "sha256-alE8Vesztx3tPxXpJURtYWD8x1cXaU/x+10Q6hbgGBY=", + "lastModified": 1762264356, + "narHash": "sha256-QVfC53Ri+8n3e7Ujx9kq6all3+TLBRRPRnc6No5qY5w=", "owner": "nix-community", "repo": "stylix", - "rev": "c33226f205aeab42a170913cd1f8bc3428b7e6b1", + "rev": "647bb8dd96a206a1b79c4fd714affc88b409e10b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f403fe1..c5a7492 100644 --- a/flake.nix +++ b/flake.nix @@ -37,10 +37,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - mango = { - url = "github:DreamMaoMao/mango"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + mango.url = "github:DreamMaoMao/mango?rev=1271832e947d3d4af27b36f687edd2f2e535f051"; hyprland.url = "github:hyprwm/Hyprland"; diff --git a/modules/home/default.nix b/modules/home/default.nix index c71b1c8..4e964e2 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -3,9 +3,11 @@ }: { imports = [ - ./alacritty.nix + # ./alacritty.nix ./firefox.nix + ./ghostty.nix ./git.nix + # ./kitty.nix ./hypr ./mango.nix ./nvf.nix diff --git a/modules/home/ghostty.nix b/modules/home/ghostty.nix new file mode 100644 index 0000000..5115230 --- /dev/null +++ b/modules/home/ghostty.nix @@ -0,0 +1,13 @@ +{ + ... +}: +{ + programs.ghostty = { + enable = true; + enableZshIntegration = true; + settings = { + theme = "Catppuccin Mocha"; + }; + systemd.enable = true; + }; +} diff --git a/modules/home/hypr/hyprland.nix b/modules/home/hypr/hyprland.nix index 33dcebb..3bb44b8 100644 --- a/modules/home/hypr/hyprland.nix +++ b/modules/home/hypr/hyprland.nix @@ -37,6 +37,7 @@ "systemctl --user enable --now waybar.service" "systemctl --user enable --now hyprpolkitagent.service" "wpaperd -d" + "systemctl enable --user app-com.mitchellh.ghostty.service" ]; env = [ diff --git a/modules/home/hypr/keybinds.nix b/modules/home/hypr/keybinds.nix index edf85ec..2f3ce1c 100644 --- a/modules/home/hypr/keybinds.nix +++ b/modules/home/hypr/keybinds.nix @@ -11,7 +11,7 @@ bind = [ "$mod, Q, killactive" - "$mod, W, exec, alacritty" + "$mod, W, exec, ghostty +new-window" "$mod, S, exec, rofi -show drun -show-icons" # Window Movement diff --git a/modules/home/kitty.nix b/modules/home/kitty.nix new file mode 100644 index 0000000..8068c6c --- /dev/null +++ b/modules/home/kitty.nix @@ -0,0 +1,14 @@ +{ + ... +}: +{ + programs.kitty = { + enable = true; + enableGitIntegration = true; + font = { + name = "FiraCode Nerd Font"; + }; + shellIntegration.enableZshIntegration = true; + themeFile = "Catppuccin-Mocha"; + }; +}