moritz
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/nixos' into nixos

nixos
Moritz Böhme 2023-01-07 17:07:02 +01:00
parent b945c25157 513942976e
commit 2a9648a3ec
Signed by: moritz
GPG Key ID: 970C6E89EB0547A9
2 changed files with 45 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/programs/gnome.nix
View File

@ -7,6 +7,13 @@
with lib;
let
cfg = config.my.programs.gnome;
extensions = with pkgs.gnomeExtensions; [
gsconnect
vitals
gtile
blur-my-shell
];
in
{
options.my.programs.gnome.enable = mkEnableOption "gnome";
@ -19,7 +26,6 @@ in
};
pulseaudio.enable = false;
};
programs.xwayland.enable = true;
services.xserver = {
layout = "de";
displayManager = {
@ -32,6 +38,14 @@ in
enable = true;
desktopManager.gnome.enable = true;
};
environment.systemPackages = with pkgs.gnomeExtensions; [ tray-icons-reloaded gsconnect ];
environment.systemPackages = extensions;
home-manager.users.moritz.dconf.settings = {
"org/gnome/shell" = {
disable-user-extensions = false;
enabled-extensions = map (p: p.extensionUuid or p.uuid) extensions;
};
"org/gnome/desktop/interface".enable-hot-corners = false;
"org/gnome/desktop/wm/preferences".focus-mode = "sloppy";
};
};
}

55
modules/programs/hyprland/default.nix
View File

@ -75,32 +75,35 @@ in
# lock screen after timeout
home-manager.users.moritz.services.swayidle = {
enable = true;
events = [
{
event = "before-sleep";
command = "${pkgs.swaylock-effects}/bin/swaylock -fF";
}
{
event = "lock";
command = "${pkgs.swaylock-effects}/bin/swaylock -fF";
}
];
timeouts = [
{
timeout = 300;
command = "${hyprland}/bin/hyprctl dispatch dpms off";
resumeCommand = "${hyprland}/bin/hyprctl dispatch dpms on";
}
{
timeout = 310;
command = "${pkgs.systemd}/bin/loginctl lock-session";
}
];
home-manager.users.moritz = {
services.swayidle = {
enable = true;
events = [
{
event = "before-sleep";
command = "${pkgs.swaylock-effects}/bin/swaylock -fF";
}
{
event = "lock";
command = "${pkgs.swaylock-effects}/bin/swaylock -fF";
}
];
timeouts = [
{
timeout = 300;
command = "${hyprland}/bin/hyprctl dispatch dpms off";
resumeCommand = "${hyprland}/bin/hyprctl dispatch dpms on";
}
{
timeout = 310;
command = "${pkgs.systemd}/bin/loginctl lock-session";
}
];
};
# start swayidle as part of hyprland, not sway
systemd.user.services.swayidle.Install.WantedBy = lib.mkForce [ "hyprland-session.target" ];
};
# start swayidle as part of hyprland, not sway
systemd.user.services.swayidle.Install.WantedBy = lib.mkForce [ "hyprland-session.target" ];
# adds pam module for swaylock
security.pam.services.swaylock = { };
@ -116,7 +119,7 @@ in
};
# set hyprpaper conf (for setting initial background)
xdg.configFile."hypr/hyprpaper.conf" = {
home-manager.users.moritz.xdg.configFile."hypr/hyprpaper.conf" = {
text =
let
setWallpaper = wallpaper: ''