diff --git a/flake.lock b/flake.lock
index 05ea433..18e08d9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,11 +3,11 @@
     "advisory-db": {
       "flake": false,
       "locked": {
-        "lastModified": 1675868798,
-        "narHash": "sha256-ghS+rNMYKidm9HQtRQQ1SRs30SXRR11s73GjtXfyWG4=",
+        "lastModified": 1684292571,
+        "narHash": "sha256-OpCnswRyIATPNoiQR4O7jE7iAyI9dekG7HfYhgZI3aI=",
         "owner": "rustsec",
         "repo": "advisory-db",
-        "rev": "b485cf4db1e37d03433c505c7675c2656f59874a",
+        "rev": "0e97e6e71f0dd52b4b4e0ab3fa6e5e5dd72f852a",
         "type": "github"
       },
       "original": {
@@ -81,11 +81,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1675814591,
-        "narHash": "sha256-RuO67fK41LFbKmcE3m1BoIAfFOcrpAlk0jGso/kWK1c=",
+        "lastModified": 1683505101,
+        "narHash": "sha256-VBU64Jfu2V4sUR5+tuQS9erBRAe/QEYUxdVMcJGMZZs=",
         "owner": "ipetkov",
         "repo": "crane",
-        "rev": "972ef2af69c4b25ec6c8583f55f7b07c956c811c",
+        "rev": "7b5bd9e5acb2bb0cfba2d65f34d8568a894cdb6c",
         "type": "github"
       },
       "original": {
@@ -145,14 +145,16 @@
         "advisory-db": "advisory-db",
         "crane": "crane",
         "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1676919660,
-        "narHash": "sha256-sOWRsLyQpHL+x2zYgev4nwdkm7JljZ5Pi+OC9JE0k0A=",
+        "lastModified": 1684440251,
+        "narHash": "sha256-SFNf0aLxi8X+NsveIsSIbnYtThQDWd8pWutuf7Mle94=",
         "owner": "lelgenio",
         "repo": "demoji",
-        "rev": "f5b5413815f22e9f32c1822a2eab5fe529c229d6",
+        "rev": "92cfb1c0f75c1f1e2236b771f5675911fc27f553",
         "type": "github"
       },
       "original": {
@@ -165,7 +167,9 @@
       "inputs": {
         "fenix": "fenix",
         "flake-utils": "flake-utils_3",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1659395338,
@@ -273,12 +277,15 @@
       }
     },
     "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
       "locked": {
-        "lastModified": 1667395993,
-        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
+        "lastModified": 1681202837,
+        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
+        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
         "type": "github"
       },
       "original": {
@@ -288,12 +295,15 @@
       }
     },
     "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_2"
+      },
       "locked": {
-        "lastModified": 1667395993,
-        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
+        "lastModified": 1681202837,
+        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
+        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
         "type": "github"
       },
       "original": {
@@ -319,7 +329,7 @@
     },
     "flake-utils_4": {
       "inputs": {
-        "systems": "systems"
+        "systems": "systems_3"
       },
       "locked": {
         "lastModified": 1681202837,
@@ -337,7 +347,7 @@
     },
     "flake-utils_5": {
       "inputs": {
-        "systems": "systems_2"
+        "systems": "systems_4"
       },
       "locked": {
         "lastModified": 1681202837,
@@ -355,7 +365,7 @@
     },
     "flake-utils_6": {
       "inputs": {
-        "systems": "systems_3"
+        "systems": "systems_5"
       },
       "locked": {
         "lastModified": 1681202837,
@@ -373,7 +383,7 @@
     },
     "flake-utils_7": {
       "inputs": {
-        "systems": "systems_4"
+        "systems": "systems_6"
       },
       "locked": {
         "lastModified": 1681202837,
@@ -414,20 +424,19 @@
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
-        ],
-        "utils": "utils"
+        ]
       },
       "locked": {
-        "lastModified": 1681092193,
-        "narHash": "sha256-JerCqqOqbT2tBnXQW4EqwFl0hHnuZp21rIQ6lu/N4rI=",
+        "lastModified": 1685599623,
+        "narHash": "sha256-Tob4CMOVHue0D3RzguDBCtUmX5ji2PsdbQDbIOIKvsc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "f9edbedaf015013eb35f8caacbe0c9666bbc16af",
+        "rev": "93db05480c0c0f30382d3e80779e8386dcb4f9dd",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-22.11",
+        "ref": "release-23.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -442,11 +451,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1684237799,
-        "narHash": "sha256-70FZFU2Y4WmOwI/2xZAt98vu8f4VGEb5/VsrQsG6w8k=",
+        "lastModified": 1685729674,
+        "narHash": "sha256-i5+/bAZVmCbeIKmnwyd2DG3mGrP4LOJWbsU7nJ1lzuA=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "d68f8ea668753f3472fa8bda62c4eead9059cbc0",
+        "rev": "871ab24c6e9d2fb6e48cbf990ddddf0c46a950af",
         "type": "github"
       },
       "original": {
@@ -463,11 +472,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1681065697,
-        "narHash": "sha256-QPzwwlGKX95tl6ZEshboZbEwwAXww6lNLdVYd6T9Mrc=",
+        "lastModified": 1684265364,
+        "narHash": "sha256-AxNnWbthsuNx73HDQr0eBxrcE3+yfl/WsaXZqUFmkpQ=",
         "owner": "hyprwm",
         "repo": "hyprland-protocols",
-        "rev": "4d29e48433270a2af06b8bc711ca1fe5109746cd",
+        "rev": "8c279b9fb0f2b031427dc5ef4eab53f2ed835530",
         "type": "github"
       },
       "original": {
@@ -497,7 +506,9 @@
         "advisory-db": "advisory-db_2",
         "crane": "crane_2",
         "flake-utils": "flake-utils_5",
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1683946606,
@@ -551,8 +562,8 @@
     },
     "nix-software-center": {
       "inputs": {
-        "nixpkgs": "nixpkgs_4",
-        "utils": "utils_2"
+        "nixpkgs": "nixpkgs",
+        "utils": "utils"
       },
       "locked": {
         "lastModified": 1680477702,
@@ -570,8 +581,8 @@
     },
     "nixos-conf-editor": {
       "inputs": {
-        "nixpkgs": "nixpkgs_5",
-        "utils": "utils_3"
+        "nixpkgs": "nixpkgs_2",
+        "utils": "utils_2"
       },
       "locked": {
         "lastModified": 1680749298,
@@ -589,27 +600,27 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1675698036,
-        "narHash": "sha256-BgsQkQewdlQi8gapJN4phpxkI/FCE/2sORBaFcYbp/A=",
+        "lastModified": 1680213900,
+        "narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "1046c7b92e908a1202c0f1ba3fc21d19e1cf1b62",
+        "rev": "e3652e0735fbec227f342712f180f4f21f0594f2",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1684215771,
-        "narHash": "sha256-fsum28z+g18yreNa1Y7MPo9dtps5h1VkHfZbYQ+YPbk=",
+        "lastModified": 1685655444,
+        "narHash": "sha256-6EujQNAeaUkWvpEZZcVF8qSfQrNVWFNNGbUJxv/A5a8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "963006aab35e3e8ebbf6052b6bf4ea712fdd3c28",
+        "rev": "e635192892f5abbc2289eaac3a73cdb249abaefd",
         "type": "github"
       },
       "original": {
@@ -620,121 +631,42 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1659219666,
-        "narHash": "sha256-pzYr5fokQPHv7CmUXioOhhzDy/XyWOIXP4LZvv/T7Mk=",
+        "lastModified": 1673796341,
+        "narHash": "sha256-1kZi9OkukpNmOaPY7S5/+SlCDOuYnP3HkXHvNDyLQcc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7b9be38c7250b22d829ab6effdee90d5e40c6e5c",
+        "rev": "6dccdc458512abce8d19f74195bb20fdb067df50",
         "type": "github"
       },
       "original": {
-        "id": "nixpkgs",
+        "owner": "NixOS",
         "ref": "nixos-unstable",
-        "type": "indirect"
+        "repo": "nixpkgs",
+        "type": "github"
       }
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1683777345,
-        "narHash": "sha256-V2p/A4RpEGqEZussOnHYMU6XglxBJGCODdzoyvcwig8=",
+        "lastModified": 1685620773,
+        "narHash": "sha256-iQ+LmporQNdLz8uMJdP62TaAWeLUwl43/MYUBtWqulM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "635a306fc8ede2e34cb3dd0d6d0a5d49362150ed",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1685655444,
-        "narHash": "sha256-6EujQNAeaUkWvpEZZcVF8qSfQrNVWFNNGbUJxv/A5a8=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "e635192892f5abbc2289eaac3a73cdb249abaefd",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_5": {
-      "locked": {
-        "lastModified": 1685655444,
-        "narHash": "sha256-6EujQNAeaUkWvpEZZcVF8qSfQrNVWFNNGbUJxv/A5a8=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "e635192892f5abbc2289eaac3a73cdb249abaefd",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_6": {
-      "locked": {
-        "lastModified": 1684171562,
-        "narHash": "sha256-BMUWjVWAUdyMWKk0ATMC9H0Bv4qAV/TXwwPUvTiC5IQ=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "55af203d468a6f5032a519cba4f41acf5a74b638",
+        "rev": "f0ba8235153dd2e25cf06cbf70d43efdd4443592",
         "type": "github"
       },
       "original": {
         "id": "nixpkgs",
-        "ref": "nixos-22.11",
+        "ref": "nixos-23.05",
         "type": "indirect"
       }
     },
-    "nixpkgs_7": {
-      "locked": {
-        "lastModified": 1684498716,
-        "narHash": "sha256-PSdaOLRJc5I0SrkYAduNmPaOIex7tvhyJUGkUJl98hM=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "5d84cfdf23eb4de685dd6475bad8b60ba0560065",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "release-22.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_8": {
-      "locked": {
-        "lastModified": 1684242266,
-        "narHash": "sha256-uaCQ2k1bmojHKjWQngvnnnxQJMY8zi1zq527HdWgQf8=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "7e0743a5aea1dc755d4b761daf75b20aa486fdad",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nur": {
       "locked": {
-        "lastModified": 1684247644,
-        "narHash": "sha256-qsPD5OeA6riLTrIQPNni40nRxZvZw9qlp6EWbBSXWv8=",
+        "lastModified": 1685752884,
+        "narHash": "sha256-2OvX7nU9OI+/5Trsdnf7Z0qzWca0601fLmfKUCOzM9Y=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "102209dfcc76cb9fcda93d06c8dadf93efbcd463",
+        "rev": "b9b4c6c683b344fe0990c18f22f20530d8cf5e81",
         "type": "github"
       },
       "original": {
@@ -807,7 +739,7 @@
         "nix-index-database": "nix-index-database",
         "nix-software-center": "nix-software-center",
         "nixos-conf-editor": "nixos-conf-editor",
-        "nixpkgs": "nixpkgs_6",
+        "nixpkgs": "nixpkgs_3",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "nur": "nur",
         "plymouth-themes": "plymouth-themes",
@@ -850,11 +782,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1675391458,
-        "narHash": "sha256-ukDKZw922BnK5ohL9LhwtaDAdCsJL7L6ScNEyF1lO9w=",
+        "lastModified": 1683080331,
+        "narHash": "sha256-nGDvJ1DAxZIwdn6ww8IFwzoHb2rqBP4wv/65Wt5vflk=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "383a4acfd11d778d5c2efcf28376cbd845eeaedf",
+        "rev": "d59c3fa0cba8336e115b376c2d9e91053aa59e56",
         "type": "github"
       },
       "original": {
@@ -966,10 +898,42 @@
         "type": "github"
       }
     },
+    "systems_5": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_6": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "tlauncher": {
       "inputs": {
         "flake-utils": "flake-utils_6",
-        "nixpkgs": "nixpkgs_7"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1684504342,
@@ -986,21 +950,6 @@
       }
     },
     "utils": {
-      "locked": {
-        "lastModified": 1667395993,
-        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "utils_2": {
       "locked": {
         "lastModified": 1678901627,
         "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
@@ -1015,7 +964,7 @@
         "type": "github"
       }
     },
-    "utils_3": {
+    "utils_2": {
       "locked": {
         "lastModified": 1667395993,
         "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
@@ -1037,11 +986,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1682974941,
-        "narHash": "sha256-l+FZupzb6avSZ0WxsCPLhHWkR/8cuqyJ+rf0or4ABuY=",
+        "lastModified": 1685351104,
+        "narHash": "sha256-40APf9B0ciuTSZkK4NYXzb9cPMsXOKyishk7+J1HqIo=",
         "owner": "wegank",
         "repo": "nur-packages",
-        "rev": "3bf4310f80cbd6751028910fa5dab5859cd0d88a",
+        "rev": "12416ee0ae3d2ad835c83cbc99f5408c91e0f8b7",
         "type": "github"
       },
       "original": {
@@ -1053,7 +1002,9 @@
     "wl-crosshair": {
       "inputs": {
         "flake-utils": "flake-utils_7",
-        "nixpkgs": "nixpkgs_8"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1685576039,
@@ -1073,11 +1024,11 @@
       "flake": false,
       "locked": {
         "host": "gitlab.freedesktop.org",
-        "lastModified": 1682436395,
-        "narHash": "sha256-GGEjkQO9m7YLYIXIXM76HWdhjg4Ye+oafOtyaFAYKI4=",
+        "lastModified": 1685723274,
+        "narHash": "sha256-mjETVZbVheaSO0VRKQHWYAHcoKwYu0WZ0vhKVN7vyRo=",
         "owner": "wlroots",
         "repo": "wlroots",
-        "rev": "6830bfc17fd94709e2cdd4da0af989f102a26e59",
+        "rev": "6668c822b3bf58ca5af5d370ef03b075be3e4d27",
         "type": "gitlab"
       },
       "original": {
@@ -1099,11 +1050,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1682439384,
-        "narHash": "sha256-zHDa8LCZs05TZHQSIZ3ucwyMPglBGHcqTBzfkLjYXTM=",
+        "lastModified": 1685385764,
+        "narHash": "sha256-r+XMyOoRXq+hlfjayb+fyi9kq2JK48TrwuNIAXqlj7U=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "c0e233955568fbea4e859336f6d3d14d51294d7c",
+        "rev": "4d9ff0c17716936e0b5ca577a39e263633901ed1",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 006b74c..9c15f91 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,9 +1,9 @@
 {
   description = "My system config";
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-22.11";
+    nixpkgs.url = "nixpkgs/nixos-23.05";
     nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
-    home-manager.url = "github:nix-community/home-manager/release-22.11";
+    home-manager.url = "github:nix-community/home-manager/release-23.05";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
     nur.url = "github:nix-community/NUR";
 
@@ -43,19 +43,38 @@
     lipsum.url = "github:hannenz/lipsum";
     lipsum.flake = false;
 
-    agenix.url = "github:ryantm/agenix";
-    agenix.inputs.nixpkgs.follows = "nixpkgs";
+    agenix = {
+      url = "github:ryantm/agenix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
-    dzgui-nix.url = "github:lelgenio/dzgui-nix";
-    dzgui-nix.inputs.nixpkgs.follows = "nixpkgs";
+    dzgui-nix = {
+      url = "github:lelgenio/dzgui-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
-    tlauncher.url = "github:lelgenio/tlauncher-nix";
+    tlauncher = {
+      url = "github:lelgenio/tlauncher-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     # my stuff
-    dhist.url = "github:lelgenio/dhist";
-    demoji.url = "github:lelgenio/demoji";
-    maildir-notify-daemon.url = "github:lelgenio/maildir-notify-daemon";
-    wl-crosshair.url = "github:lelgenio/wl-crosshair";
+    dhist = {
+      url = "github:lelgenio/dhist";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    demoji = {
+      url = "github:lelgenio/demoji";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    maildir-notify-daemon = {
+      url = "github:lelgenio/maildir-notify-daemon";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    wl-crosshair = {
+      url = "github:lelgenio/wl-crosshair";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     # gnome stuff
     nixos-conf-editor.url = "github:vlinkz/nixos-conf-editor";
diff --git a/overlays/sixel-patches.nix b/overlays/sixel-patches.nix
index dbb2dd6..23d3f28 100644
--- a/overlays/sixel-patches.nix
+++ b/overlays/sixel-patches.nix
@@ -3,7 +3,7 @@ inputs: (final: prev: {
     src = inputs.alacritty-sixel;
     cargoDeps = old-alacritty.cargoDeps.overrideAttrs (prev.lib.const {
       inherit src;
-      outputHash = "sha256-wOFjVlTdKM2J1+Cq8/8vp2YMU2sRoKtX93UzwNMWUcU=";
+      outputHash = "sha256-3zPNaBPRolR17BbUv2X1ocM+W/9YMYP4E91foKOFKaE=";
     });
   }));
   ranger = (prev.ranger.overridePythonAttrs (old-ranger: rec {
diff --git a/patches/orchis-fix-warnings.patch b/patches/orchis-fix-warnings.patch
index 789b9a7..36ebdca 100644
--- a/patches/orchis-fix-warnings.patch
+++ b/patches/orchis-fix-warnings.patch
@@ -1,48 +1,19 @@
+commit 9c516cc61775a88312280f7732328d5fdf7af825
+Author: lelgenio <lelgenio@disroot.org>
+Date:   Mon May 22 11:30:01 2023 -0300
+
+    fix: limit lowest value for corner-radious at 0
+
 diff --git a/src/_sass/_variables.scss b/src/_sass/_variables.scss
-index e8e808e..68ca7ff 100644
+index 9915a22..6e87a4f 100644
 --- a/src/_sass/_variables.scss
 +++ b/src/_sass/_variables.scss
-@@ -21,7 +21,7 @@ $menuitem-size: if($compact == 'false', 28px, 24px);
+@@ -24,7 +24,7 @@ $large-icon-size: 32px;
  //
  
  $window-radius: $default_corner + $space-size;
 -$corner-radius: if($compact == 'false', $default_corner, $default_corner - 2px);
 +$corner-radius: if($compact == 'false', $default_corner, max(0, $default_corner - 2px));
+ $material-radius: $default_corner / 2 + 4px;
  $menu-radius: $default_corner / 4 + $space-size + 2px;
- $menuitem-radius: $default_corner / 4 + 2px;
- $circular-radius: 9999px;
-diff --git a/src/_sass/gtk/apps/_budgie.scss b/src/_sass/gtk/apps/_budgie.scss
-index ff60df1..5bfd813 100644
---- a/src/_sass/gtk/apps/_budgie.scss
-+++ b/src/_sass/gtk/apps/_budgie.scss
-@@ -53,11 +53,11 @@
- 
-     button {
-       @extend %button-flat-simple;
--      border-radius: $corner-radius - $space-size;
-+      border-radius: max(0, $corner-radius - $space-size);
-     }
-   }
- 
--  calendar:not(.header) { border-radius: $corner-radius - $space-size; }
-+  calendar:not(.header) { border-radius: max(0, $corner-radius - $space-size); }
- 
-   scrolledwindow.sidebar.categories { // AppMenu
-     background-color: $fill;
-@@ -108,14 +108,14 @@
-     }
-   }
- 
--  button { border-radius: $corner-radius - $space-size; }
-+  button { border-radius: max(0, $corner-radius - $space-size); }
- 
-   button.flat:not(.image-button) {
-     min-height: $menuitem-size;
-     padding: 0 8px;
-     color: $text;
-     font-weight: normal;
--    border-radius: $corner-radius - $space-size;
-+    border-radius: max(0, $corner-radius - $space-size);
- 
-     &:disabled { color: $text-disabled; }
-   }
+ $popup-radius: $default_corner + $space-size + 2px;
diff --git a/system/configuration.nix b/system/configuration.nix
index 1a7bce2..cad24f8 100644
--- a/system/configuration.nix
+++ b/system/configuration.nix
@@ -50,10 +50,12 @@
   security.rtkit.enable = true;
   services.openssh = {
     enable = true;
-    kbdInteractiveAuthentication = false;
-    passwordAuthentication = false;
-    permitRootLogin = "no";
     ports = [ 9022 ];
+    settings = {
+      PermitRootLogin = "no";
+      PasswordAuthentication = false;
+      KbdInteractiveAuthentication = false;
+    };
   };
   # programs.ssh = {
   #   startAgent = true;
diff --git a/user/firefox.nix b/user/firefox.nix
index 8d7826b..28bc77f 100644
--- a/user/firefox.nix
+++ b/user/firefox.nix
@@ -5,17 +5,17 @@ in {
     programs.firefox = {
       enable = true;
       package = pkgs.firefox-esr;
-      extensions = with pkgs.nur.repos.rycee.firefox-addons; [
-        darkreader
-        duckduckgo-privacy-essentials
-        sponsorblock
-        tree-style-tab
-        ublock-origin
-        ublock-origin
-      ];
       profiles = {
         main = {
           isDefault = true;
+          extensions = with pkgs.nur.repos.rycee.firefox-addons; [
+            darkreader
+            duckduckgo-privacy-essentials
+            sponsorblock
+            tree-style-tab
+            ublock-origin
+            ublock-origin
+          ];
           settings = {
             "devtools.theme" = "auto";
             "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
diff --git a/user/fish/default.nix b/user/fish/default.nix
index 8509c18..00ece50 100644
--- a/user/fish/default.nix
+++ b/user/fish/default.nix
@@ -79,10 +79,9 @@ in {
     };
     # programs.command-not-found.enable = true;
     programs.nix-index.enable = true;
-    home.packages = (with pkgs; [
+    home.packages = (with pkgs; with fishPlugins;[
       trash-cli
       wl-copy-file
-    ]) ++ (with pkgs.unstable.fishPlugins; [
       async-prompt
       foreign-env
     ] ++ (lib.optional (desktop == "sway") done));
diff --git a/user/helix.nix b/user/helix.nix
index 75c4ee5..9115f8a 100644
--- a/user/helix.nix
+++ b/user/helix.nix
@@ -77,10 +77,11 @@ in
         };
         keys.insert = { "A-k" = "normal_mode"; };
       };
-      languages = [
+      languages.language = [
         { auto-format = true; formatter = { command = "nixpkgs-fmt"; }; name = "nix"; }
         { auto-format = true; name = "rust"; }
       ];
+
       themes = {
         my-theme = {
           "inherits" = "gruvbox";
diff --git a/user/sway/default.nix b/user/sway/default.nix
index ee1aed8..a3b1604 100644
--- a/user/sway/default.nix
+++ b/user/sway/default.nix
@@ -15,7 +15,7 @@ in
     ./theme.nix
   ];
   config = lib.mkIf (pkgs.uservars.desktop == "sway") {
-    programs.mako.enable = true;
+    services.mako.enable = true;
     services.swayidle.enable = true;
     services.kanshi.enable = true;
 
diff --git a/user/sway/mako.nix b/user/sway/mako.nix
index a066f9d..637a2d5 100644
--- a/user/sway/mako.nix
+++ b/user/sway/mako.nix
@@ -4,7 +4,7 @@ let
   inherit (theme) color;
 in
 {
-  programs.mako = {
+  services.mako = {
     borderSize = 2;
     padding = "5";
     margin = "15";
@@ -38,7 +38,7 @@ in
     # # position
     # layer=overlay
   };
-  systemd.user.services.mako = lib.mkIf (config.programs.mako.enable) {
+  systemd.user.services.mako = lib.mkIf (config.services.mako.enable) {
     Unit = {
       Description = "Notification daemon";
       PartOf = [ "graphical-session.target" ];
diff --git a/user/waybar/default.nix b/user/waybar/default.nix
index 90113e2..a54b0c0 100644
--- a/user/waybar/default.nix
+++ b/user/waybar/default.nix
@@ -44,8 +44,8 @@ in
           on-click = "terminal -e iwd";
           format-wifi = "{icon}";
           format-icons = [ "" "" "" "" "" ];
-          format-ethernet = "";
-          format-linked = "";
+          format-ethernet = "󰈀";
+          format-linked = "󰈀";
           format-disconnected = "";
         };
         "sway/workspaces" = {
@@ -54,11 +54,11 @@ in
           format-icons = {
             "1" = "";
             "2" = "";
-            "3" = "";
+            "3" = "󰅩";
             "4" = "";
             "5" = "";
             "6" = "";
-            "7" = "";
+            "7" = "󰇮";
             "8" = "";
             "9" = "";
             "10" = "";
@@ -105,7 +105,7 @@ in
         "sway/language" = { format = "{short} {variant}"; };
         "custom/caffeine" = {
           format = "{}";
-          exec = "systemctl --user status swayidle > /dev/null && echo 鈴 || echo ";
+          exec = "systemctl --user status swayidle > /dev/null && echo 󰒲 || echo 󰒳";
           on-click = "${pkgs._sway_idle_toggle}/bin/_sway_idle_toggle";
           interval = 1;
           tooltip = false;
@@ -127,19 +127,18 @@ in
           scroll-step = 10;
           format = "{icon}";
           format-bluetooth = "";
-          format-bluetooth-muted = "";
-          format-muted = "ﱝ";
+          format-bluetooth-muted = "󰝟";
+          format-muted = "󰝟";
           format-icons = {
             "alsa_output.pci-0000_09_00.4.analog-stereo" =
-              [ " 奄" " 奔" " 墳" ];
-
-            headphone = [ " 奄" " 奔" " 墳" ];
+              [ " 󰕿" " 󰖀" " 󰕾" ];
+            headphone = [ " 󰕿" " 󰖀" " 󰕾" ];
             handsfree = "";
             headset = "";
             phone = "";
             portable = "";
             car = "";
-            default = [ "奄" "奔" "墳" ];
+            default = [ "󰕿" "󰖀" "󰕾" ];
           };
           on-click = "pavucontrol";
           on-click-right = "${pkgs.pulse_sink}/bin/pulse_sink";