Merge branch 'master' of github.com:mrjones2014/dotfiles

mrjones2014 · Apr 16, 2024 · 8289320 · 8289320
2 parents d256dab + 320970a
commit 8289320
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/home-manager/home.nix b/home-manager/home.nix
@@ -26,8 +26,7 @@ in {
     stateVersion = "22.11";
     packages = with pkgs;
       [
-        # TODO re-enable when they update to a non EOL version of electron...
-        # obsidian
+        obsidian
         mdbook
         spotify
         (discord.override {

diff --git a/home-manager/modules/gnome/dconf.nix b/home-manager/modules/gnome/dconf.nix
@@ -16,6 +16,7 @@ in {
       favorite-apps = [
         "org.gnome.Settings.desktop"
         "org.gnome.Nautilus.desktop"
+        "obsidian.desktop"
         "org.wezfurlong.wezterm.desktop"
         "1password.desktop"
         "signal-desktop.desktop"

diff --git a/nixos-modules/desktop_environment.nix b/nixos-modules/desktop_environment.nix
@@ -1,13 +1,11 @@
 { pkgs, ... }: {
   config = {
+    services.displayManager.defaultSession = "gnome-xorg";
     services.xserver = {
       enable = true;
       videoDrivers = [ "nvidia" ];
       desktopManager.gnome.enable = true;
-      displayManager = {
-        defaultSession = "gnome-xorg";
-        gdm.enable = true;
-      };
+      displayManager = { gdm.enable = true; };
     };
 
     # don't install GNOME crap like Contacts, Photos, etc.