diff --git a/home/alice/configurations/Cape/default.nix b/home/alice/configurations/Cape/default.nix index b8ff63e..4264eaa 100644 --- a/home/alice/configurations/Cape/default.nix +++ b/home/alice/configurations/Cape/default.nix @@ -8,7 +8,6 @@ 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 73a7427..56a0f35 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 "#ffc87f" + active-color "#7fc8ff" 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,20 +122,22 @@ 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 { - // Slow down all animations by this factor. Values below 1 speed them up instead. - // slowdown 3.0 - + window-close { + spring damping-ratio=1.0 stiffness=800 epsilon=0.0001 + } } window-rule { - match app-id="^org\\.wezfurlong\\.wezterm$" - default-column-width { - - } + draw-border-with-background true + geometry-corner-radius 12 + clip-to-geometry true } window-rule { match app-id="^org\\.keepassxc\\.KeePassXC$" @@ -143,13 +145,46 @@ window-rule { block-out-from "screen-capture" } window-rule { + match app-id="^com\\.mitchellh\\.ghostty$" is-active=true draw-border-with-background false } -// 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 +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 } binds { Mod+V { @@ -455,8 +490,11 @@ binds { Alt+Print { screenshot-window } - Mod+Shift+E { + Mod+Shift+Q { 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 d0197e4..9c9c855 100644 --- a/home/modules/programs/helix/default.nix +++ b/home/modules/programs/helix/default.nix @@ -2,6 +2,7 @@ lib, pkgs, config, + outputs, ... }: { @@ -30,6 +31,7 @@ { 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 a9fc6b5..8e73060 100644 --- a/overlays/modifications/default.nix +++ b/overlays/modifications/default.nix @@ -3,7 +3,6 @@ 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 deleted file mode 100644 index 340c16e..0000000 --- a/overlays/modifications/helix.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ - outputs, - ... -}: -final: prev: -let - inherit (final) stdenv; - inherit (stdenv.hostPlatform) system; -in -{ - helix = outputs.packages."${system}".helix; -}