plasma5 -> plasma6

for both the NixOS desktop env as well as home-manager packages.

ktouch had to be disabled due to being marked as broken, let's fix this
later

common/default.nix

@@ -153,7 +153,7 @@ in
 
   # Enable the KDE Desktop Environment.
   services.displayManager.sddm.enable = true;
-  services.xserver.desktopManager.plasma5.enable = true;
+  services.desktopManager.plasma6.enable = true;
 
   # dconf required for several Gnome applications
   programs.dconf.enable = true;

common/packages.nix

@@ -9,90 +9,48 @@
   # take overlays from flake
   nixpkgs.overlays = lib.attrValues config.inputInjection.flake-inputs.self.overlays;
   # List packages installed in system profile.
-  environment.systemPackages =
-    with pkgs;
-    [
-      wget
-      vim
-      vimPlugins.vim-nix
-      vimPlugins.pathogen
-      tmux
-      htop
-      zsh
-      btrfs-progs
-      git
-      python3
-      man-pages
-      dnsutils
-      netcat-openbsd
-      ntfs3g
-      file
-      multipath-tools
-      strace
-      ltrace
-      valgrind
-      testdisk
-      rsync
-      pv
-      exfat
-      iotop
-      cifs-utils
-      dstat
-      lsof
-      macchanger
-      borgbackup
+  environment.systemPackages = with pkgs; [
+    wget
+    vim
+    vimPlugins.vim-nix
+    vimPlugins.pathogen
+    tmux
+    htop
+    zsh
+    btrfs-progs
+    git
+    python3
+    man-pages
+    dnsutils
+    netcat-openbsd
+    ntfs3g
+    file
+    multipath-tools
+    strace
+    ltrace
+    valgrind
+    testdisk
+    rsync
+    pv
+    exfat
+    iotop
+    cifs-utils
+    dstat
+    lsof
+    macchanger
+    borgbackup
 
-      # for debugging WLAN failures:
-      ethtool
-      trace-cmd
+    # for debugging WLAN failures:
+    ethtool
+    trace-cmd
 
-      # NetworkManager stuff
-      networkmanager-openconnect
-      networkmanager-vpnc
-      networkmanager-openvpn
-      plasma5Packages.kdeGear.akonadi-mime # for KOrganizer
-    ]
-    ++ (
-      with plasma5Packages;
-      with kdeGear;
-      [
-        #akonadi
-        #akonadi-calendar
-        #akonadi-contacts
-        #akonadi-import-wizard
-        #akonadi-mime
-        #akonadi-notes
-        #akonadi-search
-        #akonadiconsole
-        #akregator
-        #kaddressbook
-        #kalarm
-        #kalarmcal
-        #kcalutils
-        #kcontacts
-        #kdav
-        #kdepim-addons
-
-        #kdepim-runtime
-        #kidentitymanagement
-        #kldap
-        #kmail
-        #kmailtransport
-        #kmbox
-        #kmime
-        #kontact
-        #kontactinterface
-        #korganizer
-        #kpimtextedit
-        #libkdepim
-        #libksieve
-        #mailcommon
-        #messagelib
-        #pimcommon
-        #pim-sieve-editor
-
-        # for some Flatpak packkages
-        accountsservice
-      ]
-    );
+    # NetworkManager stuff
+    networkmanager-openconnect
+    networkmanager-vpnc
+    networkmanager-openvpn
+    # TODO: is this still necessary?
+    kdePackages.akonadi-mime # for KOrganizer
+    # for some Flatpak packkages
+    accountsservice
+  ];
 }

flake.lock

@@ -117,11 +117,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718530513,
-        "narHash": "sha256-BmO8d0r+BVlwWtMLQEYnwmngqdXIuyFzMwvmTcLMee8=",
+        "lastModified": 1719827385,
+        "narHash": "sha256-qs+nU20Sm8czHg3bhGCqiH+8e13BJyRrKONW34g3i50=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "a1fddf0967c33754271761d91a3d921772b30d0e",
+        "rev": "391ca6e950c2525b4f853cbe29922452c14eda82",
         "type": "github"
       },
       "original": {
@@ -194,11 +194,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1719681865,
-        "narHash": "sha256-Lp+l1IsREVbz8WM35OJYZz8sAH0XOjrZWUXVB5bJ2qg=",
+        "lastModified": 1719895800,
+        "narHash": "sha256-xNbjISJTFailxass4LmdWeV4jNhAlmJPwj46a/GxE6M=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "a59f00f5ac65b19382617ba00f360f8bc07ed3ac",
+        "rev": "6e253f12b1009053eff5344be5e835f604bb64cd",
         "type": "github"
       },
       "original": {
@@ -210,11 +210,11 @@
     },
     "nixos-unstable": {
       "locked": {
-        "lastModified": 1719506693,
-        "narHash": "sha256-C8e9S7RzshSdHB7L+v9I51af1gDM5unhJ2xO1ywxNH8=",
+        "lastModified": 1719848872,
+        "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b2852eb9365c6de48ffb0dc2c9562591f652242a",
+        "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8",
         "type": "github"
       },
       "original": {
@@ -258,11 +258,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1719426051,
-        "narHash": "sha256-yJL9VYQhaRM7xs0M867ZFxwaONB9T2Q4LnGo1WovuR4=",
+        "lastModified": 1719838683,
+        "narHash": "sha256-Zw9rQjHz1ilNIimEXFeVa1ERNRBF8DoXDhLAZq5B4pE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "89c49874fb15f4124bf71ca5f42a04f2ee5825fd",
+        "rev": "d032c1a6dfad4eedec7e35e91986becc699d7d69",
         "type": "github"
       },
       "original": {
@@ -274,11 +274,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1719771190,
-        "narHash": "sha256-W2EApTej3kQYP+nn8BbCoSOQs+5Kvn+0LJzlT+GkB2E=",
+        "lastModified": 1719949581,
+        "narHash": "sha256-5oTHaCzhztZL0we4NxD9ZbHoRtxxS+psl+8VVVDNN+A=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "2ef1c7312fd083f118fee1bfeef40f4de36b14ca",
+        "rev": "ef879b77a1fbbe7170ab555852e18fa531c23a60",
         "type": "github"
       },
       "original": {

home/modules/packages.nix

@@ -122,7 +122,7 @@ let
     ];
 
   pythonTools = with python3Packages; [
-    python3   # to shadow old macOS python
+    python3 # to shadow old macOS python
     notebook
     ipython
     pip
@@ -193,9 +193,8 @@ let
   ];
 
   kdeTools =
-    with plasma5Packages;
-    with kdeGear;
-    [
+    [ okteta ]
+    ++ (with kdePackages; [
       okular
       gwenview
       yakuake
@@ -212,16 +211,13 @@ let
       qdirstat
       ark
       kwalletmanager
-      ktouch
+      #ktouch  # TODO: unbreak
       kcharselect
       konversation
-      okteta
       krdc
       skanlite
       akonadiconsole
       tokodon # mastodon client
-    ]
-    ++ (with kdeFrameworks; [
       networkmanager-qt
       kcrash
       breeze-gtk

hosts/framenix/default.nix

@@ -46,7 +46,6 @@ in
     };
   };
 
-
   boot.loader = {
     systemd-boot.enable = true;
     efi.canTouchEfiVariables = true;