From 91b17f861ab48ebc2d029706a433d2dc24c0f26a Mon Sep 17 00:00:00 2001
From: Steph <steph+noreply@code.steph.tools>
Date: Tue, 3 Dec 2024 10:13:54 +0100
Subject: [PATCH] yes

---
 flake.nix                |  5 +++--
 home.nix                 |  8 +++++++-
 nixos.nix                | 10 +++++-----
 platforms/linux/home.nix |  2 +-
 programs/bash.nix        | 13 ++++++++++---
 programs/firefox.nix     |  4 +++-
 6 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/flake.nix b/flake.nix
index c70b851..6d12f63 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,11 +3,12 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixpkgs-2405.url = "github:nixos/nixpkgs/nixos-24.05";
 
     home.url = "github:nix-community/home-manager";
     home.inputs.nixpkgs.follows = "nixpkgs";
 
-    firefox-gnome-theme = { url = "github:rafaelmardojai/firefox-gnome-theme"; flake = false; };
+    firefox-gnome-theme = { url = "github:rafaelmardojai/firefox-gnome-theme/v133"; flake = false; };
     firefox-macos-theme = {url = "github:AdamXweb/WhiteSurFirefoxThemeMacOS"; flake = false; };
     firefox-addons = { url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; inputs.nixpkgs.follows = "nixpkgs"; };
 
@@ -15,7 +16,7 @@
     mac-app-util.url = "github:hraban/mac-app-util";
   };
 
-  outputs = { self, nixpkgs, home, firefox-gnome-theme, firefox-addons, nur, nix-darwin, firefox-macos-theme, mac-app-util }@inputs: {
+  outputs = { self, nixpkgs, home, firefox-gnome-theme, firefox-addons, nur, nix-darwin, firefox-macos-theme, mac-app-util, nixpkgs-2405 }@inputs: {
     nixosConfigurations.iota = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       modules = [
diff --git a/home.nix b/home.nix
index 48d36d4..3165a63 100644
--- a/home.nix
+++ b/home.nix
@@ -45,9 +45,15 @@
       zip
       coreutils
       zotero
+      ollama
+      inputs.nixpkgs-2405.legacyPackages.${system}.signal-desktop-beta
+
 
       # fonts
-      (nerdfonts.override { fonts = [ "FiraCode" "DroidSansMono" ]; })
+      nerd-fonts.fira-code
+      nerd-fonts.fira-mono
+      nerd-fonts.droid-sans-mono
+      borg-sans-mono
       noto-fonts
       noto-fonts-cjk-sans
       noto-fonts-emoji
diff --git a/nixos.nix b/nixos.nix
index 7cbea58..3375842 100644
--- a/nixos.nix
+++ b/nixos.nix
@@ -7,7 +7,7 @@
     ];
 
   nix = {
-    package = pkgs.nixFlakes; 
+    package = pkgs.nixVersions.stable; 
     extraOptions = ''
       experimental-features = nix-command flakes
     '';
@@ -16,6 +16,7 @@
 
 
   networking.networkmanager.enable = true;
+  services.wg-netmanager.enable = true;
 
   time.timeZone = "Europe/Amsterdam";
 
@@ -47,7 +48,6 @@
 
   services.printing.enable = true;
 
-  sound.enable = true;
   hardware.pulseaudio.enable = false;
   security.rtkit.enable = true;
   services.pipewire = {
@@ -91,7 +91,7 @@
     udev
     usbutils
 
-    gnome.gnome-tweaks
+    gnome-tweaks
     gnomeExtensions.tray-icons-reloaded
 
     gnomeExtensions.clipboard-history
@@ -101,11 +101,11 @@
     aspell
     aspellDicts.en
     aspellDicts.nl
-    gnome.networkmanager-openvpn
+    networkmanager-openvpn
   ];
 
   services.udev.packages = with pkgs; [ 
-    gnome.gnome-settings-daemon
+    gnome-settings-daemon
     android-udev-rules
   ];
   services.fprintd.enable = true;
diff --git a/platforms/linux/home.nix b/platforms/linux/home.nix
index c8a228b..2f1ffc8 100644
--- a/platforms/linux/home.nix
+++ b/platforms/linux/home.nix
@@ -85,4 +85,4 @@
         "picture-uri" = "${config.home.homeDirectory}/.background-image";
       };
     };
-}
\ No newline at end of file
+}
diff --git a/programs/bash.nix b/programs/bash.nix
index 992dd66..24b7e3f 100644
--- a/programs/bash.nix
+++ b/programs/bash.nix
@@ -44,13 +44,20 @@
       free = "free -h";
       toupper = "tr [:lower:] [:upper:]";
       tolower = "tr [:upper:] [:lower:]";
-      rebuild = if (os == "linux") then ''
-      	nixos-rebuild switch --flake "path:$HOME/.local/os#" --use-remote-sudo
+      rebuild = if (os == "linux") then '' 
+        cd $HOME/.local/os &&
+        nix flake update --commit-lock-file
+        nixos-rebuild switch --flake "path:$HOME/.local/os#" --use-remote-sudo &&
+        cd -
       '' else ''
-        home-manager switch
+        cd $HOME/.local/os &&
+        nix flake update --commit-lock-file
+        home-manager switch &&
+        cd -
       '';
       ":r" = "!!";
       ":wq" = "exit";
+      vim = "hx";
     };
     programs.bash.sessionVariables = {
       NIX_SHELL_PRESERVE_PROMPT = 1;
diff --git a/programs/firefox.nix b/programs/firefox.nix
index b04351a..797cf0d 100644
--- a/programs/firefox.nix
+++ b/programs/firefox.nix
@@ -48,6 +48,7 @@
             consent-o-matic
             sponsorblock
             multi-account-containers
+            privacy-redirect
           ] ++ (if (os == "darwin") then [
             onepassword-password-manager
           ] else [
@@ -55,6 +56,7 @@
             h264ify 
             fediact 
             tampermonkey
+            laboratory-by-mozilla
           ]);
           search = {
             default = "DuckDuckGo";
@@ -92,4 +94,4 @@
       }
     ];
   }
-]
\ No newline at end of file
+]