phfroidmont/nixos-configs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: phfroidmont:258ff8a6007ca3fd2acf9264e65d29be8edb564e
Branches Tags
phfroidmont:master
phfroidmont:avante
phfroidmont:wsl
phfroidmont:sway
phfroidmont:rpi2
..
compare: phfroidmont:aa7d685576329ba719df3d0b7b86b7385dfd09b4
Branches Tags
phfroidmont:master
phfroidmont:avante
phfroidmont:wsl
phfroidmont:sway
phfroidmont:rpi2

No commits in common. "258ff8a6007ca3fd2acf9264e65d29be8edb564e" and "aa7d685576329ba719df3d0b7b86b7385dfd09b4" have entirely different histories.
258ff8a600 ... aa7d685576

3 changed files with 58 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

7
hosts/stellaris/default.nix
View file

@ -66,9 +66,14 @@
services.network-manager-applet.enable = true; services.network-manager-applet.enable = true;
services.blueman-applet.enable = true; services.blueman-applet.enable = true;
wayland.windowManager.hyprland.settings = { wayland.windowManager.hyprland.settings = {
env = [
"LIBVA_DRIVER_NAME,nvidia"
"__GLX_VENDOR_LIBRARY_NAME,nvidia"
];
monitor = [ monitor = [
"eDP-1, 2560x1600@240, 0x0, 1.6" "eDP-1, 2560x1600@240, 0x0, 1.6"
"desc:Microstep MPG321UX OLED 0x01010101, 3840x2160@239.99001, auto-right, 1.6" "desc:Microstep MPG321UX OLED 0x01010101, @239.99001, auto-right, 1.6"
", preferred, auto, 1" ", preferred, auto, 1"
]; ];

21
hosts/stellaris/hardware-configuration.nix
View file

@ -20,14 +20,7 @@
"sdhci_pci" "sdhci_pci"
]; ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ boot.kernelModules = [ "kvm-amd" ];
"kvm-amd"
"amdgpu"
"nvidia"
"nvidia_drm"
"nvidia_uvm"
];
boot.kernelParams = [ "nvidia-drm.modeset=1" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
@ -83,20 +76,18 @@
"nvidia" "nvidia"
]; ];
hardware.graphics = {
enable = true;
enable32Bit = true;
};
hardware.nvidia = { hardware.nvidia = {
modesetting.enable = true; modesetting.enable = true;
powerManagement.enable = false; powerManagement.enable = false;
powerManagement.finegrained = false; powerManagement.finegrained = true;
open = true; open = true;
nvidiaSettings = true; nvidiaSettings = true;
package = config.boot.kernelPackages.nvidiaPackages.stable; package = config.boot.kernelPackages.nvidiaPackages.stable;
prime = { prime = {
sync.enable = true; offload = {
enable = true;
enableOffloadCmd = true;
};
# nix run github:eclairevoyant/pcids # nix run github:eclairevoyant/pcids
amdgpuBusId = "PCI:7:0:0"; amdgpuBusId = "PCI:7:0:0";
nvidiaBusId = "PCI:1:0:0"; nvidiaBusId = "PCI:1:0:0";

125
modules/desktop/wm.nix
View file

@ -127,7 +127,7 @@ in
"$mod, semicolon, splitratio, +0.1" "$mod, semicolon, splitratio, +0.1"
"$mod, F, fullscreen, 0" "$mod, F, fullscreen, 0"
"$mod, X, exec, hyprlock" "$mod, X, exec, swaylock"
# Move focus # Move focus
"$mod, H, movefocus, l" "$mod, H, movefocus, l"
@ -402,85 +402,52 @@ in
]; ];
}; };
programs.hyprlock = { programs.swaylock = {
enable = true; enable = true;
package = pkgs.swaylock-effects;
settings = { settings = {
general = { ignore-empty-password = true;
hide_cursor = true; daemonize = true;
ignore_empty_input = true; # fade-in = 0.5;
}; indicator = true;
clock = true;
background = [ datestr = "%d/%m/%Y";
{ screenshots = true;
monitor = ""; hide-keyboard-layout = true;
path = "screenshot"; indicator-caps-lock = true;
blur_passes = 3; bs-hl-color = "7daea3cc";
blur_size = 8; caps-lock-bs-hl-color = "7daea3cc";
} caps-lock-key-hl-color = "d3869bcc";
]; font = "MesloLGS Nerd Font Propo";
font-size = "35";
input-field = [ indicator-idle-visible = true;
{ indicator-radius = 100;
monitor = ""; indicator-thickness = 7;
size = "320, 58"; inside-color = "32302f66";
position = "0, -80"; inside-clear-color = "89b48266";
halign = "center"; inside-caps-lock-color = "e78a4e66";
valign = "center"; inside-ver-color = "7daea366";
dots_center = true; inside-wrong-color = "ea696266";
fade_on_empty = false; key-hl-color = "a9b665cc";
outline_thickness = 3; layout-bg-color = "32302f00";
inner_color = "rgb(50, 48, 47)"; layout-text-color = "d4be98";
outer_color = "rgb(231, 138, 78)"; line-color = "00000000";
font_color = "rgb(212, 190, 152)"; ring-color = "e78a4ecc";
placeholder_text = "Password..."; ring-clear-color = "89b482cc";
} ring-caps-lock-color = "e78a4ecc";
]; ring-ver-color = "7daea3cc";
ring-wrong-color = "ea6962cc";
label = [ separator-color = "00000000";
{ text-color = "d4be98";
monitor = ""; text-clear-color = "d4be98";
text = "$TIME"; text-caps-lock-color = "d4be98";
color = "rgb(212, 190, 152)"; text-ver-color = "d4be98";
font_size = 42; text-wrong-color = "d4be98";
font_family = "MesloLGS Nerd Font Propo"; effect-blur = "9x9";
position = "0, 160"; effect-greyscale = true;
halign = "center"; # effect-vignette = "0.5:0.5";
valign = "center";
}
{
monitor = "";
text = "cmd[update:1000] date +%d/%m/%Y";
color = "rgb(212, 190, 152)";
font_size = 18;
font_family = "MesloLGS Nerd Font Propo";
position = "0, 120";
halign = "center";
valign = "center";
}
];
};
};
services.hypridle = {
enable = true;
settings = {
general = {
lock_cmd = "pidof hyprlock || hyprlock";
before_sleep_cmd = "loginctl lock-session";
after_sleep_cmd = "hyprctl dispatch dpms on";
};
listener = [
{
timeout = 300;
on-timeout = "loginctl lock-session";
}
{
timeout = 330;
on-timeout = "hyprctl dispatch dpms off";
on-resume = "hyprctl dispatch dpms on";
}
];
}; };
}; };
}; };
@ -499,7 +466,7 @@ in
hardware.graphics.enable = true; hardware.graphics.enable = true;
security.pam.services.hyprlock = { }; security.pam.services.swaylock = { };
}; };
} }