From 8b587f7f75dad474983c4dc860a0bcc0c1c6f6fe Mon Sep 17 00:00:00 2001 From: Daniel Patterson Date: Wed, 3 Nov 2021 20:29:49 +0000 Subject: [PATCH] bro stop asking idk --- flake.lock | 12 ++++++------ hosts/dingbox/configuration.nix | 2 +- user/dingbox/home.nix | 8 ++++++++ user/neovim/default.nix | 12 ++---------- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index f6fd61e..43304b9 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1635123562, - "narHash": "sha256-kYuwQqHXDYxy5ijpm8SvCoPNx0br1TpoWeTIOEwOYvA=", + "lastModified": 1635839387, + "narHash": "sha256-2B6DqfTiwY5w2TljC4+AxEUuVYMTP5Fo2h5iGNIONvk=", "owner": "nix-community", "repo": "home-manager", - "rev": "da8a78eec9f7adb57f9e961d1da64805efacff37", + "rev": "288faaa5a65e72e37e6027024829b15c8bb69286", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1634782485, - "narHash": "sha256-psfh4OQSokGXG0lpq3zKFbhOo3QfoeudRcaUnwMRkQo=", + "lastModified": 1635844945, + "narHash": "sha256-tZcL307dj28jgEU1Wdn+zwG9neyW0H2+ZjdVhvJxh9g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "34ad3ffe08adfca17fcb4e4a47bb5f3b113687be", + "rev": "b67e752c29f18a0ca5534a07661366d6a2c2e649", "type": "github" }, "original": { diff --git a/hosts/dingbox/configuration.nix b/hosts/dingbox/configuration.nix index 94bf795..5488ed2 100644 --- a/hosts/dingbox/configuration.nix +++ b/hosts/dingbox/configuration.nix @@ -19,7 +19,7 @@ # nix flakes compatibility nix = { - package = pkgs.nixUnstable; + package = pkgs.nix_2_4; extraOptions = '' experimental-features = nix-command flakes ''; diff --git a/user/dingbox/home.nix b/user/dingbox/home.nix index 455a28a..4b1d772 100644 --- a/user/dingbox/home.nix +++ b/user/dingbox/home.nix @@ -24,11 +24,14 @@ in with pkgs; [ + cargo chezmoi + discord element-desktop feh fzf go_1_17 + gopls jetbrains.goland i3 i3lock @@ -70,6 +73,11 @@ programs.starship.enable = true; + programs.vscode = { + enable = true; + }; + + home.stateVersion = "21.05"; } diff --git a/user/neovim/default.nix b/user/neovim/default.nix index 4643939..65baf8a 100644 --- a/user/neovim/default.nix +++ b/user/neovim/default.nix @@ -6,17 +6,9 @@ viAlias = true; vimAlias = true; plugins = with pkgs.vimPlugins; [ - fzf-vim - gruvbox-nvim - nerdtree + fugitive - nvim-lspconfig - - (nvim-treesitter.withPlugins (plugins: pkgs.tree-sitter.allGrammars)) - - nvim-whichkey-setup-lua - - vim-nix + nvim-treesitter ]; }; }