bad/devos
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Merge upstream

Browse source
This commit is contained in:
Bad 2021-10-02 18:08:34 +02:00
commit 8e68966389
13 changed files with 104 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/ISSUE_TEMPLATE/bug_report.md vendored
View file

@ -35,4 +35,4 @@ Please search on the [issue tracker](../) before creating one.
## Your Environment ## Your Environment
<!--- Include relevant details about the environment you experienced the bug in. --> <!--- Include relevant details about the environment you experienced the bug in. -->
<!--- If you have run `flk update`, for example, post the flake.lock file. --> <!--- If you have run `bud update`, for example, post the flake.lock file. -->

2
.github/workflows/check.yml vendored
View file

@ -2,7 +2,7 @@ name: "Check & Cachix"
on: on:
push: push:
branches: branches:
- main - master
- trying - trying
- staging - staging
jobs: jobs:

2
.github/workflows/mdbook_docs.yml vendored
View file

@ -3,7 +3,7 @@ name: Deploy Docs to GitHub Pages
on: on:
push: push:
branches: branches:
- main - master
jobs: jobs:
deploy: deploy:

4
.github/workflows/release.yml vendored
View file

@ -19,7 +19,7 @@ jobs:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v2 uses: actions/checkout@v2
with: with:
ref: core ref: master
- name: Update Changelog - name: Update Changelog
uses: heinrichreimer/github-changelog-generator-action@v2.1.1 uses: heinrichreimer/github-changelog-generator-action@v2.1.1
with: with:
@ -49,7 +49,7 @@ jobs:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v2 uses: actions/checkout@v2
with: with:
ref: core ref: master
- name: Get Changelog Entry - name: Get Changelog Entry
id: changelog_reader id: changelog_reader

2
.gitignore vendored
View file

@ -2,7 +2,7 @@ result
.direnv .direnv
doc/index.html doc/index.html
# Result of flk commands # Result of bud commands
vm vm
iso iso
doi doi

6
README.md
View file

@ -12,13 +12,13 @@ Make an awesome template for NixOS users, with consideration for common tools li
[devshell][devshell], and [more](./doc/integrations). [devshell][devshell], and [more](./doc/integrations).
### No. Why _flakes_? ### No. Why _flakes_?
Flakes are a part of an explicit push to improve [Nix's UI](https://github.com/NixOS/nix/blob/master/doc/manual/src/contributing/cli-guideline.md), and have become an intergral part of that effort. Flakes are a part of an explicit push to improve [Nix's UX](https://github.com/NixOS/nix/blob/master/doc/manual/src/contributing/cli-guideline.md), and have become an integral part of that effort.
They also make [Nix expressions](https://nixos.org/manual/nix/unstable/expressions/expression-syntax.html) easier to distribute and reuse with convient [flake references](https://github.com/NixOS/nix/blob/master/src/nix/flake.md#flake-references) for building or using packages, modules, and whole systems. They also make [Nix expressions](https://nixos.org/manual/nix/unstable/expressions/expression-syntax.html) easier to distribute and reuse with convient [flake references](https://github.com/NixOS/nix/blob/master/src/nix/flake.md#flake-references) for building or using packages, modules, and whole systems.
## Getting Started ## Getting Started
Check out the [guide](https://devos.divnix.com/start) to get up and running. Check out the [guide](https://devos.divnix.com/start) to get up and running.
Also, have a look at [_flake.nix_][toc]. If anything is not immediately Also, have a look at [_flake.nix_](./flake.nix). If anything is not immediately
discoverable via "[`digga`][digga]'s [`mkFlake`][mk-flake], discoverable via "[`digga`][digga]'s [`mkFlake`][mk-flake],
please file a bug report. please file a bug report.
@ -88,4 +88,4 @@ DevOS is licensed under the [MIT License][mit].
[nixpkgs]: https://github.com/NixOS/nixpkgs [nixpkgs]: https://github.com/NixOS/nixpkgs
[nvfetcher]: https://github.com/berberman/nvfetcher [nvfetcher]: https://github.com/berberman/nvfetcher
[please]: https://github.com/nrdxp/devos/tree/nrd [please]: https://github.com/nrdxp/devos/tree/nrd
[matrix]: https://matrix.to/#/#devos:nixos.org

2
bud/get.bash
View file

@ -1 +1 @@
nix flake new -t "github:divnix/devos/core" "${2:-devos}" nix flake new -t "github:divnix/devos/master" "${2:-devos}"

127
flake.lock
View file

@ -106,10 +106,9 @@
"deploy": { "deploy": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"naersk": "naersk",
"nixpkgs": [ "nixpkgs": [
"digga", "digga",
"nixpkgs" "latest"
], ],
"utils": [ "utils": [
"digga", "digga",
@ -117,11 +116,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1628752686, "lastModified": 1632822684,
"narHash": "sha256-Lzh9MYUJDsjgif+YEyOErXtj1IH+ci8J1C30g1ms69s=", "narHash": "sha256-lt7eayYmgsD5OQwpb1XYfHpxttn43bWo7G7hIJs+zJw=",
"owner": "serokell", "owner": "serokell",
"repo": "deploy-rs", "repo": "deploy-rs",
"rev": "e5546f9c2503c26d175f08a81fc0a0f330be4cbe", "rev": "9a02de4373e0ec272d08a417b269a28ac8b961b4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -132,11 +131,11 @@
}, },
"devshell": { "devshell": {
"locked": { "locked": {
"lastModified": 1629275356, "lastModified": 1632436039,
"narHash": "sha256-R17M69EKXP6q8/mNHaK53ECwjFo1pdF+XaJC9Qq8zjg=", "narHash": "sha256-OtITeVWcKXn1SpVEnImpTGH91FycCskGBPqmlxiykv4=",
"owner": "numtide", "owner": "numtide",
"repo": "devshell", "repo": "devshell",
"rev": "26f25a12265f030917358a9632cd600b51af1d97", "rev": "7a7a7aa0adebe5488e5abaec688fd9ae0f8ea9c6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -155,6 +154,7 @@
"home-manager": [ "home-manager": [
"home" "home"
], ],
"latest": "latest",
"nix": "nix", "nix": "nix",
"nixlib": [ "nixlib": [
"nixos" "nixos"
@ -165,11 +165,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1631974852, "lastModified": 1632959483,
"narHash": "sha256-f2K83yDufQWp22kjtOQXHfsXXyUbndCMxrhG57mI9DE=", "narHash": "sha256-jXogai6e+QRtiZFBOrMmYdeLXejzVT91kuDKu2RuJ10=",
"owner": "divnix", "owner": "divnix",
"repo": "digga", "repo": "digga",
"rev": "8e91e1814ef0ab294731ceb106ffdac009363702", "rev": "6549cf4c87d1a77138cbecbc6bb9483c20572cd7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -184,11 +184,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1632364326, "lastModified": 1633141670,
"narHash": "sha256-oksVLLm/4wSM6FTBcWFvqs0kzrAqZVT029aLXEp/ExI=", "narHash": "sha256-+uijaBz8uRHqfzLj2CZlizBMFSNdkAUFLzePjoJ7NZY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "b04bbfe1ed32cfa3c5ec40cbd9f36b19e4e7592e", "rev": "24731cb4716d4583e4db427f4320534389640fb5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -200,11 +200,11 @@
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1606424373, "lastModified": 1627913399,
"narHash": "sha256-oq8d4//CJOrVj+EcOaSXvMebvuTkmBJuT5tzlfewUnQ=", "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "99f1c2157fba4bfe6211a321fd0ee43199025dbf", "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -287,17 +287,34 @@
}, },
"latest": { "latest": {
"locked": { "locked": {
"lastModified": 1632325095, "lastModified": 1632660378,
"narHash": "sha256-KHVVIxhVHq4Wwj4oQPem8/eVkukVKhSPqFKI1o5NrTw=", "narHash": "sha256-sjA8eQlnyDjDLyAyq3XlJmN0nqW0ftl/pb7VnMg86L0=",
"owner": "NixOS", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a930f7da84786807bb105df40e76b541604c3e72", "rev": "31ffc50c571e6683e9ecc9dbcbd4a8e9914b4497",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "owner": "nixos",
"ref": "nixos-unstable", "ref": "nixos-unstable",
"type": "indirect" "repo": "nixpkgs",
"type": "github"
}
},
"latest_2": {
"locked": {
"lastModified": 1633080050,
"narHash": "sha256-T9I2WnlUzAIL70dk9V1jqaYk3nypy/cMkWR19S47ZHc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "82155ff501c7622cb2336646bb62f7624261f6d7",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
} }
}, },
"lowdown-src": { "lowdown-src": {
@ -318,29 +335,6 @@
} }
}, },
"naersk": { "naersk": {
"inputs": {
"nixpkgs": [
"digga",
"deploy",
"nixpkgs"
]
},
"locked": {
"lastModified": 1622810282,
"narHash": "sha256-4wmvM3/xfD0hCdNDIXVzRMfL4yB1J+DjH6Zte2xbAxk=",
"owner": "nmattia",
"repo": "naersk",
"rev": "e8061169e1495871b56be97c5c51d310fae01374",
"type": "github"
},
"original": {
"owner": "nmattia",
"ref": "master",
"repo": "naersk",
"type": "github"
}
},
"naersk_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"latest" "latest"
@ -384,17 +378,18 @@
}, },
"nixos": { "nixos": {
"locked": { "locked": {
"lastModified": 1632378131, "lastModified": 1633176478,
"narHash": "sha256-r/zMNkbh61eIh/1Njp8+y6mwqCltis4u8giP5kg5LBY=", "narHash": "sha256-D6HDiWHo8V6Iq7cUZ4ZoPyVL7hImR+XcOvNVI3CEl3k=",
"owner": "NixOS", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d22c3a6bc15d965f82020c69924bf700ef3b3275", "rev": "520179f2208a8ed8bb5efa0e8f37d584645aac1f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "owner": "nixos",
"ref": "release-21.05", "ref": "release-21.05",
"type": "indirect" "repo": "nixpkgs",
"type": "github"
} }
}, },
"nixos-generators": { "nixos-generators": {
@ -424,11 +419,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1632267580, "lastModified": 1632990363,
"narHash": "sha256-AvNXdmaPHYs6idbfgu1H40vEw4Wq15xLAgCnpCN1l1A=", "narHash": "sha256-SNqz+9Vt4yDHqw8u/CMFdzMQTulKoMlVGJdshfcb5O0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "3cc8c47af31798040ea62499090540413279f832", "rev": "0a8b8054c9920368a3c15e6d766188fdf04b736f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -439,11 +434,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1631962327, "lastModified": 1633080050,
"narHash": "sha256-h2fgtNHozEcB42BQ1QVWAJUpQ1FA3gpgq/RrOKAxbfE=", "narHash": "sha256-T9I2WnlUzAIL70dk9V1jqaYk3nypy/cMkWR19S47ZHc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bc9b956714ed6eac5f8888322aac5bc41389defa", "rev": "82155ff501c7622cb2336646bb62f7624261f6d7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -470,11 +465,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1628690139, "lastModified": 1632700276,
"narHash": "sha256-9bk59V0YjZnMfSQMCHuYVPA/Bc3enjTtoyTWt1B3/zE=", "narHash": "sha256-XABvQUq2qv+YcQxW93DnU8mgtVsGJWyhcznny/Lbp0Q=",
"owner": "berberman", "owner": "berberman",
"repo": "nvfetcher", "repo": "nvfetcher",
"rev": "e9600782adbf6fb8217087bd2f05335cad96e542", "rev": "248fe98ed1bc352ce164d08a9e76fdc5f301ba2d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -534,8 +529,8 @@
"flake-utils-plus" "flake-utils-plus"
], ],
"home": "home", "home": "home",
"latest": "latest", "latest": "latest_2",
"naersk": "naersk_2", "naersk": "naersk",
"nixlib": [ "nixlib": [
"digga", "digga",
"nixlib" "nixlib"
@ -551,11 +546,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1632341070, "lastModified": 1633118502,
"narHash": "sha256-e8ML3a8tHPPbd/TyYU5sCFymyr8hycoxN4PFkVft1YQ=", "narHash": "sha256-dQQFD5Yw5KgsepO0gD6ttBmMQXxWZgWNe7wm+fZbVvg=",
"owner": "rust-analyzer", "owner": "rust-analyzer",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "075fe761f393c0445bc375175eaa52164bbdc728", "rev": "237ea0d34dced3444486931f68e87cd07f52b6a8",
"type": "github" "type": "github"
}, },
"original": { "original": {

19
flake.nix
View file

@ -4,8 +4,8 @@
nixConfig.extra-experimental-features = "nix-command flakes ca-references"; nixConfig.extra-experimental-features = "nix-command flakes ca-references";
inputs = inputs =
{ {
nixos.url = "nixpkgs/release-21.05"; nixos.url = "github:nixos/nixpkgs/release-21.05";
latest.url = "nixpkgs/nixos-unstable"; latest.url = "github:nixos/nixpkgs/nixos-unstable";
digga.url = "github:divnix/digga"; digga.url = "github:divnix/digga";
digga.inputs.nixpkgs.follows = "nixos"; digga.inputs.nixpkgs.follows = "nixos";
@ -76,13 +76,16 @@
digga.overlays.patchedNix digga.overlays.patchedNix
agenix.overlay agenix.overlay
nvfetcher.overlay nvfetcher.overlay
deploy.overlay
./pkgs/default.nix ./pkgs/default.nix
fenix.overlay fenix.overlay
]; ];
}; };
latest = { }; latest = {
overlays = [
deploy.overlay
];
};
}; };
lib = import ./lib { lib = digga.lib // nixos.lib; }; lib = import ./lib { lib = digga.lib // nixos.lib; };
@ -100,8 +103,8 @@
hostDefaults = { hostDefaults = {
system = "x86_64-linux"; system = "x86_64-linux";
channelName = "nixos"; channelName = "nixos";
imports = [ (digga.lib.importModules ./modules) ]; imports = [ (digga.lib.importExportableModules ./modules) ];
externalModules = [ modules = [
{ lib.our = self.lib; } { lib.our = self.lib; }
digga.nixosModules.bootstrapIso digga.nixosModules.bootstrapIso
digga.nixosModules.nixConfig digga.nixosModules.nixConfig
@ -124,8 +127,8 @@
}; };
home = { home = {
imports = [ (digga.lib.importModules ./users/modules) ]; imports = [ (digga.lib.importExportableModules ./users/modules) ];
externalModules = [ ]; modules = [ ];
importables = rec { importables = rec {
profiles = digga.lib.rakeLeaves ./users/profiles; profiles = digga.lib.rakeLeaves ./users/profiles;
suites = with profiles; rec { suites = with profiles; rec {

18
hosts/bootstrap.nix Normal file
View file

@ -0,0 +1,18 @@
{ profiles, ... }:
{
# build with: `bud build bootstrap bootstrapIso`
# reachable on the local link via ssh root@fe80::47%eno1
# where 'eno1' is replaced by your own machine's network
# interface that has the local link to the target machine
imports = [
# profiles.networking
profiles.core
profiles.users.root # make sure to configure ssh keys
profiles.users.nixos
];
boot.loader.systemd-boot.enable = true;
# will be overridden by the bootstrapIso instrumentation
fileSystems."/" = { device = "/dev/disk/by-label/nixos"; };
}

1
overlays/overrides.nix
View file

@ -13,6 +13,7 @@ channels: final: prev: {
qutebrowser qutebrowser
nvfetcher nvfetcher
signal-desktop signal-desktop
delve
neovim neovim
neovim-unwrapped neovim-unwrapped
starship; starship;

4
shell/default.nix
View file

@ -1,9 +1,9 @@
{ self, inputs, ... }: { self, inputs, ... }:
{ {
externalModules = with inputs; [ modules = with inputs; [
bud.devshellModules.bud bud.devshellModules.bud
]; ];
modules = [ exportedModules = [
./devos.nix ./devos.nix
]; ];
} }

2
shell/devos.nix
View file

@ -41,7 +41,7 @@ in
category = "devos"; category = "devos";
name = pkgs.nvfetcher-bin.pname; name = pkgs.nvfetcher-bin.pname;
help = pkgs.nvfetcher-bin.meta.description; help = pkgs.nvfetcher-bin.meta.description;
command = "cd $DEVSHELL_ROOT/pkgs; ${pkgs.nvfetcher-bin}/bin/nvfetcher -c ./sources.toml --no-output $@"; command = "cd $PRJ_ROOT/pkgs; ${pkgs.nvfetcher-bin}/bin/nvfetcher -c ./sources.toml $@";
} }
(linter nixpkgs-fmt) (linter nixpkgs-fmt)
(linter editorconfig-checker) (linter editorconfig-checker)