diff --git a/flake.lock b/flake.lock index c98adf4..9bcef5d 100644 --- a/flake.lock +++ b/flake.lock @@ -193,6 +193,25 @@ "type": "sourcehut" } }, + "hyprland": { + "inputs": { + "nixpkgs": "nixpkgs", + "wlroots": "wlroots" + }, + "locked": { + "lastModified": 1669309881, + "narHash": "sha256-Au7BTeUe++JCOWwvO4O3xLpWlZlbmsOJK+EurjIbgqE=", + "owner": "hyprwm", + "repo": "Hyprland", + "rev": "379597e78f512ff2d64a83ba3eb21b7a3444d4f9", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "Hyprland", + "type": "github" + } + }, "master": { "locked": { "lastModified": 1667830549, @@ -209,6 +228,22 @@ } }, "nixpkgs": { + "locked": { + "lastModified": 1668765800, + "narHash": "sha256-rC40+/W6Hio7b/RsY8SvQPKNx4WqNcTgfYv8cUMAvJk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "52b2ac8ae18bbad4374ff0dd5aeee0fdf1aea739", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { "locked": { "lastModified": 1667669848, "narHash": "sha256-nD2dk2A+1zUlUT18ppDFVWwimi26+ultc2QRsulQwQ8=", @@ -224,7 +259,7 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs_3": { "locked": { "lastModified": 1667292599, "narHash": "sha256-7ISOUI1aj6UKMPIL+wwthENL22L3+A9V+jS8Is3QsRo=", @@ -266,7 +301,7 @@ "pre-commit-hooks_2": { "inputs": { "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1667760143, @@ -291,8 +326,9 @@ "forgit-git": "forgit-git", "home-manager": "home-manager", "howdy": "howdy", + "hyprland": "hyprland", "master": "master", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "pre-commit-hooks": "pre-commit-hooks_2", "stable": "stable", "utils": "utils_2" @@ -346,6 +382,24 @@ "repo": "flake-utils-plus", "type": "github" } + }, + "wlroots": { + "flake": false, + "locked": { + "host": "gitlab.freedesktop.org", + "lastModified": 1668785720, + "narHash": "sha256-CX+PYJP2PxZWL380WzyMNsrfRgIb/78brdwvDg/zj28=", + "owner": "wlroots", + "repo": "wlroots", + "rev": "4ff46e6cf9463e594605928feeb7c55cf323b5e7", + "type": "gitlab" + }, + "original": { + "host": "gitlab.freedesktop.org", + "owner": "wlroots", + "repo": "wlroots", + "type": "gitlab" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index bdb2968..5336489 100644 --- a/flake.nix +++ b/flake.nix @@ -50,6 +50,10 @@ url = "sourcehut:~moritzboehme/howdy"; inputs.nixpkgs.follows = "nixpkgs"; }; + + hyprland = { + url = "github:hyprwm/Hyprland"; + }; }; outputs = @@ -92,6 +96,7 @@ extraSpecialArgs = { inherit inputs self; }; }; } + inputs.hyprland.nixosModules.default inputs.agenix.nixosModules.age inputs.howdy.nixosModules.default ]; diff --git a/hosts/nixos-desktop/default.nix b/hosts/nixos-desktop/default.nix index 32cf357..0bbdc40 100644 --- a/hosts/nixos-desktop/default.nix +++ b/hosts/nixos-desktop/default.nix @@ -4,6 +4,7 @@ { lib , config , pkgs +, inputs , ... }: { imports = [ @@ -13,7 +14,7 @@ # KERNEL # HACK to get nvidia driver to build - # boot.kernelPackages = pkgs.linuxPackages_latest; + boot.kernelPackages = pkgs.linuxPackages_latest; # BOOT boot = { @@ -59,12 +60,13 @@ ''; }; - services.xserver.videoDrivers = [ "nvidia" ]; + # services.xserver.videoDrivers = [ "nvidia" ]; hardware.opengl = { enable = true; driSupport32Bit = true; + driSupport = true; }; - hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.legacy_470; + # hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.legacy_470; services.xserver.xrandrHeads = [ { output = "HDMI-1"; } { diff --git a/hosts/nixos-laptop/default.nix b/hosts/nixos-laptop/default.nix index 8bb6c1d..4c7130d 100644 --- a/hosts/nixos-laptop/default.nix +++ b/hosts/nixos-laptop/default.nix @@ -11,9 +11,15 @@ ./hardware-configuration.nix ]; - services.howdy = { - enable = true; - certainty = 3.0; + # services.howdy = { + # enable = true; + # certainty = 3.0; + # }; + + + my.programs = { + bspwm.enable = false; + hyprland.enable = true; }; # BOOT diff --git a/modules/config/nix.nix b/modules/config/nix.nix index 0dbd9ff..a932cbb 100644 --- a/modules/config/nix.nix +++ b/modules/config/nix.nix @@ -51,12 +51,14 @@ in "https://jupyterwith.cachix.org" "https://nix-community.cachix.org" "https://pre-commit-hooks.cachix.org" + "https://hyprland.cachix.org" ]; trusted-public-keys = [ "jupyterwith.cachix.org-1:/kDy2B6YEhXGJuNguG1qyqIodMyO4w8KwWH4/vAc7CI=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" "pre-commit-hooks.cachix.org-1:Pkk3Panw5AW24TOv6kz3PvLhlH8puAsJTBbOPmBo7Rc=" + "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" ]; trusted-users = [ "root" "@wheel" ]; diff --git a/modules/profiles/desktop.nix b/modules/profiles/desktop.nix index 3334689..b56dd38 100644 --- a/modules/profiles/desktop.nix +++ b/modules/profiles/desktop.nix @@ -20,7 +20,7 @@ with lib; { programs = { adb.enable = true; - bspwm.enable = true; + bspwm.enable = mkDefault true; code.enable = true; emacs.enable = true; firefox = { diff --git a/modules/programs/default.nix b/modules/programs/default.nix index 82e2dd4..abc4c23 100644 --- a/modules/programs/default.nix +++ b/modules/programs/default.nix @@ -32,5 +32,6 @@ ./xmonad ./zathura.nix ./zsh.nix + ./hyprland ]; } diff --git a/modules/programs/hyprland/default.nix b/modules/programs/hyprland/default.nix new file mode 100644 index 0000000..d05ad4c --- /dev/null +++ b/modules/programs/hyprland/default.nix @@ -0,0 +1,71 @@ +{ config +, lib +, pkgs +, inputs +, ... +}: + +with lib; +let + cfg = config.my.programs.hyprland; + + hyprland-default = inputs.hyprland.packages.${pkgs.system}.default; + hyprland-nvidia = hyprland-default.override { nvidiaPatches = true; }; + hyprland = if cfg.nvidiaSupport then hyprland-nvidia else hyprland-default; +in +{ + options.my.programs.hyprland = { + enable = mkEnableOption "hyprland"; + nvidiaSupport = mkEnableOption "enable nvidia Support"; + }; + + config = mkIf cfg.enable { + home-manager.users.moritz = { + imports = [ inputs.hyprland.homeManagerModules.default ]; + programs.waybar = { + enable = true; + package = pkgs.waybar-hyprland; + systemd.enable = true; + settings = { + mainBar = { + layer = "top"; + position = "top"; + height = 30; + output = [ + "eDP-1" + "HDMI-A-1" + ]; + modules-left = [ "wlr/workspaces" ]; + modules-center = [ "hyprland/window" ]; + modules-right = [ "network" "memory" "cpu" "battery" "clock" ]; + modules = { + "wlr/workspaces" = { + on-click = "activate"; + }; + }; + }; + }; + }; + wayland.windowManager.hyprland = { + enable = true; + package = hyprland; + extraConfig = builtins.readFile ./hyprland.conf; + }; + }; + programs.hyprland = { + enable = true; + package = null; + }; + services.xserver = { + enable = true; + displayManager = { + gdm.enable = true; + sessionPackages = [ hyprland ]; + }; + }; + xdg.portal = { + enable = true; + wlr.enable = true; + }; + }; +} diff --git a/modules/programs/hyprland/hyprland.conf b/modules/programs/hyprland/hyprland.conf new file mode 100644 index 0000000..c8ac776 --- /dev/null +++ b/modules/programs/hyprland/hyprland.conf @@ -0,0 +1,160 @@ +# +# Please note not all available settings / options are set here. +# For a full list, see the wiki +# + +# See https://wiki.hyprland.org/Configuring/Monitors/ +monitor=,preferred,auto,1 + + +# See https://wiki.hyprland.org/Configuring/Keywords/ for more + +# Execute your favorite apps at launch +# exec-once = waybar & hyprpaper & firefox + +# Source a file (multi-file configs) +# source = ~/.config/hypr/myColors.conf + +# For all categories, see https://wiki.hyprland.org/Configuring/Variables/ +input { + kb_layout = de + kb_variant = + kb_model = + kb_options = + kb_rules = + + follow_mouse = 1 + + touchpad { + natural_scroll = yes + } + + sensitivity = 0 # -1.0 - 1.0, 0 means no modification. +} + +general { + # See https://wiki.hyprland.org/Configuring/Variables/ for more + + gaps_in = 5 + gaps_out = 5 + border_size = 2 + col.active_border = rgba(1affffee) + col.inactive_border = rgba(595959aa) + + layout = dwindle +} + +decoration { + # See https://wiki.hyprland.org/Configuring/Variables/ for more + + rounding = 5 + inactive_opacity = 0.98 + blur = yes + blur_size = 8 + blur_passes = 1 + blur_new_optimizations = on + + drop_shadow = yes + shadow_range = 4 + shadow_render_power = 3 + col.shadow = rgba(1a1a1aee) +} + +animations { + enabled = yes + + # Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more + + bezier = myBezier, 0.45, 0, 0.55, 1 + + animation = windows, 1, 3, myBezier + animation = windowsOut, 1, 3, myBezier + animation = border, 1, 3, myBezier + animation = fade, 1, 3, myBezier + animation = workspaces, 1, 3, myBezier +} + +dwindle { + # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more + pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below + preserve_split = yes # you probably want this +} + +master { + # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more + new_is_master = true +} + +gestures { + # See https://wiki.hyprland.org/Configuring/Variables/ for more + workspace_swipe = on +} + +# Example per-device config +# See https://wiki.hyprland.org/Configuring/Keywords/#executing for more +device:epic mouse V1 { + sensitivity = -0.5 +} + +# Example windowrule v1 +# windowrule = float, ^(kitty)$ +# Example windowrule v2 +# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$ +windowrulev2 = float,class:^(rofi)$ +# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more + + +# See https://wiki.hyprland.org/Configuring/Keywords/ for more +$mainMod = SUPER +$windowMod = ALT + +# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more +bind = $mainMod, RETURN, exec, kitty +bind = $mainMod, Q, killactive, +bind = $mainMod, M, exit, +bind = $mainMod, E, exec, emacsclient -c -a emacs +bind = $mainMod, F, togglefloating, +bind = $mainMod, D, exec, rofi -show combi +bind = $mainMod, P, pseudo, # dwindle +bind = $mainMod, T, togglesplit, # dwindle + +# Move focus with mainMod + arrow keys +bind = $mainMod, H, movefocus, l +bind = $mainMod, L, movefocus, r +bind = $mainMod, K, movefocus, u +bind = $mainMod, J, movefocus, d + +# Switch workspaces with mainMod + [0-9] +bind = $mainMod, 1, workspace, 1 +bind = $mainMod, 2, workspace, 2 +bind = $mainMod, 3, workspace, 3 +bind = $mainMod, 4, workspace, 4 +bind = $mainMod, 5, workspace, 5 +bind = $mainMod, 6, workspace, 6 +bind = $mainMod, 7, workspace, 7 +bind = $mainMod, 8, workspace, 8 +bind = $mainMod, 9, workspace, 9 +bind = $mainMod, 0, workspace, 10 + +# Move active window to a workspace with mainMod + SHIFT + [0-9] +bind = $mainMod SHIFT, 1, movetoworkspace, 1 +bind = $mainMod SHIFT, 2, movetoworkspace, 2 +bind = $mainMod SHIFT, 3, movetoworkspace, 3 +bind = $mainMod SHIFT, 4, movetoworkspace, 4 +bind = $mainMod SHIFT, 5, movetoworkspace, 5 +bind = $mainMod SHIFT, 6, movetoworkspace, 6 +bind = $mainMod SHIFT, 7, movetoworkspace, 7 +bind = $mainMod SHIFT, 8, movetoworkspace, 8 +bind = $mainMod SHIFT, 9, movetoworkspace, 9 +bind = $mainMod SHIFT, 0, movetoworkspace, 10 + +# Scroll through existing workspaces with mainMod + scroll +bind = $mainMod, mouse_down, workspace, e+1 +bind = $mainMod, mouse_up, workspace, e-1 + +# Move/resize windows with mainMod + LMB/RMB and dragging +bindm = $mainMod, mouse:272, movewindow +bindm = $mainMod, mouse:273, resizewindow + +exec-once=synology-drive +exec-once=waybar diff --git a/modules/programs/rofi/default.nix b/modules/programs/rofi/default.nix index 56fa79a..1bb06dd 100644 --- a/modules/programs/rofi/default.nix +++ b/modules/programs/rofi/default.nix @@ -21,7 +21,7 @@ in programs.rofi = { enable = true; package = - pkgs.rofi.override { plugins = with pkgs; [ rofi-calc rofi-emoji ]; }; + pkgs.rofi-wayland.override { plugins = with pkgs; [ rofi-calc rofi-emoji ]; }; extraConfig = { combi-modi = "drun,window,emoji"; }; }; xdg = { diff --git a/overlays/default.nix b/overlays/default.nix index a31bed2..505736f 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,6 +1,12 @@ { inputs }: final: prev: { nixpkgs-review-checks = inputs.nixpkgs-review-checks.defaultPackage."${prev.system}"; agenix = inputs.agenix.defaultPackage."${prev.system}"; + waybar-hyprland = prev.waybar.overrideAttrs (old: { + postPatch = old.postPatch or "" + '' + ${final.gnused}/bin/sed -i 's,zext_workspace_handle_v1_activate(workspace_handle_);,const std::string command = "${final.hyprland}/bin/hyprctl dispatch workspace " + name_;\n\tsystem(command.c_str());,g' src/modules/wlr/workspace_manager.cpp + ''; + mesonFlags = old.mesonFlags or [ ] ++ [ "-Dexperimental=true" ]; + }); master = import inputs.master { inherit (prev) system; config.allowUnfree = true;