From ed7dbca71c5b31612039c41805d7c89893beb944 Mon Sep 17 00:00:00 2001 From: Matei Adriel Date: Wed, 19 Apr 2023 23:31:43 +0300 Subject: [PATCH] Cleaner setup for acessing unstable stuff --- devshells/visonum.nix | 6 +- dotfiles/neovim/ftplugin/tex.lua | 2 +- dotfiles/neovim/lazy-lock.json | 68 +++++++++++------------ dotfiles/neovim/lua/my/plugins/neorg.lua | 2 +- flake.lock | 6 +- flake.nix | 55 +++++++++--------- home/adrielus/features/neovim/default.nix | 14 +++-- 7 files changed, 80 insertions(+), 73 deletions(-) diff --git a/devshells/visonum.nix b/devshells/visonum.nix index b8a6c88..6441817 100644 --- a/devshells/visonum.nix +++ b/devshells/visonum.nix @@ -1,6 +1,6 @@ # Shell containing the tools I most commonly use for work -{ pkgs, inputs }: -let unstable = inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}; in +{ pkgs, upkgs, inputs }: pkgs.mkShell { - nativeBuildInputs = with pkgs; [ unstable.purescript unstable.spago typescript nodejs ]; + # REASON: purescript 0.15.7 and it's associated spago + nativeBuildInputs = [ upkgs.purescript upkgs.spago pkgs.typescript pkgs.nodejs ]; } diff --git a/dotfiles/neovim/ftplugin/tex.lua b/dotfiles/neovim/ftplugin/tex.lua index 923900f..da1a81c 100644 --- a/dotfiles/neovim/ftplugin/tex.lua +++ b/dotfiles/neovim/ftplugin/tex.lua @@ -231,4 +231,4 @@ vim.keymap.set( { desc = "Compile current buffer using vimtex", buffer = true } ) -vim.opt_local.list = false # The lsp usese tabs for formatting +vim.opt_local.list = false -- The lsp usese tabs for formatting diff --git a/dotfiles/neovim/lazy-lock.json b/dotfiles/neovim/lazy-lock.json index cc15d15..76022e8 100644 --- a/dotfiles/neovim/lazy-lock.json +++ b/dotfiles/neovim/lazy-lock.json @@ -1,76 +1,76 @@ { - "LuaSnip": { "branch": "master", "commit": "a835e3d680c5940b61780c6af07885db95382478" }, + "LuaSnip": { "branch": "master", "commit": "8d6c0a93dec34900577ba725e91c44b8d3ca1f45" }, "abbreinder.nvim": { "branch": "main", "commit": "5b2b5ff08a9ada42238d733aeebc6d3d96314d77" }, "abbremand.nvim": { "branch": "main", "commit": "d633341f632b0b2666dfc6dfe6b9842ba1610a1d" }, - "catppuccin": { "branch": "main", "commit": "128af65c3a23c94b324dc8d7f02a34feee8722d4" }, + "catppuccin": { "branch": "main", "commit": "6eb93f7240476ac51cec909fe0016e9a269c2a92" }, "clipboard-image.nvim": { "branch": "main", "commit": "d1550dc26729b7954f95269952e90471b838fa25" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, - "cmp-cmdline": { "branch": "main", "commit": "8fcc934a52af96120fe26358985c10c035984b53" }, + "cmp-cmdline": { "branch": "main", "commit": "af88e700417c6449719fc77f6f3745f88e42d5da" }, "cmp-emoji": { "branch": "main", "commit": "19075c36d5820253d32e2478b6aaf3734aeaafa0" }, "cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" }, "crates.nvim": { "branch": "main", "commit": "1d4bb1e7a0fe8bae3f97061be5fbf6f9081a27e2" }, - "dashboard-nvim": { "branch": "master", "commit": "6e0a35343fc37a2a2ca5ab1734d60fcc06c4cf01" }, + "dashboard-nvim": { "branch": "master", "commit": "275e7c8579858c3ee06f32c16bdc687153ca7204" }, "dhall-vim": { "branch": "master", "commit": "68500ef46ff3706f46c99db3be7a0c8abcf6a3ae" }, - "dressing.nvim": { "branch": "master", "commit": "5f44f829481640be0f96759c965ae22a3bcaf7ce" }, - "fidget.nvim": { "branch": "main", "commit": "688b4fec4517650e29c3e63cfbb6e498b3112ba1" }, - "firenvim": { "branch": "master", "commit": "12003d9727bc5074ccb405b3d80e691c72d4859b" }, + "dressing.nvim": { "branch": "master", "commit": "0e3e1eba147fee6e638ac1ac28f0495bcde17319" }, + "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" }, + "firenvim": { "branch": "master", "commit": "ee4ef314bd990b2b05b7fbd95b857159e444a2fe" }, "gitlinker.nvim": { "branch": "master", "commit": "cc59f732f3d043b626c8702cb725c82e54d35c25" }, - "glow.nvim": { "branch": "main", "commit": "5a8ccfb1876b1b2e29ea32c63221be6df45870d1" }, + "glow.nvim": { "branch": "main", "commit": "a3f24fdaa71d2c25a2b88026032b34f5b6a6e215" }, "harpoon": { "branch": "master", "commit": "f7040fd0c44e7a4010369136547de5604b9c22a1" }, "hydra.nvim": { "branch": "master", "commit": "3ced42c0b6a6c85583ff0f221635a7f4c1ab0dd0" }, "idris2-nvim": { "branch": "main", "commit": "dd850c1c67bcacd2395121b0898374fe9cdd228f" }, - "inc-rename.nvim": { "branch": "main", "commit": "21c23c379342a731a0c90f226601ec0434627b26" }, - "iron.nvim": { "branch": "master", "commit": "aa7aecc4410d475a62efff54896bd021501338f0" }, + "inc-rename.nvim": { "branch": "main", "commit": "fb1b7468f27d874feb209eac46be5205e20b7fd3" }, + "iron.nvim": { "branch": "master", "commit": "792dd11752c4699ea52c737b5e932d6f21b25834" }, "jupytext.vim": { "branch": "master", "commit": "32c1e37b2edf63a7e38d0deb92cc3f1462cc4dcd" }, "kmonad-vim": { "branch": "master", "commit": "37978445197ab00edeb5b731e9ca90c2b141723f" }, "knap": { "branch": "main", "commit": "8c083d333b8a82421a521539eb1c450b06c90eb6" }, "kotlin-vim": { "branch": "master", "commit": "53fe045906df8eeb07cb77b078fc93acda6c90b8" }, - "lazy.nvim": { "branch": "main", "commit": "887eb75591520a01548134c4623617b639289d0b" }, - "leap": { "branch": "main", "commit": "f74473d23ebf60957e0db3ff8172349a82e5a442" }, + "lazy.nvim": { "branch": "main", "commit": "5c89dc52f42e5058a46b0912d7d9042f564e44e0" }, + "leap": { "branch": "main", "commit": "0eb3611593e135150e2f7880ec67568ccb51c17a" }, "live-command.nvim": { "branch": "main", "commit": "ce4b104ce702c7bb9fdff863059af6d47107ca61" }, "lspkind.nvim": { "branch": "master", "commit": "c68b3a003483cf382428a43035079f78474cd11e" }, - "lualine.nvim": { "branch": "master", "commit": "e99d733e0213ceb8f548ae6551b04ae32e590c80" }, + "lualine.nvim": { "branch": "master", "commit": "84ffb80e452d95e2c46fa29a98ea11a240f7843e" }, "magma-nvim": { "branch": "main", "commit": "395b48e2e202d82fca76c15d2dcd8785c125d686" }, - "mind.nvim": { "branch": "master", "commit": "e59c52758c399caceb549c698cfa2d65e6bbb9f9" }, - "neoconf.nvim": { "branch": "main", "commit": "bc531ca41ba55d87416b4b3ade606ff81236389b" }, - "neodev.nvim": { "branch": "main", "commit": "0a8e312923671e78499b2e204f0f678379ba92c1" }, - "neogit": { "branch": "master", "commit": "039ff3212ec43cc4d3332956dfb54e263c8d5033" }, - "neorg": { "branch": "main", "commit": "1fecaab548161abd0238b3d16c81e69c7d14252a" }, - "neorg-telescope": { "branch": "main", "commit": "7d9f89375421401c41c3c270a2acad0b44ee0331" }, - "nui.nvim": { "branch": "main", "commit": "0dc148c6ec06577fcf06cbab3b7dac96d48ba6be" }, - "null-ls.nvim": { "branch": "main", "commit": "13dd1fc13063681ca7e039436c88f6eca7e3e937" }, - "nvim-autopairs": { "branch": "master", "commit": "e755f366721bc9e189ddecd39554559045ac0a18" }, + "mind.nvim": { "branch": "master", "commit": "002137dd7cf97865ebd01b6a260209d2daf2da66" }, + "neoconf.nvim": { "branch": "main", "commit": "315161d16fafb172cd4e46563a5b602fd8550a00" }, + "neodev.nvim": { "branch": "main", "commit": "e812f3d0e62e21a164b70f90f642cf30129503e4" }, + "neogit": { "branch": "master", "commit": "69a6ca7c41b023ebf9cad70778e227b3209b40c4" }, + "neorg": { "branch": "main", "commit": "f742e90d6d8ec831f0bce939c37a3c04407c0e9f" }, + "neorg-telescope": { "branch": "main", "commit": "787f95c527d4f3fe1c25600e92d939456967e944" }, + "nui.nvim": { "branch": "main", "commit": "ecd9def93891b9260b15b5fcef542eaabf4145c9" }, + "null-ls.nvim": { "branch": "main", "commit": "f8ffcd7cb8fb3325c711d459152ef132b5b65aed" }, + "nvim-autopairs": { "branch": "master", "commit": "58985de5eeab159462bc262de5cc1b9c9b375595" }, "nvim-cmp": { "branch": "main", "commit": "777450fd0ae289463a14481673e26246b5e38bf2" }, "nvim-comment": { "branch": "main", "commit": "e9ac16ab056695cad6461173693069ec070d2b23" }, - "nvim-lspconfig": { "branch": "master", "commit": "0f94c5fded29c0024254259f3d8a0284bfb507ea" }, - "nvim-tree.lua": { "branch": "master", "commit": "a50723e35f57f89fb67019127a16d90f16edfef8" }, - "nvim-treesitter": { "branch": "master", "commit": "ee1d6182801204c397534ac69c37f83283ba69e3" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "582cbb5a4cb50f6161cac8cc01f55aeaff6d836a" }, - "nvim-web-devicons": { "branch": "master", "commit": "074e13f21f52bb45d654069bdadbcb6d7c2b65d0" }, + "nvim-lspconfig": { "branch": "master", "commit": "eddaef928c1e1dd79a96f5db45f2fd7f2efe7ea0" }, + "nvim-tree.lua": { "branch": "master", "commit": "0db85a70248f9a90e61af5cdbafe5d9f4320f719" }, + "nvim-treesitter": { "branch": "master", "commit": "831f37635df26864a397a5e35450eec97bfe60cd" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "8673926519ea61069f9c1366d1ad1949316d250e" }, + "nvim-web-devicons": { "branch": "master", "commit": "4ec26d67d419c12a4abaea02f1b6c57b40c08d7e" }, "nvim_context_vt": { "branch": "master", "commit": "e592a9142fbfe0878ce886cd0d745963604c61d2" }, "paperplanes.nvim": { "branch": "master", "commit": "d704b2e1e594b32d454cc7e0c5f2cf9b391e3cc1" }, - "plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" }, + "plenary.nvim": { "branch": "master", "commit": "9ac3e9541bbabd9d73663d757e4fe48a675bb054" }, "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" }, "purescript-vim": { "branch": "main", "commit": "82348352e6568fcc0385bd7c99a8ead3a479feea" }, "rasi.vim": { "branch": "main", "commit": "eac9969cf935cd4380987dc99bfa10d69d3f34a6" }, - "rose-pine": { "branch": "main", "commit": "69f015b9522b468b320fbd56eb4ae72af4d5074f" }, + "rose-pine": { "branch": "main", "commit": "667851c05f87874826084474b5f04829940b6451" }, "rust-tools.nvim": { "branch": "master", "commit": "71d2cf67b5ed120a0e31b2c8adb210dd2834242f" }, "scrap.nvim": { "branch": "main", "commit": "16db44ae9403ec9c4b140394f294475d1af80a18" }, - "smart-splits.nvim": { "branch": "master", "commit": "52b521618511b3a874255c8a717ace7155fd5f21" }, - "telescope-file-browser.nvim": { "branch": "master", "commit": "94fe37a1ea217dd2f90d91222bc1531521146ac3" }, + "smart-splits.nvim": { "branch": "master", "commit": "31589a973ca8cd3ec8e4b96f14d7a37f22025a12" }, + "telescope-file-browser.nvim": { "branch": "master", "commit": "e0fcb12702ad0d2873544a31730f9aaef04fd032" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "580b6c48651cabb63455e97d7e131ed557b8c7e2" }, "telescope.nvim": { "branch": "master", "commit": "e960efa60e97df58e089b00270f09d60f27202c8" }, "undotree": { "branch": "master", "commit": "485f01efde4e22cb1ce547b9e8c9238f36566f21" }, "venn.nvim": { "branch": "main", "commit": "c114563960b8fb1197695d42798d1f3e7190b798" }, - "vim-abolish": { "branch": "master", "commit": "880a562ff9176773897930b5a26a496f68e5a985" }, + "vim-abolish": { "branch": "master", "commit": "cb3dcb220262777082f63972298d57ef9e9455ec" }, "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, "vim-teal": { "branch": "master", "commit": "d2aa107b257879e774680792a2aebaf9cd5742e0" }, "vim-tmux-navigator": { "branch": "master", "commit": "cdd66d6a37d991bba7997d593586fc51a5b37aa8" }, - "vim-wakatime": { "branch": "master", "commit": "3b3d7f3d0fb4a476a7d1ef4d6f41e31050bdf52a" }, + "vim-wakatime": { "branch": "master", "commit": "515dbcc2278a9279a19de838fa29fc5078e34e56" }, "vimux": { "branch": "master", "commit": "616fcb4799674a7a809b14ca2dc155bb6ba25788" }, - "which-key.nvim": { "branch": "main", "commit": "d1afcd48f309af58fdb43adc4581bf4b5684768b" }, + "which-key.nvim": { "branch": "main", "commit": "94cb020ff33a1e0e22fac1c41663d2c439741f17" }, "yuck.vim": { "branch": "master", "commit": "9b5e0370f70cc30383e1dabd6c215475915fe5c3" } } \ No newline at end of file diff --git a/dotfiles/neovim/lua/my/plugins/neorg.lua b/dotfiles/neovim/lua/my/plugins/neorg.lua index 10fa7dc..44bf4f2 100644 --- a/dotfiles/neovim/lua/my/plugins/neorg.lua +++ b/dotfiles/neovim/lua/my/plugins/neorg.lua @@ -7,7 +7,7 @@ local M = { require("neorg").setup({ load = { ["core.defaults"] = {}, -- Loads default behaviour - ["core.norg.concealer"] = {}, -- Adds pretty icons to your documents + ["core.concealer"] = {}, -- Adds pretty icons to your documents ["core.integrations.telescope"] = {}, -- {{{ Completions ["core.norg.completion"] = { diff --git a/flake.lock b/flake.lock index 4d5f9ae..fbdcffc 100644 --- a/flake.lock +++ b/flake.lock @@ -326,11 +326,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1679172431, - "narHash": "sha256-XEh5gIt5otaUbEAPUY5DILUTyWe1goAyeqQtmwaFPyI=", + "lastModified": 1681737997, + "narHash": "sha256-pHhjgsIkRMu80LmVe8QoKIZB6VZGRRxFmIvsC5S89k4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1603d11595a232205f03d46e635d919d1e1ec5b9", + "rev": "f00994e78cd39e6fc966f0c4103f908e63284780", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a53fe46..c97c20f 100644 --- a/flake.nix +++ b/flake.nix @@ -65,11 +65,12 @@ "x86_64-darwin" ]; - specialArgs = { + specialArgs = system: { inherit inputs outputs; + upkgs = inputs.nixpkgs-unstable.legacyPackages.${system}; }; in - rec { + { # Acessible through 'nix build', 'nix shell', etc packages = forAllSystems (system: let pkgs = nixpkgs.legacyPackages.${system}; @@ -83,10 +84,8 @@ let pkgs = nixpkgs.legacyPackages.${system}; default = import ./shell.nix { inherit pkgs; }; - devshells = import ./devshells - { - inherit pkgs; inherit inputs; - }; + args = { inherit pkgs; } // specialArgs system; + devshells = import ./devshells args; in devshells // { inherit default; }); @@ -102,34 +101,36 @@ # NixOS configuration entrypoint # Available through 'nixos-rebuild --flake .#... nixosConfigurations = { - tethys = nixpkgs.lib.nixosSystem { - inherit specialArgs; + tethys = let system = "x86_64-linux"; in + nixpkgs.lib.nixosSystem { + specialArgs = specialArgs system; - modules = [ - home-manager.nixosModules.home-manager - { - home-manager.users.adrielus = import ./home/adrielus/tethys.nix; - home-manager.extraSpecialArgs = specialArgs; - home-manager.useUserPackages = true; - stylix.homeManagerIntegration.followSystem = false; - stylix.homeManagerIntegration.autoImport = false; - } + modules = [ + home-manager.nixosModules.home-manager + { + home-manager.users.adrielus = import ./home/adrielus/tethys.nix; + home-manager.extraSpecialArgs = specialArgs system; + home-manager.useUserPackages = true; + stylix.homeManagerIntegration.followSystem = false; + stylix.homeManagerIntegration.autoImport = false; + } - ./hosts/nixos/tethys - ]; - }; + ./hosts/nixos/tethys + ]; + }; }; # Standalone home-manager configuration entrypoint # Available through 'home-manager --flake .#... homeConfigurations = { - "adrielus@tethys" = home-manager.lib.homeManagerConfiguration { - pkgs = nixpkgs.legacyPackages.x86_64-linux; - extraSpecialArgs = specialArgs; - modules = [ - ./home/adrielus/tethys.nix - ]; - }; + "adrielus@tethys" = let system = "x86_64-linux"; in + home-manager.lib.homeManagerConfiguration { + pkgs = nixpkgs.legacyPackages.${system}; + extraSpecialArgs = specialArgs system; + modules = [ + ./home/adrielus/tethys.nix + ]; + }; }; }; diff --git a/home/adrielus/features/neovim/default.nix b/home/adrielus/features/neovim/default.nix index aaffcaf..75ed651 100644 --- a/home/adrielus/features/neovim/default.nix +++ b/home/adrielus/features/neovim/default.nix @@ -1,11 +1,12 @@ -{ pkgs, lib, config, paths, inputs, ... }: +{ pkgs, upkgs, lib, config, paths, inputs, ... }: let # {{{ extraPackages extraPackages = with pkgs; [ # Language servers nodePackages.typescript-language-server # typescript nodePackages_latest.purescript-language-server # purescript - inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.lua-language-server # lua + # REASON: not in stable + upkgs.lua-language-server # lua rnix-lsp # nix nil # nix haskell-language-server # haskell @@ -107,10 +108,15 @@ let }; # }}} # {{{ Clients - neovim = wrapClient { base = pkgs.neovim; name = "nvim"; }; + neovim = wrapClient { + # REASON: nvim 9.0 + base = upkgs.neovim; + name = "nvim"; + }; neovide = wrapClient { - base = pkgs.neovide; + # REASON: neovide 10.0.4 + base = upkgs.neovide; name = "neovide"; extraArgs = "--set NEOVIDE_MULTIGRID true"; };