configuration.nix

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

flake.lock

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

flake.nix

@@ -7,6 +7,7 @@
 
     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,11 +14,10 @@ in
     inputs.nixvim.homeManagerModules.nixvim
     ./cava.nix
     ./default-applications.nix
-    ./development
     ./fish.nix
-    ./gtk.nix
+    ./git.nix
     ./mpv.nix
-    ./nextcloud.nix
+    ./nixvim
     ./rofi
     ./wlogout
     ./hyprland
@@ -26,6 +25,8 @@ 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

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

home-manager/development/zed.nix

@@ -1,32 +0,0 @@
-{
-  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

@@ -1,13 +0,0 @@
-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,6 +14,7 @@ in
     # Autostart
     exec-once = [
       "${app.browser}"
+      "nextcloud"
       "${app.terminal}"
       "hypridle"
       "systemctl --user start hyprpolkitagent"

home-manager/nextcloud.nix

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

modules/development.nix

@@ -6,6 +6,7 @@
     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