From 3c7877776ebc08c0914d9f5ac422321d24dc855e Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Wed, 6 Dec 2023 13:36:29 +0000 Subject: [PATCH] Switch to unstable by default --- flake.lock | 35 +++++++------------------ flake.nix | 5 ++-- system/nixos/configuration.nix | 5 ++-- system/shared/home-manager-packages.nix | 6 ++--- system/shared/modules/neovim.nix | 15 +++++------ 5 files changed, 21 insertions(+), 45 deletions(-) diff --git a/flake.lock b/flake.lock index 66dae33..8882981 100644 --- a/flake.lock +++ b/flake.lock @@ -24,32 +24,32 @@ ] }, "locked": { - "lastModified": 1700814205, - "narHash": "sha256-lWqDPKHRbQfi+zNIivf031BUeyciVOtwCwTjyrhDB5g=", + "lastModified": 1701728041, + "narHash": "sha256-x0pyrI1vC8evVDxCxyO6olOyr4wlFg9+VS3C3p4xFYQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "aeb2232d7a32530d3448318790534d196bf9427a", + "rev": "ac7216918cd65f3824ba7817dea8f22e61221eaf", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.11", + "ref": "master", "repo": "home-manager", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1701389149, - "narHash": "sha256-rU1suTIEd5DGCaAXKW6yHoCfR1mnYjOXQFOaH7M23js=", + "lastModified": 1701436327, + "narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5de0b32be6e85dc1a9404c75131316e4ffbc634c", + "rev": "91050ea1e57e50388fa87a3302ba12d188ef723a", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -72,28 +72,11 @@ "type": "github" } }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1701253981, - "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "flake-parts": "flake-parts", "home-manager": "home-manager", - "nixpkgs": "nixpkgs", - "nixpkgs-unstable": "nixpkgs-unstable" + "nixpkgs": "nixpkgs" } } }, diff --git a/flake.nix b/flake.nix index 28de1ae..4d6442d 100644 --- a/flake.nix +++ b/flake.nix @@ -1,9 +1,8 @@ { inputs = { home-manager.inputs.nixpkgs.follows = "nixpkgs"; - home-manager.url = "github:nix-community/home-manager/release-23.11"; - nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; - nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; + home-manager.url = "github:nix-community/home-manager/master"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; }; outputs = inputs@{ flake-parts, self, ... }: diff --git a/system/nixos/configuration.nix b/system/nixos/configuration.nix index b6d0530..23f832a 100644 --- a/system/nixos/configuration.nix +++ b/system/nixos/configuration.nix @@ -1,8 +1,6 @@ { inputs, pkgs, system }: let - pkgsUnstable = inputs.nixpkgs-unstable.legacyPackages."${system}"; - configure-gtk = pkgs.writeTextFile { name = "configure-gtk"; destination = "/bin/configure-gtk"; @@ -176,7 +174,8 @@ in monospace = [ "JetBrainsMono Nerd Font Mono" ]; }; }; - packages = with pkgsUnstable; [ + + packages = with pkgs; [ (nerdfonts.override { fonts = [ "AnonymousPro" diff --git a/system/shared/home-manager-packages.nix b/system/shared/home-manager-packages.nix index 91f5506..df9a02c 100644 --- a/system/shared/home-manager-packages.nix +++ b/system/shared/home-manager-packages.nix @@ -1,7 +1,5 @@ { inputs, pkgs, ... }: -let - pkgsUnstable = inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}"; -in + with pkgs; [ awscli2 bottom @@ -26,9 +24,9 @@ with pkgs; [ lua mysql neofetch - pkgsUnstable.rustywind pv ripgrep + rustywind terraform tldr tree diff --git a/system/shared/modules/neovim.nix b/system/shared/modules/neovim.nix index 5c2b2cc..2273dd6 100644 --- a/system/shared/modules/neovim.nix +++ b/system/shared/modules/neovim.nix @@ -1,8 +1,6 @@ { inputs, pkgs, self, ... }: let - pkgsUnstable = inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}"; - customVim = with self; { toggle-checkbox-nvim = pkgs.vimUtils.buildVimPlugin { name = "toggle-checkbox-nvim"; @@ -75,7 +73,7 @@ in customVim.vim-heritage customVim.vim-textobj-xmlattr customVim.vim-zoom - pkgsUnstable.vimPlugins.vim-astro + vimPlugins.vim-astro vimPlugins.vim-visual-star-search { @@ -86,13 +84,14 @@ in ''; } - pkgsUnstable.vimPlugins.refactoring-nvim vimPlugins.comment-nvim vimPlugins.dial-nvim vimPlugins.gitsigns-nvim vimPlugins.harpoon vimPlugins.impatient-nvim + vimPlugins.lualine-nvim vimPlugins.nvim-web-devicons + vimPlugins.refactoring-nvim vimPlugins.rest-nvim vimPlugins.undotree vimPlugins.vim-easy-align @@ -111,8 +110,6 @@ in vimPlugins.vim-tmux-navigator vimPlugins.vim-unimpaired - vimPlugins.lualine-nvim - { plugin = vimPlugins.vim-sort-motion; type = "lua"; @@ -154,8 +151,8 @@ in vimPlugins.nvim-treesitter-textobjects # LSP, linting and formatting - pkgsUnstable.vimPlugins.conform-nvim - pkgsUnstable.vimPlugins.none-ls-nvim + vimPlugins.conform-nvim + vimPlugins.none-ls-nvim vimPlugins.lsp-status-nvim vimPlugins.nvim-lspconfig @@ -215,6 +212,7 @@ in ansible-language-server gopls lua-language-server + nixd nodePackages.intelephense nodePackages."@astrojs/language-server" nodePackages."@tailwindcss/language-server" @@ -227,7 +225,6 @@ in nodePackages.vue-language-server nodePackages.yaml-language-server phpactor - pkgsUnstable.nixd rnix-lsp terraform-ls