m

5 files changed, 24 insertions, 10 deletions

diff --git a/flake.nix b/flake.nix
index 507b303..07142b4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,8 +3,9 @@
   description = "Master flake";
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05";
-    nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-24.05-darwin";
+    nixpkgs-old.url = "github:nixos/nixpkgs/nixos-24.11";
+    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.05";
+    nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-25.05-darwin";
     nixpkgs-unfree.url = "github:numtide/nixpkgs-unfree?ref=nixos-unstable";
     nix-darwin = {
       url = "github:lnl7/nix-darwin";
@@ -27,11 +28,11 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    # claude-desktop = {
-    #   url = "git:file:/home/y/code/nix/claude-desktop-linux-flake";
-    #   inputs.nixpkgs.follows = "nixpkgs";
-    #   inputs.flake-utils.follows = "flake-utils";
-    # };
+    claude-desktop = {
+      url = "git:file:/home/y/code/nix/claude-desktop-linux-flake";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-utils.follows = "flake-utils";
+    };
     agenix = {
       url = "github:yaxitech/ragenix";
       inputs.nixpkgs.follows = "nixpkgs";
diff --git a/hosts/local/gui.nix b/hosts/local/gui.nix
index 73b89a3..922c55b 100644
--- a/hosts/local/gui.nix
+++ b/hosts/local/gui.nix
@@ -30,7 +30,6 @@
     brave
     firefox
     # librewolf
-    vivaldi
     chromium
     # mail
     thunderbird
diff --git a/hosts/local/master/configuration.nix b/hosts/local/master/configuration.nix
index 20c25e3..2a3cc8a 100644
--- a/hosts/local/master/configuration.nix
+++ b/hosts/local/master/configuration.nix
@@ -1,7 +1,16 @@
 # Edit this configuration file to define what should be installed on
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
-{pkgs, ...}: {
+{
+  pkgs,
+  inputs,
+  ...
+}: let
+  old-pkgs = import inputs.nixpkgs-old {
+    system = pkgs.system;
+    config.allowUnfree = true;
+  };
+in {
   imports = [
     # Include the results of the hardware scan.
     ../../base.nix
@@ -53,6 +62,7 @@
   #
   #
   environment.systemPackages = [
+    old-pkgs.vivaldi
     # for AI IDE shit
     # pkgs.nodejs
     # pkgs.python312
diff --git a/hosts/pkgs.nix b/hosts/pkgs.nix
index a084f51..8be4a62 100644
--- a/hosts/pkgs.nix
+++ b/hosts/pkgs.nix
@@ -67,6 +67,11 @@
       # aider-chat
       # inputs.yek.packages.x86_64-linux.default
       # python312Packages.google-generativeai
+      codex
+      claude-code
+      nushell
+
+      # argh
     ]
     ++ lib.optionals pkgs.stdenv.isLinux [
       # linuxKernel.packages.linux_latest_libre.cpupower
diff --git a/hosts/unfree.nix b/hosts/unfree.nix
index 803c04d..8fbf3c4 100644
--- a/hosts/unfree.nix
+++ b/hosts/unfree.nix
@@ -14,7 +14,6 @@
   environment.systemPackages = with pkgs; [
     # opera
     spotify
-    microsoft-edge
     vscode
     # fonts
     corefonts