diff --git a/apps/x86_64-linux/build-switch b/apps/x86_64-linux/build-switch index 58b2bdd..3ca4eb1 100755 --- a/apps/x86_64-linux/build-switch +++ b/apps/x86_64-linux/build-switch @@ -33,12 +33,11 @@ fi print_success "Build completed" -# Switch - note this requires sudo permissions -print_info "Switching to new configuration (requires sudo)..." +print_info "Switching to new configuration..." if [[ "$EUID" -ne 0 ]]; then sudo nixos-rebuild switch --flake ".#$HOSTNAME" "${@:2}" else nixos-rebuild switch --flake ".#$HOSTNAME" "${@:2}" fi -print_success "Build and switch completed successfully" \ No newline at end of file +print_success "Build and switch completed successfully" diff --git a/flake.lock b/flake.lock index 795a782..5c516eb 100644 --- a/flake.lock +++ b/flake.lock @@ -130,7 +130,9 @@ }, "home-manager": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1757475826, @@ -242,16 +244,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1757068644, - "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=", - "owner": "NixOS", + "lastModified": 1757493204, + "narHash": "sha256-bwg0O7Xo/T7aTWp0zicklTonSULI33Y1LMsqFBmTIf8=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9", + "rev": "f9e9d45a64c8ff4e9906260804a1679a28819b4e", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-unstable", + "owner": "nixos", + "ref": "master", "repo": "nixpkgs", "type": "github" } @@ -272,22 +274,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1757493204, - "narHash": "sha256-bwg0O7Xo/T7aTWp0zicklTonSULI33Y1LMsqFBmTIf8=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "f9e9d45a64c8ff4e9906260804a1679a28819b4e", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "master", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1757034884, "narHash": "sha256-PgLSZDBEWUHpfTRfFyklmiiLBE1i1aGCtz4eRA3POao=", @@ -303,7 +289,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1754800730, "narHash": "sha256-HfVZCXic9XLBgybP0318ym3cDnGwBs/+H5MgxFVYF4I=", @@ -322,7 +308,7 @@ "nixvim": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "nuschtosSearch": "nuschtosSearch", "systems": "systems_2" }, @@ -372,7 +358,7 @@ "homebrew-cask": "homebrew-cask", "homebrew-core": "homebrew-core", "nix-homebrew": "nix-homebrew", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nixvim": "nixvim", "sops-nix": "sops-nix", "zjstatus": "zjstatus" @@ -468,7 +454,7 @@ "inputs": { "crane": "crane", "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "rust-overlay": "rust-overlay" }, "locked": { diff --git a/flake.nix b/flake.nix index 058bff3..55264d0 100644 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,10 @@ url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; - home-manager.url = "github:nix-community/home-manager"; + home-manager = { + url = "github:nix-community/home-manager"; + inputs.nixpkgs.follows = "nixpkgs"; + }; darwin = { url = "github:LnL7/nix-darwin/master"; inputs.nixpkgs.follows = "nixpkgs"; @@ -94,6 +97,18 @@ (final: prev: { zjstatus = inputs.zjstatus.packages.${prev.system}.default; }) + (_: prev: { + tailscale = prev.tailscale.overrideAttrs (old: { + checkFlags = + builtins.map ( + flag: + if prev.lib.hasPrefix "-skip=" flag + then flag + "|^TestGetList$|^TestIgnoreLocallyBoundPorts$|^TestPoller$" + else flag + ) + old.checkFlags; + }); + }) ]; } ./hosts/nixos/${hostname} diff --git a/hosts/nixos/tahani/default.nix b/hosts/nixos/tahani/default.nix index 0e2e714..f22657c 100644 --- a/hosts/nixos/tahani/default.nix +++ b/hosts/nixos/tahani/default.nix @@ -1,5 +1,4 @@ { - pkgs, hostname, user, ... @@ -8,25 +7,6 @@ ../../../modules/nixos ]; - boot = { - loader = { - systemd-boot = { - enable = true; - configurationLimit = 42; - }; - efi.canTouchEfiVariables = true; - }; - initrd.availableKernelModules = [ - "xhci_pci" - "ahci" - "nvme" - "usbhid" - "usb_storage" - "sd_mod" - ]; - kernelPackages = pkgs.linuxPackages_latest; - }; - fileSystems."/" = { device = "/dev/disk/by-label/NIXROOT"; fsType = "ext4"; diff --git a/modules/darwin/default.nix b/modules/darwin/default.nix index 0e3afae..9c38498 100644 --- a/modules/darwin/default.nix +++ b/modules/darwin/default.nix @@ -62,7 +62,7 @@ enable = true; username = user; entries = [ - {path = "/Applications/Safari.app/";} + {path = "/Applications/Orion.app/";} {path = "/${pkgs.ghostty-bin}/Applications/Ghostty.app/";} {path = "/System/Applications/Notes.app/";} {path = "/System/Applications/Music.app/";} diff --git a/modules/darwin/homebrew.nix b/modules/darwin/homebrew.nix index c464765..9a6405e 100644 --- a/modules/darwin/homebrew.nix +++ b/modules/darwin/homebrew.nix @@ -2,7 +2,7 @@ homebrew = { enable = true; casks = [ - "orbstack" + "orion" ]; masApps = { "wipr2" = 1662217862; diff --git a/modules/darwin/packages.nix b/modules/darwin/packages.nix index 388805b..310a2a6 100644 --- a/modules/darwin/packages.nix +++ b/modules/darwin/packages.nix @@ -2,8 +2,9 @@ with pkgs; [ _1password-gui dockutil - xcodes mas raycast + tailscale + xcodes # whatsapp-for-mac ] diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 9917f6f..51f8620 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -27,6 +27,25 @@ nixPath = ["nixos-config=/home/${user}/.local/share/src/nixos-config:/etc/nixos"]; }; + boot = { + loader = { + systemd-boot = { + enable = true; + configurationLimit = 42; + }; + efi.canTouchEfiVariables = true; + }; + initrd.availableKernelModules = [ + "xhci_pci" + "ahci" + "nvme" + "usbhid" + "usb_storage" + "sd_mod" + ]; + kernelPackages = pkgs.linuxPackages_latest; + }; + users.users = { ${user} = { isNormalUser = true; diff --git a/modules/packages.sync-conflict-20250904-133614-N7W6SUT.nix b/modules/packages.sync-conflict-20250904-133614-N7W6SUT.nix deleted file mode 100644 index 72d4bd0..0000000 --- a/modules/packages.sync-conflict-20250904-133614-N7W6SUT.nix +++ /dev/null @@ -1,38 +0,0 @@ -{pkgs, ...}: -with pkgs; [ - (callPackage ./bin/open-project.nix {}) - age - alejandra - nodejs_24 - pnpm - ast-grep - delta - devenv - dig - docker - docker-compose - fastfetch - fd - fira-code - gh - git - gnumake - gnupg - htop - hyperfine - jjui - jq - killall - lsof - nurl - openssh - postgresql_17 - sd - sops - sqlite - tree - tree-sitter - unzip - vivid - zip -]