Merge branch 'nixos-24.05'

This commit is contained in:
Evie Litherland-Smith 2024-06-03 05:27:13 +01:00
commit 27bbe15db5
6 changed files with 14 additions and 14 deletions

View file

@ -41,16 +41,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715381426, "lastModified": 1716736833,
"narHash": "sha256-wPuqrAQGdv3ISs74nJfGb+Yprm23U/rFpcHFFNWgM94=", "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "ab5542e9dbd13d0100f8baae2bc2d68af901f4b4", "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-23.11", "ref": "release-24.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -91,16 +91,16 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1716361217, "lastModified": 1717144377,
"narHash": "sha256-mzZDr00WUiUXVm1ujBVv6A0qRd8okaITyUp4ezYRgc4=", "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "46397778ef1f73414b03ed553a3368f0e7e33c2f", "rev": "805a384895c696f802a9bf5bf4720f37385df547",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-23.11", "ref": "nixos-24.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

View file

@ -7,9 +7,9 @@
}; };
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-23.11"; url = "github:nix-community/home-manager/release-24.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
iosevka-custom.url = "git+https://git.xenia.me.uk/pixelifytica/iosevka.git"; iosevka-custom.url = "git+https://git.xenia.me.uk/pixelifytica/iosevka.git";

View file

@ -24,7 +24,7 @@
programs.home-manager.enable = true; programs.home-manager.enable = true;
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
services = { services = {
gpg-agent.pinentryFlavor = "gtk2"; gpg-agent.pinentryPackage = pkgs.pinentry-gtk2;
avizo.enable = true; avizo.enable = true;
syncthing.enable = true; syncthing.enable = true;
udiskie = { udiskie = {

View file

@ -14,6 +14,7 @@
swaynag.enable = true; swaynag.enable = true;
systemd.enable = true; systemd.enable = true;
xwayland = true; xwayland = true;
checkConfig = false;
config = { config = {
input = { input = {
"*" = { "*" = {

View file

@ -32,7 +32,6 @@
}; };
eza = { eza = {
enable = true; enable = true;
enableAliases = true;
git = true; git = true;
icons = true; icons = true;
extraOptions = ["--octal-permissions"]; extraOptions = ["--octal-permissions"];
@ -50,9 +49,9 @@
zsh = { zsh = {
enable = true; enable = true;
enableCompletion = true; enableCompletion = true;
enableAutosuggestions = true;
enableVteIntegration = true; enableVteIntegration = true;
autocd = true; autocd = true;
autosuggestion.enable = true;
defaultKeymap = "emacs"; defaultKeymap = "emacs";
syntaxHighlighting = { syntaxHighlighting = {
enable = true; enable = true;

View file

@ -28,7 +28,7 @@
maxCacheTtl = 86400; maxCacheTtl = 86400;
defaultCacheTtl = maxCacheTtl; defaultCacheTtl = maxCacheTtl;
defaultCacheTtlSsh = maxCacheTtl; defaultCacheTtlSsh = maxCacheTtl;
pinentryFlavor = lib.mkDefault "curses"; pinentryPackage = lib.mkDefault pkgs.pinentry-curses;
extraConfig = '' extraConfig = ''
no-allow-external-cache no-allow-external-cache
''; '';