From fcf9b318c44fa0bdd7292b4060f0a48f2ef454b1 Mon Sep 17 00:00:00 2001
From: Daniel Lundin <dln@arity.se>
Date: Sun, 9 Mar 2025 09:22:29 +0100
Subject: [PATCH 1/4] ghostty: use package from nixpkgs
---
flake.nix | 1 -
home/common/ghostty.nix | 4 +---
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/flake.nix b/flake.nix
index 0eb9df5..0918288 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,7 +14,6 @@
};
inputs = {
- ghostty.url = "github:ghostty-org/ghostty";
neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
diff --git a/home/common/ghostty.nix b/home/common/ghostty.nix
index 50f8cd5..e41df52 100644
--- a/home/common/ghostty.nix
+++ b/home/common/ghostty.nix
@@ -1,8 +1,6 @@
{
config,
- inputs,
lib,
- pkgs,
...
}:
{
@@ -10,7 +8,7 @@
programs.ghostty = {
enable = true;
enableFishIntegration = true;
- package = inputs.ghostty.packages.${pkgs.system}.default;
+ # package = inputs.ghostty.packages.${pkgs.system}.default;
settings = {
font-size = 11;
font-family = "Berkeley Mono";
From c1eb392528565e145457c932091c28e0ead7de90 Mon Sep 17 00:00:00 2001
From: Daniel Lundin <dln@arity.se>
Date: Sun, 9 Mar 2025 09:22:29 +0100
Subject: [PATCH 2/4] jj: signing config
---
home/dln/home.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/home/dln/home.nix b/home/dln/home.nix
index f0d23e4..ae8681e 100644
--- a/home/dln/home.nix
+++ b/home/dln/home.nix
@@ -53,7 +53,7 @@ in
};
signing = {
- sign-all = true;
+ behavior = "own";
backend = "ssh";
backends.ssh.allowed-signers = "/home/dln/.ssh/authorized_keys";
key = "/home/dln/.ssh/git_signing_key.pub";
From 6b334b05e869b6cdd3aec159b253be92dc2d4e6f Mon Sep 17 00:00:00 2001
From: Daniel Lundin <dln@arity.se>
Date: Sun, 9 Mar 2025 09:22:29 +0100
Subject: [PATCH 3/4] just: Remove boot recipe since it might break the system
if not rebooted
---
justfile | 3 ---
1 file changed, 3 deletions(-)
diff --git a/justfile b/justfile
index 75763bf..ccf14df 100644
--- a/justfile
+++ b/justfile
@@ -4,9 +4,6 @@ set shell := ["/usr/bin/env", "bash", "-euo", "pipefail", "-c"]
default:
@just --list
-boot:
- nh os boot .
-
build:
nh os build .
From d0240503710bf640c244fad584187bd4d8669d12 Mon Sep 17 00:00:00 2001
From: Daniel Lundin <dln@arity.se>
Date: Sun, 9 Mar 2025 09:22:29 +0100
Subject: [PATCH 4/4] ghostty: tweaks
---
flake.lock | 227 ++++++----------------------------------
home/common/ghostty.nix | 4 +-
home/common/gnome.nix | 1 +
3 files changed, 38 insertions(+), 194 deletions(-)
diff --git a/flake.lock b/flake.lock
index ea297bf..f1e65c9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -17,22 +17,6 @@
}
},
"flake-compat_2": {
- "flake": false,
- "locked": {
- "lastModified": 1733328505,
- "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
- "owner": "edolstra",
- "repo": "flake-compat",
- "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
- "type": "github"
- },
- "original": {
- "owner": "edolstra",
- "repo": "flake-compat",
- "type": "github"
- }
- },
- "flake-compat_3": {
"flake": false,
"locked": {
"lastModified": 1696426674,
@@ -56,11 +40,11 @@
]
},
"locked": {
- "lastModified": 1740872218,
- "narHash": "sha256-ZaMw0pdoUKigLpv9HiNDH2Pjnosg7NBYMJlHTIsHEUo=",
+ "lastModified": 1741352980,
+ "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "3876f6b87db82f33775b1ef5ea343986105db764",
+ "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9",
"type": "github"
},
"original": {
@@ -90,50 +74,9 @@
"type": "indirect"
}
},
- "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"
- }
- },
- "ghostty": {
- "inputs": {
- "flake-compat": "flake-compat",
- "flake-utils": "flake-utils",
- "nixpkgs-stable": "nixpkgs-stable",
- "nixpkgs-unstable": "nixpkgs-unstable",
- "zig": "zig",
- "zig2nix": "zig2nix"
- },
- "locked": {
- "lastModified": 1741376783,
- "narHash": "sha256-vXlLil+0Cz6hznEX2GpwDlb8TM+Q8Cz0gLTebUhPtvE=",
- "owner": "ghostty-org",
- "repo": "ghostty",
- "rev": "4a215a9518c277780babe5d00e24784f456c80dd",
- "type": "github"
- },
- "original": {
- "owner": "ghostty-org",
- "repo": "ghostty",
- "type": "github"
- }
- },
"git-hooks": {
"inputs": {
- "flake-compat": "flake-compat_3",
+ "flake-compat": "flake-compat_2",
"gitignore": "gitignore",
"nixpkgs": [
"neovim-nightly-overlay",
@@ -141,11 +84,11 @@
]
},
"locked": {
- "lastModified": 1740915799,
- "narHash": "sha256-JvQvtaphZNmeeV+IpHgNdiNePsIpHD5U/7QN5AeY44A=",
+ "lastModified": 1741379162,
+ "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=",
"owner": "cachix",
"repo": "git-hooks.nix",
- "rev": "42b1ba089d2034d910566bf6b40830af6b8ec732",
+ "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc",
"type": "github"
},
"original": {
@@ -205,11 +148,11 @@
]
},
"locked": {
- "lastModified": 1741378606,
- "narHash": "sha256-ytDmwV93lZ1f6jswJkxEQz5cBlwje/2rH/yUZDADZNs=",
+ "lastModified": 1741579508,
+ "narHash": "sha256-skRbH+UF2ES+msEa+KWi7AQFX73S+QsGlPsyCU6XyE0=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "95711f926676018d279ba09fe7530d03b5d5b3e2",
+ "rev": "744f749dd6fbc1489591ea370b95156858629cb9",
"type": "github"
},
"original": {
@@ -220,7 +163,7 @@
},
"neovim-nightly-overlay": {
"inputs": {
- "flake-compat": "flake-compat_2",
+ "flake-compat": "flake-compat",
"flake-parts": "flake-parts",
"git-hooks": "git-hooks",
"hercules-ci-effects": "hercules-ci-effects",
@@ -229,11 +172,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
- "lastModified": 1741306000,
- "narHash": "sha256-qaDw0TyUceZBLntPBOdd1642T/mBGMNtK5NBuv2gWiY=",
+ "lastModified": 1741565384,
+ "narHash": "sha256-J6i/A2XM0cctEUJH3p0jeDUg1jhzKriPjfkhvEc/THw=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
- "rev": "c1855b306b8eeb70118b3ba70471188a65e694e7",
+ "rev": "7ecc342f01679cf4b275d8353bdcd192dfde4333",
"type": "github"
},
"original": {
@@ -245,11 +188,11 @@
"neovim-src": {
"flake": false,
"locked": {
- "lastModified": 1741302428,
- "narHash": "sha256-zcgucpL/rgEC/IIii6R4NvmtJsYT+/F0ub1FQOWVv0Q=",
+ "lastModified": 1741563807,
+ "narHash": "sha256-KfhHApWCRoqzR3X529be2qeBRa7KY8gXh8C2204J1rE=",
"owner": "neovim",
"repo": "neovim",
- "rev": "e46f07b1d2942c7b5c08fca9a4cac735ee2c0c71",
+ "rev": "b90f649ca2e240c1bfb22fe91247bc90314af1e1",
"type": "github"
},
"original": {
@@ -265,11 +208,11 @@
]
},
"locked": {
- "lastModified": 1740886574,
- "narHash": "sha256-jN6kJ41B6jUVDTebIWeebTvrKP6YiLd1/wMej4uq4Sk=",
+ "lastModified": 1741490098,
+ "narHash": "sha256-/tjVMbMzxJXrJaEk9N5esnbLebIZrkS1fbDJce/RiQg=",
"owner": "nix-community",
"repo": "nix-index-database",
- "rev": "26a0f969549cf4d56f6e9046b9e0418b3f3b94a5",
+ "rev": "296a2c992a28b37427d062ade6e20d467e479e3f",
"type": "github"
},
"original": {
@@ -280,11 +223,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1741037377,
- "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=",
+ "lastModified": 1741402956,
+ "narHash": "sha256-y2hByvBM03s9T2fpeLjW6iprbxnhV9mJMmSwCHc41ZQ=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "02032da4af073d0f6110540c8677f16d4be0117f",
+ "rev": "ed0b1881565c1ffef490c10d663d4f542031dad3",
"type": "github"
},
"original": {
@@ -296,27 +239,11 @@
},
"nixpkgs-stable": {
"locked": {
- "lastModified": 1738255539,
- "narHash": "sha256-hP2eOqhIO/OILW+3moNWO4GtdJFYCqAe9yJZgvlCoDQ=",
+ "lastModified": 1741445498,
+ "narHash": "sha256-F5Em0iv/CxkN5mZ9hRn3vPknpoWdcdCyR0e4WklHwiE=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "c3511a3b53b482aa7547c9d1626fd7310c1de1c5",
- "type": "github"
- },
- "original": {
- "owner": "nixos",
- "ref": "release-24.11",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs-stable_2": {
- "locked": {
- "lastModified": 1741332913,
- "narHash": "sha256-ri1e8ZliWS3Jnp9yqpKApHaOo7KBN33W8ECAKA4teAQ=",
- "owner": "nixos",
- "repo": "nixpkgs",
- "rev": "20755fa05115c84be00b04690630cb38f0a203ad",
+ "rev": "52e3095f6d812b91b22fb7ad0bfc1ab416453634",
"type": "github"
},
"original": {
@@ -328,27 +255,11 @@
},
"nixpkgs-unstable": {
"locked": {
- "lastModified": 1738136902,
- "narHash": "sha256-pUvLijVGARw4u793APze3j6mU1Zwdtz7hGkGGkD87qw=",
+ "lastModified": 1741402956,
+ "narHash": "sha256-y2hByvBM03s9T2fpeLjW6iprbxnhV9mJMmSwCHc41ZQ=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "9a5db3142ce450045840cc8d832b13b8a2018e0c",
- "type": "github"
- },
- "original": {
- "owner": "nixos",
- "ref": "nixpkgs-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs-unstable_2": {
- "locked": {
- "lastModified": 1741310760,
- "narHash": "sha256-aizILFrPgq/W53Jw8i0a1h1GZAAKtlYOrG/A5r46gVM=",
- "owner": "nixos",
- "repo": "nixpkgs",
- "rev": "de0fe301211c267807afd11b12613f5511ff7433",
+ "rev": "ed0b1881565c1ffef490c10d663d4f542031dad3",
"type": "github"
},
"original": {
@@ -360,11 +271,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1741246872,
- "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=",
+ "lastModified": 1741379970,
+ "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "10069ef4cf863633f57238f179a0297de84bd8d3",
+ "rev": "36fd87baa9083f34f7f5027900b62ee6d09b1f2f",
"type": "github"
},
"original": {
@@ -376,28 +287,12 @@
},
"root": {
"inputs": {
- "ghostty": "ghostty",
"home-manager": "home-manager",
"neovim-nightly-overlay": "neovim-nightly-overlay",
"nix-index-database": "nix-index-database",
"nixpkgs": "nixpkgs_2",
- "nixpkgs-stable": "nixpkgs-stable_2",
- "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"
+ "nixpkgs-stable": "nixpkgs-stable",
+ "nixpkgs-unstable": "nixpkgs-unstable"
}
},
"treefmt-nix": {
@@ -420,60 +315,6 @@
"repo": "treefmt-nix",
"type": "github"
}
- },
- "zig": {
- "inputs": {
- "flake-compat": [
- "ghostty"
- ],
- "flake-utils": [
- "ghostty",
- "flake-utils"
- ],
- "nixpkgs": [
- "ghostty",
- "nixpkgs-stable"
- ]
- },
- "locked": {
- "lastModified": 1738239110,
- "narHash": "sha256-Y5i9mQ++dyIQr+zEPNy+KIbc5wjPmfllBrag3cHZgcE=",
- "owner": "mitchellh",
- "repo": "zig-overlay",
- "rev": "1a8fb6f3a04724519436355564b95fce5e272504",
- "type": "github"
- },
- "original": {
- "owner": "mitchellh",
- "repo": "zig-overlay",
- "type": "github"
- }
- },
- "zig2nix": {
- "inputs": {
- "flake-utils": [
- "ghostty",
- "flake-utils"
- ],
- "nixpkgs": [
- "ghostty",
- "nixpkgs-stable"
- ]
- },
- "locked": {
- "lastModified": 1741368279,
- "narHash": "sha256-WTaC8HmnIq6O71iK0g9as404BbmS+YyEP5qS85m2JBY=",
- "owner": "jcollie",
- "repo": "zig2nix",
- "rev": "672971b5b6911de21446ad4fc76dee677922eda0",
- "type": "github"
- },
- "original": {
- "owner": "jcollie",
- "ref": "672971b5b6911de21446ad4fc76dee677922eda0",
- "repo": "zig2nix",
- "type": "github"
- }
}
},
"root": "root",
diff --git a/home/common/ghostty.nix b/home/common/ghostty.nix
index e41df52..25765b6 100644
--- a/home/common/ghostty.nix
+++ b/home/common/ghostty.nix
@@ -8,7 +8,6 @@
programs.ghostty = {
enable = true;
enableFishIntegration = true;
- # package = inputs.ghostty.packages.${pkgs.system}.default;
settings = {
font-size = 11;
font-family = "Berkeley Mono";
@@ -35,6 +34,8 @@
gtk-tabs-location = "hidden";
gtk-titlebar = false;
gtk-titlebar-hide-when-maximized = true;
+ window-height = 60;
+ window-width = 160;
window-padding-balance = true;
window-padding-color = "extend";
window-theme = "system";
@@ -46,6 +47,7 @@
"ctrl+i=text:\\x09"
"ctrl+m=text:\\x0D"
"ctrl+tab=goto_split:previous"
+ "alt+`=goto_split:previous"
"ctrl+[=text:\\x1B"
"super+enter=toggle_fullscreen"
];
diff --git a/home/common/gnome.nix b/home/common/gnome.nix
index 0c07521..d92b7ac 100644
--- a/home/common/gnome.nix
+++ b/home/common/gnome.nix
@@ -26,6 +26,7 @@ with lib.hm.gvariant;
minimize = [ "<Super>comma" ];
move-to-center = [ "<Super>c" ];
switch-applications = [ "<Super>Tab" ];
+ switch-group = [ "<Super>Above_Tab" ];
switch-windows = [ "<Alt>Tab" ];
move-to-workspace-1 = [ "<Shift>F1" ];
move-to-workspace-2 = [ "<Shift>F2" ];