diff --git a/README.md b/README.md index e7f7fdc..8d598b0 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ m3ta-home/ ├── users/ │ └── m3tam3re/ │ ├── identities/ -│ │ ├── private.nix ← Personal: git (m3tm3re), SSH, JJ +│ │ ├── private.nix ← Personal: git (m3tam3re), SSH, JJ │ │ └── work.nix ← Work: git (sascha.koenig), SSH, JJ │ └── preferences/ ← Identity-independent: cliphist, difftastic └── assets/ @@ -38,11 +38,11 @@ m3ta-home/ `mkHome` composes a complete Home-Manager configuration from three axes: -| Dimension | Options | Description | -|-----------|---------|-------------| -| **WHO** | `user` + `identity` | Which user, which identity (private/work) | -| **WHERE** | `context` | `desktop` or `server` — mutually exclusive | -| **WHAT** | `sets` | `coding`, `gaming`, `media` — freely combinable | +| Dimension | Options | Description | +| --------- | ------------------- | ----------------------------------------------- | +| **WHO** | `user` + `identity` | Which user, which identity (private/work) | +| **WHERE** | `context` | `desktop` or `server` — mutually exclusive | +| **WHAT** | `sets` | `coding`, `gaming`, `media` — freely combinable | ```nix mkHome { @@ -108,6 +108,7 @@ home-manager.users.m3tam3re = { ### Host-Specific Overrides Monitor layouts, window rules, and XDG/MIME settings stay in `nixos-config`: + - `hosts/m3-kratos/home.nix` — dual DP monitors, Hyprland workspaces - `hosts/m3-ares/home.nix` — laptop eDP + HDMI, tuxedo-backlight - Server hosts need no `home.nix` (no desktop config) @@ -118,11 +119,11 @@ The identity system allows switching between personal and work contexts on any m ### How Identities Work -| | **Private** | **Work** | -|---|---|---| -| **Git user** | m3tm3re | sascha.koenig | -| **Git email** | p@m3ta.dev | sascha.koenig@azintec.com | -| **JJ email** | m@m3tam3re.com | sascha.koenig@azintec.com | +| | **Private** | **Work** | +| ------------- | ---------------------------------------- | ----------------------------- | +| **Git user** | m3tam3re | sascha.koenig | +| **Git email** | p@m3ta.dev | sascha.koenig@azintec.com | +| **JJ email** | m@m3tam3re.com | sascha.koenig@azintec.com | | **SSH hosts** | code.m3ta.dev, github.com, private infra | git.az-gruppe.com, AZ servers | ### Use Case: Work Laptop @@ -140,6 +141,7 @@ If you bring a work NixOS machine into your fleet, you can use the same `m3ta-ho ``` This gives you: + - Your familiar shell setup (fish, starship, nushell) - Your CLI tools (fzf, bat, eza, zoxide, etc.) - Your editor configs (neovim, zed) @@ -237,14 +239,14 @@ source = "${config."m3ta-home".paths.srcRoot}/assets/wallpapers"; ## Dependencies -| Input | Purpose | -|-------|---------| -| `nixpkgs` | Package set (follows nixos-config's nixpkgs) | -| `home-manager` | Home-Manager modules | -| `nix-colors` | Dracula theme palette (used everywhere) | +| Input | Purpose | +| -------------- | --------------------------------------------------------------- | +| `nixpkgs` | Package set (follows nixos-config's nixpkgs) | +| `home-manager` | Home-Manager modules | +| `nix-colors` | Dracula theme palette (used everywhere) | | `m3ta-nixpkgs` | Custom packages (zellij-ps, rofi-project-opener) and HM modules | -| `agenix` | Secret management | -| `NUR` | Additional packages | +| `agenix` | Secret management | +| `NUR` | Additional packages | ## Important Notes diff --git a/profiles/contexts/desktop/default.nix b/profiles/contexts/desktop/default.nix index ac73f43..e4b26d4 100644 --- a/profiles/contexts/desktop/default.nix +++ b/profiles/contexts/desktop/default.nix @@ -100,8 +100,6 @@ home.packages = with pkgs; [ appimage-run bemoji - brave - distrobox eigent (element-desktop.override { commandLineArgs = "--password-store=gnome-libsecret"; @@ -112,12 +110,10 @@ seahorse sushi ksnip - msty-studio nwg-look rose-pine-hyprcursor remmina slack - telegram-desktop vivaldi vivaldi-ffmpeg-codecs vibetyper diff --git a/profiles/sets/coding/packages.nix b/profiles/sets/coding/packages.nix index 2501cd6..f0a891f 100644 --- a/profiles/sets/coding/packages.nix +++ b/profiles/sets/coding/packages.nix @@ -14,7 +14,6 @@ in { config = mkIf cfg.enable { home.packages = [ pkgs.bruno - pkgs.insomnia ]; }; } diff --git a/profiles/sets/media/yt-dlp.nix b/profiles/sets/media/yt-dlp.nix index 5c9e088..982f585 100644 --- a/profiles/sets/media/yt-dlp.nix +++ b/profiles/sets/media/yt-dlp.nix @@ -13,7 +13,6 @@ in { config = mkIf cfg.enable { home.packages = with pkgs; [ plexamp - unimatrix webcord ]; diff --git a/users/m3tam3re/identities/private.nix b/users/m3tam3re/identities/private.nix index 00ffb55..68b7739 100644 --- a/users/m3tam3re/identities/private.nix +++ b/users/m3tam3re/identities/private.nix @@ -17,7 +17,7 @@ signing.format = null; settings = { user = { - name = "m3tm3re"; + name = "m3tam3re"; email = "p@m3ta.dev"; }; core.excludesfile = "~/.gitignore_global";