Merge branch 'main' of github.com:FabricSoul/nixos-configs

home/fabric/default.nix

@@ -122,6 +122,8 @@
     pinentry
     gnupg
     dig
+    zathura
+    librewolf
   ];
 
   # Enable home-manager

home/fabric/programs/neomutt.nix

@@ -5,6 +5,6 @@
     };
   };
   home.packages = with pkgs; [
-    msmtp
+    urlscan
   ];
 }

home/fabric/programs/nixvim.nix

@@ -225,16 +225,6 @@
       indent-blankline.enable = true;
       harpoon = {
         enable = true;
-        # keymaps = {
-        #   addFile = "<leader>ha";
-        #   toggleQuickMenu = "<C-e>";
-        #   navFile = {
-        #     "1" = "<leader>h;";
-        #     "2" = "<leader>h,";
-        #     "3" = "<leader>h.";
-        #     "4" = "<leader>hp";
-        #   };
-        # };
       };
       yazi.enable = true;
       gitsigns = {
@@ -504,40 +494,70 @@
     keymaps = [
       {
         mode = "n";
-        key = "<leader>ha";
+        key = "<M-m>";
         action.__raw = "function() require'harpoon':list():add() end";
         options.desc = "Harpoon add file";
       }
       {
         mode = "n";
-        key = "<C-e>";
+        key = "<M-i>";
         action.__raw = "function() require'harpoon'.ui:toggle_quick_menu(require'harpoon':list()) end";
         options.desc = "Harpoon quick menu";
       }
       {
         mode = "n";
-        key = "<leader>h;";
+        key = "<M-1>";
         action.__raw = "function() require'harpoon':list():select(1) end";
         options.desc = "Harpoon file 1";
       }
       {
         mode = "n";
-        key = "<leader>h,";
+        key = "<M-2>";
         action.__raw = "function() require'harpoon':list():select(2) end";
         options.desc = "Harpoon file 2";
       }
       {
         mode = "n";
-        key = "<leader>h.";
+        key = "<M-3>";
         action.__raw = "function() require'harpoon':list():select(3) end";
         options.desc = "Harpoon file 3";
       }
       {
         mode = "n";
-        key = "<leader>hp";
+        key = "<M-4>";
         action.__raw = "function() require'harpoon':list():select(4) end";
         options.desc = "Harpoon file 4";
       }
+      {
+        mode = "n";
+        key = "<M-5>";
+        action.__raw = "function() require'harpoon':list():select(5) end";
+        options.desc = "Harpoon file 5";
+      }
+      {
+        mode = "n";
+        key = "<M-6>";
+        action.__raw = "function() require'harpoon':list():select(6) end";
+        options.desc = "Harpoon file 6";
+      }
+      {
+        mode = "n";
+        key = "<M-7>";
+        action.__raw = "function() require'harpoon':list():select(7) end";
+        options.desc = "Harpoon file 7";
+      }
+      {
+        mode = "n";
+        key = "<M-8>";
+        action.__raw = "function() require'harpoon':list():select(8) end";
+        options.desc = "Harpoon file 8";
+      }
+      {
+        mode = "n";
+        key = "<M-9>";
+        action.__raw = "function() require'harpoon':list():select(9) end";
+        options.desc = "Harpoon file 9";
+      }
       {
         mode = "n";
         key = "<C-h>";
@@ -547,24 +567,24 @@
           remap = true;
         };
       }
-      {
+      # {
-        mode = "n";
+      #   mode = "n";
-        key = "<C-j>";
+      #   key = "<C-j>";
-        action = "<C-w>j";
+      #   action = "<C-w>j";
-        options = {
+      #   options = {
-          desc = "Go to Lower Window";
+      #     desc = "Go to Lower Window";
-          remap = true;
+      #     remap = true;
-        };
+      #   };
-      }
+      # }
-      {
+      # {
-        mode = "n";
+      #   mode = "n";
-        key = "<C-k>";
+      #   key = "<C-k>";
-        action = "<C-w>k";
+      #   action = "<C-w>k";
-        options = {
+      #   options = {
-          desc = "Go to Upper Window";
+      #     desc = "Go to Upper Window";
-          remap = true;
+      #     remap = true;
-        };
+      #   };
-      }
+      # }
       {
         mode = "n";
         key = "<C-l>";

home/fabric/programs/zsh.nix

@@ -26,6 +26,7 @@
         export GPG_TTY=$(tty)
         export GPG_AGENT_INFO=
         export GPGPINENTRYMODE=loopback
+        export BROWSER=/home/fabric/.nix-profile/bin/qutebrowser
         GOPATH=$HOME/go
         PATH=$PATH:/usr/local/go/bin:$GOPATH/bin
         PATH="$HOME/.govm/shim:$PATH"

hosts/common/optional/plasma.nix

@@ -8,18 +8,6 @@
   };
 
   environment.systemPackages = with pkgs; [
-    kdePackages.discover # Optional: Install if you use Flatpak or fwupd firmware update sevice
-    kdePackages.kcalc # Calculator
-    kdePackages.kcharselect # Tool to select and copy special characters from all installed fonts
-    kdePackages.kcolorchooser # A small utility to select a color
-    kdePackages.kolourpaint # Easy-to-use paint program
-    kdePackages.ksystemlog # KDE SystemLog Application
-    kdePackages.sddm-kcm # Configuration module for SDDM
-    kdiff3 # Compares and merges 2 or 3 files or directories
-    kdePackages.isoimagewriter # Optional: Program to write hybrid ISO files onto USB disks
-    kdePackages.partitionmanager # Optional Manage the disk devices, partitions and file systems on your computer
-    hardinfo2 # System information and benchmarks for Linux systems
-    haruna # Open source video player built with Qt/QML and libmpv
     wayland-utils # Wayland utilities
     wl-clipboard # Command-line copy/paste utilities for Wayland
   ];

hosts/zion/default.nix

@@ -10,7 +10,7 @@
     ./hardware-configuration.nix
 
     # Common configurations
-    # ../common/optional/plasma.nix
+    ../common/optional/plasma.nix
     ../common/global
     ../common/optional/nvidia.nix
     ../common/optional/docker.nix
@@ -68,7 +68,7 @@
   };
 
   # Display manager configuration
-  services.displayManager.defaultSession = "dwl";
+  services.displayManager.defaultSession = "plasma";
 
   # Basic system packages
   environment.systemPackages = with pkgs; [
@@ -79,5 +79,6 @@
     usbutils
     obs-studio
     ntfs3g
+    firefox
   ];
 }