diff --git a/home/programs/fileman.nix b/home/programs/fileman.nix index cb5616f..51e6620 100644 --- a/home/programs/fileman.nix +++ b/home/programs/fileman.nix @@ -1,8 +1,8 @@ -{pkgs,...}:{ +{pkgs, ...}: { home.packages = with pkgs; [ pcmanfm ]; - + xdg.mimeApps.defaultApplications = { "inode/directory" = "pcmanfm.desktop"; }; diff --git a/home/programs/hyprland.nix b/home/programs/hyprland.nix index 3de6c00..9119e08 100644 --- a/home/programs/hyprland.nix +++ b/home/programs/hyprland.nix @@ -10,6 +10,7 @@ in { (import ./swaylock.nix) (import ./swayidle.nix) (import ./waybar.nix) + (import ./hycov.nix) ]; xdg.portal = { enable = true; @@ -39,7 +40,7 @@ in { workspace_swipe_numbered = true; }; decoration = { - rounding = 5; + rounding = 0; drop_shadow = false; }; bezier = [ @@ -52,7 +53,7 @@ in { "windows, 1, 1, default, popin" "border, 1, 1, default" "fade, 1, 1, default" - "workspaces, 1, 3, overshot" + "workspaces, 1, 1, default" "borderangle,1, 50, linear, loop" ]; }; @@ -60,8 +61,8 @@ in { # movement "${modifier}, h, movefocus, l" "${modifier}, l, movefocus, r" - "${modifier}, j, layoutmsg, cyclenext" - "${modifier}, k, layoutmsg, cycleprev" + + "${modifier}_SHIFT, space, cyclenext, floating" # window management "${modifier}, F, fullscreen," @@ -69,9 +70,11 @@ in { "${modifier}_SHIFT, X, killactive" # master layout - "${modifier}, space, layoutmsg,swapwithmaster master" - "${modifier}, W, layoutmsg, orientationprev" - "${modifier}_SHIFT, W, layoutmsg, orientationnext" + "${modifier}, j, layoutmsg, cyclenext" + "${modifier}, k, layoutmsg, cycleprev" + "${modifier}, space, layoutmsg, swapwithmaster master" + "${modifier}, W, layoutmsg, orientationtop" + "${modifier}_SHIFT, W, layoutmsg, orientationleft" # window grouping "${modifier}_SHIFT, V, togglegroup," @@ -136,11 +139,12 @@ in { "11, default:true" ]; general = { - gaps_out = 10; + gaps_out = 2; + gaps_in = 2; resize_on_border = true; layout = "master"; "col.active_border" = lib.mkForce "rgb(FFFF00) rgb(00FFFF) rgb(FF00FF)"; - border_size = lib.mkDefault 5; + border_size = lib.mkDefault 2; }; master = { mfact = 0.7; diff --git a/home/programs/scripts.nix b/home/programs/scripts.nix index 31a93b2..48cfa68 100644 --- a/home/programs/scripts.nix +++ b/home/programs/scripts.nix @@ -318,7 +318,8 @@ in { modifier = "${modifier}_SHIFT"; } ]; - }{ + } + { name = "select-word"; text = '' cat ${../../lib/words.txt} | ${my-deps.menu} | awk '{print $1}' | wl-copy diff --git a/nixos/modules/laptop.nix b/nixos/modules/laptop.nix index 59cf23d..11e1dfd 100644 --- a/nixos/modules/laptop.nix +++ b/nixos/modules/laptop.nix @@ -27,10 +27,6 @@ in { { wayland.windowManager.hyprland = { settings = { - general = { - gaps_out = 10; - border_size = 3; - }; bind = [ "SUPER_SHIFT, Q, killactive," ];