dotlayer 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d30157869fd9bd7c0d98d7957fd82879a06db355368ae7a66919d43ba2dac6dc
-  data.tar.gz: 560bf0f69bc6a68083d67739d91a97cbd3f208696313ba97f03619ccbae3901a
+  metadata.gz: b0489157f2a066cbd4729f51ad5dff3800e75c0144061ea85f49cd4005bcb297
+  data.tar.gz: 21e4467266812d237318d0ca70aab7491ae3e87dcf95d66dd2db1c85c74a5e65
 SHA512:
-  metadata.gz: ffe27ed4bf4d65aacd1a52fc1c7697771f53b1fe69b1622a10a0789a2e01ce698d56ce6f4a485256e9b86faf5b696efe974d32dacfdfc894ddfdeb6540bb26fc
-  data.tar.gz: 919ce9855ebfb9a7a5ba0b74c06d818f405bf843ba7505433f3529a89dc6565a5f6a04e5f8bf03853fb45f625b964b19c3e2a8686821f5fced95b7e952f2294d
+  metadata.gz: 8062c90a687287e5f0e1e2205064f537be913f5e6a91f844d3d3cdc994d280eeb14428f808ebd2e5e268bd2f01ff603f1be431bbcac2abcff0ff77d5d20eb58b
+  data.tar.gz: 6bcc1d1000022e64bda327a7a60a15b65bf77b2c4e394a6077482204bdb2a7ae46911f2502d5e95f50c1c30f65cf1388dc6ee5296aa364f3bbeb4011c92fc60b

data/README.md

@@ -13,7 +13,7 @@ config-macos/               → stowed on macOS
 config-omarchy/             → stowed when Omarchy is detected
 config-omarchy-desktop/     → stowed on Omarchy + desktop profile
 config-omarchy-laptop/      → stowed on Omarchy + laptop profile
-config-doximity/            → stowed when doximity group is detected
+config-mycompany/            → stowed when mycompany group is detected
 ```
 
 No config file needed — just name your directories and dotlayer figures out the rest.
@@ -64,7 +64,7 @@ Dotlayer auto-detects four things about your system:
 | **OS** | `RbConfig::CONFIG["host_os"]` | `linux`, `macos` |
 | **Profile** | `hostnamectl chassis` or `$DOTLAYER_PROFILE` | `desktop`, `laptop` |
 | **Distro** | Shell commands from config | `omarchy`, `fedora` |
-| **Group** | Shell commands from config | `doximity`, `acme` |
+| **Group** | Shell commands from config | `work`, `mycompany` |
 
 It then scans your dotfiles repo for directories matching these tags and stows them in layer order:
 
@@ -72,7 +72,7 @@ It then scans your dotfiles repo for directories matching these tags and stows t
 2. **OS layer** — `config-linux` or `config-macos`
 3. **Distro layer** — `config-omarchy`
 4. **Distro + profile** — `config-omarchy-desktop`
-5. **Group layer** — `config-doximity`
+5. **Group layer** — `config-mycompany`
 
 Each layer can add files but never conflict with earlier layers (Stow constraint).
 
@@ -106,8 +106,8 @@ distros:
     detect: . /etc/os-release && test "$ID" = "fedora"
 
 groups:
-  doximity:
-    detect: test -d ~/src/dox
+  mycompany:
+    detect: test -d ~/src/mycompany
 
 system_files:
   - source: config-linux/etc/systemd/system-sleep/xremap-restart.sh
@@ -124,9 +124,35 @@ Config file is discovered automatically from:
 - `~/.public_dotfiles/dotlayer.yml`
 - `~/.dotfiles/dotlayer.yml`
 
-## Multi-repo support
+## Public and private dotfiles
 
-Dotlayer supports multiple repos. Each repo can have its own base packages:
+Most people have two kinds of config: stuff you can share (shell aliases, editor themes, window manager rules) and stuff you can't (API keys, work credentials, employer-specific tooling). Dotlayer handles this with two repos:
+
+```
+~/.public_dotfiles/     ← shared on GitHub, safe for the world to see
+~/.private_dotfiles/    ← private repo (or not pushed at all)
+```
+
+### Why two repos?
+
+A single dotfiles repo forces a choice: keep it private (lose the benefit of sharing) or keep it public (risk leaking secrets). Two repos solves this cleanly:
+
+- **Public repo** — your shell, editor, git, and desktop config. Push to GitHub, share with the community, clone on any new machine.
+- **Private repo** — work-specific config, API tokens, SSH configs, fonts with restrictive licenses, employer tooling. Keep in a private repo or don't push at all.
+
+Both repos stow into the same target (`~`), so your home directory looks the same regardless of which repo a file came from.
+
+### Setting it up
+
+Create both repos:
+
+```sh
+mkdir -p ~/.public_dotfiles ~/.private_dotfiles
+cd ~/.public_dotfiles && git init
+cd ~/.private_dotfiles && git init
+```
+
+Add the dotlayer config at `~/.config/dotlayer/dotlayer.yml`:
 
 ```yaml
 repos:
@@ -138,9 +164,67 @@ repos:
       - fonts
 ```
 
-Repos without any matching base packages automatically stow all their top-level directories (sorted alphabetically). This is useful for private repos that only contain standalone packages.
+The `private: true` flag tells dotlayer which repo to use when you run `dotlayer adopt --private`.
+
+### What goes where?
+
+**Public repo** — uses the standard base packages (`stow`, `bin`, `git`, `zsh`, `config`) with full layering support:
+
+```
+~/.public_dotfiles/
+  config/                       ← shared config (editor, terminal, etc.)
+  config-linux/                 ← Linux-specific overrides
+  config-omarchy/               ← Omarchy distro overrides
+  config-omarchy-desktop/       ← Omarchy + desktop profile
+  git/                          ← git config
+  zsh/                          ← shell config
+  bin/                          ← personal scripts
+  stow/                         ← stow's own config
+```
+
+**Private repo** — can use per-repo packages for layered resolution, plus standalone directories that are all stowed automatically:
 
-Repos are processed in order — packages from the first repo are stowed before packages from the second.
+```
+~/.private_dotfiles/
+  config/                       ← private config overlays (SSH, API keys)
+  config-mycompany/              ← work-specific config (group layer)
+  fonts/                        ← licensed fonts
+  fonts-linux/                  ← Linux-specific font config
+  claude/                       ← standalone: Claude AI config
+  work/                         ← standalone: work tooling
+  scripts/                      ← standalone: work automation scripts
+```
+
+Directories that match the per-repo base packages (`config`, `fonts`) get full layer resolution. Everything else (`claude`, `work`, `scripts`) is stowed as-is in alphabetical order.
+
+### Adopting files into the right repo
+
+```sh
+# Public config — goes to ~/.public_dotfiles
+dotlayer adopt ~/.config/lazygit config
+
+# Private config — goes to ~/.private_dotfiles
+dotlayer adopt --private ~/.config/lazysql config
+```
+
+### Layer precedence across repos
+
+Repos are processed in order. Public packages are stowed first, then private packages overlay on top. This means:
+
+1. `~/.public_dotfiles/config/` — base config (stowed first)
+2. `~/.public_dotfiles/config-linux/` — OS layer
+3. `~/.public_dotfiles/config-omarchy/` — distro layer
+4. `~/.private_dotfiles/config/` — private overlays (stowed after public)
+5. `~/.private_dotfiles/config-mycompany/` — work group layer
+
+Each layer adds files — they never conflict because different layers use different file paths within the same directory structure.
+
+### Keeping private dotfiles private
+
+Your private repo doesn't need to be pushed anywhere. It works fine as a local-only git repo for tracking changes. If you do want backup:
+
+- Push to a **private GitHub/GitLab repo**
+- Use `dotlayer update` to pull both repos at once — it runs `git pull --rebase` on each repo that has a `.git` directory
 
 ## CLI reference
 
@@ -182,6 +266,16 @@ dotlayer adopt --dry-run ~/.config/lazygit config
 
 The last argument is always the package name. Dotlayer finds the first repo containing that package, or falls back to the first repo for new packages.
 
+## Development
+
+```sh
+bundle exec rake test          # run tests
+bundle exec standardrb         # lint
+bundle exec rubycritic lib/    # code quality report
+```
+
+See [Contributing](CONTRIBUTING.md) for full setup, testing, and contribution guidelines.
+
 ## Documentation
 
 - [Architecture](docs/architecture.md) — system design, data flow, and class responsibilities

data/lib/dotlayer/cli.rb

@@ -13,11 +13,11 @@ module Dotlayer
       config = Config.new(options[:config])
 
       case command
-      when "status"  then Commands::Status.new(config:).run
+      when "status" then Commands::Status.new(config:).run
       when "install" then Commands::Install.new(config:, dry_run: options[:dry_run], verbose: options[:verbose]).run
-      when "update"  then Commands::Update.new(config:, dry_run: options[:dry_run], verbose: options[:verbose]).run
-      when "doctor"  then Commands::Doctor.new(config:).run
-      when "adopt"   then run_adopt(config:, argv:, options:)
+      when "update" then Commands::Update.new(config:, dry_run: options[:dry_run], verbose: options[:verbose]).run
+      when "doctor" then Commands::Doctor.new(config:).run
+      when "adopt" then run_adopt(config:, argv:, options:)
       when "version"
         puts "dotlayer #{VERSION}"
       else
@@ -28,7 +28,7 @@ module Dotlayer
     private
 
     def parse_global_options(argv)
-      options = { dry_run: false, verbose: false, config: nil, private: false }
+      options = {dry_run: false, verbose: false, config: nil, private: false}
 
       OptionParser.new do |opts|
         opts.on("-c", "--config PATH", "Config file path") { |v| options[:config] = v }

data/lib/dotlayer/commands/doctor.rb

@@ -72,7 +72,11 @@ module Dotlayer
         else
           warning "#{broken.size} found"
           broken.each do |link|
-            target = File.readlink(link) rescue "(deleted)"
+            target = begin
+              File.readlink(link)
+            rescue
+              "(deleted)"
+            end
             @issues << "Broken symlink: #{link} -> #{target}"
           end
         end

data/lib/dotlayer/config.rb

@@ -23,7 +23,7 @@ module Dotlayer
     end
 
     def repos
-      @repos ||= @data.fetch("repos", [{ "path" => "~/.public_dotfiles" }]).filter_map do |entry|
+      @repos ||= @data.fetch("repos", [{"path" => "~/.public_dotfiles"}]).filter_map do |entry|
         path = entry["path"]&.to_s
         next if path.nil? || path.empty?
 

data/lib/dotlayer/detector.rb

@@ -17,7 +17,7 @@ module Dotlayer
     def detect_os
       case RbConfig::CONFIG["host_os"]
       when /darwin/ then "macos"
-      when /linux/  then "linux"
+      when /linux/ then "linux"
       else "unknown"
       end
     end

data/lib/dotlayer/resolver.rb

@@ -1,5 +1,3 @@
-require "set"
-
 module Dotlayer
   class Resolver
     def initialize(config:, detection:)

data/lib/dotlayer/stow.rb

@@ -20,7 +20,7 @@ module Dotlayer
       args << package
 
       if @verbose || @dry_run
-        $stderr.puts "  #{args.join(" ")}"
+        warn "  #{args.join(" ")}"
       end
 
       return true if @dry_run

data/lib/dotlayer.rb

@@ -1,5 +1,5 @@
 module Dotlayer
-  VERSION = "0.2.0"
+  VERSION = "0.2.2"
 
   autoload :CLI, "dotlayer/cli"
   autoload :Config, "dotlayer/config"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dotlayer
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Douglas Andrade
@@ -53,7 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.8
 specification_version: 4
 summary: Layered dotfiles management with GNU Stow
 test_files: []