This repository has no description
0

Configure Feed

Select the types of activity you want to include in your feed.

machines: move barnacle from darwin

+151 -140
+8 -4
flake.nix
··· 83 83 "laptop" 84 84 "focus" 85 85 ]; 86 + barnacle = { 87 + machineClass = "darwin"; 88 + tags = [ 89 + "laptop" 90 + "focus" 91 + ]; 92 + }; 86 93 icarus.tags = [ "laptop" ]; 87 94 prism.tags = [ "server" ]; 88 95 neoprism.tags = [ "server" ]; ··· 120 127 ); 121 128 flake.nixosConfigurations = clan.nixosConfigurations; 122 129 flake.clanInternals = clan.clanInternals; 130 + flake.darwinConfigurations = clan.darwinConfigurations; 123 131 perSystem = 124 132 { 125 133 lib, ··· 157 165 ]; 158 166 }; 159 167 }; 160 - flake.darwinConfigurations.barnacle = inputs.nix-darwin.lib.darwinSystem { 161 - specialArgs.self = self; 162 - modules = [ ./darwin/barnacle/config.nix ]; 163 - }; 164 168 flake.keys = { 165 169 pgp.yubi = { 166 170 key = ./keys/yubi.pgp;
-136
darwin/barnacle/config.nix
··· 1 - { pkgs, self, ... }: 2 - 3 - { 4 - imports = [ 5 - # ./rosetta.nix 6 - self.inputs.nix-index-database.darwinModules.nix-index 7 - ]; 8 - programs.nix-index-database.comma.enable = true; 9 - 10 - nixpkgs.hostPlatform = "aarch64-darwin"; 11 - environment.systemPackages = [ 12 - self.packages.${pkgs.system}.nvim 13 - self.packages.${pkgs.system}.pass 14 - self.packages.${pkgs.system}.passmenu 15 - 16 - # zsh dependencies 17 - pkgs.fzf 18 - pkgs.atuin 19 - 20 - pkgs.gnupg 21 - pkgs.pinentry_mac 22 - pkgs.lazygit 23 - pkgs.sshuttle 24 - pkgs.git 25 - pkgs.element-desktop 26 - pkgs.iterm2 27 - (pkgs.firefox-devedition-bin-unwrapped.overrideAttrs (o: { 28 - meta = o.meta // { 29 - license = pkgs.lib.licenses.free; 30 - }; 31 - })) 32 - pkgs.ripgrep 33 - pkgs.alt-tab-macos 34 - pkgs.zed-editor 35 - pkgs.nixd 36 - pkgs.nil 37 - ]; 38 - 39 - # Use a custom configuration.nix location. 40 - # $ darwin-rebuild switch -I darwin-config=$HOME/.config/nixpkgs/darwin/configuration.nix 41 - # environment.darwinConfig = "$HOME/.config/nixpkgs/darwin/configuration.nix"; 42 - 43 - nix = { 44 - package = pkgs.nix; 45 - settings = { 46 - extra-experimental-features = [ 47 - "nix-command" 48 - "flakes" 49 - ]; 50 - }; 51 - }; 52 - 53 - # homebrew = { 54 - # enable = true; 55 - # casks = [ 56 - # "gpg-suite" 57 - # ]; 58 - # }; 59 - 60 - # keyboard settings 61 - system.keyboard = { 62 - enableKeyMapping = true; 63 - }; 64 - 65 - # Add skhd for keyboard shortcuts 66 - services.skhd = { 67 - enable = true; 68 - skhdConfig = '' 69 - # Open passmenu with Hyper-P 70 - ctrl + shift + alt + cmd - p : /run/current-system/sw/bin/passmenu 71 - ''; 72 - }; 73 - 74 - system.defaults = { 75 - # minimal dock 76 - dock = { 77 - autohide = true; 78 - orientation = "left"; 79 - show-process-indicators = false; 80 - show-recents = false; 81 - static-only = true; 82 - }; 83 - # a finder that tells me what I want to know and lets me work 84 - finder = { 85 - AppleShowAllExtensions = true; 86 - ShowPathbar = true; 87 - FXEnableExtensionChangeWarning = false; 88 - }; 89 - # Tab between form controls and F-row that behaves as F1-F12 90 - NSGlobalDomain = { 91 - AppleKeyboardUIMode = 3; 92 - "com.apple.keyboard.fnState" = true; 93 - }; 94 - }; 95 - 96 - nix.linux-builder.enable = true; 97 - nix.linux-builder.supportedFeatures = [ 98 - "benchmark" 99 - "big-parallel" 100 - "kvm" 101 - "nixos-test" 102 - "uid-range" 103 - ]; 104 - nix.linux-builder.config = { 105 - imports = [ 106 - ../../2configs/container-tests.nix 107 - ]; 108 - }; 109 - 110 - # Create /etc/zshrc that loads the nix-darwin environment. 111 - programs.zsh.enable = true; # default shell on catalina 112 - programs.zsh.shellInit = self.packages.${pkgs.system}.zsh.zshrc; 113 - 114 - # enable sudo touch 115 - security.pam.services.sudo_local.touchIdAuth = true; 116 - 117 - # disable natural scrolling 118 - system.defaults.NSGlobalDomain."com.apple.swipescrolldirection" = false; 119 - programs.direnv.enable = true; 120 - programs.nix-index.enable = true; 121 - programs.gnupg.agent = { 122 - enable = true; 123 - enableSSHSupport = true; 124 - }; 125 - 126 - # Used for backwards compatibility, please read the changelog before changing. 127 - # $ darwin-rebuild changelog 128 - system.stateVersion = 6; 129 - 130 - system.primaryUser = "lassulus"; 131 - # enable ssh in the macos system settings: 132 - # apple -> system settings -> general -> sharing -> remote login 133 - users.users.lassulus.openssh.authorizedKeys.keys = [ 134 - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDIb3uuMqE/xSJ7WL/XpJ6QOj4aSmh0Ga+GtmJl3CDvljGuIeGCKh7YAoqZAi051k5j6ZWowDrcWYHIOU+h0eZCesgCf+CvunlXeUz6XShVMjyZo87f2JPs2Hpb+u/ieLx4wGQvo/Zw89pOly/vqpaX9ZwyIR+U81IAVrHIhqmrTitp+2FwggtaY4FtD6WIyf1hPtrrDecX8iDhnHHuGhATr8etMLwdwQ2kIBx5BBgCoiuW7wXnLUBBVYeO3II957XP/yU82c+DjSVJtejODmRAM/3rk+B7pdF5ShRVVFyB6JJR+Qd1g8iSH+2QXLUy3NM2LN5u5p2oTjUOzoEPWZo7lykZzmIWd/5hjTW9YiHC+A8xsCxQqs87D9HK9hLA6udZ6CGkq4hG/6wFwNjSMnv30IcHZzx6IBihNGbrisrJhLxEiKWpMKYgeemhIirefXA6UxVfiwHg3gJ8BlEBsj0tl/HVARifR2y336YINEn8AsHGhwrPTBFOnBTmfA/VnP1NlWHzXCfVimP6YVvdoGCCnAwvFuJ+ZuxmZ3UzBb2TenZZOzwzV0sUzZk0D1CaSBFJUU3oZNOkDIM6z5lIZgzsyKwb38S8Vs3HYE+Dqpkfsl4yeU5ldc6DwrlVwuSIa4vVus4eWD3gDGFrx98yaqOx17pc4CC9KXk/2TjtJY5xmQ== lass@yubikey" 135 - ]; 136 - }
+143
machines/barnacle/configuration.nix
··· 1 + { pkgs, self, ... }: 2 + 3 + { 4 + imports = [ 5 + # ./rosetta.nix 6 + self.inputs.nix-index-database.darwinModules.nix-index 7 + ]; 8 + clan.core.networking.targetHost = "root@localhost"; 9 + programs.nix-index-database.comma.enable = true; 10 + 11 + nixpkgs.hostPlatform = "aarch64-darwin"; 12 + environment.systemPackages = [ 13 + self.packages.${pkgs.system}.nvim 14 + self.packages.${pkgs.system}.pass 15 + self.packages.${pkgs.system}.passmenu 16 + 17 + # zsh dependencies 18 + pkgs.fzf 19 + pkgs.atuin 20 + 21 + pkgs.gnupg 22 + pkgs.pinentry_mac 23 + pkgs.lazygit 24 + pkgs.sshuttle 25 + pkgs.git 26 + pkgs.element-desktop 27 + pkgs.iterm2 28 + (pkgs.firefox-devedition-bin-unwrapped.overrideAttrs (o: { 29 + meta = o.meta // { 30 + license = pkgs.lib.licenses.free; 31 + }; 32 + })) 33 + pkgs.ripgrep 34 + pkgs.alt-tab-macos 35 + pkgs.zed-editor 36 + pkgs.nixd 37 + pkgs.nil 38 + ]; 39 + 40 + # Use a custom configuration.nix location. 41 + # $ darwin-rebuild switch -I darwin-config=$HOME/.config/nixpkgs/darwin/configuration.nix 42 + # environment.darwinConfig = "$HOME/.config/nixpkgs/darwin/configuration.nix"; 43 + 44 + nix = { 45 + package = pkgs.nix; 46 + settings = { 47 + extra-experimental-features = [ 48 + "nix-command" 49 + "flakes" 50 + ]; 51 + }; 52 + }; 53 + 54 + # homebrew = { 55 + # enable = true; 56 + # casks = [ 57 + # "gpg-suite" 58 + # ]; 59 + # }; 60 + 61 + # keyboard settings 62 + system.keyboard = { 63 + enableKeyMapping = true; 64 + }; 65 + 66 + # Add skhd for keyboard shortcuts 67 + services.skhd = { 68 + enable = true; 69 + skhdConfig = '' 70 + # Open passmenu with Hyper-P 71 + ctrl + shift + alt + cmd - p : /run/current-system/sw/bin/passmenu 72 + ''; 73 + }; 74 + 75 + system.defaults = { 76 + # minimal dock 77 + dock = { 78 + autohide = true; 79 + orientation = "left"; 80 + show-process-indicators = false; 81 + show-recents = false; 82 + static-only = true; 83 + }; 84 + # a finder that tells me what I want to know and lets me work 85 + finder = { 86 + AppleShowAllExtensions = true; 87 + ShowPathbar = true; 88 + FXEnableExtensionChangeWarning = false; 89 + }; 90 + # Tab between form controls and F-row that behaves as F1-F12 91 + NSGlobalDomain = { 92 + AppleKeyboardUIMode = 3; 93 + "com.apple.keyboard.fnState" = true; 94 + }; 95 + }; 96 + 97 + nix.linux-builder.enable = true; 98 + nix.linux-builder.supportedFeatures = [ 99 + "benchmark" 100 + "big-parallel" 101 + "kvm" 102 + "nixos-test" 103 + "uid-range" 104 + ]; 105 + nix.linux-builder.config = { 106 + imports = [ 107 + ../../2configs/container-tests.nix 108 + ]; 109 + }; 110 + 111 + # Create /etc/zshrc that loads the nix-darwin environment. 112 + programs.zsh.enable = true; # default shell on catalina 113 + programs.zsh.shellInit = self.packages.${pkgs.system}.zsh.zshrc; 114 + 115 + # enable sudo touch 116 + security.pam.services.sudo_local.touchIdAuth = true; 117 + 118 + # disable natural scrolling 119 + system.defaults.NSGlobalDomain."com.apple.swipescrolldirection" = false; 120 + programs.direnv.enable = true; 121 + programs.nix-index.enable = true; 122 + programs.gnupg.agent = { 123 + enable = true; 124 + enableSSHSupport = true; 125 + }; 126 + 127 + # Used for backwards compatibility, please read the changelog before changing. 128 + # $ darwin-rebuild changelog 129 + system.stateVersion = 6; 130 + 131 + system.primaryUser = "lassulus"; 132 + 133 + services.openssh.enable = true; 134 + users.users = 135 + let 136 + key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDIb3uuMqE/xSJ7WL/XpJ6QOj4aSmh0Ga+GtmJl3CDvljGuIeGCKh7YAoqZAi051k5j6ZWowDrcWYHIOU+h0eZCesgCf+CvunlXeUz6XShVMjyZo87f2JPs2Hpb+u/ieLx4wGQvo/Zw89pOly/vqpaX9ZwyIR+U81IAVrHIhqmrTitp+2FwggtaY4FtD6WIyf1hPtrrDecX8iDhnHHuGhATr8etMLwdwQ2kIBx5BBgCoiuW7wXnLUBBVYeO3II957XP/yU82c+DjSVJtejODmRAM/3rk+B7pdF5ShRVVFyB6JJR+Qd1g8iSH+2QXLUy3NM2LN5u5p2oTjUOzoEPWZo7lykZzmIWd/5hjTW9YiHC+A8xsCxQqs87D9HK9hLA6udZ6CGkq4hG/6wFwNjSMnv30IcHZzx6IBihNGbrisrJhLxEiKWpMKYgeemhIirefXA6UxVfiwHg3gJ8BlEBsj0tl/HVARifR2y336YINEn8AsHGhwrPTBFOnBTmfA/VnP1NlWHzXCfVimP6YVvdoGCCnAwvFuJ+ZuxmZ3UzBb2TenZZOzwzV0sUzZk0D1CaSBFJUU3oZNOkDIM6z5lIZgzsyKwb38S8Vs3HYE+Dqpkfsl4yeU5ldc6DwrlVwuSIa4vVus4eWD3gDGFrx98yaqOx17pc4CC9KXk/2TjtJY5xmQ== lass@yubikey"; 137 + in 138 + { 139 + lassulus.openssh.authorizedKeys.keys = [ key ]; 140 + root.openssh.authorizedKeys.keys = [ key ]; 141 + }; 142 + 143 + }