diff --git a/flake.lock b/flake.lock index ad28b01..1572354 100644 --- a/flake.lock +++ b/flake.lock @@ -206,11 +206,11 @@ }, "latest": { "locked": { - "lastModified": 1621884383, - "narHash": "sha256-fIU+yPGw41j1JRrU0aKg9efpoIMiJzaEZV2srCOClo4=", + "lastModified": 1621888382, + "narHash": "sha256-dGeE/SnWafRHmOC3KplwB27pJp1d1Ta1rj3VYIuBx58=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "db3199f8c31386a3b4e5958656e2eacdee3cce18", + "rev": "d706be982af01d39a22fdea6a6d3cfe067909d77", "type": "github" }, "original": { @@ -394,11 +394,11 @@ }, "nur": { "locked": { - "lastModified": 1621873622, - "narHash": "sha256-NcYoexNRgL+Asuj8QDgMFB5IDudiMYGgK9/NZ1jHH9M=", + "lastModified": 1621886351, + "narHash": "sha256-5m5ZcOo8Yap2aoTU8BHBvY2zuiXve4J6T9M1qQpQf5w=", "owner": "nix-community", "repo": "NUR", - "rev": "c4a17212dbb8a920b0efd06238ea48af6618db11", + "rev": "cc939dfd4c098d96bcc0c96b89e69226ea80fb42", "type": "github" }, "original": { diff --git a/overlays/kcr.nix b/overlays/kcr.nix index 120fff6..09a1b80 100644 --- a/overlays/kcr.nix +++ b/overlays/kcr.nix @@ -6,7 +6,7 @@ final: prev: { src = prev.fetchzip { url = "https://github.com/alexherbo2/kakoune.cr/releases/download/nightly/kakoune.cr-nightly-x86_64-unknown-linux-musl.zip"; stripRoot = false; - sha256 = "sha256-Ly6zsm2cea1GUpgwmmlkDO2UI0wsp/tSQSZpfvjLCrM="; + sha256 = "sha256-uYn7rjANFcIC+YpWkVm59OdsGf8tIxbPqzaPngT8Jkw="; }; installPhase = '' diff --git a/overlays/overrides.nix b/overlays/overrides.nix index 59516b3..6a69152 100644 --- a/overlays/overrides.nix +++ b/overlays/overrides.nix @@ -1,5 +1,4 @@ channels: final: prev: { - __dontExport = true; # overrides clutter up actual creations inherit (channels.latest) @@ -13,7 +12,6 @@ channels: final: prev: { signal-desktop starship; - haskellPackages = prev.haskellPackages.override { overrides = hfinal: hprev: let version = prev.lib.replaceChars [ "." ] [ "" ] prev.ghc.version; @@ -24,5 +22,4 @@ channels: final: prev: { haskell-language-server; }; }; - } diff --git a/users/patriot/default.nix b/users/patriot/default.nix index 48a530b..b42a96a 100644 --- a/users/patriot/default.nix +++ b/users/patriot/default.nix @@ -336,7 +336,6 @@ in (nerdfonts.override { fonts = [ "Iosevka" ]; }) # Programs discord-canary - ripcord audacity krita gimp @@ -966,12 +965,11 @@ in filetypes = ["nix"] roots = ["flake.nix", "shell.nix", ".git"] 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 = '' { android_sdk.accept_license = true;