diff --git a/flake.lock b/flake.lock
index 80121694..e1267ba4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -50,11 +50,11 @@
]
},
"locked": {
- "lastModified": 1740485968,
- "narHash": "sha256-WK+PZHbfDjLyveXAxpnrfagiFgZWaTJglewBWniTn2Y=",
+ "lastModified": 1739841949,
+ "narHash": "sha256-lSOXdgW/1zi/SSu7xp71v+55D5Egz8ACv0STkj7fhbs=",
"owner": "nix-community",
"repo": "disko",
- "rev": "19c1140419c4f1cdf88ad4c1cfb6605597628940",
+ "rev": "15dbf8cebd8e2655a883b74547108e089f051bf0",
"type": "github"
},
"original": {
@@ -128,11 +128,11 @@
]
},
"locked": {
- "lastModified": 1740606115,
- "narHash": "sha256-GKe3vrIWcei4gSTckEzHr5Zf/g9NSofmsAnbkNYU+lM=",
+ "lastModified": 1739842562,
+ "narHash": "sha256-XNvgSmdHHOhxQEHW/GFdaaXqcEcWdMXvLJyYyLmxciE=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "6be185eb76295e7562f5bf2da42afe374b8beb15",
+ "rev": "69dfc316c5b5f2de1d68e477393fecbf19a0cdba",
"type": "github"
},
"original": {
@@ -144,11 +144,11 @@
},
"nixos-hardware": {
"locked": {
- "lastModified": 1740387674,
- "narHash": "sha256-pGk/aA0EBvI6o4DeuZsr05Ig/r4uMlSaf5EWUZEWM10=",
+ "lastModified": 1739798439,
+ "narHash": "sha256-GyipmjbbQEaosel/+wq1xihCKbv0/e1LU00x/8b/fP4=",
"owner": "NixOS",
"repo": "nixos-hardware",
- "rev": "d58f642ddb23320965b27beb0beba7236e9117b5",
+ "rev": "3e2ea8a49d4d76276b0f4e2041df8ca5c0771371",
"type": "github"
},
"original": {
@@ -164,11 +164,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
- "lastModified": 1740567864,
- "narHash": "sha256-eTS2wrC1jKR6PKXC9jZqQy5PwqbIOBLSLF3dwLiFJ8M=",
+ "lastModified": 1739782332,
+ "narHash": "sha256-bPZKuual2WKfyHv7Wq+Owcj9R+i/qFzOWByqSS9rlxI=",
"owner": "nix-community",
"repo": "NixOS-WSL",
- "rev": "1f40b43d01626ce994eb47150afa0d7215f396ca",
+ "rev": "59bdbb1e75232bf1dd6d2a9313b9b6ddc5049ba2",
"type": "github"
},
"original": {
@@ -212,11 +212,11 @@
},
"nixpkgs-2411": {
"locked": {
- "lastModified": 1740463929,
- "narHash": "sha256-4Xhu/3aUdCKeLfdteEHMegx5ooKQvwPHNkOgNCXQrvc=",
+ "lastModified": 1739758141,
+ "narHash": "sha256-uq6A2L7o1/tR6VfmYhZWoVAwb3gTy7j4Jx30MIrH0rE=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "5d7db4668d7a0c6cc5fc8cf6ef33b008b2b1ed8b",
+ "rev": "c618e28f70257593de75a7044438efc1c1fc0791",
"type": "github"
},
"original": {
@@ -228,11 +228,11 @@
},
"nixpkgs-master": {
"locked": {
- "lastModified": 1740612775,
- "narHash": "sha256-ygDC2IMHf2ONEZ2XGiOrIPPZ+UTEvOnxJHcA0Za4x0E=",
+ "lastModified": 1739842125,
+ "narHash": "sha256-xzm9gbfRniztP5IxouqHo7le++ZCgdvgc2hFoIP7trY=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "f377b3c1b4d749cc4ac889e4252f2b4877696243",
+ "rev": "f365bef3cc9ce80ebc35e5aec273a975bc38e930",
"type": "github"
},
"original": {
@@ -244,11 +244,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1740463929,
- "narHash": "sha256-4Xhu/3aUdCKeLfdteEHMegx5ooKQvwPHNkOgNCXQrvc=",
+ "lastModified": 1739624908,
+ "narHash": "sha256-f84lBmLl4tkDp1ZU5LBTSFzlxXP4926DVW3KnXrke10=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "5d7db4668d7a0c6cc5fc8cf6ef33b008b2b1ed8b",
+ "rev": "a60651b217d2e529729cbc7d989c19f3941b9250",
"type": "github"
},
"original": {
@@ -260,11 +260,11 @@
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1740367490,
- "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=",
+ "lastModified": 1739736696,
+ "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05",
+ "rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f",
"type": "github"
},
"original": {
@@ -276,11 +276,11 @@
},
"nixpkgs_4": {
"locked": {
- "lastModified": 1740367490,
- "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=",
+ "lastModified": 1739736696,
+ "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05",
+ "rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f",
"type": "github"
},
"original": {
@@ -297,11 +297,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
- "lastModified": 1740603354,
- "narHash": "sha256-CO7g55YOMqO3APzKZXaGeDnPTwiomNwYVoHu8BttZD8=",
+ "lastModified": 1739841231,
+ "narHash": "sha256-dj927SnzgtkaNEYdo0SADNLOzvhj7QPj8vlNpJDCaQg=",
"owner": "nix-community",
"repo": "NUR",
- "rev": "ab4dcea9acd4ce723a5db2c02db8770acae8c629",
+ "rev": "4decf057c3af1f2f1c5528d04fdec3c6b777d09d",
"type": "github"
},
"original": {
diff --git a/nix/home/opdavies/desktop/default.nix b/nix/home/opdavies/desktop/default.nix
index 66f32ba3..58d0cf42 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/hosts/lemp11/programs.nix b/nix/hosts/lemp11/programs.nix
index c4874312..9da9ff93 100644
--- a/nix/hosts/lemp11/programs.nix
+++ b/nix/hosts/lemp11/programs.nix
@@ -2,6 +2,12 @@
{
programs = {
+ gnupg.agent = {
+ enable = true;
+ enableSSHSupport = true;
+ pinentryPackage = pkgs.pinentry-qt;
+ };
+
firefox = {
enable = true;
languagePacks = [ "en-GB" ];
diff --git a/nix/hosts/t490/programs.nix b/nix/hosts/t490/programs.nix
index ffadd265..aa7e2c3f 100644
--- a/nix/hosts/t490/programs.nix
+++ b/nix/hosts/t490/programs.nix
@@ -1,5 +1,13 @@
+{ pkgs, ... }:
+
{
programs = {
dconf.enable = true;
+
+ gnupg.agent = {
+ enable = true;
+ enableSSHSupport = true;
+ pinentryPackage = pkgs.pinentry-qt;
+ };
};
}
diff --git a/nix/modules/home-manager/features/desktop/media/kdenlive.nix b/nix/modules/home-manager/features/desktop/media/kdenlive.nix
index 77743e68..70695407 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; [ kdePackages.kdenlive ];
+ home.packages = with pkgs; [ kdenlive ];
};
}