From fe0525a579737a1266b7fdb1758f00acd6a91674 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Mon, 10 Feb 2025 14:09:15 -0600 Subject: [PATCH] Work on gnome config stuff --- flake.lock | 6 ++-- flake.nix | 6 +++- modules/home-manager/default.nix | 38 ++++++++++++++++++++++++ modules/home-manager/ghostty/config | 2 +- modules/home-manager/wezterm/wezterm.lua | 2 -- 5 files changed, 47 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index c303441..aa66142 100644 --- a/flake.lock +++ b/flake.lock @@ -216,11 +216,11 @@ "zig": "zig" }, "locked": { - "lastModified": 1736186781, - "narHash": "sha256-jiKBu/hVN6bKxShMCFS4RHXUQkRfmiuRYZXNc4iAiIc=", + "lastModified": 1739143498, + "narHash": "sha256-85TvsfDdOBfthR44rRJV9KXpj415StJqVyq+BBlLCvM=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "037de64ea2c3f6201948236559524986f41a72f7", + "rev": "a3e462bbba724bcf312fcd5edd12bb5e0251c853", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 5f987c9..47525f1 100644 --- a/flake.nix +++ b/flake.nix @@ -248,11 +248,15 @@ }; modifications = final: prev: let + helix-input = helix; wezterm-input = wezterm; + ghostty-input = ghostty; hyprland-input = hyprland; in rec { - helix = helix.outputs.packages.${prev.system}.helix; + helix = helix-input.outputs.packages.${prev.system}.helix; final.helix = helix; + ghostty = ghostty-input.outputs.packages.${prev.system}.ghostty; + final.ghostty = ghostty; /* TODO: would love to use a current wezterm build so I can make use of ssh/mux functionality without breakage source: https://github.com/wez/wezterm/issues/3771 diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index c4d01b3..87ad01d 100644 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -311,6 +311,7 @@ daniel = { settings = { "alerts.useSystemBackend" = true; + "widget.gtk.rounded-bottom-corners.enabled" = true; }; userChrome = '' #TabsToolbar { @@ -558,6 +559,24 @@ dconf = { enable = true; settings = { + "org/gnome/settings-daemon/plugins/media-keys" = { + screensaver = ["l"]; + mic-mute = ["v"]; + }; + "org/gnome/desktop/peripherals/keyboard" = { + # gnome key repeat + repeat-interval = 7; + delay = 200; + }; + "org/gnome/desktop/wm/preferences" = { + resize-with-right-button = true; + # mouse-button-modifier = ''; # default + }; + "org/gnome/desktop/wm/keybindings" = { + minimize = ["h"]; + show-desktop = ["d"]; + # mouse-button-modifier = ''; # default + }; "org/gnome/desktop/interface" = { clock-show-weekday = true; font-name = "IosevkaLyteTerm 12"; @@ -567,9 +586,28 @@ "org/gnome/mutter" = { experimental-features = ["scale-monitor-framebuffer" "variable-refresh-rate"]; }; + + "org/gnome/shell" = { + disable-user-extensions = false; + enabled-extensions = [ + # "paperwm@paperwm.github.com" + "tilingshell@ferrarodomenico.com" + ]; + }; + + "org/gnome/shell/extensions/tilingshell" = { + focus-window-right = ["l"]; + focus-window-left = ["h"]; + focus-window-up = ["k"]; + focus-window-down = ["j"]; + }; }; }; + home.packages = with pkgs; [ + gnomeExtensions.tiling-shell + ]; + programs.gnome-shell = { enable = true; extensions = [{package = pkgs.gnomeExtensions.gsconnect;}]; diff --git a/modules/home-manager/ghostty/config b/modules/home-manager/ghostty/config index ff1cd83..63442c9 100644 --- a/modules/home-manager/ghostty/config +++ b/modules/home-manager/ghostty/config @@ -1371,7 +1371,7 @@ window-inherit-font-size = true # # macOS: To hide the titlebar without removing the native window borders # or rounded corners, use `macos-titlebar-style = hidden` instead. -window-decoration = false +window-decoration = "server" # The font that will be used for the application's window and tab titles. # diff --git a/modules/home-manager/wezterm/wezterm.lua b/modules/home-manager/wezterm/wezterm.lua index f5f4af3..d6296e8 100644 --- a/modules/home-manager/wezterm/wezterm.lua +++ b/modules/home-manager/wezterm/wezterm.lua @@ -1,9 +1,7 @@ local wezterm = require 'wezterm' local config = wezterm.config_builder() -config.enable_wayland = false config.adjust_window_size_when_changing_font_size = false -config.front_end = "OpenGL" config.color_scheme = 'catppuccin-mocha-sapphire'; config.font_size = 12.0