improvements

class/desktop/clipboard.nix

@@ -0,0 +1,3 @@
+{pkgs, ...}: {
+  environment.systemPackages = [pkgs.wl-clipboard];
+}

class/desktop/default.nix

@@ -1,8 +1,8 @@
 {
   imports = [
+    ./clipboard.nix
     ./compatibility.nix
     ./docker.nix
-    ./fish.nix
     ./flatpak.nix
     ./fonts.nix
     ./fs.nix
@@ -11,11 +11,12 @@
     ./hardware.nix
     ./location.nix
     ./mullvad.nix
+    ./neovide.nix
     ./networking.nix
     ./pipewire.nix
     ./plasma.nix
     ./printing.nix
     ./syncthing.nix
-    ./vscode.nix
+    ./users.nix
   ];
 }

class/desktop/fish.nix

@@ -1,4 +0,0 @@
-{pkgs, ...}: {
-  programs.fish.enable = true;
-  users.defaultUserShell = pkgs.fish;
-}

class/desktop/fonts.nix

@@ -1,25 +1,27 @@
 {pkgs, ...}: {
   fonts = {
     enableDefaultPackages = true;
-
-    packages = with pkgs; [
-      noto-fonts
-      noto-fonts-extra
-      noto-fonts-cjk-sans
-      noto-fonts-cjk-serif
-      noto-fonts-emoji
-      (nerdfonts.override {fonts = ["Noto" "Iosevka"];})
+    packages = [
+      pkgs.noto-fonts
+      pkgs.noto-fonts-extra
+      pkgs.noto-fonts-cjk-sans
+      pkgs.noto-fonts-cjk-serif
+      pkgs.noto-fonts-monochrome-emoji
+      pkgs.noto-fonts-color-emoji
+      (pkgs.nerdfonts.override {fonts = ["Noto"];})
     ];
 
     fontconfig = {
       enable = true;
 
       defaultFonts = {
-        monospace = ["NotoSansMono Nerd Font"];
+        monospace = ["NotoSansM Nerd Font"];
         sansSerif = ["Noto Sans"];
         serif = ["Noto Serif"];
-        emoji = ["Noto Color Emoji"];
+        emoji = ["Noto Color Emoji" "Noto Emoji"];
       };
     };
+
+    fontDir.enable = true;
   };
 }

class/desktop/neovide.nix

@@ -0,0 +1,5 @@
+{pkgs, ...}: let
+  package = pkgs.neovide;
+in {
+  environment.systemPackages = [package];
+}

class/desktop/plasma.nix

@@ -1,27 +1,16 @@
 {pkgs, ...}: {
-  # TODO
-  # displayManager = {
-  #   defaultSession = "plasmawayland";
-  #   sddm = {
-  #     enable = true;
-  #     autoNumlock = true;
-  #     settings = {
-  #       Theme = {
-  #         CursorTheme = "breeze_cursors";
-  #       };
-  #     };
-  #   };
-  # };
-
-  services = {
-    xserver = {
-      enable = true;
-      desktopManager.plasma6.enable = true;
-      displayManager.sddm.enable = true;
-      excludePackages = with pkgs; [
-        xterm
-      ];
+  services.xserver = {
+    enable = true;
+    desktopManager.plasma6.enable = true;
+    displayManager = {
+      defaultSession = "plasma";
+      sddm = {
+        enable = true;
+        wayland.enable = true;
+        settings.Theme.CursorTheme = "breeze_cursors";
+      };
     };
+    excludePackages = [pkgs.xterm];
   };
 
   environment = {
@@ -31,11 +20,11 @@
       pkgs.sddm-kcm
     ];
     sessionVariables = {
-      "SUDO_ASKPASS" = pkgs.writeShellScript "kdialogaskpass" ''
+      SUDO_ASKPASS = pkgs.writeShellScript "kdialogaskpass" ''
         exec ${pkgs.kdialog} --password Askpass
       '';
-      "MOZ_USE_XINPUT2" = "1";
-      "GDK_SCALE" = "1";
+      MOZ_USE_XINPUT2 = "1";
+      GDK_SCALE = "1";
     };
   };
 

class/desktop/users.nix

@@ -0,0 +1,11 @@
+{
+  users = {
+    groups.guest = {};
+
+    users.guest = {
+      isNormalUser = true;
+      password = "guest";
+      extraGroups = ["wheel" "networkmanager" "gamemode"];
+    };
+  };
+}

class/desktop/vscode.nix

@@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  environment.systemPackages = [pkgs.vscode-fhs];
-}