Add pkg-config to home packages

Split configuration.nix and home.nix into per-domain modules
Break the two monolithic files into focused modules under system/ and home/ so each concern (boot, networking, xserver, picom, zsh, git, rofi, etc.) lives in its own file. Clean up duplicates: drop rofi from home.packages since programs.rofi.enable already installs it, and move user-only apps (alacritty, obsidian, claude-code) from environment.systemPackages to home.packages. Remove commented-out boilerplate carried over from the install template.
2026-06-29 17:28:18 +02:00 · 2026-06-28 21:02:48 +02:00 · 2026-06-28 21:02:24 +02:00 · 2026-06-28 21:02:09 +02:00 · 2026-06-28 21:01:50 +02:00 · 2026-06-28 20:00:14 +02:00
26 changed files with 323 additions and 204 deletions
--- a/config/alacritty/alacritty.toml
+++ b/config/alacritty/alacritty.toml
@@ -2,4 +2,4 @@
 opacity = 0.9

 [font]
-normal = { family = "JetBrains Mono", style = "Regular" }
+normal = { family = "JetBrainsMono Nerd Font", style = "Regular" }
--- a/config/nvim/lazy-lock.json
+++ b/config/nvim/lazy-lock.json
@@ -2,11 +2,7 @@
  "LuaSnip": { "branch": "master", "commit": "0abc8f390b278c3b4aabc4c004ac8a088b65cf24" },
  "NvChad": { "branch": "v2.5", "commit": "d042cc975247c2aa55fcb228e5d146dc1dc6c648" },
  "base46": { "branch": "v3.0", "commit": "884b990dcdbe07520a0892da6ba3e8d202b46337" },
-  "cmp-async-path": { "branch": "main", "commit": "98185a91d49ff5dd249aebf2f7456e18063fa2a0" },
-  "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" },
-  "cmp-nvim-lua": { "branch": "main", "commit": "e3a22cb071eb9d6508a156306b102c45cd2d573d" },
-  "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
+  "blink.cmp": { "branch": "main", "commit": "78336bc89ee5365633bcf754d93df01678b5c08f" },
  "conform.nvim": { "branch": "master", "commit": "619363c30309d29ffa631e67c8183f2a72caa373" },
  "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" },
  "gitsigns.nvim": { "branch": "main", "commit": "2038c666bd9d8a0b7349a0b6ee00dc83104b9ecf" },
@@ -17,11 +13,15 @@
  "minty": { "branch": "main", "commit": "aafc9e8e0afe6bf57580858a2849578d8d8db9e0" },
  "nvim-autopairs": { "branch": "master", "commit": "7b9923abad60b903ece7c52940e1321d39eccc79" },
  "nvim-cmp": { "branch": "main", "commit": "a1d504892f2bc56c2e79b65c6faded2fd21f3eca" },
+  "nvim-dap": { "branch": "master", "commit": "9e848e09a697ee95302a3ef2dd43fd6eb709e570" },
+  "nvim-dap-ui": { "branch": "master", "commit": "1a66cabaa4a4da0be107d5eda6d57242f0fe7e49" },
  "nvim-lspconfig": { "branch": "master", "commit": "3371bf298c1f56efc26771ee961f461176958fb5" },
+  "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
  "nvim-tree.lua": { "branch": "master", "commit": "8e8be709c9a93e1ebefde7964884a8b564bfd3e0" },
  "nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" },
  "nvim-web-devicons": { "branch": "master", "commit": "dfbfaa967a6f7ec50789bead7ef87e336c1fa63c" },
  "plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" },
+  "rustaceanvim": { "branch": "main", "commit": "5a3a4158857ee1f7ec839b6ddd87cc0083a19c5f" },
  "telescope.nvim": { "branch": "master", "commit": "427b576c16792edad01a92b89721d923c19ad60f" },
  "ui": { "branch": "v3.0", "commit": "3e67e9d5325fd47fdbc90ca00a147db2f3525754" },
  "volt": { "branch": "main", "commit": "620de1321f275ec9d80028c68d1b88b409c0c8b1" },
--- a/config/nvim/lua/chadrc.lua
+++ b/config/nvim/lua/chadrc.lua
@@ -6,7 +6,7 @@
 local M = {}

 M.base46 = {
-	theme = "onedark",
+	theme = "rosepine",

 	-- hl_override = {
 	-- 	Comment = { italic = true },
--- a/config/nvim/lua/mappings.lua
+++ b/config/nvim/lua/mappings.lua
@@ -8,3 +8,21 @@ map("n", ";", ":", { desc = "CMD enter command mode" })
 map("i", "jk", "<ESC>")

 -- map({ "n", "i", "v" }, "<C-s>", "<cmd> w <cr>")
+
+-- Nvim DAP
+map("n", "<Leader>dl", "<cmd>lua require'dap'.step_into()<CR>", { desc = "Debugger step into" })
+map("n", "<Leader>dj", "<cmd>lua require'dap'.step_over()<CR>", { desc = "Debugger step over" })
+map("n", "<Leader>dk", "<cmd>lua require'dap'.step_out()<CR>", { desc = "Debugger step out" })
+map("n", "<Leader>dc", "<cmd>lua require'dap'.continue()<CR>", { desc = "Debugger continue" })
+map("n", "<Leader>db", "<cmd>lua require'dap'.toggle_breakpoint()<CR>", { desc = "Debugger toggle breakpoint" })
+map(
+	"n",
+	"<Leader>dd",
+	"<cmd>lua require'dap'.set_breakpoint(vim.fn.input('Breakpoint condition: '))<CR>",
+	{ desc = "Debugger set conditional breakpoint" }
+)
+map("n", "<Leader>de", "<cmd>lua require'dap'.terminate()<CR>", { desc = "Debugger reset" })
+map("n", "<Leader>dr", "<cmd>lua require'dap'.run_last()<CR>", { desc = "Debugger run last" })
+
+-- rustaceanvim
+map("n", "<Leader>dt", "<cmd>lua vim.cmd('RustLsp testables')<CR>", { desc = "Debugger testables" })
--- a/config/nvim/lua/plugins/init.lua
+++ b/config/nvim/lua/plugins/init.lua
@@ -13,16 +13,71 @@ return {
    end,
  },

-  -- test new blink
-  -- { import = "nvchad.blink.lazyspec" },
+  {
+    'mrcjkb/rustaceanvim',
+    -- To avoid being surprised by breaking changes,
+    -- I recommend you set a version range
+    version = '^9',
+    -- This plugin implements proper lazy-loading (see :h lua-plugin-lazy).
+    -- No need for lazy.nvim to lazy-load it.
+    lazy = false,
+    config = function()
+      local mason_registry = require('mason-registry')
+      local codelldb = mason_registry.get_package('codelldb')
+      local extension_path = codelldb:get_install_path() .. "/extension/"
+      local codelldb_path = extension_path .. "adapter/codelldb"
+      local liblldb_ext = vim.uv.os_uname().sysname == "Darwin" and "dylib" or "so"
+      local liblldb_path = extension_path .. "lldb/lib/liblldb." .. liblldb_ext
+      local cfg = require('rustaceanvim.config')

-  -- {
-  -- 	"nvim-treesitter/nvim-treesitter",
-  -- 	opts = {
-  -- 		ensure_installed = {
-  -- 			"vim", "lua", "vimdoc",
-  --      "html", "css"
-  -- 		},
-  -- 	},
-  -- },
+      vim.g.rustaceanvim = {
+        dap = {
+          adapter = cfg.get_codelldb_adapter(codelldb_path, liblldb_path),
+        },
+      }
+    end
+  },
+
+  { 
+    'mfussenegger/nvim-dap', 
+    config = function()
+      local dap, dapui = require('dap'), require('dapui') 
+      
+      dap.listeners.before.attach.dapui_config = function()
+        dapui.open()
+      end
+      
+      dap.listeners.before.launch.dapui_config = function()
+        dapui.open()
+      end
+
+      dap.listeners.before.event_terminated.dapui_config = function()
+        dapui.close()
+      end
+
+      dap.listeners.before.event_exited.dapui_config = function()
+        dapui.close()
+      end
+    end
+  },
+
+  {
+    'rcarriga/nvim-dap-ui',
+    dependencies = { 'mfussenegger/nvim-dap', 'nvim-neotest/nvim-nio' },
+    config = function()
+      require('dapui').setup()
+    end,
+  },
+
+  { import = "nvchad.blink.lazyspec" },
+
+  {
+  	"nvim-treesitter/nvim-treesitter",
+  	opts = {
+  		ensure_installed = {
+  			"vim", "lua", "vimdoc",
+       "html", "css"
+  		},
+  	},
+  },
 }
--- a/configuration.nix
+++ b/configuration.nix
@@ -1,121 +1,21 @@
-{ config, lib, pkgs, ... }:
+{ ... }:

 {
-  imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-    ];
-
-  # Use the systemd-boot EFI boot loader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
-  networking.hostName = "hivebrain"; # Define your hostname.
-
-  # Configure network connections interactively with nmcli or nmtui.
-  networking.networkmanager.enable = true;
-
-  # Set your time zone.
-  time.timeZone = "Europe/Berlin";
-
-  # Select internationalisation properties.
-  # i18n.defaultLocale = "en_US.UTF-8";
-  # console = {
-  #   font = "Lat2-Terminus16";
-  #   keyMap = "de";
-  #   useXkbConfig = true; # use xkb.options in tty.
-  # };
-
-  # Enable the X11 windowing system.
-  # services.xserver.enable = true;
-
-  services.xserver = {
-    enable = true;
-    autoRepeatDelay = 200;
-    autoRepeatInterval = 35;
-    windowManager.qtile.enable = true;
-    displayManager.sessionCommands = ''
-      xwallpaper --zoom ~/nixos-dotfiles/Pictures/NixOsWallpaper.png
-    '';
-    xrandrHeads = [
-      {
-        output = "HDMI-1";
-        monitorConfig = ''
-          Option "Position" "0 0"
-        '';
-      }
-      {
-        output = "DP-1";
-        primary = true;
-        monitorConfig = ''
-          Option "Position" "1920 0"
-        '';
-      }
-    ];
-  };
-
-  services.displayManager.ly.enable = true;
-
-  services.picom = {
-    enable = true;
-    backend = "glx";
-    fade = true;
-  };
-
-  fonts.packages = with pkgs; [
-    jetbrains-mono
+  imports = [
+    ./hardware-configuration.nix
+    ./system/boot.nix
+    ./system/networking.nix
+    ./system/locale.nix
+    ./system/xserver.nix
+    ./system/picom.nix
+    ./system/display-manager.nix
+    ./system/fonts.nix
+    ./system/users.nix
+    ./system/programs.nix
+    ./system/packages.nix
+    ./system/ssh.nix
+    ./system/nix.nix
  ];

-  # Enable sound.
-  # services.pulseaudio.enable = true;
-  # OR
-  # services.pipewire = {
-  #   enable = true;
-  #   pulse.enable = true;
-  # };
-
-  nixpkgs.config.allowUnfree = true;
-
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.marvin = {
-    isNormalUser = true;
-    extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
-    shell = pkgs.zsh;
-    packages = with pkgs; [
-      tree
-    ];
-  };
-
-  programs.firefox.enable = true;
-  programs.zsh.enable = true;
-
-  # List packages installed in system profile.
-  # You can use https://search.nixos.org/ to find more packages (and options).
-  environment.systemPackages = with pkgs; [
-    vim 
-    wget
-    alacritty
-    btop
-    obsidian
-    claude-code
-    jq          # used by the Claude vault bootstrap.sh to parse settings.json
-  ];
-
-  nix.settings.experimental-features = ["nix-command" "flakes"];
-
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  # programs.mtr.enable = true;
-  # programs.gnupg.agent = {
-  #   enable = true;
-  #   enableSSHSupport = true;
-  # };
-
-  # List services that you want to enable:
-
-  # Enable the OpenSSH daemon.
-  services.openssh.enable = true;
-  
-  system.stateVersion = "26.05"; 
+  system.stateVersion = "26.05";
 }
-
--- a/home.nix
+++ b/home.nix
@@ -1,74 +1,17 @@
-{ config, pkgs, lib, ... }:
+{ ... }:

 {
-	home.username = "marvin";
-	home.homeDirectory = "/home/marvin";
-	home.stateVersion = "26.05";
-	programs = {
-    yazi.enable = true;
+  imports = [
+    ./home/zsh.nix
+    ./home/git.nix
+    ./home/rofi.nix
+    ./home/yazi.nix
+    ./home/packages.nix
+    ./home/symlinks.nix
+    ./home/fonts.nix
+  ];

-		git = {
-      enable = true;
-      userName = "MDietermann";
-      userEmail = "marvin.dietermann@hive-brain.de";
-    };
-
-    rofi = {
-      enable = true;
-      theme = "purple";
-      font = "sans-serif";
-      package = pkgs.rofi;
-      modes = [
-        "drun"
-        "run"
-        "window"
-        "ssh"
-      ];
-      extraConfig = {
-        show-icons = true;
-      };
-    };
-
-		zsh = {
-			enable = true;
-      enableCompletion = true;
-      autosuggestion.enable = true;
-      syntaxHighlighting.enable = true;
-
-      history.size = 10000;
-      history.ignoreAllDups = true;
-      history.path = "$HOME/.zsh_history";
-
-      oh-my-zsh = {
-        enable = true;
-        plugins = [ "git" "sudo" ];
-        theme = "aussiegeek";
-      };
-
-			shellAliases = {
-				btw = "echo I use NixOS";
-        reload-nixos = "sudo nixos-rebuild switch --flake ~/nixos-dotfiles#hivebrain";
-			};
-		};
-	};
-
-	home.file = lib.mapAttrs'
-		(name: _: lib.nameValuePair ".config/${name}" {
-			source = config.lib.file.mkOutOfStoreSymlink
-				"${config.home.homeDirectory}/nixos-dotfiles/config/${name}";
-		})
-		(lib.filterAttrs (_: type: type == "directory") (builtins.readDir ./config));
-
-	home.packages = with pkgs; [
-		neovim
-		ripgrep
-		nil
-		nixpkgs-fmt
-		nodejs
-		gcc
-    rofi
-    xwallpaper
-    steam
-    unzip
-	];
+  home.username = "marvin";
+  home.homeDirectory = "/home/marvin";
+  home.stateVersion = "26.05";
 }
--- a/home/fonts.nix
+++ b/home/fonts.nix
@@ -0,0 +1,5 @@
+{ ... }:
+
+{
+  fonts.fontconfig.enable = true;
+}
--- a/home/git.nix
+++ b/home/git.nix
@@ -0,0 +1,11 @@
+{ ... }:
+
+{
+  programs.git = {
+    enable = true;
+    settings.user = {
+      name = "MDietermann";
+      email = "marvin.dietermann@hive-brain.de";
+    };
+  };
+}
--- a/home/packages.nix
+++ b/home/packages.nix
@@ -0,0 +1,22 @@
+{ pkgs, ... }:
+
+{
+  home.packages = with pkgs; [
+    alacritty
+    claude-code
+    gcc
+    lua-language-server
+    neovim
+    nerd-fonts.jetbrains-mono
+    nil
+    nixpkgs-fmt
+    nodejs
+    obsidian
+    pkg-config
+    ripgrep
+    rustup
+    steam
+    unzip
+    xwallpaper
+  ];
+}
--- a/home/rofi.nix
+++ b/home/rofi.nix
@@ -0,0 +1,19 @@
+{ pkgs, ... }:
+
+{
+  programs.rofi = {
+    enable = true;
+    theme = "arthur";
+    font = "sans-serif";
+    package = pkgs.rofi;
+    modes = [
+      "drun"
+      "run"
+      "window"
+      "ssh"
+    ];
+    extraConfig = {
+      show-icons = true;
+    };
+  };
+}
--- a/home/symlinks.nix
+++ b/home/symlinks.nix
@@ -0,0 +1,10 @@
+{ config, lib, ... }:
+
+{
+  home.file = lib.mapAttrs'
+    (name: _: lib.nameValuePair ".config/${name}" {
+      source = config.lib.file.mkOutOfStoreSymlink
+        "${config.home.homeDirectory}/nixos-dotfiles/config/${name}";
+    })
+    (lib.filterAttrs (_: type: type == "directory") (builtins.readDir ../config));
+}
--- a/home/yazi.nix
+++ b/home/yazi.nix
@@ -0,0 +1,5 @@
+{ ... }:
+
+{
+  programs.yazi.enable = true;
+}
--- a/home/zsh.nix
+++ b/home/zsh.nix
@@ -0,0 +1,25 @@
+{ ... }:
+
+{
+  programs.zsh = {
+    enable = true;
+    enableCompletion = true;
+    autosuggestion.enable = true;
+    syntaxHighlighting.enable = true;
+
+    history.size = 10000;
+    history.ignoreAllDups = true;
+    history.path = "$HOME/.zsh_history";
+
+    oh-my-zsh = {
+      enable = true;
+      plugins = [ "git" "sudo" ];
+      theme = "aussiegeek";
+    };
+
+    shellAliases = {
+      btw = "echo I use NixOS";
+      reload-nixos = "sudo nixos-rebuild switch --flake ~/nixos-dotfiles#hivebrain";
+    };
+  };
+}
--- a/system/boot.nix
+++ b/system/boot.nix
@@ -0,0 +1,6 @@
+{ ... }:
+
+{
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+}
--- a/system/display-manager.nix
+++ b/system/display-manager.nix
@@ -0,0 +1,5 @@
+{ ... }:
+
+{
+  services.displayManager.ly.enable = true;
+}
--- a/system/fonts.nix
+++ b/system/fonts.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+
+{
+  fonts.packages = with pkgs; [
+    jetbrains-mono
+  ];
+}
--- a/system/locale.nix
+++ b/system/locale.nix
@@ -0,0 +1,5 @@
+{ ... }:
+
+{
+  time.timeZone = "Europe/Berlin";
+}
--- a/system/networking.nix
+++ b/system/networking.nix
@@ -0,0 +1,6 @@
+{ ... }:
+
+{
+  networking.hostName = "hivebrain";
+  networking.networkmanager.enable = true;
+}
--- a/system/nix.nix
+++ b/system/nix.nix
@@ -0,0 +1,6 @@
+{ ... }:
+
+{
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];
+  nixpkgs.config.allowUnfree = true;
+}
--- a/system/packages.nix
+++ b/system/packages.nix
@@ -0,0 +1,10 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    vim
+    wget
+    btop
+    jq
+  ];
+}
--- a/system/picom.nix
+++ b/system/picom.nix
@@ -0,0 +1,9 @@
+{ ... }:
+
+{
+  services.picom = {
+    enable = true;
+    backend = "xrender";
+    fade = true;
+  };
+}
--- a/system/programs.nix
+++ b/system/programs.nix
@@ -0,0 +1,7 @@
+{ ... }:
+
+{
+  programs.firefox.enable = true;
+  programs.zsh.enable = true;
+  programs.nix-ld.enable = true;
+}
--- a/system/ssh.nix
+++ b/system/ssh.nix
@@ -0,0 +1,5 @@
+{ ... }:
+
+{
+  services.openssh.enable = true;
+}
--- a/system/users.nix
+++ b/system/users.nix
@@ -0,0 +1,12 @@
+{ pkgs, ... }:
+
+{
+  users.users.marvin = {
+    isNormalUser = true;
+    extraGroups = [ "wheel" ];
+    shell = pkgs.zsh;
+    packages = with pkgs; [
+      tree
+    ];
+  };
+}
--- a/system/xserver.nix
+++ b/system/xserver.nix
@@ -0,0 +1,28 @@
+{ ... }:
+
+{
+  services.xserver = {
+    enable = true;
+    autoRepeatDelay = 200;
+    autoRepeatInterval = 35;
+    windowManager.qtile.enable = true;
+    displayManager.sessionCommands = ''
+      xwallpaper --zoom ~/nixos-dotfiles/Pictures/NixOsWallpaper.png
+    '';
+    xrandrHeads = [
+      {
+        output = "HDMI-1";
+        monitorConfig = ''
+          Option "Position" "0 0"
+        '';
+      }
+      {
+        output = "DP-1";
+        primary = true;
+        monitorConfig = ''
+          Option "Position" "1920 0"
+        '';
+      }
+    ];
+  };
+}
Author	SHA1	Message	Date
MDietermann	b0aadbf43b	Add pkg-config to home packages	2026-06-29 17:28:18 +02:00
MDietermann	df0df6048a	Split configuration.nix and home.nix into per-domain modules Break the two monolithic files into focused modules under system/ and home/ so each concern (boot, networking, xserver, picom, zsh, git, rofi, etc.) lives in its own file. Clean up duplicates: drop rofi from home.packages since programs.rofi.enable already installs it, and move user-only apps (alacritty, obsidian, claude-code) from environment.systemPackages to home.packages. Remove commented-out boilerplate carried over from the install template.	2026-06-28 21:02:48 +02:00
MDietermann	7acb45c3a9	Add rust DAP debugging setup to nvim Wires up nvim-dap, nvim-dap-ui and rustaceanvim, enables the NvChad blink completion lazyspec, activates the treesitter ensure_installed list and adds DAP/rustaceanvim keymaps.	2026-06-28 21:02:24 +02:00
MDietermann	b59f07bdc1	Switch nvim theme to rosepine	2026-06-28 21:02:09 +02:00
MDietermann	72a402a276	Switch alacritty font to JetBrainsMono Nerd Font	2026-06-28 21:01:50 +02:00
MDietermann	b78ff325d5	Use xrender backend for picom	2026-06-28 20:00:14 +02:00
MDietermann	8a6c4396cb	Switch rofi theme to arthur	2026-06-28 20:00:09 +02:00
MDietermann	dd33887b59	Refactor git user config into settings.user	2026-06-28 20:00:01 +02:00