From 134a2e3bdfd72e0e35aa6f4dbbdb3a04a09e7942 Mon Sep 17 00:00:00 2001 From: Charles Sirois Date: Thu, 20 Mar 2025 13:20:14 -0400 Subject: [PATCH 01/11] m4 darwin lite --- devices/macbook/configuration.nix | 31 +------------------------------ 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/devices/macbook/configuration.nix b/devices/macbook/configuration.nix index 4068baa..6e31d07 100644 --- a/devices/macbook/configuration.nix +++ b/devices/macbook/configuration.nix @@ -3,30 +3,18 @@ environment.systemPackages = with pkgs; [ # terminal - alacritty ranger (inputs.nixvim.packages.x86_64-darwin.default) # nix home-manager - alejandra nix-output-monitor # work tool git - terraform - doppler - ngrok - awscli2 - pgcli - - # misc - ollama - sl - newsboat (writeShellScriptBin "drs" '' - darwin-rebuild switch --flake ~/.config/nix-darwin + darwin-rebuild switch --flake ~/.config/nixos '') ]; @@ -37,29 +25,12 @@ cleanup = "zap"; }; - brews = [ - "emacs-plus@29" - ]; - casks = [ # internet - "qutebrowser" - "firefox" "spotify" # work "slack" - "tunnelblick" - "dbeaver-community" - "insomnia" - - # 3D - "orcaslicer" - "openscad" - - # Utilities - "flameshot" - "pika" ]; }; From 167d32b6b549980776785617b47295ebc558eb5b Mon Sep 17 00:00:00 2001 From: Charles Sirois Date: Thu, 20 Mar 2025 13:34:09 -0400 Subject: [PATCH 02/11] m4 ousp --- flake.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 6e91eb5..f9f8cd3 100644 --- a/flake.nix +++ b/flake.nix @@ -60,8 +60,10 @@ }; "mbp-m4" = nix-darwin.lib.darwinSystem { modules = [./devices/macbook/configuration.nix]; - specialArgs = {inherit inputs;}; - system = "aarch64-darwin"; + specialArgs = { + inherit inputs; + system = "aarch64-darwin"; + }; }; }; }; From e9826fc958d1e7d588cfecaca0617c055e70c574 Mon Sep 17 00:00:00 2001 From: Charles Sirois Date: Fri, 21 Mar 2025 00:12:04 -0400 Subject: [PATCH 03/11] more macos config --- devices/macbook/configuration.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/devices/macbook/configuration.nix b/devices/macbook/configuration.nix index 6e31d07..20eebe8 100644 --- a/devices/macbook/configuration.nix +++ b/devices/macbook/configuration.nix @@ -4,7 +4,7 @@ environment.systemPackages = with pkgs; [ # terminal ranger - (inputs.nixvim.packages.x86_64-darwin.default) + (inputs.nixvim.packages.${system}.default) # nix home-manager @@ -49,6 +49,19 @@ # Used for backwards compatibility, please read the changelog before changing. # $ darwin-rebuild changelog system.stateVersion = 4; + ids.gids.nixbld = 350; + + system.defaults.dock = { + autohide = true; + persistent-apps = []; + show-recents = false; + static-only = true; + tilesize = 32; + }; + + system.defaults.menuExtraClock = { + Show24Hour = true; + }; # The platform the configuration will be used on. nixpkgs.hostPlatform = system; From 03eba9522d32855a8da05beddbeeed337634653d Mon Sep 17 00:00:00 2001 From: Charles Sirois Date: Fri, 11 Apr 2025 11:04:22 -0400 Subject: [PATCH 04/11] its stable --- devices/macbook/configuration.nix | 43 ++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/devices/macbook/configuration.nix b/devices/macbook/configuration.nix index 20eebe8..0fd578c 100644 --- a/devices/macbook/configuration.nix +++ b/devices/macbook/configuration.nix @@ -1,4 +1,7 @@ -{pkgs, inputs, system, ...}: { +{pkgs, inputs, system, config, ...}: +let + my-emacs = pkgs.emacsNativeComp; +in{ nixpkgs.config.allowUnfree = true; environment.systemPackages = with pkgs; [ @@ -12,6 +15,13 @@ # work tool git + gnupg + (pass.withExtensions (exts: [exts.pass-otp])) + + # emacs + my-emacs + fd + ripgrep (writeShellScriptBin "drs" '' darwin-rebuild switch --flake ~/.config/nixos @@ -25,12 +35,21 @@ cleanup = "zap"; }; + brews = [ + # doom emacs + "fontconfig" + ]; + casks = [ # internet "spotify" + "brave-browser" # work "slack" + + # doom emacs + "font-symbols-only-nerd-font" ]; }; @@ -40,12 +59,18 @@ # Create /etc/zshrc that loads the nix-darwin environment. programs.zsh.enable = true; # default shell on catalina programs.direnv.enable = true; + programs.gnupg.agent.enable = true; services.yabai = { enable = true; }; services.skhd.enable = true; +services.emacs = { + enable = true; + package = my-emacs; +}; + # Used for backwards compatibility, please read the changelog before changing. # $ darwin-rebuild changelog system.stateVersion = 4; @@ -63,6 +88,22 @@ Show24Hour = true; }; + launchd.user.agents.remap-keys = { + serviceConfig = { + ProgramArguments = [ + "/usr/bin/hidutil" + "property" + "--set" + ''{ + "UserKeyMapping":[ + {"HIDKeyboardModifierMappingSrc":0x700000039,"HIDKeyboardModifierMappingDst":0x7000000E7} + ] + }'' + ]; + RunAtLoad = true; + }; + }; + # The platform the configuration will be used on. nixpkgs.hostPlatform = system; } From 0afd1fe82d0613cb58b41fe94710e68640440507 Mon Sep 17 00:00:00 2001 From: Charles Sirois Date: Fri, 11 Apr 2025 11:26:18 -0400 Subject: [PATCH 05/11] vimix added --- devices/macbook/configuration.nix | 2 +- flake.lock | 255 +++++++++++++++++++++++++++++- flake.nix | 1 + 3 files changed, 256 insertions(+), 2 deletions(-) diff --git a/devices/macbook/configuration.nix b/devices/macbook/configuration.nix index 0fd578c..12fb91a 100644 --- a/devices/macbook/configuration.nix +++ b/devices/macbook/configuration.nix @@ -7,7 +7,7 @@ in{ environment.systemPackages = with pkgs; [ # terminal ranger - (inputs.nixvim.packages.${system}.default) + (inputs.vimix.packages.${system}.default) # nix home-manager diff --git a/flake.lock b/flake.lock index f907450..57e4748 100644 --- a/flake.lock +++ b/flake.lock @@ -76,6 +76,42 @@ "type": "github" } }, + "flake-parts_3": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_2" + }, + "locked": { + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_4": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_3" + }, + "locked": { + "lastModified": 1741352980, + "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -94,6 +130,24 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "git-hooks": { "inputs": { "flake-compat": [ @@ -202,6 +256,49 @@ "type": "github" } }, + "mnw": { + "locked": { + "lastModified": 1742255973, + "narHash": "sha256-XfEGVKatTgEMMOVb4SNp1LYLQOSzzrFTDMVDTZFyMVE=", + "owner": "Gerg-L", + "repo": "mnw", + "rev": "b982dbd5e6d55d4438832b3567c09bc2a129649d", + "type": "github" + }, + "original": { + "owner": "Gerg-L", + "repo": "mnw", + "type": "github" + } + }, + "nil": { + "inputs": { + "flake-utils": [ + "vimix", + "nvf", + "flake-utils" + ], + "nixpkgs": [ + "vimix", + "nvf", + "nixpkgs" + ], + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1741118843, + "narHash": "sha256-ggXU3RHv6NgWw+vc+HO4/9n0GPufhTIUjVuLci8Za8c=", + "owner": "oxalica", + "repo": "nil", + "rev": "577d160da311cc7f5042038456a0713e9863d09e", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "nil", + "type": "github" + } + }, "nix-darwin": { "inputs": { "nixpkgs": "nixpkgs" @@ -270,6 +367,33 @@ "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" } }, + "nixpkgs-lib_2": { + "locked": { + "lastModified": 1730504152, + "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=", + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" + } + }, + "nixpkgs-lib_3": { + "locked": { + "lastModified": 1740877520, + "narHash": "sha256-oiwv/ZK/2FhGxrCkQkB83i7GnWXPPLzoqFHpDD3uYpk=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "147dee35aab2193b174e4c0868bd80ead5ce755c", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1730602179, @@ -350,6 +474,38 @@ "type": "github" } }, + "nixpkgs_6": { + "locked": { + "lastModified": 1744098102, + "narHash": "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c8cd81426f45942bb2906d5ed2fe21d2f19d95b7", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_7": { + "locked": { + "lastModified": 1743076231, + "narHash": "sha256-yQugdVfi316qUfqzN8JMaA2vixl+45GxNm4oUfXlbgw=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "6c5963357f3c1c840201eda129a99d455074db04", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "flake-parts": "flake-parts", @@ -420,12 +576,59 @@ "type": "github" } }, + "nvf": { + "inputs": { + "flake-parts": "flake-parts_4", + "flake-utils": "flake-utils_2", + "mnw": "mnw", + "nil": "nil", + "nixpkgs": "nixpkgs_7", + "systems": "systems_3" + }, + "locked": { + "lastModified": 1744192993, + "narHash": "sha256-dvMcjQ2yKD21qnP6ylgo5Gj6d0FYKvATe6S6Zf8X0J4=", + "owner": "notashelf", + "repo": "nvf", + "rev": "67d9aa7cb585b315473b9558c307db5ccdc9f9bb", + "type": "github" + }, + "original": { + "owner": "notashelf", + "repo": "nvf", + "type": "github" + } + }, "root": { "inputs": { "nix-darwin": "nix-darwin", "nixpkgs": "nixpkgs_2", "nixvim": "nixvim", - "sops-nix": "sops-nix" + "sops-nix": "sops-nix", + "vimix": "vimix" + } + }, + "rust-overlay": { + "inputs": { + "nixpkgs": [ + "vimix", + "nvf", + "nil", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1741055476, + "narHash": "sha256-52vwEV0oS2lCnx3c/alOFGglujZTLmObit7K8VblnS8=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "aefb7017d710f150970299685e8d8b549d653649", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" } }, "sops-nix": { @@ -462,6 +665,36 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -483,6 +716,26 @@ "repo": "treefmt-nix", "type": "github" } + }, + "vimix": { + "inputs": { + "flake-parts": "flake-parts_3", + "nixpkgs": "nixpkgs_6", + "nvf": "nvf" + }, + "locked": { + "lastModified": 1744385003, + "narHash": "sha256-VIhdEw/Wa2ZNSvXb20xueZg4+SQdiXqS630Z5w5WwCU=", + "owner": "Polensky", + "repo": "vimix", + "rev": "5184ad48e36dc2dc2d4ab24a6d05674fa710d159", + "type": "github" + }, + "original": { + "owner": "Polensky", + "repo": "vimix", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index f9f8cd3..d08c1ff 100644 --- a/flake.nix +++ b/flake.nix @@ -5,6 +5,7 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nix-darwin.url = "github:LnL7/nix-darwin"; nixvim.url = "github:Polensky/nixvim"; + vimix.url = "github:Polensky/vimix"; sops-nix.url = "github:Mic92/sops-nix"; }; From 8108ea819715d51e714f04b49e2f0eba04896dd2 Mon Sep 17 00:00:00 2001 From: Charles Sirois Date: Fri, 11 Apr 2025 11:55:19 -0400 Subject: [PATCH 06/11] tweaking --- devices/macbook/configuration.nix | 129 ++++++++++++++++-------------- 1 file changed, 68 insertions(+), 61 deletions(-) diff --git a/devices/macbook/configuration.nix b/devices/macbook/configuration.nix index 12fb91a..c21a04f 100644 --- a/devices/macbook/configuration.nix +++ b/devices/macbook/configuration.nix @@ -1,108 +1,115 @@ -{pkgs, inputs, system, config, ...}: -let - my-emacs = pkgs.emacsNativeComp; -in{ +{ + pkgs, + inputs, + system, + config, + ... +}: let + my-emacs = pkgs.emacsNativeComp; +in { nixpkgs.config.allowUnfree = true; environment.systemPackages = with pkgs; [ - # terminal + # terminal ranger - (inputs.vimix.packages.${system}.default) + (inputs.vimix.packages.${system}.default) - # nix + # nix home-manager - nix-output-monitor + nix-output-monitor - # work tool - git - gnupg + # work tool + doppler + docker + git + gnupg (pass.withExtensions (exts: [exts.pass-otp])) - # emacs - my-emacs - fd - ripgrep + # emacs + my-emacs + fd + ripgrep - (writeShellScriptBin "drs" '' + (writeShellScriptBin "drs" '' darwin-rebuild switch --flake ~/.config/nixos '') ]; - homebrew = { - enable = true; - onActivation = { - autoUpdate = true; - cleanup = "zap"; - }; + homebrew = { + enable = true; + onActivation = { + autoUpdate = true; + cleanup = "zap"; + }; - brews = [ - # doom emacs - "fontconfig" - ]; + brews = [ + # doom emacs + "fontconfig" + ]; - casks = [ - # internet - "spotify" - "brave-browser" + casks = [ + # internet + "spotify" + "brave-browser" - # work - "slack" + # work + "slack" - # doom emacs - "font-symbols-only-nerd-font" - ]; - }; + # doom emacs + "font-symbols-only-nerd-font" + ]; + }; # Necessary for using flakes on this system. nix.settings.experimental-features = "nix-command flakes"; # Create /etc/zshrc that loads the nix-darwin environment. programs.zsh.enable = true; # default shell on catalina - programs.direnv.enable = true; - programs.gnupg.agent.enable = true; + programs.direnv.enable = true; + programs.gnupg.agent.enable = true; services.yabai = { enable = true; }; services.skhd.enable = true; -services.emacs = { - enable = true; - package = my-emacs; -}; + services.emacs = { + enable = true; + package = my-emacs; + }; # Used for backwards compatibility, please read the changelog before changing. # $ darwin-rebuild changelog system.stateVersion = 4; - ids.gids.nixbld = 350; - - system.defaults.dock = { - autohide = true; - persistent-apps = []; - show-recents = false; - static-only = true; - tilesize = 32; - }; + ids.gids.nixbld = 350; - system.defaults.menuExtraClock = { - Show24Hour = true; - }; + system.defaults.dock = { + autohide = true; + persistent-apps = []; + show-recents = false; + static-only = true; + tilesize = 32; + }; - launchd.user.agents.remap-keys = { + system.defaults.menuExtraClock = { + Show24Hour = true; + }; + + launchd.user.agents.remap-keys = { serviceConfig = { ProgramArguments = [ "/usr/bin/hidutil" "property" "--set" - ''{ - "UserKeyMapping":[ - {"HIDKeyboardModifierMappingSrc":0x700000039,"HIDKeyboardModifierMappingDst":0x7000000E7} - ] - }'' + '' { + "UserKeyMapping":[ + {"HIDKeyboardModifierMappingSrc":0x700000039,"HIDKeyboardModifierMappingDst":0x7000000E7} + ] + }'' ]; RunAtLoad = true; }; - }; + }; # The platform the configuration will be used on. nixpkgs.hostPlatform = system; From a6a38afc44bf07989b704f694256d1b03efc9909 Mon Sep 17 00:00:00 2001 From: Charles Sirois Date: Fri, 11 Apr 2025 15:14:42 -0400 Subject: [PATCH 07/11] vpn/docker/update vim --- devices/macbook/configuration.nix | 2 ++ flake.lock | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/devices/macbook/configuration.nix b/devices/macbook/configuration.nix index c21a04f..f2c75a4 100644 --- a/devices/macbook/configuration.nix +++ b/devices/macbook/configuration.nix @@ -21,6 +21,7 @@ in { # work tool doppler docker + colima git gnupg (pass.withExtensions (exts: [exts.pass-otp])) @@ -54,6 +55,7 @@ in { # work "slack" + "tunnelblick" # doom emacs "font-symbols-only-nerd-font" diff --git a/flake.lock b/flake.lock index 57e4748..ac2fcf0 100644 --- a/flake.lock +++ b/flake.lock @@ -724,11 +724,11 @@ "nvf": "nvf" }, "locked": { - "lastModified": 1744385003, - "narHash": "sha256-VIhdEw/Wa2ZNSvXb20xueZg4+SQdiXqS630Z5w5WwCU=", + "lastModified": 1744398462, + "narHash": "sha256-8MHVlpsu8qjFUtE+yA2HHd9+drLvlTsYKDrdgTq09GY=", "owner": "Polensky", "repo": "vimix", - "rev": "5184ad48e36dc2dc2d4ab24a6d05674fa710d159", + "rev": "3def73fd2a1480fc0429a579743c2a1181d65edb", "type": "github" }, "original": { From 4235624227fd06b5bd5109f47241dfd6f130a9ab Mon Sep 17 00:00:00 2001 From: Charles Sirois Date: Tue, 15 Apr 2025 10:23:55 -0400 Subject: [PATCH 08/11] added dbeaver --- devices/macbook/configuration.nix | 1 + flake.lock | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/devices/macbook/configuration.nix b/devices/macbook/configuration.nix index f2c75a4..bdcaa74 100644 --- a/devices/macbook/configuration.nix +++ b/devices/macbook/configuration.nix @@ -56,6 +56,7 @@ in { # work "slack" "tunnelblick" + "dbeaver-community" # doom emacs "font-symbols-only-nerd-font" diff --git a/flake.lock b/flake.lock index ac2fcf0..f0762b0 100644 --- a/flake.lock +++ b/flake.lock @@ -724,11 +724,11 @@ "nvf": "nvf" }, "locked": { - "lastModified": 1744398462, - "narHash": "sha256-8MHVlpsu8qjFUtE+yA2HHd9+drLvlTsYKDrdgTq09GY=", + "lastModified": 1744641981, + "narHash": "sha256-kez41korUoJ4TKqmp5e4y9uGzyzujPpDhGx7bS1ARnI=", "owner": "Polensky", "repo": "vimix", - "rev": "3def73fd2a1480fc0429a579743c2a1181d65edb", + "rev": "395d710a17980a323e6fe2efe261ee9d9afce535", "type": "github" }, "original": { From 5341a33c73c3410f60b0b5f2a7b7e269aede7abc Mon Sep 17 00:00:00 2001 From: Charles Sirois Date: Tue, 15 Apr 2025 13:26:47 -0400 Subject: [PATCH 09/11] updated vimix --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index f0762b0..cde1176 100644 --- a/flake.lock +++ b/flake.lock @@ -724,11 +724,11 @@ "nvf": "nvf" }, "locked": { - "lastModified": 1744641981, - "narHash": "sha256-kez41korUoJ4TKqmp5e4y9uGzyzujPpDhGx7bS1ARnI=", + "lastModified": 1744737914, + "narHash": "sha256-JL4mYFY4w3xopvl2McBRdmEJwZBlLLkJSuTJXNEHkeY=", "owner": "Polensky", "repo": "vimix", - "rev": "395d710a17980a323e6fe2efe261ee9d9afce535", + "rev": "a5b9ae2f4db89220d486759637dff88e478c0f27", "type": "github" }, "original": { From 1b218a77d4b309bc54a8a26efceb42b8ca63e785 Mon Sep 17 00:00:00 2001 From: Charles Sirois Date: Mon, 21 Apr 2025 12:49:17 -0400 Subject: [PATCH 10/11] updated vimix --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index cde1176..614e4d7 100644 --- a/flake.lock +++ b/flake.lock @@ -724,11 +724,11 @@ "nvf": "nvf" }, "locked": { - "lastModified": 1744737914, - "narHash": "sha256-JL4mYFY4w3xopvl2McBRdmEJwZBlLLkJSuTJXNEHkeY=", + "lastModified": 1745254050, + "narHash": "sha256-FvRti3ZriGkmYfEgZgjM7HEQaIt3dfq4GQFk0FPxuoE=", "owner": "Polensky", "repo": "vimix", - "rev": "a5b9ae2f4db89220d486759637dff88e478c0f27", + "rev": "a52b216b8c410674270a1da5a282ff479a04056f", "type": "github" }, "original": { From 7037d038de606f5d7a43f75d0b66e74f354d7b93 Mon Sep 17 00:00:00 2001 From: Charles Sirois Date: Thu, 5 Jun 2025 09:40:52 -0400 Subject: [PATCH 11/11] upgrade / claude / entertainment --- devices/macbook/configuration.nix | 12 ++++++++++-- flake.lock | 6 +++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/devices/macbook/configuration.nix b/devices/macbook/configuration.nix index bdcaa74..437f908 100644 --- a/devices/macbook/configuration.nix +++ b/devices/macbook/configuration.nix @@ -52,19 +52,27 @@ in { # internet "spotify" "brave-browser" + "qutebrowser" + "stremio" # work "slack" "tunnelblick" "dbeaver-community" + "claude" # doom emacs "font-symbols-only-nerd-font" ]; }; - # Necessary for using flakes on this system. - nix.settings.experimental-features = "nix-command flakes"; + nix = { + # Necessary for using flakes on this system. + settings.experimental-features = "nix-command flakes"; + extraOptions = '' + extra-platforms = x86_64-darwin aarm64-darwin + ''; + }; # Create /etc/zshrc that loads the nix-darwin environment. programs.zsh.enable = true; # default shell on catalina diff --git a/flake.lock b/flake.lock index 614e4d7..d50f048 100644 --- a/flake.lock +++ b/flake.lock @@ -724,11 +724,11 @@ "nvf": "nvf" }, "locked": { - "lastModified": 1745254050, - "narHash": "sha256-FvRti3ZriGkmYfEgZgjM7HEQaIt3dfq4GQFk0FPxuoE=", + "lastModified": 1746063845, + "narHash": "sha256-i/WX1doZKzbgLVKK5kQUtumiWWzgBm8XFJNTvj94E04=", "owner": "Polensky", "repo": "vimix", - "rev": "a52b216b8c410674270a1da5a282ff479a04056f", + "rev": "b4f2a13777e8922685adf3b1f966dd28460e0ace", "type": "github" }, "original": {