From 8daace9b77989a742b7393ef63940394459eb66b Mon Sep 17 00:00:00 2001 From: Menno van Leeuwen Date: Mon, 30 Dec 2024 13:38:14 +0100 Subject: [PATCH] adds ghostty --- config/home-manager/flake.lock | 18 +- .../packages/workstation/ulauncher.nix | 2 +- .../workstation/keyboard-shortcuts.nix | 2 +- config/hyprland.conf | 2 +- config/nixos/flake.lock | 172 +++++++++++++++--- config/nixos/flake.nix | 16 +- config/nixos/packages/workstation/default.nix | 1 + config/nixos/packages/workstation/ghostty.nix | 6 + 8 files changed, 183 insertions(+), 36 deletions(-) create mode 100644 config/nixos/packages/workstation/ghostty.nix diff --git a/config/home-manager/flake.lock b/config/home-manager/flake.lock index a1b2dab..7199614 100644 --- a/config/home-manager/flake.lock +++ b/config/home-manager/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1734366194, - "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=", + "lastModified": 1735344290, + "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=", "owner": "nix-community", "repo": "home-manager", - "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f", + "rev": "613691f285dad87694c2ba1c9e6298d04736292d", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1734875076, - "narHash": "sha256-Pzyb+YNG5u3zP79zoi8HXYMs15Q5dfjDgwCdUI5B0nY=", + "lastModified": 1735412871, + "narHash": "sha256-Qoz0ow6jDGUIBHxduc7Y1cjYFS71tvEGJV5Src/mj98=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1807c2b91223227ad5599d7067a61665c52d1295", + "rev": "9f94733f93e4fe6e82f516efae007096e4ab5a21", "type": "github" }, "original": { @@ -39,11 +39,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1734649271, - "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "lastModified": 1735471104, + "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", "type": "github" }, "original": { diff --git a/config/home-manager/packages/workstation/ulauncher.nix b/config/home-manager/packages/workstation/ulauncher.nix index e1c8383..a100164 100644 --- a/config/home-manager/packages/workstation/ulauncher.nix +++ b/config/home-manager/packages/workstation/ulauncher.nix @@ -16,7 +16,7 @@ let render-on-screen = "mouse-pointer-monitor"; show-indicator-icon = true; show-recent-apps = "4"; - terminal-command = "kgx"; + terminal-command = "ghostty"; theme-name = "dark"; }; diff --git a/config/home-manager/workstation/keyboard-shortcuts.nix b/config/home-manager/workstation/keyboard-shortcuts.nix index 03519c1..cd9eca3 100644 --- a/config/home-manager/workstation/keyboard-shortcuts.nix +++ b/config/home-manager/workstation/keyboard-shortcuts.nix @@ -30,7 +30,7 @@ }; "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/terminal" = { binding = "t"; - command = "kgx"; + command = "ghostty"; name = "terminal"; }; "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/emotes" = { diff --git a/config/hyprland.conf b/config/hyprland.conf index c89d771..7f39445 100644 --- a/config/hyprland.conf +++ b/config/hyprland.conf @@ -17,7 +17,7 @@ monitor=DP-2, highrr, 2560x0, 1 # See https://wiki.hyprland.org/Configuring/Keywords/ # Set programs that you use -$terminal = kitty +$terminal = ghostty $fileManager = nautilus $menu = ulauncher-wrapped --no-window-shadow --hide-window diff --git a/config/nixos/flake.lock b/config/nixos/flake.lock index 4f85f1e..195b075 100644 --- a/config/nixos/flake.lock +++ b/config/nixos/flake.lock @@ -49,6 +49,61 @@ "type": "github" } }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "ghostty": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs-stable": "nixpkgs-stable", + "nixpkgs-unstable": "nixpkgs-unstable", + "zig": "zig" + }, + "locked": { + "lastModified": 1735535921, + "narHash": "sha256-cfsHww91bRA2Frni54+blIGZGU9/269vaWzeGcNRNN0=", + "owner": "ghostty-org", + "repo": "ghostty", + "rev": "87bd0bb744d6a1c45022aa39f21219d0b6ff3261", + "type": "github" + }, + "original": { + "owner": "ghostty-org", + "repo": "ghostty", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -141,15 +196,15 @@ "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs", "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems", + "systems": "systems_2", "xdph": "xdph" }, "locked": { - "lastModified": 1734988658, - "narHash": "sha256-SSPQCHeqMRsR6rhONWFAHDMtQ5NEKnU8G2BktlDwIoY=", + "lastModified": 1735556315, + "narHash": "sha256-u5odETOAAJGnqJr+WxqNX1Y6/iiMIiACnB3W63aNGdo=", "owner": "hyprwm", "repo": "hyprland", - "rev": "2e2e2e2cad97eb017ab02f8a67b751e0abe3bb72", + "rev": "8c14c2a5f472cf3d361d3cbb90ee7d2d455aae08", "type": "github" }, "original": { @@ -175,11 +230,11 @@ ] }, "locked": { - "lastModified": 1734887159, - "narHash": "sha256-boPq+l4/D/Q+MvDqAI79fCdp/3Dit57YBuPbXa1cjW0=", + "lastModified": 1735295819, + "narHash": "sha256-iHDDF1kj+wX7fHGTgKaM6rli6+O8mVFNmpypo+SgnNs=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "859b9cd371b4e1bf1043cedc8ab6c514e13ab358", + "rev": "a41bcdccac7d3fe220b3a8519633f0a812da3439", "type": "github" }, "original": { @@ -283,11 +338,11 @@ ] }, "locked": { - "lastModified": 1734796073, - "narHash": "sha256-TnuKsa8OHrSJEmHm3TLGOWbPNA1gRjmZLsRzKrCqOsg=", + "lastModified": 1735316583, + "narHash": "sha256-AiiUwHWHfEdpFzXy7l1x3zInCUa1xcRMrbZ1XRSkzwU=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "c3331116ebd0b71df5ae8c6efe9a7f94148b03bf", + "rev": "8f15d45b120b33712f6db477fe5ffb18034d0ea8", "type": "github" }, "original": { @@ -323,11 +378,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1734649271, - "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "lastModified": 1735291276, + "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "rev": "634fd46801442d760e09493a794c4f15db2d0cbb", "type": "github" }, "original": { @@ -338,6 +393,22 @@ } }, "nixpkgs-stable": { + "locked": { + "lastModified": 1733423277, + "narHash": "sha256-TxabjxEgkNbCGFRHgM/b9yZWlBj60gUOUnRT/wbVQR8=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "e36963a147267afc055f7cf65225958633e536bf", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "release-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_2": { "locked": { "lastModified": 1730741070, "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", @@ -355,11 +426,27 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1734649271, - "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "lastModified": 1733229606, + "narHash": "sha256-FLYY5M0rpa5C2QAE3CKLYAM6TwbKicdRK6qNrSHlNrE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "rev": "566e53c2ad750c84f6d31f9ccb9d00f823165550", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-unstable_2": { + "locked": { + "lastModified": 1735471104, + "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", "type": "github" }, "original": { @@ -371,11 +458,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1734875076, - "narHash": "sha256-Pzyb+YNG5u3zP79zoi8HXYMs15Q5dfjDgwCdUI5B0nY=", + "lastModified": 1735412871, + "narHash": "sha256-Qoz0ow6jDGUIBHxduc7Y1cjYFS71tvEGJV5Src/mj98=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1807c2b91223227ad5599d7067a61665c52d1295", + "rev": "9f94733f93e4fe6e82f516efae007096e4ab5a21", "type": "github" }, "original": { @@ -387,13 +474,13 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "gitignore": "gitignore", "nixpkgs": [ "hyprland", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { "lastModified": 1734797603, @@ -411,13 +498,29 @@ }, "root": { "inputs": { + "ghostty": "ghostty", "hyprland": "hyprland", "hyprland-plugins": "hyprland-plugins", "nixpkgs": "nixpkgs_2", - "nixpkgs-unstable": "nixpkgs-unstable" + "nixpkgs-unstable": "nixpkgs-unstable_2" } }, "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_2": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -472,6 +575,31 @@ "repo": "xdg-desktop-portal-hyprland", "type": "github" } + }, + "zig": { + "inputs": { + "flake-compat": [ + "ghostty" + ], + "flake-utils": "flake-utils", + "nixpkgs": [ + "ghostty", + "nixpkgs-stable" + ] + }, + "locked": { + "lastModified": 1717848532, + "narHash": "sha256-d+xIUvSTreHl8pAmU1fnmkfDTGQYCn2Rb/zOwByxS2M=", + "owner": "mitchellh", + "repo": "zig-overlay", + "rev": "02fc5cc555fc14fda40c42d7c3250efa43812b43", + "type": "github" + }, + "original": { + "owner": "mitchellh", + "repo": "zig-overlay", + "type": "github" + } } }, "root": "root", diff --git a/config/nixos/flake.nix b/config/nixos/flake.nix index 3b8b2c9..05ee901 100644 --- a/config/nixos/flake.nix +++ b/config/nixos/flake.nix @@ -10,6 +10,7 @@ url = "github:hyprwm/hyprland-plugins"; inputs.hyprland.follows = "hyprland"; }; + ghostty.url = "github:ghostty-org/ghostty"; }; outputs = @@ -19,6 +20,7 @@ nixpkgs-unstable, hyprland, hyprland-plugins, + ghostty, # nixos-cosmic, }: let @@ -44,7 +46,12 @@ ./configuration.nix ]; specialArgs = { - inherit pkgs-unstable hyprland hyprland-plugins; + inherit + pkgs-unstable + hyprland + hyprland-plugins + ghostty + ; isWorkstation = true; isServer = false; }; @@ -58,7 +65,12 @@ ./configuration.nix ]; specialArgs = { - inherit pkgs-unstable hyprland hyprland-plugins; + inherit + pkgs-unstable + hyprland + hyprland-plugins + ghostty + ; isWorkstation = true; isServer = false; }; diff --git a/config/nixos/packages/workstation/default.nix b/config/nixos/packages/workstation/default.nix index b6dd28e..b5dd110 100644 --- a/config/nixos/packages/workstation/default.nix +++ b/config/nixos/packages/workstation/default.nix @@ -6,5 +6,6 @@ ./flatpak.nix ./steam.nix ./hyprland.nix + ./ghostty.nix ]; } diff --git a/config/nixos/packages/workstation/ghostty.nix b/config/nixos/packages/workstation/ghostty.nix new file mode 100644 index 0000000..9f4cd72 --- /dev/null +++ b/config/nixos/packages/workstation/ghostty.nix @@ -0,0 +1,6 @@ +{ ghostty, pkgs, ... }: +{ + environment.systemPackages = [ + ghostty.packages.x86_64-linux.default + ]; +}