update to nixos 23.05

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;

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));

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";

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;
 

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" ];

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";