Change to Firefox, generalize terminal apps, update Forgejo, simplify other files

2025-02-22 02:21:44 -05:00 · 2025-02-22 02:21:44 -05:00 · eda4cd528f
commit eda4cd528f
parent 63fc72eeb0
20 changed files with 81 additions and 94 deletions
--- a/modules/home/programs/gui/default.nix
+++ b/modules/home/programs/gui/default.nix
@ -1,9 +1,10 @@
 { ... }:
 {
  imports = [
+    ./firefox
    ./foot
    ./imv
-    ./librewolf
+    ./looking-glass
    ./mangohud
    ./mpv
    ./obs
--- a/modules/home/programs/gui/librewolf/default.nix
+++ b/modules/home/programs/gui/librewolf/default.nix
@ -3,7 +3,6 @@
  config = lib.mkIf config.home.desktop.enable {
    programs.firefox = {
      enable = true;
-      package = pkgs.librewolf;
      profiles = let
        # FireFox css, based on https://github.com/Dook97/firefox-qutebrowser-userchrome
        themeFont = ''
@ -263,25 +262,6 @@
            ${builtins.readFile ./quteFox.css}
          '';
        };
-        Misc = {
-          id = 2;
-          extensions = commonExtensions;
-          search = commonSearch;
-          bookmarks = commonBookmarks;
-          settings = commonSettings;
-        };
-      };
-    };
-
-    # Fixes
-    home.file = {
-      # Symlinks to Librewolf
-      ".librewolf".source = config.lib.file.mkOutOfStoreSymlink "/home/${config.home.username}/.mozilla/firefox";
-      
-      # Gnome theme
-      ".mozilla/firefox/Misc/chrome".source = fetchTarball {
-        url = "https://github.com/rafaelmardojai/firefox-gnome-theme/archive/refs/tags/v132.zip";
-        sha256 = "095sv1ann2v7q5bfy65i118ylhp2vkpbgyf6fz84nd9yrx14rzwm";
      };
    };
  };
--- a/modules/home/programs/gui/librewolf/quteFox.css
+++ b/modules/home/programs/gui/librewolf/quteFox.css
--- a/modules/home/programs/gui/looking-glass/default.nix
+++ b/modules/home/programs/gui/looking-glass/default.nix
@ -0,0 +1,16 @@
+{ config, ... }:
+{
+  programs.looking-glass-client = {
+    enable = config.home.desktop.enable;
+    settings = {
+      input = {
+        rawMouse = true;
+        escapeKey = 62;
+      };
+      spice = {
+        enable = true;
+        audio = true;
+      };
+    };
+  };
+}
--- a/modules/home/programs/terminal/default.nix
+++ b/modules/home/programs/terminal/default.nix
@ -2,12 +2,12 @@
 {
  imports = [
    ./btop
+    ./eza
    ./fastfetch
    ./git
    ./ncmpcpp
    ./neovim
    ./nh
-    ./notfound
    ./ranger
    ./spotdl
    ./tmux
--- a/modules/home/programs/terminal/eza/default.nix
+++ b/modules/home/programs/terminal/eza/default.nix
@ -0,0 +1,10 @@
+{ ... }:
+{
+  programs.eza = {
+    enable = true;
+    git = true;
+    icons = "auto";
+    colors = "always";
+    extraOptions = [ "--group-directories-first" ];
+  };
+}
--- a/modules/home/programs/terminal/notfound/default.nix
+++ b/modules/home/programs/terminal/notfound/default.nix
@ -1,4 +0,0 @@
-{ ... }:
-{
-  programs.command-not-found.enable = true;
-}
--- a/modules/home/programs/terminal/ranger/default.nix
+++ b/modules/home/programs/terminal/ranger/default.nix
@ -35,8 +35,8 @@
        command = ''mpv --shuffle --no-audio-display -- "$@"'';
      }
      {
-        condition = ''ext x?html?|pdf, has librewolf, X, flag f'';
-        command = ''librewolf -- "$@"'';
+        condition = ''ext x?html?|pdf, has firefox, X, flag f'';
+        command = ''firefox -- "$@"'';
      }
      {
        condition = ''ext pptx?|od[dfgpst]|docx?|sxc|xlsx?|xlt|xlw|gnm|gnumeric, has libreoffice, X, flag f'';
--- a/modules/home/programs/terminal/zsh/default.nix
+++ b/modules/home/programs/terminal/zsh/default.nix
@ -7,7 +7,10 @@
    oh-my-zsh = {
      enable = true;
      theme = "agnoster";
-      plugins = [ "git" ];
+      plugins = [
+        "git"
+        "history"
+      ];
    };
    initExtra = ''
      pfetch
--- a/modules/home/settings/aliases/default.nix
+++ b/modules/home/settings/aliases/default.nix
@ -14,7 +14,6 @@
    # Shortcuts
    ff = "clear && fastfetch";
    ip = "ip -c";
-    ls = "${pkgs.eza}/bin/eza -a --color=always --group-directories-first --icons";
    cat = "${pkgs.bat}/bin/bat --paging never";
    copycat = "wl-copy <";
    myip = "curl ifconfig.co";
--- a/modules/home/wms/niri/autostart/default.nix
+++ b/modules/home/wms/niri/autostart/default.nix
@ -14,7 +14,6 @@
    spawn-at-startup "${pkgs.xwayland-satellite}/bin/xwayland-satellite"
    
    // Foreground
-    //spawn-at-startup "librewolf" "-p" "Misc" "--name" "MiscBrowser"
    spawn-at-startup "thunderbird"
    spawn-at-startup "vesktop"
  '';
--- a/modules/home/wms/niri/hotkeys/default.nix
+++ b/modules/home/wms/niri/hotkeys/default.nix
@ -9,9 +9,8 @@
      //// Launchers
    
      // Browser
-      ${primeMod}+F1 { spawn "sh" "-c" "librewolf -p Main --name MainBrowser | notify-send \"Main Browser\""; }
-      ${primeMod}+F2 { spawn "sh" "-c" "librewolf -p Alt --name AltBrowser | notify-send \"Alternate Browser\""; }
-      ${primeMod}+F3 { spawn "sh" "-c" "librewolf -p Misc --name MiscBrowser | notify-send \"Miscellaneous Browser\""; }
+      ${primeMod}+F1 { spawn "sh" "-c" "firefox -p Main --name MainBrowser | notify-send \"Main Browser\""; }
+      ${primeMod}+F2 { spawn "sh" "-c" "firefox -p Alt --name AltBrowser | notify-send \"Alternate Browser\""; }
    
      // Virtual machines
      ${primeMod}+F4 { spawn "sh" "-c" "virt-manager | notify-send \"Virtual Machines\""; }
--- a/modules/home/wms/niri/rules/default.nix
+++ b/modules/home/wms/niri/rules/default.nix
@ -27,20 +27,16 @@
    }

    // Etc
-    window-rule {
-      match app-id="looking-glass-client"
-      open-on-workspace "${config.ws.w2a}"
-    }
    window-rule {
      match app-id="com.obsproject.Studio"
      open-on-workspace "${config.ws.w4a}"
    }

-    //// Layer rules (Uncomment after 0.1.11)
-    //layer-rule {
-    //  match namespace="^notifications$"
-    //  block-out-from "screencast"
-    //}
+    // Layer rules
+    layer-rule {
+      match namespace="^notifications$"
+      block-out-from "screencast"
+    }

    // Everything else
    screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png"
--- a/modules/home/wms/programs/waybar/default.nix
+++ b/modules/home/wms/programs/waybar/default.nix
@ -15,9 +15,9 @@
      all-outputs = true;
      tooltip = false;
      rewrite = {
-        "(.*) — LibreWolf" = "   $1";
-        "LibreWolf" = "   Firefox";
-        "(.*) - LibreWolf — Firefox" = "󰗃   $1";
+        "(.*) — Mozilla Firefox" = "   $1";
+        "Mozilla Firefox" = "   Firefox";
+        "(.*) - Mozilla Firefox — Firefox" = "󰗃   $1";
      };
    };

--- a/modules/home/wms/sway/hotkeys/default.nix
+++ b/modules/home/wms/sway/hotkeys/default.nix
@ -12,9 +12,9 @@
      ## Launchers

      # Browser profiles
-      "${primeMod}+F1" = ''exec librewolf -p Main --name MainBrowser | notify-send "Main Browser"'';
-      "${primeMod}+F2" = ''exec librewolf -p Alt --name AltBrowser | notify-send "Alternate Browser"'';
-      "${primeMod}+F3" = ''exec librewolf -p Misc --name MiscBrowser | notify-send "Miscellaneous Browser"'';
+      "${primeMod}+F1" = ''exec firefox -p Main --name MainBrowser | notify-send "Main Browser"'';
+      "${primeMod}+F2" = ''exec firefox -p Alt --name AltBrowser | notify-send "Alternate Browser"'';
+      "${primeMod}+F3" = ''exec firefox -p Misc --name MiscBrowser | notify-send "Miscellaneous Browser"'';

      # Virtual machines
      "${primeMod}+F4" = ''exec virt-manager | notify-send "Virtual Machines"'';
--- a/modules/home/wms/sway/rules/default.nix
+++ b/modules/home/wms/sway/rules/default.nix
@ -65,7 +65,6 @@
        { class = "steam"; }
        { app_id = "heroic"; }
      ];
-      "22:${config.ws.w2a}" = [{ app_id = "looking-glass-client"; }];
      "44:${config.ws.w4a}" = [{ app_id = "com.obsproject.Studio"; }];
    };
    focus.newWindow = "focus";
--- a/modules/system/accounts/users/custom/main/default.nix
+++ b/modules/system/accounts/users/custom/main/default.nix
@ -3,16 +3,17 @@
  users.users."${config.sysusers.main}" = {
    hashedPassword = config.secrets.mainAccPass;
    isNormalUser = true;
+    openssh.authorizedKeys.keyFiles = [
+      ../../../../../../hosts/tower/id_ed25519.pub
+
+      ../../../../../../hosts/envy/id_ed25519.pub
+      ../../../../../../hosts/redmond/id_ed25519.pub
+
+      ../../../../../../hosts/kitty/id_ed25519.pub
+      ../../../../../../hosts/midas/id_ed25519.pub
+      ../../../../../../hosts/prophet/id_ed25519.pub
+    ];
    openssh.authorizedKeys.keys = [
-      (builtins.readFile ../../../../../../hosts/tower/id_ed25519.pub)
-
-      (builtins.readFile ../../../../../../hosts/envy/id_ed25519.pub)
-      (builtins.readFile ../../../../../../hosts/redmond/id_ed25519.pub)
-
-      (builtins.readFile ../../../../../../hosts/kitty/id_ed25519.pub)
-      (builtins.readFile ../../../../../../hosts/midas/id_ed25519.pub)
-      (builtins.readFile ../../../../../../hosts/prophet/id_ed25519.pub)
-
      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJahAoF74BY6GCTsFkt1ADKaraFgJJozW1Y1aBTLK0j9 Pixel9"
    ];
    extraGroups = [
--- a/modules/system/devices/bluetooth/default.nix
+++ b/modules/system/devices/bluetooth/default.nix
@ -9,8 +9,6 @@
      };
    };

-    systemd.tmpfiles.rules = [ "f /var/lib/systemd/linger/${config.sysusers.main}" ];
-
    environment.persistence."/persist".directories = [ "/var/lib/bluetooth" ];
  };
 }
--- a/modules/system/services/general/libvirtd/default.nix
+++ b/modules/system/services/general/libvirtd/default.nix
@ -3,8 +3,7 @@
  options.system.libvirtd.enable = lib.mkEnableOption "Enable libvirtd services";

  config = lib.mkIf config.system.libvirtd.enable {
-    virtualisation = {
-      libvirtd = {
+    virtualisation.libvirtd = {
      enable = true;
      onBoot = "ignore";
      onShutdown = "shutdown";
@ -13,21 +12,14 @@
          enable = true;
          packages = with pkgs; [ OVMFFull.fd ];
        };
+        vhostUserPackages = with pkgs; [ virtiofsd ];
        swtpm.enable = true;
      };
    };
-    };

-    environment = {
-      systemPackages = with pkgs; [
-        virt-manager
-        virtiofsd
-        dnsmasq
-        spice-vdagent
-        looking-glass-client
-      ];
+    programs.virt-manager.enable = true;

-      persistence."/persist".directories = [
+    environment.persistence."/persist".directories = [
      "/var/lib/libvirt/dnsmasq"
      "/var/lib/libvirt/nwfilter"
      "/var/lib/libvirt/qemu"
@ -35,7 +27,6 @@
      "/var/lib/libvirt/storage"
      "/var/lib/libvirt/swtpm"
    ];
-    };

    # Needed to make NAT work
    networking.firewall.trustedInterfaces = [
@ -43,6 +34,6 @@
      "virbr1"
    ];

-    systemd.tmpfiles.rules = [ "f /dev/shm/looking-glass 0660 ${config.sysusers.main} libvirtd -" ];
+    systemd.tmpfiles.rules = [ "f /dev/shm/looking-glass 0660 - libvirtd -" ];
  };
 }
--- a/modules/system/services/server/forgejo/default.nix
+++ b/modules/system/services/server/forgejo/default.nix
@ -1,10 +1,11 @@
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:
 {
  imports = [ ./nginx ];

  config = lib.mkIf config.system.server.enable {
    services.forgejo = {
      enable = true;
+      package = pkgs.forgejo;
      settings = {
        server = {
          DOMAIN = "git.${config.domains.p2}";
@ -33,8 +34,6 @@

    services.ddclient.domains = [ "git.${config.domains.p2}" ];

-    environment.persistence."/persist".directories = [
-      "/var/lib/forgejo"
-    ];
+    environment.persistence."/persist".directories = [ "/var/lib/forgejo" ];
  };
 }