fix hyprland build

This commit is contained in:
mjallen18
2025-06-18 15:48:34 -05:00
parent 5662fd3fa1
commit d0880fd36d
6 changed files with 37 additions and 29 deletions

View File

@@ -108,6 +108,7 @@ in
./users.nix
../default.nix
../../modules/desktop-environments/cosmic/specialisation.nix
../../modules/desktop-environments/hyprland/specialisation.nix
../../share/amd
];

View File

@@ -5,8 +5,8 @@
shellIntegration.enableZshIntegration = true;
font = {
name = "jetbrains mono nerd font";
package = pkgs.nerdfonts;
name = "nerd-fonts-jetbrains-mono";
package = pkgs.nerd-fonts.jetbrains-mono;
size = 12;
};

View File

@@ -82,9 +82,8 @@ in
fonts.packages = with pkgs; [
noto-fonts
noto-fonts-color-emoji
nerdfonts
meslo-lgs-nf
];
] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);
fonts.fontconfig.defaultFonts = {
emoji = [

View File

@@ -5,8 +5,8 @@
shellIntegration.enableZshIntegration = true;
font = {
name = "jetbrains mono nerd font";
package = pkgs.nerdfonts;
name = "nerd-fonts-jetbrains-mono";
package = pkgs.nerd-fonts.jetbrains-mono;
size = 12;
};

View File

@@ -1,21 +1,23 @@
{
services.mako = {
enable = true;
font = "monospace 12";
icons = false;
width = 500;
height = 110;
layer = "overlay";
borderRadius = 15;
borderSize = 2;
maxIconSize = 64;
defaultTimeout = 5000;
sort = "-time";
ignoreTimeout = true;
settings = {
font = "monospace 12";
icons = false;
ignore-timeout = true;
sort = "-time";
width = 500;
height = 110;
layer = "overlay";
border-radius = 15;
border-size = 2;
max-icon-size = 64;
default-timeout = 5000;
backgroundColor = "#24273a";
textColor = "#cad3f5";
borderColor = "#8aadf4";
progressColor = "over #363a4f";
background-color = "#24273a";
text-color = "#cad3f5";
border-color = "#8aadf4";
progress-color = "over #363a4f";
};
};
}

View File

@@ -1,4 +1,4 @@
{ pkgs, ... }:
{ pkgs, lib, ... }:
let
sddmTheme = "catppuccin-mocha";
in
@@ -10,12 +10,19 @@ in
home-manager.users.matt = import ./home.nix;
services = {
displayManager.sddm.enable = true;
displayManager.sddm.package = pkgs.kdePackages.sddm;
displayManager.sddm.theme = sddmTheme;
displayManager.defaultSession = "hyprland";
displayManager = {
sddm = {
enable = true;
package = pkgs.kdePackages.sddm;
theme = sddmTheme;
wayland.enable = true;
};
gdm.enable = lib.mkForce false;
defaultSession = "hyprland";
};
# disable plasma
desktopManager.plasma6.enable = false;
desktopManager.plasma6.enable = lib.mkForce false;
desktopManager.gnome.enable = lib.mkForce false;
dbus.enable = true;
@@ -86,9 +93,8 @@ in
font-awesome
noto-fonts
noto-fonts-color-emoji
nerdfonts
meslo-lgs-nf
];
] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);
fonts.fontconfig.defaultFonts = {
emoji = [