home config migration

modules/system/core/shell.nix

@@ -0,0 +1,6 @@
+{ ... }: {
+  programs = {
+    nix-ld.enable = true;
+    zsh.enable = true;
+  };
+}

modules/system/default.nix

@@ -5,9 +5,11 @@
     ./core/filesystem.nix
     ./core/network.nix
     ./core/kernel.nix
+    ./core/shell.nix
     ./core/user.nix
     ./misc/programs.nix
-    ./misc/desktop.nix
+    ./misc/graphics.nix
+    ./desktop.nix
     ./base.nix
   ];
 
@@ -20,8 +22,4 @@
       Defaults passwd_tries = 5
     '';
   };
-
-  fonts.packages = with pkgs; [
-    corefonts
-  ];
 }

modules/system/desktop.nix

@@ -0,0 +1,42 @@
+
+{ pkgs, enable-dm, ... }: {
+  imports = [
+    ./misc/theme.nix
+  ];
+
+  programs.hyprland = {
+    enable = true;
+    withUWSM = true;
+    xwayland.enable = true;
+    package = pkgs.hyprland; # if rice.enable then inputs.hl.packages."${pkgs.system}".hyprland else pkgs.hyprland;
+    portalPackage = pkgs.xdg-desktop-portal-hyprland; # inputs.hl.packages.${pkgs.system}.xdg-desktop-portal-hyprland;
+  };
+
+  xdg.portal = {
+    enable = true;
+    extraPortals = [
+      pkgs.xdg-desktop-portal-hyprland #inputs.hl.packages.${pkgs.system}.xdg-desktop-portal-hyprland
+      pkgs.xdg-desktop-portal-gtk
+    ];
+  };
+
+  services.displayManager.sddm = {
+    enable = enable-dm;
+    wayland.enable = true;
+    package = pkgs.kdePackages.sddm;
+    extraPackages = with pkgs.kdePackages; [
+      qtmultimedia qtsvg
+    ];
+  };
+
+  environment = {
+    systemPackages = with pkgs; [
+      libsecret libnotify kdePackages.kdeconnect-kde
+    ];
+    sessionVariables = {
+      XDG_RUNTIME_DIR = "/run/user/$UID"; # https://discourse.nixos.org/t/login-keyring-did-not-get-unlocked-hyprland/40869/10
+      WLR_NO_HARDWARE_CURSORS = "1";
+      NIXOS_OZONE_WL = "1";
+    };
+  };
+}

modules/system/misc/graphics.nix

@@ -1,11 +1,10 @@
-{ pkgs, enable-dm, ... }: {
+{ pkgs, ... }: {
   hardware.graphics = {
     enable = true;
     extraPackages = [ pkgs.libva-vdpau-driver ];
   };
 
   services = {
-    displayManager.gdm.enable = enable-dm;
     xserver = {
       enable = true;
       xkb = {
@@ -25,6 +24,18 @@
     blueman.enable = true;
     pulseaudio.enable = false;
   };
-
+  
+  fonts = {
+    enableDefaultPackages = true;
+    packages = with pkgs; [
+      nerd-fonts.droid-sans-mono
+      noto-fonts-cjk-sans
+      noto-fonts
+      font-awesome
+      corefonts
+    ];
+  };
+  
+  programs.xfconf.enable = true;
   security.rtkit.enable = true;
 }

modules/system/misc/programs.nix

@@ -13,16 +13,11 @@
   };
 
   programs = {
-    gdk-pixbuf.modulePackages = [ pkgs.librsvg ];
-    zsh.enable = true;
-    nix-ld.enable = true;
     steam.enable = true;
+    gdk-pixbuf.modulePackages = [ pkgs.librsvg ];
     appimage = {
       enable = true;
       binfmt = true;
     };
-    kdeconnect = {
-      enable = true;
-    };
   };
 }

modules/system/misc/theme.nix

@@ -0,0 +1,13 @@
+{ ctp-opt, ... }: {
+  qt = {
+    enable = true;
+    platformTheme = "gnome";
+    style = "adwaita-dark";
+  };
+
+  catppuccin = {
+    enable = true;
+    flavor = ctp-opt.flavor;
+    accent = ctp-opt.accent;
+  };
+}