diff --git a/modules/desktop/hyprland/default.nix b/modules/desktop/hyprland/default.nix index c85e0c8e..8036a82f 100644 --- a/modules/desktop/hyprland/default.nix +++ b/modules/desktop/hyprland/default.nix @@ -1,80 +1,69 @@ -{ inputs, outputs, options, config, lib, pkgs, ...}: -let - cfg = config.modules.desktop.hyprland; -in -{ - imports = [ - inputs.hyprland.nixosModules.default - ]; +{ inputs, outputs, options, config, lib, pkgs, ... }: +let cfg = config.modules.desktop.hyprland; +in { + imports = [ inputs.hyprland.nixosModules.default ]; - options.modules.desktop.hyprland = { - enable = lib.mkEnableOption false; - }; + options.modules.desktop.hyprland = { enable = lib.mkEnableOption false; }; config = lib.mkIf cfg.enable { - modules.desktop.dunst.enable = lib.mkForce false; + modules.desktop.dunst.enable = lib.mkForce false; - services.gnome.gnome-keyring.enable = true; + services.gnome.gnome-keyring.enable = true; - services.greetd = { - enable = true; - settings = { - terminal = { - vt = 2; - }; - default_session = { - command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --time-format '%I:%M %p | %a • %h | %F' --cmd Hyprland"; - user = "greeter"; + services.greetd = { + enable = true; + settings = { + terminal = { vt = 2; }; + default_session = { + command = + "${pkgs.greetd.tuigreet}/bin/tuigreet --time --time-format '%I:%M %p | %a • %h | %F' --cmd Hyprland"; + user = "greeter"; + }; }; }; - }; - # https://github.com/apognu/tuigreet/issues/68#issuecomment-1586359960 - # make greetd not have systemd logs overlap - systemd.services.greetd.serviceConfig = { - Type = "idle"; - StandardInput = "tty"; - StandardOutput = "tty"; - StandardError = "journal"; # Without this errors will spam on screen - # Without these bootlogs will spam on screen - TTYReset = true; - TTYVHangup = true; - TTYVTDisallocate = true; - }; + # https://github.com/apognu/tuigreet/issues/68#issuecomment-1586359960 + # make greetd not have systemd logs overlap + systemd.services.greetd.serviceConfig = { + Type = "idle"; + StandardInput = "tty"; + StandardOutput = "tty"; + StandardError = "journal"; # Without this errors will spam on screen + # Without these bootlogs will spam on screen + TTYReset = true; + TTYVHangup = true; + TTYVTDisallocate = true; + }; - services.xserver = { + services.xserver = { + enable = true; + # displayManager = { + # # lightdm = { + # # enable = true; + # # background = ../../../config/background.png; + # # greeters.gtk = { + # # enable = true; + # # theme = { + # # name = "vimix-dark-ruby"; + # # package = pkgs.vimix-gtk-themes; + # # }; + # # }; + # # }; + # gdm = { + # enable = true; + # }; + # }; + }; + services.libinput = { enable = true; - # displayManager = { -# # lightdm = { -# # enable = true; -# # background = ../../../config/background.png; -# # greeters.gtk = { -# # enable = true; -# # theme = { -# # name = "vimix-dark-ruby"; -# # package = pkgs.vimix-gtk-themes; -# # }; -# # }; -# # }; - # gdm = { - # enable = true; - # }; - # }; - }; - services.libinput = { - enable = true; - # no mouse accel - mouse = { - accelProfile = "flat"; - }; + # no mouse accel + mouse = { accelProfile = "flat"; }; - # no touchpad accel - touchpad = { - accelProfile = "flat"; - }; - }; + # no touchpad accel + touchpad = { accelProfile = "flat"; }; + }; users.users.sako.packages = with pkgs; [ # use wayland counterparts @@ -114,9 +103,7 @@ in wl-clipboard ]; - programs.hyprland = { - enable = true; - }; + programs.hyprland = { enable = true; }; programs.hyprlock.enable = true; @@ -126,7 +113,7 @@ in # piece of shit thanks! services.emacs.startWithGraphical = false; - home-manager.users.sako = { pkgs , ...}: { + home-manager.users.sako = { pkgs, ... }: { home.pointerCursor = { # name = "Catppuccin-Mocha-Dark"; name = "catppuccin-mocha-dark-cursors"; @@ -136,10 +123,10 @@ in }; gtk = { enable = true; - theme.name = "Fluent-red-Dark"; - iconTheme.name = "Fluent-red-dark"; + theme.name = "Fluent-pink-Dark"; + iconTheme.name = "Fluent-pink-dark"; }; - home.file = { + home.file = { "background.png" = { enable = true; source = ../../../config/background.png; @@ -148,12 +135,13 @@ in # thanks PartyWumpus # https://github.com/PartyWumpus/dotfiles/blob/277949d84d53a58a3f52be935cd3c581c89d5d7c/modules/hyprland/hyprland.nix#L492 "/nixos/config/ags/types" = { - source = "${inputs.ags.packages.x86_64-linux.agsWithTypes.out}/share/com.github.Aylur.ags/types"; + source = + "${inputs.ags.packages.x86_64-linux.agsWithTypes.out}/share/com.github.Aylur.ags/types"; }; }; xdg.configFile = { hypr = { - source = ../../../config/hyprland; + source = ../../../config/hyprland; recursive = true; }; waybar = { @@ -168,7 +156,7 @@ in source = ../../../config/ags; recursive = true; }; - }; + }; }; environment.sessionVariables.NIXOS_OZONE_WL = "1"; diff --git a/overlays/default.nix b/overlays/default.nix index 512cd3d9..19161942 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -16,7 +16,7 @@ prev.vimix-gtk-themes.override { themeVariants = [ "ruby" ]; }; fluent-gtk-theme = prev.fluent-gtk-theme.override { colorVariants = [ "dark" ]; - themeVariants = [ "red" ]; + themeVariants = [ "pink" ]; tweaks = [ "square" ]; }; fluent-icon-theme =