From c3074b79bee1b6807272f5461a7a48419054b95f Mon Sep 17 00:00:00 2001
From: roxwize <rae@roxwize.xyz>
Date: Wed, 18 Dec 2024 01:14:25 -0500
Subject: [PATCH] ~

---
 TODO                               |  3 ++-
 nixos/base.nix                     |  6 +-----
 nixos/home.nix                     | 20 +++++++++++++++++++-
 nixos/hosts/qemu/configuration.nix | 12 +-----------
 4 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/TODO b/TODO
index fbc8268..6dba15e 100644
--- a/TODO
+++ b/TODO
@@ -10,4 +10,5 @@
 [ ] Replace absolute paths (i.e. in openbox autostart file) with substituted
  |  paths generated by Nix (see substituteAllInPlace)
 [x] Consider using flakes
-[ ] Use just?
+[x] Use just?
+[ ] Are you managing package overlays properly (check home.nix FIXME)
diff --git a/nixos/base.nix b/nixos/base.nix
index b9b09fd..ff2fc80 100644
--- a/nixos/base.nix
+++ b/nixos/base.nix
@@ -5,11 +5,7 @@
     ];
 
     nix.settings.experimental-features = ["nix-command" "flakes"];
-
-    nixpkgs = {
-        config.allowUnfree = true;
-        overlays = [ inputs.nur.overlay ];
-    };
+    nixpkgs.config.allowUnfree = true;
 
     networking.networkmanager.enable = true;
 
diff --git a/nixos/home.nix b/nixos/home.nix
index b7b8c31..5a38a07 100644
--- a/nixos/home.nix
+++ b/nixos/home.nix
@@ -1,5 +1,8 @@
-{ pkgs, ... }:
+{ pkgs, inputs, ... }:
 {
+    # FIXME is this the correct way to manage this??
+    nixpkgs.overlays = [ inputs.nur.overlays.default ];
+
     home = {
         stateVersion = "24.11";
         username = "rae";
@@ -22,6 +25,21 @@
             enable = true;
             profiles.default = {
                 isDefault = true;
+                extensions = with pkgs.nur.repos.rycee.firefox-addons; [
+                    privacy-badger
+                    stylus
+                    ublock-origin
+                ];
+                bookmarks = [
+                    {
+                        name = "NixOS search";
+                        url = "https://search.nixos.org/packages";
+                    }
+                    {
+                        name = "Home Manager search";
+                        url = "https://home-manager-options.extranix.com/";
+                    }
+                ];
             };
         };
         git = {
diff --git a/nixos/hosts/qemu/configuration.nix b/nixos/hosts/qemu/configuration.nix
index 5512cd9..b35055f 100644
--- a/nixos/hosts/qemu/configuration.nix
+++ b/nixos/hosts/qemu/configuration.nix
@@ -6,12 +6,9 @@
     ];
 
     boot.loader = {
-        # efi.efiSysMountPoint = "/boot/efi";
         grub = {
             enable = true;
-            device = "/dev/sda"; # or "nodev" for efi only
-            # efiSupport = true;
-            # efiInstallAsRemovable = true;
+            device = "/dev/sda";
         };
     };
 
@@ -22,14 +19,7 @@
     console = {
         font = "gr928-8x16-thin"; # t || https://adeverteuil.github.io/linux-console-fonts-screenshots/
         keyMap = "us";
-        #  useXkbConfig = true; # use xkb.options in tty.
     };
 
-    # Open ports in the firewall.
-    # networking.firewall.allowedTCPPorts = [ ... ];
-    # networking.firewall.allowedUDPPorts = [ ... ];
-    # Or disable the firewall altogether.
-    # networking.firewall.enable = false;
-
     system.stateVersion = "24.11";
 }