From 478d0de3a9aee86c83f23be4990c73d30f407544 Mon Sep 17 00:00:00 2001 From: joy Date: Fri, 4 Oct 2024 16:16:47 +0200 Subject: [PATCH] lol --- hosts/phone/home/git/default.nix | 2 +- modules/apps/gui/mpv/default.nix | 1 - modules/default.nix | 2 +- modules/{hypr => wm}/ags/bar/config.js | 0 modules/{hypr => wm}/ags/bar/style.css | 0 modules/{hypr => wm}/ags/default.nix | 0 modules/{hypr => wm}/ags/tsconfig.json | 0 modules/{hypr => wm}/clip/default.nix | 0 modules/{hypr => wm}/default.nix | 4 +-- .../{hypr/idle => wm/hypridle}/default.nix | 0 .../{hypr/land => wm/hyprland}/default.nix | 32 +++++++++++-------- .../{hypr/land => wm/hyprland}/scripts/ags.sh | 0 .../land => wm/hyprland}/scripts/cmus.sh | 0 .../land => wm/hyprland}/scripts/gamemode.sh | 0 .../{hypr/land => wm/hyprland}/scripts/mpv.sh | 0 .../land => wm/hyprland}/scripts/screen.sh | 0 .../{hypr/land => wm/hyprland}/scripts/vm.sh | 0 .../land => wm/hyprland}/scripts/volume.sh | 0 modules/{hypr => wm}/misc/default.nix | 0 modules/{hypr => wm}/theme/default.nix | 0 modules/{hypr => wm}/theme/gtk/default.nix | 0 .../{hypr => wm}/theme/gtk/gruvbox-plus.nix | 0 modules/{hypr => wm}/theme/qt/default.nix | 0 modules/{hypr => wm}/theme/stylix/default.nix | 0 24 files changed, 22 insertions(+), 19 deletions(-) rename modules/{hypr => wm}/ags/bar/config.js (100%) rename modules/{hypr => wm}/ags/bar/style.css (100%) rename modules/{hypr => wm}/ags/default.nix (100%) rename modules/{hypr => wm}/ags/tsconfig.json (100%) rename modules/{hypr => wm}/clip/default.nix (100%) rename modules/{hypr => wm}/default.nix (69%) rename modules/{hypr/idle => wm/hypridle}/default.nix (100%) rename modules/{hypr/land => wm/hyprland}/default.nix (87%) rename modules/{hypr/land => wm/hyprland}/scripts/ags.sh (100%) rename modules/{hypr/land => wm/hyprland}/scripts/cmus.sh (100%) rename modules/{hypr/land => wm/hyprland}/scripts/gamemode.sh (100%) rename modules/{hypr/land => wm/hyprland}/scripts/mpv.sh (100%) rename modules/{hypr/land => wm/hyprland}/scripts/screen.sh (100%) rename modules/{hypr/land => wm/hyprland}/scripts/vm.sh (100%) rename modules/{hypr/land => wm/hyprland}/scripts/volume.sh (100%) rename modules/{hypr => wm}/misc/default.nix (100%) rename modules/{hypr => wm}/theme/default.nix (100%) rename modules/{hypr => wm}/theme/gtk/default.nix (100%) rename modules/{hypr => wm}/theme/gtk/gruvbox-plus.nix (100%) rename modules/{hypr => wm}/theme/qt/default.nix (100%) rename modules/{hypr => wm}/theme/stylix/default.nix (100%) diff --git a/hosts/phone/home/git/default.nix b/hosts/phone/home/git/default.nix index e445a5c..d3126b5 100644 --- a/hosts/phone/home/git/default.nix +++ b/hosts/phone/home/git/default.nix @@ -2,6 +2,6 @@ programs.git = { enable = true; userEmail = "mail@joygnu.org"; - userName = "joygnu"; + userName = "joy"; }; } diff --git a/modules/apps/gui/mpv/default.nix b/modules/apps/gui/mpv/default.nix index ef03b8e..8c29c21 100644 --- a/modules/apps/gui/mpv/default.nix +++ b/modules/apps/gui/mpv/default.nix @@ -7,7 +7,6 @@ "," = "frame-back-step"; "." = "frame-step"; space = "cycle-values speed 1 2"; - # space = "frame-step; cycle-values speed 1 2"; DOWN = "add volume -5"; UP = "add volume 5"; }; diff --git a/modules/default.nix b/modules/default.nix index 2af19df..8d33567 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -1,7 +1,7 @@ { imports = [ ./apps - ./hypr + ./wm ./hardware ./services ./system diff --git a/modules/hypr/ags/bar/config.js b/modules/wm/ags/bar/config.js similarity index 100% rename from modules/hypr/ags/bar/config.js rename to modules/wm/ags/bar/config.js diff --git a/modules/hypr/ags/bar/style.css b/modules/wm/ags/bar/style.css similarity index 100% rename from modules/hypr/ags/bar/style.css rename to modules/wm/ags/bar/style.css diff --git a/modules/hypr/ags/default.nix b/modules/wm/ags/default.nix similarity index 100% rename from modules/hypr/ags/default.nix rename to modules/wm/ags/default.nix diff --git a/modules/hypr/ags/tsconfig.json b/modules/wm/ags/tsconfig.json similarity index 100% rename from modules/hypr/ags/tsconfig.json rename to modules/wm/ags/tsconfig.json diff --git a/modules/hypr/clip/default.nix b/modules/wm/clip/default.nix similarity index 100% rename from modules/hypr/clip/default.nix rename to modules/wm/clip/default.nix diff --git a/modules/hypr/default.nix b/modules/wm/default.nix similarity index 69% rename from modules/hypr/default.nix rename to modules/wm/default.nix index c908c2e..cc7968e 100644 --- a/modules/hypr/default.nix +++ b/modules/wm/default.nix @@ -1,8 +1,8 @@ { imports = [ + ./hyprland + ./hypridle ./ags - ./idle - ./land ./theme ./clip ./misc diff --git a/modules/hypr/idle/default.nix b/modules/wm/hypridle/default.nix similarity index 100% rename from modules/hypr/idle/default.nix rename to modules/wm/hypridle/default.nix diff --git a/modules/hypr/land/default.nix b/modules/wm/hyprland/default.nix similarity index 87% rename from modules/hypr/land/default.nix rename to modules/wm/hyprland/default.nix index 3149605..8d2cd21 100644 --- a/modules/hypr/land/default.nix +++ b/modules/wm/hyprland/default.nix @@ -1,13 +1,14 @@ -{pkgs,...}: { +{ pkgs, ... }: { programs.hyprland = { enable = true; }; + home-manager.users.joy = { wayland.windowManager.hyprland = { enable = true; settings = { "$mod" = "SUPER"; - "$sciPath" = "~/nix/modules/hypr/land/scripts"; + "$sciPath" = "~/nix/modules/wm/hyprland/scripts"; cursor = { inactive_timeout = "3"; }; @@ -15,7 +16,7 @@ "HYPRCURSOR_THEME = Bibata-Modern-Ice" "HYPRCURSOR_SIZE = 24" "NIXOS_OZONE_WL = 1" - "QT_QPA_PLATFORM,wayland;xcb" + "QT_QPA_PLATFORM=wayland;xcb" "QT_QPA_PLATFORMTHEME = qt5ct" "QT_AUTO_SCREEN_SCALE_FACTOR = 1" "QT_WAYLAND_DISABLE_WINDOWDECORATION =1" @@ -32,13 +33,15 @@ "ags" ]; windowrule = [ - "float,title:^(Pipewire)(.*)$" - "float,title:^(Disks)(.*)$" - "float,title:^(Calculator)(.*)$" - "float,title:^(Bluetooth)(.*)$" - "float,title:^(Clocks)(.*)$" - "float,title:^(Network Connections)(.*)$" - "opacity 0.9,^(Alacritty)(.*)$" + ]; + windowrulev2 = [ + "float,:title:^(mpv)(.*)$" + "float,title:(Pipewire)" + "float,title:(Disks)" + "float,title:(Calculator)" + "float,title:(Bluetooth)" + "float,title:(Clocks)" + "float,title:(Network Connections)" ]; gestures = { workspace_swipe = true; @@ -77,13 +80,13 @@ "$mod, A, exec, rofi -show drun" "$mod, F, exec, freetube" "$mod, C, exec, hyprpicker -a" - "$mod+Shift, W, exec, sh $sciPath/vm.sh" + "$mod+Shift, W, exec, sh $sciPath/vm.sh" "$mod+Shift, Z, exec, grim - | swappy -f -" "$mod, Z, exec, sh $sciPath/screen.sh" "$mod, V, exec, cliphist list | rofi -dmenu | cliphist decode | wl-copy" "$mod, O, exec, sh $sciPath/mpv.sh" "$mod+Shift, TAB,hyprexpo:expo, toggleoverview" - # controles + # controls "$mod, Q, killactive" "$mod, W, togglefloating" "$mod, R, togglesplit" @@ -93,7 +96,8 @@ "$mod+shift, B, exec, sh $sciPath/ags.sh" "$mod, up, exec, sh $sciPath/volume.sh -i" "$mod, down, exec, sh $sciPath/volume.sh -d" - "$mod, P, exec, hyprctl dispatch togglefloating && hyprctl dispatch pin" + "$mod, P, exec, hyprctl dispatch togglefloating active; hyprctl dispatch pin active; hyprctl dispatch resizeactive 800 600; hyprctl dispatch movewindowpixel exact 0 100%-600" + # cmus "$mod, D, exec, sh $sciPath/cmus.sh" "$mod, space, exec, playerctl play-pause" @@ -153,7 +157,7 @@ ", XF86AudioMicMute, exec, sh $sciPath/volume.sh -t" ]; }; - plugins = with pkgs.hyprlandPlugins; [ + plugins = with pkgs.hyprlandPlugins; [ hyprexpo ]; }; diff --git a/modules/hypr/land/scripts/ags.sh b/modules/wm/hyprland/scripts/ags.sh similarity index 100% rename from modules/hypr/land/scripts/ags.sh rename to modules/wm/hyprland/scripts/ags.sh diff --git a/modules/hypr/land/scripts/cmus.sh b/modules/wm/hyprland/scripts/cmus.sh similarity index 100% rename from modules/hypr/land/scripts/cmus.sh rename to modules/wm/hyprland/scripts/cmus.sh diff --git a/modules/hypr/land/scripts/gamemode.sh b/modules/wm/hyprland/scripts/gamemode.sh similarity index 100% rename from modules/hypr/land/scripts/gamemode.sh rename to modules/wm/hyprland/scripts/gamemode.sh diff --git a/modules/hypr/land/scripts/mpv.sh b/modules/wm/hyprland/scripts/mpv.sh similarity index 100% rename from modules/hypr/land/scripts/mpv.sh rename to modules/wm/hyprland/scripts/mpv.sh diff --git a/modules/hypr/land/scripts/screen.sh b/modules/wm/hyprland/scripts/screen.sh similarity index 100% rename from modules/hypr/land/scripts/screen.sh rename to modules/wm/hyprland/scripts/screen.sh diff --git a/modules/hypr/land/scripts/vm.sh b/modules/wm/hyprland/scripts/vm.sh similarity index 100% rename from modules/hypr/land/scripts/vm.sh rename to modules/wm/hyprland/scripts/vm.sh diff --git a/modules/hypr/land/scripts/volume.sh b/modules/wm/hyprland/scripts/volume.sh similarity index 100% rename from modules/hypr/land/scripts/volume.sh rename to modules/wm/hyprland/scripts/volume.sh diff --git a/modules/hypr/misc/default.nix b/modules/wm/misc/default.nix similarity index 100% rename from modules/hypr/misc/default.nix rename to modules/wm/misc/default.nix diff --git a/modules/hypr/theme/default.nix b/modules/wm/theme/default.nix similarity index 100% rename from modules/hypr/theme/default.nix rename to modules/wm/theme/default.nix diff --git a/modules/hypr/theme/gtk/default.nix b/modules/wm/theme/gtk/default.nix similarity index 100% rename from modules/hypr/theme/gtk/default.nix rename to modules/wm/theme/gtk/default.nix diff --git a/modules/hypr/theme/gtk/gruvbox-plus.nix b/modules/wm/theme/gtk/gruvbox-plus.nix similarity index 100% rename from modules/hypr/theme/gtk/gruvbox-plus.nix rename to modules/wm/theme/gtk/gruvbox-plus.nix diff --git a/modules/hypr/theme/qt/default.nix b/modules/wm/theme/qt/default.nix similarity index 100% rename from modules/hypr/theme/qt/default.nix rename to modules/wm/theme/qt/default.nix diff --git a/modules/hypr/theme/stylix/default.nix b/modules/wm/theme/stylix/default.nix similarity index 100% rename from modules/hypr/theme/stylix/default.nix rename to modules/wm/theme/stylix/default.nix