config/packages.nix

@@ -14,35 +14,28 @@
           });
         } (ps: with ps; [ en en-computers en-science ]);
     in [
-    # Shell
-    socat
-    jaq
-    tldr
-    ripgrep
-    unzip
-
-    # Wayland
-    brightnessctl
-    playerctl
-    pamixer
+    gcc
     ffmpeg
-
-    # System management
-    htop-vim
     openssl
+    jaq
+    socat
+    git
+    wget
     libnotify
     inotify-tools
+    ripgrep
+    unzip
+    tldr
+    pamixer
+    brightnessctl
+    playerctl
 
-    # Programming
-    gcc
-    git
     pandoc
-    texlive.combined.scheme-full
-    aspell'
-    nixd
-
     gnuplot
     graphviz
+    texlive.combined.scheme-full
+    aspell'
+    nil
   ];
 
 
@@ -51,7 +44,7 @@
 
   programs.fish.enable = true;
   programs.sway.enable = true;
-  programs.sway.extraPackages = lib.mkForce [];
+  programs.sway.extraPackages = [];
 
   services.emacs.enable = true;
   services.emacs.package = with pkgs;

home-manager/tools.nix

@@ -32,7 +32,6 @@
     extraConfig = {
       github.user = "kiana-S";
       credential.helper = "store";
-      safe.directory = [ "/etc/nixos" ];
       git.allowForcePush = true;
       push.followTags = true;
       init.defaultBranch = "main";

home-manager/wayland/hyprland.nix

@@ -141,16 +141,16 @@ in {
         "$mod, 0, workspace, 10"
 
         # Workspace Movement
-        "$mod Shift, 1, hy3:movetoworkspace, 1"
-        "$mod Shift, 2, hy3:movetoworkspace, 2"
-        "$mod Shift, 3, hy3:movetoworkspace, 3"
-        "$mod Shift, 4, hy3:movetoworkspace, 4"
-        "$mod Shift, 5, hy3:movetoworkspace, 5"
-        "$mod Shift, 6, hy3:movetoworkspace, 6"
-        "$mod Shift, 7, hy3:movetoworkspace, 7"
-        "$mod Shift, 8, hy3:movetoworkspace, 8"
-        "$mod Shift, 9, hy3:movetoworkspace, 9"
-        "$mod Shift, 0, hy3:movetoworkspace, 10"
+        "$mod Shift, 1, movetoworkspace, 1"
+        "$mod Shift, 2, movetoworkspace, 2"
+        "$mod Shift, 3, movetoworkspace, 3"
+        "$mod Shift, 4, movetoworkspace, 4"
+        "$mod Shift, 5, movetoworkspace, 5"
+        "$mod Shift, 6, movetoworkspace, 6"
+        "$mod Shift, 7, movetoworkspace, 7"
+        "$mod Shift, 8, movetoworkspace, 8"
+        "$mod Shift, 9, movetoworkspace, 9"
+        "$mod Shift, 0, movetoworkspace, 10"
       ];
 
       bindn = [