Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge branch develop #15

Merged
merged 677 commits into from
Dec 27, 2023
Merged

Merge branch develop #15

merged 677 commits into from
Dec 27, 2023

Conversation

Lehmanator
Copy link
Owner

Use main branch for current configs.

  • Old main contents moved to new branch: old
  • New main contents should be confirmed to work for all devices [WIP]
  • develop branch should be more bleeding-edge, but now kept closer to main.

Flake lock file updates:

• Updated input 'darwin':
    'github:LnL7/nix-darwin/2ad716c2786dabf8f458ae1e7d343775d3acc65c' (2023-07-12)
  → 'github:LnL7/nix-darwin/d468d4e813bb3ebe91e8d82ffed2f21852fa8909' (2023-07-13)
Flake lock file updates:

• Updated input 'flake-devour':
    'github:srid/devour-flake/69d11547886a68d4a42d1cef0fccdbd39584aff6' (2023-07-13)
  → 'github:srid/devour-flake/0d9b1661184d40c09a21ce4db0e526e923a2e1b5' (2023-07-13)
Flake lock file updates:

• Updated input 'flake-devour':
    'github:srid/devour-flake/0d9b1661184d40c09a21ce4db0e526e923a2e1b5' (2023-07-13)
  → 'github:srid/devour-flake/f4d8c8eaade5fefe0d466c4bb90215d387eadc23' (2023-07-13)
Flake lock file updates:

• Updated input 'nur':
    'github:nix-community/NUR/cae34195effc7f9612ac2de6369fa389e61614bd' (2023-07-13)
  → 'github:nix-community/NUR/b628a183586e0de78a9250728eb4acee4fac1818' (2023-07-13)
• Updated input 'stylix':
    'github:danth/stylix/2524c8ae027e4101b9a476c0b13fe05d3c8bdeb9' (2023-07-13)
  → 'github:danth/stylix/cdf7e2ded1149a24f1b38bbdcf7c6c20d6165571' (2023-07-13)
Flake lock file updates:

• Updated input 'emanote':
    'github:srid/emanote/ae98029c61be3c6f6415551941944eb930d6c7a6' (2023-07-12)
  → 'github:srid/emanote/84aaaac7384571576506377ccdd5182fc5662ac7' (2023-07-13)
• Updated input 'nixpkgs-android':
    'github:tadfisher/android-nixpkgs/6e1c68c9e481df81230c189226bc979a5e3d7082' (2023-07-12)
  → 'github:tadfisher/android-nixpkgs/1c52ca2b6bf13a9a22ca5b5f85a5767bfa69f3aa' (2023-07-13)
• Updated input 'nixpkgs-android/nixpkgs':
    'github:NixOS/nixpkgs/f2406198ea0e4e37d4380d0e20336c575b8f8ef9' (2023-07-11)
  → 'github:NixOS/nixpkgs/2de8efefb6ce7f5e4e75bdf57376a96555986841' (2023-07-12)
• Updated input 'nur':
    'github:nix-community/NUR/b628a183586e0de78a9250728eb4acee4fac1818' (2023-07-13)
  → 'github:nix-community/NUR/1e39d43293b5469141ae8878b9b5a582f0411f5e' (2023-07-13)
• Updated input 'stylix':
    'github:danth/stylix/cdf7e2ded1149a24f1b38bbdcf7c6c20d6165571' (2023-07-13)
  → 'github:danth/stylix/d3092bed023406359d06ea9a6d1f8bd7bf93d447' (2023-07-13)
- Renamed for both user & NixOS profiles.
- Edited Tailscale config to use sops secrets. [WIP] [Untested]

Mostly tried to fix build fail from complaining of missing `cache.nix`
(it was imported in the moved file: `users/sam/nix/binary-caches.nix`)
System types (`common`, `darwin`, `nixos`) + home-manager (`hm`) have basedir containing:

- `lib/`
- `modules/`
- `overlays/`
- `packages/`
- `profiles/`
- `suites/`

along with a dir for configuration definitions. i.e.:

- `hm/users/`
- `nixos/hosts/`

- [ ] TODO: Move all personal config from `hm/profiles/` -> `hm/users/sam/`
- [ ] TODO: Test building `hosts.wyse`
- [ ] TODO: Test building `hosts.fajita`
- Initialize custom format for `nixos-generators`: `netboot-installer`
- Move import for `nixosModules`/`hmModules` w/o config to `nixos/profiles/modules/default.nix`
- Adapt config to allow `nixos-generators` to work (`mkDefault` some options)
- Delete now-unused `nixos/profiles/home-manager.nix`
  - [ ] TODO: `nixos/profiles/security/sops.nix`
@Lehmanator Lehmanator merged commit b4aef66 into main Dec 27, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant