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

fix

Browse Source
This commit is contained in:
dusk 2021-07-24 18:38:59 +03:00
parent 1ce4ea9e44
commit 98e8ff16b2
Signed by: dusk
GPG Key ID: 1D8F8FAF2294D6EA
2 changed files with 11 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
flake.lock
View File

@ -219,21 +219,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_2": {
"locked": {
"lastModified": 1618217525,
"narHash": "sha256-WGrhVczjXTiswQaoxQ+0PTfbLNeOQM6M36zvLn78AYg=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c6169a2772643c4a93a0b5ac1c61e296cba68544",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"home": { "home": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -241,16 +226,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1624228557, "lastModified": 1627079826,
"narHash": "sha256-wwOqe73BsrXfRv1PhyXQFNC8iTET50KvE/HitdkRgxs=", "narHash": "sha256-+Bz7GgiWMm9aTuZ0fvYp4Tc4wVaN4Z7IwFS2IMJw7XA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "35a24648d155843a4d162de98c17b1afd5db51e4", "rev": "996b43973969b3453e23dd06d2fc19765fb31e9d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-21.05", "ref": "master",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -309,27 +294,6 @@
"type": "github" "type": "github"
} }
}, },
"nixEvalLsp": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": [
"nixos"
]
},
"locked": {
"lastModified": 1624068016,
"narHash": "sha256-+LZZ+uwzLL8Lwj2wSuFbbcs9xiw3nLm/GudLnkV0Ubg=",
"owner": "aaronjanse",
"repo": "nix-eval-lsp",
"rev": "3e42793fc43cc1a2ebe0f9f857e798ae3cca16e5",
"type": "github"
},
"original": {
"owner": "aaronjanse",
"repo": "nix-eval-lsp",
"type": "github"
}
},
"nixos": { "nixos": {
"locked": { "locked": {
"lastModified": 1626852498, "lastModified": 1626852498,
@ -487,7 +451,6 @@
"home": "home", "home": "home",
"latest": "latest", "latest": "latest",
"naersk": "naersk_2", "naersk": "naersk_2",
"nixEvalLsp": "nixEvalLsp",
"nixlib": [ "nixlib": [
"digga", "digga",
"nixlib" "nixlib"

23
flake.nix
View File

@ -19,7 +19,7 @@
bud.inputs.nixpkgs.follows = "nixos"; bud.inputs.nixpkgs.follows = "nixos";
bud.inputs.devshell.follows = "digga/devshell"; bud.inputs.devshell.follows = "digga/devshell";
home.url = "github:nix-community/home-manager/release-21.05"; home.url = "github:nix-community/home-manager/master";
home.inputs.nixpkgs.follows = "nixos"; home.inputs.nixpkgs.follows = "nixos";
darwin.url = "github:LnL7/nix-darwin"; darwin.url = "github:LnL7/nix-darwin";
@ -41,10 +41,6 @@
nixos-hardware.url = "github:nixos/nixos-hardware"; nixos-hardware.url = "github:nixos/nixos-hardware";
nixosPersistence.url = "github:nix-community/impermanence"; nixosPersistence.url = "github:nix-community/impermanence";
nixEvalLsp = {
url = "github:aaronjanse/nix-eval-lsp";
inputs.nixpkgs.follows = "nixos";
};
nixpkgsWayland = { nixpkgsWayland = {
url = "github:colemickens/nixpkgs-wayland"; url = "github:colemickens/nixpkgs-wayland";
inputs.nixpkgs.follows = "nixos"; inputs.nixpkgs.follows = "nixos";
@ -70,7 +66,6 @@
, agenix , agenix
, nixosPersistence , nixosPersistence
, nixpkgsWayland , nixpkgsWayland
, nixEvalLsp
, nvfetcher , nvfetcher
, deploy , deploy
, ... , ...
@ -90,6 +85,7 @@
#agenix.overlay #agenix.overlay
#nvfetcher.overlay #nvfetcher.overlay
#deploy.overlay #deploy.overlay
nixpkgsWayland.overlay
./pkgs/default.nix ./pkgs/default.nix
]; ];
}; };
@ -99,9 +95,9 @@
lib = import ./lib { lib = digga.lib // nixos.lib; }; lib = import ./lib { lib = digga.lib // nixos.lib; };
sharedOverlays = [ sharedOverlays = [
(final: prev: { (_: prev: {
__dontExport = true; __dontExport = true;
lib = prev.lib.extend (lfinal: lprev: { lib = prev.lib.extend (_: _: {
our = self.lib; our = self.lib;
}); });
}) })
@ -129,7 +125,7 @@
NixOS = { }; NixOS = { };
}; };
importables = rec { importables = rec {
profiles = digga.lib.rakeLeaves ./profiles // { profiles = (digga.lib.rakeLeaves ./profiles) // {
users = digga.lib.rakeLeaves ./users; users = digga.lib.rakeLeaves ./users;
}; };
suites = with profiles; { suites = with profiles; {
@ -159,11 +155,6 @@
defaultTemplate = self.templates.bud; defaultTemplate = self.templates.bud;
templates.bud.path = ./.; templates.bud.path = ./.;
templates.bud.description = "bud template"; templates.bud.description = "bud template";
budModules = { devos = import ./pkgs/bud; };
} };
//
{
budModules = { devos = import ./pkgs/bud; };
}
;
} }