Merge conflict

work
Matthew Ess 2022-08-09 19:56:18 -04:00
parent fcb986f46e
commit 0ab9c66cf2
5 changed files with 52 additions and 12 deletions

View File

@ -127,7 +127,7 @@
matbook = darwinSystem { matbook = darwinSystem {
system = "aarch64-darwin"; system = "aarch64-darwin";
modules = nixDarwinCommonModules ++ [ modules = nixDarwinCommonModules ++ [
{ ({ pkgs, ... }: {
users.primaryUser = "mat"; users.primaryUser = "mat";
networking.computerName = "matbook pro m1"; networking.computerName = "matbook pro m1";
networking.hostName = "matbook"; networking.hostName = "matbook";
@ -137,19 +137,28 @@
nix.buildCores = 2; nix.buildCores = 2;
nix.maxJobs = 4; nix.maxJobs = 4;
environment.systemPackages = with pkgs; [
vscodium
];
games.enable = true; games.enable = true;
home-manager.sharedModules = [{ home-manager.sharedModules = [{
programs.git.userEmail = "mat@mat.services"; programs.git.userEmail = "mat@mat.services";
programs.git.userName = "mat ess"; programs.git.userName = "mat ess";
programs.ssh.matchBlocks.remarkable = {
hostname = "10.11.99.1";
user = "root";
port = 22;
};
programs.vscode.package = pkgs.vscodium;
}]; }];
} })
]; ];
}; };
yelpbook-m1 = darwinSystem { yelpbook-m1 = darwinSystem {
system = "aarch64-darwin"; system = "aarch64-darwin";
modules = nixDarwinCommonModules ++ [ modules = nixDarwinCommonModules ++ [
{ ({ pkgs, ... }: {
users.primaryUser = "mess"; users.primaryUser = "mess";
networking.knownNetworkServices = [ networking.knownNetworkServices = [
"Wi-Fi" "Wi-Fi"
@ -158,11 +167,24 @@
nix.maxJobs = 5; nix.maxJobs = 5;
games.enable = false; games.enable = false;
environment.systemPackages = with pkgs; [
yubiswitch
vscode
];
homebrew.casks = [ "itsycal" ];
home-manager.sharedModules = [{ home-manager.sharedModules = [{
programs.git.userEmail = "mess@yelp.com"; programs.git.userEmail = "mess@yelp.com";
programs.git.userName = "Matthew Ess"; programs.git.userName = "Matthew Ess";
programs.ssh.matchBlocks.devbox = {
hostname = "amp1";
forwardAgent = true;
serverAliveInterval = 120;
};
programs.fish.functions.devbox.body = ''
ssh -t devbox "agenttmux attach; or agenttmux new -s yelp"
'';
}]; }];
} })
]; ];
}; };

View File

@ -14,6 +14,7 @@
baseDir="$HOME/Applications/Home Manager Apps" baseDir="$HOME/Applications/Home Manager Apps"
rsyncArgs="--archive --checksum --chmod=-w --copy-unsafe-links --delete" rsyncArgs="--archive --checksum --chmod=-w --copy-unsafe-links --delete"
$DRY_RUN_CMD mkdir -p "$baseDir" $DRY_RUN_CMD mkdir -p "$baseDir"
$DRY_RUN_CMD sudo rm -rf "$baseDir"/*
$DRY_RUN_CMD sudo ${pkgs.rsync}/bin/rsync ''${VERBOSE_ARG:+-v} $rsyncArgs "$appsSrc" "$baseDir" $DRY_RUN_CMD sudo ${pkgs.rsync}/bin/rsync ''${VERBOSE_ARG:+-v} $rsyncArgs "$appsSrc" "$baseDir"
fi fi
''; '';

View File

@ -67,19 +67,13 @@
matchBlocks."*".extraOptions = { matchBlocks."*".extraOptions = {
UseKeychain = "yes"; UseKeychain = "yes";
AddKeysToAgent = "yes"; AddKeysToAgent = "yes";
# IdentityFile = "~/.ssh/id_ed25519"; # TODO: gate this behind a check if the cask is present
IdentityAgent = "~/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/socket.ssh"; IdentityAgent = "~/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/socket.ssh";
}; };
matchBlocks.remarkable = {
hostname = "10.11.99.1";
user = "root";
port = 22;
};
}; };
# vscode # vscode
vscode = with pkgs; { vscode = {
enable = true; enable = true;
package = vscodium;
# extensions = [ pijul-vscode ]; # extensions = [ pijul-vscode ];
}; };
}; };

View File

@ -9,6 +9,7 @@ let
"luar" "luar"
"smarttab-kak" "smarttab-kak"
"kakoune-sudo-write" "kakoune-sudo-write"
"yubiswitch"
]; ];
in in
genAttrs pkgs buildPkg genAttrs pkgs buildPkg

22
pkgs/yubiswitch.nix Normal file
View File

@ -0,0 +1,22 @@
{ stdenv, lib, fetchurl, undmg, unzip, version ? "0.12", ... }:
stdenv.mkDerivation {
inherit version;
pname = "yubiswitch";
nativeBuildInputs = [ undmg unzip ];
src = fetchurl {
url = "https://github.com/pallotron/yubiswitch/releases/download/v${version}/yubiswitch_${version}.dmg";
sha256 = "aR/3AXwAAhFYchfGCmqfNSs8uNnuLOCZ8B0JbXlKAf8=";
};
sourceRoot = ".";
installPhase = ''
runHook preInstall
mkdir -p $out/Applications
cp -r yubiswitch.app $out/Applications/yubiswitch.app
runHook postInstall
'';
}