diff --git a/darwin.nix b/darwin.nix index 229a61a..a364221 100644 --- a/darwin.nix +++ b/darwin.nix @@ -3,7 +3,6 @@ system.stateVersion = 4; nixpkgs.hostPlatform = "aarch64-darwin"; nixpkgs.config.allowUnfree = true; - services.nix-daemon.enable = true; users.users.clark = { name = "clark"; diff --git a/flake.nix b/flake.nix index c56cc9c..0a9519d 100644 --- a/flake.nix +++ b/flake.nix @@ -107,5 +107,16 @@ format = "iso"; }; }; + + packages.aarch64-darwin = { + iso = nixos-generators.nixosGenerate { + system = "x86_64-linux"; + modules = modules ++ [{ + nix.registry.nixpkgs.flake = nixpkgs; + virtualisation.diskSize = 20 * 1024; + }]; + format = "iso"; + }; + }; }; } diff --git a/home.nix b/home.nix index 2b6009d..c164690 100644 --- a/home.nix +++ b/home.nix @@ -151,6 +151,7 @@ in url = "https://raw.githubusercontent.com/samholmes/whiskers/main/whiskers.png"; hash = "sha256-By6sRGNyK5Myk608crIO2vrnixZ0dJjoW26Y1I23Dto="; }; + ".sqliterc".text = ".mode column"; }; programs.fish = { @@ -163,10 +164,10 @@ in programs.vscode = { enable = true; - enableUpdateCheck = false; + profiles.default.enableUpdateCheck = false; + profiles.default.userSettings = (import ./vscode-settings.nix) { inherit pkgs; }; # i prefer to let vscode manage stuff mutableExtensionsDir = true; - userSettings = (import ./vscode-settings.nix) { inherit pkgs; }; }; programs.neovim = { diff --git a/init.el.nix b/init.el.nix index 6d37535..d2c6536 100644 --- a/init.el.nix +++ b/init.el.nix @@ -541,7 +541,8 @@ If the new path's directories does not exist, create them." ;; Configure hooks to automatically turn-on eglot for selected modes :hook ; (((python-mode ruby-mode) . eglot)) - ((elixir-ts-mode . eglot-ensure)) + ((elixir-ts-mode . eglot-ensure) + (rust-mode . eglot-ensure)) :custom ;; let's try a higher idle time, elixir-ls is a bit finicky @@ -552,6 +553,10 @@ If the new path's directories does not exist, create them." ;; Sometimes you need to tell Eglot where to find the language server (add-to-list 'eglot-server-programs '(elixir-ts-mode "${pkgs.elixir-ls}/bin/elixir-ls")) + ; i could nixify the rust-analyzer bin path buuuut + (add-to-list 'eglot-server-programs + '((rust-ts-mode rust-mode) . + ("rust-analyzer" :initializationOptions (:check (:command "clippy"))))) ) ; oorg