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

Update flakes and add all systems link farm

Browse source 
Signed-off-by: Magic_RB <magic_rb@redalder.org>
This commit is contained in:
Magic_RB 2021-07-31 13:22:43 +02:00
parent beb1f0f12e
commit f0303cc19a
No known key found for this signature in database
GPG key ID: 08D5287CC5DDCA0E
2 changed files with 82 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

128
nix/flake.lock
View file

@ -4,23 +4,19 @@
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"naersk": "naersk", "naersk": "naersk",
"nixpkgs": [ "nixpkgs": "nixpkgs",
"nixpkgs-unstable"
],
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1625729093, "lastModified": 1625729093,
"narHash": "sha256-hpo8T7mlVEpHpZIYqhxqt5i/XY8eu4p66MrAg/MCuVY=", "narHash": "sha256-hpo8T7mlVEpHpZIYqhxqt5i/XY8eu4p66MrAg/MCuVY=",
"owner": "serokell", "path": "/nix/store/dwmicyfrwakk1qnyfd1kmmp4yx0lsych-source",
"repo": "deploy-rs",
"rev": "587cbcfe8d3ea05c5bb153764d3617012ef28c86", "rev": "587cbcfe8d3ea05c5bb153764d3617012ef28c86",
"type": "github" "type": "path"
}, },
"original": { "original": {
"owner": "serokell", "id": "deploy-rs",
"repo": "deploy-rs", "type": "indirect"
"type": "github"
} }
}, },
"easy-hls-nix": { "easy-hls-nix": {
@ -46,11 +42,11 @@
"emacs": { "emacs": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1625389614, "lastModified": 1627259478,
"narHash": "sha256-sfdncZSAeioFX5EW3rCjfJlpAc5FgmzMCGVBbwwkyq4=", "narHash": "sha256-2V04HHoy8wfVGBDGWYs2wDb2nmKYRUU/Nn5LwkSV+F0=",
"owner": "flatwhatson", "owner": "flatwhatson",
"repo": "emacs", "repo": "emacs",
"rev": "4c79a27fcb92e920701f54b25b7fd28a810978d5", "rev": "765a9f9983be8bcbba1f8da8be214f6df3a30ba2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -62,11 +58,11 @@
}, },
"emacs-overlay": { "emacs-overlay": {
"locked": { "locked": {
"lastModified": 1625937277, "lastModified": 1627722624,
"narHash": "sha256-JbID1xZBoJrDkcqiwk/i42oXVWh7uXSt0EPbGM4HVpw=", "narHash": "sha256-LtCf2ZXYfDh7DHvhqRJlJtfRojQv8Wl+Jpt7T5b5C7M=",
"ref": "master", "ref": "master",
"rev": "215fb1596ffc8f317cba6460c45ca3e678b51c1f", "rev": "9253bb4fb146035e9c3c091fdf5a4f929592fc76",
"revCount": 5395, "revCount": 5498,
"type": "git", "type": "git",
"url": "https://github.com/nix-community/emacs-overlay" "url": "https://github.com/nix-community/emacs-overlay"
}, },
@ -77,18 +73,17 @@
}, },
"fenix": { "fenix": {
"inputs": { "inputs": {
"naersk": "naersk_2",
"nixpkgs": [ "nixpkgs": [
"nixpkgs-unstable" "nixpkgs-unstable"
], ],
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1625883803, "lastModified": 1627698418,
"narHash": "sha256-U88tUKn7kbEeq32TwEzkXQwto2rlkhnVyBXFWmrNw0A=", "narHash": "sha256-ogDbdXA2wQv+oPhdMQ/z/mrHARLAW6mXRzBs8/GRd0o=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "145e889b2713c1a3e7f8291b1b84d19dc45da43d", "rev": "563db946eb49f9ab1fa298e6c89fa65fdfebc058",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -120,11 +115,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1624228557, "lastModified": 1627649712,
"narHash": "sha256-wwOqe73BsrXfRv1PhyXQFNC8iTET50KvE/HitdkRgxs=", "narHash": "sha256-AJBasvMKpsyJmCLdjroBElCHY5AlalbVy+XY5vjbgXc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "35a24648d155843a4d162de98c17b1afd5db51e4", "rev": "b39647e52ed3c0b989e9d5c965e598ae4c38d7ef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -155,26 +150,6 @@
"type": "github" "type": "github"
} }
}, },
"naersk_2": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1623927034,
"narHash": "sha256-sGxlmfp5eXL5sAMNqHSb04Zq6gPl+JeltIZ226OYN0w=",
"owner": "nmattia",
"repo": "naersk",
"rev": "e09c320446c5c2516d430803f7b19f5833781337",
"type": "github"
},
"original": {
"owner": "nmattia",
"repo": "naersk",
"type": "github"
}
},
"nixng": { "nixng": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -197,27 +172,27 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1625876238, "lastModified": 1627533199,
"narHash": "sha256-+1Q2znDawGp5MREYqimUJ3ERTUiOU97budRlYw27I1c=", "narHash": "sha256-NyIUcNevwtsMBINn56jnDF8wz3TV1AFxw+Vw6JMnkyE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9376bf7b34218e2a7f92af91089b0cb413a605e2", "rev": "dd98b100651cfbb8804f32d852f75ef7c97a6b74",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-21.05", "ref": "nixpkgs-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1625951490, "lastModified": 1627721489,
"narHash": "sha256-Cgihtvx37A63bqc5d3ebGSm/AbPYAo8hgOIWGfKOt2g=", "narHash": "sha256-Ske4ZNlI1UOjPI/eDrLP4t3xlM6RQZv39yzc0N8rgdE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "70122271d74c6041d7cb5bdfd9fa2f979570a882", "rev": "d55bba14daa28dc4df9014a1f2774cab998b82a4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -229,11 +204,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1625697353, "lastModified": 1627391865,
"narHash": "sha256-/v85RkZ0Z+lxipkG2sjYNRINktc8VySbLQmPbirY0hQ=", "narHash": "sha256-tPoWBO9Nzu3wuX37WcnctzL6LoDCErJLnfLGqqmXCm4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "87807e64a5ef5206b745a40af118c7be8db73681", "rev": "8ecc61c91a596df7d3293603a9c2384190c1b89a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -243,6 +218,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": {
"locked": {
"lastModified": 1627528535,
"narHash": "sha256-+E0LxCLav1GmbQbqwCKP39DRMn6NeEq00drC8udnYIY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2262d7863a6af007274a698367484bf4903a3299",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-21.05",
"repo": "nixpkgs",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"deploy-rs": "deploy-rs", "deploy-rs": "deploy-rs",
@ -252,10 +243,9 @@
"fenix": "fenix", "fenix": "fenix",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixng": "nixng", "nixng": "nixng",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs_2",
"nixpkgs-master": "nixpkgs-master", "nixpkgs-master": "nixpkgs-master",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"sss-cli": "sss-cli",
"vtermModule": "vtermModule", "vtermModule": "vtermModule",
"yusdacra-dotfiles": "yusdacra-dotfiles" "yusdacra-dotfiles": "yusdacra-dotfiles"
} }
@ -263,11 +253,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1625843384, "lastModified": 1627663876,
"narHash": "sha256-OlWUPu7k3NKI9gQmcmZYWgJJm36W9KmJ2K7MHFeLRc4=", "narHash": "sha256-pN12lFY53Bh5iYwJl2zZXxRCEcVAaoa699SmSbodlwc=",
"owner": "rust-analyzer", "owner": "rust-analyzer",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "10ac4e5c0d04bd6b2b6d14aa7ce9e54390d5f12d", "rev": "14f00adcb14950bbae7e8578e466428c31d882f1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -277,22 +267,6 @@
"type": "github" "type": "github"
} }
}, },
"sss-cli": {
"flake": false,
"locked": {
"lastModified": 1618318903,
"narHash": "sha256-1Pad52W+gtGDREzCXOdABn9CrKv13YOOu+Du/ohB/EY=",
"owner": "dsprenkels",
"repo": "sss-cli",
"rev": "df0dc744210b0851a0431a0951ea36f1e5ff0e91",
"type": "github"
},
"original": {
"owner": "dsprenkels",
"repo": "sss-cli",
"type": "github"
}
},
"utils": { "utils": {
"locked": { "locked": {
"lastModified": 1622445595, "lastModified": 1622445595,
@ -327,11 +301,11 @@
"yusdacra-dotfiles": { "yusdacra-dotfiles": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1625592340, "lastModified": 1627325756,
"narHash": "sha256-LJcyEXVFqw30hO12f2gJSUJ5jzNO2CUTuF9AJt5PtbQ=", "narHash": "sha256-gfq5xeVVutbfEUGk9Vynludzk8Vc2w1I4fFeWbPdPl8=",
"owner": "yusdacra", "owner": "yusdacra",
"repo": "nixos-config", "repo": "nixos-config",
"rev": "e889566c2974792c2b33addad7102a6cfc1bf6eb", "rev": "62ea74ba6b5576231056135a0cf505539786af35",
"type": "github" "type": "github"
}, },
"original": { "original": {

32
nix/flake.nix
View file

@ -87,6 +87,36 @@
homeConfigurations.blowhole = homeManagerConfiguration (import ./systems/blowhole.nix inputs); homeConfigurations.blowhole = homeManagerConfiguration (import ./systems/blowhole.nix inputs);
blowhole = self.homeConfigurations.blowhole.activationPackage; blowhole = self.homeConfigurations.blowhole.activationPackage;
allSystems =
let
pkgs = system: import nixpkgs { system = "x86_64-linux"; };
linkFarm = system: attrs:
let
pkgs' = pkgs system;
in
pkgs'.linkFarm "allSystems-${system}"
(pkgs'.lib.mapAttrsToList (n: v: { name = n; path = v; }) attrs);
nixos = name: self.nixosConfigurations.${name}.config.system.build.toplevel;
hm = name: self.homeConfigurations.${name}.activationPackage;
in
{
x86_64-linux = linkFarm "x86_64-linux"
{
omen = nixos "omen";
heater = nixos "heater";
tweedledee = nixos "tweedledee";
tweedledum = nixos "tweedledum";
toothpick = nixos "toothpick";
mark = nixos "mark";
recoveryUsb = nixos "recoveryUsb";
blowhole = hm "blowhole";
};
aarch64-linux = linkFarm "aarch64-linux"
{
edge = hm "edge";
};
};
overlays = { overlays = {
emacs = import ./overlays/emacs/default.nix inputs; emacs = import ./overlays/emacs/default.nix inputs;
@ -95,8 +125,8 @@
screenshot = import ./overlays/screenshot inputs.nixng.lib; screenshot = import ./overlays/screenshot inputs.nixng.lib;
sss-cli = import ./overlays/sss-cli inputs.sss-cli; sss-cli = import ./overlays/sss-cli inputs.sss-cli;
shh = import ./overlays/shh; shh = import ./overlays/shh;
discord-canary = import "${inputs.yusdacra-dotfiles}/overlays/discord-canary-system.nix";
easy-hls-nix = import ./overlays/easy-hls-nix inputs.easy-hls-nix; easy-hls-nix = import ./overlays/easy-hls-nix inputs.easy-hls-nix;
discord-canary = import "${inputs.yusdacra-dotfiles}/overlays/discord-canary-system.nix";
}; };
nixosModules = { nixosModules = {