diff --git a/home/home-nix-book.nix b/home/home-nix-book.nix index fdc1dfb..0956ca9 100644 --- a/home/home-nix-book.nix +++ b/home/home-nix-book.nix @@ -3,7 +3,6 @@ { imports = [ ./home-default.nix - ./modules/hyprland/nix-book.nix ]; home.i3_sway.extraSwayConfig = { diff --git a/home/home-z790prors.nix b/home/home-z790prors.nix index a08e843..0c855ae 100644 --- a/home/home-z790prors.nix +++ b/home/home-z790prors.nix @@ -3,6 +3,5 @@ { imports = [ ./home-default.nix - ./modules/hyprland/z790prors.nix ]; } diff --git a/home/modules/hyprland/default.nix b/home/modules/hyprland/default.nix deleted file mode 100644 index a0d75f0..0000000 --- a/home/modules/hyprland/default.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ inputs, ... }: - -{ - imports = [ - ./hyprpaper.nix - ]; - - wayland.windowManager.hyprland = { - enable = true; - plugins = [ inputs.hy3.packages.x86_64-linux.hy3 ]; - settings = { - "$mod" = "SUPER"; - "$terminal" = "kitty"; - "$fileManager" = "dolphin"; - "$menu" = "wofi --show drun"; - - exec-once = [ - "waybar" - "dunst" - ]; - - xwayland = { - force_zero_scaling = true; - }; - - input = { - kb_layout = "us"; - kb_options = "caps:escape"; - follow_mouse = 1; - touchpad.natural_scroll = false; - }; - - windowrulev2 = [ - # I can guess, but I should figure out what this actually does - "suppressevent maximize, class:.*" - ]; - - general.layout = "hy3"; - - bind = - [ - "SHIFT_$mod, Q, killactive" - "SHIFT_$mod, M, exit" - - "$mod, D, exec, $menu" - "$mod, Return, exec, $terminal" - - "$mod, H, hy3:movefocus, l" - "$mod, L, hy3:movefocus, r" - "$mod, K, hy3:movefocus, u" - "$mod, J, hy3:movefocus, d" - - "SHIFT_$mod, H, hy3:movewindow, l" - "SHIFT_$mod, L, hy3:movewindow, r" - "SHIFT_$mod, K, hy3:movewindow, u" - "SHIFT_$mod, J, hy3:movewindow, d" - - "$mod, V, hy3:makegroup, opposite" - "$mod, W, hy3:changegroup, toggletab" - - "$mod, A, hy3:changefocus, raise" - "SHIFT_$mod, A, hy3:changefocus, lower" - - "$mod, M, fullscreen, 0" - "$mod, E, hy3:expand, expand" - "SHIFT_$mod, E, hy3:expand, base" - - "$mod, Q, hy3:warpcursor" - ] - ++ ( - # workspaces - # binds $mod + [shift +] {1..10} to [move to] workspace {1..10} - builtins.concatLists (builtins.genList ( - x: let - ws = let - c = (x + 1) / 10; - in - builtins.toString (x + 1 - (c * 10)); - in [ - "$mod, ${ws}, workspace, ${toString (x + 1)}" - "$mod SHIFT, ${ws}, hy3:movetoworkspace, ${toString (x + 1)}" - ] - ) - 10) - ); - - bindm = - [ - "$mod, mouse:272, movewindow" - "$mod, mouse:273, resizewindow" - ]; - }; - }; -} diff --git a/home/modules/hyprland/hyprpaper.nix b/home/modules/hyprland/hyprpaper.nix deleted file mode 100644 index 38c4e45..0000000 --- a/home/modules/hyprland/hyprpaper.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - services.hyprpaper = { - enable = true; - settings = { - ipc = "on"; - splash = false; - preload = [ - "${config.xdg.dataHome}/wallpaper.jpg" - ]; - wallpaper = [ - ",${config.xdg.dataHome}/wallpaper.jpg" - ]; - }; - }; - - xdg.dataFile."wallpaper.jpg" = { - source = ./wallpaper.jpg; - }; -} diff --git a/home/modules/hyprland/nix-book.nix b/home/modules/hyprland/nix-book.nix deleted file mode 100644 index 7672b38..0000000 --- a/home/modules/hyprland/nix-book.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - wayland.windowManager.hyprland.settings.monitor = ",preferred,2880x1800@90.00Hz,1.33333"; -} diff --git a/home/modules/hyprland/wallpaper.jpg b/home/modules/hyprland/wallpaper.jpg deleted file mode 100644 index 64d23c1..0000000 Binary files a/home/modules/hyprland/wallpaper.jpg and /dev/null differ diff --git a/home/modules/hyprland/z790prors.nix b/home/modules/hyprland/z790prors.nix deleted file mode 100644 index 26e8adb..0000000 --- a/home/modules/hyprland/z790prors.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - wayland.windowManager.hyprland.settings.monitor = "DP-1,3440x1440@164.90,0x0,1.33333,vrr,1"; - wayland.windowManager.hyprland.settings.env = [ - "LIBVA_DRIVER_NAME,nvidia" - "XDG_SESSION_TYPE,wayland" - "GBM_BACKEND,nvidia-drm" - "__GLX_VENDOR_LIBRARY_NAME,nvidia" - "NVD_BACKEND,direct" - "ELECTRON_OZONE_PLATFORM_HINT,auto" - "NIXOS_OZONE_WL,1" - ]; - - wayland.windowManager.hyprland.settings.cursor.no_hardware_cursors = true; -} diff --git a/roles/default.nix b/roles/default.nix index ec9b10e..71fcc4c 100644 --- a/roles/default.nix +++ b/roles/default.nix @@ -65,7 +65,6 @@ with lib; max-jobs = "auto"; trusted-users = [ "johno" ]; substituters = [ - "https://hyprland.cachix.org" ]; };