jalil/configuration.nix
1
1
Fork 0
Code Issues 2 Pull requests 3 Projects Activity Actions

Compare commits

base: jalil:5b0f568ca2ba1af96a5a1aaae72ea05ed2b24dec
Branches Tags
jalil:main
jalil:push-unxtqqrkkxzr
jalil:push-xstqnkxmwxvm
jalil:push-zwplyztqqsnl
..
compare: jalil:5358188ad176d312ca9476d300b3825fabbd367d
Branches Tags
jalil:main
jalil:push-unxtqqrkkxzr
jalil:push-xstqnkxmwxvm
jalil:push-zwplyztqqsnl

1 commit
5b0f568ca2 ... 5358188ad1

Author SHA1 Message Date
Jalil David Salamé Messina
5358188ad1
refactor(hm/gui): reorganize modules
All checks were successful
/ check (push) Successful in 9s
Details
/ check-renovaterc (push) Successful in 3s
Details
/ build-packages (push) Successful in 13s
Details
/ build-vm (push) Successful in 2s
Details
/ report-size (push) Successful in 5s
Details 
This way we are not `import`ing stuff which is slow.

It also makes it easier to turn off the sway module.
 2025-04-21 19:04:52 +02:00
2 changed files with 20 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
justfile
View file

@ -3,10 +3,10 @@ default:
# Update a specific flake input
update input:
nix flake lock --update-input {{input}} --commit-lock-file
nix flake lock --update-input "{{input}}" --commit-lock-file
build-vm:
nixos-rebuild build-vm --flake .#vm --print-build-logs
nixos-rebuild build-vm --fallback --flake .#vm --print-build-logs
run-vm: build-vm
QEMU_OPTS="$QEMU_OPTS_WL" result/bin/run-nixos-vm

38
modules/hm/gui/sway.nix
View file

@ -11,7 +11,7 @@ in
config = lib.mkIf (config.jhome.enable && config.jhome.gui.enable && cfg.enable) {
# Window Manager
wayland.windowManager.sway = {
inherit (cfg.sway) enable;
inherit (cfg) enable;
config =
let
inherit (config.jhome.gui) terminal;
@ -30,7 +30,7 @@ in
};
in
{
modifier = "Mod 4";
modifier = "Mod4";
inherit terminal menu;
# Appearance
bars = [ ]; # Waybar is started as a systemd service
@ -73,25 +73,23 @@ in
datadir = "${schema}/share/gsettings-schemas/${schema.name}";
in
[
(cmdAlways (
pkgs.writers.writeDash "configure-gtk" ''
export XDG_DATA_DIRS="${datadir}:$XDG_DATA_DIRS"
(cmdAlways "${pkgs.writers.writeDash "configure-gtk" ''
export XDG_DATA_DIRS="${datadir}:$XDG_DATA_DIRS"
gnome_schema=org.gnome.desktop.interface
config="${config.xdg.configHome}/gtk-3.0/settings.ini"
if [ ! -f "$config" ]; then exit 1; fi
# Read settings from gtk3
gtk_theme="$(${pkgs.gnugrep}/bin/grep 'gtk-theme-name' "$config" | ${pkgs.gnused}/bin/sed 's/.*\s*=\s*//')"
icon_theme="$(${pkgs.gnugrep}/bin/grep 'gtk-icon-theme-name' "$config" | ${pkgs.gnused}/bin/sed 's/.*\s*=\s*//')"
cursor_theme="$(${pkgs.gnugrep}/bin/grep 'gtk-cursor-theme-name' "$config" | ${pkgs.gnused}/bin/sed 's/.*\s*=\s*//')"
font_name="$(grep 'gtk-font-name' "$config" | sed 's/.*\s*=\s*//')"
${pkgs.glib}/bin/gsettings set "$gnome_schema" gtk-theme "$gtk_theme"
${pkgs.glib}/bin/gsettings set "$gnome_schema" icon-theme "$icon_theme"
${pkgs.glib}/bin/gsettings set "$gnome_schema" cursor-theme "$cursor_theme"
${pkgs.glib}/bin/gsettings set "$gnome_schema" font-name "$font_name"
${pkgs.glib}/bin/gsettings set "$gnome_schema" color-scheme prefer-dark
''
))
gnome_schema=org.gnome.desktop.interface
config="${config.xdg.configHome}/gtk-3.0/settings.ini"
if [ ! -f "$config" ]; then exit 1; fi
# Read settings from gtk3
gtk_theme="$(${pkgs.gnugrep}/bin/grep 'gtk-theme-name' "$config" | ${pkgs.gnused}/bin/sed 's/.*\s*=\s*//')"
icon_theme="$(${pkgs.gnugrep}/bin/grep 'gtk-icon-theme-name' "$config" | ${pkgs.gnused}/bin/sed 's/.*\s*=\s*//')"
cursor_theme="$(${pkgs.gnugrep}/bin/grep 'gtk-cursor-theme-name' "$config" | ${pkgs.gnused}/bin/sed 's/.*\s*=\s*//')"
font_name="$(grep 'gtk-font-name' "$config" | sed 's/.*\s*=\s*//')"
${pkgs.glib}/bin/gsettings set "$gnome_schema" gtk-theme "$gtk_theme"
${pkgs.glib}/bin/gsettings set "$gnome_schema" icon-theme "$icon_theme"
${pkgs.glib}/bin/gsettings set "$gnome_schema" cursor-theme "$cursor_theme"
${pkgs.glib}/bin/gsettings set "$gnome_schema" font-name "$font_name"
${pkgs.glib}/bin/gsettings set "$gnome_schema" color-scheme prefer-dark
''}")
]
++ (builtins.map cmdAlways cfg.exec.always)
++ (builtins.map cmdOnce cfg.exec.once);