Update to (somewhat?) dendritic pattern

Heavily inspired by https://github.com/Doc-Steve/dendritic-design-with-flake-parts.

> Atomic commits? Never heard of them!

modules/programs/browser.nix

@@ -0,0 +1,14 @@
+{ inputs, ... }: {
+  flake-file.inputs = {
+    zen-browser = {
+      url = "github:youwen5/zen-browser-flake";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+  };
+
+  flake.modules.homeManager.browser = { pkgs, ... }: {
+    home.packages = [
+      inputs.zen-browser.packages.${pkgs.stdenv.hostPlatform.system}.default
+    ];
+  };
+}

modules/programs/btop.nix

@@ -0,0 +1,7 @@
+{
+  flake.modules.homeManager.btop = { pkgs, ... }: {
+    home.packages = with pkgs; [
+      btop
+    ];
+  };
+}

modules/programs/catppuccin.nix

@@ -0,0 +1,48 @@
+{ inputs, ... }: {
+  flake-file.inputs = {
+    catppuccin.url = "github:catppuccin/nix/release-25.11";
+    catppuccin.inputs.nixpkgs.follows = "nixpkgs";
+  };
+
+  flake.modules.nixos.catppuccin = {
+    imports = [
+      inputs.catppuccin.nixosModules.catppuccin
+    ];
+
+    home-manager.sharedModules = [
+      inputs.self.modules.homeManager.catppuccin
+    ];
+
+    catppuccin.enable = true;
+  };
+
+  flake.modules.homeManager.catppuccin = { pkgs, ... }: {
+    imports = [
+      inputs.catppuccin.homeModules.catppuccin
+    ];
+
+    # Catppuccin cursor
+    home.pointerCursor =
+      let
+        size = 24;
+      in
+      {
+        enable = true;
+        package = pkgs.catppuccin-cursors.mochaMauve;
+        name = "catppuccin-mocha-mauve-cursors";
+        inherit size;
+
+        dotIcons.enable = true;
+        gtk.enable = true;
+        hyprcursor.enable = true;
+        hyprcursor.size = size;
+      };
+
+    catppuccin.enable = true;
+    # Required for QT apps to use the catppuccin colors
+    qt = {
+      enable = true;
+      style.name = "kvantum";
+    };
+  };
+}

modules/programs/cli-tools.nix

@@ -0,0 +1,9 @@
+{
+  flake.modules.nixos.cli-tools = { pkgs, ... }: {
+    environment.systemPackages = with pkgs; [
+      git
+      htop
+      vim
+    ];
+  };
+}

modules/programs/development-tools/development-tools.nix

@@ -0,0 +1,14 @@
+{ inputs, ... }: {
+  flake.modules.nixos.development-tools = { pkgs, ... }: {
+    imports = with inputs.self.modules.nixos; [
+      rust
+    ];
+
+    environment.systemPackages = with pkgs; [
+      cmake
+      gnumake
+      clang
+      gcc
+    ];
+  };
+}

modules/programs/development-tools/rust.nix

@@ -0,0 +1,18 @@
+{ inputs, ... }: {
+  flake-file.inputs = {
+    rust-overlay = {
+      url = "github:oxalica/rust-overlay";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+  };
+
+  flake.modules.nixos.rust = { pkgs, ... }: {
+    nixpkgs.overlays = [
+      inputs.rust-overlay.overlays.default
+    ];
+
+    environment.systemPackages = with pkgs; [
+      rust-bin.stable.latest.default
+    ];
+  };
+}

modules/programs/direnv.nix

@@ -0,0 +1,9 @@
+{
+  flake.modules.homeManager.direnv = {
+    programs.direnv = {
+      enable = true;
+      enableZshIntegration = true;
+      nix-direnv.enable = true;
+    };
+  };
+}

modules/programs/fzf.nix

@@ -0,0 +1,8 @@
+{
+  flake.modules.homeManager.fzf = {
+    programs.fzf = {
+      enable = true;
+      enableZshIntegration = true;
+    };
+  };
+}

modules/programs/git.nix

@@ -0,0 +1,16 @@
+{
+  flake.modules.nixos.git = { pkgs, ... }: {
+    environment.systemPackages = [ pkgs.git ];
+  };
+
+  flake.modules.homeManager.git = {
+    programs.git = {
+      enable = true;
+      settings.user = {
+        email = "weckyy702@gmail.com";
+        name = "Weckyy702";
+      };
+      #TODO: signing
+    };
+  };
+}

modules/programs/gnupg.nix

@@ -0,0 +1,8 @@
+{
+  flake.modules.nixos.gnupg = {
+    programs.gnupg.agent = {
+      enable = true;
+      enableSSHSupport = true;
+    };
+  };
+}

modules/programs/hyprland/hyprland.nix

@@ -0,0 +1,20 @@
+{ inputs, ... }: {
+  flake.modules.nixos.hyprland = {
+    programs.hyprland.enable = true;
+    # Force electron apps to use wayland
+    environment.sessionVariables.NIXOS_OZONE_WL = "1";
+
+    home-manager.sharedModules = [
+      inputs.self.modules.homeManager.hyprland
+    ];
+  };
+
+  flake.modules.homeManager.hyprland = { pkgs, ... }: {
+    wayland.windowManager.hyprland.enable = true;
+    services.hyprpolkitagent.enable = true;
+
+    home.packages = with pkgs; [
+      hyprpicker
+    ];
+  };
+}

modules/programs/hyprland/settings.nix

@@ -0,0 +1,89 @@
+{
+  flake.modules.homeManager.hyprland = {
+    wayland.windowManager.hyprland.settings = {
+      "$mod" = "SUPER";
+      "$browser" = "zen";
+      "$term" = "kitty";
+
+      general = {
+        border_size = 2;
+        gaps_in = 0;
+        gaps_out = 5;
+        layout = "dwindle";
+        allow_tearing = false;
+        resize_on_border = true;
+      };
+
+      snap = { };
+
+      input = {
+        kb_layout = "de";
+        follow_mouse = 1;
+      };
+
+      exec-once = [
+        "hyprctl setcursor catppuccin-mocha-mauve-cursors 24"
+      ];
+
+      bind =
+        [
+          "$mod, Q, exit"
+          "$mod, Return, exec, $term"
+          "$mod, D, exec, rofi -show drun -modes drun,calc"
+          "$mod, F2, exec, $browser"
+          "$mod, c, killactive"
+          "$mod, f, fullscreen"
+          "$mod, h, movefocus, l"
+          "$mod, j, movefocus, d"
+          "$mod, k, movefocus, u"
+          "$mod, l, movefocus, r"
+          "$mod+SHIFT, h, movewindow, l"
+          "$mod+SHIFT, j, movewindow, d"
+          "$mod+SHIFT, k, movewindow, u"
+          "$mod+SHIFT, l, movewindow, r"
+          ", Print, exec, grim -g \"$(slurp)\" \"/home/weckyy702/Pictures/screenshots/$(date -Iseconds).png\""
+          "$mod+SHIFT, s, exec, hyprlock"
+        ]
+        ++
+        # Switch workspaces
+        (map (i: "$mod, ${builtins.toString i}, workspace, ${builtins.toString i}") [ 0 1 2 3 4 5 6 7 8 9 ])
+        ++ (map (i: "$mod+SHIFT, ${builtins.toString i}, movetoworkspacesilent, ${builtins.toString i}") [ 0 1 2 3 4 5 6 7 8 9 ]);
+
+      bindm = [
+        "$mod, mouse:272, movewindow"
+      ];
+
+      bindel = [
+        ", XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+"
+        ", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
+      ];
+
+      bindl = [
+        ", XF86AudioNext, exec, playerctl position 5+"
+        ", XF86AudioPrev, exec, playerctl position 5-"
+        ", XF86AudioPlay, exec, playerctl play-pause"
+      ];
+
+      bindo = [
+        ", XF86AudioNext, exec, playerctl next"
+        ", XF86AudioPrev, exec, playerctl previous"
+      ];
+
+      decoration = {
+        shadow.enabled = false;
+        blur.enabled = true;
+        active_opacity = 0.8;
+        inactive_opacity = 0.8;
+      };
+
+      animations.enabled = false;
+
+      misc.disable_hyprland_logo = true;
+
+      cursor.inactive_timeout = 3;
+
+      ecosystem.no_update_news = true;
+      ecosystem.no_donation_nag = true;
+    };
+  };
+}

modules/programs/kitty/config.nix

@@ -0,0 +1,5 @@
+{
+  flake.modules.homeManager.kitty = {
+    #TODO: kitty config
+  };
+}

modules/programs/kitty/kitty.nix

@@ -0,0 +1,14 @@
+{
+  flake.modules.homeManager.kitty = {
+    programs.kitty = {
+      enable = true;
+      enableGitIntegration = true;
+      font = {
+        name = "JetBrains Mono";
+        size = 10;
+      };
+      shellIntegration.enableZshIntegration = true;
+      #TODO: kitty config
+    };
+  };
+}

modules/programs/multimedia.nix

@@ -0,0 +1,11 @@
+{
+  flake.modules.homeManager.multimedia = { pkgs, ... }: {
+    home.packages = with pkgs; [
+      feh
+      mpv
+      playerctl
+      file
+      zathura
+    ];
+  };
+}

modules/programs/nixvim/_nixvim-config/default.nix

@@ -0,0 +1,19 @@
+{ ... }: {
+  imports = [
+    ./keymaps.nix
+    ./options.nix
+    ./plugins
+  ];
+
+  clipboard.register = "unnamedplus";
+
+  colorschemes.catppuccin = {
+    enable = true;
+    settings.flavour = "mocha";
+    settings.integrations = {
+      gitsigns = true;
+      treesitter = true;
+      cmp = true;
+    };
+  };
+}

modules/programs/nixvim/_nixvim-config/keymaps.nix

@@ -0,0 +1,25 @@
+{ ... }: {
+  globals.mapleader = " ";
+
+  keymaps = [
+    {
+      key = "<esc>";
+      action = ":noh<CR>";
+      mode = "n";
+      options = {
+        silent = true;
+        desc = "Clear search highlight";
+      };
+    }
+    {
+      key = "j";
+      action = "gj";
+      mode = "n";
+    }
+    {
+      key = "k";
+      action = "gk";
+      mode = "n";
+    }
+  ];
+}

modules/programs/nixvim/_nixvim-config/options.nix

@@ -0,0 +1,50 @@
+{ ... }: {
+  opts = {
+    # Expand tabs to 4 spaces
+    shiftwidth = 4;
+    softtabstop = 4;
+    expandtab = true;
+
+    signcolumn = "yes:3";
+
+    # automatically indent and try to be smart about it
+    autoindent = true;
+    smartindent = true;
+
+    # Relative line numbers
+    number = true;
+    relativenumber = true;
+
+    # See search result as you type
+    inccommand = "split";
+
+    # Visualize whitespace
+    list = true;
+    listchars = {
+      tab = "» ";
+      trail = "·";
+      nbsp = "␣";
+    };
+
+    # Show which line the cursor is on
+    cursorline = true;
+
+    # Keep the cursor somewhat centered on the screen
+    scrolloff = 25;
+
+    # Ask if operations would fail due to unsaved buffers
+    confirm = true;
+
+    # ignore case in search unless multiple capital case letter have been typed
+    smartcase = true;
+    ignorecase = true;
+
+    completeopt = "menu,menuone,noselect";
+
+    # Persistent undos :)
+    undofile = true;
+
+    # enable resize by mouse
+    mouse = "n";
+  };
+}

modules/programs/nixvim/_nixvim-config/plugins/cmp/default.nix

@@ -0,0 +1,42 @@
+{ ... }: {
+  imports = [
+    ./keymaps.nix
+  ];
+
+  plugins = {
+    lspkind.enable = true;
+
+    cmp-nvim-lsp-signature-help.enable = true;
+
+    cmp = {
+      enable = true;
+      autoEnableSources = true;
+      autoLoad = true;
+
+      settings.sources = [
+        { name = "nvim_lsp"; }
+        { name = "nvim_lsp_signature_help"; }
+        { name = "path"; }
+      ];
+
+      settings.mapping = {
+        "<Tab>" = "cmp.mapping.select_next_item()";
+        "<S-Tab>" = "cmp.mapping.select_prev_item()";
+        "<C-Space>" = "cmp.mapping.complete()";
+        "<C-S-Space>" = "cmp.mapping.close()";
+        "<CR>" = "cmp.mapping.confirm({ behavior = cmp.ConfirmBehavior.Insert, select = true })";
+      };
+    };
+
+    lsp-format.enable = true;
+
+    none-ls = {
+      enable = true;
+      enableLspFormat = true;
+      sources.formatting = {
+        alejandra.enable = true;
+        nixpkgs_fmt.enable = true;
+      };
+    };
+  };
+}

modules/programs/nixvim/_nixvim-config/plugins/cmp/keymaps.nix

@@ -0,0 +1,16 @@
+{ ... }: {
+  keymaps = [
+    {
+      key = "grd";
+      action = "<cmd>Telescope lsp_definitions<CR>";
+      mode = "n";
+      options.desc = "LSP: [G]oto [D]efinition";
+    }
+    {
+      key = "gri";
+      action = "<cmd>Telescope lsp_implementations<CR>";
+      mode = "n";
+      options.desc = "LSP: [G]oto [I]mplementations";
+    }
+  ];
+}

modules/programs/nixvim/_nixvim-config/plugins/default.nix

@@ -0,0 +1,24 @@
+{ ... }: {
+  imports = [
+    ./lsp.nix
+    ./telescope
+    ./cmp
+  ];
+
+  plugins = {
+    lualine.enable = true;
+
+    web-devicons.enable = true;
+
+    treesitter = {
+      enable = true;
+      autoLoad = true;
+    };
+
+    gitsigns.enable = true;
+
+    which-key.enable = true;
+
+    glow.enable = true;
+  };
+}

modules/programs/nixvim/_nixvim-config/plugins/lsp.nix

@@ -0,0 +1,36 @@
+{ ... }: {
+  dependencies.rust-analyzer.enable = true;
+
+  lsp = {
+    inlayHints.enable = true;
+    servers = {
+      "*" = {
+        config.capabilities.textDocument.semanticTokens.multilineTokenSupport = true;
+        config.root_markers = [
+          ".git"
+        ];
+      };
+      clangd = {
+        enable = true;
+        config.root_markers = [
+          "compile_commands.json"
+        ];
+      };
+      rust_analyzer = {
+        enable = true;
+      };
+      rnix.enable = true;
+    };
+
+    keymaps = [
+      {
+        key = "<leader>e";
+        action = "<cmd>lua vim.diagnostic.open_float()<CR>";
+        options.desc = "Open Diagnostics";
+      }
+    ];
+  };
+
+  plugins.lspconfig.enable = true;
+  plugins.clangd-extensions.enable = true;
+}

modules/programs/nixvim/_nixvim-config/plugins/telescope/default.nix

@@ -0,0 +1,20 @@
+{ ... }: {
+  imports = [
+    ./keymaps.nix
+  ];
+  dependencies.ripgrep.enable = true;
+
+  plugins.telescope = {
+    enable = true;
+    extensions.file-browser = {
+      enable = true;
+      settings = {
+        git_status = true;
+        hijack_netrw = true;
+        respect_gitignore = true;
+        fzf-native.enable = true;
+        fzf-native.settings.case_mode = "ignore_case";
+      };
+    };
+  };
+}

modules/programs/nixvim/_nixvim-config/plugins/telescope/keymaps.nix

@@ -0,0 +1,24 @@
+{ ... }: {
+  keymaps = [
+    {
+      key = "<leader>sf";
+      action = "<cmd>Telescope find_files<CR>";
+      options.desc = "[S]earch [F]iles";
+    }
+    {
+      key = "<leader>sg";
+      action = "<cmd>Telescope live_grep<CR>";
+      options.desc = "[S]earch by [G]rep";
+    }
+    {
+      key = "<leader>sw";
+      action = "<cmd>Telescope grep_string<CR>";
+      options.desc = "[S]earch current [W]ord";
+    }
+    {
+      key = "<leader>q";
+      action = "<cmd>Telescope diagnostics<CR>";
+      options.desc = "Lsp Diagnostics";
+    }
+  ];
+}

modules/programs/nixvim/nixvim.nix

@@ -0,0 +1,19 @@
+{ inputs, ... }: {
+  flake-file.inputs = {
+    nixvim.url = "github:nix-community/nixvim/nixos-25.11";
+    nixvim.inputs.nixpkgs.follows = "nixpkgs";
+  };
+
+  flake.modules.homeManager.nixvim = {
+    imports = [
+      inputs.nixvim.homeModules.nixvim
+    ];
+
+    programs.nixvim = {
+      enable = true;
+      imports = [ ./_nixvim-config ];
+    };
+
+    home.sessionVariables.EDITOR = "nvim";
+  };
+}

modules/programs/qbittorrent.nix

@@ -0,0 +1,7 @@
+{
+  flake.modules.homeManager.qbittorrent = { pkgs, ... }: {
+    home.packages = with pkgs; [
+      qbittorrent
+    ];
+  };
+}

modules/programs/rofi.nix

@@ -0,0 +1,15 @@
+{
+  flake.modules.homeManager.rofi = { pkgs, ... }: {
+    programs.rofi = {
+      enable = true;
+      modes = [
+        "combi"
+        "drun"
+        "calc"
+      ];
+      plugins = [
+        pkgs.rofi-calc
+      ];
+    };
+  };
+}

modules/programs/spicetify.nix

@@ -0,0 +1,30 @@
+{ inputs, ... }: {
+  flake-file.inputs = {
+    spicetify-nix.url = "github:Gerg-L/spicetify-nix";
+    spicetify-nix.inputs.nixpkgs.follows = "nixpkgs";
+  };
+
+  flake.modules.homeManager.spicetify = { pkgs, ... }: {
+    imports = [
+      inputs.spicetify-nix.homeManagerModules.default
+    ];
+
+    programs.spicetify =
+      let
+        spkgs = inputs.spicetify-nix.legacyPackages.${pkgs.stdenv.hostPlatform.system};
+      in
+      {
+        enable = true;
+        enabledExtensions = with spkgs.extensions; [
+          fullAppDisplay
+          shuffle
+          aiBandBlocker
+        ];
+        enabledCustomApps = with spkgs.apps; [
+          newReleases
+        ];
+        theme = spkgs.themes.catppuccin;
+        colorScheme = "mocha";
+      };
+  };
+}

modules/programs/steam.nix

@@ -0,0 +1,16 @@
+{
+  flake.modules.nixos.steam = { pkgs, ... }: {
+    programs.steam = {
+      enable = true;
+      extraCompatPackages = [
+        pkgs.proton-ge-bin
+      ];
+      protontricks = {
+        enable = true;
+      };
+      dedicatedServer.openFirewall = true;
+      localNetworkGameTransfers.openFirewall = true;
+      remotePlay.openFirewall = true;
+    };
+  };
+}

modules/programs/thunderbird.nix

@@ -0,0 +1,9 @@
+# might make this bad boy a factory later
+{
+  flake.modules.homeManager.thunderbird = {
+    programs.thunderbird = {
+      enable = true;
+      profiles.default.isDefault = true;
+    };
+  };
+}

modules/programs/vesktop.nix

@@ -0,0 +1,5 @@
+{
+  flake.modules.homeManager.vesktop = {
+    programs.vesktop.enable = true;
+  };
+}

modules/programs/zathura.nix

@@ -0,0 +1,5 @@
+{
+  flake.modules.homeManager.zathura = {
+    programs.zathura.enable = true;
+  };
+}

modules/programs/zoxide.nix

@@ -0,0 +1,9 @@
+{
+  flake.modules.homeManager.zoxide = {
+    programs.zoxide = {
+      enable = true;
+      enableZshIntegration = true;
+      options = [ "--cmd cd" ];
+    };
+  };
+}

modules/programs/zsh/zsh.nix

@@ -0,0 +1,53 @@
+{ inputs, ... }: {
+  flake.modules.nixos.zsh = {
+    programs.zsh.enable = true;
+
+    environment.pathsToLink = [ "/share/zsh" ];
+  };
+
+  flake.modules.homeManager.zsh = { pkgs, ... }: {
+    imports = with inputs.self.modules.homeManager; [
+      fzf
+      zoxide
+    ];
+
+    programs.zsh = {
+      enable = true;
+
+      autocd = true;
+      enableCompletion = true;
+      autosuggestion.enable = true;
+      syntaxHighlighting.enable = true;
+      initContent = pkgs.lib.mkBefore ''
+        date
+        # Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
+        # Initialization code that may require console input (password prompts, [y/n]
+        # confirmations, etc.) must go above this block; everything else may go below.
+        if [[ -r "''${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-''${(%):-%n}.zsh" ]]; then
+          source "''${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-''${(%):-%n}.zsh"
+        fi
+      '';
+
+      plugins = [
+        {
+          name = "powerlevel10k";
+          src = "${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/";
+          file = "powerlevel10k.zsh-theme";
+        }
+        {
+          name = "p10k-config";
+          src = ./p10k;
+          file = "p10k.zsh";
+        }
+      ];
+
+      oh-my-zsh = {
+        enable = true;
+        plugins = [
+          "git"
+        ];
+        theme = "robbyrussell";
+      };
+    };
+  };
+}