diff --git a/flake.lock b/flake.lock index 6141529..982ba78 100644 --- a/flake.lock +++ b/flake.lock @@ -90,64 +90,6 @@ "type": "github" } }, - "nix-rosetta-builder": { - "inputs": { - "nixos-generators": "nixos-generators", - "nixpkgs": [ - "nixpkgs-darwin" - ] - }, - "locked": { - "lastModified": 1756177999, - "narHash": "sha256-aSbB7/jrt7ujiJ55f2uGhOo+usGxVSkqbAMVgg2jDls=", - "owner": "cpick", - "repo": "nix-rosetta-builder", - "rev": "ebb7162a975074fb570a2c3ac02bc543ff2e9df4", - "type": "github" - }, - "original": { - "owner": "cpick", - "repo": "nix-rosetta-builder", - "type": "github" - } - }, - "nixlib": { - "locked": { - "lastModified": 1736643958, - "narHash": "sha256-tmpqTSWVRJVhpvfSN9KXBvKEXplrwKnSZNAoNPf/S/s=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "1418bc28a52126761c02dd3d89b2d8ca0f521181", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixos-generators": { - "inputs": { - "nixlib": "nixlib", - "nixpkgs": [ - "nix-rosetta-builder", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1737057290, - "narHash": "sha256-3Pe0yKlCc7EOeq1X/aJVDH0CtNL+tIBm49vpepwL1MQ=", - "owner": "nix-community", - "repo": "nixos-generators", - "rev": "d002ce9b6e7eb467cd1c6bb9aef9c35d191b5453", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixos-generators", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1764522689, @@ -260,7 +202,6 @@ "agenix": "agenix", "home-manager": "home-manager", "nix-darwin": "nix-darwin", - "nix-rosetta-builder": "nix-rosetta-builder", "nixpkgs": "nixpkgs", "nixpkgs-darwin": "nixpkgs-darwin", "nixpkgs-unstable": "nixpkgs-unstable", diff --git a/flake.nix b/flake.nix index 59c9ce0..bbd1632 100644 --- a/flake.nix +++ b/flake.nix @@ -44,15 +44,11 @@ url = "github:LnL7/nix-darwin/nix-darwin-25.11"; inputs.nixpkgs.follows = "nixpkgs-darwin"; }; - nix-rosetta-builder = { - url = "github:cpick/nix-rosetta-builder"; - inputs.nixpkgs.follows = "nixpkgs-darwin"; - }; }; outputs = { self, nix-darwin, nixpkgs, nixpkgs-darwin, nixpkgs-unstable - , home-manager, agenix, rycee-nurpkgs, nur, plasma-manager, quadlet-nix - , nix-rosetta-builder, ... }: + , home-manager, agenix, rycee-nurpkgs, nur, plasma-manager, quadlet-nix, ... + }: let mkHomeConfiguration = { hostname, arch ? "x86_64", os ? "linux" , desktop ? false, extraModules ? [ ] }: @@ -123,11 +119,8 @@ }; agenix = agenix; }; - modules = [ - ./systems/darwin/corianne.nix - agenix.darwinModules.default - nix-rosetta-builder.darwinModules.default - ]; + modules = + [ ./systems/darwin/corianne.nix agenix.darwinModules.default ]; }; nixosConfigurations = { diff --git a/homes/desktop.nix b/homes/desktop.nix index 255db78..7b1b2ad 100644 --- a/homes/desktop.nix +++ b/homes/desktop.nix @@ -22,7 +22,6 @@ nil nixd nixfmt-classic - nixos-rebuild quarto roboto-slab shellcheck diff --git a/programs/zed.nix b/programs/zed.nix index b3f7fd6..19beb45 100644 --- a/programs/zed.nix +++ b/programs/zed.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: { +{ ... }: { programs.zed-editor = { enable = true; extensions = [ @@ -58,22 +58,6 @@ initialization_options.formatting.command = [ "nixfmt" ]; settings.nix.flake.autoArchive = true; }; - texlab = { - settings = { - build = { - onSave = false; - forwardSearchAfter = true; - }; - forwardSearch = if pkgs.stdenv.hostPlatform.isDarwin then { - executable = - "/Applications/Skim.app/Contents/SharedSupport/displayline"; - args = [ "-r" "%l" "%p" "%f" "-g" ]; - } else { - executable = "/usr/bin/okular"; - args = [ "--unique" "file:%p#src:%l%f" ]; - }; - }; - }; tinymist = { settings = { exportPdf = "onSave"; @@ -97,12 +81,5 @@ ui_font_size = 16; wrap_guides = [ 80 92 120 ]; }; - userTasks = [{ - label = "latexmk (project)"; - command = "latexmk"; - args = [ "-synctex=1" "-pdf" "-recorder" ]; - cwd = "$ZED_DIRNAME"; - tags = [ "latex-build" ]; - }]; }; } diff --git a/systems/darwin/corianne.nix b/systems/darwin/corianne.nix index f1c1eb2..dea0f34 100644 --- a/systems/darwin/corianne.nix +++ b/systems/darwin/corianne.nix @@ -26,27 +26,9 @@ in { }; # Auto upgrade nix package and the daemon service. - nix = { - enable = true; - gc = { - automatic = true; - interval = { Weekday = 1; }; - options = '' - --delete-older-than 14d - ''; - }; - # Needed for rosetta-builder, see - # - # - linux-builder = { - enable = true; - ephemeral = true; - }; - extraOptions = '' - extra-platforms = x86_64-darwin - ''; - }; - nix-rosetta-builder.onDemand = true; + nix.enable = true; + #services.nix-daemon.tempDir = "/nix/tmp"; + nix.package = pkgs.nix; # Create /etc/zshrc that loads the nix-darwin environment. programs.zsh.enable = true; # default shell on catalina @@ -224,7 +206,6 @@ in { "rig" "rstudio" "signal" - "skim" "slack" "stats" "steam"