Merge branch 'stableconfig' into trunk

flake.lock

@@ -503,7 +503,6 @@
         "nixpkgs": "nixpkgs_2",
         "snowfall-lib": "snowfall-lib",
         "sops-nix": "sops-nix",
-        "trilium-next-pr": "trilium-next-pr",
         "zen-browser": "zen-browser"
       }
     },
@@ -621,22 +620,6 @@
         "type": "github"
       }
     },
-    "trilium-next-pr": {
-      "locked": {
-        "lastModified": 1736678965,
-        "narHash": "sha256-2A687i3Rq0/wqJVvpgaiRPWcfnBBuBhPjKaT8cnd7o0=",
-        "owner": "FliegendeWurst",
-        "repo": "nixpkgs",
-        "rev": "4fcdf706929246476e52e960760b6643cb8395c4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "FliegendeWurst",
-        "ref": "trilium-next",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "zen-browser": {
       "inputs": {
         "home-manager": "home-manager_2",

flake.nix

@@ -30,10 +30,6 @@
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    trilium-next-pr = {
-      url = "github:FliegendeWurst/nixpkgs/trilium-next";
-      # Don't follow nixpkgs as this repo has its own pinned nixpkgs
-    };
     anikki = {
       url = "github:Hion-V/Anikki-flake";
       inputs.nixpkgs.follows = "nixpkgs";

systems/x86_64-linux/drivebystation-nix/configuration.nix

@@ -47,9 +47,9 @@
 
   services = {
     # Enable Gnome Session
-    displayManager.gdm.enable = true;
-    displayManager.sddm.enable = false;
-    displayManager.sddm.wayland.enable = false;
+    displayManager.gdm.enable = false;
+    displayManager.sddm.enable = true;
+    displayManager.sddm.wayland.enable = true;
     displayManager.cosmic-greeter.enable = false;
     displayManager.defaultSession = "gnome";
     
@@ -140,6 +140,7 @@
     htop
     rivalcfg
     blender
+    freecad
     reaper
     discord
     betterdiscordctl