flake.lock

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

home/common/wm.nix

@@ -63,10 +63,6 @@ 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 = {

home/profile/base.nix

@@ -16,6 +16,8 @@ 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 = {

system/default.nix

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

system/mitigations.nix

@@ -1,18 +0,0 @@
-{ 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;
-    })
-  ];
-}