fixes for light mode

hosts/desktop/default.nix

@@ -17,8 +17,8 @@ nixpkgs.lib.nixosSystem {
       identityFile = "/home/${globals.user}/.ssh/id_ed25519";
       gui.enable = true;
       theme = {
-        colors = (import ../../modules/colorscheme/gruvbox).dark;
+        colors = (import ../../modules/colorscheme/gruvbox).light;
-        dark = true;
+        dark = false;
       };
       wallpaper = "${wallpapers}/gruvbox/road.jpg";
       gtk.theme.name = nixpkgs.lib.mkDefault "Adwaita-dark";

modules/applications/firefox.nix

@@ -45,6 +45,8 @@
             "toolkit.legacyUserProfileCustomizations.stylesheets" =
               true; # Allow userChrome.css
             "layout.css.color-mix.enabled" = true;
+            "ui.systemUsesDarkTheme" =
+              if config.theme.dark == true then 1 else 0;
           };
           userChrome = ''
             :root {

modules/colorscheme/gruvbox/default.nix

@@ -20,6 +20,7 @@
     base0E = "#d3869b"; # purple
     base0F = "#d65d0e"; # brown
     neovimConfig = ./neovim.lua;
+    batTheme = "gruvbox-dark";
   };
   light = {
     base00 = "#fbf1c7"; # ----
@@ -38,6 +39,7 @@
     base0D = "#076678"; # blue
     base0E = "#8f3f71"; # purple
     base0F = "#d65d0e"; # brown
-    neovimConfig = ./neovim-light.lua;
+    neovimConfig = ./neovim.lua;
+    batTheme = "gruvbox-light";
   };
 }

modules/colorscheme/gruvbox/neovim.lua

@@ -6,7 +6,6 @@ M.packer = function(use)
         config = function()
             vim.g.gruvbox_italicize_strings = 0
             vim.cmd("colorscheme gruvbox8")
-            vim.cmd("set background=dark")
         end,
     })
 end

modules/neovim/default.nix

@@ -19,9 +19,9 @@
       };
       "nvim/lua/packer/colors.lua".source = config.theme.colors.neovimConfig;
       "nvim/lua/background.lua".text = ''
-        vim.cmd("set background=${
+        vim.o.background = "${
           if config.theme.dark == true then "dark" else "light"
-        }")
+        }"
       '';
     };
 

modules/shell/utilities.nix

@@ -13,50 +13,59 @@ let
 
 in {
 
-  home-manager.users.${config.user} = {
+  config = {
 
-    home.packages = with pkgs; [
+    home-manager.users.${config.user} = {
-      unzip # Extract zips
-      rsync # Copy folders
-      ripgrep # grep
-      bat # cat
-      fd # find
-      sd # sed
-      jq # JSON manipulation
-      tealdeer # Cheatsheets
-      tree # View directory hierarchy
-      htop # Show system processes
-      glow # Pretty markdown previews
-      qrencode # Generate qr codes
-      vimv-rs # Batch rename files
-      dig # DNS lookup
-      lf # File viewer
-      # whois # Lookup IPs
-      age # Encryption
-    ];
 
-    programs.zoxide.enable = true; # Shortcut jump command
+      home.packages = with pkgs; [
+        unzip # Extract zips
+        rsync # Copy folders
+        ripgrep # grep
+        fd # find
+        sd # sed
+        jq # JSON manipulation
+        tealdeer # Cheatsheets
+        tree # View directory hierarchy
+        htop # Show system processes
+        glow # Pretty markdown previews
+        qrencode # Generate qr codes
+        vimv-rs # Batch rename files
+        dig # DNS lookup
+        lf # File viewer
+        inetutils # Includes telnet, whois
+        age # Encryption
+      ];
 
-    home.file = {
+      programs.zoxide.enable = true; # Shortcut jump command
-      ".rgignore".text = ignorePatterns;
-      ".fdignore".text = ignorePatterns;
-      ".digrc".text = "+noall +answer"; # Cleaner dig commands
-    };
 
-    programs.fish.shellAbbrs = {
+      home.file = {
-      cat = "bat"; # Swap cat with bat
+        ".rgignore".text = ignorePatterns;
-    };
+        ".fdignore".text = ignorePatterns;
-
+        ".digrc".text = "+noall +answer"; # Cleaner dig commands
-    programs.fish.functions = {
-      ping = {
-        description = "Improved ping";
-        argumentNames = "target";
-        body = "${pkgs.prettyping}/bin/prettyping --nolegend $target";
       };
-      qr = {
+
-        body =
+      programs.bat = {
-          "${pkgs.qrencode}/bin/qrencode $argv[1] -o /tmp/qr.png | open /tmp/qr.png"; # Fix for non-macOS
+        enable = true; # cat replacement
+        config = { theme = config.theme.colors.batTheme; };
       };
+
+      programs.fish.shellAbbrs = {
+        cat = "bat"; # Swap cat with bat
+      };
+
+      programs.fish.functions = {
+        ping = {
+          description = "Improved ping";
+          argumentNames = "target";
+          body = "${pkgs.prettyping}/bin/prettyping --nolegend $target";
+        };
+        qr = {
+          # Fix for non-macOS
+          body =
+            "${pkgs.qrencode}/bin/qrencode $argv[1] -o /tmp/qr.png | ${pkgs.gnome.sushi}/bin/sushi /tmp/qr.png";
+        };
+      };
+
     };
 
   };