AtaraxiaDev/nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add master nixpkgs

Browse Source
This commit is contained in:
Dmitriy Kholkin 2021-04-02 21:50:33 +03:00
parent 9e0206b64d
commit 6c3b9bab4d
3 changed files with 64 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
flake.lock generated
View File

@ -34,16 +34,28 @@
"type": "github" "type": "github"
} }
}, },
"base16-material-ocean-scheme": {
"flake": false,
"locked": {
"narHash": "sha256-WAVSMhWqwzR34pHalWGkpKkP6+TfEE+Fv3Adj0G2isk=",
"path": "/home/alukard/projects/base16-material-ocean-scheme",
"type": "path"
},
"original": {
"path": "/home/alukard/projects/base16-material-ocean-scheme",
"type": "path"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1615753545, "lastModified": 1616724076,
"narHash": "sha256-FR6vHvQlmQFAA26wNguEGWwav40Xgy9U6vRpT6UneTg=", "narHash": "sha256-SwbPXLjN2sLy4NL/GhodiJrdkIVZwGGTGiCN3JxH1cU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "07f6c6481e0cbbcaf3447f43e964baf99465c8e1", "rev": "fedfd430f96695997b3eaf8d7e82ca79406afa23",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -81,6 +93,7 @@
"original": { "original": {
"owner": "nana-4", "owner": "nana-4",
"repo": "materia-theme", "repo": "materia-theme",
"rev": "3e2220a133746a7fc80b0f995a40ffda55443de0",
"type": "github" "type": "github"
} }
}, },
@ -89,16 +102,18 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1615911544, "lastModified": 1616010669,
"narHash": "sha256-2V0qJ9EaPjOetEzEx0vxP+dxKOX8ZXJi7PIlLjkxymA=", "narHash": "sha256-IMzdmoWAX6Lerhslsf7h2814xjJolPnl2bICDixRgdk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nix", "repo": "nix",
"rev": "66fa1c7375e4b3073a16df4678cf1d37446ed20b", "rev": "8a5203d3b836497c2c5f157f85008aa8bcb6a1d2",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nix", "owner": "NixOS",
"type": "indirect" "repo": "nix",
"rev": "8a5203d3b836497c2c5f157f85008aa8bcb6a1d2",
"type": "github"
} }
}, },
"nixpkgs": { "nixpkgs": {
@ -116,6 +131,22 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs-master": {
"locked": {
"lastModified": 1616785109,
"narHash": "sha256-kpaULt9vJtCUzYli3fXwtlrDEUBgaSrtGea50AIYEqU=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "109d6b3bdbac150c23ac134682c591c679e20a5b",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "master",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-mozilla": { "nixpkgs-mozilla": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -134,11 +165,11 @@
}, },
"nixpkgs-old": { "nixpkgs-old": {
"locked": { "locked": {
"lastModified": 1615879109, "lastModified": 1616701903,
"narHash": "sha256-2FX/qmp6IX255zhJaYL6ClGIaCyJVh4sNDYcnT7TvJU=", "narHash": "sha256-zYjmZqdfetp6XNbJcznCGGR8YkjcZ45c3Zy+Q0GrhMw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "36e15cd6e7d55ba143caf3dc930467ace573d85c", "rev": "34f85de51bbc74595e63b22ee089adbb31f7c7a2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -150,11 +181,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1615938548, "lastModified": 1616785109,
"narHash": "sha256-BYuu+UfFAuQFa2itTyT9lmzR9knjtF1z2npmZ4l8weY=", "narHash": "sha256-kpaULt9vJtCUzYli3fXwtlrDEUBgaSrtGea50AIYEqU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "31ced622faa531aac45cd4484945cf1b2011060b", "rev": "109d6b3bdbac150c23ac134682c591c679e20a5b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -179,11 +210,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1615797423, "lastModified": 1616527350,
"narHash": "sha256-5NGDZXPQzuoxf/42NiyC9YwwhwzfMfIRrz3aT0XHzSc=", "narHash": "sha256-VkMevY2WLU+K7T/P4wVj18Ms8zyeRfp05ILf556m5Y8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "266dc8c3d052f549826ba246d06787a219533b8f", "rev": "d3f7e969b9860fb80750147aeb56dab1c730e756",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -197,11 +228,13 @@
"inputs": { "inputs": {
"base16": "base16", "base16": "base16",
"base16-horizon-scheme": "base16-horizon-scheme", "base16-horizon-scheme": "base16-horizon-scheme",
"base16-material-ocean-scheme": "base16-material-ocean-scheme",
"home-manager": "home-manager", "home-manager": "home-manager",
"i3lock-fancy-rapid": "i3lock-fancy-rapid", "i3lock-fancy-rapid": "i3lock-fancy-rapid",
"materia-theme": "materia-theme", "materia-theme": "materia-theme",
"nix": "nix", "nix": "nix",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_4",
"nixpkgs-master": "nixpkgs-master",
"nixpkgs-mozilla": "nixpkgs-mozilla", "nixpkgs-mozilla": "nixpkgs-mozilla",
"nixpkgs-old": "nixpkgs-old", "nixpkgs-old": "nixpkgs-old",
"zsh-autosuggestions": "zsh-autosuggestions", "zsh-autosuggestions": "zsh-autosuggestions",

9
flake.nix
View File

@ -3,16 +3,21 @@
inputs = { inputs = {
nixpkgs.url = github:nixos/nixpkgs/nixos-unstable; nixpkgs.url = github:nixos/nixpkgs/nixos-unstable;
# nixpkgs.url = github:AlukardBF/nixpkgs/nixos-unstable; nixpkgs-master.url = github:nixos/nixpkgs/master;
nixpkgs-old.url = github:nixos/nixpkgs/nixos-20.09; nixpkgs-old.url = github:nixos/nixpkgs/nixos-20.09;
nix.url = github:NixOS/nix/8a5203d3b836497c2c5f157f85008aa8bcb6a1d2;
home-manager.url = github:nix-community/home-manager; home-manager.url = github:nix-community/home-manager;
base16.url = github:alukardbf/base16-nix; base16.url = github:alukardbf/base16-nix;
base16-horizon-scheme = { base16-horizon-scheme = {
url = github:michael-ball/base16-horizon-scheme; url = github:michael-ball/base16-horizon-scheme;
flake = false; flake = false;
}; };
base16-material-ocean-scheme = {
url = "/home/alukard/projects/base16-material-ocean-scheme";
flake = false;
};
materia-theme = { materia-theme = {
url = github:nana-4/materia-theme; url = github:nana-4/materia-theme/3e2220a133746a7fc80b0f995a40ffda55443de0;
flake = false; flake = false;
}; };
zsh-autosuggestions = { zsh-autosuggestions = {

15
modules/overlay.nix
View File

@ -5,6 +5,10 @@ let
config = config.nixpkgs.config; config = config.nixpkgs.config;
localSystem = { inherit system; }; localSystem = { inherit system; };
}); });
master = import inputs.nixpkgs-master ({
config = config.nixpkgs.config;
localSystem = { inherit system; };
});
in in
{ {
nixpkgs.overlays = [ nixpkgs.overlays = [
@ -24,14 +28,9 @@ in
ibm-plex-powerline = pkgs.callPackage ./packages/ibm-plex-powerline.nix { }; ibm-plex-powerline = pkgs.callPackage ./packages/ibm-plex-powerline.nix { };
bibata-cursors = pkgs.callPackage ./packages/bibata-cursors.nix { }; bibata-cursors = pkgs.callPackage ./packages/bibata-cursors.nix { };
spotifyd = pkgs.callPackage ./packages/spotifyd.nix { }; spotifyd = pkgs.callPackage ./packages/spotifyd.nix { };
# UPDATE foliate = pkgs.callPackage ./packages/foliate.nix { };
# vivaldi = super.vivaldi.overrideAttrs (old: rec { vscode = master.vscode;
# version = "3.6.2165.36-1"; vivaldi = master.vivaldi;
# src = super.fetchurl {
# url = "https://downloads.vivaldi.com/stable/vivaldi-stable_${version}_amd64.deb";
# sha256 = "1wgxzggy5sg98k4lzd34k4hyw2jgc14db41z7s7j3c5whlnifh08";
# };
# });
multimc = super.multimc.overrideAttrs (old: rec { multimc = super.multimc.overrideAttrs (old: rec {
version = "unstable-2021-02-10"; version = "unstable-2021-02-10";
src = super.fetchFromGitHub { src = super.fetchFromGitHub {