diff --git a/flake.lock b/flake.lock index 8ce2ebb..b9bf31b 100644 --- a/flake.lock +++ b/flake.lock @@ -127,11 +127,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1754263839, - "narHash": "sha256-ck7lILfCNuunsLvExPI4Pw9OOCJksxXwozum24W8b+8=", + "lastModified": 1754365350, + "narHash": "sha256-NLWIkn1qM0wxtZu/2NXRaujWJ4Y1PSZlc7h0y6pOzOQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "1d7abbd5454db97e0af51416f4960b3fb64a4773", + "rev": "c5d7e957397ecb7d48b99c928611c6e780db1b56", "type": "github" }, "original": { @@ -159,11 +159,11 @@ "homebrew-cask": { "flake": false, "locked": { - "lastModified": 1754337299, - "narHash": "sha256-EUJ+kn8JtuNSc1mlAQLVXmk3W2bdGLjSGEq/IxvduBU=", + "lastModified": 1754378251, + "narHash": "sha256-ol6YF6T1TOK7Ea2A0cE/K6FstsRKl9cy3vML8mDEleQ=", "owner": "homebrew", "repo": "homebrew-cask", - "rev": "885bf23bf37c350adca6c3d007cb84f76ab2bb84", + "rev": "f3ac53ff0b16be95a8c84adf7848739b2429944d", "type": "github" }, "original": { @@ -175,11 +175,11 @@ "homebrew-core": { "flake": false, "locked": { - "lastModified": 1754338947, - "narHash": "sha256-C+Pt0qqnpNJsyXlLGg5n/WFvOWQ7e+bdxTJ9k4b86uA=", + "lastModified": 1754394050, + "narHash": "sha256-QksgXyQ3y+CawspGIMVzav/n5CJvjRimfOx6/Vom9Uc=", "owner": "homebrew", "repo": "homebrew-core", - "rev": "d05c7db4ea810874d9ffa7d786a9eeb8d663825a", + "rev": "9f2fd2fadc00a8af6094ebb461a18a5a1ef732ef", "type": "github" }, "original": { diff --git a/profiles/base/home-manager/zellij.nix b/profiles/base/home-manager/zellij.nix new file mode 100644 index 0000000..a9b0ca2 --- /dev/null +++ b/profiles/base/home-manager/zellij.nix @@ -0,0 +1,6 @@ +{ + programs.zellij = { + enable = true; + enableFishIntegration = true; + }; +} diff --git a/profiles/base/packages.nix b/profiles/base/packages.nix index b23b44d..778593e 100644 --- a/profiles/base/packages.nix +++ b/profiles/base/packages.nix @@ -4,6 +4,7 @@ with pkgs; [ age age-plugin-yubikey + delta docker docker-compose git diff --git a/profiles/darwin/default.nix b/profiles/darwin/default.nix index 5fcdbbb..8e1e6d8 100644 --- a/profiles/darwin/default.nix +++ b/profiles/darwin/default.nix @@ -38,13 +38,13 @@ ../base/home-manager/bat.nix ../base/home-manager/eza.nix ../base/home-manager/fish.nix - ../base/home-manager/ghostty.nix ../base/home-manager/git.nix ../base/home-manager/jujutsu.nix ../base/home-manager/ssh.nix ../base/home-manager/starship.nix ../base/home-manager/zoxide.nix ../base/home-manager/zsh.nix + ./home-manager/ghostty.nix ]; home = { packages = pkgs.callPackage ./packages.nix { }; diff --git a/profiles/darwin/home-manager/ghostty.nix b/profiles/darwin/home-manager/ghostty.nix new file mode 100644 index 0000000..7dd6bfa --- /dev/null +++ b/profiles/darwin/home-manager/ghostty.nix @@ -0,0 +1,57 @@ +{ + pkgs, + ... +}: + +{ + programs.ghostty = { + enable = true; + package = pkgs.ghostty-bin; + settings = { + command = "${pkgs.fish}/bin/fish"; + theme = "catppuccin-latte"; + window-padding-x = 8; + window-padding-y = 2; + window-padding-balance = true; + font-family = "Iosevka"; + font-size = 15.5; + font-feature = [ + "-calt" + "-dlig" + ]; + cursor-style = "block"; + mouse-hide-while-typing = true; + mouse-scroll-multiplier = 1.25; + shell-integration = "detect"; + shell-integration-features = "no-cursor"; + + keybind = [ + "global:ctrl+shift+space=toggle_quick_terminal" + "shift+enter=text:\\n" + "ctrl+one=goto_tab:1" + "ctrl+two=goto_tab:2" + "ctrl+three=goto_tab:3" + "ctrl+four=goto_tab:4" + "ctrl+five=goto_tab:5" + "ctrl+six=goto_tab:6" + "ctrl+seven=goto_tab:7" + "ctrl+eight=goto_tab:8" + "ctrl+nine=goto_tab:9" + "ctrl+left=previous_tab" + "ctrl+right=next_tab" + "ctrl+h=previous_tab" + "ctrl+l=next_tab" + "ctrl+shift+left=goto_split:left" + "ctrl+shift+right=goto_split:right" + "ctrl+shift+h=goto_split:left" + "ctrl+shift+j=goto_split:down" + "ctrl+shift+k=goto_split:up" + "ctrl+shift+l=goto_split:right" + "ctrl+shift+enter=new_split:right" + "ctrl+t=new_tab" + "ctrl+w=close_tab" + "ctrl+shift+w=close_surface" + ]; + }; + }; +} \ No newline at end of file