From 8ad9475f34bc5cad9df76bc72e55f6af1a954e02 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Thu, 18 Apr 2024 12:01:54 +0200 Subject: [PATCH] 2024-04-18 --- flake.lock | 24 ++++++++++++------------ profiles/base/default.nix | 7 +++++++ profiles/zsh/default.nix | 4 +++- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index 97c8131..ebfcd30 100644 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ ] }, "locked": { - "lastModified": 1706981411, - "narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=", + "lastModified": 1710888565, + "narHash": "sha256-s9Hi4RHhc6yut4EcYD50sZWRDKsugBJHSbON8KFwoTw=", "owner": "nix-community", "repo": "home-manager", - "rev": "652fda4ca6dafeb090943422c34ae9145787af37", + "rev": "f33900124c23c4eca5831b9b5eb32ea5894375ce", "type": "github" }, "original": { @@ -79,11 +79,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1710838473, - "narHash": "sha256-RLvwdQSENKOaLdKhNie8XqHmTXzNm00/M/THj6zplQo=", + "lastModified": 1711460390, + "narHash": "sha256-akSgjDZL6pVHEfSE6sz1DNSXuYX6hq+P/1Z5IoYWs7E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fa9f817df522ac294016af3d40ccff82f5fd3a63", + "rev": "44733514b72e732bd49f5511bd0203dea9b9a434", "type": "github" }, "original": { @@ -95,11 +95,11 @@ }, "nur": { "locked": { - "lastModified": 1710923589, - "narHash": "sha256-lKYSsx0BQbcXVZf14vpf2yD7r7pakHQ7173pxXmgvk4=", + "lastModified": 1711724241, + "narHash": "sha256-JiclJSBzebtmWevi7TcqYTO/GcDGzzHU0r2FOKNxMas=", "owner": "nix-community", "repo": "NUR", - "rev": "6b42f9fe3099d436ada62d4e41a36673caa10bbf", + "rev": "81b0577bd5a676cc7c4e29aeaa1886f284a0675d", "type": "github" }, "original": { @@ -120,11 +120,11 @@ }, "unstable": { "locked": { - "lastModified": 1710827359, - "narHash": "sha256-/KY8hffTh9SN/tTcDn/FrEiYwTXnU8NKnr4D7/stmmA=", + "lastModified": 1711681563, + "narHash": "sha256-rY/L4ZpFZRJDVoUsOqtpk3/8A8/l3RjYgMXmQc3uw3w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5710127d9693421e78cca4f74fac2db6d67162b1", + "rev": "9b09bde6e3fc9493b6a8b2a5702ac87c66505c64", "type": "github" }, "original": { diff --git a/profiles/base/default.nix b/profiles/base/default.nix index 60974a4..bfb74c9 100644 --- a/profiles/base/default.nix +++ b/profiles/base/default.nix @@ -58,6 +58,9 @@ in progress file + bintools + + gh tmux timewarrior @@ -65,6 +68,8 @@ in unzip p7zip + yt-dlp + parallel sshfs jq @@ -79,6 +84,7 @@ in ] ++ lib.optionals config.profiles.gui.enable [ mpv sxiv + gnome3.eog dolphin plasma5Packages.dolphin-plugins @@ -241,6 +247,7 @@ in # }); girt = pkgs.git-interactive-rebase-tool; in "${girt}/bin/interactive-rebase-tool"; + branch.sort = "-committerdate"; }; delta.enable = true; }; diff --git a/profiles/zsh/default.nix b/profiles/zsh/default.nix index 19fd168..28305b9 100644 --- a/profiles/zsh/default.nix +++ b/profiles/zsh/default.nix @@ -20,7 +20,7 @@ in share = false; }; shellAliases = { - cat = "bat"; + cat = "bat -pp"; ls = "eza"; tree = "eza -T"; df = "df -h"; @@ -78,6 +78,8 @@ in }; }; + programs.zoxide.enable = true; + home.packages = lib.optionals (config.profiles.gui.enable && config ? nixpkgs) [ pkgs.dan.mesloNFp10k ];