From 87c2558155232dad664b20e3ab9a41484fba3b82 Mon Sep 17 00:00:00 2001 From: Jimbo Date: Thu, 21 Nov 2024 20:00:29 -0500 Subject: [PATCH] Update flake lock, switch back to Zen kernel, enable lazygit properly --- flake.lock | 24 +++++++++---------- hosts/tower/boot/default.nix | 2 +- .../home/programs/terminal/git/default.nix | 4 ++-- .../programs/terminal/git/lazygit/default.nix | 4 ++++ 4 files changed, 19 insertions(+), 15 deletions(-) create mode 100644 modules/home/programs/terminal/git/lazygit/default.nix diff --git a/flake.lock b/flake.lock index 14ad3eb..4d24c96 100644 --- a/flake.lock +++ b/flake.lock @@ -61,11 +61,11 @@ ] }, "locked": { - "lastModified": 1732109232, - "narHash": "sha256-iYh6h8yueU8IyOfNclbiBG2+fBFcjjUfXm90ZBzk0c0=", + "lastModified": 1732221404, + "narHash": "sha256-fWTyjgGt+BHmkeJ5IxOR4zGF4/uc+ceWmhBjOBSVkgQ=", "owner": "nix-community", "repo": "disko", - "rev": "a0c384e0a3b8bcaed30a6bcf3783f8a7c8b35be4", + "rev": "97c0c4d7072f19b598ed332e9f7f8ad562c6885b", "type": "github" }, "original": { @@ -310,11 +310,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1732067443, - "narHash": "sha256-CPNSYmlv8Hp1GHLPKq4RE1ujnOpwGEZKHZDWb1b1ZNc=", + "lastModified": 1732153840, + "narHash": "sha256-lt8Gdx6TNheby/9lRNE1GMP3vkdpLaXmyHQk+ZvYNAY=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "ca645f4163a501a3302e4afeb25f52906493bfd3", + "rev": "8325d463c1c424f2e6edeef2010c0d902a37b3d3", "type": "github" }, "original": { @@ -416,11 +416,11 @@ }, "nur": { "locked": { - "lastModified": 1732115975, - "narHash": "sha256-arKN32R6RbBo4Bm5s29QUFAMufGAonNpjdUmCKSLslE=", + "lastModified": 1732220928, + "narHash": "sha256-OOFqnjTax0132/mBsRpVD1QTMlZUCbVexKgKUVUxJNg=", "owner": "nix-community", "repo": "NUR", - "rev": "ac7a0e7173912ef48579ffe9e3ec0ab991c3fa8a", + "rev": "8439fca0da7f67b331edcca08eb2a47249be72f4", "type": "github" }, "original": { @@ -543,11 +543,11 @@ }, "unstable": { "locked": { - "lastModified": 1731676054, - "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "type": "github" }, "original": { diff --git a/hosts/tower/boot/default.nix b/hosts/tower/boot/default.nix index 3881cf2..03013bf 100644 --- a/hosts/tower/boot/default.nix +++ b/hosts/tower/boot/default.nix @@ -16,7 +16,7 @@ let in { boot = { # Must be Zen for IOMMU isolation - kernelPackages = pkgs.unstable.linuxPackages_latest; + kernelPackages = pkgs.unstable.linuxPackages_zen; kernel.sysctl."vm.max_map_count" = 2147483642; kernelParams = commonKernelParams ++ [ "vfio-pci.ids=10de:1f82,10de:10fa" ]; blacklistedKernelModules = [ "pcspkr" ]; diff --git a/modules/home/programs/terminal/git/default.nix b/modules/home/programs/terminal/git/default.nix index 1081e2e..7d4656a 100644 --- a/modules/home/programs/terminal/git/default.nix +++ b/modules/home/programs/terminal/git/default.nix @@ -1,10 +1,10 @@ { pkgs, config, ... }: { + imports = [ ./lazygit ]; + programs.git = { enable = true; userName = "Jimbo"; userEmail = "jimbo@${config.domains.jim2}"; }; - - home.packages = with pkgs; [ lazygit ]; } diff --git a/modules/home/programs/terminal/git/lazygit/default.nix b/modules/home/programs/terminal/git/lazygit/default.nix new file mode 100644 index 0000000..e7aa98b --- /dev/null +++ b/modules/home/programs/terminal/git/lazygit/default.nix @@ -0,0 +1,4 @@ +{ ... }: +{ + programs.lazygit.enable = true; +}