axeman/pub-solar-os
1
0
Fork 0
forked from pub-solar/os
Code Issues Pull requests Packages Projects Releases Wiki Activity
1120 commits 23 branches 43 tags 6.4 MiB
Commit graph

1120 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Arnold 5bd943f97d
imp: advise removal of */modules-list.nix on merge conflicts 
During merge conflicts, these lines should appear in the hunks
and give instructions on how to handle them in the face of the
implementation of `rakeLeaves` for modules in https://git.io/JB1Wk via
`importModules`, that knows how to rake leaves by walking the folder
tree on it's own and collecting leaves that are normal nix files or
folers who contain a `default.nix` mmicking strongly a "recursive"
import-ish syntax.
 2021-07-31 23:03:19 -05:00
bors[bot] f69737301f
Merge #350 
350: Ensure pinning latest channel to nixpkgs nixos-unstable branch r=blaggacao a=teutat3s



Co-authored-by: teutat3s <10206665+teutat3s@users.noreply.github.com>
 2021-08-01 03:51:21 +00:00
teutat3s bf81ed29d1
Ensure pinning latest channel to nixpkgs nixos-unstable branch 2021-07-30 22:22:44 +02:00
Timothy DeHerrera 8b67cae20a
flake: remove ci-agent 2021-07-23 14:38:54 -06:00
David Arnold 3e298b68dd
fix: bump flake-utils-plus with a regression w.r.t exportModules reverted 2021-07-23 15:32:39 -05:00
drone b3bbfcdab4 Merge remote-tracking branch 'origin/devos' into core 2021-07-23 00:25:04 +00:00
David Arnold a3ec0d2814
imp: use bud nixos-/devhsllModules and hide rebiding 
both modules depend on `self`/`inputs` available as special args for
both, devshell & nixos modules, so bump to an improved `digga`, as well.
 2021-07-20 23:36:41 -05:00
David Arnold 0410acf3d7
Merge branch 'core' into develop 2021-07-20 22:21:18 -05:00
David Arnold bf8620f8ba
ref: point digga to main (default) branch 2021-07-20 22:19:09 -05:00
David Arnold 31a8e76209
ref: adapt to using plain digga module for boostrap ISO 2021-07-20 21:45:41 -05:00
David Arnold dcb425341d
update: digga/fup refactoring 2021-07-20 19:13:17 -05:00
teutat3s 0c2defad98
Update flake.lock 2021-07-17 15:47:54 +02:00
teutat3s 81a70f7063
Merge remote-tracking branch 'devos/develop' into core 2021-07-17 15:43:05 +02:00
David Arnold a088edd77a fmt 2021-07-16 16:57:57 -05:00
David Arnold 6c25e77f6f add flake's nixConfig values that go well with this repo 2021-07-16 16:57:57 -05:00
David Arnold aa45592c17 imp: add digga's nixConfig and patchedNix 2021-07-16 16:57:57 -05:00
David Arnold 8ae22c63dc
fix: move legacy nix path definitions back to devos 2021-07-16 15:27:17 -05:00
David Arnold b05f95065e
bump: point to tip of squashed digga develop branch 2021-07-16 13:18:10 -05:00
David Arnold bd0ef12149 bump: pull in latest bud fixes & additions 
- portble home profiles
- missing coreutils
 2021-07-16 13:02:49 -05:00
David Arnold 26a2423312 ref: make hm common module explicit 2021-07-16 13:02:49 -05:00
David Arnold 73431f5709
rm: community 
the commmunity branch was fallen too far behind and there where no
contributions to it, anyways. We will start linking usage examples
out in the wild, instead.
 2021-07-16 12:51:58 -05:00
David Arnold b95189d754
rm: community 
the commmunity branch was fallen too far behind and there where no
contributions to it, anyways. We will start linking usage examples
out in the wild, instead.
 2021-07-16 12:50:18 -05:00
David Arnold 4b9cab40cb imp: add portable user definition 
According to https://github.com/nix-community/home-manager/issues/2161
there might be a better formal distinction between host-spaced and
portable arch-spaced hm users in the future.
 2021-07-16 11:22:10 -05:00
David Arnold 000329f6a7
fix: bump digga with infinite recursion hotfix 2021-07-15 22:19:38 -05:00
David Arnold 6ebdf3adb4 imp: reduce flake inputs footprint and increase conciseness 2021-07-15 19:26:27 -05:00
teutat3s de5d4a223a upstream pub-solar changes from teutat3s (#11) 
Co-authored-by: teutat3s <10206665+teutat3s@users.noreply.github.com>
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/11
Reviewed-by: Benjamin Bädorf <b12f@noreply.example.org>
Co-authored-by: teutat3s <teutates@mailbox.org>
Co-committed-by: teutat3s <teutates@mailbox.org>
 2021-07-13 17:05:36 +00:00
teutat3s a3961f7c52 move back from neovim-nightly to neovim from unstable (#10) 
https://github.com/neovim/neovim/releases/tag/v0.5.0

Co-authored-by: teutat3s <10206665+teutat3s@users.noreply.github.com>
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/10
Co-authored-by: teutat3s <teutates@mailbox.org>
Co-committed-by: teutat3s <teutates@mailbox.org>
 2021-07-13 16:33:15 +00:00
David Arnold fe73d2a083
fix: hm pin to corresponding nixos version 2021-07-09 11:46:42 -05:00
David Arnold bf59976063 work-around for https://github.com/NixOS/nix/pull/4641 2021-07-07 21:03:31 -05:00
David Arnold 33fb25e011 ref: move devshell module here to devos again 2021-07-07 21:03:31 -05:00
Benjamin Bädorf b55792154d Merge remote-tracking branch 'origin/devos' into core 2021-07-07 17:51:16 +00:00
Benjamin Bädorf 18c1161e2f fix/dafakincron (#9) 
Co-authored-by: Benjamin Bädorf <hello@benjaminbaedorf.eu>
Co-authored-by: teutat3s <10206665+teutat3s@users.noreply.github.com>
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/9
Reviewed-by: teutat3s <teutates@mailbox.org>
Co-authored-by: Benjamin Bädorf <b12f@noreply.example.org>
Co-committed-by: Benjamin Bädorf <b12f@noreply.example.org>
 2021-07-07 17:50:51 +00:00
bors[bot] 62f9d95259
Merge #333 
333: core: use bottom instead of gotop r=blaggacao a=nrdxp

gotop is unmaintained, unless someone has a better alternative, it looks like bottom is the new goto

Co-authored-by: Timothy DeHerrera <tim.deh@pm.me>
 2021-07-04 04:48:35 +00:00
Timothy DeHerrera 1a4b7d19c9
README.md: rework 2021-07-01 23:40:55 -06:00
Timothy DeHerrera 95f429a525
core: use bottom instead of gotop 2021-06-30 08:50:07 -06:00
teutat3s 1ecdf060b9
Fix starting step on wrong branch, step names 2021-06-27 17:23:18 +02:00
teutat3s 75e994e853
Glob matching of the cron name, maybe? 2021-06-25 15:53:44 +02:00
bors[bot] 741e8fdc47
Merge #330 
330: Fix: Haskell overlay r=blaggacao a=GTrunSec

using `lib.composeExtensions` for packageOverrides is more idiomatic.
Fixes: https://github.com/divnix/devos/pull/325#pullrequestreview-687772802
such as 
```
 python3 = pkgs.python3.override (old: {
   5 │ │ packageOverrides =
   4 │ │ │ pkgs.lib.composeExtensions
   3 │ │ │ │ (old.packageOverrides or (_: _: { }))
   2 │ │ │ │ packageOverrides;
   1 │ });
```

Co-authored-by: GTrunSec <gtrunsec@hardenedlinux.org>
 2021-06-25 12:54:51 +00:00
GTrunSec f1117f27ec
fix hasekllPackages overlay 2021-06-24 22:58:26 -07:00
bors[bot] e3b7c07daf
Merge #325 
325: feature: Add pkgs fetch manager nvfetcher r=blaggacao a=GTrunSec

Regarding motivation in https://github.com/divnix/devos/issues/299

Any question here?

Example: 
-  overlay 
```
inherit (prev.sources.<PackageName>) pname version src;
```

- pkgs 
```
stdenv.mkDerivation rec {
 inherit (sources.<PackageName>) pname version src;
```

Resolves #299 

Co-authored-by: GTrunSec <gtrunsec@hardenedlinux.org>
Co-authored-by: David Arnold <dgx.arnold@gmail.com>
 2021-06-25 02:39:01 +00:00
David Arnold b927d97ce2
doc: nvfetcher 2021-06-24 21:37:51 -05:00
GTrunSec ee89bf3f2a
feature: Add pkgs fetch manager nvfetcher 
Co-authored-by: David Arnold <dar@xoe.solutions>
 2021-06-24 21:37:50 -05:00
bors[bot] 5f5c26bee3
Merge #329 
329: bump digga to latest develop r=nrdxp a=blaggacao



Co-authored-by: David Arnold <dgx.arnold@gmail.com>
 2021-06-25 02:17:44 +00:00
David Arnold 1c80b508ca
bump: nixpkgs to avoid https://github.com/NixOS/nixpkgs/pull/127720 2021-06-24 18:15:15 -05:00
David Arnold 3cc28b3adb
bump digga to latest develop 2021-06-24 18:11:24 -05:00
teutat3s 40b807044a CI: Fix drone cron daily target (#7) 
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/7
Reviewed-by: Benjamin Bädorf <b12f@noreply.example.org>
Co-authored-by: teutat3s <teutates@mailbox.org>
Co-committed-by: teutat3s <teutates@mailbox.org>
 2021-06-20 18:56:38 +00:00
Benjamin Bädorf a9e304617b feat/upstreaming (#4) 
Co-authored-by: Benjamin Bädorf <hello@benjaminbaedorf.eu>
Co-authored-by: teutat3s <teutates@mailbox.org>
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/4
Co-authored-by: Benjamin Bädorf <b12f@noreply.example.org>
Co-committed-by: Benjamin Bädorf <b12f@noreply.example.org>
 2021-06-14 23:28:23 +00:00
Benjamin Bädorf fccbc349bd Merge remote-tracking branch 'origin/devos' into core 2021-06-14 21:28:39 +00:00
bors[bot] ab4bd584e2
Merge #326 
326: ref: pass our lib as lib.our to the module system r=Pacman99 a=blaggacao

At least we don't find ourselves with strange module signatures
and use something that looks like a dedicated namespace within
he module system: `config.lib`

---

```shell
➜  devos git:(da/pass-lib-as-config-lib) rg ourLib
➜  devos git:(da/pass-lib-as-config-lib) # nothing found
```

Co-authored-by: David Arnold <dar@xoe.solutions>
 2021-06-14 06:45:35 +00:00
David Arnold 62683b24ac
ref: pass our lib as lib.our to the module system 
At least we don't find ourselves with strange module signatures
and use something that looks like a dedicated namespace within
he module system: `config.lib`
 2021-06-13 23:30:05 -05:00