From 4b8ce88a8a225769a594555d2fd7488b3d56dded Mon Sep 17 00:00:00 2001
From: Nydragon <contact@ccnlc.eu>
Date: Thu, 8 Aug 2024 13:28:33 +0200
Subject: [PATCH] misc: various additions including a firefox fix

---
 home/graphical/firefox/default.nix       |  2 ++
 home/scripts/default.nix                 |  3 +++
 home/terminal/btop.nix                   |  5 +++++
 home/terminal/default.nix                |  1 +
 home/terminal/ssh/default.nix            |  7 ++++++-
 hosts/brontes/hardware-configuration.nix |  2 +-
 hosts/marr/configuration.nix             | 11 -----------
 modules/programs/firefox.nix             |  8 +++++++-
 8 files changed, 25 insertions(+), 14 deletions(-)
 create mode 100644 home/terminal/btop.nix

diff --git a/home/graphical/firefox/default.nix b/home/graphical/firefox/default.nix
index a4c0a4d..232a178 100644
--- a/home/graphical/firefox/default.nix
+++ b/home/graphical/firefox/default.nix
@@ -7,6 +7,8 @@
 lib.mkIf osConfig.programs.firefox.enable {
   programs.firefox = {
     enable = true;
+    # Installed by nixpkgs module
+    package = null;
     profiles.nico = {
       name = "Nico";
       isDefault = true;
diff --git a/home/scripts/default.nix b/home/scripts/default.nix
index e985bee..fbe1772 100644
--- a/home/scripts/default.nix
+++ b/home/scripts/default.nix
@@ -18,6 +18,7 @@
         fi
       '';
     };
+
   set-background = pkgs.writers.writeFishBin "set-background" (
     builtins.readFile (
       pkgs.fetchurl {
@@ -28,4 +29,6 @@
   );
 
   nixedit = pkgs.writers.writeFishBin "nixedit" "env --chdir ~/.nixconf $EDITOR .";
+
+  getext = pkgs.writeScriptBin "ls | grep -E \"\.[a-zA-Z0-9]+$\" --only-matching  | sort | uniq";
 }
diff --git a/home/terminal/btop.nix b/home/terminal/btop.nix
new file mode 100644
index 0000000..4f1a73b
--- /dev/null
+++ b/home/terminal/btop.nix
@@ -0,0 +1,5 @@
+{
+  programs.btop = {
+    enable = true;
+  };
+}
diff --git a/home/terminal/default.nix b/home/terminal/default.nix
index 228200d..58cec1b 100644
--- a/home/terminal/default.nix
+++ b/home/terminal/default.nix
@@ -4,5 +4,6 @@
     ./ssh
     ./git
     ./fish
+    ./btop.nix
   ];
 }
diff --git a/home/terminal/ssh/default.nix b/home/terminal/ssh/default.nix
index b440cd2..0fe2f17 100644
--- a/home/terminal/ssh/default.nix
+++ b/home/terminal/ssh/default.nix
@@ -3,11 +3,16 @@
     enable = true;
     addKeysToAgent = "confirm";
     matchBlocks = {
-      "deck" = {
+      deck = {
         hostname = "steamdeck";
         user = "deck";
         port = 22;
       };
+      dockervm = {
+        hostname = "192.168.178.67";
+        user = "nydragon";
+        port = 22;
+      };
     };
   };
 }
diff --git a/hosts/brontes/hardware-configuration.nix b/hosts/brontes/hardware-configuration.nix
index d107e2c..e0284c0 100644
--- a/hosts/brontes/hardware-configuration.nix
+++ b/hosts/brontes/hardware-configuration.nix
@@ -43,7 +43,7 @@
     fsType = "btrfs";
   };
 
-  swapDevices = [ { device = "/dev/disk/by-uuid/fb751a3f-929b-4b33-baba-d65a9caaaa59"; } ];
+  swapDevices = [ { device = "/dev/disk/by-uuid/2f655287-02bd-4bd7-b16c-3bdb882536e0"; } ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's
diff --git a/hosts/marr/configuration.nix b/hosts/marr/configuration.nix
index f090a62..ebf3da9 100644
--- a/hosts/marr/configuration.nix
+++ b/hosts/marr/configuration.nix
@@ -137,17 +137,6 @@
     };
   };
 
-  services.greetd = {
-    enable = true;
-    settings = rec {
-      initial_session = {
-        command = "${pkgs.greetd.greetd}/bin/agreety --cmd ${pkgs.sway}/bin/sway";
-        user = "${username}";
-      };
-      default_session = initial_session;
-    };
-  };
-
   services.gnome.gnome-keyring.enable = true;
 
   services.flatpak.enable = true;
diff --git a/modules/programs/firefox.nix b/modules/programs/firefox.nix
index 2788c2f..d13c0cc 100644
--- a/modules/programs/firefox.nix
+++ b/modules/programs/firefox.nix
@@ -1,9 +1,15 @@
 # References:
 # https://discourse.nixos.org/t/declare-firefox-extensions-and-settings/36265
 # https://github.com/gvolpe/nix-config/blob/6feb7e4f47e74a8e3befd2efb423d9232f522ccd/home/programs/browsers/firefox.nix
-{ lib, config, ... }:
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
 lib.mkIf config.programs.firefox.enable {
   programs.firefox = {
+    package = pkgs.firefox-bin;
     preferencesStatus = "locked";
     preferences = {
       "browser.bookmarks.restore_default_bookmarks" = false;