From cd6b256c88bfe5a04deaa1d46b6c6311897ecb57 Mon Sep 17 00:00:00 2001 From: Laurent Gueret Date: Mon, 16 Feb 2026 09:34:11 +0100 Subject: [PATCH] last maj --- flake.nix | 3 +- hosts/darwin/home/alistreaza.nix | 42 ++++++++++++++++++++++++- hosts/darwin/home/partials/paneru.nix | 37 ---------------------- hosts/darwin/system/partials/system.nix | 4 +-- modules/system/darwin/jetbrain.nix | 7 ++--- {hosts => overlays}/nixos/overlays.nix | 0 6 files changed, 46 insertions(+), 47 deletions(-) delete mode 100644 hosts/darwin/home/partials/paneru.nix rename {hosts => overlays}/nixos/overlays.nix (100%) diff --git a/flake.nix b/flake.nix index a9ea313..cf23241 100755 --- a/flake.nix +++ b/flake.nix @@ -61,7 +61,7 @@ home-manager = home-manager; }; modules = [ - ./hosts/nixos/overlays.nix + (import-tree ./overlays/nixos) (import-tree ./hosts/common) (import-tree ./modules/system/nixos) @@ -94,7 +94,6 @@ ] ++ [ (import-tree ./overlays/darwin) - (import-tree ./modules/system/darwin) home-manager.darwinModules.home-manager (import-tree ./hosts/common) diff --git a/hosts/darwin/home/alistreaza.nix b/hosts/darwin/home/alistreaza.nix index 0c599ff..1bbb041 100644 --- a/hosts/darwin/home/alistreaza.nix +++ b/hosts/darwin/home/alistreaza.nix @@ -3,7 +3,7 @@ home-manager.users.alistreaza = { imports = [ (import-tree ../../../modules/home/common) - (import-tree ./partials) + (import-tree ../../../modules/home/darwin) ]; home = { @@ -30,6 +30,46 @@ targets.darwin.linkApps.enable = false; targets.darwin.copyApps.enable = false; + services.paneru = { + enable = true; + # Equivalent to what you would put into `~/.paneru` (See Configuration options below). + settings = { + options = { + preset_column_widths = [ + 0.25 + 0.33 + 0.5 + 0.66 + 0.75 + ]; + swipe_gesture_fingers = 4; + animation_speed = 4000; + }; + bindings = { + window_focus_west = "cmd - h"; + window_focus_east = "cmd - l"; + window_focus_north = "cmd - k"; + window_focus_south = "cmd - j"; + window_swap_west = "alt - h"; + window_swap_east = "alt - l"; + window_swap_first = "alt + shift - h"; + window_swap_last = "alt + shift - l"; + window_center = "alt - c"; + window_resize = "alt - r"; + window_fullwidth = "alt - f"; + window_manage = "ctrl + alt - t"; + window_stack = "alt - ]"; + window_unstack = "alt + shift - ]"; + quit = "ctrl + alt - q"; + }; + windows.all = { + title = ".*"; + vertical_padding = 5; + horizontal_padding = 5; + }; + }; + }; + # The state version is required and should stay at the version you # originally installed. home.stateVersion = "25.11"; diff --git a/hosts/darwin/home/partials/paneru.nix b/hosts/darwin/home/partials/paneru.nix deleted file mode 100644 index 39a80f6..0000000 --- a/hosts/darwin/home/partials/paneru.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ ... }: -{ - services.paneru = { - enable = true; - # Equivalent to what you would put into `~/.paneru` (See Configuration options below). - settings = { - options = { - preset_column_widths = [ - 0.25 - 0.33 - 0.5 - 0.66 - 0.75 - ]; - swipe_gesture_fingers = 4; - animation_speed = 4000; - }; - bindings = { - window_focus_west = "cmd - h"; - window_focus_east = "cmd - l"; - window_focus_north = "cmd - k"; - window_focus_south = "cmd - j"; - window_swap_west = "alt - h"; - window_swap_east = "alt - l"; - window_swap_first = "alt + shift - h"; - window_swap_last = "alt + shift - l"; - window_center = "alt - c"; - window_resize = "alt - r"; - window_fullwidth = "alt - f"; - window_manage = "ctrl + alt - t"; - window_stack = "alt - ]"; - window_unstack = "alt + shift - ]"; - quit = "ctrl + alt - q"; - }; - }; - }; -} diff --git a/hosts/darwin/system/partials/system.nix b/hosts/darwin/system/partials/system.nix index e2150b0..ddca1b3 100644 --- a/hosts/darwin/system/partials/system.nix +++ b/hosts/darwin/system/partials/system.nix @@ -14,7 +14,7 @@ minimize-to-application = true; show-recents = false; tilesize = 30; - autohide = false; + autohide = true; orientation = "bottom"; persistent-apps = [ { app = "/System/Applications/Apps.app"; } @@ -36,7 +36,7 @@ { app = "/Applications/DataSpell.app"; } { app = "/Applications/iTerm.app"; } ]; - persistent-others= []; + persistent-others = [ ]; wvous-bl-corner = 1; wvous-br-corner = 3; wvous-tl-corner = 1; diff --git a/modules/system/darwin/jetbrain.nix b/modules/system/darwin/jetbrain.nix index 80f4310..04658d6 100644 --- a/modules/system/darwin/jetbrain.nix +++ b/modules/system/darwin/jetbrain.nix @@ -12,12 +12,9 @@ in homebrew.casks = [ "intellij-idea" "pycharm" - "phpstorm" - "rustrover" - "goland" - "datagrip" - "dataspell" "clion" + "rustrover" + "dataspell" ]; }; diff --git a/hosts/nixos/overlays.nix b/overlays/nixos/overlays.nix similarity index 100% rename from hosts/nixos/overlays.nix rename to overlays/nixos/overlays.nix