updated display.nix

This commit is contained in:
serenity-F 2025-02-13 01:41:14 +10:00
parent 33cb5bba76
commit 64e53429eb
3 changed files with 68 additions and 33 deletions

View file

@ -24,10 +24,12 @@
supportedFilesystems = [ "vfat" "ext4" ]; supportedFilesystems = [ "vfat" "ext4" ];
loader.grub = { loader = {
enable = true; grub = {
device = "/dev/nvme0n1"; enable = true;
enableCryptodisk = true; device = "/dev/nvme0n1";
enableCryptodisk = true;
};
}; };
initrd.luks.devices = { initrd.luks.devices = {

View file

@ -22,7 +22,7 @@
"rd.udev.log_level=0" "rd.udev.log_level=0"
"udev.log_priority=3" "udev.log_priority=3"
"boot.shell_on_fail" "boot.shell_on_fail"
"i915.fastboot=1" #"i915.fastboot=1"
"plymouth.use-simpledrm" "plymouth.use-simpledrm"
]; ];
loader = { loader = {
@ -35,9 +35,9 @@
#fontSize = 16; #fontSize = 16;
splashImage = null; splashImage = null;
timeoutStyle = "hidden"; timeoutStyle = "hidden";
extraConfig = '' #extraConfig = ''
GRUB_FORCE_HIDDEN_MENU=true #GRUB_FORCE_HIDDEN_MENU=true
''; #'';
}; };
}; };
plymouth = { plymouth = {

View file

@ -3,36 +3,31 @@
let let
swayConfig = pkgs.writeText "greetd-sway-config" '' swayConfig = pkgs.writeText "greetd-sway-config" ''
# `-l` activates layer-shell mode. Notice that `swaymsg exit` will run after gtkgreet. # `-l` activates layer-shell mode. Notice that `swaymsg exit` will run after gtkgreet.
exec "${pkgs.greetd.gtkgreet}/bin/gtkgreet -l; swaymsg exit" exec "${pkgs.greetd.gtkgreet}/bin/gtkgreet -l; swaymsg exit"
bindsym Mod4+shift+e exec swaynag \ bindsym Mod4+shift+e exec swaynag \
-t warning \ -t warning \
-m 'What do you want to do?' \ -m 'What do you want to do?' \
-b 'Poweroff' 'systemctl poweroff' \ -p 'Poweroff' 'systemctl poweroff' \
-b 'Reboot' 'systemctl reboot' -b 'Reboot' 'systemctl reboot'
''; '';
in in {
{
services = { services = {
## Eventual login greeter/display manager, ## Login greeter/display manager,
## wayland native. ReGreet on top of greetd. ## wayland native. ReGreet on top of greetd.
greetd = { greetd = {
enable = true; enable = true;
#package = [ ]; #package = [ ];
restart = true; restart = true;
settings = { settings = {
default_session = { default_session = {
command = "${pkgs.sway}/bin/sway --config ${swayConfig}"; command = "${pkgs.sway}/bin/sway --config ${swayConfig}";
}; };
}; };
}; };
}; };
environment = { environment = {
@ -49,23 +44,13 @@ in
enable = true; enable = true;
#package = [ ]; #package = [ ];
#cageArgs = [ "-s" "-m" "last" ]; ## Appearance
#settings = { };
font = { font = {
name = "Spleen-32x64"; name = "Spleen-32x64";
size = 10; size = 10;
package = pkgs.spleen; package = pkgs.spleen;
}; };
theme = {
name = "adwaita-dark";
package = pkgs.adw-gtk3;
};
#extraCss = "";
iconTheme = { iconTheme = {
name = "Flat-Remix-Grey-Darkest"; name = "Flat-Remix-Grey-Darkest";
package = pkgs.flat-remix-icon-theme; package = pkgs.flat-remix-icon-theme;
@ -75,6 +60,54 @@ in
name = "Bibata-Modern-Classic"; name = "Bibata-Modern-Classic";
package = pkgs.bibata-cursors; package = pkgs.bibata-cursors;
}; };
theme = {
name = "Colloid-Dark";
package = pkgs.colloid-gtk-theme;
};
#extraCss = '''';
settings = {
# Supposed to be toml, but idk how that works, apparently this is fine ?
# https://github.com/rharish101/ReGreet/blob/main/regreet.sample.toml
# https://github.com/NixOS/nixpkgs/issues/335082#issuecomment-2293304283
appearance = { # ... this is ALL appearance ? tf bruh
greeting_msg = "Welcome !";
};
background = {
path =
"../../../home/resources/wallpapers/attunement-HelveticaBlanc.png";
fit = "Cover";
};
gtk = { # why this shit needs to be declared twice i do not know
application_prefer_dark_theme = true;
cursor_theme_name = "Bibata-Modern-Classica";
font_name = "Spleen-32x64 16";
icon_theme_name = "Flat-Remix-Grey-Darkest";
theme_name = "Colloid-Dark";
};
widget.clock = {
format = "%a, %D %H:%M"; # Thursday 13/02/24, 01:36
resolution = "500ms";
timezone = "Australia/Brisbane";
label_width = 150; # will need adjustment
};
## Other
commands = {
reboot = [ "systemctl" "reboot" ];
poweroff = [ "systemctl" "poweroff" ];
};
};
cageArgs =
[ "-s" ]; # https://github.com/cage-kiosk/cage/blob/master/cage.1.scd
}; };
} }