Commit graph

341 commits

Author SHA1 Message Date
Chris Scutcher
08435eec4b
style: Apply nixpkgs-fmt and fix
Apply standard formatting and some statix conventions using;

```sh
nixpkgs-fmt **.nix && statix fix .
```

With the intent of making contribution a bit easier and reducing mental
load in hand formatting (in the same vein as [black]).

[black]: https://github.com/psf/black#the-uncompromising-code-formatter
2023-02-06 14:24:34 +00:00
bors[bot]
b1a4ecb8ca
Merge #142
142: flake.lock: Update r=disko-bot a=disko-bot



Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2023-02-06 01:36:42 +00:00
github-actions[bot]
33d4ed918b flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/50e4dbf35b95fd2b96718b656ebcbc6f9fa3a4ab' (2023-01-31)
  → 'github:NixOS/nixpkgs/d840126a0890621e7b220894d749132dd4bde6a0' (2023-02-05)
2023-02-06 01:36:25 +00:00
Lassulus
492b01f2dc
Merge pull request #140 from nix-community/jq-fix 2023-02-04 23:17:28 +01:00
Jörg Thalheim
a511f59961 jq: filter null values from mountpoints from lsblk output 2023-02-03 14:57:55 +01:00
bors[bot]
da20419aab
Merge #139
139: Quickstart guide r=Mic92 a=Mic92



Co-authored-by: Jörg Thalheim <joerg@thalheim.io>
Co-authored-by: Aiden <aiden@oldstreetjournal.co.uk>
2023-02-03 12:41:00 +00:00
Aiden
a9e0f9ba44 insert output of the cli --help 2023-02-03 13:29:45 +01:00
Jörg Thalheim
753b5543a0 better structure 2023-02-03 13:27:21 +01:00
Jörg Thalheim
66b265be44 add quickstart guide 2023-02-03 13:22:44 +01:00
Jörg Thalheim
db2be366c4 quickstart guide 2023-02-03 13:22:42 +01:00
bors[bot]
c0c93e75d9
Merge #138
138: {example,tests}: add hybrid-tmpfs-on-root r=Lassulus a=Kranzes



Co-authored-by: Ilan Joselevich <personal@ilanjoselevich.com>
2023-02-02 19:35:59 +00:00
Ilan Joselevich
3e0b4ddd3b
{example,tests}: add hybrid-tmpfs-on-root 2023-02-02 21:28:36 +02:00
bors[bot]
d3bbbfe4f4
Merge #136
136: add hybrid bios/efi example + fixes & zvol table support r=Lassulus a=Lassulus



Co-authored-by: lassulus <git@lassul.us>
Co-authored-by: Jörg Thalheim <joerg@thalheim.io>
2023-02-02 13:53:06 +00:00
Jörg Thalheim
d23fcb611e add test for hybrid configuration 2023-02-02 14:49:20 +01:00
Jörg Thalheim
daaba55a28 delete obsolete types.nix 2023-02-02 14:42:09 +01:00
Jörg Thalheim
78ea07107a support zvol with disko
this is useful for quick testing.
2023-02-02 14:42:09 +01:00
Jörg Thalheim
9f58230409 also inherit lib for disko scripts 2023-02-02 14:42:09 +01:00
Jörg Thalheim
0fadf13755 hardcode nixpkgs in NIX_PATH of disko cli 2023-02-02 14:42:09 +01:00
Jörg Thalheim
50adcfe303 disko: fix packaging missing nix files 2023-02-02 14:42:09 +01:00
lassulus
b3875afc1f examples: add hybrid.nix 2023-02-02 14:42:05 +01:00
lassulus
e88e00752d cli: fix zap_create_mount mode 2023-02-02 12:44:57 +01:00
bors[bot]
06a2cc336b
Merge #135
135: flake.lock: Update r=Mic92 a=disko-bot



Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2023-02-02 07:13:18 +00:00
github-actions[bot]
e2698264c8 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/a0feb36dc510bfa8f8809980a8230617fb9eb618' (2023-01-29)
  → 'github:NixOS/nixpkgs/50e4dbf35b95fd2b96718b656ebcbc6f9fa3a4ab' (2023-01-31)
2023-02-02 01:39:43 +00:00
bors[bot]
e97f8b7ab7
Merge #134
134: Update bcachefs r=Mic92 a=Mic92



Co-authored-by: Jörg Thalheim <joerg@thalheim.io>
2023-02-01 21:57:34 +00:00
Jörg Thalheim
5f4651aa0b
bcachefs: 2022-12-29 -> 2023-02-01 2023-02-01 22:56:32 +01:00
bors[bot]
e1f892517e
Merge #129
129: flake.lock: Update r=Mic92 a=disko-bot



Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2023-01-30 11:28:42 +00:00
Jörg Thalheim
309618f10a
Merge pull request #131 from nix-community/type-refactoring
Split disko type into multiple files
2023-01-30 11:26:56 +00:00
github-actions[bot]
2ac68063b8 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/cfb43ad7b941d9c3606fb35d91228da7ebddbfc5' (2023-01-20)
  → 'github:NixOS/nixpkgs/a0feb36dc510bfa8f8809980a8230617fb9eb618' (2023-01-29)
2023-01-30 01:26:57 +00:00
Jörg Thalheim
48e4c06004 split disko type into multiple files 2023-01-29 08:10:33 +01:00
bors[bot]
aa26c0ce0d
Merge #128
128: add support for another mountpoint than /mnt r=Mic92 a=Lassulus



Co-authored-by: lassulus <lassulus@lassul.us>
Co-authored-by: lassulus <git@lassul.us>
2023-01-28 17:21:26 +00:00
lassulus
f49536f004 types.table: get device mountOptions the correct way 2023-01-28 18:08:31 +01:00
lassulus
08dc4d06da disk-deactivate: follow by-id/by-uuid links to real device 2023-01-28 18:08:31 +01:00
lassulus
6bbccd8edd types: relax filename, pathname & absolute pathname 2023-01-28 18:08:31 +01:00
lassulus
af2da574be add support for another mountpoint than /mnt 2023-01-28 18:08:31 +01:00
bors[bot]
d7e178126f
Merge #127
127: move linuxPackages_bcachefs to legacyPackages r=Mic92 a=Mic92



Co-authored-by: Jörg Thalheim <joerg@thalheim.io>
2023-01-23 14:36:00 +00:00
Jörg Thalheim
e018cf8c59 update bors toml 2023-01-23 15:35:25 +01:00
Jörg Thalheim
65a8e3f9a0 move linuxPackages_bcachefs to legacyPackages 2023-01-23 15:34:35 +01:00
bors[bot]
2c82dbc132
Merge #126
126: Bcachefs fixes r=Mic92 a=Mic92



Co-authored-by: Jörg Thalheim <joerg@thalheim.io>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2023-01-23 09:57:20 +00:00
github-actions[bot]
232aed177d flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/37b97ae3dd714de9a17923d004a2c5b5543dfa6d' (2023-01-13)
  → 'github:NixOS/nixpkgs/cfb43ad7b941d9c3606fb35d91228da7ebddbfc5' (2023-01-20)
2023-01-23 10:56:51 +01:00
Jörg Thalheim
eca1957835 vendorize bcachefs kernel 2023-01-23 10:56:51 +01:00
Jörg Thalheim
825be2b627
Merge pull request #123 from nix-community/doc
Revert "don't use bot token for flake updates"
2023-01-23 08:29:44 +00:00
Jörg Thalheim
5e1969f952 Revert "don't use bot token for flake updates"
This reverts commit c681875a0c.

That did not quite work, but now we have our own bot for disko.
2023-01-23 09:29:14 +01:00
Jörg Thalheim
8903d73825
Merge pull request #121 from nix-community/updates
don't use bot token for flake updates
2023-01-23 08:15:50 +00:00
Jörg Thalheim
c681875a0c don't use bot token for flake updates 2023-01-23 09:15:25 +01:00
bors[bot]
53f71ef232
Merge #120
120: ci: automerge flake updates r=Mic92 a=Mic92



Co-authored-by: Jörg Thalheim <joerg@thalheim.io>
2023-01-23 08:09:29 +00:00
Jörg Thalheim
3da5595a9c drop mergify 2023-01-23 09:08:59 +01:00
Jörg Thalheim
f0fff7ab32 ci: automerge flake updates 2023-01-23 09:06:47 +01:00
Lassulus
e1eba38e8e
Merge pull request #95 from phaer/zfs-crypto 2023-01-19 13:23:39 +01:00
phaer
a63d0fa12b hooks: add description 2023-01-19 13:12:08 +01:00
phaer
caf893b6eb hooks: remove debug output 2023-01-19 13:09:41 +01:00