Compare commits
2 commits
8d9697d309
...
f7459348f4
Author | SHA1 | Date | |
---|---|---|---|
f7459348f4 | |||
9894be9b65 |
7 changed files with 28 additions and 15 deletions
|
@ -10,7 +10,7 @@
|
||||||
line-height = 30;
|
line-height = 30;
|
||||||
fields = "name,generic,comment";
|
fields = "name,generic,comment";
|
||||||
terminal = lib.my.getExe osConfig.modules.system.roles.desktop.terminal;
|
terminal = lib.my.getExe osConfig.modules.system.roles.desktop.terminal;
|
||||||
prompt = "❯ ";
|
prompt = ''"❯ "'';
|
||||||
layer = "overlay";
|
layer = "overlay";
|
||||||
};
|
};
|
||||||
colors = {
|
colors = {
|
||||||
|
|
|
@ -29,11 +29,7 @@ mkIf osConfig.programs.hyprland.enable {
|
||||||
|
|
||||||
exec-once = [
|
exec-once = [
|
||||||
"${config.services.kdeconnect.package}/bin/kdeconnect-indicator"
|
"${config.services.kdeconnect.package}/bin/kdeconnect-indicator"
|
||||||
"${pkgs.protonmail-bridge-gui}/bin/protonmail-bridge-gui --no-window"
|
"${pkgs.keepassxc}/bin/keepassxc"
|
||||||
|
|
||||||
# keepassxc ignores themeing and doesnt show up in system tray otherwise
|
|
||||||
# Dirty solution but hey
|
|
||||||
"sleep 3 && ${pkgs.keepassxc}/bin/keepassxc"
|
|
||||||
(lib.mkIf config.services.hypridle.enable "${pkgs.hypridle}/bin/hypridle")
|
(lib.mkIf config.services.hypridle.enable "${pkgs.hypridle}/bin/hypridle")
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -73,6 +73,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
programs = {
|
programs = {
|
||||||
|
uwsm.enable = true;
|
||||||
dconf.enable = true;
|
dconf.enable = true;
|
||||||
fish.enable = true;
|
fish.enable = true;
|
||||||
firefox.enable = true;
|
firefox.enable = true;
|
||||||
|
|
|
@ -1 +1,10 @@
|
||||||
{ lib, config, ... }: lib.mkIf config.programs.hyprland.enable { }
|
{ lib, config, ... }:
|
||||||
|
lib.mkIf config.programs.hyprland.enable {
|
||||||
|
programs.uwsm = {
|
||||||
|
waylandCompositors.hyprland = {
|
||||||
|
prettyName = "Hyprland";
|
||||||
|
comment = "Hyprland compositor managed by UWSM";
|
||||||
|
binPath = "/run/current-system/sw/bin/Hyprland";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
|
@ -1,7 +1,17 @@
|
||||||
{ config, lib, ... }:
|
{ config, lib, ... }:
|
||||||
lib.mkIf config.programs.sway.enable {
|
lib.mkIf config.programs.sway.enable {
|
||||||
programs.sway = {
|
|
||||||
wrapperFeatures.gtk = true;
|
programs = {
|
||||||
extraPackages = [ ];
|
uwsm = {
|
||||||
|
waylandCompositors.sway = {
|
||||||
|
prettyName = "Sway";
|
||||||
|
comment = "Sway compositor managed by UWSM";
|
||||||
|
binPath = "/run/current-system/sw/bin/sway";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
sway = {
|
||||||
|
wrapperFeatures.gtk = true;
|
||||||
|
extraPackages = [ ];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -26,10 +26,7 @@ in
|
||||||
pkgs.brightnessctl
|
pkgs.brightnessctl
|
||||||
pkgs.networkmanager
|
pkgs.networkmanager
|
||||||
];
|
];
|
||||||
wantedBy = [
|
wantedBy = [ "graphical-session.target" ];
|
||||||
"multi-user.target"
|
|
||||||
"graphical-session.target"
|
|
||||||
];
|
|
||||||
partOf = [ "graphical-session.target" ];
|
partOf = [ "graphical-session.target" ];
|
||||||
after = [ "graphical-session-pre.target" ];
|
after = [ "graphical-session-pre.target" ];
|
||||||
|
|
||||||
|
|
|
@ -86,7 +86,7 @@ in
|
||||||
description = "tailscale system tray";
|
description = "tailscale system tray";
|
||||||
wantedBy = [ "graphical-session.target" ];
|
wantedBy = [ "graphical-session.target" ];
|
||||||
wants = [ "graphical-session.target" ];
|
wants = [ "graphical-session.target" ];
|
||||||
after = [ "graphical-session.target" ];
|
after = [ "graphical-session-pre.target" ];
|
||||||
path = [ pkgs.polkit ];
|
path = [ pkgs.polkit ];
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
Type = "simple";
|
Type = "simple";
|
||||||
|
|
Loading…
Add table
Reference in a new issue