From 97e843a098e81831cc19910d9115deb16cf232d6 Mon Sep 17 00:00:00 2001 From: Dave Gallant Date: Sun, 28 Nov 2021 14:16:58 -0500 Subject: [PATCH] Move to stable with the idea of transitioning a subset of packages to unstable --- common/linux.nix | 2 +- common/packages.nix | 12 +++++------- flake.lock | 20 ++++++++++---------- flake.nix | 2 +- home/default.nix | 24 ++++++++++++------------ home/nvim/lua/init.lua | 4 ++-- machines/hephaestus/configuration.nix | 2 +- 7 files changed, 32 insertions(+), 34 deletions(-) diff --git a/common/linux.nix b/common/linux.nix index d4eccba..d22858f 100644 --- a/common/linux.nix +++ b/common/linux.nix @@ -1,7 +1,7 @@ { pkgs, ... }: { - system.stateVersion = "unstable"; + system.stateVersion = "stable"; system.autoUpgrade.enable = true; # Automatically optimize the Nix store. diff --git a/common/packages.nix b/common/packages.nix index ee99014..9e94c03 100644 --- a/common/packages.nix +++ b/common/packages.nix @@ -76,7 +76,7 @@ in # lua lua53Packages.luacheck - stylua + # stylua # golang golangci-lint @@ -133,7 +133,7 @@ in ## aws aws-connect - aws-role-play + # aws-role-play aws-vault awscli2 awslogs @@ -142,10 +142,9 @@ in # python python39 python39Packages.black - python39Packages.ipython + # python39Packages.ipython python39Packages.pip - python39Packages.pipx - python39Packages.poetry + # python39Packages.poetry python39Packages.setuptools python39Packages.virtualenv @@ -154,7 +153,7 @@ in rubocop ruby rufo - rubyPackages.solargraph + # rubyPackages.solargraph # not in 21.05 # news srv @@ -211,7 +210,6 @@ in tailscale teams wireshark-qt - yuzu zoom-us netdata # TODO: Enable launchd support with nix-darwin ]); diff --git a/flake.lock b/flake.lock index b1dd8ea..0eeb720 100644 --- a/flake.lock +++ b/flake.lock @@ -81,11 +81,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1637944485, - "narHash": "sha256-78FOxFL8UonKZbueovs3Qc55KkTjc5mbqwcKYI/lOqw=", + "lastModified": 1638043901, + "narHash": "sha256-/ptPh9yDIFYik13bOv6nhPWlWaozOI9SVPe7F/nCzrw=", "owner": "neovim", "repo": "neovim", - "rev": "afbf89dc0120b1db5782a0bf807dc7c8db70ccf6", + "rev": "07223fae54b5b8095da16c598fc1395ec3677691", "type": "github" }, "original": { @@ -102,11 +102,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1638000798, - "narHash": "sha256-dqK12CEwqiTgAs5Gdn5tTLWb4He+oGvzHZI5uzS1vSE=", + "lastModified": 1638087178, + "narHash": "sha256-2Z1bFOdtqJz3259xIXaAqu3n0iD0uaKOG53uSCQEr34=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "ecdf29639837b6cb1e22ba531dabdbe8c908b2e1", + "rev": "e1a53537b1c7ad2a16da1493cd75b773635a9319", "type": "github" }, "original": { @@ -149,16 +149,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1637841632, - "narHash": "sha256-QYqiKHdda0EOnLGQCHE+GluD/Lq2EJj4hVTooPM55Ic=", + "lastModified": 1637973395, + "narHash": "sha256-wp/QgsnnKJAIMZeQgJT1bWQ/OutZ+80lHwtpYAUWDfE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "73369f8d0864854d1acfa7f1e6217f7d6b6e3fa1", + "rev": "4f37689c8a219a9d756c5ff38525ad09349f422f", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-21.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 50df2a5..8fb6b8a 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-21.05"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; diff --git a/home/default.nix b/home/default.nix index 9b032e0..1c8fa1d 100644 --- a/home/default.nix +++ b/home/default.nix @@ -11,16 +11,16 @@ let sha256 = "sha256-FDeyGH5OPAYV7zePCfDujsj+nGd5AFnqySPStJYEY2E="; }; }; - hound-nvim = pkgs.vimUtils.buildVimPlugin { - name = "hound-nvim"; - nativeBuildInputs = with pkgs; [ lua53Packages.luacheck stylua ]; - src = pkgs.fetchFromGitHub { - owner = "davegallant"; - repo = "hound.nvim"; - rev = "e85ba4f65ece79fe6332d8a0ccc594a0d367f4ed"; - sha256 = "sha256-fxPtixVB6dVjrxpJ1oP+eA00JSiKxWuii8pMxVeuyMY="; - }; - }; + # hound-nvim = pkgs.vimUtils.buildVimPlugin { + # name = "hound-nvim"; + # nativeBuildInputs = with pkgs; [ lua53Packages.luacheck ]; + # src = pkgs.fetchFromGitHub { + # owner = "davegallant"; + # repo = "hound.nvim"; + # rev = "e85ba4f65ece79fe6332d8a0ccc594a0d367f4ed"; + # sha256 = "sha256-fxPtixVB6dVjrxpJ1oP+eA00JSiKxWuii8pMxVeuyMY="; + # }; + # }; inherit (pkgs) stdenv; in { @@ -320,10 +320,10 @@ in plugins = with pkgs.vimPlugins; [ completion-nvim git-blame-nvim - gitlinker-nvim + # gitlinker-nvim # not in 21.05 glow-nvim gruvbox-nvim - hound-nvim + # hound-nvim lualine-nvim nvim-lspconfig nvim-tree-lua diff --git a/home/nvim/lua/init.lua b/home/nvim/lua/init.lua index beabded..b78869b 100644 --- a/home/nvim/lua/init.lua +++ b/home/nvim/lua/init.lua @@ -106,7 +106,7 @@ require("lspconfig").gopls.setup({}) require("lspconfig").pyright.setup({}) require("lspconfig").rls.setup({}) require("lspconfig").rnix.setup({}) -require("lspconfig").solargraph.setup({}) +-- require("lspconfig").solargraph.setup({}) # not in 21.05 require("lspconfig").terraformls.setup({}) require("lspconfig").tflint.setup({}) require("lspconfig").yamlls.setup({}) @@ -129,7 +129,7 @@ end) -- Plugins {{{1 --------------------------------------------------------------- ------------------------------------------------------------------------------- -- gitlinker -require("gitlinker").setup() +-- require("gitlinker").setup() -- status line require("lualine").setup({ diff --git a/machines/hephaestus/configuration.nix b/machines/hephaestus/configuration.nix index 501741c..94bd6ec 100644 --- a/machines/hephaestus/configuration.nix +++ b/machines/hephaestus/configuration.nix @@ -29,7 +29,7 @@ services.tailscale = { enable = true; }; - # services.xserver.videoDrivers = [ "nvidia" ]; + services.xserver.videoDrivers = [ "nvidia" ]; }