From 3f38bafaf2cb06202958c2c36c05822c4e1b0b8b Mon Sep 17 00:00:00 2001
From: Nate Anderson <nate.anderson@vasion.com>
Date: Tue, 4 Feb 2025 20:43:47 -0700
Subject: [PATCH] Add ghostty
---
flake.lock | 223 ++----------------
nate-work/dotfiles/ghostty/config | 46 ++++
.../dotfiles/hypr/scripts/music_setup.sh | 2 +-
nate-work/modules/home-manager/home.nix | 12 +-
nate-work/modules/hypr/hypr_home.nix | 2 +-
nate-work/modules/hypr/hyprland.nix | 3 +-
6 files changed, 83 insertions(+), 205 deletions(-)
create mode 100644 nate-work/dotfiles/ghostty/config
diff --git a/flake.lock b/flake.lock
index b9c6006..524d78b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,20 +2,14 @@
"nodes": {
"catppuccin": {
"inputs": {
- "catppuccin-v1_1": "catppuccin-v1_1",
- "catppuccin-v1_2": "catppuccin-v1_2",
- "home-manager": "home-manager",
- "home-manager-stable": "home-manager-stable",
- "nixpkgs": "nixpkgs",
- "nixpkgs-stable": "nixpkgs-stable",
- "nuscht-search": "nuscht-search"
+ "nixpkgs": "nixpkgs"
},
"locked": {
- "lastModified": 1735569271,
- "narHash": "sha256-4CIClg4LMcmcCRIXSTcHDe6ujPzlxMtbCjMH7ntV784=",
+ "lastModified": 1737579274,
+ "narHash": "sha256-8kBIYfn8TI9jbffhDNS12SdbQHb9ITXflwcgIJBeGqw=",
"owner": "catppuccin",
"repo": "nix",
- "rev": "7413a65b3ed37964c16e2fbe20145b55bcda8281",
+ "rev": "06f0ea19334bcc8112e6d671fd53e61f9e3ad63a",
"type": "github"
},
"original": {
@@ -24,34 +18,6 @@
"type": "github"
}
},
- "catppuccin-v1_1": {
- "locked": {
- "lastModified": 1734055249,
- "narHash": "sha256-pCWJgwo77KD7EJpwynwKrWPZ//dwypHq2TfdzZWqK68=",
- "rev": "7221d6ca17ac36ed20588e1c3a80177ac5843fa7",
- "revCount": 326,
- "type": "tarball",
- "url": "https://api.flakehub.com/f/pinned/catppuccin/nix/1.1.1/0193bdc0-b045-7eed-bbec-95611a8ecdf5/source.tar.gz"
- },
- "original": {
- "type": "tarball",
- "url": "https://flakehub.com/f/catppuccin/nix/1.1.%2A.tar.gz"
- }
- },
- "catppuccin-v1_2": {
- "locked": {
- "lastModified": 1734728407,
- "narHash": "sha256-Let3uJo4YDyfqbqaw66dpZxhJB2TrDyZWSFd5rpPLJA=",
- "rev": "23ee86dbf4ed347878115a78971d43025362fab1",
- "revCount": 341,
- "type": "tarball",
- "url": "https://api.flakehub.com/f/pinned/catppuccin/nix/1.2.0/0193e5e0-33b7-7149-a362-bfe56b20f64e/source.tar.gz"
- },
- "original": {
- "type": "tarball",
- "url": "https://flakehub.com/f/catppuccin/nix/1.2.%2A.tar.gz"
- }
- },
"flake-parts": {
"inputs": {
"nixpkgs-lib": [
@@ -73,58 +39,18 @@
"type": "github"
}
},
- "flake-utils": {
- "inputs": {
- "systems": "systems"
- },
- "locked": {
- "lastModified": 1731533236,
- "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
- "owner": "numtide",
- "repo": "flake-utils",
- "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "flake-utils",
- "type": "github"
- }
- },
"home-manager": {
"inputs": {
"nixpkgs": [
- "catppuccin",
"nixpkgs"
]
},
"locked": {
- "lastModified": 1734622215,
- "narHash": "sha256-OOfI0XhSJGHblfdNDhfnn8QnZxng63rWk9eeJ2tCbiI=",
+ "lastModified": 1736373539,
+ "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "1395379a7a36e40f2a76e7b9936cc52950baa1be",
- "type": "github"
- },
- "original": {
- "owner": "nix-community",
- "repo": "home-manager",
- "type": "github"
- }
- },
- "home-manager-stable": {
- "inputs": {
- "nixpkgs": [
- "catppuccin",
- "nixpkgs-stable"
- ]
- },
- "locked": {
- "lastModified": 1734366194,
- "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=",
- "owner": "nix-community",
- "repo": "home-manager",
- "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f",
+ "rev": "bd65bc3cde04c16755955630b344bc9e35272c56",
"type": "github"
},
"original": {
@@ -134,62 +60,13 @@
"type": "github"
}
},
- "home-manager_2": {
- "inputs": {
- "nixpkgs": [
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1734366194,
- "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=",
- "owner": "nix-community",
- "repo": "home-manager",
- "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f",
- "type": "github"
- },
- "original": {
- "owner": "nix-community",
- "ref": "release-24.11",
- "repo": "home-manager",
- "type": "github"
- }
- },
- "ixx": {
- "inputs": {
- "flake-utils": [
- "catppuccin",
- "nuscht-search",
- "flake-utils"
- ],
- "nixpkgs": [
- "catppuccin",
- "nuscht-search",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1729958008,
- "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=",
- "owner": "NuschtOS",
- "repo": "ixx",
- "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb",
- "type": "github"
- },
- "original": {
- "owner": "NuschtOS",
- "ref": "v0.0.6",
- "repo": "ixx",
- "type": "github"
- }
- },
"nixpkgs": {
"locked": {
- "lastModified": 1734424634,
- "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=",
+ "lastModified": 1736012469,
+ "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33",
+ "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d",
"type": "github"
},
"original": {
@@ -199,29 +76,13 @@
"type": "github"
}
},
- "nixpkgs-stable": {
- "locked": {
- "lastModified": 1734600368,
- "narHash": "sha256-nbG9TijTMcfr+au7ZVbKpAhMJzzE2nQBYmRvSdXUD8g=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "b47fd6fa00c6afca88b8ee46cfdb00e104f50bca",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixos-24.11",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
"nixpkgs-unstable": {
"locked": {
- "lastModified": 1734119587,
- "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=",
+ "lastModified": 1738410390,
+ "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5",
+ "rev": "3a228057f5b619feb3186e986dbe76278d707b6e",
"type": "github"
},
"original": {
@@ -233,11 +94,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1734323986,
- "narHash": "sha256-m/lh6hYMIWDYHCAsn81CDAiXoT3gmxXI9J987W5tZrE=",
+ "lastModified": 1738435198,
+ "narHash": "sha256-5+Hmo4nbqw8FrW85FlNm4IIrRnZ7bn0cmXlScNsNRLo=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "394571358ce82dff7411395829aa6a3aad45b907",
+ "rev": "f6687779bf4c396250831aa5a32cbfeb85bb07a3",
"type": "github"
},
"original": {
@@ -249,11 +110,11 @@
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1734119587,
- "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=",
+ "lastModified": 1738142207,
+ "narHash": "sha256-NGqpVVxNAHwIicXpgaVqJEJWeyqzoQJ9oc8lnK9+WC4=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5",
+ "rev": "9d3ae807ebd2981d593cddd0080856873139aa40",
"type": "github"
},
"original": {
@@ -270,11 +131,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
- "lastModified": 1734477737,
- "narHash": "sha256-cPCcKzLYCWS6ywHdJvn5DzaqOg8ppsv4E0giuaDQwYg=",
+ "lastModified": 1738362438,
+ "narHash": "sha256-EO2dVkMVLThWqv4hobEZEZGWBEuH2Z9SYqQDrbLSclU=",
"owner": "nix-community",
"repo": "NUR",
- "rev": "24a04cb00533ff6bd9098d303a789764afe81193",
+ "rev": "95ddad0ff0e67c90314c6ca46324dce5f9a910d2",
"type": "github"
},
"original": {
@@ -283,53 +144,15 @@
"type": "github"
}
},
- "nuscht-search": {
- "inputs": {
- "flake-utils": "flake-utils",
- "ixx": "ixx",
- "nixpkgs": [
- "catppuccin",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1733773348,
- "narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=",
- "owner": "NuschtOS",
- "repo": "search",
- "rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9",
- "type": "github"
- },
- "original": {
- "owner": "NuschtOS",
- "repo": "search",
- "type": "github"
- }
- },
"root": {
"inputs": {
"catppuccin": "catppuccin",
- "home-manager": "home-manager_2",
+ "home-manager": "home-manager",
"nixpkgs": "nixpkgs_2",
"nixpkgs-unstable": "nixpkgs-unstable",
"nur": "nur"
}
},
- "systems": {
- "locked": {
- "lastModified": 1681028828,
- "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
- "owner": "nix-systems",
- "repo": "default",
- "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
- "type": "github"
- },
- "original": {
- "owner": "nix-systems",
- "repo": "default",
- "type": "github"
- }
- },
"treefmt-nix": {
"inputs": {
"nixpkgs": [
diff --git a/nate-work/dotfiles/ghostty/config b/nate-work/dotfiles/ghostty/config
new file mode 100644
index 0000000..7d3c56a
--- /dev/null
+++ b/nate-work/dotfiles/ghostty/config
@@ -0,0 +1,46 @@
+theme = "catppuccin-macchiato"
+
+###
+# Font config
+###
+
+font-size = 14
+font-family = "Monaspace Xenon Var"
+font-family-bold = "Monaspace Argon Var"
+font-family-italic = "Monaspace Radon Var"
+font-family-bold-italic = "Monaspace Krypton Var"
+
+font-variation = wght=400
+font-variation = wdth=100
+font-variation = slnt=-2
+
+font-variation-bold = wght=600
+font-variation-bold = wdth=100
+
+font-variation-italic = wght=400
+font-variation-italic = wdth=100
+font-variation-italic = slnt=-10
+
+font-variation-bold-italic = wght=700
+font-variation-bold-italic = wdth=100
+font-variation-bold-italic = slnt=-3
+
+font-feature = +ss01, +ss02, +ss03, +ss04, +ss05, +ss06, +ss07, +ss08, +ss09, +ss10
+# Enables texture healing
+font-feature = +calt
+font-feature = +liga
+
+###
+# Keybinds
+###
+
+keybind = ctrl+shift+plus=increase_font_size:1
+# keybind = ctrl+minus=decrease_font_size:1
+
+###
+# Misc
+###
+
+window-padding-x = 4
+window-padding-y = 4
+copy-on-select=clipboard
diff --git a/nate-work/dotfiles/hypr/scripts/music_setup.sh b/nate-work/dotfiles/hypr/scripts/music_setup.sh
index 2d63b21..7e58b1e 100755
--- a/nate-work/dotfiles/hypr/scripts/music_setup.sh
+++ b/nate-work/dotfiles/hypr/scripts/music_setup.sh
@@ -12,7 +12,7 @@ hyprctl dispatch movewindow l
hyprctl dispatch resizeactive exact 45% 45%
hyprctl dispatch moveactive 30% 5%
-foot ~/.config/hypr/scripts/music_setup_cmd.sh &
+ghostty ~/.config/hypr/scripts/music_setup_cmd.sh &
sleep 1
hyprctl dispatch togglefloating
hyprctl dispatch resizeactive exact 95% 30%
diff --git a/nate-work/modules/home-manager/home.nix b/nate-work/modules/home-manager/home.nix
index 3aabdde..aff85ff 100644
--- a/nate-work/modules/home-manager/home.nix
+++ b/nate-work/modules/home-manager/home.nix
@@ -158,8 +158,16 @@
libsForQt5.qt5ct
# Install fonts
lato
- (nerdfonts.override { fonts = [ "Hermit" "Overpass" ]; })
- recursive
+ # (unstable.nerdfonts.override { fonts = [ "Iconsolata" "Hermit" "Overpass" ]; })
+ unstable.nerd-fonts.hurmit
+ unstable.nerd-fonts.overpass
+ unstable.nerd-fonts.monaspace
+ monaspace
+# fonts.packages = [
+# ...
+# pkgs.nerd-fonts._0xproto
+# pkgs.nerd-fonts.droid-sans-mono
+# ] recursive
];
};
diff --git a/nate-work/modules/hypr/hypr_home.nix b/nate-work/modules/hypr/hypr_home.nix
index 914202a..99a354f 100644
--- a/nate-work/modules/hypr/hypr_home.nix
+++ b/nate-work/modules/hypr/hypr_home.nix
@@ -16,7 +16,7 @@ in
# wayland.windowManager.hyprland.package = hyprland; # enable Hyprland
wayland.windowManager.hyprland.settings = {
"$mod" = "Super";
- "$terminal" = "foot";
+ "$terminal" = "ghostty";
"$fileManager" = "nautilus";
"$menu" = "nwg-drawer";
# Autostart
diff --git a/nate-work/modules/hypr/hyprland.nix b/nate-work/modules/hypr/hyprland.nix
index d668d74..6407079 100644
--- a/nate-work/modules/hypr/hyprland.nix
+++ b/nate-work/modules/hypr/hyprland.nix
@@ -31,6 +31,7 @@ in
bash
egl-wayland
foot
+ unstable.ghostty
git
glib # gsettings
man-pages
@@ -105,7 +106,7 @@ in
services.gnome.sushi.enable = true;
programs.nautilus-open-any-terminal = {
enable = true;
- terminal = "foot";
+ terminal = "ghostty";
};
programs.xfconf.enable = true;
programs.regreet.enable = true;