diff options
| -rw-r--r-- | flake.nix | 33 | ||||
| -rw-r--r-- | home-modules/apps/default.nix | 2 | ||||
| -rw-r--r-- | modules/desktop/common.nix | 23 | ||||
| -rw-r--r-- | modules/desktop/wms/hyprland.nix | 1 | ||||
| -rw-r--r-- | users/live-user.nix | 2 |
5 files changed, 42 insertions, 19 deletions
@@ -42,32 +42,51 @@ inputs.sops-nix.nixosModules.sops ]; }; - test_vm = nixpkgs.lib.nixosSystem { + full-iso = nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs; + isoImage.squashfsCompression = "lz4"; + isoImage.isoLabel = "NIX_WQ_ISO"; }; system = "x86_64-linux"; modules = [ ./common.nix - ./hosts/test_vm - ./users/wilkuu.nix + ./hosts/full-iso + ./users/live-user.nix inputs.home-manager.nixosModules.default + inputs.sops-nix.nixosModules.sops ]; }; - full-iso = nixpkgs.lib.nixosSystem { + vm-desktop = nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs; - isoImage.squashfsCompression = "lz4"; - isoImage.isoLabel = "NIX_WQ_ISO"; }; system = "x86_64-linux"; modules = [ ./common.nix - ./hosts/full-iso + ./hosts/test_vm ./users/live-user.nix inputs.home-manager.nixosModules.default + inputs.sops-nix.nixosModules.sops ]; }; + vm-shell = nixpkgs.lib.nixosSystem { + specialArgs = { + inherit inputs; + }; + system = "x86_64-linux"; + modules = [ + ./common.nix + ./hosts/test_vm + ./users/live-user.nix + ({lib, ...}: { + addons.desktop.hyprland.enable = lib.mkForce false; + addons.desktop.xfce.enable = lib.mkForce false; + }) + inputs.home-manager.nixosModules.default + inputs.sops-nix.nixosModules.sops + ]; + }; }; }; } diff --git a/home-modules/apps/default.nix b/home-modules/apps/default.nix index e9d0109..0efdaec 100644 --- a/home-modules/apps/default.nix +++ b/home-modules/apps/default.nix @@ -3,6 +3,7 @@ pkgs, inputs, config, + hostconfig, ... }: with lib; @@ -35,7 +36,6 @@ in multimedia.enable = lib.mkEnableOption "Enable multimedia apps"; games.enable = lib.mkEnableOption "Enable games"; }; - config = lib.mkMerge [ (lib.mkIf cfg.full.enable { homeapps.presets = { diff --git a/modules/desktop/common.nix b/modules/desktop/common.nix index 4690597..ca43c5f 100644 --- a/modules/desktop/common.nix +++ b/modules/desktop/common.nix @@ -58,15 +58,20 @@ # fcitx is broken for now i18n.inputMethod = { type = "fcitx5"; - enable = true; - fcitx5.addons = with pkgs; [ - fcitx5-gtk - fcitx5-lua - fcitx5-mozc - catppuccin-fcitx5 - fcitx5-table-other - kdePackages.fcitx5-qt - ]; + enable = false; + fcitx5 = { + waylandFrontend = true; + addons = with pkgs; [ + # fcitx5-gtk + # fcitx5-lua + # fcitx5-mozc + # catppuccin-fcitx5 + # fcitx5-table-other + # fcitx5-gtk + # libsForQt5.fcitx5-qt + # kdePackages.fcitx5-qt + ]; + }; }; fonts.packages = with pkgs; [ diff --git a/modules/desktop/wms/hyprland.nix b/modules/desktop/wms/hyprland.nix index dfc7116..b35881c 100644 --- a/modules/desktop/wms/hyprland.nix +++ b/modules/desktop/wms/hyprland.nix @@ -45,6 +45,7 @@ in xdg-desktop-portal-gnome xdg-desktop-portal-hyprland wl-clipboard + hyprland-qt-support ]; } ] diff --git a/users/live-user.nix b/users/live-user.nix index 8e8c237..ec5074e 100644 --- a/users/live-user.nix +++ b/users/live-user.nix @@ -1,7 +1,5 @@ { pkgs, - lib, - config, ... }: { |