From f63a3e4dcc7046e04dcd59fd6ea3c23e1ef2500a Mon Sep 17 00:00:00 2001 From: teutat3s Date: Sun, 12 Nov 2023 19:06:07 +0100 Subject: [PATCH] feat: switch to nixos-unstable --- flake.lock | 32 +++++++++++++++++++------- flake.nix | 5 ++-- modules/desktop-extended/default.nix | 4 ++-- modules/graphical/default.nix | 4 ++-- modules/terminal-life/bash/default.nix | 4 ++-- modules/terminal-life/default.nix | 2 +- overlays/neovim-plugins.nix | 12 +++++----- users/teutat3s/home.nix | 2 +- 8 files changed, 41 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 44852d93..802f40ce 100644 --- a/flake.lock +++ b/flake.lock @@ -159,16 +159,15 @@ ] }, "locked": { - "lastModified": 1695108154, - "narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=", + "lastModified": 1699783872, + "narHash": "sha256-4zTwLT2LL45Nmo6iwKB3ls3hWodVP9DiSWxki/oewWE=", "owner": "nix-community", "repo": "home-manager", - "rev": "07682fff75d41f18327a871088d20af2710d4744", + "rev": "280721186ab75a76537713ec310306f0eba3e407", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.05", "repo": "home-manager", "type": "github" } @@ -226,6 +225,22 @@ "type": "github" } }, + "nixos-23-05": { + "locked": { + "lastModified": 1699596684, + "narHash": "sha256-XSXP8zjBZJBVvpNb2WmY0eW8O2ce+sVyj1T0/iBRIvg=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "da4024d0ead5d7820f6bd15147d3fe2a0c0cec73", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixos-flake": { "locked": { "lastModified": 1698598244, @@ -258,16 +273,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1699291058, - "narHash": "sha256-5ggduoaAMPHUy4riL+OrlAZE14Kh7JWX4oLEs22ZqfU=", + "lastModified": 1699099776, + "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "41de143fda10e33be0f47eab2bfe08a50f234267", + "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -317,6 +332,7 @@ "master": "master", "nix-darwin": "nix-darwin", "nixos-22-05": "nixos-22-05", + "nixos-23-05": "nixos-23-05", "nixos-flake": "nixos-flake", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", diff --git a/flake.nix b/flake.nix index 7746dff1..6fbcdb8b 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,8 @@ inputs = { # Track channels with commits tested and built by hydra nixos-22-05.url = "github:nixos/nixpkgs/nixos-22.05"; - nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; + nixos-23-05.url = "github:nixos/nixpkgs/nixos-23.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; unstable.url = "github:nixos/nixpkgs/nixos-unstable"; master.url = "github:nixos/nixpkgs/master"; @@ -18,7 +19,7 @@ nix-darwin.url = "github:lnl7/nix-darwin/master"; nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; - home-manager.url = "github:nix-community/home-manager/release-23.05"; + home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; flake-parts.url = "github:hercules-ci/flake-parts"; diff --git a/modules/desktop-extended/default.nix b/modules/desktop-extended/default.nix index 2c008dcc..96c29f14 100644 --- a/modules/desktop-extended/default.nix +++ b/modules/desktop-extended/default.nix @@ -30,11 +30,11 @@ in { ]; fonts = { - fonts = with pkgs; [ + packages = with pkgs; [ dejavu_fonts fira-code fira-code-symbols - google-fonts + #google-fonts lato montserrat nerdfonts diff --git a/modules/graphical/default.nix b/modules/graphical/default.nix index 95183e4b..38f64467 100644 --- a/modules/graphical/default.nix +++ b/modules/graphical/default.nix @@ -73,11 +73,11 @@ in { services.yubikey-agent.enable = true; fonts = { - fonts = with pkgs; [ + packages = with pkgs; [ dejavu_fonts powerline-fonts ]; - enableDefaultFonts = true; + enableDefaultPackages = true; fontconfig.enable = true; fontconfig.defaultFonts = { monospace = ["DejaVu Sans Mono for Powerline"]; diff --git a/modules/terminal-life/bash/default.nix b/modules/terminal-life/bash/default.nix index 92a61cc3..6df4aa09 100644 --- a/modules/terminal-life/bash/default.nix +++ b/modules/terminal-life/bash/default.nix @@ -100,8 +100,8 @@ in { vi = "nvim"; vim = "nvim"; mutt = "neomutt"; - ls = "exa"; - la = "exa --group-directories-first -lag"; + ls = "eza"; + la = "eza --group-directories-first -lag"; wget = "wget --hsts-file=$XDG_CACHE_HOME/wget-hsts"; irssi = "irssi --config=$XDG_CONFIG_HOME/irssi/config --home=$XDG_DATA_HOME/irssi"; drone = "DRONE_TOKEN=$(secret-tool lookup drone token) drone"; diff --git a/modules/terminal-life/default.nix b/modules/terminal-life/default.nix index c4e6a1d8..ceddc62e 100644 --- a/modules/terminal-life/default.nix +++ b/modules/terminal-life/default.nix @@ -27,7 +27,7 @@ in { asciinema bat blesh - exa + eza fd jump (nnn.overrideAttrs (o: { diff --git a/overlays/neovim-plugins.nix b/overlays/neovim-plugins.nix index 9bb3d73f..1bb2c399 100644 --- a/overlays/neovim-plugins.nix +++ b/overlays/neovim-plugins.nix @@ -2,22 +2,22 @@ final: prev: { vimPlugins = prev.vimPlugins // { - instant-nvim-nvfetcher = prev.vimUtils.buildVimPluginFrom2Nix { + instant-nvim-nvfetcher = prev.vimUtils.buildVimPlugin { inherit (prev.sources.instant-nvim-nvfetcher) pname version src; }; - vimagit-nvfetcher = prev.vimUtils.buildVimPluginFrom2Nix { + vimagit-nvfetcher = prev.vimUtils.buildVimPlugin { inherit (prev.sources.vimagit-nvfetcher) pname version src; }; - vim-caddyfile-nvfetcher = prev.vimUtils.buildVimPluginFrom2Nix { + vim-caddyfile-nvfetcher = prev.vimUtils.buildVimPlugin { inherit (prev.sources.vim-caddyfile-nvfetcher) pname version src; }; - vim-workspace-nvfetcher = prev.vimUtils.buildVimPluginFrom2Nix { + vim-workspace-nvfetcher = prev.vimUtils.buildVimPlugin { inherit (prev.sources.vim-workspace-nvfetcher) pname version src; }; - vim-beautify-nvfetcher = prev.vimUtils.buildVimPluginFrom2Nix { + vim-beautify-nvfetcher = prev.vimUtils.buildVimPlugin { inherit (prev.sources.vim-beautify-nvfetcher) pname version src; }; - vim-apprentice-nvfetcher = prev.vimUtils.buildVimPluginFrom2Nix { + vim-apprentice-nvfetcher = prev.vimUtils.buildVimPlugin { inherit (prev.sources.vim-apprentice-nvfetcher) pname version src; }; }; diff --git a/users/teutat3s/home.nix b/users/teutat3s/home.nix index 89eff3ef..f8401fba 100644 --- a/users/teutat3s/home.nix +++ b/users/teutat3s/home.nix @@ -81,7 +81,7 @@ in { complete -C ${pkgs.consul}/bin/consul consul complete -C ${pkgs.nomad_1_4}/bin/nomad nomad complete -C ${pkgs.vault}/bin/vault vault - complete -C ${pkgs.terraform}/bin/terraform terraform + complete -C ${flake.inputs.nixos-22-05.legacyPackages.${pkgs.system}.terraform}/bin/terraform terraform complete -C ${pkgs.waypoint}/bin/waypoint waypoint complete -C '${pkgs.awscli2}/bin/aws_completer' ${pkgs.awscli2}/bin/aws '';