diff --git a/home/alice/configurations/Cape/default.nix b/home/alice/configurations/Cape/default.nix index 4264eaa..b8ff63e 100644 --- a/home/alice/configurations/Cape/default.nix +++ b/home/alice/configurations/Cape/default.nix @@ -8,6 +8,7 @@ youthlic = { xdg-dirs.enable = true; programs = { + helix.enable = true; gpg.enable = true; fish.enable = true; bash.enable = true; diff --git a/home/david/configurations/Tytonidae/niri/config.kdl b/home/david/configurations/Tytonidae/niri/config.kdl index 56a0f35..73a7427 100644 --- a/home/david/configurations/Tytonidae/niri/config.kdl +++ b/home/david/configurations/Tytonidae/niri/config.kdl @@ -53,7 +53,7 @@ layout { // You can change how the focus ring looks. focus-ring { // Uncomment this line to disable the focus ring. - off + // off // How many logical pixels the ring extends out from the windows. width 4 // Colors can be set in a variety of ways: @@ -83,9 +83,9 @@ layout { border { // The settings are the same as for the focus ring. // If you enable the border, you probably want to disable the focus ring. - // off + off width 4 - active-color "#7fc8ff" + active-color "#ffc87f" inactive-color "#505050" // active-gradient from="#ffbb66" to="#ffc880" angle=45 relative-to="workspace-view" // inactive-gradient from="#505050" to="#808080" angle=45 relative-to="workspace-view" @@ -122,22 +122,20 @@ spawn-at-startup "wl-paste" "--watch" "cliphist" "store" // Additionally, clients will be informed that they are tiled, removing some client-side rounded corners. // This option will also fix border/focus ring drawing behind some semitransparent windows. // After enabling or disabling this, you need to restart the apps for this to take effect. -prefer-no-csd +// prefer-no-csd screenshot-path "~/pic/screenshot%Y-%m-%d-%H-%M-%S.png" -hotkey-overlay { - skip-at-startup -} // You can also set this to null to disable saving screenshots to disk. // screenshot-path null animations { - window-close { - spring damping-ratio=1.0 stiffness=800 epsilon=0.0001 - } + // Slow down all animations by this factor. Values below 1 speed them up instead. + // slowdown 3.0 + } window-rule { - draw-border-with-background true - geometry-corner-radius 12 - clip-to-geometry true + match app-id="^org\\.wezfurlong\\.wezterm$" + default-column-width { + + } } window-rule { match app-id="^org\\.keepassxc\\.KeePassXC$" @@ -145,46 +143,13 @@ window-rule { block-out-from "screen-capture" } window-rule { - match app-id="^com\\.mitchellh\\.ghostty$" is-active=true draw-border-with-background false } -window-rule { - match app-id="^com\\.mitchellh\\.ghostty$" is-active=false - opacity 0.8 - draw-border-with-background false -} -window-rule { - match is-window-cast-target=true - focus-ring { - active-color "#f38ba8" - inactive-color "#7d0d2d" - } - border { - inactive-color "#7d0d2d" - } - tab-indicator { - active-color "#f38ba8" - inactive-color "#7d0d2d" - } - shadow { - on - } -} -window-rule { - match app-id="^org\\.telegram\\.desktop$" title="Media viewer" - open-floating true -} -layer-rule { - match namespace="^swaync-notification-window$" - match namespace="^swaync-control-center$" - block-out-from "screen-capture" -} -layer-rule { - match namespace="^launcher$" - shadow { - on - } - geometry-corner-radius 10 +// Example: enable rounded corners for all windows. +// (This example rule is commented out with a "/-" in front.) +/-window-rule { +geometry-corner-radius 12 +clip-to-geometry true } binds { Mod+V { @@ -490,11 +455,8 @@ binds { Alt+Print { screenshot-window } - Mod+Shift+Q { + Mod+Shift+E { quit } - Mod+E { - expand-column-to-available-width - } } diff --git a/home/modules/programs/helix/default.nix b/home/modules/programs/helix/default.nix index 9c9c855..d0197e4 100644 --- a/home/modules/programs/helix/default.nix +++ b/home/modules/programs/helix/default.nix @@ -2,7 +2,6 @@ lib, pkgs, config, - outputs, ... }: { @@ -31,7 +30,6 @@ { programs.helix = lib.mkIf cfg.enable { enable = true; - package = outputs.packages."${pkgs.system}".helix; defaultEditor = true; extraPackages = cfg.extraPackages; settings = diff --git a/overlays/modifications/default.nix b/overlays/modifications/default.nix index 8e73060..a9fc6b5 100644 --- a/overlays/modifications/default.nix +++ b/overlays/modifications/default.nix @@ -3,6 +3,7 @@ final: prev: let inherit (prev) lib; overlay-files = [ + ./helix.nix ./spotify.nix ./niri.nix ./ghostty.nix diff --git a/overlays/modifications/helix.nix b/overlays/modifications/helix.nix new file mode 100644 index 0000000..340c16e --- /dev/null +++ b/overlays/modifications/helix.nix @@ -0,0 +1,12 @@ +{ + outputs, + ... +}: +final: prev: +let + inherit (final) stdenv; + inherit (stdenv.hostPlatform) system; +in +{ + helix = outputs.packages."${system}".helix; +}