From 2a6a33e3920a7d9b50dfac3c8e53aef8b0db62a1 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Thu, 30 Nov 2023 04:32:11 +0100 Subject: [PATCH] port to 23.11 --- flake.lock | 28 ++++++++++++++-------------- flake.nix | 8 ++++---- profiles/base/default.nix | 2 +- profiles/zsh/default.nix | 4 ++-- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index ab5aead..948116a 100644 --- a/flake.lock +++ b/flake.lock @@ -42,16 +42,16 @@ ] }, "locked": { - "lastModified": 1695108154, - "narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=", + "lastModified": 1700814205, + "narHash": "sha256-lWqDPKHRbQfi+zNIivf031BUeyciVOtwCwTjyrhDB5g=", "owner": "nix-community", "repo": "home-manager", - "rev": "07682fff75d41f18327a871088d20af2710d4744", + "rev": "aeb2232d7a32530d3448318790534d196bf9427a", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.05", + "ref": "release-23.11", "repo": "home-manager", "type": "github" } @@ -79,27 +79,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1698942558, - "narHash": "sha256-/UmnB+mEd6Eg3mJBrAgqRcyZX//RSjHphcCO7Ig9Bpk=", + "lastModified": 1701156937, + "narHash": "sha256-jpMJOFvOTejx211D8z/gz0ErRtQPy6RXxgD2ZB86mso=", "owner": "nixos", "repo": "nixpkgs", - "rev": "621f51253edffa1d6f08d5fce4f08614c852d17e", + "rev": "7c4c20509c4363195841faa6c911777a134acdf3", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-23.05", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } }, "nur": { "locked": { - "lastModified": 1699131694, - "narHash": "sha256-dKWORPD0ODREKihqCZqEqc1zJ3wACmoMmuf2BGg3DbE=", + "lastModified": 1701308551, + "narHash": "sha256-qMcu9E+TyzCe7BirjzVdgPsNPNGyI8BQ+bVZKlBKY38=", "owner": "nix-community", "repo": "NUR", - "rev": "6226a48fb329802a63da2babbdd2d375713af333", + "rev": "940a70ca002a96ddeb74335afbcc3a5389fda6af", "type": "github" }, "original": { @@ -120,11 +120,11 @@ }, "unstable": { "locked": { - "lastModified": 1699094435, - "narHash": "sha256-YLZ5/KKZ1PyLrm2MO8UxRe4H3M0/oaYqNhSlq6FDeeA=", + "lastModified": 1701174899, + "narHash": "sha256-1W+FMe8mWsJKXoBc+QgKmEeRj33kTFnPq7XCjU+bfnA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9d5d25bbfe8c0297ebe85324addcb5020ed1a454", + "rev": "010c7296f3b19a58b206fdf7d68d75a5b0a09e9e", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 862f553..0694117 100644 --- a/flake.nix +++ b/flake.nix @@ -1,13 +1,13 @@ { description = "dandellion's home-manager profiles"; - nixConfig.extra-substituters = ["https://cache.dodsorf.as"]; - nixConfig.exta-trusted-public-keys = "cache.dodsorf.as:FYKGadXTyI2ax8mirBTOjEqS/8PZKAWxiJVOBjESQXc="; + # nixConfig.extra-substituters = ["https://cache.dodsorf.as"]; + # nixConfig.exta-trusted-public-keys = "cache.dodsorf.as:FYKGadXTyI2ax8mirBTOjEqS/8PZKAWxiJVOBjESQXc="; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; - home-manager.url = "github:nix-community/home-manager/release-23.05"; + home-manager.url = "github:nix-community/home-manager/release-23.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; diff --git a/profiles/base/default.nix b/profiles/base/default.nix index 15a3564..a15b96a 100644 --- a/profiles/base/default.nix +++ b/profiles/base/default.nix @@ -74,7 +74,7 @@ in ncdu bat - exa + eza ripgrep ] ++ lib.optionals cfg.plus [ ffmpeg-full diff --git a/profiles/zsh/default.nix b/profiles/zsh/default.nix index 9cd834b..19fd168 100644 --- a/profiles/zsh/default.nix +++ b/profiles/zsh/default.nix @@ -21,8 +21,8 @@ in }; shellAliases = { cat = "bat"; - ls = "exa"; - tree = "exa -T"; + ls = "eza"; + tree = "eza -T"; df = "df -h"; sysu = "systemctl --user";