add mitmproxy to workstation

upgrade system
2024-03-31 19:46:48 +03:00 · 2024-03-23 18:01:09 +03:00
11 changed files with 260 additions and 175 deletions
--- a/flake.lock
+++ b/flake.lock
@ -8,11 +8,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1708104794,
-        "narHash": "sha256-Eq0MFpezo1lmP7sTVffHAvgOjjRFf4Eybllu1z2XZp0=",
+        "lastModified": 1710342492,
+        "narHash": "sha256-vEE+z5Tm0xWRAJo6xBai88kojzfROfHJ1a5dkNWoGRA=",
        "owner": "ezKEa",
        "repo": "aagl-gtk-on-nix",
-        "rev": "b562d6df3eb34aa2bbb1bd894d26872ef5b7225e",
+        "rev": "c0943e683baedeb19498562497aec35701b1fe02",
        "type": "github"
      },
      "original": {
@ -42,17 +42,16 @@
        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1709510479,
-        "narHash": "sha256-hpZF/sPN+nlfCU9GyXzlaN8Q8M5j5Q0HOJMrPj4/WdE=",
-        "owner": "AtaraxiaSjel",
-        "repo": "nur",
-        "rev": "fb21bb5cdd31f1f5b26f2c41248359adf2286eb7",
-        "type": "github"
+        "dirtyRev": "131d1adf3e0d8848ddf02c9a66b849ad7bdc4271-dirty",
+        "dirtyShortRev": "131d1ad-dirty",
+        "lastModified": 1710164092,
+        "narHash": "sha256-+q05eGP58uu/P9uqziWQk6WAvHbU5dk97Wi14iV04t8=",
+        "type": "git",
+        "url": "file:///home/ataraxia/projects/nur"
      },
      "original": {
-        "owner": "AtaraxiaSjel",
-        "repo": "nur",
-        "type": "github"
+        "type": "git",
+        "url": "file:///home/ataraxia/projects/nur"
      }
    },
    "attic": {
@ -181,11 +180,11 @@
        "pre-commit-hooks": "pre-commit-hooks"
      },
      "locked": {
-        "lastModified": 1709300857,
-        "narHash": "sha256-jkK99RiSt5YfLWj3kAQoB8OB3idxLTdT9kfo/wILbjw=",
+        "lastModified": 1710819219,
+        "narHash": "sha256-SXTz20R4ZDXwr3iPxXJXQTftHmZwOPzSpIK7bIIculA=",
        "owner": "cachix",
        "repo": "devenv",
-        "rev": "f0319af4f966fb8bc25c6429f4f2e097e79116c2",
+        "rev": "169d2cbce65977289f2e0e863a4e8f42f9ce98af",
        "type": "github"
      },
      "original": {
@ -201,11 +200,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1709439398,
-        "narHash": "sha256-MW0zp3ta7SvdpjvhVCbtP20ewRwQZX2vRFn14gTc4Kg=",
+        "lastModified": 1710724748,
+        "narHash": "sha256-aXlifKr6Brg0SBUBgRNEBaZf3JLUeGhM9BX2gam+vvo=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "1f76b318aa11170c8ca8c225a9b4c458a5fcbb57",
+        "rev": "c09c3a9639690f94ddff44c3dd25c85602e5aeb2",
        "type": "github"
      },
      "original": {
@ -349,11 +348,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1704982712,
-        "narHash": "sha256-2Ptt+9h8dczgle2Oo6z5ni5rt/uLMG47UFTR1ry/wgg=",
+        "lastModified": 1709336216,
+        "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "07f6395285469419cf9d078f59b5b49993198c00",
+        "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2",
        "type": "github"
      },
      "original": {
@ -388,11 +387,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1706830856,
-        "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=",
+        "lastModified": 1709336216,
+        "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f",
+        "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2",
        "type": "github"
      },
      "original": {
@ -537,14 +536,14 @@
    },
    "flake-utils_6": {
      "inputs": {
-        "systems": "systems_5"
+        "systems": "systems_6"
      },
      "locked": {
-        "lastModified": 1705309234,
-        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
        "type": "github"
      },
      "original": {
@ -555,7 +554,7 @@
    },
    "flake-utils_7": {
      "inputs": {
-        "systems": "systems_6"
+        "systems": "systems_7"
      },
      "locked": {
        "lastModified": 1681202837,
@ -573,7 +572,7 @@
    },
    "flake-utils_8": {
      "inputs": {
-        "systems": "systems_7"
+        "systems": "systems_8"
      },
      "locked": {
        "lastModified": 1701680307,
@ -591,7 +590,7 @@
    },
    "flake-utils_9": {
      "inputs": {
-        "systems": "systems_8"
+        "systems": "systems_9"
      },
      "locked": {
        "lastModified": 1681202837,
@ -658,11 +657,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1709485962,
-        "narHash": "sha256-rmFB4uE10+LJbcVE4ePgiuHOBlUIjQOeZt4VQVJTU8M=",
+        "lastModified": 1710820906,
+        "narHash": "sha256-2bNMraoRB4pdw/HtxgYTFeMhEekBZeQ53/a8xkqpbZc=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "d579633ff9915a8f4058d5c439281097e92380a8",
+        "rev": "022464438a85450abb23d93b91aa82e0addd71fb",
        "type": "github"
      },
      "original": {
@ -671,23 +670,50 @@
        "type": "github"
      }
    },
+    "hyprcursor": {
+      "inputs": {
+        "hyprlang": "hyprlang",
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1710257359,
+        "narHash": "sha256-43re5pzE/cswFAgw92/ugsB3+d5ufDaCcLtl9ztKfBo=",
+        "owner": "hyprwm",
+        "repo": "hyprcursor",
+        "rev": "1761f6cefd77f4fcd2039d930c88d6716ddc4974",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprcursor",
+        "type": "github"
+      }
+    },
    "hyprland": {
      "inputs": {
+        "hyprcursor": "hyprcursor",
        "hyprland-protocols": "hyprland-protocols",
-        "hyprlang": "hyprlang",
+        "hyprlang": "hyprlang_2",
        "nixpkgs": [
          "nixpkgs"
        ],
-        "systems": "systems_4",
+        "systems": "systems_5",
        "wlroots": "wlroots",
        "xdph": "xdph"
      },
      "locked": {
-        "lastModified": 1709491298,
-        "narHash": "sha256-GO98QYKyURXyxxps4RlXoLXaankHWfg7sVL4xItkYt4=",
+        "lastModified": 1710881780,
+        "narHash": "sha256-zHP8Uqx9juNguP5OK1R9nHrr9+g9iXd+OlFnRWoVndM=",
        "owner": "hyprwm",
        "repo": "Hyprland",
-        "rev": "063708df26e8b930f492200e1907eb47950f50e6",
+        "rev": "05cd6d3df1e5faf3f7476724b0cfb156f4be43f6",
        "type": "github"
      },
      "original": {
@ -725,19 +751,17 @@
      "inputs": {
        "nixpkgs": [
          "hyprland",
+          "hyprcursor",
          "nixpkgs"
        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
+        "systems": "systems_4"
      },
      "locked": {
-        "lastModified": 1708787654,
-        "narHash": "sha256-7ACgM3ZuAhPqurXHUvR2nWMRcnmzGGPjLK6q4DSTelI=",
+        "lastModified": 1709914708,
+        "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=",
        "owner": "hyprwm",
        "repo": "hyprlang",
-        "rev": "0fce791ba2334aca183f2ed42399518947550d0d",
+        "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2",
        "type": "github"
      },
      "original": {
@ -747,6 +771,31 @@
      }
    },
    "hyprlang_2": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1709914708,
+        "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=",
+        "owner": "hyprwm",
+        "repo": "hyprlang",
+        "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprlang",
+        "type": "github"
+      }
+    },
+    "hyprlang_3": {
      "inputs": {
        "nixpkgs": "nixpkgs_6"
      },
@ -766,17 +815,17 @@
    },
    "hyprpaper": {
      "inputs": {
-        "hyprlang": "hyprlang_2",
+        "hyprlang": "hyprlang_3",
        "nixpkgs": [
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1709070328,
-        "narHash": "sha256-gTpeu+UZZm/zeM7TRkaPhpUY5aK5Lk3Ybu77zhE1Aas=",
+        "lastModified": 1710691958,
+        "narHash": "sha256-/7rjxbXwl4efSzTInQiw8Q8mxdgbRpH/4dQZqLQrdAA=",
        "owner": "hyprwm",
        "repo": "hyprpaper",
-        "rev": "09c4062659cfaf1bb5ba92532a17e1d131f3b3d2",
+        "rev": "518adcaf9046d8e15a256048869cfb9de2e5f752",
        "type": "github"
      },
      "original": {
@ -904,11 +953,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1707986999,
-        "narHash": "sha256-uPCdmwnf2vcfKMxHvD8Hhs1o2yqfnK8Xz6oM7Urvspk=",
+        "lastModified": 1710495228,
+        "narHash": "sha256-w0XM85Zo4mNqRLZDZMWUw0wv7LRoODKohCWIaVNnE94=",
        "owner": "thiagokokada",
        "repo": "nix-alien",
-        "rev": "d6f007b3cab6cd16e50a0041c542a18793357737",
+        "rev": "75c0c2d5eb1fdd2c5187c49888cab40b060605fa",
        "type": "github"
      },
      "original": {
@ -924,11 +973,11 @@
        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
-        "lastModified": 1706125328,
-        "narHash": "sha256-YPkz7Pdsz2FqRTvJbw7Tz4Dtvmgnyk71OdePTe9ZuKQ=",
+        "lastModified": 1710379196,
+        "narHash": "sha256-77BXN4okkGx7XVEiUFW2mIuaMDaVnj/7Sn4ZlHJ9fys=",
        "owner": "nix-community",
        "repo": "nix-direnv",
-        "rev": "ae3b757eb9e88df23d81b8185245433d632e8ceb",
+        "rev": "6455f38a8dcf731dccd69aabef3f85ac962bfa8d",
        "type": "github"
      },
      "original": {
@ -946,11 +995,11 @@
        "treefmt-nix": "treefmt-nix_2"
      },
      "locked": {
-        "lastModified": 1703607026,
-        "narHash": "sha256-Emh0BPoqlS4ntp2UJrwydXfIP4qIMF0VBB2FUE3/M/E=",
+        "lastModified": 1709911523,
+        "narHash": "sha256-XNutwbRI6h57ybeKy0yYupfngWYcfcIqE0b0LgXnyxs=",
        "owner": "Mic92",
        "repo": "nix-fast-build",
-        "rev": "4376b8a33b217ee2f78ba3dcff01a3e464d13a46",
+        "rev": "692fe3e98f36b60c678d637235271b57910a7f80",
        "type": "github"
      },
      "original": {
@ -961,11 +1010,11 @@
    },
    "nix-filter": {
      "locked": {
-        "lastModified": 1705332318,
-        "narHash": "sha256-kcw1yFeJe9N4PjQji9ZeX47jg0p9A0DuU4djKvg1a7I=",
+        "lastModified": 1710156097,
+        "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=",
        "owner": "numtide",
        "repo": "nix-filter",
-        "rev": "3449dc925982ad46246cfc36469baf66e1b64f17",
+        "rev": "3342559a24e85fc164b295c3444e8a139924675b",
        "type": "github"
      },
      "original": {
@ -979,11 +1028,11 @@
        "nixpkgs": "nixpkgs_9"
      },
      "locked": {
-        "lastModified": 1707620986,
-        "narHash": "sha256-XE0tCSkSVBeJDWhjFwusNInwAhrnp+TloUNUpvnTiLw=",
+        "lastModified": 1710120787,
+        "narHash": "sha256-tlLuB73OCOKtU2j83bQzSYFyzjJo3rjpITZE5MoofG8=",
        "owner": "nix-community",
        "repo": "nix-index-database",
-        "rev": "0cb4345704123492e6d1f1068629069413c80de0",
+        "rev": "e76ff2df6bfd2abe06abd8e7b9f217df941c1b07",
        "type": "github"
      },
      "original": {
@ -1001,11 +1050,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1709428697,
-        "narHash": "sha256-NpXo8PhCG1lg731w9/7mn31zRG5ie2UwEg+QpjTSO/8=",
+        "lastModified": 1710811024,
+        "narHash": "sha256-A2s6Mx1oXZFFjZGrPIJpOGfZnQpKlBEEADIjLe1dPqY=",
        "owner": "nix-community",
        "repo": "nix-vscode-extensions",
-        "rev": "ad19653822c4b9499b47a9c6a399ae5a7dc1b319",
+        "rev": "ebf9b6e2c3252dfcd375a06b69723e0065091568",
        "type": "github"
      },
      "original": {
@ -1036,11 +1085,11 @@
    },
    "nixlib": {
      "locked": {
-        "lastModified": 1708821942,
-        "narHash": "sha256-jd+E1SD59qty65pwqad2mftzkT6vW5nNFWVuvayh4Zw=",
+        "lastModified": 1710636348,
+        "narHash": "sha256-/kB+ZWSdkZjbZ0FTqm0u84sf2jFS+30ysaEajmBjtoY=",
        "owner": "nix-community",
        "repo": "nixpkgs.lib",
-        "rev": "479831ed8b3c9c7b80533999f880c7d0bf6a491b",
+        "rev": "fa827dda806c5aa98f454da4c567991ab8ce422c",
        "type": "github"
      },
      "original": {
@ -1057,11 +1106,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1709226763,
-        "narHash": "sha256-GlJ7g2srrtx6s5P2uswZ6Zcpy2u90tomIx+Gstlk97s=",
+        "lastModified": 1710722910,
+        "narHash": "sha256-P5p9+WQFuABoBXBKEK1ZYu8mD6q8j/cQwZ9OYb0oh2E=",
        "owner": "nix-community",
        "repo": "nixos-generators",
-        "rev": "2c9562e7624fa1b50983fc18d504bf86202bef49",
+        "rev": "e63df01c798b99a76dc2ec25481be7dd25cd1610",
        "type": "github"
      },
      "original": {
@ -1106,11 +1155,11 @@
    },
    "nixpkgs-master": {
      "locked": {
-        "lastModified": 1709498152,
-        "narHash": "sha256-aZ/YJXvGN0S8Jd8mjS47+EnznFZHq00HC43GMpw5SVQ=",
+        "lastModified": 1710883987,
+        "narHash": "sha256-JrG05u5FqZA0eaYFMj2BAvJleY/CQPljJac/5NdVpi0=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "7a0b371a25ea55c4f99a864234ade3f1068c1065",
+        "rev": "cb45d3a979cc41c59537c784fb89e60f4c9d40b7",
        "type": "github"
      },
      "original": {
@ -1186,11 +1235,11 @@
    },
    "nixpkgs-stable_3": {
      "locked": {
-        "lastModified": 1709309926,
-        "narHash": "sha256-VZFBtXGVD9LWTecGi6eXrE0hJ/mVB3zGUlHImUs2Qak=",
+        "lastModified": 1710695816,
+        "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "79baff8812a0d68e24a836df0a364c678089e2c7",
+        "rev": "614b4613980a522ba49f0d194531beddbb7220d3",
        "type": "github"
      },
      "original": {
@ -1202,11 +1251,11 @@
    },
    "nixpkgs-stable_4": {
      "locked": {
-        "lastModified": 1709428628,
-        "narHash": "sha256-//ZCCnpVai/ShtO2vPjh3AWgo8riXCaret6V9s7Hew4=",
+        "lastModified": 1710628718,
+        "narHash": "sha256-y+l3eH53UlENaYa1lmnCBHusZb1kxBEFd2/c7lDsGpw=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "66d65cb00b82ffa04ee03347595aa20e41fe3555",
+        "rev": "6dc11d9859d6a18ab0c5e5829a5b8e4810658de3",
        "type": "github"
      },
      "original": {
@ -1218,11 +1267,11 @@
    },
    "nixpkgs_10": {
      "locked": {
-        "lastModified": 1705697961,
-        "narHash": "sha256-XepT3WS516evSFYkme3GrcI3+7uwXHqtHbip+t24J7E=",
+        "lastModified": 1710346304,
+        "narHash": "sha256-vwoyBoCovK7+vdbCYqL9MssoFQjaXtZN8sElcjUdbx8=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "e5d1c87f5813afde2dda384ac807c57a105721cc",
+        "rev": "a0906f14161a5c5792e9883117b9471f5bf6df72",
        "type": "github"
      },
      "original": {
@ -1234,11 +1283,11 @@
    },
    "nixpkgs_11": {
      "locked": {
-        "lastModified": 1709237383,
-        "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=",
+        "lastModified": 1710806803,
+        "narHash": "sha256-qrxvLS888pNJFwJdK+hf1wpRCSQcqA6W5+Ox202NDa0=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8",
+        "rev": "b06025f1533a1e07b6db3e75151caa155d1c7eb3",
        "type": "github"
      },
      "original": {
@ -1250,11 +1299,11 @@
    },
    "nixpkgs_12": {
      "locked": {
-        "lastModified": 1708751719,
-        "narHash": "sha256-0uWOKSpXJXmXswOvDM5Vk3blB74apFB6rNGWV5IjoN0=",
+        "lastModified": 1709968316,
+        "narHash": "sha256-4rZEtEDT6jcgRaqxsatBeds7x1PoEiEjb6QNGb4mNrk=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "f63ce824cd2f036216eb5f637dfef31e1a03ee89",
+        "rev": "0e7f98a5f30166cbed344569426850b21e4091d4",
        "type": "github"
      },
      "original": {
@ -1378,11 +1427,11 @@
    },
    "nixpkgs_9": {
      "locked": {
-        "lastModified": 1707268954,
-        "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=",
+        "lastModified": 1709703039,
+        "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1",
+        "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d",
        "type": "github"
      },
      "original": {
@ -1460,11 +1509,11 @@
        "pre-commit-hooks": "pre-commit-hooks_2"
      },
      "locked": {
-        "lastModified": 1709348980,
-        "narHash": "sha256-a8qUvQ4RVmWqA3ywepr35IfUvB4O2Bc5R09pgcJRhIk=",
+        "lastModified": 1710558649,
+        "narHash": "sha256-GRZSRLGcJH/XzBgpANulZc9BAarLe7ZEByLOJyGjB9I=",
        "owner": "AtaraxiaSjel",
        "repo": "PrismLauncher",
-        "rev": "a2976e2482f2cbaf0b9fbcf5a0d16ec8a19f3669",
+        "rev": "b61550f1c1cb7e03b87b8085379af7c540580994",
        "type": "github"
      },
      "original": {
@ -1510,11 +1559,11 @@
    "rycee": {
      "flake": false,
      "locked": {
-        "lastModified": 1709447189,
-        "narHash": "sha256-uXro556jQeBydN2zoCgxvoHlwvY8sIVp5j/ycT1el90=",
+        "lastModified": 1710821046,
+        "narHash": "sha256-MgXYQjFu21qc2LcB6EGaiLc6HeBNnVuzml2kese1A0o=",
        "owner": "rycee",
        "repo": "nur-expressions",
-        "rev": "4a7e0685baf8277ac9b86e7207ed2d9a6a2d157b",
+        "rev": "319f4424a6e8e66e8776c06b9c75e564a351348b",
        "type": "gitlab"
      },
      "original": {
@ -1531,11 +1580,11 @@
        "nixpkgs-stable": "nixpkgs-stable_4"
      },
      "locked": {
-        "lastModified": 1709434911,
-        "narHash": "sha256-UN47hQPM9ijwoz7cYq10xl19hvlSP/232+M5vZDOMs4=",
+        "lastModified": 1710644594,
+        "narHash": "sha256-RquCuzxfy4Nr8DPbdp3D/AsbYep21JgQzG8aMH9jJ4A=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "075df9d85ee70cfb53e598058045e1738f05e273",
+        "rev": "83b68a0e8c94b72cdd0a6e547a14ca7eb1c03616",
        "type": "github"
      },
      "original": {
@ -1606,16 +1655,16 @@
    },
    "systems_5": {
      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "lastModified": 1689347949,
+        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "repo": "default-linux",
+        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
        "type": "github"
      },
      "original": {
        "owner": "nix-systems",
-        "repo": "default",
+        "repo": "default-linux",
        "type": "github"
      }
    },
@ -1664,6 +1713,21 @@
        "type": "github"
      }
    },
+    "systems_9": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
    "treefmt-nix": {
      "inputs": {
        "nixpkgs": [
@ -1672,11 +1736,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1705659004,
-        "narHash": "sha256-XQsZudrb9u5Pw631U0tFYZkjq49CcwF24XT01vz2jPk=",
+        "lastModified": 1710278050,
+        "narHash": "sha256-Oc6BP7soXqb8itlHI8UKkdf3V9GeJpa1S39SR5+HJys=",
        "owner": "numtide",
        "repo": "treefmt-nix",
-        "rev": "8cd95da6c30852adb2a06c4b6bdacfe8b64a0a35",
+        "rev": "35791f76524086ab4b785a33e4abbedfda64bd22",
        "type": "github"
      },
      "original": {
@ -1732,11 +1796,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1684517665,
-        "narHash": "sha256-SaAr66uCQ8CF75jIr23FZjk1+9Kfwm5sQnwV25206Gs=",
+        "lastModified": 1709622318,
+        "narHash": "sha256-bTscF0366xtoIXgH7Zq+Mn0mpX3w4h/2xKpHiYMyLNc=",
        "owner": "msteen",
        "repo": "nixos-vscode-server",
-        "rev": "1e1358493df6529d4c7bc4cc3066f76fd16d4ae6",
+        "rev": "d0ed9b8cf1f0a71f110df9119489ab047e0726bd",
        "type": "github"
      },
      "original": {
@ -1749,18 +1813,18 @@
      "flake": false,
      "locked": {
        "host": "gitlab.freedesktop.org",
-        "lastModified": 1708558866,
-        "narHash": "sha256-Mz6hCtommq7RQfcPnxLINigO4RYSNt23HeJHC6mVmWI=",
+        "lastModified": 1709983277,
+        "narHash": "sha256-wXWIJLd4F2JZeMaihWVDW/yYXCLEC8OpeNJZg9a9ly8=",
        "owner": "wlroots",
        "repo": "wlroots",
-        "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5",
+        "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b",
        "type": "gitlab"
      },
      "original": {
        "host": "gitlab.freedesktop.org",
        "owner": "wlroots",
        "repo": "wlroots",
-        "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5",
+        "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b",
        "type": "gitlab"
      }
    },
@ -1784,11 +1848,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1708696469,
-        "narHash": "sha256-shh5wmpeYy3MmsBfkm4f76yPsBDGk6OLYRVG+ARy2F0=",
+        "lastModified": 1709299639,
+        "narHash": "sha256-jYqJM5khksLIbqSxCLUUcqEgI+O2LdlSlcMEBs39CAU=",
        "owner": "hyprwm",
        "repo": "xdg-desktop-portal-hyprland",
-        "rev": "1b713911c2f12b96c2574474686e4027ac4bf826",
+        "rev": "2d2fb547178ec025da643db57d40a971507b82fe",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -123,7 +123,7 @@
      # permittedInsecurePackages = [ "electron-25.9.0" ];
    };
    channels.unstable.input = nixpkgs;
-    channels.unstable.patches = patchesPath [ "zen-kernels.patch" "ydotoold.patch" ] ++ sharedPatches;
+    channels.unstable.patches = patchesPath [ "297158.patch" "zen-kernels.patch" "ydotoold.patch" ] ++ sharedPatches;
    channels.stable.input = inputs.nixpkgs-stable;
    channels.stable.patches = sharedPatches;

--- a/machines/AMD-Workstation/boot.nix
+++ b/machines/AMD-Workstation/boot.nix
@ -3,7 +3,7 @@ let
  zfs_arc_max = toString (6 * 1024 * 1024 * 1024);
 in {
  boot = {
-    zfs.enableUnstable = true;
+    zfs.package = pkgs.zfs_unstable;
    kernelPackages = pkgs.linuxPackages_lqx;

    initrd = {
@ -47,6 +47,7 @@ in {
      "zfs.zfs_arc_max=${zfs_arc_max}"
      "amd_pstate=active"
      "retbleed=off" # big performance impact
+      "amdgpu.ignore_min_pcap=1"
    ];
    kernel.sysctl = {
      "kernel.split_lock_mitigate" = 0;
--- a/machines/AMD-Workstation/default.nix
+++ b/machines/AMD-Workstation/default.nix
@ -107,6 +107,7 @@
      pkgs.wayvnc
      pkgs.distrobox
      pkgs.nix-fast-build
+      pkgs.mitmproxy
    ];
    xdg.configFile."distrobox/distrobox.conf".text = ''
      container_always_pull="1"
@ -119,6 +120,7 @@
    ".local/share/winbox"
    ".local/share/PrismLauncher"
    ".local/share/distrobox"
+    ".mitmproxy"
  ];

  system.stateVersion = "23.05";
--- a/machines/Dell-Laptop/boot.nix
+++ b/machines/Dell-Laptop/boot.nix
@ -3,7 +3,7 @@ let
  zfs_arc_max = toString (2 * 1024 * 1024 * 1024);
 in {
  boot = {
-    zfs.enableUnstable = true;
+    zfs.package = pkgs.zfs_unstable;
    kernelPackages = pkgs.linuxPackages_lqx;

    initrd = {
--- a/misc/mitmproxy-ca-cert.pem
+++ b/misc/mitmproxy-ca-cert.pem
@ -1,20 +1,20 @@
 -----BEGIN CERTIFICATE-----
-MIIDNTCCAh2gAwIBAgIUXRCkp1va9+RhhVyWeGF7NJwQ7ngwDQYJKoZIhvcNAQEL
+MIIDNTCCAh2gAwIBAgIUU4dH+g6Pj1pXPNoVvVqn7Z8+uxwwDQYJKoZIhvcNAQEL
 BQAwKDESMBAGA1UEAwwJbWl0bXByb3h5MRIwEAYDVQQKDAltaXRtcHJveHkwHhcN
-MjQwMTA4MDU1MzQyWhcNMzQwMTA3MDU1MzQyWjAoMRIwEAYDVQQDDAltaXRtcHJv
+MjQwMzI5MTk0NTUwWhcNMzQwMzI5MTk0NTUwWjAoMRIwEAYDVQQDDAltaXRtcHJv
 eHkxEjAQBgNVBAoMCW1pdG1wcm94eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBANLlDci/gCjzt4lBK73smQWm0QuH+7M3/GbxQzN89xUeT9nNUO2CUjIi
-GOb+l7BzHUhnSzmE5OYsivZnoG2H2LTtrFFDe1Y7uhPAAS0Pe6XWPweyTv9E9I4Y
-9nZfNU3aWMqFanCucL2nc368JfjRj3Zrd9o91M6FxQCJ7YwcznSu2TGwhszUpdi2
-lWeIymPyzrQH2amXNBOfGtwxduZnQYwQBgT0lnScNHrj6q0y0q56R6y63l015SF6
-DXC3IsM8hmGB3gGafgZj10y5ToQgfmbkTkScZWjjM5Gg3iDkGReOGiwSiP3zao7z
-T6l7kT/I9jkx+S4DI03F7rm7SBkXsoECAwEAAaNXMFUwDwYDVR0TAQH/BAUwAwEB
+AQoCggEBALJDaLta2nxnmpqT6NyZxobznMQS5aZTB+90U2CVWOz/S7zf4y0cGDVC
+G6PprXYw2F3Sw3ym2JuvZpAAuC32X4IYtktjA0ABXoDuLyi76fmTrZ8ZE89DDFT4
+ZTfrnEGE+u5ccUC0URLDv8tGgQU4n+M+WQrVRVeJAP0uVvLmMTBjKISJ2HsFfd1I
+qXRoiU4ASySM4+lcWylRp7ljJ1dun95Mhk03i5EEuhbNRkug7u7xRPQsGk0a/rT8
+nKVN1LV049FFVJl5yMpgdakHVt9bJcpeDVuJvtK05El6M1CV0xpuU4T6QXayGRUi
+ToRggdZib+Sz+39Q1iNs+oS+S3NPrbUCAwEAAaNXMFUwDwYDVR0TAQH/BAUwAwEB
 /zATBgNVHSUEDDAKBggrBgEFBQcDATAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYE
-FFNxA8DTtIKZoeRCV5TNwFjkCwg7MA0GCSqGSIb3DQEBCwUAA4IBAQAVlpbupq8Y
-BAtulmw0WIRZUMqX25mFvt85Y2aswaYTdtsNNtwqjluAKTroyvUmVM2cq54ice/E
-zzkBFikrdOsAHmEdPlXByXRgw5v4/kVqn+t3cAqOqJfkb/dIqXkGu2Ybsrmg8CeH
-gwJPwoyMx167c4b+I484QlxudStg921jkb5cpjnpTrjgGmsyVDhfYLUFBwN4IzIB
-UbBTSXxiB0Zes+6sFHhXM1z1NHV7LO444YqBNTjLP1Ro+QmBqYZctxuGFCwojNnX
-P49rs79Wexo1w5F93jkI0y5Paf289LDhjvs4JoUV9NjODm9HsbEPFaEoCLFNdDa0
-Alpnmnw8hNPw
+FPBTcuR6sh0gZVQaH4/R2yyNNANvMA0GCSqGSIb3DQEBCwUAA4IBAQBdLe3py6Hr
+E81iiyASrV8FJsHqX+JSTtnkTIUe+xzSo/DSf9wTMJmDsT4jnXTT11MUWujJQhW/
+TZbly7EPk3twIbFdBltu661KEADf7YzZP2O6txmUD4TrpOh3VoP0wn7vhWuOg3Nv
+IZHgw1IJ5Y+LBLDRzmxYE4c+gW2I120jNQ4fduXiu5w+UjZHi+90VxGR0YvCgkxj
+Q61pc6DC5fTf7XjcChXHjh05XhbgROuvCEgg93pgLLxXTSWd9WKnuDLDi2jCbNDh
+pojCx0f7H82JmMPmzAaacqlM/H0XRrr04XQCMNzIr6bj62vDjwKKOHaTa9anAFm9
+0F3V7wUzjoON
 -----END CERTIFICATE-----
--- a/modules/steam-compat-tools.nix
+++ b/modules/steam-compat-tools.nix
@ -1,31 +0,0 @@
-{ config, lib, ... }:
-with lib;
-let cfg = config.programs.steam;
-in {
-  options.programs.steam = {
-    extraCompatPackages = mkOption {
-      type = with types; listOf package;
-      default = [ ];
-      defaultText = literalExpression "[]";
-      example = literalExpression ''
-        with pkgs; [
-          luxtorpeda
-          proton-ge
-        ]
-      '';
-      description = lib.mdDoc ''
-        Extra packages to be used as compatibility tools for Steam on Linux. Packages will be included
-        in the `STEAM_EXTRA_COMPAT_TOOLS_PATHS` environmental variable. For more information see
-        <https://github.com/ValveSoftware/steam-for-linux/issues/6310">.
-      '';
-    };
-  };
-
-  config = mkIf cfg.enable {
-    # Append the extra compatibility packages to whatever else the env variable was populated with.
-    # For more information see https://github.com/ValveSoftware/steam-for-linux/issues/6310.
-    environment.sessionVariables = mkIf (cfg.extraCompatPackages != [ ]) {
-      STEAM_EXTRA_COMPAT_TOOLS_PATHS = makeBinPath cfg.extraCompatPackages;
-    };
-  };
-}
--- a/patches/297158.patch
+++ b/patches/297158.patch
@ -0,0 +1,46 @@
+From 49f83b701e7939079c529f378c79fa8544f4db72 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andr=C3=A9=20Silva?= <andrerfosilva@gmail.com>
+Date: Tue, 19 Mar 2024 11:31:45 +0000
+Subject: [PATCH] waybar: build against wireplumber-0.4
+
+---
+ pkgs/applications/misc/waybar/default.nix | 14 +++++++++++++-
+ 1 file changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix
+index 47071c60f29424..fd24f6605e4e08 100644
+--- a/pkgs/applications/misc/waybar/default.nix
+++ b/pkgs/applications/misc/waybar/default.nix
+@@ -2,6 +2,7 @@
+ , stdenv
+ , bash
+ , fetchFromGitHub
+, fetchFromGitLab
+ , SDL2
+ , alsa-lib
+ , catch2_3
+@@ -72,6 +73,17 @@ let
+     rev = "0.10.1";
+     hash = "sha256-iIYKvpOWafPJB5XhDOSIW9Mb4I3A4pcgIIPQdQYEqUw=";
+   };
+
+  wireplumber_0_4 = wireplumber.overrideAttrs (attrs: rec {
+    version = "0.4.17";
+    src = fetchFromGitLab {
+      domain = "gitlab.freedesktop.org";
+      owner = "pipewire";
+      repo = "wireplumber";
+      rev = version;
+      hash = "sha256-vhpQT67+849WV1SFthQdUeFnYe/okudTQJoL3y+wXwI=";
+    };
+  });
+ in
+ stdenv.mkDerivation (finalAttrs: {
+   pname = "waybar";
+@@ -138,7 +150,7 @@ stdenv.mkDerivation (finalAttrs: {
+   ++ lib.optional traySupport libdbusmenu-gtk3
+   ++ lib.optional udevSupport udev
+   ++ lib.optional upowerSupport upower
+-  ++ lib.optional wireplumberSupport wireplumber
+  ++ lib.optional wireplumberSupport wireplumber_0_4
+   ++ lib.optional (!stdenv.isLinux) libinotify-kqueue;
--- a/profiles/applications/games/emulators.nix
+++ b/profiles/applications/games/emulators.nix
@ -4,7 +4,7 @@
    home.packages = with pkgs; [
      (retroarch.override { cores = with libretro; [ genesis-plus-gx dosbox ]; })
      ryujinx
-      citra-canary
+      # citra-canary
      # pcsx2
      # rpcs3
    ];
--- a/profiles/applications/games/steam.nix
+++ b/profiles/applications/games/steam.nix
@ -1,7 +1,7 @@
 { pkgs, ... }: {
  programs.steam.enable = true;
  programs.steam.extraCompatPackages = [
-    pkgs.proton-ge
+    pkgs.proton-ge-bin
  ];
  programs.gamescope.enable = true;
  programs.gamescope.capSysNice = false;
@ -16,5 +16,7 @@
    ".config/WarThunder"
    ".local/share/BeamNG.drive"
    ".local/share/Transistor"
+    ".local/share/Paradox\ Interactive"
+    ".paradoxlauncher"
  ];
 }
--- a/profiles/workspace/gpg.nix
+++ b/profiles/workspace/gpg.nix
@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, pkgs, lib, ... }:
 with config.deviceSpecific; {
  home-manager.users.${config.mainuser} = {
    programs.gpg = {
@ -8,7 +8,7 @@ with config.deviceSpecific; {
    services.gpg-agent = {
      enable = true;
      enableSshSupport = true;
-      pinentryFlavor = if !isServer then "gnome3" else "curses";
+      pinentryPackage = if !isServer then pkgs.pinentry-gnome3 else pkgs.pinentry-curses;
      sshKeys = [
        "7A7130ABF128CC2C32B3D6AD27515056B0193CE1"
        "E6A6377C3D0827C36428A290199FDB3B91414AFE"
@ -24,5 +24,6 @@ with config.deviceSpecific; {
      };
    };
  };
+  services.dbus.packages = lib.mkIf (!isServer) [ pkgs.gcr ];
  persist.state.homeDirectories = [ ".local/share/gnupg" ];
 }
Author	SHA1	Message	Date
Dmitriy Kholkin	299e863e6b	add mitmproxy to workstation	2024-03-31 19:46:48 +03:00
Dmitriy Kholkin	9b72d90963	upgrade system	2024-03-23 18:01:09 +03:00