🧑‍💻 Zed configs, Nextcloud as service, moved dev stuff

configuration.nix

@@ -46,7 +46,6 @@ in
     stremio
     fastfetch
     freetube
-    nextcloud-client
     discord
     nix-prefetch-github # Cmd to get rev and hash from GitHub
     gimp

flake.lock

@@ -116,9 +116,7 @@
         "catppuccin-v1_2": "catppuccin-v1_2",
         "home-manager": "home-manager",
         "home-manager-stable": "home-manager-stable",
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs",
-          "nixpkgs"
-        ],
         "nixpkgs-stable": "nixpkgs-stable",
         "nuscht-search": "nuscht-search"
       },
@@ -666,16 +664,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1736200483,
+        "lastModified": 1736344531,
-        "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=",
+        "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=",
-        "owner": "nixos",
+        "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751",
+        "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
+        "owner": "NixOS",
-        "ref": "nixos-24.11",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -712,6 +710,22 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1736200483,
+        "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-24.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixvim": {
       "inputs": {
         "devshell": "devshell",
@@ -791,7 +805,7 @@
         "catppuccin": "catppuccin",
         "home-manager": "home-manager_2",
         "hyprpanel": "hyprpanel",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "nixvim": "nixvim",
         "spicetify-nix": "spicetify-nix",

flake.nix

@@ -7,7 +7,6 @@
 
     catppuccin = {
       url = "github:catppuccin/nix";
-      inputs.nixpkgs.follows = "nixpkgs";
     };
     home-manager = {
       url = "github:nix-community/home-manager/release-24.11";

home-manager/default.nix

@@ -14,10 +14,11 @@ in
     inputs.nixvim.homeManagerModules.nixvim
     ./cava.nix
     ./default-applications.nix
+    ./development
     ./fish.nix
-    ./git.nix
+    ./gtk.nix
     ./mpv.nix
-    ./nixvim
+    ./nextcloud.nix
     ./rofi
     ./wlogout
     ./hyprland
@@ -25,8 +26,6 @@ in
     ./yazi
   ];
 
-  # Home Manager needs a bit of information about you and the
-  # paths it should manage.
   home = {
     username = username;
     homeDirectory = dir.home;

home-manager/development/default.nix

@@ -0,0 +1,7 @@
+{
+  imports = [
+    ./git.nix
+    ./nixvim
+    ./zed.nix
+  ];
+}

home-manager/development/zed.nix

@@ -0,0 +1,32 @@
+{
+  programs.zed-editor = {
+    enable = true;
+    extensions = [
+      "html"
+      "catppuccin"
+      "toml"
+      "nix"
+      "git_firefly"
+    ];
+    userSettings =
+      let
+        theme = import ../../theme.nix;
+        font = "${theme.nerdFont} Nerd Font";
+        fontSize = 14;
+      in
+      {
+        autosave = "on_focus_change";
+        base_keymap = "JetBrains";
+        ui_font_family = font;
+        buffer_font_family = font;
+        ui_font_size = fontSize;
+        buffer_font_size = fontSize;
+        theme = {
+          mode = "system";
+          light = "Catppuccin Frappé";
+          dark = "Catppuccin Mocha";
+        };
+        lsp.nil.initialization_options.formatting.command = [ "nixfmt" ];
+      };
+  };
+}

home-manager/gtk.nix

@@ -0,0 +1,13 @@
+let
+  theme = import ../theme.nix;
+in
+{
+  gtk.enable = true;
+  catppuccin.gtk = {
+    enable = true;
+    flavor = theme.flavor;
+    icon.enable = true;
+  };
+
+  stylix.targets.gtk.enable = false;
+}

home-manager/hyprland/settings.nix

@@ -14,7 +14,6 @@ in
     # Autostart
     exec-once = [
       "${app.browser}"
-      "nextcloud"
       "${app.terminal}"
       "hypridle"
       "systemctl --user start hyprpolkitagent"

home-manager/nextcloud.nix

@@ -0,0 +1,6 @@
+{
+  services.nextcloud-client = {
+    enable = true;
+    startInBackground = true;
+  };
+}

modules/development.nix

@@ -6,7 +6,6 @@
     jetbrains.rust-rover
     jetbrains.webstorm
     vscodium # TODO set up extensions
-    zed-editor
     # Tools
     git
     rustup

modules/gnome/default.nix

@@ -6,7 +6,7 @@
   ];
 
   environment.systemPackages = with pkgs; [
-    adw-gtk3
+    # adw-gtk3
     glib
     adwaita-icon-theme
     gnomeExtensions.appindicator