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 ./users.nix
../default.nix ../default.nix
../../modules/desktop-environments/cosmic/specialisation.nix ../../modules/desktop-environments/cosmic/specialisation.nix
../../modules/desktop-environments/hyprland/specialisation.nix
../../share/amd ../../share/amd
]; ];

View File

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

View File

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

View File

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

View File

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

View File

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