@ -6,24 +6,25 @@
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
inherit (config.stylix) colors;
|
||||
inherit (lib) mkIf mkEnableOption mkDefault mkForce getExe;
|
||||
cfg = config.desktop.hyprland;
|
||||
hostname = osConfig.networking.hostName;
|
||||
cursorSize = config.stylix.cursor.size;
|
||||
fontName = config.stylix.fonts.sansSerif.name;
|
||||
inherit (config.lib.stylix) colors;
|
||||
keyboard =
|
||||
if hostname == "eldrid"
|
||||
then "chromeos"
|
||||
else "platform";
|
||||
xdgPictures =
|
||||
config.xdg.userDirs.pictures;
|
||||
ifLaptop = lib.mkIf (hostname != "dunamis");
|
||||
ifLaptop = mkIf (hostname != "dunamis");
|
||||
in {
|
||||
options = {
|
||||
desktop.hyprland.enable =
|
||||
lib.mkEnableOption "enable hyprland desktop";
|
||||
mkEnableOption "enable hyprland desktop";
|
||||
};
|
||||
config = lib.mkIf cfg.enable {
|
||||
config = mkIf cfg.enable {
|
||||
stylix.targets.waybar.enable = false;
|
||||
stylix.targets.hyprland.enable = false;
|
||||
stylix.targets.hyprlock.enable = false;
|
||||
@ -507,7 +508,7 @@ in {
|
||||
};
|
||||
qt = {
|
||||
enable = true;
|
||||
platformTheme.name = lib.mkDefault "gtk3";
|
||||
platformTheme.name = mkDefault "gtk3";
|
||||
};
|
||||
dconf.settings = {
|
||||
"org/gnome/desktop/interface" = {
|
||||
@ -1017,7 +1018,7 @@ in {
|
||||
width = 300;
|
||||
height = 300;
|
||||
icon_theme = "${config.dconf.settings."org/gnome/desktop/interface".icon-theme}";
|
||||
corner_radius = lib.mkDefault 9;
|
||||
corner_radius = mkDefault 9;
|
||||
#corners = "top-right,bottom-left";
|
||||
offset = "16x16";
|
||||
origin = "bottom-right";
|
||||
@ -1230,7 +1231,7 @@ in {
|
||||
Service =
|
||||
graphicalService.Service
|
||||
// {
|
||||
Environment = lib.mkForce "QT_QPA_PLATFORM=wayland";
|
||||
Environment = mkForce "QT_QPA_PLATFORM=wayland";
|
||||
};
|
||||
};
|
||||
hyprpolkitagent = mkGraphicalService {
|
||||
@ -1252,7 +1253,7 @@ in {
|
||||
// {
|
||||
Type = "simple";
|
||||
Slice = "session.slice";
|
||||
ExecStart = "${lib.getExe perSystem.hyprsunset.hyprsunset} -t 6500";
|
||||
ExecStart = "${getExe perSystem.hyprsunset.hyprsunset} -t 6500";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
@ -5,9 +5,10 @@
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
cfg = config.desktop.niri;
|
||||
inherit (lib) mkIf mkEnableOption mkDefault mkForce getExe;
|
||||
inherit (osConfig.networking) hostId;
|
||||
inherit (config.lib.stylix) colors;
|
||||
inherit (config.stylix) colors;
|
||||
cfg = config.desktop.niri;
|
||||
cursorSize = config.stylix.cursor.size;
|
||||
cursorName = config.stylix.cursor.name;
|
||||
keyboard =
|
||||
@ -16,18 +17,18 @@
|
||||
else "platform";
|
||||
xdgPics =
|
||||
config.xdg.userDirs.pictures;
|
||||
ifLaptop = lib.mkIf (hostId != "c7f6c4a1");
|
||||
ifLaptop = mkIf (hostId != "c7f6c4a1");
|
||||
# TODO: make terminal depent on thing outside a module
|
||||
terminal = lib.getExe pkgs.wezterm;
|
||||
launcher = lib.getExe pkgs.fuzzel;
|
||||
terminal = getExe pkgs.wezterm;
|
||||
launcher = getExe pkgs.fuzzel;
|
||||
browser = "app.zen_browser.zen";
|
||||
lockscreen = lib.getExe pkgs.gtklock;
|
||||
lockscreen = getExe pkgs.gtklock;
|
||||
in {
|
||||
options = {
|
||||
desktop.niri.enable =
|
||||
lib.mkEnableOption "enable niri desktop";
|
||||
mkEnableOption "enable niri desktop";
|
||||
};
|
||||
config = lib.mkIf cfg.enable {
|
||||
config = mkIf cfg.enable {
|
||||
stylix.targets = {
|
||||
waybar.enable = false;
|
||||
wpaperd.enable = true;
|
||||
@ -274,7 +275,7 @@ in {
|
||||
match-mode = "fuzzy";
|
||||
icon-theme = "${config.dconf.settings."org/gnome/desktop/interface".icon-theme}";
|
||||
};
|
||||
border = lib.mkDefault {
|
||||
border = mkDefault {
|
||||
width = 3;
|
||||
radius = 12;
|
||||
};
|
||||
@ -1039,7 +1040,7 @@ in {
|
||||
Service =
|
||||
graphicalService.Service
|
||||
// {
|
||||
Environment = lib.mkForce "QT_QPA_PLATFORM=wayland";
|
||||
Environment = mkForce "QT_QPA_PLATFORM=wayland";
|
||||
};
|
||||
};
|
||||
xwayland-satellite = mkGraphicalService {
|
||||
@ -1047,12 +1048,12 @@ in {
|
||||
graphicalService.Service
|
||||
// {
|
||||
Type = "simple";
|
||||
ExecStart = lib.getExe pkgs.xwayland-satellite + " :123";
|
||||
ExecStart = getExe pkgs.xwayland-satellite + " :123";
|
||||
};
|
||||
};
|
||||
wpaperd = mkGraphicalService {
|
||||
Service =
|
||||
lib.mkDefault graphicalService.Service;
|
||||
mkDefault graphicalService.Service;
|
||||
};
|
||||
gnome-polkit-agent = mkGraphicalService {
|
||||
Service =
|
||||
|
Reference in New Issue
Block a user