refractor

nixcfgs/modules/nixos/desktop/default.nix

@@ -1,8 +1,7 @@
-{...}: {
-
+{pkgs, ...}: {
   imports = [
-    ../rime.nix
-    ../fonts.nix
+    ./fonts.nix
+    ./gnome-keyring.nix
   ];
   services.pipewire = {
     enable = true;
@@ -47,5 +46,6 @@
   };
   environment.systemPackages = with pkgs; [
     wl-clipboard
+    libnotify
   ];
 }

nixcfgs/modules/nixos/desktop/laptop.nix

@@ -1,9 +1,8 @@
-{ pkgs, ... }:
-
-{
+{pkgs, ...}: {
   environment.systemPackages = with pkgs; [
     powertop
   ];
+  imports = [
+    ./host-machine.nix
+  ];
 }
-
-

nixcfgs/modules/nixos/desktop/libvirt.nix

@@ -1,30 +0,0 @@
-{pkgs, ...}: {
-  environment.systemPackages = with pkgs; [
-    virt-manager
-    dnsmasq
-    virtiofsd
-  ];
-  programs.virt-manager.enable = true;
-  virtualisation.libvirtd = {
-    enable = true;
-    qemu = {
-      package = pkgs.qemu_kvm;
-      runAsRoot = true;
-      swtpm.enable = true;
-      # ovmf = {
-      #   enable = true;
-      #   packages = [
-      #     (pkgs.OVMF.override {
-      #       secureBoot = true;
-      #       tpmSupport = true;
-      #     }).fd
-      #   ];
-      # };
-    };
-  };
-  users.users.js0ny = {
-    extraGroups = ["libvirtd"];
-  };
-  networking.firewall.trustedInterfaces = ["virbr0"];
-  virtualisation.spiceUSBRedirection.enable = true;
-}

nixcfgs/modules/nixos/desktop/rime.nix

@@ -1,26 +0,0 @@
-{pkgs, ...}: {
-  # environment.variables = {
-  #   GTK_IM_MODULE = "fcitx";
-  #   QT_IM_MODULE = "fcitx";
-  #   XMODIFIERS = "@im=fcitx";
-  #   INPUT_METHOD = "fcitx";
-  # };
-  i18n.inputMethod = {
-    enable = true;
-    # enabled = "fcitx5"; dep.
-    enableGtk2 = true;
-    enableGtk3 = true;
-    type = "fcitx5";
-    fcitx5 = {
-      waylandFrontend = true;
-      # plasma6Support = true;
-      addons = with pkgs; [
-        fcitx5-rime
-        kdePackages.fcitx5-configtool
-        kdePackages.fcitx5-qt
-        fcitx5-gtk
-        fcitx5-lua
-      ];
-    };
-  };
-}

nixcfgs/modules/nixos/desktop/steam.nix

@@ -1,11 +0,0 @@
-{pkgs, ...}: {
-  nixpkgs.config.allowUnfree = true;
-  programs.steam = {
-    enable = true;
-    remotePlay.openFirewall = true;
-    dedicatedServer.openFirewall = true;
-    fontPackages = with pkgs; [
-      lxgw-neoxihei
-    ];
-  };
-}

nixcfgs/modules/nixos/desktop/waydroid.nix

@@ -1,22 +0,0 @@
-{ pkgs, inputs, ... }:
-{
-  virtualisation.waydroid.enable = true;
-  nixpkgs.overlays = [
-    inputs.nur.overlays.default
-  ];
-  # waydroid-script: Tool to install libhoudini (arm support), magisk, ...
-  # usage: sudo waydroid-script
-  environment.systemPackages = with pkgs; [
-    nur.repos.ataraxiasjel.waydroid-script
-    waydroid-helper
-  ];
-  systemd = {
-    packages = [ pkgs.waydroid-helper ];
-    services.waydroid-mount = {
-      wantedBy = [ "multi-user.target" ];
-      serviceConfig = {
-        ExecStart = "${pkgs.waydroid-helper}/bin/waydroid-helper --start-mount";
-      };
-    };
-  };
-}

nixcfgs/modules/nixos/desktop/winboat.nix

@@ -1,5 +0,0 @@
-{inputs, ...}: {
-  environment.systemPackages = [
-    inputs.winboat
-  ];
-}

nixcfgs/modules/nixos/desktop/wine.nix

@@ -1,8 +0,0 @@
-# https://nixos.wiki/wiki/Wine
-{pkgs, ...}: {
-  environment.systemPackages = with pkgs; [
-    wineWowPackages.stable
-    winetricks
-    wineWowPackages.waylandFull
-  ];
-}