This commit is contained in:
dusk 2021-05-24 23:54:27 +03:00
parent 5d0a5fe6d8
commit 9136c273e1
Signed by: dusk
GPG Key ID: 1D8F8FAF2294D6EA
4 changed files with 11 additions and 16 deletions

View File

@ -206,11 +206,11 @@
}, },
"latest": { "latest": {
"locked": { "locked": {
"lastModified": 1621884383, "lastModified": 1621888382,
"narHash": "sha256-fIU+yPGw41j1JRrU0aKg9efpoIMiJzaEZV2srCOClo4=", "narHash": "sha256-dGeE/SnWafRHmOC3KplwB27pJp1d1Ta1rj3VYIuBx58=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "db3199f8c31386a3b4e5958656e2eacdee3cce18", "rev": "d706be982af01d39a22fdea6a6d3cfe067909d77",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -394,11 +394,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1621873622, "lastModified": 1621886351,
"narHash": "sha256-NcYoexNRgL+Asuj8QDgMFB5IDudiMYGgK9/NZ1jHH9M=", "narHash": "sha256-5m5ZcOo8Yap2aoTU8BHBvY2zuiXve4J6T9M1qQpQf5w=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "c4a17212dbb8a920b0efd06238ea48af6618db11", "rev": "cc939dfd4c098d96bcc0c96b89e69226ea80fb42",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -6,7 +6,7 @@ final: prev: {
src = prev.fetchzip { src = prev.fetchzip {
url = "https://github.com/alexherbo2/kakoune.cr/releases/download/nightly/kakoune.cr-nightly-x86_64-unknown-linux-musl.zip"; url = "https://github.com/alexherbo2/kakoune.cr/releases/download/nightly/kakoune.cr-nightly-x86_64-unknown-linux-musl.zip";
stripRoot = false; stripRoot = false;
sha256 = "sha256-Ly6zsm2cea1GUpgwmmlkDO2UI0wsp/tSQSZpfvjLCrM="; sha256 = "sha256-uYn7rjANFcIC+YpWkVm59OdsGf8tIxbPqzaPngT8Jkw=";
}; };
installPhase = '' installPhase = ''

View File

@ -1,5 +1,4 @@
channels: final: prev: { channels: final: prev: {
__dontExport = true; # overrides clutter up actual creations __dontExport = true; # overrides clutter up actual creations
inherit (channels.latest) inherit (channels.latest)
@ -13,7 +12,6 @@ channels: final: prev: {
signal-desktop signal-desktop
starship; starship;
haskellPackages = prev.haskellPackages.override { haskellPackages = prev.haskellPackages.override {
overrides = hfinal: hprev: overrides = hfinal: hprev:
let version = prev.lib.replaceChars [ "." ] [ "" ] prev.ghc.version; let version = prev.lib.replaceChars [ "." ] [ "" ] prev.ghc.version;
@ -24,5 +22,4 @@ channels: final: prev: {
haskell-language-server; haskell-language-server;
}; };
}; };
} }

View File

@ -336,7 +336,6 @@ in
(nerdfonts.override { fonts = [ "Iosevka" ]; }) (nerdfonts.override { fonts = [ "Iosevka" ]; })
# Programs # Programs
discord-canary discord-canary
ripcord
audacity audacity
krita krita
gimp gimp
@ -966,12 +965,11 @@ in
filetypes = ["nix"] filetypes = ["nix"]
roots = ["flake.nix", "shell.nix", ".git"] roots = ["flake.nix", "shell.nix", ".git"]
command = "${pkgBin "rnix-lsp"}" command = "${pkgBin "rnix-lsp"}"
[language.haskell]
filetypes = ["haskell"]
roots = ["Setup.hs", "stack.yaml", "*.cabal"]
command = "${pkgBin "haskell-language-server"}"
''; '';
# [language.haskell]
# filetypes = ["haskell"]
# roots = ["Setup.hs", "stack.yaml", "*.cabal"]
# command = "${pkgBin "haskell-language-server"}"
"nixpkgs/config.nix".text = '' "nixpkgs/config.nix".text = ''
{ {
android_sdk.accept_license = true; android_sdk.accept_license = true;