Update sway config

modules/home/sway.nix

@@ -7,20 +7,11 @@
 }:
 
 with lib; let
-    cfg = config.simmer.sway;
     gui = systemConfig.gui;
     modifier = "Mod4";
 in
 {
-    options.simmer.sway = {
-        enable = mkOption {
-            description = "Whether to install and set sway as window manager";
-            type = types.bool;
-            default = gui.enable;
-        };
-    };
-
-    config = mkIf cfg.enable {
+    config = mkIf gui.sway.enable {
         wayland.windowManager.sway = {
             enable = true;
             checkConfig = false;
@@ -144,11 +135,10 @@ in
                     ];
 
                     "6" = [
-                        {app_id="com.obsproject.Studio"; }
                     ];
 
                     "7" = [
-                        {app_id="org.strawberrymusicplayer.strawberry"; }
+                        {class="feishin"; }
                     ];
 
                     "8" = [
@@ -159,10 +149,7 @@ in
 
                     "9" = [];
 
-                    "0" = [
-                        {app_id="python3"; }
-                        {class="steam_proton"; }
-                    ];
+                    "0" = [];
                 };
 
                 input."type:keyboard" = {

modules/nix/audio.nix

@@ -16,16 +16,6 @@ in
                 type = types.bool;
                 default = false;
             };
-            pulseSupport = mkOption {
-                description = "Enable pulse support for pipewire";
-                type = types.bool;
-                default = true;
-            };
-            alsaSupport = mkOption {
-                description = "Enable alsa support for pipewire";
-                type = types.bool;
-                default = true;
-            };
         };
 
         music = {
@@ -56,23 +46,22 @@ in
     };
 
     config = {
-        environment.systemPackages = 
-        with pkgs; []
+        environment.systemPackages = with pkgs; []
+            ++ optional cfg.pipewire.enable pulseaudio
+            ++ optional cfg.music.enable feishin
             ++ optional cfg.tools.helvum helvum
             ++ optional cfg.tools.easyeffects easyeffects
-            ++ optional cfg.tools.pavucontrol pavucontrol
-            ++ optional cfg.pipewire.pulseSupport pulseaudio
-            ++ optional cfg.music.enable feishin;
+            ++ optional cfg.tools.pavucontrol pavucontrol;
 
 
         security.rtkit.enable = mkIf cfg.pipewire.enable true;
         services.pipewire = mkIf cfg.pipewire.enable {
             enable = true;
-            alsa = mkIf cfg.pipewire.alsaSupport {
+            alsa = {
                 enable = true;
                 support32Bit = true;
             };
-            pulse.enable = mkIf cfg.pipewire.pulseSupport true;
+            pulse.enable = true;
         };
     };
 }

modules/nix/backup.nix

@@ -38,7 +38,7 @@ in
         };
 
         passphrase = mkOption {
-            description = "path to file containing passphrase";
+            description = "Path to file containing passphrase";
             type = types.path;
         };
 

modules/nix/common.nix

@@ -20,7 +20,7 @@ in
         nil.enable = mkOption {
             description = "Whether to install nil";
             type = types.bool;
-            default = false;
+            default = true;
         };
 
         shell = mkOption {

modules/nix/games.nix

@@ -47,12 +47,11 @@ in
     };
 
     config = mkIf cfg.enable {
-        environment.systemPackages = with pkgs; with localPackages.x86_64-linux;
-        []
-        ++ optional cfg.protonup.enable protonup-qt
-        ++ optional cfg.gamescope.enable gamescope-old
-        ++ optional cfg.discord.enable vesktop
-        ++ optionals cfg.lutris.enable [ lutris wine ];
+        environment.systemPackages = with pkgs; with localPackages.x86_64-linux; []
+            ++ optional cfg.protonup.enable protonup-qt
+            ++ optional cfg.gamescope.enable gamescope-old
+            ++ optional cfg.discord.enable vesktop
+            ++ optionals cfg.lutris.enable [ lutris wine ];
 
         programs.steam = mkIf cfg.steam.enable {
             enable = true;

modules/nix/gui.nix

@@ -103,8 +103,8 @@ in
             packages = with pkgs; [
                 liberation_ttf
                 ubuntu_font_family
-                font-awesome
                 vazir-fonts
+                font-awesome
             ];
              fontconfig = {