From 33ef4623a1d416ed534ee02474cf7f7c892b8814 Mon Sep 17 00:00:00 2001
From: Vinzenz Schroeter <vinzenz.f.s@gmail.com>
Date: Sun, 27 Aug 2023 22:48:32 +0200
Subject: [PATCH] figured out mount problems

---
 home.nix                               | 22 ++++++++++++----------
 kde.nix                                | 17 ++++++++++++++++-
 vinzenz-pc3-hardware-configuration.nix | 25 +++++++++++++++----------
 3 files changed, 43 insertions(+), 21 deletions(-)

diff --git a/home.nix b/home.nix
index 9529fa1..80d9741 100644
--- a/home.nix
+++ b/home.nix
@@ -110,7 +110,9 @@
         initExtra = "eval \"$(direnv hook zsh)\"";
 
         shellAliases = {
-          my-update = "sudo nixos-rebuild switch";
+          my-apply = "sudo nixos-rebuild boot";
+          my-switch = "sudo nixos-rebuild switch";
+          my-update = "sudo nixos-rebuild boot --upgrade";
           my-fmt = "alejandra .";
         };
 
@@ -165,10 +167,11 @@
           "editor.fontFamily" = "'Fira Code', 'Droid Sans Mono', 'monospace', monospace";
           "editor.fontLigatures" = true;
           "editor.formatOnSave" = true;
-          "editor.formatOnSaveMode" = "modificationsIfAvailiable";
+          "editor.formatOnSaveMode" = "modificationsIfAvailable";
           "editor.minimap.autohide" = true;
           "diffEditor.diffAlgorithm" = "advanced";
           "explorer.excludeGitIgnore" = true;
+          "workbench.startupEditor" = "readme";
           "markdown.extension.tableFormatter.normalizeIndentation" = true;
           "markdown.extension.toc.orderedList" = false;
           "telemetry.telemetryLevel" = "off";
@@ -205,14 +208,13 @@
 
       exa = {
         enable = true;
-        # not availiable at 22.11
-        # git = true;
-        #   icons = true;
-        # enableAliases = true;
-        # extraOptions = [
-        #   "--group-directories-first"
-        #   "--header"
-        # ];
+        git = true;
+        icons = true;
+        enableAliases = true;
+        extraOptions = [
+          "--group-directories-first"
+          "--header"
+        ];
       };
 
       # checked https://rycee.gitlab.io/home-manager/options.html until "programs.jq"
diff --git a/kde.nix b/kde.nix
index 6535c59..2d890a8 100644
--- a/kde.nix
+++ b/kde.nix
@@ -6,11 +6,25 @@
   services = {
     # Enable the KDE Plasma Desktop Environment.
     xserver = {
-      displayManager.sddm.enable = true;
       desktopManager.plasma5.enable = true;
+
+      displayManager = {
+        sddm.enable = true;
+        defaultSession = "plasmawayland";
+      };
     };
   };
 
+  environment.plasma5.excludePackages = with pkgs.libsForQt5; [
+    elisa
+    gwenview
+    okular
+    khelpcenter
+  ];
+
+  programs.dconf.enable = true;
+  programs.partition-manager.enable = true;
+
   home-manager.users.vinzenz = {
     config,
     pkgs,
@@ -20,6 +34,7 @@
       packages = with pkgs; [
       ];
     };
+
     services.kdeconnect = {
       enable = true;
       indicator = true;
diff --git a/vinzenz-pc3-hardware-configuration.nix b/vinzenz-pc3-hardware-configuration.nix
index 3f603b1..a3f26fd 100644
--- a/vinzenz-pc3-hardware-configuration.nix
+++ b/vinzenz-pc3-hardware-configuration.nix
@@ -29,17 +29,22 @@
       fsType = "vfat";
     };
 
-#    "/sdmanjaro" = {
-#      device = "/dev/disk/by-uuid/b6b4c0b8-4b16-4a72-a18d-d7923a2bb532";
-#      fsType = "btrfs";
-#      options = ["subvol=@"];
-#    };
+    "/mnt/manjaro" = {
+      device = "/dev/disk/by-uuid/b6b4c0b8-4b16-4a72-a18d-d7923a2bb532";
+      fsType = "btrfs";
+      options = ["subvol=@"];
+    };
 
-#    "/sdmanjaro/home" = {
-#      device = "/dev/disk/by-uuid/b6b4c0b8-4b16-4a72-a18d-d7923a2bb532";
-#      fsType = "btrfs";
-#      options = ["subvol=home"];
-#    };
+    "/mnt/manjaro/home" = {
+      device = "/dev/disk/by-uuid/b6b4c0b8-4b16-4a72-a18d-d7923a2bb532";
+      fsType = "btrfs";
+      options = ["subvol=@home"];
+    };
+
+    "/mnt/ssd2" = {
+      device = "/dev/disk/by-uuid/6b2a647d-c68e-4c07-85bf-c9bfc5db7e8a";
+      fsType = "ext4";
+    };
   };
 
   swapDevices = [];