From bd58cf5821dda1517585bd371a98fa9c301ca270 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Sun, 2 Mar 2025 22:10:27 +0000 Subject: [PATCH] nix flake update --- flake.lock | 60 +++++++++---------- nix/home/opdavies/default.nix | 1 + nix/home/opdavies/desktop/default.nix | 2 +- nix/modules/home-manager/features/cli/git.nix | 2 +- .../features/desktop/media/kdenlive.nix | 2 +- .../home-manager/features/desktop/zoom.nix | 2 +- nix/modules/nixos/features/gaming.nix | 2 +- nvim/plugin/harpoon.lua | 45 +++----------- 8 files changed, 44 insertions(+), 72 deletions(-) diff --git a/flake.lock b/flake.lock index e1267ba..edd0542 100644 --- a/flake.lock +++ b/flake.lock @@ -50,11 +50,11 @@ ] }, "locked": { - "lastModified": 1739841949, - "narHash": "sha256-lSOXdgW/1zi/SSu7xp71v+55D5Egz8ACv0STkj7fhbs=", + "lastModified": 1740485968, + "narHash": "sha256-WK+PZHbfDjLyveXAxpnrfagiFgZWaTJglewBWniTn2Y=", "owner": "nix-community", "repo": "disko", - "rev": "15dbf8cebd8e2655a883b74547108e089f051bf0", + "rev": "19c1140419c4f1cdf88ad4c1cfb6605597628940", "type": "github" }, "original": { @@ -128,11 +128,11 @@ ] }, "locked": { - "lastModified": 1739842562, - "narHash": "sha256-XNvgSmdHHOhxQEHW/GFdaaXqcEcWdMXvLJyYyLmxciE=", + "lastModified": 1740845322, + "narHash": "sha256-AXEgFj3C0YJhu9k1OhbRhiA6FnDr81dQZ65U3DhaWpw=", "owner": "nix-community", "repo": "home-manager", - "rev": "69dfc316c5b5f2de1d68e477393fecbf19a0cdba", + "rev": "fcac3d6d88302a5e64f6cb8014ac785e08874c8d", "type": "github" }, "original": { @@ -144,11 +144,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1739798439, - "narHash": "sha256-GyipmjbbQEaosel/+wq1xihCKbv0/e1LU00x/8b/fP4=", + "lastModified": 1740646007, + "narHash": "sha256-dMReDQobS3kqoiUCQIYI9c0imPXRZnBubX20yX/G5LE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3e2ea8a49d4d76276b0f4e2041df8ca5c0771371", + "rev": "009b764ac98a3602d41fc68072eeec5d24fc0e49", "type": "github" }, "original": { @@ -164,11 +164,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1739782332, - "narHash": "sha256-bPZKuual2WKfyHv7Wq+Owcj9R+i/qFzOWByqSS9rlxI=", + "lastModified": 1740567864, + "narHash": "sha256-eTS2wrC1jKR6PKXC9jZqQy5PwqbIOBLSLF3dwLiFJ8M=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "59bdbb1e75232bf1dd6d2a9313b9b6ddc5049ba2", + "rev": "1f40b43d01626ce994eb47150afa0d7215f396ca", "type": "github" }, "original": { @@ -212,11 +212,11 @@ }, "nixpkgs-2411": { "locked": { - "lastModified": 1739758141, - "narHash": "sha256-uq6A2L7o1/tR6VfmYhZWoVAwb3gTy7j4Jx30MIrH0rE=", + "lastModified": 1740865531, + "narHash": "sha256-h00vGIh/jxcGl8aWdfnVRD74KuLpyY3mZgMFMy7iKIc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c618e28f70257593de75a7044438efc1c1fc0791", + "rev": "5ef6c425980847c78a80d759abc476e941a9bf42", "type": "github" }, "original": { @@ -228,11 +228,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1739842125, - "narHash": "sha256-xzm9gbfRniztP5IxouqHo7le++ZCgdvgc2hFoIP7trY=", + "lastModified": 1740951829, + "narHash": "sha256-tsloAIbMJC5ItHUfS8p/AbJXVTfflZijYrERsQNVc3o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f365bef3cc9ce80ebc35e5aec273a975bc38e930", + "rev": "75e9d5e5cc345c093af5ac39f307a9187adfb08b", "type": "github" }, "original": { @@ -244,11 +244,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1739624908, - "narHash": "sha256-f84lBmLl4tkDp1ZU5LBTSFzlxXP4926DVW3KnXrke10=", + "lastModified": 1740463929, + "narHash": "sha256-4Xhu/3aUdCKeLfdteEHMegx5ooKQvwPHNkOgNCXQrvc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a60651b217d2e529729cbc7d989c19f3941b9250", + "rev": "5d7db4668d7a0c6cc5fc8cf6ef33b008b2b1ed8b", "type": "github" }, "original": { @@ -260,11 +260,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1739736696, - "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=", + "lastModified": 1740828860, + "narHash": "sha256-cjbHI+zUzK5CPsQZqMhE3npTyYFt9tJ3+ohcfaOF/WM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f", + "rev": "303bd8071377433a2d8f76e684ec773d70c5b642", "type": "github" }, "original": { @@ -276,11 +276,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1739736696, - "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=", + "lastModified": 1740828860, + "narHash": "sha256-cjbHI+zUzK5CPsQZqMhE3npTyYFt9tJ3+ohcfaOF/WM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f", + "rev": "303bd8071377433a2d8f76e684ec773d70c5b642", "type": "github" }, "original": { @@ -297,11 +297,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1739841231, - "narHash": "sha256-dj927SnzgtkaNEYdo0SADNLOzvhj7QPj8vlNpJDCaQg=", + "lastModified": 1740948325, + "narHash": "sha256-u/kvjABaWQs7DrqHE5ZnWlmbTkPk4wNZ7EQu7L1l8ks=", "owner": "nix-community", "repo": "NUR", - "rev": "4decf057c3af1f2f1c5528d04fdec3c6b777d09d", + "rev": "6def47427ce83f56c6a07a5651536e26f227f386", "type": "github" }, "original": { diff --git a/nix/home/opdavies/default.nix b/nix/home/opdavies/default.nix index 649530e..1a87451 100644 --- a/nix/home/opdavies/default.nix +++ b/nix/home/opdavies/default.nix @@ -17,6 +17,7 @@ let overlays = [ outputs.overlays.additions + outputs.overlays.stable-packages ]; }; diff --git a/nix/home/opdavies/desktop/default.nix b/nix/home/opdavies/desktop/default.nix index fe9e24a..c24100d 100644 --- a/nix/home/opdavies/desktop/default.nix +++ b/nix/home/opdavies/desktop/default.nix @@ -9,9 +9,9 @@ home.packages = with pkgs; [ build-glove80 gscan2pdf + kdePackages.okular meslo-lg obs-studio - okular pamixer pavucontrol xcape diff --git a/nix/modules/home-manager/features/cli/git.nix b/nix/modules/home-manager/features/cli/git.nix index 9e11e80..3db41cb 100644 --- a/nix/modules/home-manager/features/cli/git.nix +++ b/nix/modules/home-manager/features/cli/git.nix @@ -144,7 +144,7 @@ }; }; - home.packages = [ pkgs.git-instafix ]; + home.packages = with pkgs; [ nixpkgs-2411.git-instafix ]; home.sessionVariables = { GIT_INSTAFIX_UPSTREAM = "origin/main"; diff --git a/nix/modules/home-manager/features/desktop/media/kdenlive.nix b/nix/modules/home-manager/features/desktop/media/kdenlive.nix index 7069540..77743e6 100644 --- a/nix/modules/home-manager/features/desktop/media/kdenlive.nix +++ b/nix/modules/home-manager/features/desktop/media/kdenlive.nix @@ -11,6 +11,6 @@ with lib; options.features.desktop.media.kdenlive.enable = mkEnableOption "Enable kdenlive"; config = mkIf config.features.desktop.media.kdenlive.enable { - home.packages = with pkgs; [ kdenlive ]; + home.packages = with pkgs; [ kdePackages.kdenlive ]; }; } diff --git a/nix/modules/home-manager/features/desktop/zoom.nix b/nix/modules/home-manager/features/desktop/zoom.nix index 417d78e..5992587 100644 --- a/nix/modules/home-manager/features/desktop/zoom.nix +++ b/nix/modules/home-manager/features/desktop/zoom.nix @@ -11,6 +11,6 @@ with lib; options.features.desktop.zoom.enable = mkEnableOption "Enable zoom"; config = mkIf config.features.desktop.zoom.enable { - home.packages = with pkgs; [ nixpkgs-2405.zoom-us ]; + home.packages = with pkgs; [ zoom-us ]; }; } diff --git a/nix/modules/nixos/features/gaming.nix b/nix/modules/nixos/features/gaming.nix index abcf78c..c8f4d40 100644 --- a/nix/modules/nixos/features/gaming.nix +++ b/nix/modules/nixos/features/gaming.nix @@ -13,6 +13,6 @@ with lib; config = mkIf config.features.desktop.gaming.enable { programs.steam.enable = true; - environment.systemPackages = with pkgs; [ nixpkgs-2411.zeroad ]; + environment.systemPackages = with pkgs; [ zeroad ]; }; } diff --git a/nvim/plugin/harpoon.lua b/nvim/plugin/harpoon.lua index 5fb4073..cfc88af 100644 --- a/nvim/plugin/harpoon.lua +++ b/nvim/plugin/harpoon.lua @@ -2,46 +2,17 @@ local harpoon = require "harpoon" harpoon:setup() -vim.keymap.set("n", "A", function() - harpoon:list():prepend() -end) - -vim.keymap.set("n", "a", function() +vim.keymap.set("n", "hm", function() harpoon:list():add() end) -vim.keymap.set("n", "", function() +vim.keymap.set("n", "hl", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end) -vim.keymap.set("n", "", function() - harpoon:list():select(1) -end) - -vim.keymap.set("n", "", function() - harpoon:list():select(2) -end) - -vim.keymap.set("n", "", function() - harpoon:list():select(3) -end) - -vim.keymap.set("n", "", function() - harpoon:list():select(4) -end) - -vim.keymap.set("n", "", function() - harpoon:list():replace_at(1) -end) - -vim.keymap.set("n", "", function() - harpoon:list():replace_at(2) -end) - -vim.keymap.set("n", "", function() - harpoon:list():replace_at(3) -end) - -vim.keymap.set("n", "", function() - harpoon:list():replace_at(4) -end) +-- Set 1..5 be my shortcuts to moving to the files +for _, idx in ipairs { 1, 2, 3, 4, 5 } do + vim.keymap.set("n", string.format("%d", idx), function() + harpoon:list():select(idx) + end) +end