magic_rb/dotfiles
1
0
Fork 0
mirror of https://git.sr.ht/~magic_rb/dotfiles synced 2024-11-29 11:36:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

deploy-rs and inputs updates

Browse source 
Signed-off-by: Magic_RB <magic_rb@redalder.org>
This commit is contained in:
Magic_RB 2021-07-25 00:40:41 +02:00
parent 30af10eb1c
commit 4f426e302a
No known key found for this signature in database
GPG key ID: 08D5287CC5DDCA0E
2 changed files with 102 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
nix/flake.lock
View file

@ -1,5 +1,28 @@
{
"nodes": {
"deploy-rs": {
"inputs": {
"flake-compat": "flake-compat",
"naersk": "naersk",
"nixpkgs": [
"nixpkgs-unstable"
],
"utils": "utils"
},
"locked": {
"lastModified": 1625729093,
"narHash": "sha256-hpo8T7mlVEpHpZIYqhxqt5i/XY8eu4p66MrAg/MCuVY=",
"owner": "serokell",
"repo": "deploy-rs",
"rev": "587cbcfe8d3ea05c5bb153764d3617012ef28c86",
"type": "github"
},
"original": {
"owner": "serokell",
"repo": "deploy-rs",
"type": "github"
}
},
"easy-hls-nix": {
"inputs": {
"nixpkgs": [
@ -54,7 +77,7 @@
},
"fenix": {
"inputs": {
"naersk": "naersk",
"naersk": "naersk_2",
"nixpkgs": [
"nixpkgs-unstable"
],
@ -74,6 +97,22 @@
"type": "github"
}
},
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1606424373,
"narHash": "sha256-oq8d4//CJOrVj+EcOaSXvMebvuTkmBJuT5tzlfewUnQ=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "99f1c2157fba4bfe6211a321fd0ee43199025dbf",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
@ -96,6 +135,27 @@
}
},
"naersk": {
"inputs": {
"nixpkgs": [
"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": [
"nixpkgs"
@ -185,6 +245,7 @@
},
"root": {
"inputs": {
"deploy-rs": "deploy-rs",
"easy-hls-nix": "easy-hls-nix",
"emacs": "emacs",
"emacs-overlay": "emacs-overlay",
@ -232,6 +293,21 @@
"type": "github"
}
},
"utils": {
"locked": {
"lastModified": 1622445595,
"narHash": "sha256-m+JRe6Wc5OZ/mKw2bB3+Tl0ZbtyxxxfnAWln8Q5qs+Y=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "7d706970d94bc5559077eb1a6600afddcd25a7c8",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"vtermModule": {
"flake": false,
"locked": {

32
nix/flake.nix
View file

@ -24,6 +24,11 @@
flake = false;
};
deploy-rs = {
url = "github:serokell/deploy-rs";
inputs.nixpkgs.follows = "nixpkgs-unstable";
};
# PACKAGES
## sss-cli
sss-cli = {
@ -50,13 +55,20 @@
};
};
outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, ... }@inputs:
outputs = { self
, nixpkgs
, nixpkgs-unstable
, home-manager
, deploy-rs
, ...
}@inputs:
let
inherit (nixpkgs-unstable.lib) nixosSystem;
inherit (home-manager.lib) homeManagerConfiguration;
supportedSystems = [ "x86_64-linux" "i686-linux" "aarch64-linux" ];
forAllSystems = f: nixpkgs.lib.genAttrs supportedSystems (system: f system);
supportedSystems = [ "x86_64-linux" ]; # add "i686-linux" "aarch64-linux" back after hls is fixed
forAllSystems' = systems: f: nixpkgs.lib.genAttrs systems (system: f system);
forAllSystems = forAllSystems' supportedSystems;
in {
nixosConfigurations.omen = nixosSystem (import ./systems/omen.nix inputs);
omen = self.nixosConfigurations.omen.config.system.build.toplevel;
@ -104,9 +116,15 @@
packages =
forAllSystems (system:
let
mkPkg' =
pkgs: name: package: (import pkgs { inherit system; overlays = [ self.overlays."${name}" ]; }).magic_rb."${package}";
mkPkg = name: mkPkg' nixpkgs-unstable name name;
mkPkg'' =
pkgs: name: package:
(import pkgs { inherit system;
overlays =
nixpkgs.lib.mapAttrsToList
(_: v: v) self.overlays;
} ).magic_rb."${package}";
mkPkg' = mkPkg'' nixpkgs-unstable;
mkPkg = name: mkPkg'' nixpkgs-unstable name name;
in
{
emacs = mkPkg "emacs";
@ -116,7 +134,7 @@
screenshot = mkPkg "screenshot";
sss-cli = mkPkg "sss-cli";
shh = mkPkg "shh";
easy-hls-nix = mkPkg "easy-hls-nix";
easy-hls-nix = if system == "x86_64-linux" then mkPkg "easy-hls-nix" else (import nixpkgs-unstable { inherit system; }).hello;
});
};
}