optimize, split irc config and add ghostty config

6 files changed, 70 insertions, 10 deletions

diff --git a/common-darwin.nix b/common-darwin.nix
index 82b4c85..2e300c9 100644
--- a/common-darwin.nix
+++ b/common-darwin.nix
@@ -8,6 +8,7 @@
   imports = [
     ./zsh.nix
     ./vim.nix
+    ./irc.nix
   ];
 
   # List packages installed in system profile. To search by name, run:
@@ -24,10 +25,23 @@
     pass
     passExtensions.pass-otp
     passExtensions.pass-update
+    nh
+    nix-output-monitor
   ];
 
+  nix.gc = {
+    automatic = true;
+    interval.Day = 7;
+    options = "--delete-older-than 14d";
+  };
+
   programs.zsh.enable = true;
 
+  fonts.packages = with pkgs; [
+    fira-code
+    nerd-fonts.fira-code
+  ];
+
   security.pam.services.sudo_local = {
     enable = true;
     reattach = true;
@@ -106,5 +120,17 @@
   # The platform the configuration will be used on.
   nixpkgs.hostPlatform = "aarch64-darwin";
   nixpkgs.config.allowUnfree = true;
-  nix.settings.experimental-features = ["nix-command" "flakes"];
+  nix.settings = {
+    experimental-features = ["nix-command" "flakes"];
+    extra-substituters = ["https://nix-community.cachix.org"];
+    extra-trusted-public-keys = ["nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="];
+  };
+  nix.optimise = {
+    automatic = true;
+    interval = {
+      Weekday = 0;
+      Hour = 0;
+      Minute = 0;
+    };
+  };
 }
diff --git a/common-linux.nix b/common-linux.nix
index 8dae24d..9b7884e 100644
--- a/common-linux.nix
+++ b/common-linux.nix
@@ -6,6 +6,7 @@
 }: {
   imports = [
     ./bash.nix
+    ./irc.nix
   ];
 
   # Bootloader.
@@ -29,10 +30,20 @@
 
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
-  nix.settings.experimental-features = [
-    "nix-command"
-    "flakes"
-  ];
+  nix.settings = {
+    experimental-features = ["nix-command" "flakes"];
+    extra-substituters = ["https://nix-community.cachix.org"];
+    extra-trusted-public-keys = ["nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="];
+  };
+  nix.optimise = {
+    automatic = true;
+    dates = ["Sun 00:00:00"];
+  };
+  nix.gc = {
+    automatic = true;
+    dates = "weekly";
+    persistent = true;
+  };
 
   # List packages installed in system profile. To search, run:
   # $ nix search wget
@@ -44,6 +55,8 @@
     gcc
     alejandra
     gnumake
+    nh
+    nix-output-monitor
   ];
 
   fonts = {
diff --git a/dotfiles/ghostty/config.ghostty b/dotfiles/ghostty/config.ghostty
new file mode 100644
index 0000000..f38e25b
--- /dev/null
+++ b/dotfiles/ghostty/config.ghostty
@@ -0,0 +1,5 @@
+font-family = "Fira Code Nerd Font"
+font-size = 14
+theme = "Dimmed Monokai"
+mouse-hide-while-typing = true
+mouse-shift-capture = true
diff --git a/hjem-darwin.nix b/hjem-darwin.nix
index 9090d86..ac3bab9 100644
--- a/hjem-darwin.nix
+++ b/hjem-darwin.nix
@@ -8,13 +8,12 @@
   ];
 
   hjem.users.${username} = {
-    directory = "/home/${username}";
+    directory = "/Users/${username}";
     files = {
-      ".config/senpai/senpai.scfg".source = ./dotfiles/senpai/senpai.scfg;
+      ".config/ghostty/config.ghostty".source = ./dotfiles/ghostty/config.ghostty;
     };
 
     packages = with pkgs; [
-      senpai
     ];
   };
 }
diff --git a/hjem-linux.nix b/hjem-linux.nix
index df49b12..9446720 100644
--- a/hjem-linux.nix
+++ b/hjem-linux.nix
@@ -25,7 +25,6 @@
       ".config/surf/script.js".source = ./dotfiles/surf/script.js;
 
       ".sfeed/sfeedrc".source = ./dotfiles/sfeed/sfeedrc;
-      ".config/senpai/senpai.scfg".source = ./dotfiles/senpai/senpai.scfg;
 
       ".config/fastfetch/config.jsonc".source = ./dotfiles/fastfetch/config.jsonc;
     };
@@ -39,7 +38,6 @@
       zathura
       lf
       sfeed
-      senpai
     ];
   };
 
diff --git a/irc.nix b/irc.nix
new file mode 100644
index 0000000..a897e1f
--- /dev/null
+++ b/irc.nix
@@ -0,0 +1,19 @@
+{
+  config,
+  pkgs,
+  username,
+  ...
+}: {
+  imports = [
+  ];
+
+  hjem.users.${username} = {
+    files = {
+      ".config/senpai/senpai.scfg".source = ./dotfiles/senpai/senpai.scfg;
+    };
+
+    packages = with pkgs; [
+      senpai
+    ];
+  };
+}