Compare commits

..

No commits in common. "7eb36b622b4de46635ce68e46d76879df56ebde9" and "20227371973bb40fa02f58a40a30d877307358b8" have entirely different histories.

5 changed files with 38 additions and 29 deletions

View file

@ -63,11 +63,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1773926255, "lastModified": 1772974802,
"narHash": "sha256-sZn8ioXgK12ronBh97g4/MoLE5AA7hquRiVMruBeiCw=", "narHash": "sha256-SEe6mMTwceijwzeeQ4dauWuuEwkdqobSbDgiwqQwnxI=",
"owner": "wamserma", "owner": "wamserma",
"repo": "flake-programs-sqlite", "repo": "flake-programs-sqlite",
"rev": "344e53cb994a06b512eb286325d0f97b7480ead9", "rev": "7ac37009c7b3fa6c1a1d076f3181a695401f7d31",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -128,11 +128,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1773952365, "lastModified": 1772985285,
"narHash": "sha256-temgIjfdoniHw2vvUGM/BgVgIUig0quH2ClRfSnNk94=", "narHash": "sha256-wEEmvfqJcl9J0wyMgMrj1TixOgInBW/6tLPhWGoZE3s=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "9bc3ca1230d96119bdf61b9c3ec0c66a2b6eafdc", "rev": "5be5d8245cbc7bc0c09fbb5f38f23f223c543f85",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -150,11 +150,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1773888274, "lastModified": 1772937574,
"narHash": "sha256-PujDYvxi8Hbm/EB706mi+UWRRzoBaAVhpJREH13Gepg=", "narHash": "sha256-Yw1tP/ASebNYuW2GcYDTgWf2Mg9qcUYo6MTagXyeFCs=",
"owner": "fufexan", "owner": "fufexan",
"repo": "nix-gaming", "repo": "nix-gaming",
"rev": "6e734655941171e75e64511c7c643f854753f52e", "rev": "d2b0b283deb24cdbb2750e658fa7001fee5ad586",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -165,11 +165,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1773821835, "lastModified": 1772773019,
"narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", "narHash": "sha256-E1bxHxNKfDoQUuvriG71+f+s/NT0qWkImXsYZNFFfCs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0", "rev": "aca4d95fce4914b3892661bcb80b8087293536c6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -220,11 +220,11 @@
"uv2nix": "uv2nix" "uv2nix": "uv2nix"
}, },
"locked": { "locked": {
"lastModified": 1773750494, "lastModified": 1772763464,
"narHash": "sha256-24rXOoLl1ozr0LhOFGIcoNege/HVpaql+JfFEJ0sCNA=", "narHash": "sha256-1IEO166bp1yLwyWE1tl6dJDzL6fniu4+OdeSJpkUwD4=",
"owner": "pwndbg", "owner": "pwndbg",
"repo": "pwndbg", "repo": "pwndbg",
"rev": "c1a626def5a40466dc7ac372f000a9a5dbf7af48", "rev": "2b1c3b4f91f05aca4ed8b17d0c7a634b55d8f754",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -302,11 +302,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1773889674, "lastModified": 1772944399,
"narHash": "sha256-+ycaiVAk3MEshJTg35cBTUa0MizGiS+bgpYw/f8ohkg=", "narHash": "sha256-xTzsSd3r5HBeufSZ3fszAn0ldfKctvsYG7tT2YJg5gY=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "29b6519f3e0780452bca0ac0be4584f04ac16cc5", "rev": "c8e69670b316d6788e435a3aa0bda74eb1b82cc0",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -13,6 +13,25 @@
}; };
}; };
virtualisation.libvirtd.enable = config.u.has.virt; virtualisation.libvirtd.enable = config.u.has.virt;
virtualisation.libvirtd.package = pkgs.libvirt.overrideAttrs (old: {
postPatch =
old.postPatch
+ (
let
script = pkgs.writeShellApplication {
name = "virt-secret-init-encryption-sh";
runtimeInputs = [
pkgs.coreutils
pkgs.systemd
];
text = ''exec ${pkgs.runtimeShell} "$@"'';
};
in ''
substituteInPlace src/secret/virt-secret-init-encryption.service.in \
--replace-fail /usr/bin/sh ${lib.getExe script}
''
);
});
programs.virt-manager.enable = config.u.has.graphical && config.u.has.virt; programs.virt-manager.enable = config.u.has.graphical && config.u.has.virt;
programs.nix-ld.enable = true; programs.nix-ld.enable = true;
hardware.graphics.enable32Bit = config.u.has.graphical && config.u.has.wine; hardware.graphics.enable32Bit = config.u.has.graphical && config.u.has.wine;

View file

@ -11,8 +11,4 @@ HISTFILESIZE=
HISTSIZE= HISTSIZE=
HISTTIMEFORMAT="[%F %T] " HISTTIMEFORMAT="[%F %T] "
HISTFILE=~/.cache/bash_history HISTFILE=~/.cache/bash_history
if [ -z "$PROMPT_COMMAND" ]; then
PROMPT_COMMAND="history -a"
else
PROMPT_COMMAND="history -a; $PROMPT_COMMAND" PROMPT_COMMAND="history -a; $PROMPT_COMMAND"
fi

View file

@ -3,5 +3,3 @@
name = caandt name = caandt
[core] [core]
sshCommand = ssh -F ~/.local/ssh/config sshCommand = ssh -F ~/.local/ssh/config
[init]
defaultBranch = main

View file

@ -32,10 +32,6 @@ lib.mkIf config.u.has.graphical {
"application/xml" = text; "application/xml" = text;
"text/html" = text; "text/html" = text;
"application/pdf" = browser;
"x-scheme-handler/http" = browser;
"x-scheme-handler/https" = browser;
"inode/directory" = "org.kde.dolphin.desktop"; "inode/directory" = "org.kde.dolphin.desktop";
}; };
xdg.portal = { xdg.portal = {