diff --git a/desktops/hyprland/hyprland.nix b/desktops/hyprland/hyprland.nix index 11bdd7a..0e047f3 100644 --- a/desktops/hyprland/hyprland.nix +++ b/desktops/hyprland/hyprland.nix @@ -10,6 +10,7 @@ "GBM_BACKEND,nvidia-drm" "__GLX_VENDOR_LIBRARY_NAME,nvidia" "WLR_NO_HARDWARE_CURSORS,1" + "NIXOS_OZONE_WL,1" ]; exec-once = [ "dunst" @@ -22,6 +23,9 @@ }; bind = import ./keybinds.nix; bindm = import ./mousebinds.nix; + bindr = [ + "SUPER,SUPER_L,exec,pkill wofi || wofi --show=drun" + ]; monitor = import ./monitors.nix; windowrule = [ "pseudo,^(alacritty)$" @@ -34,6 +38,7 @@ programs.alacritty.enable = true; programs.waybar = import ./waybar.nix; programs.wofi = import ./wofi.nix; + programs.swaylock = import ./swaylock.nix; home.packages = with pkgs; [ xwaylandvideobridge @@ -45,9 +50,17 @@ gtk = { enable = true; theme = { - name = "Adwaita"; + name = "adw-gtk3"; package = pkgs.adw-gtk3; }; + cursorTheme = { + name = "capitaine-cursors"; + package = pkgs.capitaine-cursors; + }; + iconTheme = { + name = "Tela"; + package = pkgs.tela-icon-theme; + }; }; home.file.profile = { diff --git a/desktops/hyprland/keybinds.nix b/desktops/hyprland/keybinds.nix index 02fba66..3e72e7d 100644 --- a/desktops/hyprland/keybinds.nix +++ b/desktops/hyprland/keybinds.nix @@ -1,6 +1,5 @@ [ "SUPER,Q,killactive" "SUPER,T,exec,alacritty" - ",SUPER,exec,wofi --show=dmenu" "SUPER_SHIFT,C,exec,hyprpicker" ] diff --git a/desktops/hyprland/swaylock.nix b/desktops/hyprland/swaylock.nix new file mode 100644 index 0000000..7dc2601 --- /dev/null +++ b/desktops/hyprland/swaylock.nix @@ -0,0 +1,3 @@ +{ + enable = true; +} diff --git a/desktops/hyprland/wofi.nix b/desktops/hyprland/wofi.nix index 640588a..b1f5768 100644 --- a/desktops/hyprland/wofi.nix +++ b/desktops/hyprland/wofi.nix @@ -2,5 +2,40 @@ enable = true; settings = {}; style = '' + window { + margin: 5px; + border: 2px solid red; + background-color: red; + } + + #input { + margin: 5px; + border: 2px solid blue; + background-color: blue; + } + + #inner-box { + margin: 5px; + border: 2px solid yellow; + background-color: yellow; + } + + #outer-box { + margin: 5px; + border: 2px solid orange; + background-color: orange; + } + + #scroll { + margin: 5px; + border: 2px solid orange; + background-color: orange; + } + + #text { + margin: 5px; + border: 2px solid cyan; + background-color: cyan; + } ''; } diff --git a/flake.nix b/flake.nix index d129231..e691a04 100644 --- a/flake.nix +++ b/flake.nix @@ -6,12 +6,6 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - - # hyprland.url = "github:hyprwm/Hyprland"; - # split-monitor-workspaces = { - # url = "github:Duckonaut/split-monitor-workspaces"; - # inputs.hyprland.follows = "hyprland"; - # }; }; outputs = {nixpkgs, home-manager, ...}: @@ -36,7 +30,6 @@ inherit pkgs; modules = [ - # hyprland.homeManagerModules.default home ]; }; diff --git a/packages.nix b/packages.nix index 5fea080..0716ba1 100644 --- a/packages.nix +++ b/packages.nix @@ -20,7 +20,7 @@ (import ./packages/threema-desktop.nix { inherit pkgs; }) (discord.override { withOpenASAR = true; - withVencord = true; + withVencord = false; }) slack