gerg-l/nixos
1
0
Fork 0
mirror of https://github.com/Gerg-L/nixos.git synced 2025-12-10 00:43:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

xorg cleanup

Browse source
This commit is contained in:
Gerg-L 2025-03-13 19:26:00 -04:00
parent 518ab13797
commit 8fcc7d718e
Signed by: gerg-l
SSH key fingerprint: SHA256:FPYDHIkvMocr4wdmZXpgpJjsb2Tw6rASs2ISPbOb0KI
7 changed files with 61 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

11
nixosConfigurations/gerg-desktop/main.nix
View file

@ -9,11 +9,7 @@
{ {
local = { local = {
DE.dwm.enable = true; DE.dwm.enable = true;
DM = { DM.lightdm.enable = true;
lightdm.enable = true;
autoLogin = true;
loginUser = "gerg";
};
theming = { theming = {
enable = true; enable = true;
kmscon.enable = true; kmscon.enable = true;
@ -114,7 +110,10 @@
''; '';
}; };
services.libinput.mouse.accelProfile = "flat"; services.displayManager.autoLogin = {
enable = true;
user = "gerg";
};
programs = { programs = {
steam.enable = true; steam.enable = true;

10
nixosConfigurations/media-laptop/main.nix
View file

@ -7,11 +7,7 @@
{ {
local = { local = {
remoteBuild.enable = true; remoteBuild.enable = true;
DM = { DM.lightdm.enable = true;
lightdm.enable = true;
autoLogin = true;
loginUser = "media";
};
DE.xfce.enable = true; DE.xfce.enable = true;
theming = { theming = {
enable = true; enable = true;
@ -35,6 +31,10 @@
sops.secrets.root.neededForUsers = true; sops.secrets.root.neededForUsers = true;
services.displayManager.autoLogin = {
enable = true;
user = "media";
};
users = { users = {
mutableUsers = false; mutableUsers = false;
users = { users = {

94
nixosModules/DE/dwm.nix
View file

@ -38,36 +38,62 @@
sxhkd = { sxhkd = {
wantedBy = [ "graphical-session.target" ]; wantedBy = [ "graphical-session.target" ];
partOf = [ "graphical-session.target" ]; partOf = [ "graphical-session.target" ];
serviceConfig = { serviceConfig =
ExecStart = "${lib.getExe pkgs.sxhkd} -c /etc/sxhkd/sxhkdrc"; let
Restart = "always"; configFile = pkgs.writeText "sxhkdrc" ''
RestartSec = 2; XF86AudioPlay
ExecReload = "pkill -usr1 -x $MAINPID"; playerctl play-pause
}; XF86AudioPause
playerctl play-pause
XF86AudioStop
playerctl stop
XF86AudioNext
playerctl next
XF86AudioPrev
playerctl previous
XF86AudioRaiseVolume
wpctl set-volume @DEFAULT_AUDIO_SINK@ 1%+
XF86AudioLowerVolume
wpctl set-volume @DEFAULT_AUDIO_SINK@ 1%-
XF86AudioMute
wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
Print
maim $HOME/Screenshots/$(date +%Y-%m-%d_%H-%m-%s).jpg
Print + shift
maim | xclip -selection clipboard -t image/png
super + Print
maim -s $HOME/Screenshots/$(date +%Y-%m-%d_%H-%m-%s).jpg
super + Print + shift
maim -s | xclip -selection clipboard -t image/png
super + ctrl + r
pkill -usr1 -x sxhkd
super + ctrl + l
xsecurelock
'';
in
{
ExecStart = "${lib.getExe pkgs.sxhkd} -c '${configFile}'";
Restart = "always";
RestartSec = 2;
ExecReload = "pkill -usr1 -x $MAINPID";
};
}; };
picom = { picom = {
wantedBy = [ "graphical-session.target" ]; wantedBy = [ "graphical-session.target" ];
partOf = [ "graphical-session.target" ]; partOf = [ "graphical-session.target" ];
serviceConfig = { serviceConfig.ExecStart = "${lib.getExe pkgs.picom} --backend egl";
ExecStart = "${lib.getExe pkgs.picom} --backend egl";
Restart = "always";
RestartSec = 2;
ExecReload = "pkill -usr1 -x $MAINPID";
};
}; };
}; };
services = { services = {
gvfs.enable = true;
displayManager.defaultSession = "none+dwm"; displayManager.defaultSession = "none+dwm";
xserver = { xserver = {
enable = true; enable = true;
displayManager = { displayManager.sessionCommands = ''
sessionCommands = '' feh --bg-center "${self'.packages.images}/recursion.png"
feh --bg-center "${self'.packages.images}/recursion.png" numlockx
numlockx '';
'';
};
windowManager.session = [ windowManager.session = [
{ {
name = "dwm"; name = "dwm";
@ -93,35 +119,5 @@
}; };
}; };
environment.etc."sxhkd/sxhkdrc".text = ''
XF86AudioPlay
playerctl play-pause
XF86AudioPause
playerctl play-pause
XF86AudioStop
playerctl stop
XF86AudioNext
playerctl next
XF86AudioPrev
playerctl previous
XF86AudioRaiseVolume
wpctl set-volume @DEFAULT_AUDIO_SINK@ 1%+
XF86AudioLowerVolume
wpctl set-volume @DEFAULT_AUDIO_SINK@ 1%-
XF86AudioMute
wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
Print
maim $HOME/Screenshots/$(date +%Y-%m-%d_%H-%m-%s).jpg
Print + shift
maim | xclip -selection clipboard -t image/png
super + Print
maim -s $HOME/Screenshots/$(date +%Y-%m-%d_%H-%m-%s).jpg
super + Print + shift
maim -s | xclip -selection clipboard -t image/png
super + ctrl + r
pkill -usr1 -x sxhkd
super + ctrl + l
xsecurelock
'';
}; };
} }

10
nixosModules/DE/xfce.nix
View file

@ -8,13 +8,11 @@
config = lib.mkIf config.local.DE.xfce.enable { config = lib.mkIf config.local.DE.xfce.enable {
environment.systemPackages = [ pkgs.xfce.xfce4-whiskermenu-plugin ]; environment.systemPackages = [ pkgs.xfce.xfce4-whiskermenu-plugin ];
services = { services.xserver = {
xserver = { enable = true;
desktopManager.xfce = {
enable = true; enable = true;
desktopManager.xfce = { enableScreensaver = true;
enable = true;
enableScreensaver = true;
};
}; };
displayManager.defaultSession = "xfce"; displayManager.defaultSession = "xfce";
}; };

19
nixosModules/DM/autoLogin.nix
View file

@ -1,19 +0,0 @@
{ config, lib }:
{
options.local.DM = {
autoLogin = lib.mkEnableOption "";
loginUser = lib.mkOption {
type = lib.types.nullOr lib.types.str;
default = null;
};
};
config = lib.mkIf config.local.DM.autoLogin {
services.displayManager = {
autoLogin = {
enable = true;
user = config.local.DM.loginUser;
};
};
};
}

2
nixosModules/DM/lightDM.nix
View file

@ -14,7 +14,7 @@
extraConfig = "minimum-vt=1"; extraConfig = "minimum-vt=1";
greeters.mini = { greeters.mini = {
enable = true; enable = true;
user = config.local.DM.loginUser; inherit (config.services.displayManager.autoLogin) user;
extraConfig = '' extraConfig = ''
[greeter] [greeter]
show-password-label = false show-password-label = false

1
nixosModules/X11.nix
View file

@ -1,5 +1,6 @@
{ pkgs, lib }: { pkgs, lib }:
{ {
services.libinput.mouse.accelProfile = "flat";
services.xserver = { services.xserver = {
tty = lib.mkDefault 1; tty = lib.mkDefault 1;
exportConfiguration = true; exportConfiguration = true;