From 48f7bf30b0e9889062949b5333b33a4d284f52ea Mon Sep 17 00:00:00 2001 From: CaptainSpof Date: Tue, 4 Jan 2022 12:42:10 +0100 Subject: [PATCH] Apply patch from upstream: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 1cbf28f445caabc4f89798a7447ee0bee580b81b Author: Parthiv Seetharaman Date: Wed Dec 29 19:49:19 2021 -0800 flake: update bud input fixes #406 commit 267e135c4d4d6fc219fd56a75726bbd6e4887705 Merge: 3587d67 87f1d7d Author: Parthiv Seetharaman Date: Wed Dec 29 16:45:42 2021 -0800 Merge pull request #409 from Pacman99/bud-get-git bud: move to shell and use git clone for get commit 87f1d7da18e44a8386bf31a0ee82da8f3ad0ae51 Author: Parthiv Seetharaman Date: Wed Dec 29 15:41:58 2021 -0800 bud: move to shell and use git clone for get commit 3587d675064f4006807f130a0d7dee16c520cac9 Merge: b15b8bf a319aed Author: Parthiv Seetharaman Date: Wed Dec 29 14:01:09 2021 -0800 Merge pull request #403 from divnix/update-digga update digga commit a319aed9f4e21ac096891077bc217af1a38803c7 Author: David Arnold Date: Mon Nov 29 19:38:56 2021 -0500 imp: move follows responsibility downstream - also remove unimportant (small) depenencies from follows management - so that it is less complex as errors occur, since: - it seems there are still follows issues present upstream commit 838bcd1f5114c93473fdd920d49dc5abba6577bf Author: David Arnold Date: Mon Nov 29 18:07:21 2021 -0500 nix-direnv: rm enableFlakes and pass nixUnstable > Failed assertions: - The option definition `programs.direnv.nix-direnv.enableFlakes' in `/nix/store/pv3vi4n7x83r4sc3ljqdgg9qifr4n5gp-source/users/profiles/direnv' no longer has any effect; please remove it. Flake support is now always enabled. commit 6151d02b8dd9c74f0ce645cdd0c6309adbf57673 Author: David Arnold Date: Mon Nov 29 17:37:02 2021 -0500 rm: use of patched nix for nixos 21.11 enabled digga - patched nix held the follows patch which is now upstreamed commit b15b8bf86551f0b4ed2c7ac2c569d6784cd25fd7 Author: Dmytro Kostiuchenko Date: Mon Nov 29 08:44:15 2021 +0200 Do not hardcode UID for the exemplary user uid = 1000 is an unreasonable default for an examplary user nixos, because someone trying DevOs on a working NixOS installation likely has their own user with uid=1000 already. The code thus renders /etc/passwd invalid preventing user from logging in commit 506079201d113b66aab4c4fa20b2fc397ea890e9 Merge: fca9289 70545ab Author: Pacman99 Date: Sat Nov 20 17:58:07 2021 -0800 Merge pull request #401 from michaelr/docs-fix-typo-bootstrap docs: fix typo in start/bootstrapping commit 70545abd1bf263c6c5f575fee41ec137af630f95 Author: Michael Reddick Date: Sat Nov 20 15:58:37 2021 -0600 docs: fix typo in start/bootstrapping commit fca9289eeca5fbbe70c198264f7766efd678bde7 Merge: 633ccde 6962aab Author: Timothy DeHerrera Date: Sat Nov 13 14:09:09 2021 -0700 Merge pull request #395 from pub-solar/refactor/remove-git-crypt Remove git crypt, update docs commit 633ccde1b13b685b4e0673049b691cf51e7eb922 Merge: 65db5d3 89b3cf7 Author: Timothy DeHerrera Date: Sat Nov 13 14:07:41 2021 -0700 Merge pull request #398 from KarolisL/doc_deploy_hm Document using deploy-rs to deploy home-manager commit 89b3cf78fd7af80e4dce4bfa9b3e6120e8d323e0 Author: Karolis Labrencis Date: Tue Nov 2 23:42:38 2021 +0200 Document using deploy-rs to deploy home-manager commit 6962aab06c1b679163e41cd70a697807b199548e Author: Benjamin Bädorf Date: Sun Oct 24 19:39:23 2021 +0200 Remove .gitattributes files commit 243116e2288005c90824a6d0d0ac400b973629ac Author: Benjamin Bädorf Date: Sun Oct 24 19:36:56 2021 +0200 Remove git crypt, update docs commit 65db5d30ae4df02b9cef6620e72ed34a2082fc31 Author: Karolis Labrencis Date: Sun Oct 24 01:33:04 2021 +0300 docs: remove outdated `nix-rebuild` notes commit 1b1bc8eb97fc346f65ef96b580544a987e35ab3a Author: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Thu Oct 21 23:39:38 2021 +0200 digga: fix link to new default branch main commit 8397aa7aa396bc99b380fe69120950022e88bbfd Author: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Thu Oct 21 23:39:19 2021 +0200 workflows: switch to new default branch main commit a25d78b9c3d7fddd2c9345e2a38d858cd06bc9eb Merge: a819ff2 804e972 Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Sat Oct 9 20:07:22 2021 +0000 Merge #388 388: Update docs and scripts to use main branch. r=Pacman99 a=trevorriles When following the getting started guide commands were failing due to the mater branch not existing. I went through and updated all references in the docs and other scripts from master to main. Co-authored-by: Trevor Riles commit 804e972c5701884f8f0891dc68e8a60802d9f03b Author: Trevor Riles Date: Sat Oct 9 11:17:42 2021 -0500 Update docs and scripts to use main branch. When following the getting started guide commands were failing due to the mater branch not existing. I went through and updated all references in the docs and other scripts from master to main. commit a819ff2d1f22c7d4eb899c1fb6826e26b2c9155e Merge: cc663a2 8684105 Author: Timothy DeHerrera Date: Thu Oct 7 09:38:27 2021 -0600 Merge pull request #387 from jyooru/patch-1 docs: fix typos in concepts/suites commit 8684105d21c1c59db27e499a5801023dd3ce2c7d Author: Joel Date: Thu Oct 7 19:11:21 2021 +1000 docs: fix typos in concepts/suites commit cc663a22d25d5021c2a1ada1eab4ba9326b36dea Merge: 287cb82 74208fb Author: Pacman99 Date: Wed Oct 6 12:46:00 2021 -0700 Merge pull request #386 from Pacman99/update-bud flake: update bud input and add check for bud commit 74208fb88f7832e0354e0646145784e55071b7af Author: Parthiv Seetharaman Date: Mon Oct 4 12:18:28 2021 -0700 workflows: add check to run bud commit 469b3746cfe1c2698b9c23d352d23b6c1133014e Author: Parthiv Seetharaman Date: Mon Oct 4 11:59:33 2021 -0700 flake: update bud input commit 287cb82d1ccd74693ae844869baa34228f143c21 Merge: 2976777 1df67a3 Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Thu Sep 30 16:38:05 2021 +0000 Merge #380 380: chore: update deploy-rs, nvfetcher, devshell r=nrdxp a=GTrunSec - waiting for https://github.com/divnix/digga/pull/108 Co-authored-by: GTrunSec commit 1df67a3f2ac5e109fef54dc0b761aca0d64c2c5c Author: GTrunSec Date: Thu Sep 30 00:33:01 2021 -0700 update digga lock commit f10a8fdd33e5b354e6c5cfe32029900a891e65ca Author: GTrunSec Date: Wed Sep 29 11:49:43 2021 -0700 chore: update nvfecher commit 950199ef2c5c85e7d8235962dc49f9a5793f41e5 Author: GTrunSec Date: Wed Sep 29 11:45:46 2021 -0700 update deploy-rs overlay commit 2976777ba9e328af094f9356bedbda6024669160 Merge: e5660cd e0da74c Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Wed Sep 29 15:23:41 2021 +0000 Merge #378 378: Update flake to use new modules options r=nrdxp a=Pacman99 connected to divnix/digga#107 Co-authored-by: Parthiv Seetharaman commit e0da74c87c62b1acca275f11af80a3c9fb556f33 Author: Parthiv Seetharaman Date: Fri Sep 24 11:40:53 2021 -0700 Update flake to use new moddules options commit e5660cdf83d9581f971504db8024240346328de8 Author: Chris Montgomery Date: Sun Sep 19 23:53:14 2021 -0400 ci: remove lingering references to `main` in workflow configs `main` is no longer in use. See #369 commit 95f89c0b44acf92e16ec702b38a23016616d8a2b Author: Chris Montgomery Date: Sun Sep 19 23:43:29 2021 -0400 docs: use single quotes in example to avoid shell expansion commit ccf160dd218aa48346ce2d9802d937757ccb1bd5 Author: Chris Montgomery Date: Sun Sep 19 23:40:19 2021 -0400 docs: `deploy` command example is run from repo root commit 0770c7f9009293412c53d4f901bf23ff5d368769 Author: Chris Montgomery Date: Sun Sep 19 23:30:16 2021 -0400 docs: `bud get` creates a directory named `devos` by default As mentioned in #370 it would not result in a directory called `bud`, as can be seen in the custom `get.bash` command where the directory name defaults to `devos`. commit 252769ce465660b1480fcc127b54dab6262f4b3f Author: Chris Montgomery Date: Sat Sep 18 15:27:49 2021 -0400 ci: update release workflow to checkout code from `master` branch commit 57a14bb4119f19cf7b56adec41a7fe8797a5b000 Author: Chris Montgomery Date: Sat Sep 18 15:26:15 2021 -0400 docs: update links to point to `master` instead of `core` commit 19666a06a7598872a0781e1b07fd267dac3d989f Author: Chris Montgomery Date: Sat Sep 18 15:21:03 2021 -0400 fix: `bud get` should init flake based off `master` commit 955b9ce1c1691d5ecd54bd666b0b47e42559a382 Author: Chris Montgomery Date: Sat Sep 18 15:19:35 2021 -0400 docs(bud): replace references to `flk` commit f13c11ea174fd508a7a327e13ad8fffff95facd6 Author: Timothy DeHerrera Date: Sun Sep 19 11:17:01 2021 -0600 README.md: fix broken links commit c3461cd2c3f947c3ed30d64565d4e78c80d1fdba Author: Chris Montgomery Date: Sat Sep 18 15:47:59 2021 -0400 docs: `master` is the current target branch for pull requests commit 54a9a8366e796661be44f8ab6f913632c02e0c34 Author: Chris Montgomery Date: Sat Sep 18 15:47:11 2021 -0400 ci: workflows on `main` push should trigger on `master` push commit a3b2bcf3d57be28c27119a44445cfdde38349cb9 Author: Anton Date: Sat Sep 18 16:50:51 2021 +0300 fix typo in CONTRIBUTING.md commit 61a56569c8f565bb9aa41b41a6edf539c02165f4 Merge: 079adc4 0536d0d Author: Timothy DeHerrera Date: Thu Sep 2 09:35:08 2021 -0600 Merge pull request #358 from benneti/patch-1 update pkgs documentation commit 0536d0de90f7b56f914052cd86e42e2b105b79a8 Author: benneti Date: Thu Sep 2 11:37:21 2021 +0200 update pkgs documentation commit 079adc4474231d5582fee5574bc5bcc6f133e5ac Author: David Arnold Date: Thu Aug 12 20:57:22 2021 -0500 fix: more docs w.r.t. bootstrap iso commit c46d923876420cdfe0fc805dc70221a214e6d20e Author: David Arnold Date: Thu Aug 12 20:51:18 2021 -0500 fix: iso docs w.r.t. bud burn and bootstrap.nix commit 32bddf6403895f104bb72d4ba7e113a61bafef70 Author: David Arnold Date: Thu Aug 12 20:48:30 2021 -0500 fix: docs bootsrtap - swap disk by label (easied copy/paste) commit c30870f266d19e305d4163184ff4d812be022fec Author: David Arnold Date: Thu Aug 12 20:45:47 2021 -0500 imp: bootstrap docs commit 5b89e53e7a39c603bed327023c953d0b30433ec2 Author: Las Safin Date: Wed Aug 11 19:05:03 2021 +0000 Fix typo in README.md commit 5c3d6254c36723875bf695b92c63ed388605605f Author: Kid <44045911+kidonng@users.noreply.github.com> Date: Fri Aug 6 23:07:40 2021 +0800 Fix a typo commit 5657ddf3c1991831bdbd8ed2df8d590b0c92588d Author: David Arnold Date: Thu Aug 5 20:30:40 2021 -0500 fix: input ref / bump digga the indirect reference started failing with ``` warning: Git tree '/home/blaggacao/ghq/github.com/divnix/devos' is dirty error: NAR hash mismatch in input 'github:NixOS/nixpkgs/release-21.05' (/nix/store/0r0xrqj5l88071cama7hlha5ajya06c8-source), expected 'sha256-MhVtkVt1MFfaDY3ObJu54NBcsaPk19vOBZ8ouhjO4qs=', got 'sha256-jQgXeJ9NQQS0Eobb/qQOvS+RRULkqRikAeXkkFKOPDA=' ``` commit b5da4066898205f2270f1ac4b0dada9403bb78e1 Author: David Arnold Date: Thu Aug 5 20:16:53 2021 -0500 fix: dedicated bootstrap config commit 768c9b8216516eaa20ffed8a3c1bebed55acaf70 Author: GTrunSec Date: Sun Aug 1 15:46:41 2021 -0700 bump: nvfetcher and cleanup commit aba10aa8a43a0011e7d86d15ac466b4aeaf9e59b Author: GTrunSec Date: Sun Aug 1 15:44:31 2021 -0700 fix/hm: direnv flakes support commit 6f5ef6126ee7fa96276e45ba349f048f937c49ab Author: David Arnold Date: Mon Aug 2 14:38:30 2021 -0500 fix: cachix branch commit 0f98fe0cb3f4867d35531e709921c9c899a83a25 Author: David Arnold Date: Mon Aug 2 14:09:33 2021 -0500 bump: bud with some corutils missing deps & other fixes commit 757c107b4670aba05851896c4c6c8fb7b9fe283b Author: David Arnold Date: Mon Aug 2 14:07:04 2021 -0500 bump: digga commit 135f1d656d9d86f8f021aa49132515958b2b05ba Author: David Arnold Date: Mon Aug 2 14:05:58 2021 -0500 bump: nixos w upstream fixes specifically - https://github.com/NixOS/nixpkgs/pull/132363 - https://github.com/NixOS/nixpkgs/pull/131876 commit 4c130410b9cae569eb44fc7453bec38cfccd9d22 Merge: 2fcb360 5bd943f Author: David Arnold Date: Sun Aug 1 16:39:21 2021 -0500 Merge branch 'core' into develop commit 2fcb3605eed05978fe4df0f5969aca552fa0e140 Author: David Arnold Date: Sun Aug 1 16:38:52 2021 -0500 docs: soft update (fix the most obvious drift) commit 5bd943f97da8e63c4b8a6c234d71fcdb7b7e7193 Author: David Arnold Date: Sat Jul 31 23:03:19 2021 -0500 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. commit f69737301f5cfcc72bab125175df8421f6a52c64 Merge: 8b67cae bf81ed2 Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Sun Aug 1 03:51:21 2021 +0000 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> commit bf81ed29d1d1ab22c79f0a0700e7cf76ba031004 Author: teutat3s <10206665+teutat3s@users.noreply.github.com> Date: Fri Jul 30 22:22:44 2021 +0200 Ensure pinning latest channel to nixpkgs nixos-unstable branch commit 8b67cae20a110f296abf91cdba94a3946b1ba647 Author: Timothy DeHerrera Date: Fri Jul 23 14:38:54 2021 -0600 flake: remove ci-agent commit 3e298b68dd99c72c54f2450c34068f5b1711c0f8 Author: David Arnold Date: Fri Jul 23 15:32:39 2021 -0500 fix: bump flake-utils-plus with a regression w.r.t exportModules reverted commit a3ec0d281433f9ba3a1b9723a19cc29302d96eb6 Author: David Arnold Date: Tue Jul 20 23:36:41 2021 -0500 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. commit 0410acf3d73965e860308301db10921ceffa7652 Merge: bf8620f 73431f5 Author: David Arnold Date: Tue Jul 20 22:21:18 2021 -0500 Merge branch 'core' into develop commit bf8620f8bac46e4ce707ca7f093ecee07c013d2e Author: David Arnold Date: Tue Jul 20 22:19:09 2021 -0500 ref: point `digga` to `main` (default) branch commit 31a8e76209e880ffbb9f8561aeb3a65a0e38ae3b Author: David Arnold Date: Tue Jul 20 20:59:50 2021 -0500 ref: adapt to using plain digga module for boostrap ISO commit dcb425341d94dbf0172f9f3d3ccd9fb870956612 Author: David Arnold Date: Tue Jul 20 18:33:45 2021 -0500 update: digga/fup refactoring commit a088edd77ae40203d31f55dc8478548f07b8c9a0 Author: David Arnold Date: Fri Jul 16 16:01:25 2021 -0500 fmt commit 6c25e77f6fc3e4c0fa0eb009aae48a817b6bac51 Author: David Arnold Date: Fri Jul 16 16:09:26 2021 -0500 add flake's nixConfig values that go well with this repo commit aa45592c1735b5016b9cea835f49657eb2b02928 Author: David Arnold Date: Fri Jul 16 15:35:55 2021 -0500 imp: add digga's nixConfig and patchedNix commit 8ae22c63dc9eb0956ec26ca90dd7bef495be4404 Author: David Arnold Date: Fri Jul 16 15:27:17 2021 -0500 fix: move legacy nix path definitions back to devos commit b05f95065e52f8451625f5e08a212f6bf33f4436 Author: David Arnold Date: Fri Jul 16 13:18:10 2021 -0500 bump: point to tip of squashed digga develop branch commit bd0ef12149c4b0c19e84670e40b036bfbcbdaf45 Author: David Arnold Date: Fri Jul 16 12:21:57 2021 -0500 bump: pull in latest bud fixes & additions - portble home profiles - missing coreutils commit 26a2423312fccdbc4899506f91e2c084e7899aec Author: David Arnold Date: Fri Jul 9 10:17:05 2021 -0500 ref: make hm common module explicit commit 73431f57098f769e8393d7fa5963d3c20bf47c65 Author: David Arnold Date: Fri Jul 16 12:45:48 2021 -0500 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. commit b95189d754a0afd3f8d119dda036a483131283de Author: David Arnold Date: Fri Jul 16 12:45:48 2021 -0500 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. commit 4b9cab40cb1c5d7989c2e3719d743e764128ac2a Author: David Arnold Date: Mon Jul 12 17:32:13 2021 -0500 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. commit 000329f6a75529dda55b5f432827aadd96bf5029 Author: David Arnold Date: Thu Jul 15 22:19:38 2021 -0500 fix: bump digga with infinite recursion hotfix commit 6ebdf3adb422c79675d2b919025c7f1367a5a665 Author: David Arnold Date: Thu Jul 15 17:15:18 2021 -0500 imp: reduce flake inputs footprint and increase conciseness commit fe73d2a0835228d18f83f65d064245c6dcd78727 Author: David Arnold Date: Fri Jul 9 11:46:01 2021 -0500 fix: hm pin to corresponding nixos version commit bf59976063db3bdabea6d6e988658c986f7cee13 Author: David Arnold Date: Wed Jul 7 17:11:59 2021 -0500 work-around for https://github.com/NixOS/nix/pull/4641 commit 33fb25e011b050bf577a0fd77f29348e0126abc0 Author: David Arnold Date: Wed Jul 7 19:31:12 2021 -0500 ref: move devshell module here to `devos` again commit 62f9d9525975b629ccf3782aedee948d7e9f4a1d Merge: 741e8fd 95f429a Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Sun Jul 4 04:48:35 2021 +0000 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 commit 1a4b7d19c9faa6b90cd8db02bc345c3cc395b2f7 Author: Timothy DeHerrera Date: Thu Jul 1 23:40:55 2021 -0600 README.md: rework commit 95f429a5258b9b9d2f9be243c97f83da5385b06b Author: Timothy DeHerrera Date: Wed Jun 30 08:50:07 2021 -0600 core: use bottom instead of gotop commit 741e8fdc471be7c8961f3b9ea75cf4e6bb11a025 Merge: e3b7c07 f1117f2 Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Fri Jun 25 12:54:51 2021 +0000 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 commit f1117f27ec333cc801fd04c70b7ba205330b986d Author: GTrunSec Date: Thu Jun 24 22:58:26 2021 -0700 fix hasekllPackages overlay commit e3b7c07daf7889399662f36144f55ea189ff090f Merge: 5f5c26b b927d97 Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Fri Jun 25 02:39:01 2021 +0000 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.) pname version src; ``` - pkgs ``` stdenv.mkDerivation rec { inherit (sources.) pname version src; ``` Resolves #299 Co-authored-by: GTrunSec Co-authored-by: David Arnold commit b927d97ce2fe99977b10a792a094952a514dcfe5 Author: David Arnold Date: Wed Jun 16 17:25:37 2021 -0500 doc: nvfetcher commit ee89bf3f2a166c610101f93f1b3053068f86626f Author: GTrunSec Date: Sun Jun 13 21:48:43 2021 -0700 feature: Add pkgs fetch manager nvfetcher Co-authored-by: David Arnold commit 5f5c26bee3fec083a9acdf91760b743e5a842f07 Merge: ab4bd58 1c80b50 Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Fri Jun 25 02:17:44 2021 +0000 Merge #329 329: bump digga to latest develop r=nrdxp a=blaggacao Co-authored-by: David Arnold commit 1c80b508ca29def7c0df7f1e883fd9ca86d125f5 Author: David Arnold Date: Thu Jun 24 18:15:15 2021 -0500 bump: nixpkgs to avoid https://github.com/NixOS/nixpkgs/pull/127720 commit 3cc28b3adb93f15ff8f23097c27e4b666ee6ba2b Author: David Arnold Date: Sat Jun 19 13:26:07 2021 -0500 bump digga to latest develop commit ab4bd584e22ff1d9ee0d0307af457eef81fd8590 Merge: e1d7178 62683b2 Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Mon Jun 14 06:45:35 2021 +0000 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 commit 62683b24acc01aad5785569f18219eca9764df90 Author: David Arnold Date: Sun Jun 13 23:30:05 2021 -0500 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` commit e1d7178979a421bbfc83961edb962871acf5c791 Author: David Arnold Date: Sun Jun 13 12:15:09 2021 -0500 init: common flake compat fixes for other nixpkgs fixes #315 commit 0e1947b6f03ca17b02a9b3a31f720fa17a5e21e1 Author: David Arnold Date: Sun Jun 13 12:27:20 2021 -0500 add upstream issue report template commit b3118a6ea27c935c221d8cbc212a64bc655ef779 Merge: 4d1b3a5 a7c2046 Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Wed Jun 9 01:41:45 2021 +0000 Merge #301 301: Update core r=blaggacao a=Pacman99 Most of the changes were in digga Co-authored-by: Pacman99 Co-authored-by: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Co-authored-by: Pacman99 Co-authored-by: Jarosław Wygoda Co-authored-by: almostnobody <1583339+almostnobody@users.noreply.github.com> commit a7c20465ecd79b13d4cfe151c3096b2c309f2bf6 Author: Pacman99 Date: Tue Jun 8 18:27:54 2021 -0700 doc/suites: updating explanation of suites commit 5831adb06109adac4fd7d4f76564235917b876f9 Author: Pacman99 Date: Tue Jun 8 18:14:32 2021 -0700 flake: switch to digga master To use the now released v0.2.0 commit 4d1b3a5e132b924ea6f945831ab0ee25407c996b Author: Pacman99 Date: Tue Jun 8 14:07:19 2021 -0700 Merge pull request #311 from almostnobody/patch-1 override module doc: fix #310 commit 9dcc4adeef25658d7db3a30e6eb11a899b92c0c7 Merge: fb41643 d852305 Author: Pacman99 Date: Tue Jun 8 14:07:19 2021 -0700 Merge pull request #311 from almostnobody/patch-1 override module doc: fix #310 commit d852305c4c05d7769a72ce7d6207a3d072c4d388 Author: almostnobody <1583339+almostnobody@users.noreply.github.com> Date: Tue Jun 8 22:24:24 2021 +0300 Update doc/concepts/overrides.md Co-authored-by: Pacman99 commit c30e8c5ca2c1aa3772b0bb1ac70eabb491fbea9c Author: almostnobody <1583339+almostnobody@users.noreply.github.com> Date: Tue Jun 8 22:10:17 2021 +0300 override module doc: fix #310 commit fb41643ed66c354081e18078103f2c9b3b64bde0 Merge: 30892d8 fe3a624 Author: Pacman99 Date: Sat Jun 5 10:13:06 2021 -0700 Merge pull request #304 from Pacman99/update-docs docs: general updates commit fe3a624930d35a7278001a5d05629959c5a42d4d Author: Pacman99 Date: Thu Jun 3 12:25:06 2021 -0700 docs: general updates commit 30892d83eb9461b1249a7b392eedb21cd2c38e3e Author: Pacman99 Date: Thu Jun 3 22:42:45 2021 -0700 gitignore: add flk command results commit 1a87b83b5d88c37e0fac603ef792a8a12deac95b Merge: 7110767 454b279 Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Thu Jun 3 07:45:26 2021 +0000 Merge #302 302: customBuilds: add digitalOcean r=Pacman99 a=jwygoda https://github.com/divnix/digga/pull/42 Co-authored-by: Jarosław Wygoda commit 454b27937f2d3c07457dfdaf37474f4e037c1cb6 Author: Jarosław Wygoda Date: Thu Jun 3 08:48:25 2021 +0200 customBuilds: add digitalOcean commit 7110767300ef0ae46001a9be342d168b8c8ec1d3 Merge: 768e3e7 8e250d5 Author: Pacman99 Date: Tue Jun 1 12:40:31 2021 -0700 Merge pull request #300 from Pacman99/update-digga flake: update to new digga api commit 8e250d5084eb62c16a930f4b02a7e42b6952b852 Author: Pacman99 Date: Sat May 29 12:53:33 2021 -0700 flake: add agenix to devShell commit d9082066f7bc5bd6a58ab55418db3d6abf4da3d6 Author: Pacman99 Date: Thu May 27 10:41:55 2021 -0700 flake: update to new digga api commit 768e3e75414602bab35712ec414dd289f5fc0cd3 Merge: da9f14c f88acc1 Author: Pacman99 Date: Thu May 27 11:02:41 2021 -0700 Merge branch 'core' into develop commit 0f72f26a5750502ed505a57090b55dc53b879191 Author: Pacman99 Date: Thu May 27 17:02:40 2021 +0000 Update Changelog for tag commit f88acc1608ee719582fb19db34156d7c5d45a919 Merge: a81930a 20649fb Author: Pacman99 Date: Mon May 24 08:22:52 2021 -0700 Merge pull request #297 from Narice/core Added note about cache in start/index.md docs commit 20649fb3a9861734ff1507144499dff1083f85d1 Author: Narice Date: Mon May 24 10:28:52 2021 +0200 Added note about cache in the start index This resolves #292. commit da9f14cab26caf4d5d0a7eee4c6283f6ee5f23e6 Merge: 2ab4df3 c57925d Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Thu May 20 18:53:20 2021 +0000 Merge #279 279: Agenix integration r=blaggacao a=Pacman99 AFAICT This is mostly a documentation thing. But with divnix/devlib#2 we can now add agenix to the devshell. Co-authored-by: Pacman99 commit a81930af36be9f78484ce16e95409f4f56064f93 Author: David Arnold Date: Wed May 19 20:15:49 2021 -0400 readme: declare it beta and update some other things commit 21cba8024d0c26df0c999b1e92651f4086d372c1 Author: Pacman99 Date: Tue May 18 11:29:56 2021 -0700 flake: update digga input no longer builds all packages from overlays in devShell commit adaf76e1fbd592d933149128f26d61a02f96a2c9 Author: Pacman99 Date: Tue May 18 10:23:43 2021 -0700 doc/hosts: update to new auto-import style commit d1d2a4ca08cd21865eaba04e0901d3e31b6de56f Merge: cf47170 564888d Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Tue May 18 17:12:56 2021 +0000 Merge #291 291: Remove ´profiles/suites.nix` and fix hardware module in hosts documentation r=blaggacao a=ymarkus See #282 As I understand it, this file isn't needed anymore and the hardware module is not defined properly in the documentation. Co-authored-by: Yannick Markus commit 564888d1fef8ff4b664a3be862d43eb2fef13159 Author: Yannick Markus Date: Tue May 18 18:12:36 2021 +0200 remove profiles/suites.nix commit 629a50975fab9e85aefa5c43a13ed55c48555339 Author: Yannick Markus Date: Tue May 18 18:11:29 2021 +0200 hosts doc: fix hardware module in example commit cf47170d6f703906aa546dfee29f2083701a82ef Author: Narice Date: Mon May 17 10:46:02 2021 +0200 Modified wording of iso documentation commit 18d4c78ea5ae926284636d068692c9b23e33caeb Author: Pacman99 Date: Sun May 16 19:35:52 2021 -0700 flake: un-comment defaultTemplate This was accidentally commented. fixes #288 commit 3fa96c7793f838c28f304c8177cb8215711011a2 Merge: 2ab4df3 5151380 Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Sun May 16 23:56:12 2021 +0000 Merge #286 286: default.nix: fix path to compat r=blaggacao a=Pacman99 Looks like it was just a path error. fixes #285 Co-authored-by: Pacman99 commit 5151380d61c30851ffabe29b45213af5ec981e65 Author: Pacman99 Date: Sun May 16 10:22:40 2021 -0700 default.nix: fix path to compat commit 2ab4df3f600faae4c5f3c658c717827602fb0136 Author: Pacman99 Date: Sat May 15 10:31:54 2021 -0700 suites: re-add `rec` to simplify suite definitions commit 00f8b477a60deaeb25855b409cf9dc0daaf0de96 Author: Pacman99 Date: Fri May 14 22:49:39 2021 -0700 bors.toml: don't delete merged branches This caused develop to be deleted. And if most people send PR's from forks of devos, this line doesn't really help much. commit 634cfcb30162b18f194cb2ca90a54a5c937cba3c Author: Pacman99 Date: Fri May 14 21:27:49 2021 -0700 flake: update digga includes fix for flk config generation commit 4df3d8c2e88d760eeeacb3bccf2b10503d793723 Merge: 82b73cf 2f474e3 Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Sat May 15 04:17:49 2021 +0000 Merge #276 276: Update core r=blaggacao a=Pacman99 Core is starting to get pretty stale. All the changes in `develop` are pretty stable and I think we should encourage updating to them. As most future updates can be done through [devlib](https://github.com/divnix/devlib), so once you switch to this version of the template. Updating to new changes will be much simpler (ie #91). Co-authored-by: Pacman99 Co-authored-by: Pacman99 Co-authored-by: David Arnold commit c57925d35aed6f89727e938069914b767b9af92d Author: Pacman99 Date: Thu May 13 10:35:41 2021 -0700 document agenix integration Co-authored-by: David Arnold commit 64b7892f6e362b21182e665a49d3634a26370341 Author: Pacman99 Date: Thu May 13 10:35:23 2021 -0700 Add agenix integration to secrets and flake commit baeb144e571c3235739a4882081e0e38e2405c6a Author: Pacman99 Date: Thu May 13 11:04:15 2021 -0700 profiles/core: enable ssh by default for keys commit 2f474e37f72121679a720445385aea677a7adadc Author: Pacman99 Date: Fri May 14 16:49:12 2021 -0700 flake: update to latest digga api allows overlays to also be used with `imports` and renames importHosts commit 25388a0b55a6f808159d396db02d8d2ea11f2036 Merge: ccc0fc9 dd6c481 Author: Pacman99 Date: Fri May 14 11:05:08 2021 -0700 Merge pull request #280 from Pacman99/digga tree: rename devlib -> digga commit dd6c481791cf38f5feb408253e40490ccd7d7716 Author: Pacman99 Date: Fri May 14 11:01:44 2021 -0700 flake: format ourlib for consistency with digga commit 923ce7feff875706adb1d336fb959fbdb06b3f14 Author: Pacman99 Date: Fri May 14 10:17:53 2021 -0700 tree: rename devlib -> digga commit ccc0fc97fe168e13d8c9cb7374f91e2b326a63d8 Author: Pacman99 Date: Thu May 13 17:03:51 2021 -0700 flake.nix: use `imports` for auto-import of hosts This makes the auto-importing of hosts obvious and explicitly indicates how the options would end up getting merged. commit 7793ab42da34c77d14f58226190c5949de133738 Author: Pacman99 Date: Thu May 13 16:59:52 2021 -0700 flake: update devlib input includes nixos option improvements and importHosts change commit c89dfed81c37bde4ebe5db96f3b8db83f8eea672 Author: Pacman99 Date: Wed May 12 19:18:11 2021 -0700 don't import cachix in suites its already imported in the core profile commit 67f545123c994c96fe0752d7964e621c9178f2b7 Author: Pacman99 Date: Wed May 12 12:31:43 2021 -0700 flake: format and update to devlib api changes commit 3ee831f8529f123c66f94901accedff8ab5428e1 Author: Pacman99 Date: Wed May 12 12:29:00 2021 -0700 flake.nix: explicitly append overlays from path Co-authored-by: David Arnold commit 2b73d3bf53b35256faa30ad7dc3431ecbb78d634 Author: Pacman99 Date: Wed May 12 11:43:27 2021 -0700 customBuilds: add TODO to drop builderArgs commit 858e8546fe799ac42a23bec5701dbb93f23cc6fb Author: Pacman99 Date: Wed May 12 08:17:40 2021 -0700 flake: update devlib input includes ability to customize shell from template commit a081a922a5f1816e1f3bb0d4d0a3851d5961f89c Author: Pacman99 Date: Tue May 11 23:41:34 2021 -0700 flake: update devlib input drop ca experimental features and filterPackages improvements commit 0d7eb1c48840c99c24512833d157168201f2b2e3 Author: Pacman99 Date: Tue May 11 11:44:05 2021 -0700 doc/lib: explain ourlib usage commit 8a590c9fefa893dd738bc3161052ac9ea5c72c80 Author: Pacman99 Date: Tue May 11 11:40:37 2021 -0700 core: use self for nixos-option compat path commit 725e459655d6695a7a2d998e9e8ad13a13a98a74 Author: Pacman99 Date: Mon May 10 12:22:16 2021 -0700 doc/start: fix grammar Co-authored-by: David Arnold commit 8f20bb069a082fb9ec7c6c1c64768b3db8e28df7 Author: Pacman99 Date: Mon May 10 12:19:31 2021 -0700 doc/extern: elaborate external modules filtering Co-authored-by: David Arnold commit 6e906e87bc07b593ea66066a807b744f54035e77 Author: Pacman99 Date: Mon May 10 12:17:41 2021 -0700 doc/extern: improve overlay filtering explanation Co-authored-by: David Arnold commit 4b4f9dc45c562473e58d3c81e098064e3da73920 Merge: 226dd9b 82b73cf Author: Pacman99 Date: Thu May 6 13:55:02 2021 -0700 Merge branch 'core' into develop commit 226dd9be1ae4592d5dc375ea24d14127939f1ce5 Merge: b8f7cdb f4cd791 Author: Pacman99 Date: Wed May 5 15:19:33 2021 -0700 Merge pull request #273 from Pacman99/devlib Switch to out of tree devlib commit f4cd79194afdb9f965d9cc5521705d920e1e62f8 Author: Pacman99 Date: Tue May 4 21:49:16 2021 -0700 add in-tree local lib, ourlib commit 8dabd0f56919eea94d8c034805bb562e97da0021 Author: Pacman99 Date: Tue May 4 21:48:49 2021 -0700 switch to devlib repo and remove in-tree lib commit b8f7cdbe638699b95278e8bec56add4e63777e74 Author: Pacman99 Date: Sun May 2 10:35:29 2021 -0700 improve home-manager and deploy-rs integration move both to be setup in template only set home-manager options if they exist commit 7bf605d08c0cb6a0534b39823ac30a5a7b0976c5 Author: Pacman99 Date: Sun May 2 21:05:21 2021 -0700 lib/modules: pull devlib module arg from pkgs So any overlays affecting devlib also affect the module argument commit deb47dbfae5f7ca93a7f7c0a08cddf6e352060a1 Author: Pacman99 Date: Sun May 2 11:15:44 2021 -0700 move otherArguments to right side of merge for overlay list ordering, otherArguments should have priority commit 30412b16b9d96b2a3f880578620dac9f7c41150c Merge: 378107f 197d792 Author: Pacman99 Date: Sun May 2 10:15:40 2021 -0700 Merge pull request #271 from Pacman99/lib-rearrange Rearrange and cleanup lib commit 197d7929464757dbfcbbacbc1aef0586e9e20add Author: Pacman99 Date: Sat May 1 17:49:04 2021 -0700 update to new lib format commit 496348b8afa4fea898d5c21147d56b9314c11a25 Author: Pacman99 Date: Sun May 2 01:12:29 2021 -0700 lib: update namespaces and cleanup exports commit e837aaa8755d45028ba48b12bbac3231e86bf39b Author: Pacman99 Date: Sat May 1 17:47:43 2021 -0700 lib: remove devos section commit c93e9fda0fada3e4a48f416d1f38c5a57852e492 Author: Pacman99 Date: Sat May 1 17:46:54 2021 -0700 lib: init importers section commit e97e916521b2bbd3605350fe1a1e50dbbc8902b5 Author: Pacman99 Date: Sat May 1 17:46:30 2021 -0700 lib: init generators section commit 378107fd034e802850a58e786bd107156fe16873 Merge: e1f1872 e98e595 Author: Pacman99 Date: Sat May 1 17:44:44 2021 -0700 Merge pull request #266 from Pacman99/extract-builds pass builderArgs to config and extract builds commit e98e595704f2635f2b0fc9ffc999ae603ddaad24 Author: Pacman99 Date: Wed Apr 28 11:30:04 2021 -0700 pass builderArgs to config and extract builds have mkHomeConfiguration create its own custom build within the function create a externalModule for customBuilds so its easy to add more commit e1f18728e2202a580105d1e1d96dd2c73f142885 Merge: a5dcb5f 23ee58d Author: Pacman99 Date: Thu Apr 29 15:24:55 2021 -0700 Merge pull request #268 from Pacman99/dontexport use __dontExport property for lib and overrides commit 23ee58d2d0a26124ec16f54653e58f485c167e01 Author: Pacman99 Date: Thu Apr 29 11:53:45 2021 -0700 use __dontExport property for lib and overrides commit a5dcb5fae9d6afbc75488b4c5136aa599868574b Author: Pacman99 Date: Tue Apr 27 18:41:51 2021 -0700 fix flake by removing flake-compat follows commit 62c9b126d38c9699dc132af4fa22361ba5f05d52 Merge: c0d6453 5bc88ad Author: Pacman99 Date: Tue Apr 27 16:55:13 2021 -0700 Merge pull request #264 from divnix/api-next Implement new api and rebase on flake-utils-plus commit 5bc88ad2c21d1872ccb15eddb7da6945824ceccc Author: Pacman99 Date: Tue Apr 27 16:36:07 2021 -0700 don't use lockfile to get flake-compat lock file format isn't very reliable with naming inputs commit bb9bc02478a197b28faaac35fa97e9d21fabb16a Author: Pacman99 Date: Tue Apr 27 12:52:16 2021 -0700 fix channels.*.input defaultText formatting commit aa825b87a6a16a8a663e14f52155bc924d28bad1 Author: Pacman99 Date: Tue Apr 27 10:26:45 2021 -0700 auto import hosts in flake.nix this allows host-specific settings to be overriden with mkMerge commit df39cb692e7df07a8b7f6531303620888eadeca3 Author: Pacman99 Date: Tue Apr 27 09:52:56 2021 -0700 rebuild and update mkFlakeOptions.md commit a7cd35e433c566c5961db1a0b35a775b0dd3d73f Author: Pacman99 Date: Tue Apr 27 09:47:31 2021 -0700 update lib subflake lock commit d5276195f77d1a821454a267bd8b774a8cf896b3 Author: Pacman99 Date: Tue Apr 27 09:38:20 2021 -0700 move overrides.nix to overlays also update overrides docs it is a pure devos overlay now, it makes sense to go in overlays commit e67b49c2804902b7b4a3c3e74a59aa1667663f1e Author: Pacman99 Date: Tue Apr 27 09:35:44 2021 -0700 auto-flatten coercedListOf and type fixes commit f57840d723785bc22ad93f0ba17725a620ee9481 Author: Pacman99 Date: Tue Apr 27 09:32:12 2021 -0700 mkFlake/default.nix: formatting commit 7f3116c1ccb2aa4f6375fa4b45c9863a62656d4f Author: Pacman99 Date: Tue Apr 27 09:30:28 2021 -0700 safeReadDir: conver path to string for reliability commit 466304c8cd6d45a62b0e0c82638ce13fc9badaa7 Author: Pacman99 Date: Tue Apr 27 08:01:46 2021 -0700 improve passing host and channel arguments to fup we need to filter out arguments that are added in the devos api also anything thats null in either hostDefaults and hosts has to be removed commit 064ba88cdf6ce391cdbe3e4df72363276dbb5ebd Author: Pacman99 Date: Mon Apr 26 21:38:27 2021 -0700 improve, build, and add mkFlake options doc commit c41d3eed0662956c4ad3afd958ebea0be29fcd89 Author: Pacman99 Date: Mon Apr 26 21:32:57 2021 -0700 drop debugging related mkFlakeConfig output was only meant for debugging, not meant to be commited commit 278ae0e108633b70214d1176ed38883910f46e68 Author: Pacman99 Date: Mon Apr 26 21:32:26 2021 -0700 set _module.check in evalArgs instead of mkFlake this makes more sense since evalArgs is the module and it makes the code cleaner commit e9675330a7b3717cf6abf090a34b5bf1ac23201a Author: Pacman99 Date: Mon Apr 26 19:34:18 2021 -0700 add cachix to base suite to follow the new api commit b6c00e74e7c6e574ee72d40141a36adff2ebeccc Author: Pacman99 Date: Mon Apr 26 19:33:31 2021 -0700 set add self and hosts module arguments commit a6344faa9afd17efb8b2069c2332ac302d98944e Author: Pacman99 Date: Mon Apr 26 19:30:55 2021 -0700 update fup to fix infinite recursion error commit ffe4836e35e8b4a1ef2d99292c1ea4a3df6ad821 Author: Pacman99 Date: Mon Apr 26 18:29:05 2021 -0700 update doc to match new template format and logic commit 2a7d9e71096746cd19b56cdbf61ba1c910fb6013 Author: Pacman99 Date: Mon Apr 26 13:30:10 2021 -0700 fix suites test to match new mkSuites commit b766c693abd5530c1dc4fd16cd229addca7c3219 Author: Pacman99 Date: Mon Apr 26 13:21:40 2021 -0700 add pkgs overlay, pkgs.overlay is just for srcs commit 37820fc2148051117feaa684fb52238cde71d25f Author: Pacman99 Date: Mon Apr 26 12:29:18 2021 -0700 explain overlay exporting inputs workaround commit 9f31d5d6d1e5c204fcf5ce938a8ae95528dddf4f Author: Pacman99 Date: Mon Apr 26 12:20:16 2021 -0700 mkFlake: use inputs argument not self.inputs commit c3d8805ad607935f033c737391978100d772bca0 Author: David Arnold Date: Wed Apr 21 22:44:15 2021 -0500 update devos template to use new api commit dceac02b36f418bc91f09760b3861dbee1c03848 Author: Pacman99 Date: Sun Apr 25 16:50:01 2021 -0700 implement mkFlake for new api and rebase on fup commit f8315a293c4585f89aef4f5815f94ceac7f28fd9 Author: Pacman99 Date: Sun Apr 25 16:52:02 2021 -0700 evalArgs: general api improvements drop default channel, it is confusing and complicates api don't take nixos input, using channels is better manually pass names for outputs to improve documentation commit 3bb26330b457c32aee5249c8c114517466044a5b Author: Pacman99 Date: Sun Apr 25 16:46:59 2021 -0700 switch to flake-utils-plus staging for rebase commit 377381de51b4dcbf5aea1ee7f80abd12abd63d47 Author: Pacman99 Date: Mon Apr 26 11:34:24 2021 -0700 export pathsIn in lib and update devos input commit ceef51425e222c85eab4c4053426f08ba880ebe3 Author: Pacman99 Date: Sun Apr 25 16:46:02 2021 -0700 init unifyOverlays: to pass channels to overlays Only to those with three arguments commit 3986cc441b86cb7873c99eb2252df4b080976f76 Author: Pacman99 Date: Sun Apr 25 16:36:48 2021 -0700 pkgs-lib: don't system space functions have each function take pkgs as an argument, so a nixpkgs isn't created just for pkgs-lib and they support more systems commit ba01aa7db7419a3e301f5f9251eff358d88c7e17 Author: Pacman99 Date: Mon Apr 26 10:52:26 2021 -0700 mkSuites: generalize for one profile/suite pair commit 59383e871f882cb1a72c64392bdb48220db1367c Author: Pacman99 Date: Sun Apr 25 16:22:33 2021 -0700 modules: drop any logic already done by fup this includes creating multiPkgs, and dropping options already set by fup commit abd133c244e9c9f9be8a66bd4a2e1a98e4090270 Author: Pacman99 Date: Sun Apr 25 16:21:40 2021 -0700 make devosSystem construct a proper nixos builder Get `self` and `inputs` during construction, and rely on specialArgs.channel for nixos flake commit c0d6453b088fd220faa33048f8423fa486537d6b Merge: 60bfb24 2cab5b5 Author: Pacman99 Date: Mon Apr 26 09:58:57 2021 -0700 Merge pull request #265 from Pacman99/collect-profiles collect profiles recursively with lib function commit 2cab5b5d2b30fba6431a4a2b82f0e83afac19589 Author: Pacman99 Date: Sun Apr 25 20:53:16 2021 -0700 add and use lib.collectProfiles this function collects profiles recursively commit 60bfb24af164818435af6b074ec5494509edf1b4 Merge: e6f548e 58c7d04 Author: Pacman99 Date: Sat Apr 24 14:48:00 2021 -0700 Merge pull request #263 from Pacman99/devos-modules create lib.modules to store all devos modules commit 82b73cf63a85b7200a6a364b07f782fda5ae0851 Merge: 7a825bb 832d3bd Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Sat Apr 24 21:45:12 2021 +0000 Merge #261 261: profilesTest/mkHosts: include host's configuration r=blaggacao a=Pacman99 Now that profiles test is done dynamically - first available host - we likely need to include the host configuration itself. I have profiles that depend on the domain being set, which how I ran into this, and I think other problems might occur if we don't include the full host in the profiles test. targeting core, since its a small bug fix and was planned to make into a release. Co-authored-by: Pacman99 commit 58c7d0403649c5f5362c1ea717fe40758a065f0d Author: Pacman99 Date: Sat Apr 24 09:10:10 2021 -0700 extract iso/hm config modules to lib.modules commit 4e28ec2d8ef8125d8b2d99e0c81c3fa4efde2d62 Author: Pacman99 Date: Fri Apr 23 23:51:51 2021 -0700 devosSystem: fix iso build - can't remove core commit 2d9ea0d27edebd81fb599d87167548e5365e9b69 Author: Pacman99 Date: Sat Apr 24 08:56:51 2021 -0700 lib: init modules and move mkHosts modules there This helps to split up the code in mkHosts and creates a place where we can store modules relevent to devos. It will also be easier to remove unecessary parts of each module in the future when they are all compartmentalized. commit 7a825bbeb62261954bf44d7ac5a8f2870e77d8c4 Author: Timothy DeHerrera Date: Thu Apr 22 00:32:00 2021 -0600 ci: update bors.toml for new pipeline commit b03fd1496d118d3413e876021de86725ea5cac5b Author: Timothy DeHerrera Date: Wed Apr 21 23:40:44 2021 -0600 pkgs: fix flake hash commit ae357cb098ea2753f3ac6e4a412920762a36a292 Author: Timothy DeHerrera Date: Wed Apr 21 23:39:03 2021 -0600 Check & Upload to Cache with GitHub Action commit e6f548e723ce1e3267b356179d8317ed757dd4f6 Merge: f702ca1 a53aa8b Author: Pacman99 Date: Sat Apr 24 13:10:33 2021 -0700 Merge pull request #262 from Pacman99/simplify-mkflakedoc move mkFlakeDoc to packages output also drop jobs commit a53aa8b7eb04f87c8dda74cf82282f73230d4c06 Author: Pacman99 Date: Sat Apr 24 08:37:23 2021 -0700 lib: drop jobs output, prefer checks and packages With mkFlakeDoc in packages there is no need for jobs. And I think anything that could go in jobs really should go in checks or packages. If something needs to be tested - checks, if something needs to be built - packages. jobs is not multi-arch and is redundant to build/test things with when official flake outputs exist commit 1cd4ed136a76f8c5342168ff86e8af93f7eb5e45 Author: Pacman99 Date: Sat Apr 24 08:14:58 2021 -0700 mkFlakeDoc: move to packages output the packages output allows us to do `nix build .#nixosOptionsDoc`. theres also already an instantiated nixpkgs available there. commit 832d3bd69782015a0f4b6001e050d18d5f8ea9c8 Author: Pacman99 Date: Sat Apr 24 00:08:49 2021 -0700 profilesTest/mkHosts: include host's configuration commit 12b41f24480ff46a2291a2bf1f393a13f19a6cd1 Author: Pacman99 Date: Fri Apr 23 23:51:51 2021 -0700 devosSystem: fix iso build - can't remove core commit f702ca1337af3ea67c56718ba1554a16d91fd5eb Merge: fe9ba26 eab0bf0 Author: Pacman99 Date: Fri Apr 23 23:47:43 2021 -0700 Merge pull request #260 from Pacman99/format-fixes lib: one line for arguments, drop userFlake* commit eab0bf074c221a5dcd810aa587dfac5b17d01ae5 Author: Pacman99 Date: Fri Apr 23 18:13:03 2021 -0700 lib: one line for arguments, drop userFlake* Also format all files and add a flake.lock for lib for a folder thats meant to work on other flakes theres never a reason it should need to refer to itself, only other flakes. So "self" and "inputs" are better namings for these variables. The userFlake* is redundant and confusing, when trying to call the functions its hard to figure out how to use them when there are now two lines of arguments to figure out. commit fe9ba26561d42f97bbc77d257cdd2823e98b4b2b Author: Pacman99 Date: Fri Apr 23 17:59:01 2021 -0700 evalArgs: cleanup module and type references fix pathTo and coercedList types add modulesModule to also include modules option under home commit 1240356b37889ade5a6c8c0096257602bbdfb530 Author: Raphael Borun Das Gupta Date: Fri Apr 23 01:10:02 2021 +0200 doc: fix grammar: "your" -> "you're" where it's meant to be a contraction of "you are" rather than a possessive pronoun commit 3322bf5fe607128d7aaf04e7a0255942a314214c Merge: 8fdd668 eea4e40 Author: Pacman99 Date: Wed Apr 21 19:50:17 2021 -0700 Merge pull request #256 from blaggacao/da/renamings ref: config -> hosts | nixos -> os commit eea4e40d7e0d996bc2d0091fd4be3bedef22cf32 Author: David Arnold Date: Wed Apr 21 21:44:08 2021 -0500 ref: config -> hosts | nixos -> os in devos, we differentiate clearly between home and os configuration, reason for which we are more precise by not naming after the (more generic) fup API. commit 8fdd66859c4534d2a4d1dab5979338ec40fde84e Merge: a44fcf6 f3defb4 Author: Pacman99 Date: Wed Apr 21 18:40:13 2021 -0700 Merge pull request #255 from Pacman99/type-improvements used coercedTo for typing and improve options commit f3defb486d1e79c62e5188da297743d12e8500da Author: Pacman99 Date: Mon Apr 12 08:42:22 2021 -0700 used coercedTo for typing and improve options allow lists, nested lists, and non-lists for list like options drop config..externalModules commit a44fcf6d9dc7428840ce8baebfa4fe6a23e46836 Merge: 03e2843 24dbb2b Author: David Arnold Date: Wed Apr 21 19:02:51 2021 -0500 Merge pull request #251 from divnix/api-next Intermediate version of api-next commit 24dbb2b3231b5a9f4a9aae57ef90436d59db300b Author: Pacman99 Date: Sun Apr 11 22:27:59 2021 -0700 add mkFlakeDoc to pkgs-lib to build options doc commit 239386b5f8ad426e186825c8a13c5d5704b58bf8 Merge: a714cf4 03e2843 Author: David Arnold Date: Mon Apr 19 00:02:29 2021 -0500 Merge branch 'core' into api-next commit a714cf466dc6e104fedd616e51bb111e4327766b Author: David Arnold Date: Sun Apr 18 23:48:19 2021 -0500 fix: various left-overs commit 03e28433ce90f84ef0f848f92516ffd5171dde21 Author: Timothy DeHerrera Date: Sun Apr 18 21:42:54 2021 -0600 README.md: fix guide link commit 8134350545305cc970069ea92fe9dbadbc346840 Author: David Arnold Date: Sun Apr 18 22:40:53 2021 -0500 ref: simplify pkgs-lib deps injection commit c67877c2ebd9b511fe9e031eb6f1821d2b2be85e Author: nrdxp Date: Mon Apr 19 03:36:39 2021 +0000 Update Changelog for tag commit 9eeddb8dacff9a5f6f4ec2645247160c074aaca3 Merge: 658cd2b 50eaa4d Author: Timothy DeHerrera Date: Sun Apr 18 21:32:53 2021 -0600 Merge pull request #235 from divnix/release-0.9.0 Prepare 0.9.0 release commit 362cc31827d32d9d187808d4f8b66a12d683f6fd Author: David Arnold Date: Sun Apr 18 22:29:28 2021 -0500 fix: constructors of mkFlake function family commit 50eaa4d0bab31c26355726c838971611541b6e8d Author: Timothy DeHerrera Date: Sun Apr 18 21:25:21 2021 -0600 remove community action The community branch will likely go away soon. This is no longer required. commit dba178dc1fd8d6a4990e7bffaea867a7a774adb4 Author: Timothy DeHerrera Date: Sun Apr 18 21:20:36 2021 -0600 build docs new location commit 6f0392b55e12b86695995e1744221bc27a382998 Author: David Arnold Date: Sun Apr 18 22:00:49 2021 -0500 ref: cave out instances of userFLake dependencies and intject them as if functions where contructors commit 40acfd13e319bc51a5109dbadc73d2478897da5f Author: David Arnold Date: Sun Apr 18 21:45:08 2021 -0500 use: makeExtensible commit be924bcb27432d1e3293a12be5675f849bfe3afc Author: David Arnold Date: Sat Apr 17 21:29:45 2021 -0500 ref: reduce exposure to callLibs for clarity's sake, expose which function uses final and prev, so that people can have a clearer understanding how they relate to each other in terms of dependencies. also a simple `{ lib = final; }` probably does not warrant a complete callLibs obscurization. commit e1e0f99af949b8833ea04f9f04b965e33d2a7126 Author: Timothy DeHerrera Date: Sun Apr 18 21:13:12 2021 -0600 suites: move to `profles/suites.nix` commit e13a65b33c761a1686de71625b5f1dece52190a7 Author: Timothy DeHerrera Date: Sun Apr 18 21:06:47 2021 -0600 overrides: move to extern commit f2543047969d2bbac5669325c459638661518525 Author: Timothy DeHerrera Date: Sun Apr 18 21:00:45 2021 -0600 mv `nix/ci.nix` directly to `default.nix` commit 127cb25bd1787da6c638860f8deb8a77b694502d Author: Timothy DeHerrera Date: Sun Apr 18 20:51:47 2021 -0600 lib: move compat to lib commit fbce126f4d72c40c6a00948fe05d42ccba7233e2 Author: Timothy DeHerrera Date: Sun Apr 18 20:43:37 2021 -0600 cachix: move out of root and into profile commit 2d91946745eed8994e6bd4cb7c648ed431b818a0 Author: Timothy DeHerrera Date: Sun Apr 18 20:26:27 2021 -0600 doc: move all docs under `doc` commit 048171ecafb0c572a83039b4433a2613c5d8a3e1 Author: Timothy DeHerrera Date: Fri Apr 9 19:42:33 2021 -0600 lib: improve `profileMap` for added convenience Simplify the definition of suites a bit by removing the need for list concatenation. commit 9dca402914d6cd20791836d0da559adb03466aa5 Author: David Arnold Date: Sat Apr 17 20:56:24 2021 -0500 ref: make onion with flake-utils commit 6cccb5526378452afeafd7fca5e66dee41a44b46 Author: David Arnold Date: Sun Apr 18 19:35:11 2021 -0500 ref: userSelf -> userFlakeSelf commit cd7fb4f54c81e19c93e7cc067b2022d6216bf0fc Author: David Arnold Date: Sat Apr 17 20:46:20 2021 -0500 ref: flatten out inputs commit 16b3fad559b6f44eda5068eb369d1dd83827de7f Author: David Arnold Date: Sat Apr 17 20:35:05 2021 -0500 ref: merge dev into lib commit fb6c6ba4cf693df6f87921d418a2e8d176d45a4b Author: David Arnold Date: Sun Apr 18 19:15:53 2021 -0500 fix: update devos in flake.lock commit c24199649a3f58a6203f823d555143394a8cd134 Author: David Arnold Date: Sun Apr 18 18:30:07 2021 -0500 fixup: distinguish self and userSelf commit 19c900e2933999f27fbe5a2015745a02adb3a6e6 Author: David Arnold Date: Sun Apr 18 17:45:51 2021 -0500 workarround for unkown problem commit 6116779b23e5e5e189175fd29b220f13525fbdb0 Author: David Arnold Date: Sun Apr 18 17:40:57 2021 -0500 fixup: nix flake check II / II commit 21a03fa94c9a3bb63f1be88857c80e5900c18cf4 Author: David Arnold Date: Sun Apr 18 17:23:27 2021 -0500 fixup: nix flake check I / X commit 5f89d274284e05a0cf35f8b58cae537756375567 Author: David Arnold Date: Thu Apr 1 21:10:24 2021 -0500 ref: extract lib into subflake commit 863c17621c33f8d86aaf949c608155e7fc00e0f6 Author: David Arnold Date: Sat Apr 17 19:30:55 2021 -0500 libtests: outfactor in preparation of lib/flake.nix commit 0db2bb041e8cfecbbec08010d150539f4e11963e Author: Pacman99 Date: Tue Apr 13 11:24:10 2021 -0700 add old evalArgs as evalOldArgs, so flake works commit 2b70cd3ae607d8c5d05b4266530be6011e94371b Author: Pacman99 Date: Sun Apr 11 22:25:37 2021 -0700 fix some small bugs in mkFlake/evalArgs commit 8d0c036b6b7dec31ab9c01fb6e87a5d71ea30fa0 Merge: 658cd2b b7bcaea Author: Pacman99 Date: Sun Apr 11 20:10:52 2021 -0700 Merge pull request #239 from Pacman99/evalargs-next Update evalArgs to match the new planned API commit b7bcaea497ed24c0e26266f3d1b1cdf32d1c8bd1 Author: Pacman99 Date: Sun Apr 11 20:01:13 2021 -0700 Update evalArgs to match the new planned api commit 658cd2bb082b259ef27cfdb910d4bc1f5193fcf1 Author: Pacman99 Date: Sun Apr 11 10:24:00 2021 -0700 pkgs-lib/shell: update to new homeConfigurations flk should switch to use home-manager --flake whenever the updated package is made available in the hm flake or nixpkgs commit 401566af34ab9891335366db49bd12482bbf125c Author: Pacman99 Date: Sat Apr 10 22:13:54 2021 -0700 lib/pkgs-lib: update checks for new hm format commit 8ba7bffc3f0960fddd864a9c1760b8b439d55d57 Author: Pacman99 Date: Sat Apr 10 22:04:49 2021 -0700 export users home for home-manager --flake home-manager --flake needs the activationPackage in the root of the homeConfiguration commit d5175f6ccaedfc4b7cd4b240b80338bf0f5793b2 Merge: 1f25b0b ac4c267 Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Sat Apr 10 21:01:33 2021 +0000 Merge #236 236: init pkgs-lib and add tests and shell r=nrdxp a=Pacman99 Towards the goal of removing top level folders and putting more things in lib. This shifts shell and tests to lib under the `pkgs-lib` namespace. This namespace is separated by architecture, because those lib functions rely on nixpkgs architecture specific derivations. I think this is the cleanest way to do it, you don't have to instantiate pkgs-lib for each arch, and it exposes some of these functions for others to use. This PR also fixes multi-arch checks. Co-authored-by: Pacman99 commit 1f25b0b061d9b82b3251df1529cc11fd4ded0d23 Merge: be4b612 2c3f17a Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Sat Apr 10 20:44:48 2021 +0000 Merge #227 227: Fix documentation mistake after project rename r=nrdxp a=lycheese After the project rename the cachix documentation in `cachix/README.md` contains instructions that do not work (`cachix use divnix`). Tested that `cachix use nrdxp` works and should have the intended effect. Co-authored-by: lycheese <4779944-lycheese@users.noreply.gitlab.com> commit ac4c26755b1bb74f3d6b7ec6fa6070e7e725763e Author: Pacman99 Date: Sat Apr 10 10:59:10 2021 -0700 init pkgs-lib, move tests and shell there commit be4b612b23817abb6c99e92ad80cf77be4f7a582 Author: Timothy DeHerrera Date: Fri Apr 9 19:22:08 2021 -0600 treewide: format with nixpkgs-fmt commit 3daa99072841d590aa8bdeef7f1d8d0087bd0f44 Author: Pacman99 Date: Fri Apr 9 10:03:42 2021 -0700 fix userSpecialArgs defaults (#234) Co-authored-by: Pacman99 commit 1838e9fe2f95ebef1a60bdec60f43f9a92a67da8 Merge: 18dbc7d ab2919d Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Fri Apr 9 03:33:30 2021 +0000 Merge #233 233: core: add usbutils r=nrdxp a=blaggacao Looks like core does not include `lsusb` by default, now it does. Co-authored-by: David Arnold commit 18dbc7d0e456ec1dc4b920ae188c5180231e7bb7 Author: Timothy DeHerrera Date: Thu Apr 8 21:18:08 2021 -0600 Revert "drop toString in evalArgs - trying to fix CI" This reverts commit a2530339310bf2ae6a58deda15c66889b292a1df. commit eaff91c0f99d2ecd7904f31265f1a21d5b0b2024 Author: Timothy DeHerrera Date: Thu Apr 8 21:17:24 2021 -0600 Revert "drop toString in pathsIn - trying to fix CI issues" This reverts commit 930b3e96b4f330d1380011e7363c9373b2f5ca64. commit ab2919df217d2c0230f1f41f8d1812425575d9d7 Author: David Arnold Date: Thu Apr 8 22:03:38 2021 -0500 core: add usbutils Looks like core does not include `lsusb` by default, now it does. commit 3823eb6423e30a2d2a9e694f8a6fc332e39cf529 Merge: 306e7c1 a253033 Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Fri Apr 9 02:58:30 2021 +0000 Merge #231 231: Move flake implementation logic to lib r=nrdxp a=Pacman99 This is a simpler version of #218 that moves flake logic to lib and adds a module to evaluate devos. This DOES NOT support out of tree usage, so if you were following any of the previous PR's, the doc sections/examples to use devos as a library will not work. There is work to make a cleaner api and only then will out of tree support work. Until then, this is still useful to simplify devos and clean up a lot of the implementation logic. Co-authored-by: Pacman99 commit 306e7c1967016855d4dc0c2fd9241e19d87a2ff5 Merge: 01b0555 115f1e6 Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Wed Apr 7 02:04:27 2021 +0000 Merge #229 229: make core an unecessary profile and add to suites r=nrdxp a=Pacman99 Prevents mkHosts subverting standard devos api to import core and add all necessary core features to mkHosts, so core can be safely deleted in suites Co-authored-by: Pacman99 commit 115f1e6711e3fac5041974b3dbe6df2aa22f78db Author: Pacman99 Date: Sat Apr 3 08:09:36 2021 -0700 make core an unecessary profile and add to suites Prevents mkHosts subverting standard devos api to import core and add all necessary core features to mkHosts, so core can be safely deleted in suites commit a2530339310bf2ae6a58deda15c66889b292a1df Author: Pacman99 Date: Tue Apr 6 17:33:05 2021 -0700 drop toString in evalArgs - trying to fix CI commit 930b3e96b4f330d1380011e7363c9373b2f5ca64 Author: Pacman99 Date: Tue Apr 6 17:02:30 2021 -0700 drop toString in pathsIn - trying to fix CI issues commit d068d79bfd2a37d8ea015b19558a2cc0cddcea37 Author: Pacman99 Date: Fri Mar 26 11:59:10 2021 -0700 flake: use mkFlake this is where we create devos's template structure commit 340784df6ddaaeb40095f18de8107b92fa25fa30 Author: Pacman99 Date: Fri Mar 26 11:57:24 2021 -0700 lib: init evalFlakeArgs for mkFlake args module describing devos flake arguments commit a76ca177fdba72b9621568eafc6411bcc0e5bb32 Author: Pacman99 Date: Tue Mar 30 11:10:58 2021 -0700 lib: init mkFlake to create a devos flake general lib function - not devos specific commit 2c3f17a458aebb98be4198bf6d75e0f3f42d27a8 Author: lycheese <4779944-lycheese@users.noreply.gitlab.com> Date: Sat Apr 3 16:25:28 2021 +0200 Fix documentation mistake after project rename commit 01b05551175ba103ea8e2c7682916003ded73f8d Merge: f14dcda 3d1501c Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Thu Apr 1 20:08:55 2021 +0000 Merge #225 225: lib: only readDir if path exists with safeReadDir r=nrdxp a=Pacman99 After doing this for the second time, I realized it might be good to make a lib function for it and do it across lib. Create a function called `safeReadDir` that only uses `builtins.readDir` if the path exists. With `optionalAttrs` any function that relies on the output won't fail since they still get an empty attrset. Then replace all uses of `readDir` with the safe version. Co-authored-by: Pacman99 commit 3d1501c384528310ce3c07f04b24ad3ffe451a9f Author: Pacman99 Date: Tue Mar 30 12:47:54 2021 -0700 lib: only readDir if path exists with safeReadDir commit f14dcdaf788279368c43c0d055e83699a134aeb2 Merge: ed17d9e b3aa387 Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Mon Mar 29 17:22:20 2021 +0000 Merge #224 224: Allow for directories in module-list r=nrdxp a=Pacman99 fixes #221 building on #222 this PR improves the lib functions pathsToImportedAttrs and pathsIn. First to add support for directories. This does not support actually passing a file in a directory, so `./matrix/default.nix` won't work but `./matrix` will - I should probably document this somewhere. Also I moved the filtering for nix files to `pathsIn`, since its only necessary for auto-import. We can assume that users would pass proper files in `module-list.nix`. Co-authored-by: Pacman99 commit ed17d9e99f4149ce078025b43daa820421a9df31 Merge: ef1ee6e 7650526 Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Mon Mar 29 17:19:51 2021 +0000 Merge #216 216: Move host and suite implementation logic to lib r=nrdxp a=Pacman99 This is just the `mkSuites` and `mkHosts` part of the `mkDevos` PR. I would like to avoid changing mkSuites and mkHosts api, to make it easier to rebase changes into the mkDevos branch. But if necessary we can change them. And to that end, there is some more logic added to the flake.nix now which would ideally not be there if devos was meant to be a template. But since the goal is to move towards a lib function with template, this is just a step in that direction. Co-authored-by: Pacman99 commit 7650526407a2fe5f8ee326c090d74c3047b728fd Author: Pacman99 Date: Mon Mar 29 09:54:02 2021 -0700 isoConfig: fix disabling profiles convert each to a list which doesn't get appended to modulesPath commit 259ec11d92633b417602c89082de49af77da260f Author: Pacman99 Date: Sun Mar 28 15:05:47 2021 -0700 tests: init testSuites to test suites and profile processing commit 92700888b7a0089fb21a2d2c5cfe5a3f18f01f48 Author: Pacman99 Date: Fri Mar 26 08:38:42 2021 -0700 flake: update to use mkSuites and mkHosts commit ec7eff63eb859325750297a8d525fe5883f51bda Author: Pacman99 Date: Sat Mar 20 09:37:03 2021 -0700 move hosts implementation logic to lib as mkHosts commit 7ebd6b57301deb391565e22060292af2600244b5 Author: Pacman99 Date: Sat Mar 20 09:36:14 2021 -0700 move suites implementation logic to lib as mkSuites commit 8ab865a85390a7746c0d759d63a0f60e3f87ac61 Author: Pacman99 Date: Tue Mar 23 12:05:30 2021 -0700 lib/mkProfileAttrs: don't change to path store paths can't be appended to a path commit b3aa38702b00c698e81df8e041dd5c26d6f71757 Author: Pacman99 Date: Sat Mar 27 23:18:27 2021 -0700 lib/pathsToImportedAttrs: allow directories check if directory has a default.nix and use directory name as key Co-authored-by: Timothy DeHerrera commit ef1ee6e6b8778b1b4f371712b579d115ee415045 Merge: b3e8e2c e10fd4b Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Sat Mar 27 17:31:26 2021 +0000 Merge #217 217: lib/mkPkgs: don't import external files and get inputs as argument r=nrdxp a=Pacman99 Changes mkPkgs to take extern, overrides, and pkgs as an argument. This improves their ability to be used as lib functions. Co-authored-by: Pacman99 commit e10fd4b3193a240b1d84cc4cf1e0d55007343c21 Author: Pacman99 Date: Sat Mar 27 09:21:27 2021 -0700 shell: get extern and overrides to pass to mkpkgs commit 562f476fb54ab748ff6b1ed05b0f97870e72563c Author: Pacman99 Date: Fri Mar 26 09:54:37 2021 -0700 lib/mkPkgs: fix function arguments take extern and overrides as arguments as to not import external files get inputs as a function dependency from callLib commit b3e8e2c4d39b325084f9f4227ac7de03235c406c Author: Timothy DeHerrera Date: Sat Mar 27 09:16:37 2021 -0600 README.md: update NixOS badge commit 1cbbb78aba5a78f36d444bc1d8c7ca86418837e7 Author: Timothy DeHerrera Date: Fri Mar 26 18:29:48 2021 -0600 ci: don't build `legacyPackages` `legacyPackages` are not filtered by system and so will contain invalid derivations. If something in legacyPackages should be explicitly built add it to the `checks` output. commit 82fe56d5fa19f42fda726fc2b5dbf830a6285c4e Author: Timothy DeHerrera Date: Fri Mar 26 18:18:16 2021 -0600 tests: remove nixpkgs patch Should have been removed in 436fbb08e8c70dec921953ba15c340680a314a62 commit 5a3bae7be5719b954782a8567619e1d120594dba Merge: 3c772df 58814fe Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Sat Mar 27 00:10:58 2021 +0000 Merge #220 220: Drop flattenTreeSystem and use custom function for filtering packages r=nrdxp a=Pacman99 I don't think we should flatten the system because if a user doesn't make a package a derivation in pkgs/default.nix we should trust that there is a reason for doing so. So instead this drops the flattenTreeSystem reference(and switches to flake-utils master branch) and replaces its usage with a custom function `filterPackages`. This function filter all packages that match three conditions; - is a derivation - not broken - system is supported In that order as to not cause errors when trying to reference non-derivation meta attributes. And then also just dump *all* packages into legacy packages, so everything else is still accessible. I was considering removing the packages that are already in the packages output in legacyPackages, but I don't think its necessary since nix looks to the packages output first. Co-authored-by: Pacman99 commit 58814fe74109b7725aa6466e9620a61920d0f508 Author: Pacman99 Date: Fri Mar 26 16:33:27 2021 -0700 flake: use filterPackages instead of flattenTreeSystem commit fb14e20249fd58facfc4819fa9fac4d75db1893f Author: Pacman99 Date: Fri Mar 26 14:41:10 2021 -0700 lib/filterPackages: filter by flake requirements returns only non-broken derivations that support the system. commit 3c772df5b0e123fe107f2143cbfe39f7808c06ef Merge: 0075999 68a5a2e Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Fri Mar 26 21:30:04 2021 +0000 Merge #215 215: lib/pathsToImportedAttrs: discard string context in the names to prevent flake check error r=nrdxp a=Pacman99 So I learned about this myself while working on it. Nix has a thing called string context, where strings refer to various store paths that they used to contain. This is normally a good thing to guarantee purity, but flake outputs cannot contain store paths. So when `pathsToImportedAttrs` is passed a list of store paths, and is then used for a flake output, we get a very confusing error that the string refers to a store path - even though it doesn't look like it does! I think its good to review this as a separate Pr, since it requires calling an unsafe nix builtin. Co-authored-by: Pacman99 commit 00759997ab35a2f5c7434b5716eb0d352ae1fb19 Merge: 205a9d3 397d2ba Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Fri Mar 26 21:22:49 2021 +0000 Merge #211 211: home-manager fixes r=nrdxp a=nrdxp - [x] integrate nix-community/home-manager#1880 (to avoid duplicate commits, we'll wait a bit to see if this gets merged) - [x] don't use all of `systemPackages` for `flk home` - [x] test home-manager `activationPackage` and `flk home` as part of CI Co-authored-by: Timothy DeHerrera commit 205a9d3e03cf5b46c29bb1a85a4ef3aa311e7182 Merge: 908ba16 d344fc2 Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Fri Mar 26 21:07:51 2021 +0000 Merge #219 219: lib/mkPkgs: reorder overlays to get access to devos lib(dev) r=nrdxp a=Pacman99 nixpkgs applies overlays in the order given. This PR moves the lib extension overlay to be first so all subsequent overlays can access `dev` which is the devos lib. Co-authored-by: Pacman99 commit d344fc2ea68ab1b023dbb229fba1cc0a3e585516 Author: Pacman99 Date: Fri Mar 26 13:00:38 2021 -0700 lib/mkPkgs: reorder overlays to get access to devos lib(dev) commit 68a5a2eecfc083dbb183c575e61c6271486160b3 Author: Pacman99 Date: Thu Mar 25 20:42:47 2021 -0700 lib/pathsToImportedAttrs: discard string context in the names to prevent flake check error commit 397d2bab5ead80534bcb702458da34c35f4cb99a Author: Timothy DeHerrera Date: Fri Mar 26 00:31:45 2021 -0600 home-manager: simple test commit b39bd973da6e7d9300e0e44c55d33520eea53d2a Author: Timothy DeHerrera Date: Thu Mar 25 23:46:58 2021 -0600 home-manager: update to fix sharedModules args incooperate nix-community/home-manager#1880. commit 908ba1633d34ea39e167f98f0728ebe8651ab9a4 Merge: d5c5ff5 9303275 Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Fri Mar 26 00:58:32 2021 +0000 Merge #213 213: readme typo r=Pacman99 a=jackmac92 hopefully I can make a more meaningful contribution in the future, but this is all I got for now Co-authored-by: Jack McCown commit 93032755db27007f9c1ccaabe76218e7504f87ba Author: Jack McCown Date: Thu Mar 25 19:05:52 2021 -0400 readme typo hopefully I can make a more meaningful contribution in the future, but this is all I got for now commit d5c5ff5a704ba9259984db731e1c3c3e9f0c27ef Merge: 4f38a88 61fc640 Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Thu Mar 25 23:01:35 2021 +0000 Merge #212 212: lib/pathsIn: don't error if path doesn't exist r=Pacman99 a=Pacman99 Really simple, just don't error if path passed to pathsIn doesn't exist. This doesn't affect much, since the majority of folders in devos end up getting referenced in some way or another outside of a pathsIn call. But it will help for users of mkDevos, so they can safely delete folders they don't want to use. Can test with current overlays folder in deovs, that only gets imported through a pathsIn call. Co-authored-by: Pacman99 commit 61fc640f10a0ada5b8a951620d696f32f49a7331 Author: Pacman99 Date: Thu Mar 25 15:21:10 2021 -0700 lib/pathsIn: don't error if path doesn't exist commit e767f7066e6614dab22001d587d6bd5e08d6719d Author: Timothy DeHerrera Date: Thu Mar 25 00:14:57 2021 -0600 devosSystem#hmConfig: don't pass systemPackages The intentions are good, but for users with many profiles, this is overkill. Proper solution will come when #127 is resolved. commit 4f38a881911676a0ddbeb62e1c6b3ff22a793f5b Author: Timothy DeHerrera Date: Tue Mar 23 22:59:01 2021 -0600 changelog: only on release To remove the opportunity for junk to enter into the changelog, and to reduce the commit history, the changlog generation will only happen on release, and only based on merged PRs. Fixes #205 commit 01f25807e4a8a46e043265de0f4c0952489a35ba Author: bors[bot] Date: Tue Mar 23 20:50:56 2021 +0000 Update Changelog for PR commit 4dcf191d1d8e17f36ffb2afbc9650a6aba345fb4 Merge: 54d0c8d 25a2431 Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Tue Mar 23 20:48:04 2021 +0000 Merge #210 210: hosts: add cachix r=nrdxp a=Pacman99 fixes #208 I think it was dropped during #157. It used to be added to nixosModules, but I think its better added to hosts, I don't see a reason to export the cachix module as an output. Co-authored-by: Pacman99 commit 25a2431ff790aaf1c94864d45f26b16b2ffa22f9 Author: Pacman99 Date: Tue Mar 23 10:25:42 2021 -0700 hosts: add cachix commit 54d0c8d5d7a91107d75858d9710d79612efc184e Author: bors[bot] Date: Tue Mar 23 17:21:06 2021 +0000 Update Changelog for PR commit 74c23ce9c163a26bb26015f9ff977cff362ab273 Merge: 6134c31 6d51ed0 Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Tue Mar 23 17:18:43 2021 +0000 Merge #156 156: Improve Home Manager support: profiles/suites, modules, extern, flake outputs r=Pacman99 a=Pacman99 A really simple method of implementing #119. This relies on a feature that I added in home-manager master for module options of extraSpecialArgs and sharedModules, nix-community/home-manager#1793. I could try and get that backported to 20.09. But I thought I'd get some feedback on these changes first. Co-authored-by: Pacman99 commit 6d51ed02669c93fbc02950475deeb6dc11f6a010 Author: Pacman99 Date: Tue Mar 23 07:44:57 2021 -0700 users: add Home Manager section to doc commit dc9d9877b87c4bce3d82503b1b9974c9ff5417a6 Author: Pacman99 Date: Tue Mar 23 07:37:11 2021 -0700 export homeConfigurations for all user@host pairs and add better home-manager only defaults commit cc52cd9fa25c59bce42b724070697b149a65fee1 Author: Pacman99 Date: Tue Mar 23 07:36:23 2021 -0700 users: wire up all user profiles to userSuites and pass to home-manager commit 416a52fcd3feb637dca28b860141b26430389ce7 Author: Pacman99 Date: Tue Mar 23 07:34:38 2021 -0700 users: add and export user modules and import them in hosts commit 0e5aa6568e9876eade5bef40786efb4c687f25ba Author: Pacman99 Date: Tue Mar 23 07:28:25 2021 -0700 flake/home: release -> master commit 6134c31ecec4caae1e4041b7aee7308b7426bfb6 Author: bors[bot] Date: Tue Mar 23 06:12:06 2021 +0000 Update Changelog for PR commit c667cc5097f5a5c5ae35e14b86d1bb66d92e878d Merge: b7cb975 44623b5 Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Tue Mar 23 06:10:34 2021 +0000 Merge #192 192: flake: nixos -> nixos-unstable r=nrdxp a=nrdxp 20.09 is getting stale as we move toward a new release so track unstable for now. Co-authored-by: Timothy DeHerrera commit 44623b5979f375dc565134a0f7b2a47440517b13 Author: Timothy DeHerrera Date: Tue Mar 16 22:52:28 2021 -0600 nix: don't use nix flake I originally wanted to use the nix flake to allow users to take advantage of the latest changes. Just so happened that nixpkgs was recently updated with a new version around the same time, and this just adds complexity for no real gain. commit 9ba1e7f9bc321f0aa009186cc21c2aee9e77dacf Author: Timothy DeHerrera Date: Tue Mar 16 22:11:56 2021 -0600 nix: remove patch for default unstable features commit 436fbb08e8c70dec921953ba15c340680a314a62 Author: Timothy DeHerrera Date: Tue Mar 16 15:49:33 2021 -0600 tests: patched nixpkgs no longer needed commit 9537daee32e33a0ad133206a23e91ed7cf746acb Author: Timothy DeHerrera Date: Tue Mar 16 15:43:55 2021 -0600 flake: nixos -> nixos-unstable 20.09 is getting stale as we move toward a new release so track unstable for now. commit b7cb975486b61529b70d786fbc1bd2550120d706 Author: bors[bot] Date: Mon Mar 22 22:02:13 2021 +0000 Update Changelog for PR commit 870897a3e938cef9f4377b8111da853b0bacac45 Merge: b1924a2 49b1ad8 Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Mon Mar 22 21:59:12 2021 +0000 Merge #202 202: iso: avoid systemd service startup r=nrdxp a=blaggacao fixes #194 alternative to #197 # Manual Tests
was unrelated - [ ] `flk install NixOS --impure` correctly onto `/mnt` :negative_squared_cross_mark: (looks like no profile is present) Issue: https://github.com/divnix/devos/issues/204 Upstream Issue: https://github.com/NixOS/nixpkgs/issues/116938
- [x] acceptable build time / closure size ca 850MB (for a simple base OS) :heavy_check_mark: - [x] local profile with `cage` service is disabled, that is: boots into terminal :heavy_check_mark: - [x] success: air gapped / offline devshell enter :heavy_check_mark: - [ ] failure: aire gapped target install: ← non blocking bonus item :negative_squared_cross_mark: ```console $ flk install POS warning: you don't have internet access; disabling some network-dependent features building the flake in path:/iso/devos?narHash=sha265-... warning: you don't have internet access; disabling some network-dependent features error: unable to download 'https://api.github.com/repos/NixOS/nixpkgs/df8e3...': Couldn't resolve host name (6) ``` → detailed rationale in the commit messages :heart: @Pacman99 for the excellent and detailed discussions in #197 and the may ideas, suggestions and code. Co-authored-by: David Arnold commit b1924a21cdb7f72a4751a7ccbccaa2927f84ea35 Author: bors[bot] Date: Fri Mar 19 19:55:27 2021 +0000 Update Changelog for PR commit c05002717165dd5df5b52b6943c3db199e36ec57 Merge: 2961c1e 3c8d22a Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Fri Mar 19 19:33:31 2021 +0000 Merge #161 161: Multi-arch support for hosts(nixosConfigurations) r=nrdxp a=Pacman99 fixes #72 also related, #125 This allows users to set `nixpkgs.system` to any architecture exported by the nixpkgs flake and nixpkgs.pkgs will be set to that system. I also added `multiPkgs` as a special arg and made `nixpkgs.pkgs` a default. So if someone wanted to do crossSystem builds or anything else with pkgs, that is also an option(eg. mobile-nixos!!). Co-authored-by: Pacman99 commit 3c8d22a5281e70ec5619e425f3e140d17b444bd4 Author: Pacman99 Date: Sun Mar 14 19:14:51 2021 -0700 flake/tests: improve multi arch support for flake checks commit aec7c92cc71aeeb2ad492f59cb9e5b942bc593ae Author: Pacman99 Date: Mon Mar 15 19:04:28 2021 -0700 hosts: set nixpkgs.pkgs based on nixpkgs.system commit 49b1ad8227d0884a628e90468fe362a740c1bd95 Author: David Arnold Date: Thu Mar 18 23:17:58 2021 -0500 iso: ensure tools of deactivated profiles are still available This is just for convenience, since the closuers are already in the store. It might be helpful to be able to test out some things of those deactivated profiles een on the iso isntaller. commit 007447652b387fa32fad9129db58809d4f534c4d Author: David Arnold Date: Thu Mar 18 15:58:01 2021 -0500 iso: add back complete host profile to the nix store This ensures that all builds of activated profiles are included into the iso cache and don't require rebuilding within the live installer environment. commit 435847823fac76f0f2df067893bdc2443780244a Author: David Arnold Date: Thu Mar 18 17:42:17 2021 -0500 style / organization commit 15cf15b3ed56c801d44d4b07a27907536cc01e72 Author: David Arnold Date: Thu Mar 18 17:41:22 2021 -0500 iso: filter out al profiles (except core) IN order to avoid random startup of systemd services, filter out all profiles, except for core and user profiles. This works becasue of a fundamental devos contract, that modules only define configuration, but don't implement them and profiles only implement confguration but don't define them. So only ever an activated profile is expected to effectively start up a systemd service. closes: #194 commit db716d192192beb206a320a4c7e38e0596f7571c Author: David Arnold Date: Thu Mar 18 20:58:55 2021 -0500 lib: ensure path type in mkProfileAttrs This is required so that filtering via lib.remove works against modules.core and similar which are of path type. It is also a prerequisite for disabledModules to match by module.key instead of path string relative to nixpkgs' modulePath. commit 2961c1ea529a98296be9c0f07a08431665bb8654 Author: bors[bot] Date: Thu Mar 18 03:38:02 2021 +0000 Update Changelog for PR commit 1b4edf3333568f45362025eb8c17ea2afb068a74 Merge: 8ee3342 dd494fa Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Thu Mar 18 03:36:12 2021 +0000 Merge #198 198: hosts/devosSystem: pass modules as attrset r=nrdxp a=Pacman99 This is a fairly simple change that only changes the lib api for devosSystem. But doesn't add any features by itself. Hosts now pass modules to devosSystem as an attrset. And devosSystem just grabs all modules in the set and passes it to nixosSystem. I plan to use this in #197 to selectively import modules. And I think it could help with nix-darwin - and other config systems - support, since not all profiles and modules are config system agnostic. This could be a workaround to add rudimentary support for other config systems by only importing the necessary modules. Overall I think its a useful change and extends the abilities of `devosSystem` Co-authored-by: Pacman99 commit dd494facc314f331e842177f4e8a327e5dcebf1d Author: Pacman99 Date: Wed Mar 17 15:41:54 2021 -0700 hosts/devosSystem: pass modules as attrset commit 8ee334277ab8146143e26524ded92c84222bd67e Author: bors[bot] Date: Wed Mar 17 00:32:59 2021 +0000 Update Changelog for PR commit f3a0fc9cc03f54578b6d90dc9bf2021bd018a3ce Merge: 7d7c365 6b5d4ce Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Wed Mar 17 00:30:21 2021 +0000 Merge #196 196: doc: enact bootstrapping section r=nrdxp a=blaggacao closes: #193 Co-authored-by: David Arnold commit 6b5d4ce8f4938c71e146dcd2f33a4467fe24a76c Author: David Arnold Date: Tue Mar 16 19:19:01 2021 -0500 doc: enact bootstrapping section closes: #193 commit 7d7c365a2cb4f4b0bd46e5ed05092380f05d3ff5 Author: bors[bot] Date: Wed Mar 17 00:00:15 2021 +0000 Update Changelog for PR commit c2cd3e79cad18327e98fa56b0b7ad66bfa4354b1 Merge: 70e19e0 6210daf Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Tue Mar 16 23:57:32 2021 +0000 Merge #164 164: add hosts module arg r=nrdxp a=Pacman99 should help with #163. Fixes #169 But either way this could be generally useful. I have one use case of setting up a minecraft bungeecord proxy with servers on different hosts. Co-authored-by: Pacman99 commit 70e19e0c9e7791948867504253153e00f5c5bee9 Author: bors[bot] Date: Tue Mar 16 23:47:36 2021 +0000 Update Changelog for PR commit e6f15ae257e0ad4130bd5a147623ce9a9b7d4f61 Merge: 1ac3d83 faa8558 Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Tue Mar 16 23:45:57 2021 +0000 Merge #191 191: iso: copy input closourse into iso to avoide re-download r=blaggacao a=blaggacao closes #190 Tested on my setup, considerably cuts times and only leaves one (noticable) download. Co-authored-by: Pacman99 Co-authored-by: David Arnold commit 6210daff13e0466c7fa5b5ae35dfc0749f50432c Author: Pacman99 Date: Tue Mar 16 14:22:38 2021 -0700 add hosts module arg to easily access other host's config commit faa855824058cfa01c367786051fa7e7cd1ee63c Author: David Arnold Date: Tue Mar 16 18:01:29 2021 -0500 iso: document iso cache / closures (speed!) commit 8e3777ff346e2f75f31d0813ac16fc71dc29322c Author: David Arnold Date: Tue Mar 16 17:33:53 2021 -0500 iso: copy devShell storepath to iso This avoids for the live nixos on the iso to rebuild the devshell upon entering it. commit 17aee57df455e5524a6911ff517acfb3ae2629b5 Author: David Arnold Date: Tue Mar 16 16:42:58 2021 -0500 iso: pin inputs as flakes This intends to avoid downloading inputs on the iso live image and is a step towards completely air-gaped installs. credits: @Pacman99 closes: #190 commit 403465935058d0ff0b62da10196f96de794d83a5 Author: Pacman99 Date: Mon Mar 15 17:02:20 2021 -0700 lib: pass `inputs` to `./lib` library functions now can access inputs (and their sources!) directly, for example in order to copy their closure into the iso registry so that evaluating the flake does not need to fetch inputs again commit 1ac3d83fc1dd74a6628475580e28cfbceae842fb Author: Timothy DeHerrera Date: Tue Mar 16 15:15:26 2021 -0600 bors: no squash merge commit ed4998870336a107e928c1424ef03dc5429ba38e Author: bors[bot] Date: Tue Mar 16 21:14:56 2021 +0000 Update Changelog for PR commit 3d324e7533aeaccca0d55f3a2bfa0b853b4f096b Author: David Arnold Date: Tue Mar 16 19:50:38 2021 +0000 lib/devos: bake devos repo into live cd (#168) fix #167 This worked for me to bootstrap another machine. commit f53b6a454348f46f062eeb10b936792169ba4c60 Author: Timothy DeHerrera Date: Sun Mar 14 21:49:35 2021 -0600 core: really fix #162 commit 8f2a8adb55ff8ad738320223ca659c645141a217 Author: nrdxp Date: Mon Mar 15 03:42:30 2021 +0000 Update Changelog for PR commit c12528b7d9420c9e998a3f523f0c9db2723513a0 Author: Timothy DeHerrera Date: Sun Mar 14 21:41:28 2021 -0600 core: fix #162 commit d8068073c644c1befe5f50b09fa5dc16295f9714 Author: Timothy DeHerrera Date: Sun Mar 14 21:40:49 2021 -0600 lib: add rgxToString function commit d51cd34fb7542bc6d4baf1e9393b7c1e90d5806b Author: Timothy DeHerrera Date: Sun Mar 14 21:27:58 2021 -0600 subflakes: make first class citizens Subflakes should provide their wares as outputs, so wire up the pkgs flake to reflect that. Due to the unstable nature of flakes, updating the root flake doesn't currently update the subflake lock file. Therefore, add additional logic to flk update script in order to do this behind the scenes. Nix is now pulled in from the "nix" registry flake in order for users to take advantage of improvements to the UI since its last update in nixpkgs. commit d7f15a664d20de910611a29167107aee8ff0dbab Author: nrdxp Date: Sun Mar 14 07:14:55 2021 +0000 Update Changelog for PR commit c012f2f4edd72faaf79a2cbd707bce381e383223 Author: Timothy DeHerrera Date: Sun Mar 14 07:10:51 2021 +0000 treewide cleanups and refactoring for initial tests (#157) - [x] refactor lib into separate files, similar to NixOS/nixpkgs/lib. - [x] refactor ci to automatically generate derivations from flake outputs - [x] remove cluttered indirection statements throughout the codebase - [x] refactor hosts to allow for upcoming integration tests - [x] improve ambiguity in the existing docs - [x] add [BORS](https://bors.tech) support - [x] add initial integration test - [x] write tests documentation - [x] test lib - [x] improve version string generation, and do so automatically for pkgs/flake.nix sources Clean up the codebase as best we can in preparation for #152 and add tests. From now on, all PRs will be merged with BORS. commit b06adb81bacb9577ee740a0ffbd88d2c06ce60bd Author: nrdxp Date: Fri Mar 5 19:17:24 2021 +0000 Update Changelog for PR commit 5bd8876b7467d09b467cc2f8913c79135a684e50 Merge: c7bb624 e37446e Author: Timothy DeHerrera Date: Fri Mar 5 12:16:38 2021 -0700 Merge pull request #147 from blaggacao/da/lib-with-dep-on-pkgs lib: can depend on pkgs (a la nixpkgs#pkgs/pkgs-lib) commit c7bb6247f520792fb689795e0014b03359751d12 Author: nrdxp Date: Fri Mar 5 01:42:38 2021 +0000 Update Changelog for PR commit 98404a158b48cdd2cbfe8a3d21f8ff05a35e4759 Author: Timothy DeHerrera Date: Mon Mar 1 23:05:32 2021 -0700 hosts: pass host as reference Allow easier debugging, in the same vain as 165191391025e956fd8349606663e51014753e10. commit 78af54670586aa4ff095abe7df07ff2635a38401 Author: Timothy DeHerrera Date: Mon Mar 1 22:57:23 2021 -0700 workflows#sync: sync after changelog generation commit 92afb9c52f14817aa0ff57f893717b4e17d34581 Author: Timothy DeHerrera Date: Mon Mar 1 22:42:19 2021 -0700 README.md: fix typo commit de810fde334c4a348a97a0f0815ab16538754e83 Author: nrdxp Date: Tue Mar 2 05:29:08 2021 +0000 Update Changelog for tag commit 6e2ed81438ce705237d953fbc5347dee78bcbd49 Author: Timothy DeHerrera Date: Mon Mar 1 22:25:42 2021 -0700 workflows#release: set-env is deprecated https://github.blog/changelog/2020-10-01-github-actions-deprecating-set-env-and-add-path-commands commit 827fe2233437099eee13e2c98ea5463504f46a6e Author: nrdxp Date: Tue Mar 2 05:16:57 2021 +0000 Update Changelog for PR commit 7c226c916885e7be43049431b36dea8a17fba0a6 Author: Timothy DeHerrera Date: Mon Mar 1 22:14:15 2021 -0700 lib#genPkgs: reorder overlays Resolves #146 by allowing external overlays to ve overriden by local overlays. commit 5bce44b1bd3dfc90d973a8a44cb71cdf87af7939 Author: Timothy DeHerrera Date: Mon Mar 1 20:30:47 2021 -0700 flake.lock: update commit 44bae215646a9712070e78024341eeb0c91690e1 Author: Timothy DeHerrera Date: Mon Mar 1 20:11:23 2021 -0700 nix#registry: update names Continuing the work from 487fa7ea26bfb756bba0d5f60cb360b2e198ce00, simplify the registry entries a bit more by simply refering to the input flakes. Also add alias `orch` for easy search `override`. commit 8733f2b5dc734cf822ad150f02a0fd91b76ec7e3 Author: nrdxp Date: Tue Mar 2 01:45:48 2021 +0000 Update Changelog for PR commit 4b54c035534e1f7b388a0e74d1ec2679b872a550 Author: Timothy DeHerrera Date: Mon Mar 1 18:43:32 2021 -0700 workflows#release: autogen release on tag Thanks: https://renehernandez.io/essays/2020/09/23/automate-changelog-and-releases-creation-in-github commit aded99e9b338a8408504731506e649d451569707 Author: Timothy DeHerrera Date: Mon Mar 1 18:43:04 2021 -0700 workflow#changelog: actually commit changelog commit 25bdb250912b12dfc103539cc7b9c8d9179507fa Author: Timothy DeHerrera Date: Mon Mar 1 17:44:23 2021 -0700 doc#start: fix #141 by quoting arg to `--run` commit e37446efb66fa26377cb7edf5c1771573715fc63 Merge: e56c619 fc1dddd Author: David Arnold Date: Mon Mar 1 15:16:45 2021 -0500 Merge branch 'core' into da/lib-with-dep-on-pkgs commit fc1dddd18168ddf09628ba1646bf66711c55789f Merge: d20877c 487fa7e Author: Timothy DeHerrera Date: Mon Mar 1 12:46:57 2021 -0700 Merge pull request #143 from lourkeur/fix_142 hosts: fix #142 commit e56c619aef7da69292a2ae9b9b3582edce4d898a Author: David Arnold Date: Mon Mar 1 14:37:43 2021 -0500 lib: add usage docs commit bca532ab42f23aed8a9379f7e56737a952b52223 Author: David Arnold Date: Mon Mar 1 14:00:18 2021 -0500 lib: can depend on pkgs (a la nixpkgs#pkgs/pkgs-lib) commit 487fa7ea26bfb756bba0d5f60cb360b2e198ce00 Author: Louis Bettens Date: Mon Mar 1 18:03:46 2021 +0100 hosts: fix #142 commit d20877cd6d5003a8a89fd62cdd975e82cc3169ff Author: Timothy DeHerrera Date: Sun Feb 28 22:33:14 2021 -0700 README.md: status blurb commit 6b377ac49bfab8af553f67566920f2677b783c0e Author: Timothy DeHerrera Date: Fri Feb 26 01:09:49 2021 -0700 workflow: fix syntax error commit 63190509c7f683fc5ad6024060cfd8a2941ebefe Author: Timothy DeHerrera Date: Fri Feb 26 01:04:43 2021 -0700 workflow: gen changelog on version push commit 8f014c004d2b550d8ea181ce961d8731daaa8c4b Author: Timothy DeHerrera Date: Fri Feb 26 00:48:03 2021 -0700 github: add changelog workflow commit afedb536cc8089cc5352da3da0217fc92573e4b9 Merge: 314b18e 088b51a Author: Timothy DeHerrera Date: Fri Feb 26 00:18:20 2021 -0700 Merge pull request #135 from divnix/auto-srcs pkgs: automatic source management commit 088b51a020ea08d5478e4ef6bc6845764c779716 Author: Timothy DeHerrera Date: Fri Feb 26 00:07:40 2021 -0700 README.md: emphasize source management commit e5ddc3127ba7f18a3538dab6bd28ce01ac5d738f Author: Timothy DeHerrera Date: Thu Feb 25 23:43:03 2021 -0700 pkgs#flake: fix flake-compat support https://github.com/edolstra/flake-compat/pull/18 commit 25180a5e6e3229ef7b7badc57e9c238a272752f9 Author: Timothy DeHerrera Date: Mon Feb 22 19:49:31 2021 -0700 pkgs: use subflake to manage package sources * Resolves #118 * Leverage flakes to manage package sources & hashes * Update documentation with an example. * Add `mkVersion` function to autogenerate a version string. * Add srcs package via overlay containing all sources defined in _pkgs/flake.nix_ * Extend `flk update` with the ability to only update the given input commit 314b18e5f838d1daffef27612930b4648c26e3da Merge: 7d87e5a 1651913 Author: Timothy DeHerrera Date: Thu Feb 25 14:56:20 2021 -0700 Merge pull request #139 from divnix/fix-136 profiles: simplify profiles to suites commit 165191391025e956fd8349606663e51014753e10 Author: Timothy DeHerrera Date: Thu Feb 25 14:47:19 2021 -0700 profiles: simplify profiles to suites * Leave importing to nixpkgs module implentation. Provide a path instead; resolves #136. * Allow profiles which are not lambdas but simple attribute sets, relaxing the constraints a bit. * Update profile README.md * defaultImports -> mkProfileAttrs: allow importing subprofiles even if parent directory does not contain a default.nix. commit 7d87e5abc3f6a60b3f0bde3800f79c8a781498c1 Author: Timothy DeHerrera Date: Sun Feb 21 16:36:43 2021 -0700 doc: add hercules-ci usage commit cbdec3959560226e624ffcd5d1897dd18a911b1c Author: Timothy DeHerrera Date: Sun Feb 21 14:51:19 2021 -0700 doc: improve demonstration commit 091e1f5648824839a35b32379abfd9353893d3ef Author: Timothy DeHerrera Date: Sun Feb 21 14:44:57 2021 -0700 doc: demonstrace hmModules commit 87008d851c0712def7e3b1ce0c8200f17eab6c35 Author: Timothy DeHerrera Date: Sun Feb 21 14:16:52 2021 -0700 extern: typo commit f87344678785042f2ffb03c1c834213c1caacb6c Author: Timothy DeHerrera Date: Sat Feb 20 12:42:36 2021 -0700 doc#extern: docment hmModules commit aff6c085cc3cb7ec2bcc7b4a7d778531d42369cc Author: Timothy DeHerrera Date: Sat Feb 20 00:48:47 2021 -0700 doc: fix mdbook publish cname commit 278c1a93b645e08da8f38c137e11b750362700d7 Author: Timothy DeHerrera Date: Sat Feb 20 00:30:07 2021 -0700 issues: consistent template commit 4393d7e876a87e4aa77d784b3095ee164d24f0c5 Author: Timothy DeHerrera Date: Sat Feb 20 00:07:23 2021 -0700 issues: improve bug template commit 3fb0d801855d67f85f02a004548b664019b58c08 Author: Timothy DeHerrera Date: Fri Feb 19 23:32:29 2021 -0700 README.md: typo commit 92a69cbdcbebfe5acdcab5550e99f70ba1903a2f Author: Timothy DeHerrera Date: Fri Feb 19 23:06:00 2021 -0700 extern: fix #106 well commit e6189cd8bccf8eec40e93b377bda270643ea700c Author: Timothy DeHerrera Date: Fri Feb 19 22:42:33 2021 -0700 README.md: promote upstreaming commit 772dbab9fb2099fb5212cfdebe2f7a4396a49cce Author: Timothy DeHerrera Date: Fri Feb 19 22:09:31 2021 -0700 move funding to personal repo commit ebb09d13886b940bcdfc2c42a84bc76805bd9615 Author: Timothy DeHerrera Date: Fri Feb 19 18:21:07 2021 -0700 buymeacoffee 😉 commit 4e95e1ee720e340f6b8fbe8dab0dbe0190698f30 Author: Timothy DeHerrera Date: Fri Feb 19 16:25:28 2021 -0700 shell: fix #131 commit 2cb1ec608196ebe8549ce10e53c563c0ebfbb38d Author: Timothy DeHerrera Date: Wed Feb 17 22:40:36 2021 -0700 book.toml: no longer needed commit cf113e452f17d25eb2c179ae12fe737c4716a600 Author: Timothy DeHerrera Date: Wed Feb 17 22:39:43 2021 -0700 cachix: fix link after name change commit 2a67128dc1ee57c98e555a533bccce093f975b1c Author: Timothy DeHerrera Date: Wed Feb 17 21:32:18 2021 -0700 README.md: refine the intro Emphasize the potentially ephemeral nature of the API until stability is reached. commit 6cbbfffe649cfa06d6482d71a989d6cd0c76f4cc Author: Timothy DeHerrera Date: Wed Feb 17 21:03:07 2021 -0700 README.md: fix guide link commit 8939c3401b72eab5d339d11b11caaa103adb98a1 Author: Timothy DeHerrera Date: Wed Feb 17 18:31:33 2021 -0700 project rename: nixflk -> devos commit 4ff3e3604608be5dfa621af501dd39f873d9dfcf Author: Timothy DeHerrera Date: Wed Feb 17 17:07:44 2021 -0700 README.md: advisory top commit a63a36befc9aa0889f8463fbf9cdeafba0c08ca4 Author: Timothy DeHerrera Date: Wed Feb 17 16:29:55 2021 -0700 github: add community issues commit 3f0345fa318bacdc18a2bf999389835147d485d6 Author: Timothy DeHerrera Date: Wed Feb 17 14:38:37 2021 -0700 github: default labels for issue templates commit 95c6ee036831a098ec6a5398fc7406c514b15a35 Author: Timothy DeHerrera Date: Wed Feb 17 14:15:43 2021 -0700 nix: fix #126 * Update the readme to pull from cachix first, so users don't have to build nix. * Pull `nixFlakes` from override for slightly newer ui, and consistency for users who change the nixos flake ref to something newer. commit 4f44e0dd130dd47defd143d5fdff98705db335f0 Author: Timothy DeHerrera Date: Wed Feb 17 12:54:41 2021 -0700 nix: patch nix directly for experimental features The bash wrapper was causing issues with deploy-rs and the experimental-features option in the config was causing hercules-ci to spit out a bunch of junk in the logs. Patching nix with the default values required for flakes fixes both of these issues. commit b41c738f3967db57ba0823eed369cbdfbbbde4e4 Author: Timothy DeHerrera Date: Wed Feb 17 11:49:13 2021 -0700 shell: use devshell.toml commit 0e27b367d7b6551f4991508e52d9fe8188aeb2b0 Author: Timothy DeHerrera Date: Mon Feb 15 23:30:18 2021 -0700 flk: fix #123 commit e7b46dfd92f27c2f15a3ae369341e16365c36073 Merge: bf68c69 77296ff Author: Timothy DeHerrera Date: Mon Feb 15 11:34:07 2021 -0700 Merge pull request #120 from nrdxp/deploy-rs deploy-rs: init support commit 77296ff433c0dc6e9b5cad522b6a46dafaa204ba Author: Timothy DeHerrera Date: Mon Feb 15 11:24:43 2021 -0700 deploy: move logic to lib commit ad49a5e7e74356cd38c8b8439cbb5d632793c954 Author: Timothy DeHerrera Date: Mon Feb 15 11:08:17 2021 -0700 doc: usage for deploy-rs commit bf68c696729b2dd4a051b3545b410efbc6087e35 Author: Timothy DeHerrera Date: Mon Feb 15 00:41:45 2021 -0700 README.md: add shields and useful links commit 8c7631b014a7d27fddb71bb0d6f7eaa1d9582695 Author: Timothy DeHerrera Date: Sun Feb 14 22:33:37 2021 -0700 checks: add checks to ci commit caba5fd756046a9e0b67fa1a1a8943487fad2ca8 Author: Timothy DeHerrera Date: Sun Feb 14 22:17:24 2021 -0700 deploy-rs: init support Managing servers remotely is a big usecase, and deploy-rs is a flake first deployment tool. By default, all nixosConfigurations are also setup as deploy-rs nodes. You'll still need to do some manual ssh setup, but other than that, the system is ready to deploy. commit cf23b8e64dd11ac8457de654d40fcc6d0c588f56 Author: Timothy DeHerrera Date: Sun Feb 14 22:11:49 2021 -0700 flake: rename flake-utils input commit b42f7b514d3710c2f4e2b89844f4d1a3d1cfa843 Author: Timothy DeHerrera Date: Sun Feb 14 22:08:24 2021 -0700 flake: manage flake-compate as input commit 1b12c78c0e1eae9175e35ead9e0665452c497996 Author: Timothy DeHerrera Date: Sun Feb 14 19:43:11 2021 -0700 flake: nixpkgs points to master by default No need to explicitly specify it. commit f2d22e13bec0e785c4de5eb9c6fdc369dd8f1694 Author: Timothy DeHerrera Date: Sun Feb 14 19:03:51 2021 -0700 ci: reformulate commit b54e5e6b61b5369124d3b3b11be7ff81b60ea951 Merge: 4e582b1 b9bcbab Author: Timothy DeHerrera Date: Sun Feb 14 17:48:01 2021 -0700 Merge pull request #113 from nrdxp/doc doc: begin work on new documentation commit b9bcbab130db0feee3b74889c666e10d3b8ac6b4 Author: Timothy DeHerrera Date: Sun Feb 14 17:44:34 2021 -0700 workflows: prepare for merge commit 0405949ec62c47ebd1ae3825f223a071269205c8 Author: Timothy DeHerrera Date: Sun Feb 14 17:41:15 2021 -0700 doc: finish `flk` reference commit 3a735ce70b49774e9ea35acded53163d89c4c4b1 Author: Timothy DeHerrera Date: Sun Feb 14 15:50:49 2021 -0700 core: pin registry by ref Users may wish to change the default value of override and nixos inputs. If they do so, we want the registry listing to reflect the proper ref names afterwards. Also create a shell alias to easily search every flake in nix.registry. commit bf34d2071ff1f660156cd9cb2c79988d6f0afb3b Author: Timothy DeHerrera Date: Sat Feb 13 19:38:20 2021 -0700 doc: new mdbook documentation commit 4e582b1ff5fbea89e16fd158eb6c0b536f315993 Author: Timothy DeHerrera Date: Sun Feb 14 02:38:41 2021 -0700 shell: remove cachix from i686-linux Build of cachix is failing on i686-linux right now. Remove it so shell is still usable. commit 933fb8fee9e9d65c33eb95330fb7ac176fac1182 Author: Timothy DeHerrera Date: Sun Feb 14 02:29:17 2021 -0700 shell: cleanup devshell * Add update command to flk * Add cleaner usage to flk command * Factor out scripts to be more readable commit 1eb4d1f5ea990a46c7999e47b5a3263374bc2a5c Author: Timothy DeHerrera Date: Fri Feb 12 23:07:49 2021 -0700 secrets: fix subtle error with .gitkeep Add secrets .gitattributes to secrets dir and avoid encrypting it. Fixes an issue with .gitkeep causing build failures on unlocked repos. commit 147e5a8b1217018e1d95cce9bc8cffbe23cfd902 Author: Timothy DeHerrera Date: Fri Feb 12 01:23:43 2021 -0700 shell: fix pkgs for nix-shell commit 058c3195061cb90f230bd346349ce38b0a27e753 Author: Timothy DeHerrera Date: Thu Feb 11 21:34:19 2021 -0700 workflows: keep community in sync with core commit c42298febc77b013b30c1646d541bcf6e1e6663b Merge: eb275d7 cc097e1 Author: Timothy DeHerrera Date: Thu Feb 11 20:49:03 2021 -0700 Merge pull request #116 from lourkeur/fix_115 core: fix #115 commit cc097e1c73ebe470effc8824c52fceaf23f9f98c Author: Louis Bettens Date: Mon Feb 8 13:35:05 2021 +0100 core: fix #115 commit eb275d7d0e110beedcd2e52e104d57ccce8db0ec Author: Timothy DeHerrera Date: Sun Feb 7 18:23:31 2021 -0700 core: fix #114 commit 850cb21124a4d268a6fdfeeba2d6644c6fb27a57 Author: Timothy DeHerrera Date: Sun Feb 7 14:24:41 2021 -0700 flake: use same nixos versions for inputs commit 77952d08c5e8c8529d20d7b5b6e09762d495473f Author: Timothy DeHerrera Date: Sun Feb 7 10:19:33 2021 -0700 flake.lock: Update Flake input changes: * Updated 'ci-agent': 'github:hercules-ci/hercules-ci-agent/42e702d5865b7b7eb6ee5b743bcda7562f95e82e' -> 'github:hercules-ci/hercules-ci-agent/41d1fbfd2faa98559b2cad6da5d9c448b0182121' * Updated 'devshell': 'github:numtide/devshell/8ba5f48386bbe42b9c7672e3a829eb9bb32f4213' -> 'github:numtide/devshell/02933029b06747c7523f3a6f677df06d4cfdfc7b' * Updated 'home/nixpkgs': 'path:/nix/store/vlrfmmyplwyj5wb6pn46jbqqpc3qm7sf-source?lastModified=1610885893&narHash=sha256-VAETd1jhnWUJmq0b8Dbi9mo4qvS+AYC3d9tmVfnf2zQ=&rev=3888fe83e1c7b5331d032177b039e91f83bf34e1' -> 'path:/nix/store/ni76x56hwqch7c6lybf1vfh1cm4lqmp7-source?lastModified=1612241354&narHash=sha256-OepU8m0D4ZfgsPHt+QL5IGieGRCoA+b6RPqGRHkt9dg=&rev=8cef6531ff83c940d8be117011a667269e829338' * Updated 'master': 'github:NixOS/nixpkgs/a0dc0f6f2c965b5ef9de31ca56b1d7aec190841e' -> 'github:NixOS/nixpkgs/77ffc4c2413dc4e1d269e1ec65d4b005188f8536' * Updated 'nixos': 'github:NixOS/nixpkgs/8cef6531ff83c940d8be117011a667269e829338' -> 'github:NixOS/nixpkgs/2b973d233906fb0483263bca71bb789cad61513e' * Updated 'nixos-hardware': 'github:nixos/nixos-hardware/a0d8383c422f85f37fccee5af74b1cb4b52287d9' -> 'github:nixos/nixos-hardware/3657e7c334469370e81d9a6ada1b08e4d82f4597' * Updated 'nur': 'github:nix-community/NUR/7eb3c1f43fc26280b59114fd18908ebcd3754cc0' -> 'github:nix-community/NUR/6f0988f4ea1e39f24e9320bb88e8a16d7fae6590' commit d93d63a5e811fda9be23a9cedfe285af2c0762be Author: Timothy DeHerrera Date: Sat Feb 6 14:51:57 2021 -0700 flk: add get command commit 3bc16596f7788e57353df0163e165452215a3ac0 Author: Timothy DeHerrera Date: Sat Feb 6 13:30:17 2021 -0700 lib: rename defaultImports commit e2172c84109751f4c457cd0914437656479c1296 Author: Timothy DeHerrera Date: Sat Feb 6 13:27:26 2021 -0700 shell: workaround https://github.com/NixOS/nix/issues/4529 commit 6290f9f1f6d04c1da247257958465a239264ab61 Author: Timothy DeHerrera Date: Sat Feb 6 13:26:17 2021 -0700 hosts: fix core commit 69e0bdff6316dc6be1c3213fd5225d7f29785e30 Author: Timothy DeHerrera Date: Sat Feb 6 01:39:55 2021 -0700 local: remove set locale and timezone per host instead commit 1d5b489bb299e739552d625e7171f2fe75078d80 Author: Timothy DeHerrera Date: Sat Feb 6 01:31:48 2021 -0700 suites: mv to dir commit c6d25002ed06099e17a869e263c7723ed7727aea Author: Timothy DeHerrera Date: Thu Feb 4 23:42:46 2021 -0700 extern: move specialArgs here commit 0ec0c25238d7802829bb36b149e032c194e968af Author: Timothy DeHerrera Date: Wed Feb 3 23:44:58 2021 -0700 various refactors * Move extern lists to their own folder * Move unstable package and module imports to their own folder * Create a genPkgs function to avoid using legacyPackages for the whole package set * Move hmActivationPackages to legacyPackages commit 7b404f587d7ab3bb1c08dd88e2ee1ffa52131c3d Author: Timothy DeHerrera Date: Wed Feb 3 21:24:53 2021 -0700 shell: fix formatted files not commited commit a808eda724718d88e8b3673dfb0669d5936739fa Author: Timothy DeHerrera Date: Wed Feb 3 21:23:15 2021 -0700 cachix: add nix-community commit 9b81fef4855ef415b9e0b2c045b2c82af4106e64 Author: Timothy DeHerrera Date: Wed Feb 3 21:07:08 2021 -0700 Revert "ci: build iso" This reverts commit 42bfb73a06dca81e9e059efb47043df8054055b5. For some reason, the iso is built every time, even when it doesn't change, eating up all the space on cachix. commit fc9c6d48dc98a643db09487efefda487fd1e98d2 Author: Timothy DeHerrera Date: Wed Feb 3 21:02:18 2021 -0700 Revert "ci: fix nixos config" This reverts commit 5703b77484db32068f050d55d89905ee4bce79ee. commit f5c3194e44b6839995be79d8232789d66607d158 Author: Timothy DeHerrera Date: Wed Feb 3 20:57:41 2021 -0700 fix: https://github.com/hercules-ci/support/issues/51 commit 42bfb73a06dca81e9e059efb47043df8054055b5 Author: Timothy DeHerrera Date: Wed Feb 3 16:47:48 2021 -0700 ci: build iso commit 5330121646ae852394acec8a141fcfbd14d0a7bf Author: Timothy DeHerrera Date: Wed Feb 3 20:16:44 2021 -0700 README.md: additional fixes commit 564d2500fe2e144c41639534de38a9a1a2677fce Author: Timothy DeHerrera Date: Wed Feb 3 19:51:08 2021 -0700 CONTRIBUTING.md: update pre-commit info commit 55630829f9ec82c992d338a967bdefd17eaca7b5 Author: Timothy DeHerrera Date: Wed Feb 3 19:42:57 2021 -0700 secrets: init empty secrets dir commit 39acbefbe99bb14cc2395b5c9bfc202b5428a428 Author: Timothy DeHerrera Date: Wed Feb 3 19:35:10 2021 -0700 ci: fix ci after core creation commit c9ed0edf599ab13ae4de788b6bfa6dc04a5b0383 Author: Timothy DeHerrera Date: Wed Feb 3 19:16:27 2021 -0700 README.md: reflect new project structure commit 40b49c52c193ec988ad3d0c7d25467f98d9a2763 Author: Timothy DeHerrera Date: Wed Feb 3 18:58:58 2021 -0700 create core branch without any profiles This core will be used as the new base for the reuse branch, which is essentiall the same as the existing template branch, except that it is rebased from this core, simplifying future rebasing. commit bd9878f82a478ec2dc5beeffee5031acb9dff7ed Author: Timothy DeHerrera Date: Wed Feb 3 16:41:21 2021 -0700 ci: move into build attribute commit 33f29d62f43da89dd7e095d0e2c4dfbd7d768ae3 Merge: ec8a357 b7b8b59 Author: Timothy DeHerrera Date: Wed Feb 3 15:37:25 2021 -0700 Merge pull request #109 from nrdxp/refac-profs profiles: add concept of suites commit ec8a357ff9748637e019ad808126dddab088549f Merge: 22e5b08 e92283e Author: Timothy DeHerrera Date: Wed Feb 3 15:35:30 2021 -0700 Merge branch 'refac-profs' into template commit e92283e9d00fdecd8cbf8302ef06bbe540d1175c Author: Timothy DeHerrera Date: Mon Feb 1 23:37:08 2021 -0700 suites: fix play commit 9234577e7e925dbf741422d6ca735bfd8d1b35f4 Author: Timothy DeHerrera Date: Mon Feb 1 20:57:14 2021 -0700 suites: add users to suites commit c67b84692909c96a94e4109d70d1fa84e5fb42bb Author: Timothy DeHerrera Date: Mon Feb 1 20:26:47 2021 -0700 profiles: add concept of suites * Import attrs of profiles automatically with `defaultImport`. * Refactor profiles to ensure all are functions returning a module. * Add a suites.nix with collections of profiles. * Add suites as `specialArgs` to modules. * Add suite import to NixOS host. commit 22e5b08fe3157675baff832cdfaca742ed3bfc67 Author: Timothy DeHerrera Date: Tue Feb 2 23:05:13 2021 -0700 ci: add aarch64-shell commit 6b3100326b9b03d2ff3dbdcd4a7cc02790ea97aa Author: Timothy DeHerrera Date: Tue Feb 2 22:46:12 2021 -0700 core: add tealdeer commit b7b8b592fa2be90347c817258f4988ed0cd21218 Author: Timothy DeHerrera Date: Mon Feb 1 23:37:08 2021 -0700 suites: fix play commit 57c60bcdcd5e25a59439a27b51eb369a0fa64118 Author: Timothy DeHerrera Date: Mon Feb 1 20:57:14 2021 -0700 suites: add users to suites commit 0837303bb58eb0b7fd5d5fcb43490391b6e12c67 Author: Timothy DeHerrera Date: Mon Feb 1 20:26:47 2021 -0700 profiles: add concept of suites * Import attrs of profiles automatically with `defaultImport`. * Refactor profiles to ensure all are functions returning a module. * Add a suites.nix with collections of profiles. * Add suites as `specialArgs` to modules. * Add suite import to NixOS host. commit 61c732a8e0a37abefc38c8d8708de5d2b26d12e3 Author: Timothy DeHerrera Date: Tue Feb 2 09:39:13 2021 -0700 qutebrowser: enable darkmode commit c5a2fa2f4d84552c8ba2ae641197f21b634f82b2 Author: Timothy DeHerrera Date: Tue Feb 2 09:27:19 2021 -0700 qutebrowser: update config.py for new version commit f8e3b70aee71fd20be87f17cc534ed2d52265a4b Author: Timothy DeHerrera Date: Tue Feb 2 01:34:19 2021 -0700 qutebrowser: patch merged upstream commit 5703b77484db32068f050d55d89905ee4bce79ee Author: Timothy DeHerrera Date: Tue Feb 2 01:34:12 2021 -0700 ci: fix nixos config commit 4514ea76871ea23b9dbc9734742fb7447b0f8121 Author: Timothy DeHerrera Date: Tue Feb 2 01:30:24 2021 -0700 graphical: latest kernel breaks nvidia commit 51ffb69817ec0c28f8dbfa4560b8fc9d264115b1 Author: Timothy DeHerrera Date: Mon Feb 1 23:46:31 2021 -0700 flake.lock: Update Flake input changes: * Updated 'devshell': 'github:numtide/devshell/21f3cc1433ec257cc9b85c91e471d54f7f74f646' -> 'github:numtide/devshell/8ba5f48386bbe42b9c7672e3a829eb9bb32f4213' * Updated 'home': 'github:nix-community/home-manager/63f299b3347aea183fc5088e4d6c4a193b334a41' -> 'github:nix-community/home-manager/91bd34620d73340be03642279ee0d1c64110ee6c' * Updated 'home/nixpkgs': 'path:/nix/store/6l6hv9pyfmznqmxkk77bbig0a9wsqslp-source?lastModified=1607981906&narHash=sha256-tFuNBkK0F5km1Lq5ulLgLVm3BvOvI7t4k4Y7xTIo3QE=&rev=dd95aa337e23a8a48fe82f0f7b1cced8bc03e379' -> 'path:/nix/store/vlrfmmyplwyj5wb6pn46jbqqpc3qm7sf-source?lastModified=1610885893&narHash=sha256-VAETd1jhnWUJmq0b8Dbi9mo4qvS+AYC3d9tmVfnf2zQ=&rev=3888fe83e1c7b5331d032177b039e91f83bf34e1' * Updated 'master': 'github:NixOS/nixpkgs/3bdf95ceb5660273a01ed2e5be2676487f7e820e' -> 'github:NixOS/nixpkgs/a0dc0f6f2c965b5ef9de31ca56b1d7aec190841e' * Updated 'nixos': 'github:NixOS/nixpkgs/3888fe83e1c7b5331d032177b039e91f83bf34e1' -> 'github:NixOS/nixpkgs/8cef6531ff83c940d8be117011a667269e829338' * Updated 'nixos-hardware': 'github:nixos/nixos-hardware/874830945a65ad1134aff3a5aea0cdd2e1d914ab' -> 'github:nixos/nixos-hardware/a0d8383c422f85f37fccee5af74b1cb4b52287d9' * Updated 'nur': 'github:nix-community/NUR/c32c0ee347949d55f34b0762dccaa52a1f73aa83' -> 'github:nix-community/NUR/7eb3c1f43fc26280b59114fd18908ebcd3754cc0' commit 1c5a86026be777de78eadd9903267f0093262af2 Author: Timothy DeHerrera Date: Tue Feb 2 01:02:06 2021 -0700 Create FUNDING.yml commit 5fd770d4db7f1397233db1e5ea1046ca15281125 Author: Timothy DeHerrera Date: Mon Feb 1 23:37:39 2021 -0700 qutebrowser: use pdf viewer commit c4699ed6826f5bf4472e08636008522eeec0cee8 Author: Timothy DeHerrera Date: Mon Feb 1 23:16:26 2021 -0700 shell: add editorconfig hook commit 46a7e7d4ce8e9bd8453681d3d2157cdc8540201c Author: Timothy DeHerrera Date: Mon Feb 1 20:10:26 2021 -0700 shell#flk: consistent quoting commit 4ae99af29dac6a80aee72763b648fcdff1ea322e Merge: 8d0119d 17621d6 Author: Timothy DeHerrera Date: Mon Feb 1 19:51:44 2021 -0700 Merge pull request #102 from blaggacao/da/iso-sd-netboot host: add deault implementation for system.build.isoImage target (per… commit 8d0119d8e49ccf45641d7ced758c4f8892b894ec Author: Timothy DeHerrera Date: Mon Feb 1 19:48:59 2021 -0700 home: move hmActivationPackages to own output Fixes `nix flake check` failure. commit 17621d6b14db1bf5d0e914f89f338be630cf92f9 Author: Timothy DeHerrera Date: Mon Feb 1 18:57:19 2021 -0700 iso-cd: style cleanup (#2) commit e7d9abfdcdc49ef6f9f28443ec48bce307fdb0a2 Author: Timothy DeHerrera Date: Mon Feb 1 14:05:53 2021 -0700 shell: fix pre-commit on deleted files commit 7fed7e7392046bdb4e362ca3341db55b84493804 Merge: acde966 fc082b5 Author: Timothy DeHerrera Date: Mon Feb 1 09:58:03 2021 -0700 Merge pull request #108 from nrdxp/fix-nixpath hosts: add nixpkgs to NIX_PATH commit fc082b5b0d8d96e537de5fda033aefc35b6a7719 Author: Timothy DeHerrera Date: Mon Feb 1 09:56:33 2021 -0700 hosts: add nixpkgs to NIX_PATH commit acde966df41baaa0f5801147b648c49f24596af4 Author: Timothy DeHerrera Date: Thu Jan 28 14:47:48 2021 -0700 develop: fix devshell package Introduced in a1fade8 commit 8cb82a307ff248b276da03687c6a9f29855839c2 Author: David Arnold Date: Wed Jan 27 21:11:38 2021 -0500 iso: move iso target to ./lib commit 33bcf093b7e5f0e913c444d9da10507978a5a1c7 Author: David Arnold Date: Mon Jan 25 18:40:39 2021 -0500 iso-cd: fix by overruling conflicting custom configuration commit 28ccf4f3f9f18d488c9ee67bc3878ddc0e7fcd05 Author: David Arnold Date: Mon Jan 25 16:48:51 2021 -0500 host: add deault implementation for system.build.isoImage target (per host) commit 5e2f4d09ef4a53a636fdd8da143dadee5c8b56d9 Merge: ea972d8 b1734b4 Author: Timothy DeHerrera Date: Wed Jan 27 11:11:23 2021 -0700 Merge pull request #93 from Pacman99/home-manager-only users: Initial home-manager only configurations(non-nixos systems) commit ea972d892085b358b97c017314535940d778c8c6 Merge: a1fade8 0051415 Author: Timothy DeHerrera Date: Wed Jan 27 10:45:48 2021 -0700 Merge pull request #103 from blaggacao/da/ditch-pre-commit shell: use devshell-native pre-commit hooks commit b1734b4e53b866b0ea212ae5fb1dc18753141254 Author: Pacman99 Date: Sat Jan 16 11:24:58 2021 -0800 doc: Document home-manager integration and home-manager only configurations commit bbcf4123b2d7dd4ceb80c4f5b8c1d62202cfd1ef Author: Pacman99 Date: Sat Jan 16 10:28:20 2021 -0800 flk script: add home-manager only configuration support commit 88eecddab5a0ad213986927e748d141c6b940b94 Author: Pacman99 Date: Wed Jan 13 23:20:00 2021 -0800 users: home-manager only configurations for non-root users or non-nixos systems commit 0051415adb0afc8bd8d0033c4dec5f956dc72e8b Author: David Arnold Date: Wed Jan 27 12:04:57 2021 -0500 devshell: pull in latest fixes commit 2126268791fdf9001c2b7f6b96f05c98e222f8a7 Author: David Arnold Date: Wed Jan 27 10:31:17 2021 -0500 shell: use devshell-native pre-commit hooks commit a1fade8411b445c3d64be915ce11313ac610f01c Author: Timothy DeHerrera Date: Mon Jan 25 09:23:51 2021 -0700 shell: use DEVSHELL_ROOT commit b1c42e4ed4932a507257abf173c153206f0c6a4c Author: Timothy DeHerrera Date: Mon Jan 25 09:21:27 2021 -0700 flake: format fix commit a173bd41656d3aa81baf8f97ca182ebef03544e8 Author: Timothy DeHerrera Date: Mon Jan 25 09:20:40 2021 -0700 profiles#ci-agent: init commit e97dc7f57b3a9e9652c9007c6687c8fb5b16c8de Author: Timothy DeHerrera Date: Sun Jan 24 21:40:49 2021 -0700 ci: host fails build for now commit d6f50531b2497f0d153c5d6026f0fe45fe13ed7e Author: Timothy DeHerrera Date: Sun Jan 24 11:14:42 2021 -0700 ci: add explicit ci file * Build a nixos configuration with all profiles available as part of ci pipeline. * Remove darwin packages as we do not have a ci agent for them. * Build shell as part of ci commit b3ec025f2424356957f9a6e4331d86a2f05a4196 Author: Timothy DeHerrera Date: Sun Jan 24 11:06:14 2021 -0700 ci: remove broken qutebrowser platforms commit 82463ffdc9447a2a1fe7e845398d03591e2e7f25 Author: Timothy DeHerrera Date: Sun Jan 24 11:05:37 2021 -0700 flake: apply overrides first Fixes other overlays not applying when pulling package from master. commit 7c0381f47897995693f54d8029d99d25012775f3 Author: Timothy DeHerrera Date: Tue Jan 19 01:00:41 2021 -0700 hosts: simplify nix_path commit bd50bcbdc2e606f354be74d886c0224801eae748 Author: Timothy DeHerrera Date: Tue Jan 19 00:58:39 2021 -0700 miningcore: remove broken package commit 1b8080651684a889c028653e7f8b55cd6db80aa0 Author: Timothy DeHerrera Date: Tue Jan 19 00:51:23 2021 -0700 compat: fixes * fix nixos-option * use flake-compat for all backward compat concerns * rebuild devshell after any nix file changes * reexport system pkgs as legacyPackages * provide lib flake output * provide flake lib to nixos configs via `lib.flk` * clean up flake.nix commit 7002009c86664902ee909ebd7725a2c8fa86e58c Merge: a608d70 4a5cb13 Author: Timothy DeHerrera Date: Sat Jan 23 16:38:21 2021 -0700 Merge pull request #96 from benneti/template nixos-hardware: use the flake instead of a path commit a608d70908c8ab1b55c7f72cf056d7a612fd264f Merge: 78adcf8 4796343 Author: Timothy DeHerrera Date: Sat Jan 23 16:37:19 2021 -0700 Merge pull request #99 from nrdxp/revert-71-da-substituters Revert "Add nrdxp cachix to substituter flake list" commit 47963432c43d2c71d5886d6fbce5c0d776ad944a Author: Timothy DeHerrera Date: Sat Jan 23 16:36:21 2021 -0700 Revert "Add nrdxp cachix to substituter flake list" commit 4a5cb133a7b697eb70e4a4b7629298f921ffa9d7 Author: benneti Date: Tue Jan 19 11:32:59 2021 +0100 Update README.md commit 12188b6ec3113305b2161b31410cf68284c7c565 Author: Benedikt Tissot Date: Tue Jan 19 10:45:06 2021 +0100 nixos-hardware: use the flake instead of a path commit 78adcf86dcf5879450cc3708ca1a20e73f9cf1bf Author: Timothy DeHerrera Date: Mon Jan 18 10:34:53 2021 -0700 default: build all platforms in ci commit 8ce3db6326b7ab9154ebbbec79641cbfcc7688b6 Merge: 6f7327c 99c537e Author: Timothy DeHerrera Date: Mon Jan 18 10:20:33 2021 -0700 Merge pull request #71 from blaggacao/da-substituters Add nrdxp cachix to substituter flake list commit 6f7327cd79645a263b10f94598aba50c2bfa24db Merge: 5595073 58b0f1a Author: Timothy DeHerrera Date: Mon Jan 18 10:05:06 2021 -0700 Merge pull request #95 from benneti/template flake/host: add nixos-hardware commit 58b0f1ae655119454094fcadcf756960591317d1 Merge: a9f11b3 5595073 Author: Timothy DeHerrera Date: Mon Jan 18 10:03:57 2021 -0700 Merge branch 'template' into template commit 55950737dc55ef0a3cc4ca09ab2f18d2644c20c6 Author: Timothy DeHerrera Date: Mon Jan 18 02:26:52 2021 -0700 default: x86_64-linux packages commit cd2ba3b9dc70ddf4ca0af2351729d3437bc5b707 Author: Timothy DeHerrera Date: Mon Jan 18 02:24:34 2021 -0700 flake.lock: update inputs commit f8f67d2dcb2b5cceec58aec6d136e82bc4f6e58c Author: Timothy DeHerrera Date: Mon Jan 18 02:23:49 2021 -0700 packages: apply overlays to output packages Apply overlays to output packages so we can easily use a modified package. commit 4248b2d1a552271777c51cb9da1ad4a25be9c6d7 Author: Timothy DeHerrera Date: Mon Jan 18 02:11:15 2021 -0700 miningcore: remove from outputs commit fcf91480199cec9225e155c68dafff9980b1812a Author: Timothy DeHerrera Date: Mon Jan 18 01:59:52 2021 -0700 default: add default.nix using flake-compat commit a9f11b3dcaaa29f87e2a2e9d97d4fb188d671a4a Author: Benedikt Tissot Date: Mon Jan 18 08:37:11 2021 +0100 flake/host: add nixos-hardware - add nixos-hardware flake. - configuration in hosts/default.nix to be able to include hardware specifics per host. - add corresponding documentation in readme commit 3968ba64c98a56ee6a81355b442cb6181c3ce020 Merge: f72125c 36bb3d2 Author: Timothy DeHerrera Date: Sun Jan 17 01:27:24 2021 -0700 Merge pull request #94 from nrdxp/redist-firmware hosts: enable redistributable firmware by default commit 36bb3d264912a0d21c28b8067ffe541370b48568 Author: Timothy DeHerrera Date: Sun Jan 17 01:26:38 2021 -0700 hosts: enable redistributable firmware by default Fixes #92 commit f72125c5d233df778ea9de5b064c449239cdf486 Merge: 75fa02f d22cfc6 Author: Timothy DeHerrera Date: Mon Jan 11 20:12:09 2021 -0700 Merge pull request #90 from blaggacao/ix-lock lock: fix flake util refs commit 75fa02fc028111835be01438c318e4e7549a0d34 Author: Timothy DeHerrera Date: Mon Jan 11 20:07:18 2021 -0700 kakoune: add haskell lsp support commit 0e974ee976d40156cd71f472eb2d155373801641 Author: Timothy DeHerrera Date: Mon Jan 11 20:06:08 2021 -0700 develop#haskell: init profile commit f2aedb889b770beff161a89d959b262e62d4d2df Author: Timothy DeHerrera Date: Mon Jan 11 19:59:49 2021 -0700 pkgs: simplify override commit d22cfc6d29afe1ccf0bd5052c7a16ceabbd4464c Author: David Arnold Date: Mon Jan 11 20:55:33 2021 -0500 lock: fix flake util refs commit d35195187f823aca00a5c82bc22c20b99678c49c Merge: 5558959 25293a7 Author: Timothy DeHerrera Date: Mon Jan 11 18:15:19 2021 -0700 Merge pull request #88 from nrdxp/remove-apps flake: remove apps to reduce complexity commit 25293a7ea83096922e8d18ceb019359f90add8cf Author: Timothy DeHerrera Date: Mon Jan 11 18:10:48 2021 -0700 flake: remove apps to reduce complexity As pointed out here numtide/flake-utils#17, apps are somewhat redundant and, for the sake of simplicity, should be removed for now. commit 5558959869a34d513f6fb641feb3a97e0f42f809 Merge: c2a7984 253f175 Author: Timothy DeHerrera Date: Mon Jan 11 18:01:24 2021 -0700 Merge pull request #81 from nrdxp/flk-up shell: add `flk up` command commit c2a7984178a14145368c49201dd9b2640d459b5e Merge: ade0ca4 7fb5967 Author: Timothy DeHerrera Date: Mon Jan 11 17:59:37 2021 -0700 Merge pull request #78 from blaggacao/patch-4 Don't evaluate overlays on master commit ade0ca4e3ab0d002b88ba6ff4aa882cbdff28e58 Merge: 62ecffc c1b04a3 Author: Timothy DeHerrera Date: Mon Jan 11 17:59:22 2021 -0700 Merge pull request #77 from blaggacao/patch-3 Evaluate exported pkgs against repo baseline nixos commit 62ecffc1cf94f3c8862900a5424944f9779bb437 Merge: e67cd37 176bdcf Author: Timothy DeHerrera Date: Mon Jan 11 17:40:21 2021 -0700 Merge pull request #87 from blaggacao/patch-1 Fix realod commit 176bdcf34ba915bb5188b3678b90775380f0b33c Author: David Arnold Date: Mon Jan 11 19:36:48 2021 -0500 Fix realod better fix for #75 commit 253f175f558559a666e8790c82310671b74ff261 Author: Timothy DeHerrera Date: Mon Jan 11 17:32:58 2021 -0700 README.md: add note on the up command commit 620849bcf081465bdd3f306fad119137ab203c50 Author: Timothy DeHerrera Date: Mon Jan 11 16:21:40 2021 -0700 shell: namespace `flk up` Namespace and stage generated files so that the user can build it right away. commit e67cd3701aa2a2081d0c261ccc12b47f743c0866 Merge: dee6d77 17fb425 Author: Timothy DeHerrera Date: Mon Jan 11 16:08:20 2021 -0700 Merge pull request #82 from blaggacao/patch-1 Hosts: fix mod override commit dee6d77c09020709eff6d05c63ecd5066a6b6514 Merge: 70b26dd 89a4887 Author: Timothy DeHerrera Date: Mon Jan 11 15:56:55 2021 -0700 Merge pull request #84 from blaggacao/patch-5 Shell: pass flags to iso build commit 89a48870b1aa2912b70b93a7312e1f5b8d776eb2 Author: David Arnold Date: Mon Jan 11 17:34:46 2021 -0500 Shell: pass flags to iso build like --show-trace commit 17fb425844828ca55a99d56283b27a7331932a8f Author: David Arnold Date: Mon Jan 11 17:27:38 2021 -0500 Hosts: fix mod override In some occasions the module path was renamed. To avoid conflicts, the old path must be disabled manually. E.g. ```nix { unstableModules = [ "services/ttys/getty.nix" ]; addToDisabledModules = [ "services/ttys/agetty.nix" ]; } ``` commit 70b26dd43088e02f57fcf1fbd8fadc77cd36b430 Merge: d0fe508 a45df43 Author: Timothy DeHerrera Date: Mon Jan 11 13:50:21 2021 -0700 Merge pull request #80 from blaggacao/patch-5 Little hint commit 86ee73655284323e8f8b51e7e720dafcfd29c6fd Author: Timothy DeHerrera Date: Mon Jan 11 13:20:52 2021 -0700 shell: ignore `flk up` generated configs commit e33f53ff2e227fbba9256f1fd695e7071a64fef4 Author: Timothy DeHerrera Date: Mon Jan 11 13:15:55 2021 -0700 shell: add `flk up` command Automatically generate a configuration for your current system using nixos-generate-config, placed in the `up` directory. A file is added in hosts/up-$(hostname).nix importing said configuration. commit a45df43106e0eb4248ccdf4c82e0dad228fb8f31 Author: David Arnold Date: Mon Jan 11 14:26:25 2021 -0500 Update flake.nix commit bb3f6ac13e10d82799378c29eb5cf5cb4c339dc3 Author: David Arnold Date: Mon Jan 11 14:14:48 2021 -0500 Little hint commit 7fb59677357b1f1ad6ab46e4c9ff45e61a854950 Author: David Arnold Date: Sun Jan 10 20:10:59 2021 -0500 Don't evaluate overlays on master master is only used in the context of `pkgs/override.nix` and `unstableModulesPath` and only within `./hosts` Since overlays exists that are incompatible between nixos and master at evaluation time (sic!), this together with #77 avoids evaluating overlays against master all together. commit c1b04a3aa1cc99785d91ffbcce597b9c4e7976e7 Author: David Arnold Date: Sun Jan 10 20:02:08 2021 -0500 Evaluate exported pkgs against repo baseline nixos The baseline pkgs for own consumption is nixos, only pkgs/override.nix provides a mechanism to "backport" packages from unstable. Therefore, we should expose our packages to others in the same context as we use them ourselves. commit 99c537e10efa9ede6dee8085388631324fc00803 Author: David Arnold Date: Sat Jan 9 20:39:12 2021 -0500 Add nrdxp cachix to substituter flake list courtesy of: https://github.com/NixOS/nix/commit/343239fc8a1993f707a990c2cd54a41f1fa3de99 commit d0fe508da20695bd72c1a5eebd3cb113778366ac Merge: 7ec9a15 41e3de0 Author: Timothy DeHerrera Date: Sun Jan 3 00:15:42 2021 -0700 Merge pull request #67 from nrdxp/flatten-tree use `flattenTreeSystem` for `packages` output commit 41e3de0eab833efb1d5bc44346956a705bcc13bf Author: Timothy DeHerrera Date: Sun Jan 3 00:05:39 2021 -0700 flake: simply `packages` with flattenTreeSystem Based on https://github.com/numtide/flake-utils/pull/13. commit 51deae41cc4ac070c3aba0a1ee75dbf3cd4a0858 Author: Timothy DeHerrera Date: Sun Jan 3 00:02:28 2021 -0700 overlays: fix darkwin builds commit 77a5bd36a379c20323e50e76754b7685c8262b93 Author: Timothy DeHerrera Date: Sun Jan 3 00:00:46 2021 -0700 miningcore: mark as broken commit 7ec9a15be3e9d6ea8a294e713ecf33cecd29f555 Author: Timothy DeHerrera Date: Thu Dec 31 14:11:32 2020 -0700 hosts: left out of #66 by mistake commit 4f4cd72fdc90b27e69e2a31d57acf47691a2e796 Merge: 6d96a58 003ab99 Author: Timothy DeHerrera Date: Thu Dec 31 14:04:03 2020 -0700 Merge pull request #66 from nrdxp/override-modules Make modules overridable commit 003ab99e35d9bb9d24e52323278d97fa9b6599e6 Author: Timothy DeHerrera Date: Thu Dec 31 13:50:08 2020 -0700 niximg: install flakes directly within iso Fixes #63. commit 00b35136c341606eb2428f898b4c8832f331f70d Author: Timothy DeHerrera Date: Thu Dec 31 13:44:57 2020 -0700 flake: add pkgs back to overlays Packages from `pkgs/default.nix` are meant to be exposed to all nixos configurations. However, #61 removed a redundancy in the output api which was relied up to do so. commit 73bc694bbbe31ac0736520a751f7f8d99bebd891 Author: Timothy DeHerrera Date: Thu Dec 31 13:43:34 2020 -0700 simple mechanism to override modules from master commit 164a672129dca889c6b94e0aaee2e446f5e5c48a Author: Timothy DeHerrera Date: Thu Dec 31 13:42:49 2020 -0700 hosts: add unstableModulesPath commit 6d96a5888fe7135485a45b97e566758f66bcf427 Author: Timothy DeHerrera Date: Thu Dec 31 12:41:01 2020 -0700 don't be fancy commit 09f0bbda70c2793f5264e89cfc57b616aa86d734 Merge: 9f561b8 94f334e Author: Timothy DeHerrera Date: Wed Dec 30 13:53:51 2020 -0700 Merge pull request #61 from blaggacao/da-separate-pkgs-from-overlays ref: remove overlay xref to pkgs commit 9f561b8cead52cd7840ca0bcf75def8f9eb9d207 Merge: a0b9f9f 8438d0c Author: Timothy DeHerrera Date: Wed Dec 30 12:36:22 2020 -0700 Merge pull request #62 from lourkeur/home-manager_moved update home-manager urls commit 94f334ee8d92a7c21754664d47427995f94422bb Author: David Arnold Date: Wed Dec 30 11:50:23 2020 -0500 ref: remove overlay xref to pkgs since packages are exposed through output.packages by their own, a second export through overlays.pkgs would be smudging the public api of this repository. commit 8438d0c404374f7c2e131f809d10ae6764e63f3c Author: Louis Bettens Date: Wed Dec 30 17:47:49 2020 +0100 configuration.nix: update home-manager url commit 095953efef777921828995804a619b6bf9684b1f Author: Louis Bettens Date: Wed Dec 30 17:47:46 2020 +0100 README.md: update home-manager url commit 07c57c56f6280332cc7c35ae50b40adf5b563416 Author: Louis Bettens Date: Wed Dec 30 17:47:41 2020 +0100 DOC.md: update home-manager url commit a0b9f9ffe688c86bfc04c35655d783289e3484ba Author: Timothy DeHerrera Date: Wed Dec 30 01:47:42 2020 -0700 hooks: declare nixpkgs-fmt pre-commit hook commit 28e473517de2c2bb827b1d5adad947d64d7835a0 Author: Timothy DeHerrera Date: Wed Dec 30 01:00:12 2020 -0700 editorconfig: fixup commit a1fad9c019446858b38eded7b4f4f762bbe77a01 Author: Timothy DeHerrera Date: Tue Dec 29 23:31:34 2020 -0700 core: add n repl alias commit a4409f79e41cfddcf9ebfc4e3412f4300f5a5830 Author: Timothy DeHerrera Date: Tue Dec 29 20:16:26 2020 -0700 any-nix-shell: update overlay commit 37d40e0cfe4e770a1ef388e93de3bd048d5aaee7 Author: Timothy DeHerrera Date: Tue Dec 29 01:17:36 2020 -0700 shell: add command descriptions commit ad4bbdd39812bfff9a32104f57ce317e0b591a0a Author: Timothy DeHerrera Date: Tue Dec 29 00:36:44 2020 -0700 shell: fix flk command commit 165ffaa4fb6805e2a31ea7dde60a06d7f7d375fb Merge: 828a939 893e092 Author: Timothy DeHerrera Date: Mon Dec 28 23:15:03 2020 -0700 Merge pull request #54 from nrdxp/devshell Use mkDevShell for shell.nix commit 893e09278bdacbc486866759987367316a3577ef Author: Timothy DeHerrera Date: Mon Dec 28 23:12:27 2020 -0700 shell: switch to using mkDevShell commit e7c07009592b1aa6d1c0fbdeaa6d62a95d991803 Author: Timothy DeHerrera Date: Mon Dec 28 23:08:11 2020 -0700 factor out a generic fetch from nixpkgs-compat Create fetch function which takes a valid flake input, and calls fetchTarball with the revision and hash information from the flake.lock. Useful for pulling the exact revision of flake inputs from not flake expressions, such as those in shell.nix. commit 828a9394700a5c8591e5f9c8b469d7a116f5b2de Author: Timothy DeHerrera Date: Mon Dec 28 22:15:10 2020 -0700 README.md: Add some useful information commit 11f085e78cf0e798b8a04bc5bedcfb72b3771e29 Author: Timothy DeHerrera Date: Mon Dec 28 21:58:23 2020 -0700 shell: pull in more dependencies * Pull recent enough versions on nixos-(rebuild|install) to ensure compatibility with flakes. * Add grip for viewing changes to README.md locally commit 69308e6e717d31bd2c707b46bca392dbe1f0e4bb Merge: 2b41411 da685a0 Author: Timothy DeHerrera Date: Mon Dec 28 21:47:29 2020 -0700 Merge pull request #49 from nrdxp/app-support Add an `apps` output attribute set commit da685a0fb1f56ece3a7d1c173275dd39a265040a Author: Timothy DeHerrera Date: Mon Dec 28 20:33:26 2020 -0700 flake: add apps output Packages that contain an "$out/bin" dir are exported as `apps` as well. commit 2b41411802916e01d189315b19ee8866477394c1 Author: Timothy DeHerrera Date: Mon Dec 28 20:07:34 2020 -0700 pkgs#purs: fix package commit 932147304efd55c7ef140007bfa82e4a46ebf580 Author: Timothy DeHerrera Date: Mon Dec 28 19:05:46 2020 -0700 kakoune: load editorconfig commit 58b8d41ce5f5c0886b5be33cf9163070b0f63e9e Merge: 2e6f10d 7816965 Author: Timothy DeHerrera Date: Mon Dec 28 18:57:42 2020 -0700 Merge pull request #48 from blaggacao/da-editorconfig chore: add editorconfig commit 2e6f10dc857c95472f2d6c302e324a24efa05e78 Author: Timothy DeHerrera Date: Mon Dec 28 18:48:41 2020 -0700 Fix any-nix-shell breaking `nix-run` Simply apply the PR from haslersn/any-nix-shell#6 until it is merged upstream. commit 7816965566e37ca90fcf0bfbe584656d6f94a174 Author: David Arnold Date: Mon Dec 28 20:47:43 2020 -0500 chore: add editorconfig commit 5b46f6a0381c81caefee275800b6b42c1fda549d Merge: 5204d47 30ffedd Author: Timothy DeHerrera Date: Mon Dec 28 16:39:27 2020 -0700 Merge pull request #47 from nrdxp/fix-system-arg Revert "Add extraArgs to lib.nixosSystem call..." commit 30ffeddc4b434a496eed41094500f29e93984186 Author: Timothy DeHerrera Date: Mon Dec 28 16:36:49 2020 -0700 Revert "Add extraArgs to lib.nixosSystem call..." Fixes #46 by reverting commit 684804ebe026aaad2c6bbcff2166222ebff124d8. If you need the value of system, use `pkgs.system` instead. commit 5204d476eb54760f19940bb018356bcd3f1f0ca7 Author: Timothy DeHerrera Date: Mon Dec 28 15:31:17 2020 -0700 README.md: explain externModules commit 1045327e4633953b0f42d55197ca3c4791cdde88 Author: Timothy DeHerrera Date: Mon Dec 28 15:27:32 2020 -0700 README.md: add some useful links commit db653d6a8fe1e335fb363d20344611353aad7385 Merge: 167c692 bdfdc4d Author: Timothy DeHerrera Date: Mon Dec 28 15:09:52 2020 -0700 Merge pull request #45 from nrdxp/external-modules flake: add `externModules` list commit bdfdc4da54b86cebef3dc7482fbe0ec0ce5a58b0 Author: Timothy DeHerrera Date: Mon Dec 28 15:07:15 2020 -0700 flake: add `externModules` list Fixes #44. Easily add external modules from other flakes by dropping them in the list. commit 167c692f9be447571ba45a4701862864baed3518 Author: Timothy DeHerrera Date: Sun Dec 27 21:33:28 2020 -0700 README.md: explain NUR commit 766b54b1c96a7fbc8feafa94a8e6c36042cef44b Merge: bd9367b 7a6e725 Author: Timothy DeHerrera Date: Sun Dec 27 21:20:36 2020 -0700 Merge pull request #18 from nrdxp/multiArch initial multiArch support commit 7a6e725b539aec2ba02fe5c4601abe707f09e610 Author: Timothy DeHerrera Date: Sun Dec 27 21:19:45 2020 -0700 flake: initial multiarch support commit b7016c8d92a132c2e4d63861ac0357bc9f994a3a Author: Timothy DeHerrera Date: Sun Dec 27 21:07:40 2020 -0700 pkgs: add platform information to all packages commit bd9367be48349d92e39e46a6cd5823f910d53e86 Author: Timothy DeHerrera Date: Sun Dec 27 20:04:32 2020 -0700 kakoune: fix vertical selection shortcut commit 1d3c467ca0d51818a2389b2bc8a9907be28e886f Author: Timothy DeHerrera Date: Sun Dec 27 17:38:49 2020 -0700 virt: enable container configs commit 8842ae52a099f416b078b5e57de57c19ca58dd69 Author: Timothy DeHerrera Date: Sun Dec 27 17:38:22 2020 -0700 kakoune: add dhall-lsp support commit fd3d0abd05b754a41fc8a4dbb0b0c28f3adb4621 Merge: 5f7af10 15003e3 Author: Timothy DeHerrera Date: Sun Dec 27 00:43:53 2020 -0700 Merge pull request #43 from diogox/template Add NUR support commit 5f7af10bae7297e1879b6cd243003b92fbb4a274 Author: Timothy DeHerrera Date: Sun Dec 27 00:40:12 2020 -0700 shell: add a nixpkgs-compat file We are now able to pull in the same revision of nixpkgs as listed in the lock file. commit 15003e3de9e9e39b7cb9752b65bad96b819c1624 Author: Diogo Xavier Date: Fri Dec 25 22:37:51 2020 +0000 Add NUR support commit 94de0921e62081c65f54ac1a00c8ebc21b99ab75 Author: Timothy DeHerrera Date: Fri Dec 25 22:14:56 2020 -0700 shell: rename rebuild to flk commit 42e02c08d652f691d0936208498037b4d777303b Author: Timothy DeHerrera Date: Fri Dec 25 22:10:44 2020 -0700 adblocking: update hosts commit fde19f01171c0e6972dbe85b9af526cc8a3ee975 Author: Timothy DeHerrera Date: Fri Dec 25 22:09:09 2020 -0700 direnv: use nix-direnv instead ad hoc hack commit 89d7829169395601307db3b4e3c4ba7feb03f6d4 Author: Timothy DeHerrera Date: Fri Dec 25 15:57:47 2020 -0700 virt: use docker alias so completion works commit e7ce2fb21b7c24221b922f3c335a226d1d0f6fd3 Merge: 5620569 211fc1d Author: Timothy DeHerrera Date: Fri Dec 25 12:56:45 2020 -0700 Merge pull request #42 from nrdxp/flake-clean flake: clean up by moving implementation to utils commit 211fc1d5f5194bff9593f2c9decdc7f8b1e2b34a Author: Timothy DeHerrera Date: Fri Dec 25 12:55:18 2020 -0700 DOC.md: update docs to reflect changes. commit 3300b5d582db7f92c65cba16a9147256568711ef Author: Timothy DeHerrera Date: Fri Dec 25 12:53:57 2020 -0700 flake: clean up by moving implementation to utils Fixes #28 by adding an `externOverlays` list to easily import overlays from external flakes. commit 56205698522799e17d041d2124f706af623ccca1 Author: Timothy DeHerrera Date: Mon Dec 21 03:11:50 2020 -0700 develop: switch to using gopass commit 63b4e060986940a9f2d0e33615b737efcfbcbb50 Author: Timothy DeHerrera Date: Mon Dec 21 03:10:38 2020 -0700 qutebrowser: 1.3.1 -> 1.4.1 commit 2f10157648972462b1dd5be15059d49ffe8de27c Author: Timothy DeHerrera Date: Sat Dec 19 18:35:33 2020 -0700 shell: silent nix-command check commit d3f0ad14d331346088a58ccfc12dd3896a32c453 Author: Timothy DeHerrera Date: Sat Dec 19 18:35:16 2020 -0700 core: fix direnv hook commit 1e0ad4d2593ac49ac580bd425345fd5f10fda16c Author: Timothy DeHerrera Date: Sat Dec 19 18:14:13 2020 -0700 nix-zsh-completions: update overlay commit 891fd23ec20598d455beb66e67354b08d678164f Author: Timothy DeHerrera Date: Sat Dec 19 18:13:04 2020 -0700 shell: for zsh users provide useful competion Default nix completions fail with the new nix-command interface, at least for users of zsh and direnv, this can be avoided on first startup. commit 3a626b6cf2e18ebf16a7808972dfd643494cc1a7 Author: Timothy DeHerrera Date: Sat Dec 19 18:11:21 2020 -0700 shell: don't overwrite nix by default For users who already have nix-command setup, we don't want to override the `nix` in their path. commit 70723403ccb3f46dec1181d9866086ad1e4b42ac Author: Timothy DeHerrera Date: Sat Dec 19 17:49:18 2020 -0700 direnv: flake based envs are pure by default We should reflect this in the IN_NIX_SHELL envar, since it doesn't get set properly otherwise. commit 4367a6212fecd6b22f99b0cf1fcf1ceff72b7cba Author: Timothy DeHerrera Date: Sat Dec 19 17:42:55 2020 -0700 users#git: avoid warning on `git pull` commit 2a53745f3e5f52b058882036136d4145dbc56ab6 Author: Timothy DeHerrera Date: Sat Dec 19 17:22:00 2020 -0700 virt: enable oci containers via podman commit 96b1ebf55616df7015a3d2140fd1e226c8d26c41 Author: Timothy DeHerrera Date: Sat Dec 19 17:21:24 2020 -0700 virt: overlay no longer useful commit d8974dfb562312419ce76128ce50cd1bcf86f2b9 Merge: 993a79e 1aaf982 Author: Timothy DeHerrera Date: Sat Dec 19 15:01:58 2020 -0700 Merge pull request #33 from nrdxp/fix-home-nixpkgs home-manager: fix trying to import commit 1aaf9827b06ddf59aca7ea60bcad7ff51605eaf5 Author: Timothy DeHerrera Date: Sat Dec 19 14:55:33 2020 -0700 home-manager: follow project README.md for flakes home-manager's readme specifies that, at a bare minimum, `useUserPackages` should be used in addition to `useGlobalPkgs`, when using a flakes configuration. commit 6cc85a916a427710307403fb7f77bfa2bd02ee93 Author: Timothy DeHerrera Date: Fri Dec 18 13:13:02 2020 -0700 home-manager: fix trying to import Fixes #30. commit 993a79e61edeb811537927cbb504769013eaf37d Author: Timothy DeHerrera Date: Wed Dec 16 14:48:40 2020 -0700 core: add manix and nix-index commit 01fe19121007412c1dfab7576e8751c3a6e869ee Author: Timothy DeHerrera Date: Wed Dec 16 14:47:51 2020 -0700 hosts: use stable release as nixpkgs commit 23c4a925a6cce69b556edaa222f02a9025143101 Author: Timothy DeHerrera Date: Tue Dec 15 21:41:19 2020 -0700 profiles#virt: add vagrant commit 829bb503d5e98b41677d30f4105adc1f1db129cd Author: Timothy DeHerrera Date: Tue Dec 15 21:40:57 2020 -0700 startship: space the lock commit 2bdead324bbf15685db291cdd15c961d9d0d51a9 Author: Timothy DeHerrera Date: Mon Dec 14 16:55:45 2020 -0700 starship: update config for new version commit a71bc1e0bfe680d632e07393ef092dabe3fad57d Author: Timothy DeHerrera Date: Mon Dec 14 16:55:02 2020 -0700 envrc: flakes should be considered pure commit 09988bf54b3dd3e2ba31bdb3a5456c31c814d2c9 Author: Timothy DeHerrera Date: Mon Dec 14 16:54:42 2020 -0700 legacy: fix configuration.nix commit 35a5da70fccb33236ba38a3177aeb7b5f623e0fc Author: Timothy DeHerrera Date: Mon Dec 14 16:54:17 2020 -0700 flake: update inputs commit 4a97ba81d24d52d9c2ae002c161b9ace4ed8cd09 Author: Timothy DeHerrera Date: Mon Dec 14 00:40:46 2020 -0700 pkgs#miningcore: use local runtime commit 9134e200abee0d45d73a8d889ac407863b325170 Author: Timothy DeHerrera Date: Sat Dec 12 21:43:09 2020 -0700 pkgs#miningcore: init at 50 commit 1b7fb9214dd36d2a1bce5fc95058a0cbf3dfab63 Merge: 0623b00 fd1dd69 Author: Timothy DeHerrera Date: Fri Dec 11 11:24:04 2020 -0700 Merge pull request #29 from nrdxp/rebuild-fix shell: alias rebuild to nixos rebuild commit fd1dd69566942e91258d23af678e3e312245f5fa Author: Timothy DeHerrera Date: Fri Dec 11 11:21:53 2020 -0700 shell: alias rebuild to nixos rebuild Fixes #27 commit 0623b009249992ba7ce2721c145c20f3bdc86420 Author: Timothy DeHerrera Date: Thu Dec 10 13:10:53 2020 -0700 kakoune: fix nix linting for new version commit 13c3c67667da280628f179fb9759301bbe196b88 Merge: c403cd1 60de68f Author: Timothy DeHerrera Date: Thu Dec 10 09:28:38 2020 -0700 Merge pull request #26 from krishxmatta/fix-doc-typo DOC.md: Fix declaration typo commit 60de68fc5cb03cf1b26be30d2385f65f616e7346 Author: Krish Matta Date: Sun Dec 6 16:24:01 2020 -0500 DOC.md: Fix declaration typo commit c403cd1c32fc5c1b4d126d35855f7368073a2a4e Author: Timothy DeHerrera Date: Sat Dec 5 18:13:13 2020 -0700 update: small fixes after version bump commit ece0f8f8a2651ac0ab4f7b58da3f41646510ec02 Author: Timothy DeHerrera Date: Sat Dec 5 18:12:54 2020 -0700 cquery: is depricated; use clangd instead commit 8a5a49653bb0df19ba33d41e21b866a8d8e1cc0c Author: Timothy DeHerrera Date: Sat Dec 5 18:11:29 2020 -0700 retroarch: 1.8.9 -> 1.9.0 commit 01f63a83ff513b15bd8e4fba3d643b010fb76e19 Author: Timothy DeHerrera Date: Sat Dec 5 18:11:10 2020 -0700 redshift: point to latest wayland pr commit 069eaaa0f2374fc22f6eb71331266b8f98fa67be Author: Timothy DeHerrera Date: Sat Dec 5 18:10:50 2020 -0700 pcsx2: no need for overlay anymore commit 0f4be1b554c3af626ff11d009ced07c47279a836 Author: Timothy DeHerrera Date: Sat Dec 5 18:10:33 2020 -0700 systemd: remove systemd override commit aba4d5f759ec43f847ee6461f12f443a8c114c34 Author: Timothy DeHerrera Date: Sat Dec 5 16:37:16 2020 -0700 qutebrowser: fix pass userscript by adding rofi commit a4a447bcf375b2d8a03edb0866f2c6c12c577d20 Merge: 144ea28 dc81753 Author: Timothy DeHerrera Date: Sat Dec 5 16:32:43 2020 -0700 Merge pull request #25 from codygman/fix-segfault update to 20.09 to fix segfault commit 144ea28d1d881b0ea4b233c6615cc8803da8cb08 Merge: 22a9182 684804e Author: Timothy DeHerrera Date: Sat Dec 5 16:30:34 2020 -0700 Merge pull request #23 from adamscott/template Add extraArgs to lib.nixosSystem call to add system args commit 22a91823b09293cfa0e8184b2b4129457fed2cb3 Merge: d897b36 f528c4e Author: Timothy DeHerrera Date: Sat Dec 5 16:29:46 2020 -0700 Merge pull request #20 from ncfavier/patch-1 .gitattributes: match the entire secrets/** subtree commit dc8175379092d048ee478931ea5e94e671a2f322 Author: codygman Date: Tue Dec 1 21:16:04 2020 -0600 update to 20.09 Also fixes #24 by using recommended home-manager commit 684804ebe026aaad2c6bbcff2166222ebff124d8 Author: Adam Scott Date: Wed Nov 18 13:35:08 2020 -0500 Add extraArgs to lib.nixosSystem call to add system args. commit f528c4e4499b457de1a490eafb7812004f857407 Author: Naïm Favier Date: Sun Aug 9 03:17:07 2020 +0200 .gitattributes: match the entire secrets/** subtree A single star would only match a single level. commit d897b364c6c55e7ccedb6f0b7f7420684b745c8a Author: Timothy DeHerrera Date: Tue Aug 4 13:44:11 2020 -0600 profiles: reorganize commit 01d916f379d7bbe9500e2c03a871c5af3c8bd72f Author: Timothy DeHerrera Date: Tue Aug 4 13:23:24 2020 -0600 profiles: add symlink to user/profiles commit 102aeac8f46e09f7dce26f1d6d31e693cc2d6abd Author: Timothy DeHerrera Date: Tue Aug 4 01:04:37 2020 -0600 games: fix dependency commit 10abd8cb711f7ab5a0232cdffb0f0d2427a196eb Author: Timothy DeHerrera Date: Tue Aug 4 00:45:33 2020 -0600 gamemode: remove pkg from packages commit c7c74152d356ad21fce4536a3194dc66b6ecdbee Author: Timothy DeHerrera Date: Tue Aug 4 00:45:11 2020 -0600 graphical: reorganize dependant profiles commit a6506bc80ddda1fcae4f9b0a2ec3ee284b3b9bd5 Author: Timothy DeHerrera Date: Tue Aug 4 00:38:23 2020 -0600 games: don't use gamemode module commit 4cff4dfa0f228b666bdd52948566cb8eb19cb4f8 Author: Timothy DeHerrera Date: Tue Aug 4 00:25:28 2020 -0600 gamemode: mark as broken commit d3105265d3e94ac5020e6ebbff4b921ee4a2d08e Author: Timothy DeHerrera Date: Tue Aug 4 00:11:08 2020 -0600 hosts: add configurationRevision commit 1cec06738555fdd21993d627f5ca036f21fd2abe Author: Timothy DeHerrera Date: Sun Aug 2 22:54:52 2020 -0600 nix-zsh-completions: enable `nix-command` support commit 219975f9ccfe0e44fec7fa876eff677507a4511e Author: Timothy DeHerrera Date: Sun Aug 2 21:26:00 2020 -0600 packages: export overlays as packages commit 7219c387123c02f7c9d9f93422eae851c1958f2c Author: Timothy DeHerrera Date: Sun Aug 2 16:23:35 2020 -0600 NUR: remove NUR support commit 090cc0aa325a39e401658cdb8fb51757fb494f3d Author: Timothy DeHerrera Date: Sun Aug 2 16:10:53 2020 -0600 README: simply and update commit 1870fa29bd8e73cfe371255345c8883b26dc2319 Author: Timothy DeHerrera Date: Sun Aug 2 15:24:00 2020 -0600 Revert "shell.nix: remove `rebuild` command" This reverts commit b954963e36af24dad462ad36146d581a162cf509. commit c09d867f11c4649f3623ee56ebe74648af74ae65 Author: Timothy DeHerrera Date: Sun Aug 2 14:50:05 2020 -0600 core: move into subdir commit c8e3177373dcfe664a2b53cbec5a0c5f7e08df4b Author: Timothy DeHerrera Date: Sun Aug 2 14:46:16 2020 -0600 overrides: fix overrides commit dde189fb98fbacfe556b6d6ebcf9aa0b3bb92903 Author: Timothy DeHerrera Date: Sun Aug 2 13:30:50 2020 -0600 envrc: `use flake` if available commit aa85a2eda58ecd1fd43f3744aeb3eeb6e32faf5b Author: Timothy DeHerrera Date: Sun Aug 2 13:30:03 2020 -0600 users#nixos: use git and direnv profiles commit f3f73c2b7b13c945320379c1147de9e1c378dee5 Author: Timothy DeHerrera Date: Sun Aug 2 13:29:42 2020 -0600 users#direnv: init profile commit cdc9960c55ca04d0674a49fd8daefd2900d47543 Author: Timothy DeHerrera Date: Sun Aug 2 13:29:31 2020 -0600 users#alacritty: init profile commit d225760ebe25600b5c2adf90c984ef6530b7463a Author: Timothy DeHerrera Date: Sun Aug 2 13:29:14 2020 -0600 users#git: init profile commit 60ae677683a759b91e9b36a3801239e9f3232573 Author: Timothy DeHerrera Date: Sun Aug 2 13:28:41 2020 -0600 core: enable direnv in bash commit 39c1a4867406abe07b02c1e6ee764ebc06c5d0ce Author: Timothy DeHerrera Date: Sat Aug 1 22:29:42 2020 -0600 flake: add template output commit 893bf5b6a1851441d72e8540e461a6ccb2aaaa72 Author: Timothy DeHerrera Date: Sat Aug 1 22:23:35 2020 -0600 shell: proper shell escape commit 93c2a3506b59a21c5dad34992af3e5d5d0118ea5 Author: Timothy DeHerrera Date: Sat Aug 1 22:12:15 2020 -0600 core: add nix flake alias commit 5e0ca31d0220e2a1f1d95ec8974f162cda487d06 Author: Timothy DeHerrera Date: Sat Aug 1 22:08:41 2020 -0600 flake: rename flake inputs and add overrides Now you can add packages to the list in pkgs/override.nix and they will be pulled in from nixpkgs master instead of the default NixOS flake when installed. commit 068be3f5bf3eb568edf5136b6d4ed0e1b9805dd2 Author: Timothy DeHerrera Date: Thu Jul 30 23:32:53 2020 -0600 lint: remove `//`, replace with `recursiveUpdate` commit 10171142e501fbc6e8e1745bb7e31ef6587704e0 Author: Timothy DeHerrera Date: Thu Jul 30 22:49:41 2020 -0600 format: upgrade nixpkgs-fmt commit 6ad7b4eedab4de73835b31e73f832a3c3df00500 Author: Timothy DeHerrera Date: Thu Jul 30 22:49:26 2020 -0600 xmonad: remove touchtoggle commit 2369f43398f5734011fe341ec828b1b1efa05d8d Author: Timothy DeHerrera Date: Thu Jul 30 22:17:28 2020 -0600 format: apply nixpkgs-fmt commit 14edf3fd1927286669d3dcb1d6eeb027b711352b Author: Timothy DeHerrera Date: Thu Jul 30 22:13:41 2020 -0600 fix various linting errors throughout the repo * replace `rec` attrs with let bindings * remove unused args commit 9ba71d5b6285bad96ae55c76b6ed749072220184 Author: Timothy DeHerrera Date: Thu Jul 30 22:05:36 2020 -0600 replace nixfmt with nixpkgs-fmt nixpkgs-fmt looks like it is going to be the standard formatter for nixpkgs, so we should follow suite. commit 3501100952948103517c57499411f7c5e68bf8bd Author: Timothy DeHerrera Date: Thu Jul 30 15:31:45 2020 -0600 flake.lock: update nixpkgs nad unstable commit 7e93ef7ccf9283bb61ff6a52e1d8d35499fc5a62 Author: Timothy DeHerrera Date: Thu Jul 30 15:29:58 2020 -0600 flake: move pathsToImportedAttrs to utils commit 2d5471681d1afeb14ac567f6688ba03f53fb88cc Author: Timothy DeHerrera Date: Wed Jul 29 23:39:24 2020 -0600 kakoune: add dhall lint and format commit d478059fe82ea4d77980906fa9d147c8a7075eaa Author: Timothy DeHerrera Date: Wed Jul 29 16:45:51 2020 -0600 networkmanager: don't update dns from NM commit c55d60ef2714c528c69840cb122656b3ad4805b7 Author: Timothy DeHerrera Date: Sun Jul 26 22:24:40 2020 -0600 graphical: remove firefox commit 6d64118e26329f0a25d8390242b3288993332f9a Author: Timothy DeHerrera Date: Sun Jul 26 22:24:28 2020 -0600 shell: use starship for bash and zsh commit 5d8413a85a5bafb977995d154a4c57bfd7d551e3 Author: Timothy DeHerrera Date: Sun Jul 26 22:18:59 2020 -0600 pkgs#unstable: remove specialArgs The `specialArgs` defined in `hosts` has kept some modules from working in external flakes. Instead, we simply enumerate packages in `hosts` which should be pulled from `unstablePkgs`. commit 1373380a91dc08bde5a269265a576883a98a7f76 Author: Timothy DeHerrera Date: Sun Jul 26 16:03:51 2020 -0600 flake#nixosModules: add binary cache as module commit 1dddafdfcf43b53d70333cd9160f2db45cf16680 Author: Timothy DeHerrera Date: Fri Jul 24 20:20:24 2020 -0600 core: remove network from nix search alias commit 13eb4ec2333f01473c08676fe22ae19f289f7816 Author: Timothy DeHerrera Date: Thu Jul 23 17:06:07 2020 -0600 core: alias for search nixpkgs commit fff06c44f73bed717f52cbf0dde723455a090792 Author: Timothy DeHerrera Date: Thu Jul 23 17:03:42 2020 -0600 core: add some flakes to system registry commit e37634fb80c45772c3bc48f7b110dd9f8a023eea Author: Timothy DeHerrera Date: Thu Jul 23 17:03:08 2020 -0600 shell.nix: don't override NIX_CONF_DIR commit 093513e3139df6316dfc382603d0d12306ee3d45 Author: Timothy DeHerrera Date: Tue Jul 21 14:34:21 2020 -0600 networkmanager: use resolved and set dns over tls commit 29f5382539d677af649ade978ff8e46d8bc05579 Author: Timothy DeHerrera Date: Mon Jul 20 18:53:21 2020 -0600 direnv: add flake profile so shell isn't GC'd commit cd44832dc1ef95dfbe9437a11f22a9a7cdf58b64 Author: Timothy DeHerrera Date: Mon Jul 20 18:45:25 2020 -0600 purs: show user when root commit 364a25a7f2e2d0934e6d3f061670930c0c61b150 Author: Timothy DeHerrera Date: Mon Jul 20 18:39:45 2020 -0600 stubby: remove immutable attribute commit 455ac24a27cb64733174698d5ba48e0acd721418 Author: Timothy DeHerrera Date: Mon Jul 20 18:07:26 2020 -0600 im: riot renamed to element commit bb8917559053b1bb41938a9a436ca97a85c1e359 Author: Timothy DeHerrera Date: Mon Jul 20 18:04:37 2020 -0600 core: add jq commit 8d7317bd574d75d842ffb36adbda03a18977c9d2 Author: Timothy DeHerrera Date: Mon Jul 20 18:03:08 2020 -0600 kakoune: fix nix linting by using `nix-linter` commit 34f27bd3f3f6e2cd3dd6bce6f9a098c90c2a3da5 Author: Timothy DeHerrera Date: Thu Jul 16 18:43:28 2020 -0600 pkgs#purs: show user@host inside ssh session commit 42ed7910b1d5da6de0f1af2ddab738814ce0cadc Author: Timothy DeHerrera Date: Thu Jul 16 15:27:39 2020 -0600 core: add core to module list commit 27fe99a85d5348f21a8b5b7edeb92e06a644ec82 Author: Timothy DeHerrera Date: Thu Jul 16 15:17:12 2020 -0600 shell.nix: pass command line options to build-iso commit 857537342a7d726cffc9fbcb8d188474d27400d2 Author: Timothy DeHerrera Date: Thu Jul 16 15:16:52 2020 -0600 stubby: make resolv.conf immutable commit eab95c0265da1c4b53f7e59780c5e206d37485fb Author: Timothy DeHerrera Date: Thu Jul 16 15:16:27 2020 -0600 core: lower min-free commit a163cb6edbb00d9ca1b9af2a57a86b8080c959f2 Author: Timothy DeHerrera Date: Thu Jul 16 15:15:13 2020 -0600 core: move kernel out of core profile The boot options and packages moved from core are more appropriate in graphical. commit c1996b17223c0c816fadff10ddf6cdc40f66525b Author: Timothy DeHerrera Date: Tue Jul 14 17:32:01 2020 -0600 qutebrowser: modify some privacy settings commit 446b906cfdcf8f0dd8c541f59b15b5f89a2b8d77 Author: Timothy DeHerrera Date: Tue Jul 14 17:31:09 2020 -0600 adblocking: update to latest hosts commit 7df6fdaab552dc51b075fde68f218d40948deeef Author: Timothy DeHerrera Date: Mon Jul 13 22:04:34 2020 -0600 hosts#NixOS: add fileSystems to pass checks commit 90aa1f4224668446d1733a16e8bb0847a61fc600 Author: Timothy DeHerrera Date: Mon Jul 13 21:48:01 2020 -0600 flake: update lock file commit 1ca628b3bd2982e02561a7a4db0f2dd06007a6ba Author: Timothy DeHerrera Date: Mon Jul 13 20:07:32 2020 -0600 core: add `min-free` to `nix.conf` commit c9495ea8812b8f3c23e7ae13492a8199bb42a1d9 Author: Timothy DeHerrera Date: Mon Jul 13 20:00:47 2020 -0600 direnv: use `nix print-dev-env` In order to increase determinism in the build environment, we are having direnv load the shell environment from the flake's `devShell` output, instead of the traditional `nix-shell` approach. Of course, one can still enter a `nix-shell` manually on a system without flake support installed. commit b954963e36af24dad462ad36146d581a162cf509 Author: Timothy DeHerrera Date: Mon Jul 13 19:56:39 2020 -0600 shell.nix: remove `rebuild` command `nixos-rebuild` now works perfectly with flakes so this is no longer required. A new command `build-iso` is still available so that building a NixOS image is still possible. commit 4456d570cc3484658c1c12a5774fee504da9ba7a Author: Timothy DeHerrera Date: Fri Jul 10 18:28:14 2020 -0600 cachix: add personal cachix information No profile imports it by default, but if the user wishes to benefit from having some of the packages expressed in this flake pulled down from the cache instead of built locally, they can easily import ./cachix.nix from any profile or host. commit 4f91c0c6615649a3819bc9415fc0bbc6134798e2 Author: Timothy DeHerrera Date: Thu Jul 9 00:45:05 2020 -0600 flake: update lock file commit 60d998073468348adc1dddeaf78123028a90ad18 Author: Timothy DeHerrera Date: Thu Jul 9 00:23:54 2020 -0600 README.md: mention new nixops support commit 4ebf259d11930774b3a13b370b955a8765bfcae6 Author: Timothy DeHerrera Date: Thu Jul 9 00:05:24 2020 -0600 modules#steam: create xsession for Steam commit e9be8e5f5eab0971f6fb07d3b77ec59538d91d44 Author: Timothy DeHerrera Date: Thu Jul 9 00:04:42 2020 -0600 flake: base unstable on master commit 8b37f63b2c5a1c8b6868650f21c6854195c3d1b5 Author: Timothy DeHerrera Date: Mon Jul 6 18:25:32 2020 -0600 core: add nmap to core commit 86aaa62f970423ddfc55a440ea647e2fec6f57e7 Author: Timothy DeHerrera Date: Thu Jun 25 21:56:15 2020 -0600 core: add whois to core packages commit 77a635348fea4b45da2804c9154c5750454e52a3 Author: Timothy DeHerrera Date: Thu Jun 25 21:54:34 2020 -0600 graphical: set volume settings via window manager sound.mediaKeys doesn't work with pulseaudio enabled, but some programs e.g. Firefox require it. commit 51ef800af6071ffb13c1c44d733572b5090f55fe Author: Timothy DeHerrera Date: Thu Jun 25 21:52:40 2020 -0600 retroarch: 1.8.8 -> 1.8.9 commit ae74fb0e9a1ebd5c913b9f4e7c65932615ad44a7 Author: Timothy DeHerrera Date: Thu Jun 25 21:51:35 2020 -0600 sway#waybar: fix time format commit 37dac0d77d0942dfc43d9b5b71f92a723e15eeea Author: Timothy DeHerrera Date: Sat Jun 20 14:02:31 2020 -0600 profiles#im: init commit 43820d08fc04c4185632a9e746cefcd62db41fc5 Author: Timothy DeHerrera Date: Sat Jun 20 13:59:50 2020 -0600 graphical: fix network manager password storage commit b2d6471694efe962cdb7aceb81f867b8d255c8f8 Author: Timothy DeHerrera Date: Sat Jun 20 13:59:34 2020 -0600 profiles#networkmanager: init commit 21f0320dcab1705e24a4672fe158a0eec80b5212 Author: Timothy DeHerrera Date: Fri Jun 19 15:13:28 2020 -0600 sddm-chili: simplify dependencies commit d1c0b0f6ecb4cfd4f860d43e649c53ba172a68c6 Author: Timothy DeHerrera Date: Fri Jun 19 14:55:30 2020 -0600 pkgs: add metadata and standardize commit 1c3216630dbeac435d1b5c5607dd3e529ea08643 Author: Timothy DeHerrera Date: Wed Jun 17 23:36:38 2020 -0600 ssh: init profile commit a0cef270aaa2e5580da747efa3afd001d20cdc75 Author: Timothy DeHerrera Date: Wed Jun 17 20:14:37 2020 -0600 games: add gamemode service commit 9983d0d2dfef941a2649f9ad06f8779f94764f4d Author: Timothy DeHerrera Date: Wed Jun 17 14:23:37 2020 -0600 xmonad: use volnoti and eliminate dzvol commit da1c13b8d971b5167c16b95f9c801bb567f0b33e Author: Timothy DeHerrera Date: Tue Jun 16 20:52:52 2020 -0600 laptop: add usbutils commit 38b2ba7dda92b1e7a4ba40f9b7ee06abd4b58e7f Author: Timothy DeHerrera Date: Tue Jun 16 20:52:14 2020 -0600 games: add wii-u-gc-adapter package and service commit adce24be8bdee76df3964abc9e9e1f1163b48c6c Author: Timothy DeHerrera Date: Sun Jun 14 13:48:08 2020 -0600 games: update retroarch to latest version commit dc230fa066d2c41b708c938d178c193269a241b3 Author: Timothy DeHerrera Date: Sun Jun 14 12:46:44 2020 -0600 Revert "graphical: disable pulse, use alsa instead" This reverts commit 8706a1ca533082673e2a96e060e1fbcff60b6bf5. commit f4845a8f7f99ffc8ad7b4f81e0744bf7824cfb80 Author: Timothy DeHerrera Date: Sun Jun 14 12:41:00 2020 -0600 graphical: fix sddm without having to use plasma5 commit 7027feba31d486ba9aef12941b9a962218619058 Author: Timothy DeHerrera Date: Sun Jun 14 12:39:10 2020 -0600 graphical: fix icon theme commit 242787797178b9001d3d4a02852ff68974f3ec1f Author: Timothy DeHerrera Date: Sun Jun 14 12:30:40 2020 -0600 configuration.nix: fix modules import commit 66b12f4e80ef467d7ab25be5ef7f5d9f67dd40d0 Author: Timothy DeHerrera Date: Sun Jun 14 12:30:24 2020 -0600 laptop: add bluetooth support commit ea1d06c017b847a2c16e1d11da2f60ab6210d0ac Author: Timothy DeHerrera Date: Sun Jun 14 12:30:01 2020 -0600 games: add pcsx2 and steam-hardware commit 1efc3eab51b5fbdaeca59495789d7d27981efebc Author: Timothy DeHerrera Date: Sat Jun 13 09:35:26 2020 -0600 xmonad: patch slock to include window title needed for reliable focus exclusion from picom, so that screen contents aren't leaked while locked. commit 8ae4b62d777ccdbb959293b6234cd39ff0a5e7cf Author: Timothy DeHerrera Date: Fri Jun 12 19:37:17 2020 -0600 flake: update lock file commit 3653d4c5455e244460ea8be904477861395e6b35 Author: Timothy DeHerrera Date: Fri Jun 12 19:19:14 2020 -0600 qutebrowser: remove deprecated font option commit 05a798a56e9cd9aba0231319227a5ea500b77c4d Author: Timothy DeHerrera Date: Fri Jun 12 19:18:27 2020 -0600 flake: add option to install packages from nixos-unstable commit 861cb69fa17c3eb278bf717f5ddb81e4052ce9d3 Author: Timothy DeHerrera Date: Fri Jun 12 18:49:24 2020 -0600 xmonad: use monospace font commit 4f29413119eeed512815b6159397c4dcec1021fe Author: Timothy DeHerrera Date: Fri Jun 12 18:49:08 2020 -0600 xmonad: fix stoggle script commit bbdd9670951bd7b5dafba4e1dad8681b84c149c1 Author: Timothy DeHerrera Date: Fri Jun 12 18:48:36 2020 -0600 xmonad: use picom to distinguish active window commit 3d444c672edf645a9cea1758396551445c7c25d0 Author: Timothy DeHerrera Date: Fri Jun 12 18:44:32 2020 -0600 graphical: make sure libinput is available commit 8706a1ca533082673e2a96e060e1fbcff60b6bf5 Author: Timothy DeHerrera Date: Fri Jun 12 18:44:10 2020 -0600 graphical: disable pulse, use alsa instead commit 3aadbdec03b6036e733cdb2d4264c5ba102a7538 Author: Timothy DeHerrera Date: Fri Jun 12 18:42:23 2020 -0600 laptop: add acpi package commit 0d9a3b788797ee1c8a08e56729a74af8c411403c Author: Timothy DeHerrera Date: Tue Jun 9 13:24:41 2020 -0600 xmonad: add screenshot dependencies commit df88ef7bb0aa6412b97e3b42d4c510551c9e7004 Merge: d0e263a a774900 Author: Timothy DeHerrera Date: Tue Jun 9 13:11:42 2020 -0600 Merge pull request #15 from jtojnar/check-fixes flake: Fix `nix flake check` commit d0e263afa5b4b6245f55453810a0125e0d839431 Author: Timothy DeHerrera Date: Tue Jun 9 13:05:32 2020 -0600 graphical: add xsel to packages commit 0aa797ef4bcf222369859f5010ee60484a445ecd Author: Timothy DeHerrera Date: Tue Jun 9 13:02:14 2020 -0600 tmux: fix plugins commit 3769abafa3bf1d15ef6de0224e77d183e1c7b696 Author: Timothy DeHerrera Date: Tue Jun 9 10:38:51 2020 -0600 laptop: init profile commit 653012f81a1a4053d5895b602b1bba189e46f9b0 Author: Timothy DeHerrera Date: Tue Jun 9 10:38:34 2020 -0600 sway: update deprecated naming convention commit 4527b96ffc41ed21c6929d9a1af0ae2ef8639ea4 Author: Timothy DeHerrera Date: Tue Jun 9 10:37:57 2020 -0600 security#mitigations: avoid http call commit ad9f0d70e8837a2c4607332e9fc61644ed3026d5 Author: Timothy DeHerrera Date: Tue Jun 9 10:37:23 2020 -0600 flake: update lockfile commit 54be96d8b6c8e812dab2456c2e3c522840c62d99 Author: Timothy DeHerrera Date: Tue Jun 9 10:36:38 2020 -0600 graphical#xmonad: init profile commit a7749005bc0d6f622cf09aafb936c55c47035e2a Author: Jan Tojnar Date: Tue Jun 2 01:17:38 2020 +0200 flake: Fix overlays for `nix flake check` It complains that: value is a list while a set was expected, at /nix/store/0qdcc831rj27wz07lrri6bnfmhvm4wrm-source/flake.nix:26:7 But nixpkgs still expects a list, so we need to pass it just the values. commit 0b14dbbc2df8dc13c4a96dac21092cc6cf8f14a1 Author: Jan Tojnar Date: Tue Jun 2 01:14:33 2020 +0200 flake: Refactor nixosModules collection We will want to reuse the prep method for overlays so let's move it higher and simplify it a bit. commit f3e52ede3c110222897c7035fc545fa7c3ccf938 Author: Jan Tojnar Date: Tue Jun 2 00:58:36 2020 +0200 flake: remove epoch It was renamed to edition: https://github.com/NixOS/rfcs/commit/cc5d0a24970a49d7da294544aff2fb3c26139635 leading to the following error: error: flake 'git+file:///home/jtojnar/Projects/nixflk?ref=template&rev=31c2b767ca7cb901040e388794b34942807719e0' has an unsupported attribute 'epoch', at /nix/store/yndrc91vlh5vm0k4nngx303q1cjm77z9-source/flake.nix:4:3 but that itself has been deprecated: warning: flake 'git+file:///home/jtojnar/Projects/nixflk' has deprecated attribute 'edition' commit 31c2b767ca7cb901040e388794b34942807719e0 Merge: a42fb66 a08c7e5 Author: Timothy DeHerrera Date: Wed May 27 09:02:52 2020 -0600 Merge pull request #14 from demyanrogozhin/bugfix/13 Fix: nix run -> nix shell commit a08c7e51843d0f5f4d7c32586659305931f08318 Author: Demyan Rogozhin Date: Thu May 21 14:55:06 2020 +0200 Fix: nix run -> nix shell commit a42fb668277f2510917b256a7ea51d26d143860f Author: Timothy DeHerrera Date: Sun Apr 26 17:45:41 2020 -0600 tmux: fix warning message commit 9af46a3dca6b57ddc32019e15eaad346e64eecdf Author: Timothy DeHerrera Date: Thu Apr 23 12:03:55 2020 -0600 flake: update to upstream commit ce1087880d94465921cb869dd841714347385cfa Author: Timothy DeHerrera Date: Sun Feb 9 13:18:15 2020 -0700 develop: add clang as default cc commit ca2e2066856c1aeba3226d19b438a0c17057b65c Author: Timothy DeHerrera Date: Sun Feb 9 13:16:27 2020 -0700 graphical#sway: split tmux vetically on start commit a67ca5d03bc59fed89491bc167a41d8dec367f89 Author: Timothy DeHerrera Date: Sat Feb 1 21:10:09 2020 -0700 remove unnecessary recursive attribute sets commit 36a555f807d2d41e207252277596624074da26a1 Author: Timothy DeHerrera Date: Sat Feb 1 20:37:43 2020 -0700 DOC.md: fix typo commit 66ee2b5c366842fc7d3f265dd38291c79c66c896 Author: Timothy DeHerrera Date: Sat Feb 1 15:07:02 2020 -0700 overlays#qutebrowser: fix invisible tooltip hover commit 9b7f3199963f79f5ab9b2f894574b437457fa133 Author: Timothy DeHerrera Date: Sat Feb 1 10:20:29 2020 -0700 develop#python: use ptpython as default repl commit 4c79faac59cfc1018b2a0a63264d04d913878507 Author: Timothy DeHerrera Date: Fri Jan 31 09:49:47 2020 -0700 develop#python: init profile commit a53bd30aaced628d40c7b83dd52a8f0fd6f3f6b9 Author: Timothy DeHerrera Date: Thu Jan 30 10:12:24 2020 -0700 nrd: add screenshot tools for wayland commit a69df563a091e1053e2952bec968a8878a575b7e Author: Timothy DeHerrera Date: Wed Jan 29 09:25:23 2020 -0700 kakoune: add python3 for avilable repl commit d5ba9f617374aaa9552f63d34f21960c963fbbba Author: Timothy DeHerrera Date: Wed Jan 29 08:50:07 2020 -0700 flake.nix: define `pkgs` in flake Set the global package set via `hosts/default.nix` passed in from its definition in `flake.nix`. commit 331fa795b1d9d74058a59f2708016e6915beb120 Author: Timothy DeHerrera Date: Sat Jan 11 19:56:12 2020 -0700 README.md: minor fix commit 7064f53d09a2f3b2b7446dd3d6f53125fb17555a Author: Timothy DeHerrera Date: Sat Jan 11 19:51:23 2020 -0700 README.md: cleanup and clarify commit d5598cfb2426f7ff22820e8af513083fdc1a6d35 Author: Timothy DeHerrera Date: Sat Jan 11 00:29:16 2020 -0700 README.md: point to NUR usage header commit fe0e81b72e5dc0e8858a0b288828fff0bfa37a30 Author: Timothy DeHerrera Date: Sat Jan 11 00:24:12 2020 -0700 niximg: fix nixos user commit 8d8ae7ec7b207378ae8e6d7325c0d3e24b0777a7 Author: Timothy DeHerrera Date: Sat Jan 11 00:05:34 2020 -0700 flake.lock: update commit e078e7a22943d6ba1bc3a72da212cc2d6182df45 Author: Timothy DeHerrera Date: Fri Jan 10 23:49:18 2020 -0700 DOC.md: split off from README.md Keep the README.md lean and use DOC.md for more detailed explanations. While revising user documentation, a default `nixos` user profile was created, which serves as a goood base example. commit 9b64b50ee89166212eed6998fa15c364eb2c4a1e Author: Timothy DeHerrera Date: Fri Jan 10 22:39:42 2020 -0700 flake.nix: consistent `default.nix` semantics commit cef548d232de0c032141b78f38ef940a13b72c86 Author: Timothy DeHerrera Date: Fri Jan 10 21:55:09 2020 -0700 Revert "Merge branch 'nur' into template" This reverts commit 48afb873c1e4131b519a10ff2371a92ab98f54e3, reversing changes made to 7e58e0457e2c079484207e3a7e5d979377a6cfc8. commit 48afb873c1e4131b519a10ff2371a92ab98f54e3 Merge: 7e58e04 db5bc5f Author: Timothy DeHerrera Date: Fri Jan 10 00:41:03 2020 -0700 Merge branch 'nur' into template commit db5bc5f57cf8f059003fed960315c138c065c414 Author: Timothy DeHerrera Date: Fri Jan 10 00:38:59 2020 -0700 README.md: add NUR usage commit 506e810b9f753bc409836a1395826506e2430219 Author: Timothy DeHerrera Date: Fri Jan 10 00:10:59 2020 -0700 flake: initial NUR support commit 7e58e0457e2c079484207e3a7e5d979377a6cfc8 Author: Timothy DeHerrera Date: Fri Jan 10 00:10:01 2020 -0700 flake: update flake.lock commit ed6a3e2e0006b1a6e7e54b06b4b62370b6c4147e Author: Timothy DeHerrera Date: Wed Jan 8 13:40:53 2020 -0700 postgres: init profile commit fd50518214c6a5bc7958f3789364ed6c4b86e4c0 Merge: 86a1974 413a6c7 Author: Timothy DeHerrera Date: Wed Jan 8 13:33:08 2020 -0700 Merge pull request #7 from nrdxp/enhance/mitigations security#mitigations: init module commit 413a6c75f6b1ae1f6650035fe8da8a84753ced92 Author: Timothy DeHerrera Date: Wed Jan 8 13:28:49 2020 -0700 security#mitigations: init module Resolves #6 by breaking out the disabling of mitigations into it's own module. Now users must explicitly accept the risk of disabling Spectre and Meltdown mitigations with `security.mitigations.acceptRisk` in addition to actually disabling them with `security.mitigations.disable`. commit 86a1974010ac6b862755ea48de6f11f0831520be Merge: 030eb7d fc3b375 Author: Timothy DeHerrera Date: Wed Jan 8 12:41:38 2020 -0700 Merge pull request #5 from bbigras/patch-1 fix typos in README.md commit 030eb7d9c216d1e59992ef0ace6506448d85e682 Author: Timothy DeHerrera Date: Tue Jan 7 16:37:46 2020 -0700 README.md: advise about nix-channels deprecation commit fc3b3753819cb00e3570d979cf6eccbecd8abbc3 Author: Bruno Bigras Date: Tue Jan 7 15:57:55 2020 -0500 fix typos in README.md commit 7d69d15ff51c206c00eab62ad63fb26f50926534 Author: Timothy DeHerrera Date: Tue Jan 7 13:11:14 2020 -0700 virt: add to exported profiles commit ef5d61af7633dcea7e0b1c42fbef3d40532e2ab0 Author: Timothy DeHerrera Date: Tue Jan 7 13:05:38 2020 -0700 pkgs#pure: init at 0e87bd8 commit 56be97690f888a8ad43fd698d7b13773ba40457f Author: Timothy DeHerrera Date: Tue Jan 7 13:04:32 2020 -0700 README.md: expand on quick setup details commit 6d537c35c4bebc57740e2ab9b92acac99abdad6b Author: Timothy DeHerrera Date: Tue Jan 7 13:02:35 2020 -0700 shell.nix: run nix build as root Variables mist be preserved so use `sudo -E`. Fixes #4. commit 0bf18acdd47879c81f10f7827db7a665613f2b6c Author: Timothy DeHerrera Date: Mon Jan 6 23:44:54 2020 -0700 virt: init profile commit b18c93a1242cca6910c92a1a75b89e9ef8f992c1 Author: Timothy DeHerrera Date: Mon Jan 6 23:44:35 2020 -0700 rebuild: iso builds "out of the box" commit c6cb43fc21257e290abea3afde5af8007b59a9cc Author: Timothy DeHerrera Date: Mon Jan 6 22:35:33 2020 -0700 develop#zsh: check of ~/.zcompdump exists commit 8f52fbd80726ef60ab1c3cb74c9c9b6c30d46fc2 Author: Timothy DeHerrera Date: Mon Jan 6 17:24:25 2020 -0700 README.md: emphasize that users are profiles commit 5b49f1d1bfba59c06b723bb2e3a001591e7ab5fe Author: Timothy DeHerrera Date: Mon Jan 6 16:57:35 2020 -0700 README.md: removed flake vcs info by mistake Adding it back resolves #2. commit 31c3fd8acc4a1041c27dacf71f58bb7a99b09eea Author: Timothy DeHerrera Date: Mon Jan 6 00:38:12 2020 -0700 core: don't set root password commit c914a607dabfb4d3ff7740425392ffda8fb6b14b Author: Timothy DeHerrera Date: Mon Jan 6 00:26:48 2020 -0700 flake: changed by mistake; revert commit 32381093ad9fc8f3a152b108b44b649c19f61fe6 Author: Timothy DeHerrera Date: Mon Jan 6 00:16:21 2020 -0700 README.md: clarify overlays better commit 395be3f74cb43d4454f02e6614a080e43b7bb26d Author: Timothy DeHerrera Date: Mon Jan 6 00:07:26 2020 -0700 legacy: pull in all overlays commit 4cf804880711e27e752ec2a7c6472f14abb8efab Author: Timothy DeHerrera Date: Mon Jan 6 00:01:00 2020 -0700 overlays: init overlays directory Overlays now live globally in the overlays directory. They will be pulled into the flake and the rest of your configuration automatically from there. commit e92bb060eefdaa7255f3435b808bd97dcf6a46a6 Author: Timothy DeHerrera Date: Sun Jan 5 23:01:00 2020 -0700 utils: rename `utils` to `usr` for module args Avoids a name conflict. commit 6770621c707d5d61bdca27cfe8ebbaa0713fd1dc Author: Timothy DeHerrera Date: Sun Jan 5 22:41:19 2020 -0700 utils: add to specialArgs All the utility functions defined in lib/utils.nix are now easily accessible via NixOS module arguements, i.e. `{ utils, ... }:` commit f04bc17c895e88441bcb86b70bb50a7381a45935 Author: Timothy DeHerrera Date: Sun Jan 5 18:57:04 2020 -0700 README.md: don't specify branch name commit 7caae5b8bc474226f97df24eb9b629bc42bae485 Author: Timothy DeHerrera Date: Sun Jan 5 00:01:20 2020 -0700 develop:zsh: new shell functions * rnm: don't ever repeat yourself in the shell * chext: easily change file extension commit 97c87299de2e94a248c1f48ec6714357ba86dd43 Author: Timothy DeHerrera Date: Sun Jan 5 18:26:09 2020 -0700 README.md: further refinements commit 9670fa4b0fd0f82e2f6896d54851d6ea861f9f23 Author: Timothy DeHerrera Date: Sun Jan 5 15:39:59 2020 -0700 Revert "utils: now lives in lib.utils globally" This reverts commit c9944b411ed3bdbbbea6c972dde26242e8a51a57. Causes infinite recursion, revert for now while exploring possible solutions. commit c9944b411ed3bdbbbea6c972dde26242e8a51a57 Author: Timothy DeHerrera Date: Sun Jan 5 03:45:59 2020 -0700 utils: now lives in lib.utils globally commit e7153d31fe4c92aa5e14caec9d286592bff5154d Author: Timothy DeHerrera Date: Sun Jan 5 03:43:28 2020 -0700 README.md: be more concise commit 6a6efbdda00c2726b27d4186df3f1288691c151c Author: Timothy DeHerrera Date: Sat Jan 4 17:21:01 2020 -0700 Update issue templates commit b328616d76de796c890a3293cfe9ca481324a6ff Author: Timothy DeHerrera Date: Sat Jan 4 17:16:59 2020 -0700 CONTRIBUTING.md: break off from README.md commit 5976084fa200a3bf337f1cb3bb382c68ec9b51b2 Author: Timothy DeHerrera Date: Sat Jan 4 16:40:16 2020 -0700 configuration.nix: import module list directly commit a4a1908af231a73a29f95ac604bd8ea80ac70a99 Author: Timothy DeHerrera Date: Sat Jan 4 16:32:57 2020 -0700 README.md: reflect changes to profiles commit a3dcc4f6bc2ae962d53a73711e2cf09ad92ce529 Author: Timothy DeHerrera Date: Sat Jan 4 16:23:15 2020 -0700 profiles: convert to list same as modules commit ae303b39fdf6077bb79d4b35f23ba6438f60b17b Author: Timothy DeHerrera Date: Sat Jan 4 16:08:49 2020 -0700 modules: convert to list to match nixpkg sematics commit 0b131c0bf16ed80e9f68ba57aecf82368b701fcb Author: Timothy DeHerrera Date: Sat Jan 4 15:33:51 2020 -0700 README.md: add missing apostophe commit 8ab0a928505aa76bd62c28efcf4b0f0647186ee0 Author: Timothy DeHerrera Date: Sat Jan 4 15:30:00 2020 -0700 Idiomatic semantics for overlays changed The idiom of 'self: super:' is changing upstream to 'final: prev:'. commit a9765f7df692567686d88943bbf64ede1c59167f Merge: 16b8136 998ab8c Author: Timothy DeHerrera Date: Sat Jan 4 13:52:37 2020 -0700 Merge pull request #1 from bbigras/patch-1 fix some typos in README.md commit 998ab8ca42072a135d4ef74d1c52720817191e92 Author: Bruno Bigras Date: Sat Jan 4 00:51:23 2020 -0500 fix some typos in README.md commit 16b8136f50b17858e347fd7414b2ca05597aaef7 Author: Timothy DeHerrera Date: Fri Jan 3 22:06:31 2020 -0700 change formatter to nixfmt commit 916add29213ce58152706b8b1a1ff12836e8f4a6 Author: Timothy DeHerrera Date: Fri Jan 3 21:30:27 2020 -0700 profiles: export additional subprofiles commit c2fa18a063caf573463c47e00025b396033586e7 Author: Timothy DeHerrera Date: Fri Jan 3 21:19:53 2020 -0700 graphical#qutebrowser: init The current qutebrowser configuration is sufficiently complex that it benefits from being factored out into a separate subprofile. An additional benefit is that this subprofile is now exported via the `nixosModules` flake output. commit 3e43465bc6ebcf9110bb3c2e6d809eb48272d0fd Author: Timothy DeHerrera Date: Fri Jan 3 20:57:52 2020 -0700 core: move mtr to develop profile commit cd8900dd47d3697ad5abf78ec9966401daa14d02 Author: Timothy DeHerrera Date: Fri Jan 3 20:37:07 2020 -0700 README.md fix incorrect punctuation commit 0ad4236bcb37cb20cdd6ef907dc60f4102f47d65 Author: Timothy DeHerrera Date: Fri Jan 3 20:23:13 2020 -0700 README.md: refine language and clarify more commit 425f7894a423d0a97c4e43f5fb43a300959ed4a0 Author: Timothy DeHerrera Date: Fri Jan 3 20:01:22 2020 -0700 export profiles via flake outputs Export those listed in `profiles/default.nix` to be included in the flake output `nixosModules` for easy use in other flakes. commit 4cc03cae50f04113ec7e3f74c0a5a26351c4098c Author: Timothy DeHerrera Date: Fri Jan 3 19:12:11 2020 -0700 remove user specific host hp500281 commit 46e41ccc75cf5cd12d5ccb12d508e2eeb036e425 Author: Timothy DeHerrera Date: Fri Jan 3 19:07:42 2020 -0700 README.md: link to nrdxp branch commit e93ac2f7906fefcf1638ebb46856266fbe365301 Author: Timothy DeHerrera Date: Fri Jan 3 18:27:52 2020 -0700 flake.nix: name flake inputs The flake inputs can now be arbitrarily referenced from hosts/default.nix as they are all passed into it. Any input not declared at the top of hosts/default.nix can still be referenced as args.. commit 5b5d072851d7f2d75aedc783ea8c86b6d14306f5 Author: Timothy DeHerrera Date: Fri Jan 3 18:06:01 2020 -0700 users: create on entering nix-shell commit c608b607006ccb52597654f9fa4bb67ec207951a Author: Timothy DeHerrera Date: Fri Jan 3 17:57:44 2020 -0700 README.md: fix type commit 89c2e04bb397b0e6ea368f607fe55a4218358d06 Author: Timothy DeHerrera Date: Fri Jan 3 17:54:27 2020 -0700 secrets: create on entering a nix-shell commit 73d3826d64291f024b541ee63098d4f611c5b823 Author: Timothy DeHerrera Date: Fri Jan 3 17:47:17 2020 -0700 Initialize template branch Remove all idiosyncratic stuff and only leave profiles, modules and pkg definitions, which are general and applicable for any configuration. commit dd9856d519fe2a24a1fbcd0db4b85bee83dc51ca Author: Timothy DeHerrera Date: Fri Jan 3 17:06:32 2020 -0700 shell.nix: add git-crypt dependency commit a125cc339689da141dac6446e4ca5fa1132c272b Author: Timothy DeHerrera Date: Fri Jan 3 17:05:26 2020 -0700 README.md: expand on aim, and explain secrets commit c13b241b6cf3439d67c1d5bee5bfaf1a2bdc91aa Author: Timothy DeHerrera Date: Fri Jan 3 01:02:08 2020 -0700 core: empty root passwd by default commit a1a2a2c7e2a7451f077ed6864a17ce662b3d01b1 Author: Timothy DeHerrera Date: Wed Jan 1 23:17:50 2020 -0700 README.md: elaborate on project structure Provide details for contribution and bootstrapping. commit ed94fa013d791bf8c3d06ab05017e7776f266dbf Author: Timothy DeHerrera Date: Wed Jan 1 21:55:19 2020 -0700 shell.nix: basic command to build nixos `nixos-rebuild` has unstable flake support. By adding a simple rebuild command to the shell, we don't need to reply on it to switch configurations anymore. At least until it stablizes. commit 92f78f3d93af0446e96c2a1d5500390460837610 Author: Timothy DeHerrera Date: Wed Jan 1 21:01:58 2020 -0700 shell.nix: init minimal commit 11000f56e23bcef74d01213e8e1ce7cf82375265 Author: Timothy DeHerrera Date: Wed Jan 1 19:45:49 2020 -0700 niximg: use modulesPath commit 1493f43ba78540730e2bc5a5e892b18b07717455 Author: Timothy DeHerrera Date: Wed Jan 1 19:24:09 2020 -0700 flake: add packages to outputs commit a080a07b21666826f8586ba0c13dfc1be6970023 Author: Timothy DeHerrera Date: Wed Jan 1 19:21:15 2020 -0700 core: don't import file systems In order not to conflict with different kinds of configurations, i.e. nixos disk images, don't have core profile import file-systems. Instead declare `fileSystems` individually in host profiles. commit 1c797819361e141e1345e2f626d6d6ee52991adc Author: Timothy DeHerrera Date: Wed Jan 1 19:12:59 2020 -0700 niximg: init iso configuration Easily build the iso using `nix build $ISO` thanks to direnv. commit 063d05c6804a3ac3f0fd2d850d51f4f4eba2c66a Author: Timothy DeHerrera Date: Wed Jan 1 17:16:38 2020 -0700 legacy: ensure config exists commit f69c5a59f1d260c37d38f1996deef6af7b7f5f9b Author: Timothy DeHerrera Date: Wed Jan 1 16:28:45 2020 -0700 develop#zsh: load some useful functions commit 71600808b2832b51b4ba7f13686a2f6f2f484e65 Author: Timothy DeHerrera Date: Wed Jan 1 16:27:39 2020 -0700 graphical#sway: add 50/50 window split commit 9423855cb61ee9725bbb7085570cdbcd91d9a9b7 Author: Timothy DeHerrera Date: Wed Jan 1 16:26:40 2020 -0700 graphical: plasma needs pulseaudio commit 8bafdaab27f0ae6de3eee1bf902a7c7aaf3c4477 Author: Timothy DeHerrera Date: Wed Jan 1 16:26:03 2020 -0700 develop: add firejail commit 45edaf673ca5ef09e32b1b695191e0642e47872b Author: Timothy DeHerrera Date: Wed Jan 1 16:24:36 2020 -0700 modules#qbittorrent: add `openFirewall` option commit af861dd0f8f814c6d6e5ba94fed9eb45d1e6fa32 Author: Timothy DeHerrera Date: Wed Jan 1 16:23:57 2020 -0700 legacy: import modules an overlays commit c914ed2c446e988d70df01369864fe396884801e Author: Timothy DeHerrera Date: Mon Dec 30 18:42:36 2019 -0700 graphical#ffmpeg: build with svt-av1 support commit 5f05e9e80959d37e66647cd47b297ac8779a50b6 Author: Timothy DeHerrera Date: Mon Dec 30 18:05:27 2019 -0700 flake: provide overlay and overlays commit cd25fdf37c0165e9a04e6b7a0311bd11ec3e0518 Author: Timothy DeHerrera Date: Mon Dec 30 18:00:09 2019 -0700 flake: move modules to outputs commit ac5e184666435c3a81f0dd48a785dc35aedfd43b Author: Timothy DeHerrera Date: Mon Dec 30 17:45:30 2019 -0700 flake: move overlays to flake outputs commit 60f58c5a9c141d4e8b8da29b34c50b711e128259 Author: Timothy DeHerrera Date: Mon Dec 30 02:38:25 2019 -0700 graphical#sway: window niceties commit a249fe56436f6c8cc8b2bf98ef8930c0ff44bc34 Author: Timothy DeHerrera Date: Mon Dec 30 02:22:18 2019 -0700 graphical#sway: rethink autostart programs commit c1b0aac62efa6f3acd0eb23ee9d94e528d2284c0 Author: Timothy DeHerrera Date: Fri Dec 27 20:58:48 2019 -0700 flake: update lock commit 2058b189e671e68845043a5b494ee6dc244b1d2e Author: Timothy DeHerrera Date: Thu Dec 26 19:11:57 2019 -0700 develop:zsh: speed up and reformat zshrc a bit commit 667fad8f1e45ecb2ee1de91dc387d84666569f8e Author: Timothy DeHerrera Date: Thu Dec 26 18:25:02 2019 -0700 pkgs: import all packages into core overlay commit 787eb050dfd14af39e2d898d75d5ee8208eccf45 Author: Timothy DeHerrera Date: Thu Dec 26 00:23:00 2019 -0700 develop: redundant now commit aa9d439c3dc7f887a3f08077fbe79769bf2ccc64 Author: Timothy DeHerrera Date: Thu Dec 26 00:17:44 2019 -0700 core: use gotop as top commit 22e631f6c96de0c0303d495cdc2f8c9163ae24e4 Author: Timothy DeHerrera Date: Thu Dec 26 00:17:26 2019 -0700 games: init profile commit 080716f496351d39365063e32280fd1221031675 Author: Timothy DeHerrera Date: Sun Dec 22 22:24:19 2019 -0700 develop#zsh: fix exa function commit 5ae733b85470eb7a40fe44f3da17dc612e780314 Author: Timothy DeHerrera Date: Sun Dec 22 22:01:28 2019 -0700 graphical: add develop as dependency commit 5921d567795c1cea515ec77fc2fe4cdd0f3fb7ae Author: Timothy DeHerrera Date: Sun Dec 22 21:59:42 2019 -0700 develop: add DejaVu Nerd Font commit fc13190a296e660451211b746ad5cbc0ada9644e Author: Timothy DeHerrera Date: Sat Dec 21 19:08:44 2019 -0700 develop: add developer docs commit e7079c5c6345bc5ecf7bbcfd121f2c7cb69909cf Author: Timothy DeHerrera Date: Sat Dec 21 19:02:22 2019 -0700 utils: small cleanup commit 1f55960518c4e3583f995f9ea3dca093b7ca5033 Author: Timothy DeHerrera Date: Sat Dec 21 18:39:19 2019 -0700 rename configurations to hosts commit e35652cac0be31ea01f948f5bb37bb40db9c1cee Author: Timothy DeHerrera Date: Thu Dec 19 13:03:15 2019 -0700 create media group commit 3038c1db41da21eeacb1d11cda9c435f5a98a1bb Author: Timothy DeHerrera Date: Thu Dec 19 11:57:49 2019 -0700 core: better sudo and journal aliases commit e7d560a3af2001f6d7fcfc287478aafb26cdad68 Author: Timothy DeHerrera Date: Wed Dec 18 00:57:31 2019 -0700 misc#qbittorrent: init commit 27d47125571efa301a800405ae4305a967d8181a Author: Timothy DeHerrera Date: Wed Dec 18 00:34:30 2019 -0700 misc#plex: init media server commit 5fb8b0b1fa17256f6555c1228268d0b8ad5270b8 Author: Timothy DeHerrera Date: Wed Dec 18 00:00:44 2019 -0700 develop#zsh: send configuration.nix configurations COPYING flake.lock flake.nix lib local pkgs profiles README.md secrets users output to PAGER commit 28a9b4acc42b344856a964ef4e5c29096c70f1f5 Author: Timothy DeHerrera Date: Tue Dec 17 23:43:13 2019 -0700 graphical: add firefox commit 38547de891f4b65b22acc06d59ecd5c696ca7c6f Author: Timothy DeHerrera Date: Tue Dec 17 23:34:43 2019 -0700 graphical#qutebrowser: turn off spell-check commit 92648918af92c0ec80d1016ee83f27d5dd431cff Author: Timothy DeHerrera Date: Tue Dec 17 23:33:06 2019 -0700 graphical: sddm display manager commit 5f8899e7692cee738ecf3712fc8fd3fb48d693db Author: Timothy DeHerrera Date: Tue Dec 17 22:40:43 2019 -0700 flake: update lock file commit 25c606cc4ef7e47087cfe732a3fc78743206405b Author: Timothy DeHerrera Date: Tue Dec 17 20:47:43 2019 -0700 call exec from wrapper scripts commit a4f5fa96924b78d1ff102ca83b8b329c435819ca Author: Timothy DeHerrera Date: Tue Dec 17 18:53:29 2019 -0700 enable hardware acceleration commit 792e7b7c0532ace10ec7cf8bbbf04c4f642c06ca Author: Timothy DeHerrera Date: Tue Dec 17 18:10:18 2019 -0700 aliases: clean up some aliases Ensure aliases have their packages installed for man pages. Move `procs` alias from core to develop profile. commit 6368b95dcd082f7e23cb7bb23c559c6e89ab623e Author: Timothy DeHerrera Date: Tue Dec 17 18:00:31 2019 -0700 develop#kakoune: fix binary conflict commit 23db288d40a874dcf07fe3f2c23b40c8306f7b06 Author: Timothy DeHerrera Date: Tue Dec 17 17:49:26 2019 -0700 core: add default system features commit dc6690adbabb0a45bcb8a3dfbebb92fe2d7c0be8 Author: Timothy DeHerrera Date: Tue Dec 17 17:31:14 2019 -0700 develop#tmux: update status every minute commit 40fe0972c67424c7f13b816d2215c5c819ed2e9f Author: Timothy DeHerrera Date: Tue Dec 17 17:29:20 2019 -0700 add configuration.nix for compatibility recreates an impure representation of the current flake profile based on the systems current hostname. commit 7a7599fae38c08fefbe6bff18c3dc1aa19eae653 Author: Timothy DeHerrera Date: Tue Dec 17 16:26:01 2019 -0700 users#nrd: alacritty configuration commit 40d885b047c93e9094250e1b1f4f7b8d97127df0 Author: Timothy DeHerrera Date: Tue Dec 17 16:03:44 2019 -0700 configurations: maintain declarative style commit f37dbf15217cd0925d8dfbf57477806e11e59ecb Author: Timothy DeHerrera Date: Tue Dec 17 16:00:59 2019 -0700 users#nrd: add git restore aliases commit f5b89dc39a4338f8c81e689889821fecd2d8a04f Author: Timothy DeHerrera Date: Tue Dec 17 15:58:40 2019 -0700 develop#zsh: fix i function commit 2bad76157eaf4dec132227df67e664f84bcc9414 Author: Timothy DeHerrera Date: Tue Dec 17 15:56:02 2019 -0700 flake: nix flake is broken, use pkgs.nixFlakes commit b94a880a6941750c81b45fe2be7d726fbc2387a3 Author: Timothy DeHerrera Date: Tue Dec 17 15:50:39 2019 -0700 develop#zsh: compinit needs -u to trust /nix/store commit 39c80acdd1f5b3c89528ae5190fc250b19c7145f Author: Timothy DeHerrera Date: Mon Dec 16 21:16:19 2019 -0700 configurations: don't pass utils commit 1e45e959bede2b58a0eb1209c97a64ef751cbfd6 Author: Timothy DeHerrera Date: Mon Dec 16 21:15:48 2019 -0700 hp500281: add some basics commit 7f7fd97a31f0479d1c12f6a4ca2d0756d38596ee Author: Timothy DeHerrera Date: Mon Dec 16 21:13:33 2019 -0700 core: add parition tools commit 5a276c60869365b0a10c46dbcc69fa899c687dd6 Author: Timothy DeHerrera Date: Mon Dec 16 16:13:37 2019 -0700 develop#zsh: i to install pkg commit 2693437e2856c8737d6470c6f88b710ca50b694b Author: Timothy DeHerrera Date: Mon Dec 16 15:37:31 2019 -0700 core: nix and ps aliases commit 0fff9dbd8d760a364edb25cf689d481ce635127c Author: Timothy DeHerrera Date: Mon Dec 16 15:36:20 2019 -0700 setup cdr commit 831f9b1b5c2a1edf14428df3c6792c82350b1bcd Author: Timothy DeHerrera Date: Mon Dec 16 02:41:55 2019 -0700 misc#make-linux-fast-again: init commit 1bac4a5ab6749ddb21b16c74cd73f430366ca8ea Author: Timothy DeHerrera Date: Mon Dec 16 02:36:51 2019 -0700 misc#adblocking: init commit 57abccc95c89385f6683c8def484e39f3aa514bc Author: Timothy DeHerrera Date: Mon Dec 16 02:34:29 2019 -0700 misc#stubby: init commit f3f31938f61a9372462f3fd2ed7027f5af675f1b Author: Timothy DeHerrera Date: Mon Dec 16 02:29:13 2019 -0700 develop: add pass to packages commit a8ab4f7368dc03a52466d847d294b8962d761126 Author: Timothy DeHerrera Date: Mon Dec 16 02:28:11 2019 -0700 develop#kakoune: add kakboard plugin commit 31567a0fd4d5bd66167996b678d5ae3884714a64 Author: Timothy DeHerrera Date: Mon Dec 16 02:21:06 2019 -0700 graphical#sway: set wl-copy as copy command commit d05c7bed71c9f65b5c0b4051b240203c183f50ac Author: Timothy DeHerrera Date: Mon Dec 16 01:53:23 2019 -0700 users#nrd: fix gpg-agent commit 42f2f27183a7cb340f90f2f5b89ae48c3fb1f824 Author: Timothy DeHerrera Date: Mon Dec 16 00:54:46 2019 -0700 develop#graphical: init commit 60ac8ec1eac4f8057ef305afa217bb0f5075dfb8 Author: Timothy DeHerrera Date: Sun Dec 15 22:46:11 2019 -0700 develop#zsh: fix 'jj' bindkey commit ef07773e6c3ae9fca4a230048980d51e1af0fd84 Author: Timothy DeHerrera Date: Sun Dec 15 22:33:52 2019 -0700 core: n as nix alias commit 4fe8172e5bd9bb219cc23c0df501c2392f52354b Author: Timothy DeHerrera Date: Sun Dec 15 22:32:40 2019 -0700 develop#zsh: plugin to remind aliases commit 211073068f722714bf0351cfe3343e046a77bb3a Author: Timothy DeHerrera Date: Sun Dec 15 22:31:12 2019 -0700 users#nrd: use pinentry-tty commit 9cd09ff0fe98d8c12bd4ecf578d301f10c81a947 Author: Timothy DeHerrera Date: Sun Dec 15 22:30:25 2019 -0700 develop#kakoune: wrap binary to load plugins commit d0aa623d6f0634a72e6d9ee38193d223a8dd6593 Author: Timothy DeHerrera Date: Sun Dec 15 21:36:05 2019 -0700 set `NIX_PATH` to nixpkgs flake commit 78f6065bf2cb4fb4f7ab25cbc93c00aded4ccead Author: Timothy DeHerrera Date: Sun Dec 15 21:29:54 2019 -0700 core: add nix aliases commit 4488d0d754d94492c1f861e9c990a15fbdfd864e Author: Timothy DeHerrera Date: Sun Dec 15 21:24:04 2019 -0700 develop: set less as PAGER commit 87ab45c5547d338502ca6ea5e16f439877bf63ff Author: Timothy DeHerrera Date: Sun Dec 15 21:22:09 2019 -0700 users#nrd: fix gpg-agent not working commit 6139834a4aad1497640a34cddb6bf83028161bb5 Author: Timothy DeHerrera Date: Sun Dec 15 20:54:11 2019 -0700 develop#zsh: factor out functions into files Upgrade the `rg` function to only pipe to `PAGER` when output is a terminal. commit 42197cd35cb6ae24bd9539e2c9e8cff1317547fc Author: Timothy DeHerrera Date: Sun Dec 15 03:10:13 2019 -0700 users#nrd:fix broken parts commit 32a668f41ed06e7de4a81d0fefd9da984eaf7fe6 Author: Timothy DeHerrera Date: Sun Dec 15 03:07:35 2019 -0700 users#nrd:fix broken parts commit 873c3a2eef8556534f470d978763b5cb5ff4fe97 Author: Timothy DeHerrera Date: Sun Dec 15 02:55:54 2019 -0700 users#nrd: init cargo credentials commit 3b56b1fe579e6c5363037eb20da50d05da45f921 Author: Timothy DeHerrera Date: Sun Dec 15 02:46:08 2019 -0700 nrd#git: add diff aliases commit d1683cc1bacb87717ae57c936dbbe493e6abfff6 Author: Timothy DeHerrera Date: Sun Dec 15 02:44:31 2019 -0700 users#nrd: init ec2-keys commit 3abc7fe9733808fdb381f657bd73c7f714a57122 Author: Timothy DeHerrera Date: Sun Dec 15 02:37:45 2019 -0700 users#nrd: init ssh commit 4122c25ac07b36c7dd5fea0928a0c2e3145fd5d3 Author: Timothy DeHerrera Date: Sun Dec 15 02:15:12 2019 -0700 users#nrd: init gpg-agent commit 20f49b2003abf2604a8219a66adc10bf92659e42 Author: Timothy DeHerrera Date: Sun Dec 15 01:59:33 2019 -0700 users#nrd: init git commit c90053758754552ce7b49f4ff4fcef1d064c1783 Author: Timothy DeHerrera Date: Sun Dec 15 01:35:12 2019 -0700 home-manager: init commit 6c51d2761a5bc648f52751d87cc014dd2d3d289c Author: Timothy DeHerrera Date: Sun Dec 15 01:23:19 2019 -0700 utils: import from configurations commit 8f3957ca2377c5163eb6d80ba7c7d1b76df2fb48 Author: Timothy DeHerrera Date: Sun Dec 15 01:18:33 2019 -0700 core: enable nix feature `ca-references` commit 9a93dcc921eca4a2d02ba10633318736290bbfe2 Author: Timothy DeHerrera Date: Sun Dec 15 01:17:42 2019 -0700 core: git alias commit da6e3fee946fffeb649527d5a131f7c7cf707ea1 Author: Timothy DeHerrera Date: Sun Dec 15 01:08:22 2019 -0700 format with nixpkgs#nixpkgs-fmt commit ddb256725ea0efdc2af4b219c4940aadb45a76f2 Author: Timothy DeHerrera Date: Sun Dec 15 01:00:01 2019 -0700 develop#tmux: default session alias commit b05b75bcfda176451287fa20db1c071d34ed1a56 Author: Timothy DeHerrera Date: Sun Dec 15 00:27:41 2019 -0700 develop: move compression tools to zsh profile commit ab896c6dd70aa79e106a742bedba75bd1d2f8e49 Author: Timothy DeHerrera Date: Sun Dec 15 00:25:04 2019 -0700 develop: init tmux profile commit b1716f9bbefb631a132e6f6aac273ca4da901891 Author: Timothy DeHerrera Date: Sun Dec 15 00:08:38 2019 -0700 zsh: fix infinite recursion commit 598b90c2bcdf83c0e6d446718feaebc0c6c8b057 Author: Timothy DeHerrera Date: Sun Dec 15 00:06:28 2019 -0700 add users subfolder to root commit 95741bbfce69235f607a1f15d0da714e3bce3f94 Author: Timothy DeHerrera Date: Sun Dec 15 00:03:57 2019 -0700 develop: init kakoune profile commit 6b26ef84a88463ec607d3e8413cfc4d6ba743aab Author: Timothy DeHerrera Date: Sat Dec 14 21:37:46 2019 -0700 profiles: init develop setup zshrc commit 96e530e2cb3feb43dc77d14a067375e80d30f3da Author: Timothy DeHerrera Date: Fri Dec 13 22:47:05 2019 -0700 set root password in core profile commit 4c6476932237131c2b2bf8367dfa3b0b5b286520 Author: Timothy DeHerrera Date: Fri Dec 13 22:00:11 2019 -0700 move locale.nix to local folder commit 10522aac5998252ccc574d01e1e083e11ca751ae Author: Timothy DeHerrera Date: Fri Dec 13 21:39:25 2019 -0700 use my fork of `nixpkgs` until flakes stabilize commit ae0746a5a4c29f5e5f7ececa43b4033a153de1bd Author: Timothy DeHerrera Date: Fri Dec 13 21:30:43 2019 -0700 utils: create utility functions to ease repetition `reqImport` in particular, is useful for easily importing an entire directory of nix files into an attribute set. commit 7bffd55c6f6e0ffd321427ab5d377da66e2d6e52 Author: Timothy DeHerrera Date: Thu Dec 5 11:09:17 2019 -0700 fix file systems import path commit c2d1230a0054ca81abbd7a5d9d855f0e0c382a75 Author: Timothy DeHerrera Date: Thu Dec 5 01:36:15 2019 -0700 succinct `description` and README.md commit 08ede18662bb693df9c4231f9d45b2dabc082ed7 Author: Timothy DeHerrera Date: Thu Dec 5 00:02:49 2019 -0700 mv modules/profiles profiles commit 79181e103fc3631913e8701d0b756c756e8683f4 Author: Timothy DeHerrera Date: Wed Dec 4 22:36:36 2019 -0700 setup configurations API NixOS file, configurations/.nix, will be easily installable via `nixos-rebuild --flake ".#"`. commit 17713c22d07c54525c728c62060a0428b76dee3b Author: Timothy DeHerrera Date: Mon Dec 2 22:18:30 2019 -0700 init --- flake.lock | 244 +++++++++++++++++------------- flake.nix | 243 ++++++++++++++--------------- hosts/bootstrap.nix | 2 +- overlays/overrides.nix | 2 + profiles/core/default.nix | 10 +- profiles/core/starship.toml | 95 ++++++++++++ shell/bud/default.nix | 10 ++ shell/bud/get.bash | 1 + shell/devos.nix | 7 +- users/nixos/default.nix | 11 -- users/profiles/direnv/default.nix | 1 - 11 files changed, 379 insertions(+), 247 deletions(-) create mode 100644 profiles/core/starship.toml create mode 100644 shell/bud/default.nix create mode 100644 shell/bud/get.bash delete mode 100644 users/nixos/default.nix diff --git a/flake.lock b/flake.lock index 3b38b93..774055b 100644 --- a/flake.lock +++ b/flake.lock @@ -3,15 +3,15 @@ "agenix": { "inputs": { "nixpkgs": [ - "latest" + "nixos" ] }, "locked": { - "lastModified": 1638837456, - "narHash": "sha256-WHLOxthAGx/wXw3QUa/lFE3mr6cQtnXfFYZ0DNyYwt4=", + "lastModified": 1637793790, + "narHash": "sha256-oPXavjxETEWGXq8g7kQHyRLKUmLX2yPtGn+t3V0mrTY=", "owner": "ryantm", "repo": "agenix", - "rev": "57806bf7e340f4cae705c91748d4fdf8519293a9", + "rev": "f85eea0e29fa9a8924571d0e398215e175f80d55", "type": "github" }, "original": { @@ -23,7 +23,10 @@ "beautysh": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs", + "nixpkgs": [ + "bud", + "nixpkgs" + ], "poetry2nix": "poetry2nix" }, "locked": { @@ -67,11 +70,11 @@ ] }, "locked": { - "lastModified": 1633877936, - "narHash": "sha256-+o3n6s7fR8dBGRldTGelyp2j3jSyTlrniOXwNfmMG20=", + "lastModified": 1640836100, + "narHash": "sha256-My9Lay6BCDwAZgrL4SuVXHkYPHIU7ypnuiS/pd7eg1M=", "owner": "divnix", "repo": "bud", - "rev": "15df091133ff95216c321b09be04905c0a0944c4", + "rev": "b1d8ab3970f4dfb5fb90d7d8a9ab493c75d031fc", "type": "github" }, "original": { @@ -83,15 +86,15 @@ "darwin": { "inputs": { "nixpkgs": [ - "latest" + "nixos" ] }, "locked": { - "lastModified": 1640117230, - "narHash": "sha256-W7LXeJavyIzNfNaoEsK65sEaCGqE9MVWvK0xSzNR4ls=", + "lastModified": 1634994402, + "narHash": "sha256-xmlCVVOYGpZoxgOqsDOVF0B0ASrnbNGVAEzID9qh2xo=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "5851d9613edf8b2279746c7e5b9faac55ff17e8a", + "rev": "44da835ac40dab5fd231298b59d83487382d2fab", "type": "github" }, "original": { @@ -102,20 +105,23 @@ }, "deploy": { "inputs": { + "fenix": "fenix", "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs_3", + "nixpkgs": [ + "nixos" + ], "utils": "utils" }, "locked": { - "lastModified": 1632822684, - "narHash": "sha256-lt7eayYmgsD5OQwpb1XYfHpxttn43bWo7G7hIJs+zJw=", - "owner": "serokell", + "lastModified": 1637357482, + "narHash": "sha256-mMRxOlcQs3V9cZYsKGKWEjl+oqclhaH1SKT3QGeTQ0Q=", + "owner": "input-output-hk", "repo": "deploy-rs", - "rev": "9a02de4373e0ec272d08a417b269a28ac8b961b4", + "rev": "5a6db26726ec8c7904aea5bcdf13589342386f9d", "type": "github" }, "original": { - "owner": "serokell", + "owner": "input-output-hk", "repo": "deploy-rs", "type": "github" } @@ -138,7 +144,9 @@ "digga": { "inputs": { "blank": "blank", - "deploy": "deploy", + "deploy": [ + "deploy" + ], "devshell": "devshell", "flake-utils": "flake-utils_3", "flake-utils-plus": "flake-utils-plus", @@ -168,6 +176,25 @@ "type": "github" } }, + "fenix": { + "inputs": { + "nixpkgs": "nixpkgs_2", + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { + "lastModified": 1637303083, + "narHash": "sha256-e2A5JBjxYNpjoGd53K0oVUUaS9ojwOT5rnThyPNS46M=", + "owner": "nix-community", + "repo": "fenix", + "rev": "8294ceadbbbe1a886640bfcc15f5a02a2b471955", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -184,6 +211,22 @@ "type": "github" } }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1627913399, + "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1623875721, @@ -262,6 +305,21 @@ "type": "github" } }, + "flake-utils_5": { + "locked": { + "lastModified": 1631561581, + "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home": { "inputs": { "nixpkgs": [ @@ -269,15 +327,16 @@ ] }, "locked": { - "lastModified": 1640417317, - "narHash": "sha256-jT2uMARXs0Xm65ccroFsKyr4LTHSecw+9HAnmBdJO8U=", + "lastModified": 1637917557, + "narHash": "sha256-3u5bLyGn5NUG3RJA7/v1Bqa/QCFGqp/01Bh/4REf9m4=", "owner": "nix-community", "repo": "home-manager", - "rev": "48f2b381dd397ec88040d3354ac9c036739ba139", + "rev": "4daff26495ca9ac67476cba8cf15c3e36d91ab18", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-21.11", "repo": "home-manager", "type": "github" } @@ -300,16 +359,16 @@ }, "latest_2": { "locked": { - "lastModified": 1640530943, - "narHash": "sha256-PIu6lmNwc9WEyl3GvVx1kjaPmBjuQp+r8UTRCHjuePs=", + "lastModified": 1638198142, + "narHash": "sha256-plU9b8r4St6q4U7VHtG9V7oF8k9fIpfXl/KDaZLuY9k=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fa5e153653a1b48e4a21a14b341e2e01835ba8b5", + "rev": "8a308775674e178495767df90c419425474582a1", "type": "github" }, "original": { "owner": "nixos", - "ref": "master", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -317,15 +376,15 @@ "naersk": { "inputs": { "nixpkgs": [ - "latest" + "nixos" ] }, "locked": { - "lastModified": 1639947939, - "narHash": "sha256-pGsM8haJadVP80GFq4xhnSpNitYNQpaXk4cnA796Cso=", + "lastModified": 1638203339, + "narHash": "sha256-Sz3iCvbWrVWOD/XfYQeRJgP/7MVYL3/VKsNXvDeWBFc=", "owner": "nmattia", "repo": "naersk", - "rev": "2fc8ce9d3c025d59fee349c1f80be9785049d653", + "rev": "c3e56b8a4ffb6d906cdfcfee034581f9a8ece571", "type": "github" }, "original": { @@ -351,16 +410,16 @@ }, "nixos": { "locked": { - "lastModified": 1640319671, - "narHash": "sha256-ZkKmakwaOaLiZOpIZWbeJZwap5CzJ30s4UJTfydYIYc=", + "lastModified": 1638231428, + "narHash": "sha256-Sm5loBKdeusSvIAC+LtzRT6I7tAcqZdIPnHcxZt7NaE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "eac07edbd20ed4908b98790ba299250b5527ecdf", + "rev": "393c5357a0071d51668bcdc69dfc25ddacbd5840", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "release-21.11", "repo": "nixpkgs", "type": "github" } @@ -368,7 +427,7 @@ "nixos-generators": { "inputs": { "nixlib": "nixlib", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1637655461, @@ -386,11 +445,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1640513880, - "narHash": "sha256-dIJYjqGFqCBNh3iasE+6EHG/W96I0YK6ayjfazOVuE8=", + "lastModified": 1638182287, + "narHash": "sha256-vBzf+hbTJz2ZdXV/DWirl6wOO7tjdqzTIU+0FANt65U=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "2a76e1204f3a605f8d8d2f323671e1a295a5246d", + "rev": "6b3f79de09c3de7c91ab51e55e87879f61b6faec", "type": "github" }, "original": { @@ -401,31 +460,31 @@ }, "nixpkgs": { "locked": { - "lastModified": 1640495232, - "narHash": "sha256-p0lVVPxfl/ePaZhugyfm3379/YlqiafChqtj+/GLYHI=", + "lastModified": 1640831728, + "narHash": "sha256-KK5SKqqfAt+ev3bHLrVXJ6i4zx9YQW6k19oUInY8T2M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4c5906c94893a04eb8e8b6f113fa9c41af070021", + "rev": "5d90841dd0179430db010dfc2c58b2a7de4371be", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable-small", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1640530943, - "narHash": "sha256-PIu6lmNwc9WEyl3GvVx1kjaPmBjuQp+r8UTRCHjuePs=", - "owner": "NixOS", + "lastModified": 1636976544, + "narHash": "sha256-9ZmdyoRz4Qu8bP5BKR1T10YbzcB9nvCeQjOEw2cRKR0=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "fa5e153653a1b48e4a21a14b341e2e01835ba8b5", + "rev": "931ab058daa7e4cd539533963f95e2bb0dbd41e6", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -446,29 +505,13 @@ "type": "github" } }, - "nixpkgs_4": { - "locked": { - "lastModified": 1640418986, - "narHash": "sha256-a8GGtxn2iL3WAkY5H+4E0s3Q7XJt6bTOvos9qqxT5OQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5c37ad87222cfc1ec36d6cd1364514a9efc2f7f2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nur": { "locked": { - "lastModified": 1640522459, - "narHash": "sha256-YUENmz9SzucqRMzaDSYblZjuWf6JAyagoJDWwm/e+lw=", + "lastModified": 1638231901, + "narHash": "sha256-XzuvFTmsXULdWynQWzgaPHikepNhjEpK4o5WXfmRqek=", "owner": "nix-community", "repo": "NUR", - "rev": "15e903784995ea5b4ab559053b2ddb21016afb15", + "rev": "4e68fb3d8f48e91196deb13f44bcfb421da25afb", "type": "github" }, "original": { @@ -478,26 +521,18 @@ }, "nvfetcher": { "inputs": { - "flake-compat": [ - "digga", - "deploy", - "flake-compat" - ], - "flake-utils": [ - "digga", - "flake-utils-plus", - "flake-utils" - ], + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_5", "nixpkgs": [ - "latest" + "nixos" ] }, "locked": { - "lastModified": 1640033174, - "narHash": "sha256-b8w7NgobOYLlFV9j+XGbF+51LpOll0QeatxEGRv7uhg=", + "lastModified": 1634524567, + "narHash": "sha256-v9ZTZj1WNQaaVfs1P1mUPuh518mmwpqszj1EjdeGUmc=", "owner": "berberman", "repo": "nvfetcher", - "rev": "8bbf1921a36343f9a78c68e2bbc9798ab8f3b768", + "rev": "807513f4bbd0e3b5863f4c3b91f8ac846ed6da9b", "type": "github" }, "original": { @@ -509,7 +544,7 @@ "poetry2nix": { "inputs": { "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1625240517, @@ -528,48 +563,43 @@ "root": { "inputs": { "agenix": "agenix", - "blank": [ - "digga", - "blank" - ], "bud": "bud", "darwin": "darwin", - "deploy": [ - "digga", - "deploy" - ], + "deploy": "deploy", "digga": "digga", - "flake-utils": [ - "digga", - "flake-utils" - ], - "flake-utils-plus": [ - "digga", - "flake-utils-plus" - ], "home": "home", "latest": "latest_2", "naersk": "naersk", - "nixlib": [ - "digga", - "nixlib" - ], "nixos": "nixos", "nixos-hardware": "nixos-hardware", - "nixpkgs": [ - "nixos" - ], "nur": "nur", "nvfetcher": "nvfetcher" } }, + "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1637268320, + "narHash": "sha256-lxB1r+7cmZisiGLx0tZ2LaC6X/EcQTbRIWZfnLIIgs4=", + "owner": "rust-analyzer", + "repo": "rust-analyzer", + "rev": "f0da9406bcbde1bc727242b481d8de825e84f59a", + "type": "github" + }, + "original": { + "owner": "rust-analyzer", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, "utils": { "locked": { - "lastModified": 1638122382, - "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=", + "lastModified": 1637014545, + "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=", "owner": "numtide", "repo": "flake-utils", - "rev": "74f7e4319258e287b0f9cb95426c9853b282730b", + "rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 3a3342d..79e59b2 100644 --- a/flake.nix +++ b/flake.nix @@ -1,149 +1,154 @@ { description = "A highly structured configuration database."; - nixConfig.extra-experimental-features = "nix-command flakes ca-references"; - nixConfig.extra-substituters = - "https://nrdxp.cachix.org https://nix-community.cachix.org"; - nixConfig.extra-trusted-public-keys = - "nrdxp.cachix.org-1:Fc5PSqY2Jm1TrWfm88l6cvGWwz3s93c6IOifQWnhNW4= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="; + nixConfig.extra-experimental-features = "nix-command flakes"; + nixConfig.extra-substituters = "https://nrdxp.cachix.org https://nix-community.cachix.org"; + nixConfig.extra-trusted-public-keys = "nrdxp.cachix.org-1:Fc5PSqY2Jm1TrWfm88l6cvGWwz3s93c6IOifQWnhNW4= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="; - inputs = { - nixos.url = "github:nixos/nixpkgs/nixos-unstable"; - latest.url = "github:nixos/nixpkgs/master"; + inputs = + { + nixos.url = "github:nixos/nixpkgs/release-21.11"; + latest.url = "github:nixos/nixpkgs/nixos-unstable"; - digga.url = "github:divnix/digga"; - digga.inputs.nixpkgs.follows = "nixos"; - digga.inputs.nixlib.follows = "nixos"; - digga.inputs.home-manager.follows = "home"; + digga.url = "github:divnix/digga"; + digga.inputs.nixpkgs.follows = "nixos"; + digga.inputs.nixlib.follows = "nixos"; + digga.inputs.home-manager.follows = "home"; + digga.inputs.deploy.follows = "deploy"; - bud.url = "github:divnix/bud"; - bud.inputs.nixpkgs.follows = "nixos"; - bud.inputs.devshell.follows = "digga/devshell"; + bud.url = "github:divnix/bud"; + bud.inputs.nixpkgs.follows = "nixos"; + bud.inputs.devshell.follows = "digga/devshell"; - home.url = "github:nix-community/home-manager"; - home.inputs.nixpkgs.follows = "nixos"; + home.url = "github:nix-community/home-manager/release-21.11"; + home.inputs.nixpkgs.follows = "nixos"; - darwin.url = "github:LnL7/nix-darwin"; - darwin.inputs.nixpkgs.follows = "latest"; + darwin.url = "github:LnL7/nix-darwin"; + darwin.inputs.nixpkgs.follows = "nixos"; - deploy.follows = "digga/deploy"; + deploy.url = "github:input-output-hk/deploy-rs"; + deploy.inputs.nixpkgs.follows = "nixos"; - agenix.url = "github:ryantm/agenix"; - agenix.inputs.nixpkgs.follows = "latest"; + agenix.url = "github:ryantm/agenix"; + agenix.inputs.nixpkgs.follows = "nixos"; - nvfetcher.url = "github:berberman/nvfetcher"; - nvfetcher.inputs.nixpkgs.follows = "latest"; - nvfetcher.inputs.flake-compat.follows = "digga/deploy/flake-compat"; - nvfetcher.inputs.flake-utils.follows = "digga/flake-utils-plus/flake-utils"; + nvfetcher.url = "github:berberman/nvfetcher"; + nvfetcher.inputs.nixpkgs.follows = "nixos"; - naersk.url = "github:nmattia/naersk"; - naersk.inputs.nixpkgs.follows = "latest"; + naersk.url = "github:nmattia/naersk"; + naersk.inputs.nixpkgs.follows = "nixos"; - nixos-hardware.url = "github:nixos/nixos-hardware"; + nixos-hardware.url = "github:nixos/nixos-hardware"; + }; - # start ANTI CORRUPTION LAYER - # remove after https://github.com/NixOS/nix/pull/4641 - nixpkgs.follows = "nixos"; - nixlib.follows = "digga/nixlib"; - blank.follows = "digga/blank"; - flake-utils-plus.follows = "digga/flake-utils-plus"; - flake-utils.follows = "digga/flake-utils"; - # end ANTI CORRUPTION LAYER - }; + outputs = + { self + , digga + , bud + , nixos + , home + , nixos-hardware + , nur + , agenix + , nvfetcher + , deploy + , ... + } @ inputs: + digga.lib.mkFlake + { + inherit self inputs; + + channelsConfig = { allowUnfree = true; }; + + channels = { + nixos = { + imports = [ (digga.lib.importOverlays ./overlays) ]; + overlays = [ + nur.overlay + agenix.overlay + nvfetcher.overlay + ./pkgs/default.nix + ]; + }; + latest = { }; + }; - outputs = { self, digga, bud, nixos, home, nixos-hardware, nur, agenix - , nvfetcher, deploy, ... }@inputs: - digga.lib.mkFlake { - inherit self inputs; + lib = import ./lib { lib = digga.lib // nixos.lib; }; - channelsConfig = { allowUnfree = true; }; + sharedOverlays = [ + (final: prev: { + __dontExport = true; + lib = prev.lib.extend (lfinal: lprev: { + our = self.lib; + }); + }) + ]; - channels = { nixos = { - imports = [ (digga.lib.importOverlays ./overlays) ]; - overlays = [ - # digga.overlays.patchedNix - nur.overlay - agenix.overlay - nvfetcher.overlay - ./pkgs/default.nix - ]; - }; - latest = { overlays = [ deploy.overlay ]; }; - }; - - lib = import ./lib { lib = digga.lib // nixos.lib; }; - - sharedOverlays = [ - (final: prev: { - __dontExport = true; - lib = prev.lib.extend (lfinal: lprev: { our = self.lib; }); - }) - ]; - - nixos = { - hostDefaults = { - system = "x86_64-linux"; - channelName = "nixos"; - imports = [ (digga.lib.importExportableModules ./modules) ]; - modules = [ - { lib.our = self.lib; } - digga.nixosModules.bootstrapIso - digga.nixosModules.nixConfig - home.nixosModules.home-manager - agenix.nixosModules.age - bud.nixosModules.bud - ]; - }; - - imports = [ (digga.lib.importHosts ./hosts) ]; - hosts = { - # set host specific properties here - NixOS = { }; - dafpi = { - system = "aarch64-linux"; - modules = [ nixos-hardware.nixosModules.raspberry-pi-4 ]; + hostDefaults = { + system = "x86_64-linux"; + channelName = "nixos"; + imports = [ (digga.lib.importExportableModules ./modules) ]; + modules = [ + { lib.our = self.lib; } + digga.nixosModules.bootstrapIso + digga.nixosModules.nixConfig + home.nixosModules.home-manager + agenix.nixosModules.age + bud.nixosModules.bud + ]; }; - }; - importables = rec { - profiles = digga.lib.rakeLeaves ./profiles // { - users = digga.lib.rakeLeaves ./users; + + imports = [ (digga.lib.importHosts ./hosts) ]; + hosts = { + /* set host specific properties here */ + NixOS = { }; + dafpi = { + system = "aarch64-linux"; + modules = [ nixos-hardware.nixosModules.raspberry-pi-4 ]; + }; }; - suites = with profiles; rec { - base = [ core cli.common users.daf ]; - plasma = [ desktop.plasma ]; - workstation = [ base plasma ]; + importables = rec { + profiles = digga.lib.rakeLeaves ./profiles // { + users = digga.lib.rakeLeaves ./users; + }; + suites = with profiles; rec { + base = [ core cli.common users.daf ]; + plasma = [ desktop.plasma ]; + workstation = [ base plasma ]; + }; }; }; - }; - - home = { - imports = [ (digga.lib.importExportableModules ./users/modules) ]; - modules = [ ]; - importables = rec { - profiles = digga.lib.rakeLeaves ./users/profiles; - suites = with profiles; rec { - base = [ direnv git ssh starship zoxide zsh ]; - graphical = [ alacritty ]; + + home = { + imports = [ (digga.lib.importExportableModules ./users/modules) ]; + modules = [ ]; + importables = rec { + profiles = digga.lib.rakeLeaves ./users/profiles; + suites = with profiles; rec { + base = [ direnv git ssh starship zoxide zsh ]; + graphical = [ alacritty ]; + }; }; + users = { + daf = { suites, ... }: { imports = suites.base; }; + }; # digga.lib.importers.rakeLeaves ./users/hm; }; - users = { - daf = { suites, ... }: { imports = suites.base; }; - }; # digga.lib.importers.rakeLeaves ./users/hm; - }; - devshell = ./shell; + devshell = ./shell; - homeConfigurations = - digga.lib.mkHomeConfigurations self.nixosConfigurations; + homeConfigurations = digga.lib.mkHomeConfigurations self.nixosConfigurations; - deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations { }; + deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations { }; - defaultTemplate = self.templates.bud; - templates.bud.path = ./.; - templates.bud.description = "bud template"; + defaultTemplate = self.templates.bud; + templates.bud.path = ./.; + templates.bud.description = "bud template"; - } // { - budModules = { devos = import ./bud; }; - }; + } + // + { + budModules = { devos = import ./shell/bud; }; + } + ; } diff --git a/hosts/bootstrap.nix b/hosts/bootstrap.nix index d491855..f103e3e 100644 --- a/hosts/bootstrap.nix +++ b/hosts/bootstrap.nix @@ -8,7 +8,7 @@ # profiles.networking profiles.core profiles.users.root # make sure to configure ssh keys - profiles.users.nixos + profiles.users.daf ]; boot.loader.systemd-boot.enable = true; diff --git a/overlays/overrides.nix b/overlays/overrides.nix index 597817b..4b48b6d 100644 --- a/overlays/overrides.nix +++ b/overlays/overrides.nix @@ -15,6 +15,8 @@ channels: final: prev: { deploy-rs ; + # nix is set to 2.3 in 21.11 + nix-direnv = prev.nix-direnv.override { nix = prev.nixUnstable; }; haskellPackages = prev.haskellPackages.override (old: { diff --git a/profiles/core/default.nix b/profiles/core/default.nix index 214bda0..434c79f 100644 --- a/profiles/core/default.nix +++ b/profiles/core/default.nix @@ -15,14 +15,20 @@ in direnv dnsutils dosfstools + fd git + bottom gptfdisk iputils + jq manix moreutils nix-index nmap neovim + ripgrep + skim + tealdeer usbutils utillinux whois @@ -85,8 +91,6 @@ in dn = ifSudo "s systemctl stop"; jtl = "journalctl"; - # vim - vim = "nvim"; }; }; @@ -137,9 +141,9 @@ in # For rage encryption, all hosts need a ssh key pair services.openssh = { enable = true; - challengeResponseAuthentication = false; passwordAuthentication = false; startWhenNeeded = true; + openFirewall = lib.mkDefault true; }; programs.ssh.startAgent = true; diff --git a/profiles/core/starship.toml b/profiles/core/starship.toml new file mode 100644 index 0000000..6ed366b --- /dev/null +++ b/profiles/core/starship.toml @@ -0,0 +1,95 @@ +[aws] +symbol = " " + +[character] +success_symbol = "[❯](bold purple)" +vicmd_symbol = "[❮](bold purple)" + +[battery] +full_symbol = "" +charging_symbol = "" +discharging_symbol = "" + +[conda] +symbol = " " + +[directory] +style = "cyan" +read_only = " 🔒" + +[docker] +symbol = " " + +[elixir] +symbol = " " + +[elm] +symbol = " " + +[git_branch] +format = "[$symbol$branch]($style) " +symbol = " " +style = "bold dimmed white" + +[git_status] +format = '([「$all_status$ahead_behind」]($style) )' +conflicted = "⚠️" +ahead = "⟫${count} " +behind = "⟪${count}" +diverged = "🔀 " +untracked = "📁 " +stashed = "↪ " +modified = "𝚫 " +staged = "✔ " +renamed = "⇆ " +deleted = "✘ " +style = "bold bright-white" + +[golang] +symbol = " " + +[haskell] +symbol = " " + +[hg_branch] +symbol = " " + +[java] +symbol = " " + +[julia] +symbol = " " + +[memory_usage] +symbol = " " +disabled = false + +[nim] +symbol = " " + +[nix_shell] +format = '[$symbol$state]($style) ' +symbol = " " +pure_msg = "λ" +impure_msg = "⎔" + +[nodejs] +symbol = " " + +[package] +symbol = " " + +[php] +symbol = " " + +[python] +symbol = " " + +[ruby] +symbol = " " + +[rust] +symbol = " " + +[status] +disabled = false diff --git a/shell/bud/default.nix b/shell/bud/default.nix new file mode 100644 index 0000000..c486636 --- /dev/null +++ b/shell/bud/default.nix @@ -0,0 +1,10 @@ +{ pkgs, lib, budUtils, ... }: { + bud.cmds = with pkgs; { + get = { + writer = budUtils.writeBashWithPaths [ nixUnstable git coreutils ]; + synopsis = "get [DEST]"; + help = "Copy the desired template to DEST"; + script = ./get.bash; + }; + }; +} diff --git a/shell/bud/get.bash b/shell/bud/get.bash new file mode 100644 index 0000000..7c10d1b --- /dev/null +++ b/shell/bud/get.bash @@ -0,0 +1 @@ +git clone https://github.com/divnix/devos.git "${2:-devos}" diff --git a/shell/devos.nix b/shell/devos.nix index 6f01267..dd6f75e 100644 --- a/shell/devos.nix +++ b/shell/devos.nix @@ -1,4 +1,4 @@ -{ pkgs, extraModulesPath, ... }: +{ pkgs, extraModulesPath, inputs, ... }: let hooks = import ./hooks; @@ -43,12 +43,9 @@ in (linter editorconfig-checker) # (docs python3Packages.grip) too many deps (docs mdbook) + (devos inputs.deploy.packages.${pkgs.system}.deploy-rs) ] - ++ lib.optional - (pkgs ? deploy-rs) - (devos deploy-rs.deploy-rs) - ++ lib.optional (system != "i686-linux") (devos cachix) diff --git a/users/nixos/default.nix b/users/nixos/default.nix deleted file mode 100644 index cfdd50e..0000000 --- a/users/nixos/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ hmUsers, ... }: -{ - # home-manager.users = { inherit (hmUsers) nixos; }; - - # users.users.nixos = { - # password = "nixos"; - # description = "default"; - # isNormalUser = true; - # extraGroups = [ "wheel" ]; - # }; -} diff --git a/users/profiles/direnv/default.nix b/users/profiles/direnv/default.nix index cf05463..67ff211 100644 --- a/users/profiles/direnv/default.nix +++ b/users/profiles/direnv/default.nix @@ -3,7 +3,6 @@ enable = true; nix-direnv = { enable = true; - # enableFlakes = true; }; }; }