upgrade

2023-09-16 02:04:05 +03:00 · 2023-09-16 02:04:05 +03:00 · 16466750f5
commit 16466750f5
parent 9f2d632f23
5 changed files with 81 additions and 80 deletions
--- a/flake.lock
+++ b/flake.lock
@ -6,11 +6,11 @@
        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1692553283,
-        "narHash": "sha256-iKTir40mS+NUzcX9buy+L7xX0XJ2wPxy3VeF0DLnn8M=",
+        "lastModified": 1693886279,
+        "narHash": "sha256-oVCA5yz6zcsFzGCCwRpVDuDml7Z0sWQqW1fEWWcC0xM=",
        "owner": "ezKEa",
        "repo": "aagl-gtk-on-nix",
-        "rev": "eed6e941adbb56c7cb67f33452fe4122d0c67426",
+        "rev": "8fc45fabbedef44a481c3bcabd9512732c0ade91",
        "type": "github"
      },
      "original": {
@ -165,11 +165,11 @@
        "utils": "utils"
      },
      "locked": {
-        "lastModified": 1686747123,
-        "narHash": "sha256-XUQK9kwHpTeilHoad7L4LjMCCyY13Oq383CoFADecRE=",
+        "lastModified": 1694513707,
+        "narHash": "sha256-wE5kHco3+FQjc+MwTPwLVqYz4hM7uno2CgXDXUFMCpc=",
        "owner": "serokell",
        "repo": "deploy-rs",
-        "rev": "724463b5a94daa810abfc64a4f87faef4e00f984",
+        "rev": "31c32fb2959103a796e07bbe47e0a5e287c343a8",
        "type": "github"
      },
      "original": {
@ -186,11 +186,11 @@
        "pre-commit-hooks": "pre-commit-hooks"
      },
      "locked": {
-        "lastModified": 1693363254,
-        "narHash": "sha256-le4CbQz8rKheEkGZcZzmx1ycCQ4tjFMAkcpu3Uq+tEk=",
+        "lastModified": 1694422554,
+        "narHash": "sha256-s5NTPzT66yIMmau+ZGP7q9z4NjgceDETL4xZ6HJ/TBg=",
        "owner": "cachix",
        "repo": "devenv",
-        "rev": "3654eb5d47218cfa2d12280ba5ac1ace0a9dd225",
+        "rev": "63d20fe09aa09060ea9ec9bb6d582c025402ba15",
        "type": "github"
      },
      "original": {
@ -206,11 +206,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1693189188,
-        "narHash": "sha256-o6otfsB/ecudboYFwiCeL49BX3/8vRC/XUZTgkaDx54=",
+        "lastModified": 1694808292,
+        "narHash": "sha256-zSZ8IfZfv6nK0z+wNuM0Tqx6c9b4+Q5Xn9FIpunWBwA=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "00169fe4a6015a88c3799f0bf89689e06a4d4896",
+        "rev": "0faae8adf6d790df2c3d00437ccad7cd5c531c70",
        "type": "github"
      },
      "original": {
@ -568,11 +568,11 @@
        "systems": "systems_4"
      },
      "locked": {
-        "lastModified": 1692799911,
-        "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=",
+        "lastModified": 1694529238,
+        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44",
+        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
        "type": "github"
      },
      "original": {
@ -668,11 +668,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1693399033,
-        "narHash": "sha256-yXhiMo8MnE86sGtPIHAKaLHhmhe8v9tqGGotlUgKJvY=",
+        "lastModified": 1694643239,
+        "narHash": "sha256-pv2k/5FvyirDE8g4TNehzwZ0T4UOMMmqWSQnM/luRtE=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "f5c15668f9842dd4d5430787d6aa8a28a07f7c10",
+        "rev": "d9b88b43524db1591fb3d9410a21428198d75d49",
        "type": "github"
      },
      "original": {
@ -690,11 +690,11 @@
        "xdph": "xdph"
      },
      "locked": {
-        "lastModified": 1693409962,
-        "narHash": "sha256-toJIvniVNai1VWmWYqOaukZ4QR57xWKfzLPIz8+T9A0=",
+        "lastModified": 1694812403,
+        "narHash": "sha256-SNFi+gYNwlA68cnwCjRtczmr/ACz5QQ/hzKUmQuev9w=",
        "owner": "hyprwm",
        "repo": "Hyprland",
-        "rev": "b10cae3010f5b1d853eb13f8a591ee10d67fe51e",
+        "rev": "cc630c90b5d743b380ff2da741881796ec79e997",
        "type": "github"
      },
      "original": {
@ -735,11 +735,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1692480535,
-        "narHash": "sha256-3Q0Uz/JPW9USHyAmrzRl6KhZLqMYTWkmtL3RA+oAeVY=",
+        "lastModified": 1694600309,
+        "narHash": "sha256-d9LcB+D0bfMu+8UhnUVJ/DX5OVTX6o5dIntdVqEeQDA=",
        "owner": "hyprwm",
        "repo": "hyprpaper",
-        "rev": "5e73eb60552d48d55541c60f9a8da2b666003fe6",
+        "rev": "e5a18a171d5d6e7c6b9ffdfb9e86fb09055964a1",
        "type": "github"
      },
      "original": {
@ -903,11 +903,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1692077780,
-        "narHash": "sha256-4BO9p4N4ywIkeAOQ0SpLxOIAZpH7GZWDYFobnL8ENOA=",
+        "lastModified": 1693880502,
+        "narHash": "sha256-krCRVLNdlCI7l7F1Bb2ovkgac8hoz015LyYvm/+aYZw=",
        "owner": "thiagokokada",
        "repo": "nix-alien",
-        "rev": "95507c65bb91ac9ae4dd55a083f3dc48ea1e9baa",
+        "rev": "0fbd284930bcf1a5d1e3d07f2973e6f1738505cc",
        "type": "github"
      },
      "original": {
@ -922,11 +922,11 @@
        "nixpkgs": "nixpkgs_10"
      },
      "locked": {
-        "lastModified": 1693334386,
-        "narHash": "sha256-aAT5zAnsn1OLvCPQNDrzx9uCq+2dkc6z9dFkEABwNiU=",
+        "lastModified": 1694719020,
+        "narHash": "sha256-Dqg4ZI+kGXCdfgEdfr3PKfhQWUDFXtGn4WSvP08DJyg=",
        "owner": "nix-community",
        "repo": "nix-direnv",
-        "rev": "17d5f206eef1b1feaed7160deed107695347b4b9",
+        "rev": "4132068df5153d44b7c17401ccefe54f99736dc1",
        "type": "github"
      },
      "original": {
@ -965,11 +965,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1693358717,
-        "narHash": "sha256-OYGe2Yay1QoodZZmvPYBFGAoTrRfyKLzFs2vON4gRek=",
+        "lastModified": 1694740775,
+        "narHash": "sha256-cxnaqGPye8mN7WaCpF1TGlcQaSHAyEIgSVImOTuVrsQ=",
        "owner": "nix-community",
        "repo": "nix-vscode-extensions",
-        "rev": "50c4bce16b93e7ca8565d51fafabc05e9f0515da",
+        "rev": "d073d60efa6c3400d9de3c91bcddba5c4c419159",
        "type": "github"
      },
      "original": {
@ -1022,11 +1022,11 @@
    },
    "nixlib": {
      "locked": {
-        "lastModified": 1689469483,
-        "narHash": "sha256-2SBhY7rZQ/iNCxe04Eqxlz9YK9KgbaTMBssq3/BgdWY=",
+        "lastModified": 1693701915,
+        "narHash": "sha256-waHPLdDYUOHSEtMKKabcKIMhlUOHPOOPQ9UyFeEoovs=",
        "owner": "nix-community",
        "repo": "nixpkgs.lib",
-        "rev": "02fea408f27186f139153e1ae88f8ab2abd9c22c",
+        "rev": "f5af57d3ef9947a70ac86e42695231ac1ad00c25",
        "type": "github"
      },
      "original": {
@ -1043,11 +1043,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1690133435,
-        "narHash": "sha256-YNZiefETggroaTLsLJG2M+wpF0pJPwiauKG4q48ddNU=",
+        "lastModified": 1693791338,
+        "narHash": "sha256-wHmtB5H8AJTUaeGHw+0hsQ6nU4VyvVrP2P4NeCocRzY=",
        "owner": "nix-community",
        "repo": "nixos-generators",
-        "rev": "b1171de4d362c022130c92d7c8adc4bf2b83d586",
+        "rev": "8ee78470029e641cddbd8721496da1316b47d3b4",
        "type": "github"
      },
      "original": {
@ -1058,11 +1058,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1690789960,
-        "narHash": "sha256-3K+2HuyGTiJUSZNJxXXvc0qj4xFx1FHC/ItYtEa7/Xs=",
+        "lastModified": 1693377291,
+        "narHash": "sha256-vYGY9bnqEeIncNarDZYhm6KdLKgXMS+HA2mTRaWEc80=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "fb942492b7accdee4e6d17f5447091c65897dde4",
+        "rev": "e7f38be3775bab9659575f192ece011c033655f0",
        "type": "github"
      },
      "original": {
@ -1122,11 +1122,11 @@
    },
    "nixpkgs-master": {
      "locked": {
-        "lastModified": 1693407469,
-        "narHash": "sha256-W4QZ/1gdCoWAjDGpbHYU/tu0p9v8qMIhmEp5WSulYjE=",
+        "lastModified": 1694810993,
+        "narHash": "sha256-SWYQdFzdcRyGoX4b2G1sZfGwvizrVejBaVB54OUjgBc=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "83f55e3bda6256489cde6f2a5cfdc57d91e9751a",
+        "rev": "7fb1b6096567f4a5e7e5f195396950a77d8d85d7",
        "type": "github"
      },
      "original": {
@ -1218,11 +1218,11 @@
    },
    "nixpkgs-stable_3": {
      "locked": {
-        "lastModified": 1693341273,
-        "narHash": "sha256-wrsPjsIx2767909MPGhSIOmkpGELM9eufqLQOPxmZQg=",
+        "lastModified": 1694753796,
+        "narHash": "sha256-QPE7dqcicQH/nq9aywVXJWWtci4FvxHaM+BSIEbGBvA=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "2ab91c8d65c00fd22a441c69bbf1bc9b420d5ea1",
+        "rev": "360a7d31c30abefdc490d203f80e3221b7a24af2",
        "type": "github"
      },
      "original": {
@ -1234,11 +1234,11 @@
    },
    "nixpkgs_10": {
      "locked": {
-        "lastModified": 1693145325,
-        "narHash": "sha256-Gat9xskErH1zOcLjYMhSDBo0JTBZKfGS0xJlIRnj6Rc=",
+        "lastModified": 1694593561,
+        "narHash": "sha256-WSaIQZ5s9N9bDFkEMTw6P9eaZ9bv39ZhsiW12GtTNM0=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "cddebdb60de376c1bdb7a4e6ee3d98355453fe56",
+        "rev": "1697b7d480449b01111e352021f46e5879e47643",
        "type": "github"
      },
      "original": {
@ -1250,11 +1250,11 @@
    },
    "nixpkgs_11": {
      "locked": {
-        "lastModified": 1693377291,
-        "narHash": "sha256-vYGY9bnqEeIncNarDZYhm6KdLKgXMS+HA2mTRaWEc80=",
+        "lastModified": 1694767346,
+        "narHash": "sha256-5uH27SiVFUwsTsqC5rs3kS7pBoNhtoy9QfTP9BmknGk=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "e7f38be3775bab9659575f192ece011c033655f0",
+        "rev": "ace5093e36ab1e95cb9463863491bee90d5a4183",
        "type": "github"
      },
      "original": {
@ -1346,11 +1346,11 @@
    },
    "nixpkgs_6": {
      "locked": {
-        "lastModified": 1693158576,
-        "narHash": "sha256-aRTTXkYvhXosGx535iAFUaoFboUrZSYb1Ooih/auGp0=",
+        "lastModified": 1694183432,
+        "narHash": "sha256-YyPGNapgZNNj51ylQMw9lAgvxtM2ai1HZVUu3GS8Fng=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "a999c1cc0c9eb2095729d5aa03e0d8f7ed256780",
+        "rev": "db9208ab987cdeeedf78ad9b4cf3c55f5ebd269b",
        "type": "github"
      },
      "original": {
@ -1410,11 +1410,11 @@
    },
    "nur": {
      "locked": {
-        "lastModified": 1693403791,
-        "narHash": "sha256-SfBFDodAW2XJqEl8ZSYos6LxhTX20f0m+VZ+xs/CjaI=",
+        "lastModified": 1694814340,
+        "narHash": "sha256-eo9444JGI/G9jZF+X3xmS5TMRuIT4VYPKyZQ11iF65Q=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "659bbe81ff2f443ee54675ebe63775265c53b4b6",
+        "rev": "9b70f21fd41d3b96580e7ca4a3d1c29e87bdab36",
        "type": "github"
      },
      "original": {
@ -1591,11 +1591,11 @@
    "rycee": {
      "flake": false,
      "locked": {
-        "lastModified": 1693403288,
-        "narHash": "sha256-Pr8taPWQjMg4Y5ycC46JIde7oh3AfdAn6FHVON9gkZs=",
+        "lastModified": 1694750549,
+        "narHash": "sha256-p/qc0XKjlqYc7h0lFF//4wlpFUx9n21PAp8qMLQp38E=",
        "owner": "rycee",
        "repo": "nur-expressions",
-        "rev": "e9570e3ca98bbcd1cd53c7d0ae7ddba1a79a79f8",
+        "rev": "b99fbd02f370f1e93e55a894965a7731e0f105d9",
        "type": "gitlab"
      },
      "original": {
@ -1804,18 +1804,18 @@
      "flake": false,
      "locked": {
        "host": "gitlab.freedesktop.org",
-        "lastModified": 1692976565,
-        "narHash": "sha256-eBKkG7tMxg92NskEn8dHRFY245JwjirWRoOZzW6DnUw=",
+        "lastModified": 1694302348,
+        "narHash": "sha256-S9NOc88L/1jpNKJqBu2Hihvn0V1HHCK2hXE4bNBAStg=",
        "owner": "wlroots",
        "repo": "wlroots",
-        "rev": "717ded9bb0191ea31bf4368be32e7a15fe1b8294",
+        "rev": "65bbbbbf0c3d6844cee3c4e294d0ba07e1f82211",
        "type": "gitlab"
      },
      "original": {
        "host": "gitlab.freedesktop.org",
        "owner": "wlroots",
        "repo": "wlroots",
-        "rev": "717ded9bb0191ea31bf4368be32e7a15fe1b8294",
+        "rev": "65bbbbbf0c3d6844cee3c4e294d0ba07e1f82211",
        "type": "gitlab"
      }
    },
@ -1835,11 +1835,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1691841170,
-        "narHash": "sha256-RCTm1/MVWYPnReMgyp7tr2ogGYo/pvw38jZaFwemgPU=",
+        "lastModified": 1694363988,
+        "narHash": "sha256-RF6LXm4J6mBF3B8VcQuABuU4g4tCPHgMYJQSoJ3DW+8=",
        "owner": "hyprwm",
        "repo": "xdg-desktop-portal-hyprland",
-        "rev": "57a3a41ba6b358109e4fc25c6a4706b5f7d93c6b",
+        "rev": "aca51609d4c415b30e88b96c6f49f0142cbcdae7",
        "type": "github"
      },
      "original": {
--- a/patches/ydotoold.patch
+++ b/patches/ydotoold.patch
@ -13,14 +13,14 @@ diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
 index dce6e878540d5..580d938030685 100644
 --- a/nixos/modules/module-list.nix
 +++ b/nixos/modules/module-list.nix
-@@ -255,6 +255,7 @@
-   ./programs/xss-lock.nix
+@@ -280,6 +280,7 @@
   ./programs/xwayland.nix
   ./programs/yabar.nix
+   ./programs/yazi.nix
 +  ./programs/ydotool.nix
-   ./programs/zmap.nix
+   ./programs/yubikey-touch-detector.nix
+   ./programs/zsh/zmap.nix
   ./programs/zsh/oh-my-zsh.nix
-   ./programs/zsh/zsh-autoenv.nix
 diff --git a/nixos/modules/programs/ydotool.nix b/nixos/modules/programs/ydotool.nix
 new file mode 100644
 index 0000000000000..f5996059a4c36
--- a/profiles/applications/packages.nix
+++ b/profiles/applications/packages.nix
@ -8,7 +8,7 @@ with config.deviceSpecific; {
      bat
      comma
      curl
-      exa
+      eza
      fd
      glib.out
      jq
--- a/profiles/boot.nix
+++ b/profiles/boot.nix
@ -60,5 +60,6 @@ with config.deviceSpecific; {

    tmp.cleanOnBoot = !config.boot.tmp.useTmpfs;
    zfs.forceImportAll = lib.mkDefault false;
+    swraid.enable = false;
  };
 }
--- a/profiles/workspace/zsh/default.nix
+++ b/profiles/workspace/zsh/default.nix
@ -75,11 +75,11 @@
          "q" = "${pkgs.libqalculate}/bin/qalc";
          # "grep" = "${pkgs.ripgrep}/bin/rg";
          "man" = "${pkgs.pinfo}/bin/pinfo";
-          "l" = "${pkgs.exa}/bin/exa -lahgF@ --git --group-directories-first";
-          "tree" = "${pkgs.exa}/bin/exa -T";
-          "ltree" = "${pkgs.exa}/bin/exa -lhgFT@ --git";
-          "atree" = "${pkgs.exa}/bin/exa -aT";
-          "latree" = "${pkgs.exa}/bin/exa -lahgFT@ --git";
+          "l" = "${pkgs.eza}/bin/eza -lahgF@ --git --group-directories-first";
+          "tree" = "${pkgs.eza}/bin/eza -T";
+          "ltree" = "${pkgs.eza}/bin/eza -lhgFT@ --git";
+          "atree" = "${pkgs.eza}/bin/eza -aT";
+          "latree" = "${pkgs.eza}/bin/eza -lahgFT@ --git";
          # "gif2webm" = "(){ ${pkgs.ffmpeg.bin}/bin/ffmpeg -i $1 -c:v libvpx-vp9 -crf 20 -b:v 0 $1.webm ;}";
          "t" = "${pkgs.translate-shell}/bin/trans";
        };