opdavies/dotfiles
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

nix flake update

Browse source
This commit is contained in:
Oliver Davies 2025-03-02 22:10:27 +00:00
parent 9d2848cbd7
commit bd58cf5821
8 changed files with 44 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
flake.lock
View file

@ -50,11 +50,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1739841949, "lastModified": 1740485968,
"narHash": "sha256-lSOXdgW/1zi/SSu7xp71v+55D5Egz8ACv0STkj7fhbs=", "narHash": "sha256-WK+PZHbfDjLyveXAxpnrfagiFgZWaTJglewBWniTn2Y=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "15dbf8cebd8e2655a883b74547108e089f051bf0", "rev": "19c1140419c4f1cdf88ad4c1cfb6605597628940",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -128,11 +128,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1739842562, "lastModified": 1740845322,
"narHash": "sha256-XNvgSmdHHOhxQEHW/GFdaaXqcEcWdMXvLJyYyLmxciE=", "narHash": "sha256-AXEgFj3C0YJhu9k1OhbRhiA6FnDr81dQZ65U3DhaWpw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "69dfc316c5b5f2de1d68e477393fecbf19a0cdba", "rev": "fcac3d6d88302a5e64f6cb8014ac785e08874c8d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -144,11 +144,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1739798439, "lastModified": 1740646007,
"narHash": "sha256-GyipmjbbQEaosel/+wq1xihCKbv0/e1LU00x/8b/fP4=", "narHash": "sha256-dMReDQobS3kqoiUCQIYI9c0imPXRZnBubX20yX/G5LE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "3e2ea8a49d4d76276b0f4e2041df8ca5c0771371", "rev": "009b764ac98a3602d41fc68072eeec5d24fc0e49",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -164,11 +164,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1739782332, "lastModified": 1740567864,
"narHash": "sha256-bPZKuual2WKfyHv7Wq+Owcj9R+i/qFzOWByqSS9rlxI=", "narHash": "sha256-eTS2wrC1jKR6PKXC9jZqQy5PwqbIOBLSLF3dwLiFJ8M=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "59bdbb1e75232bf1dd6d2a9313b9b6ddc5049ba2", "rev": "1f40b43d01626ce994eb47150afa0d7215f396ca",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -212,11 +212,11 @@
}, },
"nixpkgs-2411": { "nixpkgs-2411": {
"locked": { "locked": {
"lastModified": 1739758141, "lastModified": 1740865531,
"narHash": "sha256-uq6A2L7o1/tR6VfmYhZWoVAwb3gTy7j4Jx30MIrH0rE=", "narHash": "sha256-h00vGIh/jxcGl8aWdfnVRD74KuLpyY3mZgMFMy7iKIc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c618e28f70257593de75a7044438efc1c1fc0791", "rev": "5ef6c425980847c78a80d759abc476e941a9bf42",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -228,11 +228,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1739842125, "lastModified": 1740951829,
"narHash": "sha256-xzm9gbfRniztP5IxouqHo7le++ZCgdvgc2hFoIP7trY=", "narHash": "sha256-tsloAIbMJC5ItHUfS8p/AbJXVTfflZijYrERsQNVc3o=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f365bef3cc9ce80ebc35e5aec273a975bc38e930", "rev": "75e9d5e5cc345c093af5ac39f307a9187adfb08b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -244,11 +244,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1739624908, "lastModified": 1740463929,
"narHash": "sha256-f84lBmLl4tkDp1ZU5LBTSFzlxXP4926DVW3KnXrke10=", "narHash": "sha256-4Xhu/3aUdCKeLfdteEHMegx5ooKQvwPHNkOgNCXQrvc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a60651b217d2e529729cbc7d989c19f3941b9250", "rev": "5d7db4668d7a0c6cc5fc8cf6ef33b008b2b1ed8b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -260,11 +260,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1739736696, "lastModified": 1740828860,
"narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=", "narHash": "sha256-cjbHI+zUzK5CPsQZqMhE3npTyYFt9tJ3+ohcfaOF/WM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f", "rev": "303bd8071377433a2d8f76e684ec773d70c5b642",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -276,11 +276,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1739736696, "lastModified": 1740828860,
"narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=", "narHash": "sha256-cjbHI+zUzK5CPsQZqMhE3npTyYFt9tJ3+ohcfaOF/WM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f", "rev": "303bd8071377433a2d8f76e684ec773d70c5b642",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -297,11 +297,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1739841231, "lastModified": 1740948325,
"narHash": "sha256-dj927SnzgtkaNEYdo0SADNLOzvhj7QPj8vlNpJDCaQg=", "narHash": "sha256-u/kvjABaWQs7DrqHE5ZnWlmbTkPk4wNZ7EQu7L1l8ks=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "4decf057c3af1f2f1c5528d04fdec3c6b777d09d", "rev": "6def47427ce83f56c6a07a5651536e26f227f386",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
nix/home/opdavies/default.nix
View file

@ -17,6 +17,7 @@ let
overlays = [ overlays = [
outputs.overlays.additions outputs.overlays.additions
outputs.overlays.stable-packages
]; ];
}; };

2
nix/home/opdavies/desktop/default.nix
View file

@ -9,9 +9,9 @@
home.packages = with pkgs; [ home.packages = with pkgs; [
build-glove80 build-glove80
gscan2pdf gscan2pdf
kdePackages.okular
meslo-lg meslo-lg
obs-studio obs-studio
okular
pamixer pamixer
pavucontrol pavucontrol
xcape xcape

2
nix/modules/home-manager/features/cli/git.nix
View file

@ -144,7 +144,7 @@
}; };
}; };
home.packages = [ pkgs.git-instafix ]; home.packages = with pkgs; [ nixpkgs-2411.git-instafix ];
home.sessionVariables = { home.sessionVariables = {
GIT_INSTAFIX_UPSTREAM = "origin/main"; GIT_INSTAFIX_UPSTREAM = "origin/main";

2
nix/modules/home-manager/features/desktop/media/kdenlive.nix
View file

@ -11,6 +11,6 @@ with lib;
options.features.desktop.media.kdenlive.enable = mkEnableOption "Enable kdenlive"; options.features.desktop.media.kdenlive.enable = mkEnableOption "Enable kdenlive";
config = mkIf config.features.desktop.media.kdenlive.enable { config = mkIf config.features.desktop.media.kdenlive.enable {
home.packages = with pkgs; [ kdenlive ]; home.packages = with pkgs; [ kdePackages.kdenlive ];
}; };
} }

2
nix/modules/home-manager/features/desktop/zoom.nix
View file

@ -11,6 +11,6 @@ with lib;
options.features.desktop.zoom.enable = mkEnableOption "Enable zoom"; options.features.desktop.zoom.enable = mkEnableOption "Enable zoom";
config = mkIf config.features.desktop.zoom.enable { config = mkIf config.features.desktop.zoom.enable {
home.packages = with pkgs; [ nixpkgs-2405.zoom-us ]; home.packages = with pkgs; [ zoom-us ];
}; };
} }

2
nix/modules/nixos/features/gaming.nix
View file

@ -13,6 +13,6 @@ with lib;
config = mkIf config.features.desktop.gaming.enable { config = mkIf config.features.desktop.gaming.enable {
programs.steam.enable = true; programs.steam.enable = true;
environment.systemPackages = with pkgs; [ nixpkgs-2411.zeroad ]; environment.systemPackages = with pkgs; [ zeroad ];
}; };
} }

45
nvim/plugin/harpoon.lua
View file

@ -2,46 +2,17 @@ local harpoon = require "harpoon"
harpoon:setup() harpoon:setup()
vim.keymap.set("n", "<leader>A", function() vim.keymap.set("n", "<leader>hm", function()
harpoon:list():prepend()
end)
vim.keymap.set("n", "<leader>a", function()
harpoon:list():add() harpoon:list():add()
end) end)
vim.keymap.set("n", "<C-e>", function() vim.keymap.set("n", "<leader>hl", function()
harpoon.ui:toggle_quick_menu(harpoon:list()) harpoon.ui:toggle_quick_menu(harpoon:list())
end) end)
vim.keymap.set("n", "<C-h>", function() -- Set <space>1..<space>5 be my shortcuts to moving to the files
harpoon:list():select(1) for _, idx in ipairs { 1, 2, 3, 4, 5 } do
end) vim.keymap.set("n", string.format("<space>%d", idx), function()
harpoon:list():select(idx)
vim.keymap.set("n", "<C-j>", function() end)
harpoon:list():select(2) end
end)
vim.keymap.set("n", "<C-k>", function()
harpoon:list():select(3)
end)
vim.keymap.set("n", "<C-l>", function()
harpoon:list():select(4)
end)
vim.keymap.set("n", "<leader><C-h>", function()
harpoon:list():replace_at(1)
end)
vim.keymap.set("n", "<leader><C-j>", function()
harpoon:list():replace_at(2)
end)
vim.keymap.set("n", "<leader><C-k>", function()
harpoon:list():replace_at(3)
end)
vim.keymap.set("n", "<leader><C-l>", function()
harpoon:list():replace_at(4)
end)