Compare commits

...

3 Commits

5 changed files with 41 additions and 20 deletions

36
flake.lock generated
View File

@ -59,11 +59,11 @@
]
},
"locked": {
"lastModified": 1706981411,
"narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=",
"lastModified": 1710888565,
"narHash": "sha256-s9Hi4RHhc6yut4EcYD50sZWRDKsugBJHSbON8KFwoTw=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "652fda4ca6dafeb090943422c34ae9145787af37",
"rev": "f33900124c23c4eca5831b9b5eb32ea5894375ce",
"type": "github"
},
"original": {
@ -80,11 +80,11 @@
]
},
"locked": {
"lastModified": 1710452332,
"narHash": "sha256-+lKOoQ89fD6iz6Ro7Adml4Sx6SqQcTWII4t1rvVtdjs=",
"lastModified": 1710974515,
"narHash": "sha256-jZpdsypecYTOO9l12Vy77otGmh9uz8tGzcguifA30Vs=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "096d9c04b3e9438855aa65e24129b97a998bd3d9",
"rev": "1c2acec99933f9835cc7ad47e35303de92d923a4",
"type": "github"
},
"original": {
@ -224,11 +224,11 @@
]
},
"locked": {
"lastModified": 1710415616,
"narHash": "sha256-1qVByzzCcKoCmP8ReUSAjKU5V9pfTLHQIM4WI1tvQ9E=",
"lastModified": 1710868143,
"narHash": "sha256-U5DLWla6nNiomFyCskYn6QfNCpVyQTeyG6FOAuEKHRg=",
"owner": "hyprwm",
"repo": "contrib",
"rev": "75420d09f93346d9d23d5a1e26b42699f6b66cd6",
"rev": "4ee76323053bfae15cc05c294c7fda9997ca7fc3",
"type": "github"
},
"original": {
@ -320,11 +320,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1710408871,
"narHash": "sha256-YpSGYZR96I8g5OK/Fdm0O4+mHLen6YPA1cPanqqNqT0=",
"lastModified": 1710889954,
"narHash": "sha256-Pr6F5Pmd7JnNEMHHmspZ0qVqIBVxyZ13ik1pJtm2QXk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "bd5ddf2c6bfafff031edf80221e1ee94e86ca10a",
"rev": "7872526e9c5332274ea5932a0c3270d6e4724f3b",
"type": "github"
},
"original": {
@ -336,11 +336,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1710695816,
"narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=",
"lastModified": 1710838473,
"narHash": "sha256-RLvwdQSENKOaLdKhNie8XqHmTXzNm00/M/THj6zplQo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "614b4613980a522ba49f0d194531beddbb7220d3",
"rev": "fa9f817df522ac294016af3d40ccff82f5fd3a63",
"type": "github"
},
"original": {
@ -390,11 +390,11 @@
]
},
"locked": {
"lastModified": 1710727870,
"narHash": "sha256-Ulsx+t4SnRmjMJx4eF2Li+3rBGYhZp0XNShVjIheCfg=",
"lastModified": 1710987136,
"narHash": "sha256-Q8GRdlAIKZ8tJUXrbcRO1pA33AdoPfTUirsSnmGQnOU=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "a1b17cacfa7a6ed18f553a195a047f4e73e95da9",
"rev": "97596b54ac34ad8184ca1eef44b1ec2e5c2b5f9e",
"type": "github"
},
"original": {

View File

@ -63,6 +63,10 @@ in
"application/pdf" = defaultBrowser;
};
};
# this makes xdg.mimeApps overwrite mimeapps.list if it has been touched by something else
xdg.configFile."mimeapps.list" = {
force = true;
};
services = {
udiskie = {

View File

@ -16,8 +16,6 @@ in
config = lib.mkIf cfg.enable {
nixfiles.programs.comma.enable = true;
# this makes xdg.mimeApps overwrite mimeapps.list if it has been touched by something else
xdg.configFile."mimeapps.list".force = true;
# TODO move this stuff to a zsh.nix or something; this is just a quick fix so home.sessionVariables works
home.shellAliases = {

View File

@ -13,6 +13,7 @@ in
./sessions
./testing
./cachix.nix
./mitigations.nix
];
config = {};
options.nixfiles = {

18
system/mitigations.nix Normal file
View File

@ -0,0 +1,18 @@
{ pkgs, config, lib, inputs, nixpkgs, ... }:
let
p5 = config.services.xserver.desktopManager.plasma5.enable;
p6 = config.services.desktopManager.plasma6.enable;
in
{
config = lib.mkMerge [
(lib.mkIf (p5 || p6) {
assertions = [
{
assertion = ((nixpkgs == inputs.nixpkgs-unstable) && nixpkgs.lastModified < (1710889954 + (60*60*24*2)));
message = "workaround still configured in system/mitigations.nix";
}
];
programs.gnupg.agent.pinentryPackage = lib.mkForce pkgs.pinentry-qt;
})
];
}