diff --git a/flake.nix b/flake.nix index 2f57e8431..a17620013 100644 --- a/flake.nix +++ b/flake.nix @@ -77,6 +77,12 @@ username = "nixos"; desktop = "gnome"; }; + "nixos@iso-lomiri" = helper.mkHome { + hostname = "iso-lomiri"; + username = "nixos"; + desktop = "lomiri"; + }; + "nixos@iso-mate" = helper.mkHome { hostname = "iso-mate"; username = "nixos"; @@ -150,6 +156,12 @@ username = "nixos"; desktop = "gnome"; }; + iso-lomiri = helper.mkNixos { + hostname = "iso-lomiri"; + username = "nixos"; + desktop = "lomiri"; + }; + iso-mate = helper.mkNixos { hostname = "iso-mate"; username = "nixos"; diff --git a/nixos/_mixins/desktop/features/xdg/default.nix b/nixos/_mixins/desktop/features/xdg/default.nix index 25c7ef76f..a6e0a27cd 100644 --- a/nixos/_mixins/desktop/features/xdg/default.nix +++ b/nixos/_mixins/desktop/features/xdg/default.nix @@ -16,6 +16,8 @@ ] ++ lib.optionals (desktop == "pantheon") [ pkgs.pantheon.xdg-desktop-portal-pantheon pkgs.xdg-desktop-portal-gtk + ] ++ lib.optionals (desktop == "lomiri") [ + lxqt.xdg-desktop-portal-lxqt ]; config = { common = { diff --git a/nixos/_mixins/desktop/lomiri/default.nix b/nixos/_mixins/desktop/lomiri/default.nix new file mode 100644 index 000000000..82093e4a3 --- /dev/null +++ b/nixos/_mixins/desktop/lomiri/default.nix @@ -0,0 +1,60 @@ +{ + config, + isInstall, + lib, + pkgs, + ... +}: +{ + environment = { + systemPackages = + with pkgs; + lib.optionals isInstall [ + lomiri.morph-browser + lomiri.lomiri-terminal-app + lomiri.lomiri-clock-app + lomiri.lomiri-filemanager-app + lomiri.lomiri-camera-app + lomiri.lomiri-calculator-app + lomiri.teleports + unstable.lomiri.lomiri-gallery-app + unstable.lomiri.lomiri-docviewer-app + ]; + }; + + programs = { + dconf.profiles.user.databases = [ + { + settings = with lib.gvariant; { + "org/gnome/desktop/interface" = { + clock-format = "24h"; + color-scheme = "prefer-dark"; + cursor-size = mkInt32 48; + cursor-theme = "catppuccin-mocha-blue-cursors"; + document-font-name = "Work Sans 12"; + font-name = "Work Sans 12"; + gtk-theme = "catppuccin-mocha-blue-standard"; + gtk-enable-primary-paste = true; + icon-theme = "Papirus-Dark"; + monospace-font-name = "FiraCode Nerd Font Mono Medium 13"; + text-scaling-factor = mkDouble 1.0; + }; + + "org/gnome/desktop/sound" = { + theme-name = "freedesktop"; + }; + + "org/gtk/gtk4/Settings/FileChooser" = { + clock-format = "24h"; + }; + + "org/gtk/Settings/FileChooser" = { + clock-format = "24h"; + }; + }; + } + ]; + }; + services.xserver.displayManager.lightdm.greeters.lomiri.enable = true; + services.desktopManager.lomiri.enable = true; +} diff --git a/nixos/_mixins/scripts/build-iso/build-iso.sh b/nixos/_mixins/scripts/build-iso/build-iso.sh index cf7cda846..2c167fdeb 100644 --- a/nixos/_mixins/scripts/build-iso/build-iso.sh +++ b/nixos/_mixins/scripts/build-iso/build-iso.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash if [ -z "${1}" ]; then - echo "Usage: build-iso " + echo "Usage: build-iso " exit 1 fi diff --git a/nixos/iso-lomiri b/nixos/iso-lomiri new file mode 120000 index 000000000..420d867ba --- /dev/null +++ b/nixos/iso-lomiri @@ -0,0 +1 @@ +iso-console \ No newline at end of file