diff --git a/flake.nix b/flake.nix index dbf0527..470ebda 100644 --- a/flake.nix +++ b/flake.nix @@ -9,7 +9,7 @@ nixos-hardware.url = "github:NixOS/nixos-hardware/master"; # nixos user repository ? :o - nur.url "git:nix-community/NUR"; + nur.url = "git:nix-community/NUR"; # alejandra ?? think its a code formatter # alejandra.url = "github:kamadorueda/alejandra/3.0.0"; diff --git a/modules/core/packages/packages.nix b/modules/core/packages/packages.nix index cb7339a..300a7b8 100644 --- a/modules/core/packages/packages.nix +++ b/modules/core/packages/packages.nix @@ -10,6 +10,7 @@ firefox ## filsesystem support + udiskie ntfs3g xfsprogs @@ -45,6 +46,11 @@ (unstable.nerdfonts.override { fonts = ["NerdFontsSymbolsOnly"]; }) ## maybe more + + ## libraries + glib + qt5-wayland + qt6-wayland ]; diff --git a/modules/home/hyprland/default.nix b/modules/home/hyprland/default.nix index c8e98f1..d1eb184 100644 --- a/modules/home/hyprland/default.nix +++ b/modules/home/hyprland/default.nix @@ -3,5 +3,8 @@ imports = [ (import ./hyprland.nix) ] ++ [ (import ./config.nix) ] ++ [ (import ./variables.nix) ] + ++ [ (import ./waybar) ] + ++ [ (import ./wofi) ] + # ++ [ (import ./stylix) ] ++ [ inputs.hyprland.homeManagerModules.default ]; } diff --git a/modules/home/hyprland/environment.nix b/modules/home/hyprland/environment.nix deleted file mode 100644 index 710ff45..0000000 --- a/modules/home/hyprland/environment.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ config, pkgs, ... }: - -{ - - home = { - - sessionVariables = { - EDITOR = "micro"; - BROWSER = "firefox"; - TERMINAL = "kitty"; - - XDG_CURRENT_DESKTOP = "Hyprland"; - XDG_SESSION_DESKTOP - "Hyprland"; - XDG_SESSION_TYPE = "wayland"; - - }; - - }; - -} diff --git a/modules/home/hyprland/hypr2.nix b/modules/home/hyprland/hypr2.nix deleted file mode 100644 index 27ca178..0000000 --- a/modules/home/hyprland/hypr2.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ config, lib, pkgs, osConfig, ... } - -{ - - imports = [ - hyprland.homeManagerModules.default - ./hyprland-environment.nix - - ]; - - home = { - packages = with pkgs; [ - waybar - ]; - }; - - programs = { - hyperland = { - enable = true; - xwayland.enable = true; - }; - }; - - wayland.windowManager.hyprland = { - enable = true; - systemdIntegration = true; - settings = { - "$mod" = "SUPER"; - bind = [ - "$mod, F, exec, firefox" - ", Print, exec, grimblast copy area" - ] ++ ( # 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}, movetoworkspace, ${toString (x + 1)}" - ] - ) - 10) - ); - }; - }; - - home.stateVersion = "23.11"; - -} diff --git a/modules/home/hyprland/hyprland.nix b/modules/home/hyprland/hyprland.nix index 859a7db..f46b48f 100644 --- a/modules/home/hyprland/hyprland.nix +++ b/modules/home/hyprland/hyprland.nix @@ -1,28 +1,41 @@ -{ inputs, pkgs, ...}: +{ inputs, pkgs, ...}: + { + home.packages = with pkgs; [ - # swww - swaybg + wayland + inputs.hypr-contrib.packages.${pkgs.system}.grimblast + + hyprlock + hyprpaper hyprpicker + hyprcursor + wofi grim + dunst slurp - wl-clipboard - # cliphist + nm-applet + overskride + cliphist + wl-clip-persist wf-recorder - glib - wayland - direnv + ]; - systemd.user.targets.hyprland-session.Unit.Wants = [ "xdg-desktop-autostart.target" ]; + + systemd.user.targets.hyprland-session.Unit.Wants = [ + "xdg-desktop-autostart.target" + ]; + wayland.windowManager.hyprland = { + enable = true; + systemd.enable = true; xwayland = { enable = true; # hidpi = true; }; - # enableNvidiaPatches = false; - systemd.enable = true; }; + } diff --git a/modules/home/hyprland/variables.nix b/modules/home/hyprland/variables.nix index 7e530d6..884624e 100644 --- a/modules/home/hyprland/variables.nix +++ b/modules/home/hyprland/variables.nix @@ -1,6 +1,11 @@ { ... }: + { home.sessionVariables = { + + TERMINAL = "kitty"; + EDITOR = "micro"; + BROWSER = "firefox"; NIXOS_OZONE_WL = "1"; __GL_GSYNC_ALLOWED = "0"; __GL_VRR_ALLOWED = "0"; @@ -20,6 +25,8 @@ WLR_BACKEND = "vulkan"; WLR_RENDERER = "vulkan"; WLR_NO_HARDWARE_CURSORS = "1"; + XDG_CURRENT_DESKTOP = "hyprland"; + XDG_SESSION_DESKTOP = "hyprland"; XDG_SESSION_TYPE = "wayland"; SDL_VIDEODRIVER = "wayland"; CLUTTER_BACKEND = "wayland";