From a1f39da01d902505978c69282f6b090dcc6b7e21 Mon Sep 17 00:00:00 2001 From: Matei Adriel Date: Thu, 26 May 2022 19:33:38 +0300 Subject: [PATCH] random update --- dotfiles/neovim/lua/my/plugins/treesitter.lua | 6 ++-- flake.lock | 30 +++++++++---------- modules/applications/misc.nix | 2 +- modules/applications/neovim.nix | 2 +- modules/dev/haskell/default.nix | 7 +++++ modules/dev/javascript.nix | 3 +- modules/nix.nix | 11 +++++++ modules/overlays/npm.nix | 2 +- modules/overlays/npm/default.nix | 7 +++-- 9 files changed, 47 insertions(+), 23 deletions(-) diff --git a/dotfiles/neovim/lua/my/plugins/treesitter.lua b/dotfiles/neovim/lua/my/plugins/treesitter.lua index 6ed5218..1948a1f 100644 --- a/dotfiles/neovim/lua/my/plugins/treesitter.lua +++ b/dotfiles/neovim/lua/my/plugins/treesitter.lua @@ -10,8 +10,10 @@ function M.setup() sync_install = false, indent = {enable = true}, highlight = { - enable = true, - disable = {"lua"}, -- WHY TF DOES THIS NOT WORK + enable = false, + disable = { + "lua", "json", "yaml", "bash", "scss", "html", "javascript" + }, -- WHY TF -- Setting this to true will run `:h syntax` and tree-sitter at the same time. -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation). diff --git a/flake.lock b/flake.lock index 48de068..21c301a 100644 --- a/flake.lock +++ b/flake.lock @@ -517,11 +517,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1652254318, - "narHash": "sha256-4LF4p4GuDJTVO2mqCAAZVwVI6tW8nSsoR8czPcoUU3M=", + "lastModified": 1653533365, + "narHash": "sha256-tPFBnXXBf2fxHtk5e9//7BL6LbxthtYkgznjNMrx9Ls=", "owner": "neovim", "repo": "neovim", - "rev": "3a5abcd649f3637e3292dd595dd197e85d1a2272", + "rev": "7b952793d5c46e862a9cdec3d6ac4762370296ed", "type": "github" }, "original": { @@ -540,11 +540,11 @@ ] }, "locked": { - "lastModified": 1652257362, - "narHash": "sha256-qtESMLoS2B+dVDlJpCIDZHQYM8BfGk7o9VivDf8w81I=", + "lastModified": 1653553105, + "narHash": "sha256-jyWSZMHmaGUmHq3Susugsf6a1/ejR9aaUaZHJ+qoOcs=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "5ab33071cc20422d0108c7e86d50cd8543e8475d", + "rev": "548165a9d107cb9d4ac84ede0ec6ff5dc815a447", "type": "github" }, "original": { @@ -555,11 +555,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1652172129, - "narHash": "sha256-8e2JMrswaKe02P8rYfvIMoc59pNuw6h/GYu8DBE1c+0=", + "lastModified": 1653407748, + "narHash": "sha256-g9puJaILRTb9ttlLQ7IehpV7Wcy0n+vs8LOFu6ylQcM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f419dc5763c2b3c5580e396dea065b6d8b58ee27", + "rev": "5ce6597eca7d7b518c03ecda57d45f9404b5e060", "type": "github" }, "original": { @@ -571,11 +571,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1652278321, - "narHash": "sha256-dvm5y9LkOtMeddK9eKzhhSK9d01yipfXISvQtGLBpU0=", + "lastModified": 1653565689, + "narHash": "sha256-xdJ6bmPxDPIMItZJWsDxopPXUTAFPWMkNkyOOcptWSc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e88ce43c86ebd9dee39764c3b8e9851cab9bef62", + "rev": "9bc0e974545d5bc4c24e1ed047be0dc4e30e494b", "type": "github" }, "original": { @@ -587,11 +587,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1652252629, - "narHash": "sha256-SvT64apetqc8P5nYp1/fOZvUmHUPdPFUZbhSpKy+1aI=", + "lastModified": 1653326962, + "narHash": "sha256-W8feCYqKTsMre4nAEpv5Kx1PVFC+hao/LwqtB2Wci/8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d2fc6856824cb87742177eefc8dd534bdb6c3439", + "rev": "41cc1d5d9584103be4108c1815c350e07c807036", "type": "github" }, "original": { diff --git a/modules/applications/misc.nix b/modules/applications/misc.nix index 41adda3..0ccf9f0 100644 --- a/modules/applications/misc.nix +++ b/modules/applications/misc.nix @@ -44,7 +44,7 @@ # deluge slack tdesktop # telegram for the desktop - zoom-us + # zoom-us # teams # browsers diff --git a/modules/applications/neovim.nix b/modules/applications/neovim.nix index d018e1d..ff3b807 100644 --- a/modules/applications/neovim.nix +++ b/modules/applications/neovim.nix @@ -17,6 +17,7 @@ let sumneko-lua-language-server # lua rnix-lsp # nix haskell-language-server # haskell + vscode-langservers-extracted # css and shit # Formatters luaformatter # lua @@ -62,7 +63,6 @@ in home.packages = [ neovim # idk why I need to install this here - vscode-langservers-extracted # css and shit ]; programs.neovim = { diff --git a/modules/dev/haskell/default.nix b/modules/dev/haskell/default.nix index f00fb56..f1d3829 100644 --- a/modules/dev/haskell/default.nix +++ b/modules/dev/haskell/default.nix @@ -1,5 +1,12 @@ { pkgs, ... }: { + # Use more recent ghc versions + # nixpkgs.overlays = [ + # (self: super: { + # haskell.compiler.ghc902 = self.unstable.haskell.compiler.ghc902; + # }) + # ]; + home-manager.users.adrielus.home = { file.".ghci".source = ./ghci; diff --git a/modules/dev/javascript.nix b/modules/dev/javascript.nix index 5305022..86f2b17 100644 --- a/modules/dev/javascript.nix +++ b/modules/dev/javascript.nix @@ -4,13 +4,14 @@ let yarn = pkgs.yarn.override { nodejs = node; }; in { + home-manager.users.adrielus.home.packages = with pkgs; with nodePackages; [ node deno node2nix - pnpm + unstable.nodePackages.pnpm yarn # TODO: find a good way to reinstall some of these diff --git a/modules/nix.nix b/modules/nix.nix index 49cf46e..6ce9b15 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -1,4 +1,15 @@ { pkgs, ... }: { + # Idk why tf I need to add this here + nixpkgs.config.permittedInsecurePackages = [ + "nodejs-12.22.12" + ]; + + home-manager.users.adrielus = { + nixpkgs.config.permittedInsecurePackages = [ + "nodejs-12.22.12" + ]; + }; + nix = { # Emanble nix flakes package = pkgs.nixFlakes; diff --git a/modules/overlays/npm.nix b/modules/overlays/npm.nix index 22202a5..994d29e 100644 --- a/modules/overlays/npm.nix +++ b/modules/overlays/npm.nix @@ -1,5 +1,5 @@ self: super: -let customPackages = self.callPackage ./npm { }; +let customPackages = (import ./npm) { nodejs = self.nodejs-17_x; pkgs = self; }; in with self; { # Faster prettier for editors diff --git a/modules/overlays/npm/default.nix b/modules/overlays/npm/default.nix index 53bdef1..cbf643e 100644 --- a/modules/overlays/npm/default.nix +++ b/modules/overlays/npm/default.nix @@ -1,8 +1,11 @@ # This file has been generated by node2nix 1.9.0. Do not edit! -{pkgs ? import { +{ pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: + } +, system ? builtins.currentSystem +, nodejs ? pkgs."nodejs-12_x" +}: let nodeEnv = import ./node-env.nix {