Updated to 26.05HEADmaster

5 files changed, 26 insertions, 11 deletions

diff --git a/computers/nixnode.nix b/computers/nixnode.nix
index 552bafb..b3d4745 100644
--- a/computers/nixnode.nix
+++ b/computers/nixnode.nix
@@ -201,7 +201,7 @@ ${pkgs.iptables}/bin/iptables -t nat -D POSTROUTING -s 10.100.0.0/24 -o eth0 -j
             track-voting = false;
             voting-timeout = 15;
 	        private-server-password = "lug@uoa";
-            motd = "Server for LUG@UoA\nChampionship coming now!";
+            motd = "Server for LUG@UoA\nChampionship coming soon!";
             live-spectate = true;
             server-configurable = true;
         };
diff --git a/computers/nixy.nix b/computers/nixy.nix
index bcdf3aa..01bf9ec 100644
--- a/computers/nixy.nix
+++ b/computers/nixy.nix
@@ -169,7 +169,7 @@
 		    vim
 		    firefox
 		    pfetch
-		    neofetch
+		    fastfetch
             pinentry-gtk2
             git
             nm-file-secret-agent
diff --git a/flake.nix b/flake.nix
index 2dde055..657d8bc 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,13 +2,13 @@
     description = "My nixos configuration";
 
     inputs = {
-        nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
+        nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05";
         home-manager = {
-            url = "github:nix-community/home-manager/release-25.11";
+            url = "github:nix-community/home-manager/release-26.05";
             inputs.nixpkgs.follows = "nixpkgs";
         };
         stylix = {
-            url = "github:danth/stylix/release-25.11";
+            url = "github:danth/stylix/release-26.05";
             inputs.nixpkgs.follows = "nixpkgs";
         };
         spicetify-nix = {
@@ -42,8 +42,9 @@
             inputs.nixpkgs.follows = "nixpkgs";
         };
         zen-browser = {
-            url = "github:MarceColl/zen-browser-flake";
+            url = "github:0xc000022070/zen-browser-flake";
             inputs.nixpkgs.follows = "nixpkgs";
+            inputs.home-manager.follows = "home-manager";
         };
         nixcord = {
             url = "github:kaylorben/nixcord";
diff --git a/home-manager/home.nix b/home-manager/home.nix
index 3611afc..897a6b1 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -9,6 +9,7 @@
         ./kitty
         inputs.spicetify-nix.homeManagerModules.default
         inputs.nixcord.homeModules.nixcord
+        inputs.zen-browser.homeModules.twilight-official
         #inputs.stylix.homeManagerModules.stylix
     ];
 
@@ -28,6 +29,8 @@
         playerctl
         libqalculate
         libreoffice
+        hunspell
+        hunspellDicts.en_AU
         logisim-evolution
         thunderbird
         xdotool
@@ -63,10 +66,13 @@
             jupytext
             pandas
             pydot
+            scikit-learn
+            nbdev
+            pillow
         ]))
         graphviz
         alacritty
-        nyxt
+        # nyxt
         wireguard-tools
         brightnessctl
         # inputs.nil.packages.${system}.default
@@ -76,7 +82,7 @@
         #inputs.zen-browser.packages."${system}".default
         piper
         qbittorrent
-        sbcl
+        # sbcl
         superTuxKart
         typst
         sops
@@ -86,6 +92,7 @@
         # inputs.hytale-launcher.packages.${pkgs.system}.default
         #adom
         flatpak
+        # openttd
     ];
     
     nix = {
@@ -139,7 +146,13 @@
     # services.easyeffects.enable = true;
     
 
-    programs.firefox.enable = true;
+    programs.firefox = {
+        enable = true;
+    };
+    programs.zen-browser = {
+        enable = true;
+        setAsDefaultBrowser = true;
+    };
 
     # programs.nixcord = {
     #     enable = true;
@@ -148,6 +161,7 @@
 
     stylix.targets.spicetify.enable = true;
     stylix.targets.firefox.profileNames = [ "default"];
+    stylix.targets.zen-browser.profileNames = [ "default" ];
     # stylix.targets.nixcord.enable = true;
     
     programs.spicetify =
diff --git a/home-manager/i3/config b/home-manager/i3/config
index d58db13..554d7bd 100644
--- a/home-manager/i3/config
+++ b/home-manager/i3/config
@@ -93,7 +93,7 @@ bindsym $mod+Shift+s exec --no-startup-id flameshot gui
 bindsym $mod+x exec --no-startup-id "loginctl lock-session"
 bindsym $mod+Shift+x exec --no-startup-id "loginctl lock-session; systemctl suspend"
 # bindsym $mod+Shift+c exec --no-startup-id "~/.i3_commands/open-qb.sh"
-bindsym $mod+c exec --no-startup-id "firefox"
+bindsym $mod+c exec --no-startup-id "zen-twilight"
 bindsym $mod+Shift+c exec --no-startup-id "nyxt"
 bindsym $mod+Shift+minus exec --no-startup-id "emacsclient -c"
 
@@ -105,7 +105,7 @@ bindsym XF86AudioNext exec --no-startup-id playerctl next
 bindsym XF86AudioPrev exec --no-startup-id playerctl previous
 bindxym XF86AudioStop exec --no-startup-id playerctl stop
 
-bindsym $mod+bracketleft exec --no-startup-id playerctl -p firefox play-pause
+bindsym $mod+bracketleft exec --no-startup-id playerctl -p zen-twilight play-pause
 bindsym $mod+bracketright exec --no-startup-id playerctl -p spotify play-pause
 
 #Emoji picker