Revert "Revert "Back to stable""
This reverts commit aaec5362630535f734f6a13f3cf3a2cdc562b683.
This commit is contained in:
parent
e4c8e91319
commit
1e7b0cbc96
|
@ -9,7 +9,7 @@ let
|
||||||
};
|
};
|
||||||
in rec {
|
in rec {
|
||||||
hera = nixos-20-09;
|
hera = nixos-20-09;
|
||||||
apollo = unstable;
|
apollo = nixos-20-09;
|
||||||
cloud = hera;
|
cloud = hera;
|
||||||
chor-cloud = hera;
|
chor-cloud = hera;
|
||||||
mail = hera;
|
mail = hera;
|
||||||
|
|
|
@ -17,10 +17,10 @@
|
||||||
"homepage": "",
|
"homepage": "",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "f0e6396b7844387d9c23fbd7067d4205e8ca9103",
|
"rev": "b9597e57747f227317affdfa2f97fee8e167c33f",
|
||||||
"sha256": "1f7fanb8qbg1gpf0hljycqf077rf7mv9k1h622a4yf05h592wws6",
|
"sha256": "029ymsgc3d7fj4fw6r9n488p20vrb1vqwpb66d2qc1ha33fb541v",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://github.com/nix-community/home-manager/archive/f0e6396b7844387d9c23fbd7067d4205e8ca9103.tar.gz",
|
"url": "https://github.com/nix-community/home-manager/archive/b9597e57747f227317affdfa2f97fee8e167c33f.tar.gz",
|
||||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||||
},
|
},
|
||||||
"kassandra": {
|
"kassandra": {
|
||||||
|
@ -34,7 +34,7 @@
|
||||||
"branch": "master",
|
"branch": "master",
|
||||||
"ref": "master",
|
"ref": "master",
|
||||||
"repo": "git@hera.m-0.eu:kassandra2",
|
"repo": "git@hera.m-0.eu:kassandra2",
|
||||||
"rev": "d46cd759fd3ae0707ff6627be485c1ebb9c4b8bc",
|
"rev": "eb11ec167b93af8de8b699025e557872a3fdd505",
|
||||||
"type": "git"
|
"type": "git"
|
||||||
},
|
},
|
||||||
"logfeed": {
|
"logfeed": {
|
||||||
|
@ -50,10 +50,10 @@
|
||||||
"homepage": null,
|
"homepage": null,
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "e065200fc90175a8f6e50e76ef10a48786126e1c",
|
"rev": "c5c6009fb436efe5732e07cd0e5692f495321752",
|
||||||
"sha256": "157ih9h1j9r4rf5ppv4yhin73k664bzclsy9c791crx9j5db0l7a",
|
"sha256": "17h1dyi4alc3d7r6ivz9r76a3f7cxdwxw2kc3akhpgf5b00pnzv2",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://github.com/NixOS/nixpkgs/archive/e065200fc90175a8f6e50e76ef10a48786126e1c.tar.gz",
|
"url": "https://github.com/NixOS/nixpkgs/archive/c5c6009fb436efe5732e07cd0e5692f495321752.tar.gz",
|
||||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
|
@ -76,15 +76,15 @@
|
||||||
"type": "git"
|
"type": "git"
|
||||||
},
|
},
|
||||||
"nixos-unstable": {
|
"nixos-unstable": {
|
||||||
"branch": "nixos-unstable-small",
|
"branch": "nixos-unstable",
|
||||||
"description": "Nixpkgs/NixOS branches that track the Nixpkgs/NixOS channels",
|
"description": "Nixpkgs/NixOS branches that track the Nixpkgs/NixOS channels",
|
||||||
"homepage": null,
|
"homepage": null,
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "ac02f26980ffc6a84844943cb2c303662225543a",
|
"rev": "1a57d96edd156958b12782e8c8b6a374142a7248",
|
||||||
"sha256": "1q3fnxnqqp910zi1v3ylw7cyv5ij2411m6h6xc4y6ahrach3cfj7",
|
"sha256": "1qdh457apmw2yxbpi1biwl5x5ygaw158ppff4al8rx7gncgl10rd",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://github.com/NixOS/nixpkgs/archive/ac02f26980ffc6a84844943cb2c303662225543a.tar.gz",
|
"url": "https://github.com/NixOS/nixpkgs/archive/1a57d96edd156958b12782e8c8b6a374142a7248.tar.gz",
|
||||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||||
},
|
},
|
||||||
"nixpkgs-master": {
|
"nixpkgs-master": {
|
||||||
|
@ -93,10 +93,10 @@
|
||||||
"homepage": null,
|
"homepage": null,
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "0b0760b5e0a899f88ab88fae0098d63a933c6d51",
|
"rev": "f35bf8ef29d2bd9e4f1a915202de355e126a9ffd",
|
||||||
"sha256": "14w2p5w21c8xq57mf63203v7mq5g1k2svzb58mzls4silm9sdw3w",
|
"sha256": "0a9farbkwf1fnf112ldvn5pdlghnnsdx2bih26zaanc6ah120abs",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://github.com/NixOS/nixpkgs/archive/0b0760b5e0a899f88ab88fae0098d63a933c6d51.tar.gz",
|
"url": "https://github.com/NixOS/nixpkgs/archive/f35bf8ef29d2bd9e4f1a915202de355e126a9ffd.tar.gz",
|
||||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||||
},
|
},
|
||||||
"obelisk": {
|
"obelisk": {
|
||||||
|
@ -111,6 +111,13 @@
|
||||||
"url": "https://github.com/obsidiansystems/obelisk/archive/7ad33cbe3e84b209e83c505ce25486445bbd602e.tar.gz",
|
"url": "https://github.com/obsidiansystems/obelisk/archive/7ad33cbe3e84b209e83c505ce25486445bbd602e.tar.gz",
|
||||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||||
},
|
},
|
||||||
|
"radicle-upstream-nix": {
|
||||||
|
"branch": "master",
|
||||||
|
"ref": "master",
|
||||||
|
"repo": "https://git.sr.ht/~andir/radicle-upstream-nix",
|
||||||
|
"rev": "003b49f23a935def5379bb6468f1772ab1290e65",
|
||||||
|
"type": "git"
|
||||||
|
},
|
||||||
"taskwarrior-git-backend": {
|
"taskwarrior-git-backend": {
|
||||||
"branch": "master",
|
"branch": "master",
|
||||||
"description": "An experimental task-sync alternative via git written in Haskell",
|
"description": "An experimental task-sync alternative via git written in Haskell",
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
enableDefaultFonts = true;
|
enableDefaultFonts = true;
|
||||||
fontDir.enable = true;
|
#fontDir.enable = true;
|
||||||
fonts = builtins.attrValues {
|
fonts = builtins.attrValues {
|
||||||
inherit (pkgs)
|
inherit (pkgs)
|
||||||
nerdfonts # For all my terminal needs.
|
nerdfonts # For all my terminal needs.
|
||||||
|
|
|
@ -72,8 +72,5 @@ in writeScriptBin "grafana-devel" ''
|
||||||
export GF_DATABASE_NAME="grafana"
|
export GF_DATABASE_NAME="grafana"
|
||||||
ln -sf ${grafana}/share/grafana/conf conf
|
ln -sf ${grafana}/share/grafana/conf conf
|
||||||
ln -sf ${grafana}/share/grafana/tools tools
|
ln -sf ${grafana}/share/grafana/tools tools
|
||||||
${lib.concatStringsSep "\n" (lib.mapAttrsToList
|
|
||||||
(pluginName: plugin: "ln -s ${toString plugin} plugins/${pluginName}")
|
|
||||||
grafanaPlugins)}
|
|
||||||
exec ${grafana}/bin/grafana-server "$@"
|
exec ${grafana}/bin/grafana-server "$@"
|
||||||
''
|
''
|
||||||
|
|
|
@ -33,7 +33,8 @@ self: super: {
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
desktop-pkgs = {
|
desktop-pkgs = {
|
||||||
inherit (self) lm_sensors xwayland xdg_utils libnotify kassandra kassandra2 shotcut mlt audacity radicle-upstream;
|
radicle-upstream = import self.sources.radicle-upstream-nix {};
|
||||||
|
inherit (self) lm_sensors xwayland xdg_utils libnotify kassandra kassandra2 shotcut mlt audacity;
|
||||||
inherit (self.gnomeExtensions) appindicator system-monitor;
|
inherit (self.gnomeExtensions) appindicator system-monitor;
|
||||||
inherit (self.gnome3)
|
inherit (self.gnome3)
|
||||||
dconf dconf-editor gnome-tweaks gnome-shell-extensions adwaita-icon-theme
|
dconf dconf-editor gnome-tweaks gnome-shell-extensions adwaita-icon-theme
|
||||||
|
|
Loading…
Reference in a new issue