dusk/ark
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into terra

Browse Source
This commit is contained in:
dusk 2021-10-01 22:32:16 +03:00
commit 7857bbcec1
Signed by: dusk
GPG Key ID: 1D8F8FAF2294D6EA
4 changed files with 45 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
flake.lock
View File

@ -34,10 +34,9 @@
"deploy": {
"inputs": {
"flake-compat": "flake-compat",
"naersk": "naersk",
"nixpkgs": [
"digga",
"nixpkgs"
"latest"
],
"utils": [
"digga",
@ -45,11 +44,11 @@
]
},
"locked": {
"lastModified": 1628752686,
"narHash": "sha256-Lzh9MYUJDsjgif+YEyOErXtj1IH+ci8J1C30g1ms69s=",
"lastModified": 1632822684,
"narHash": "sha256-lt7eayYmgsD5OQwpb1XYfHpxttn43bWo7G7hIJs+zJw=",
"owner": "serokell",
"repo": "deploy-rs",
"rev": "e5546f9c2503c26d175f08a81fc0a0f330be4cbe",
"rev": "9a02de4373e0ec272d08a417b269a28ac8b961b4",
"type": "github"
},
"original": {
@ -60,11 +59,11 @@
},
"devshell": {
"locked": {
"lastModified": 1629275356,
"narHash": "sha256-R17M69EKXP6q8/mNHaK53ECwjFo1pdF+XaJC9Qq8zjg=",
"lastModified": 1632436039,
"narHash": "sha256-OtITeVWcKXn1SpVEnImpTGH91FycCskGBPqmlxiykv4=",
"owner": "numtide",
"repo": "devshell",
"rev": "26f25a12265f030917358a9632cd600b51af1d97",
"rev": "7a7a7aa0adebe5488e5abaec688fd9ae0f8ea9c6",
"type": "github"
},
"original": {
@ -98,6 +97,7 @@
"home-manager": [
"home"
],
"latest": "latest",
"nix": "nix",
"nixlib": [
"nixos"
@ -108,11 +108,11 @@
]
},
"locked": {
"lastModified": 1632930345,
"narHash": "sha256-9RFOy/MH1VIPWUv6pVseSjqIK2LnK6ZHV8LM2/jrvaI=",
"lastModified": 1632959483,
"narHash": "sha256-jXogai6e+QRtiZFBOrMmYdeLXejzVT91kuDKu2RuJ10=",
"owner": "divnix",
"repo": "digga",
"rev": "46c7c712d79ea627faf74739a2e89438a9d214f8",
"rev": "6549cf4c87d1a77138cbecbc6bb9483c20572cd7",
"type": "github"
},
"original": {
@ -125,11 +125,11 @@
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1606424373,
"narHash": "sha256-oq8d4//CJOrVj+EcOaSXvMebvuTkmBJuT5tzlfewUnQ=",
"lastModified": 1627913399,
"narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "99f1c2157fba4bfe6211a321fd0ee43199025dbf",
"rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2",
"type": "github"
},
"original": {
@ -251,6 +251,22 @@
"type": "github"
}
},
"latest_2": {
"locked": {
"lastModified": 1632820883,
"narHash": "sha256-MegRCaHkbD0f/Auwpowba0z+xaKLFlJ+7D7ZrgtmfvY=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "c21ba4f7bb4a3d621eb1d187e6b5e816bb85380c",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"lowdown-src": {
"flake": false,
"locked": {
@ -269,29 +285,6 @@
}
},
"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": {
"nixpkgs": [
"latest"
@ -358,11 +351,11 @@
},
"nixos": {
"locked": {
"lastModified": 1632639184,
"narHash": "sha256-fRLxre+gPxIkjFVj17O68pyAWU1cxT20XFOiulIWzRw=",
"lastModified": 1632918953,
"narHash": "sha256-XY3TKBfhP7wCu/SeqrwIkTWkyYHy5W1yRR8pxyzRY9Y=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "fd8a7fd07da0f3fc0e27575891f45c2f88e5dd44",
"rev": "ee90403e147b181300dffca5b0afa405e14f1945",
"type": "github"
},
"original": {
@ -399,11 +392,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1632267580,
"narHash": "sha256-AvNXdmaPHYs6idbfgu1H40vEw4Wq15xLAgCnpCN1l1A=",
"lastModified": 1632990363,
"narHash": "sha256-SNqz+9Vt4yDHqw8u/CMFdzMQTulKoMlVGJdshfcb5O0=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "3cc8c47af31798040ea62499090540413279f832",
"rev": "0a8b8054c9920368a3c15e6d766188fdf04b736f",
"type": "github"
},
"original": {
@ -461,11 +454,11 @@
]
},
"locked": {
"lastModified": 1632643075,
"narHash": "sha256-I2MPLO3HPM2hMVNDwMV0c9mmZUggWuxtKsVtZG9gm5w=",
"lastModified": 1633037428,
"narHash": "sha256-mg2M/FCZNkwIFEs9pS+poJp0CCA3vSXUSjIfsGB2FFM=",
"owner": "nix-community",
"repo": "rnix-lsp",
"rev": "cc8d7a30eacfc0dd996339942bc024f5c8d7ec5d",
"rev": "93cca733a087ccd11911149b3690f943d68eeb05",
"type": "github"
},
"original": {
@ -491,8 +484,8 @@
],
"helix": "helix",
"home": "home",
"latest": "latest",
"naersk": "naersk_2",
"latest": "latest_2",
"naersk": "naersk",
"nixlib": [
"digga",
"nixlib"

4
flake.nix
View File

@ -21,8 +21,6 @@
/*darwin.url = "github:LnL7/nix-darwin";
darwin.inputs.nixpkgs.follows = "latest";*/
#deploy.follows = "digga/deploy";
/*agenix.url = "github:ryantm/agenix";
agenix.inputs.nixpkgs.follows = "latest";*/
@ -73,7 +71,6 @@
#, nur
#, agenix
#, nvfetcher
#, deploy
, nixosPersistence
, nixpkgsWayland
, rnixLsp
@ -104,7 +101,6 @@
./pkgs/default.nix
];
};
latest = { };
};
lib = import ./lib { lib = digga.lib // nixos.lib; };

4
overlays/overrides.nix
View File

@ -21,7 +21,9 @@ channels: final: prev: {
gh
chromium-unwrapped
chromium
sublime4;
sublime4
deploy-rs
;
libnotify-latest = channels.latest.libnotify;

2
shell/devos.nix
View File

@ -41,7 +41,7 @@ in
category = "devos";
name = pkgs.nvfetcher-bin.pname;
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 editorconfig-checker)