maralorn/nixos-config
1
0
Fork 0
Code Wiki Activity

Bump some versions, improve hoogle

Browse source
This commit is contained in:
Malte Brandy 2020-09-15 23:07:15 +02:00
parent 728808dac7
commit d403410c78
No known key found for this signature in database
GPG key ID: 226A2D41EF5378C9
7 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
home-manager/roles/neovim/default.nix
View file

@ -88,7 +88,7 @@ let
in { in {
home = { home = {
file.".config/nvim/coc-settings.json".text = builtins.toJSON cocSettings; file.".config/nvim/coc-settings.json".text = builtins.toJSON cocSettings;
packages = [ neovim pkgs.neuron-language-server]; packages = [ neovim pkgs.neuron-language-server ];
sessionVariables.EDITOR = "${neovim}/bin/nvim"; sessionVariables.EDITOR = "${neovim}/bin/nvim";
}; };
} }

18
nix/sources.json
View file

@ -53,10 +53,10 @@
"homepage": null, "homepage": null,
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "51d115ac89d676345b05a0694b23bd2691bf708a", "rev": "4bd1938e03e1caa49a6da1ec8cff802348458f05",
"sha256": "1gfjaa25nq4vprs13h30wasjxh79i67jj28v54lkj4ilqjhgh2rs", "sha256": "0529npmibafjr80i2bhqg22pjr3d5qz1swjcq2jkdla1njagkq2k",
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/51d115ac89d676345b05a0694b23bd2691bf708a.tar.gz", "url": "https://github.com/NixOS/nixpkgs/archive/4bd1938e03e1caa49a6da1ec8cff802348458f05.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": {
@ -71,6 +71,18 @@
"url": "https://github.com/NixOS/nixpkgs/archive/75dd59019ca3043d29ec6fbb3f69d9bcb46d2113.tar.gz", "url": "https://github.com/NixOS/nixpkgs/archive/75dd59019ca3043d29ec6fbb3f69d9bcb46d2113.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-release": {
"branch": "release-20.03",
"description": "Nixpkgs/NixOS branches that track the Nixpkgs/NixOS channels",
"homepage": null,
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0da54872f9da4649099118b8f59e85a4256cc45c",
"sha256": "17f63bz3l6j8iyxifmk12qvn0rkxi53yrv294q8sghcqrw0qhr98",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/0da54872f9da4649099118b8f59e85a4256cc45c.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"obelisk": { "obelisk": {
"branch": "master", "branch": "master",
"description": "Obelisk provides an easy way to develop and deploy your Reflex project for web and mobile", "description": "Obelisk provides an easy way to develop and deploy your Reflex project for web and mobile",

2
overlays/10-previews.nix
View file

@ -8,6 +8,6 @@ in {
inherit (unstable.gnome3) gnome-keyring seahorse gdm; inherit (unstable.gnome3) gnome-keyring seahorse gdm;
}; };
inherit (unstable) inherit (unstable)
aqbanking neovim vimPlugins syncthing nerdfonts ormolu ghcid go-neb; aqbanking neovim vimPlugins syncthing nerdfonts ormolu ghcid go-neb fzf nixpkgs-fmt;
inherit (nixpkgs-master) element-web element-desktop; inherit (nixpkgs-master) element-web element-desktop;
} }

1
overlays/20-unfree.nix
View file

@ -4,4 +4,5 @@ if super.config.allowUnfree or false then
else { else {
unfree = import self.sources.nixpkgs { config.allowUnfree = true; }; unfree = import self.sources.nixpkgs { config.allowUnfree = true; };
unstableUnfree = import self.sources.unstable { config.allowUnfree = true; }; unstableUnfree = import self.sources.unstable { config.allowUnfree = true; };
releaseUnfree = import self.sources.nixpkgs-release { config.allowUnfree = true; };
} }

5
overlays/30-ghc.nix
View file

@ -1,10 +1,11 @@
self: super: self: super:
let let
inherit (super) fetchFromGitHub;
master = import super.sources.nixpkgs-master { }; master = import super.sources.nixpkgs-master { };
inherit (master.haskell.lib) overrideCabal unmarkBroken; inherit (master.haskell.lib) overrideCabal unmarkBroken;
myOverrides = self: super: { myOverrides = self: super: {
optics = super.optics_0_3; optics = super.optics_0_3;
optics-th = super.optics-th_0_3_0_1; optics-th = super.optics-th_0_3_0_2;
optics-core = super.optics-core_0_3_0_1; optics-core = super.optics-core_0_3_0_1;
optics-extra = super.optics-extra_0_3; optics-extra = super.optics-extra_0_3;
}; };
@ -24,5 +25,5 @@ in {
myHaskellPackages = makeHaskellPackages master.haskellPackages; myHaskellPackages = makeHaskellPackages master.haskellPackages;
scriptGhc = master.ghc.withPackages scriptGhc = master.ghc.withPackages
(p: builtins.attrValues (makeHaskellScriptPackages p)); (p: builtins.attrValues (makeHaskellScriptPackages p));
ghc = master.ghc.withHoogle (p: builtins.attrValues (makeHaskellPackages p)); ghc = (master.haskellPackages.override { overrides = myOverrides; }).ghc.withHoogle (p: builtins.attrValues (makeHaskellPackages p));
} }

2
overlays/neuron-language-server/package.nix
View file

@ -7,7 +7,7 @@ buildGoModule {
owner = "aca"; owner = "aca";
repo = "neuron-language-server"; repo = "neuron-language-server";
rev = "master"; rev = "master";
sha256 = "02vj5szqric7zbm8fbw9ngg4dwrgi3nss6a4kv28bqjr1zm3zn4v"; sha256 = "1kbh0bzzfmk7aj3c6k3ifwx4p42lw2pnr68srk3qpy6hjna8nczb";
}; };
vendorSha256 = "02dajl4l3c8522ik2hmiq8cx4kj4h2ykx8l7qsal5xznx9pqbs7i"; vendorSha256 = "02dajl4l3c8522ik2hmiq8cx4kj4h2ykx8l7qsal5xznx9pqbs7i";

2
overlays/pkgSets.nix
View file

@ -45,7 +45,7 @@ self: super: {
inherit (self.pythonPackages) yapf jsbeautifier; inherit (self.pythonPackages) yapf jsbeautifier;
inherit (self) inherit (self)
go gdb mpc_cli ncmpcpp shfmt htmlTidy astyle nodejs tasksh magic-wormhole go gdb mpc_cli ncmpcpp shfmt htmlTidy astyle nodejs tasksh magic-wormhole
nixfmt rnix-lsp tmate rustup kitty nix-top ghc ghcid; nixfmt nixpkgs-fmt rnix-lsp tmate rustup kitty nix-top ghc ghcid;
obelisk = (import self.sources.obelisk { }).command; obelisk = (import self.sources.obelisk { }).command;
}; };
accounting-pkgs = { accounting-pkgs = {