Merge conflict
parent
fcb986f46e
commit
0ab9c66cf2
30
flake.nix
30
flake.nix
|
@ -127,7 +127,7 @@
|
|||
matbook = darwinSystem {
|
||||
system = "aarch64-darwin";
|
||||
modules = nixDarwinCommonModules ++ [
|
||||
{
|
||||
({ pkgs, ... }: {
|
||||
users.primaryUser = "mat";
|
||||
networking.computerName = "matbook pro m1";
|
||||
networking.hostName = "matbook";
|
||||
|
@ -137,19 +137,28 @@
|
|||
nix.buildCores = 2;
|
||||
nix.maxJobs = 4;
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
vscodium
|
||||
];
|
||||
games.enable = true;
|
||||
home-manager.sharedModules = [{
|
||||
programs.git.userEmail = "mat@mat.services";
|
||||
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 {
|
||||
system = "aarch64-darwin";
|
||||
modules = nixDarwinCommonModules ++ [
|
||||
{
|
||||
({ pkgs, ... }: {
|
||||
users.primaryUser = "mess";
|
||||
networking.knownNetworkServices = [
|
||||
"Wi-Fi"
|
||||
|
@ -158,11 +167,24 @@
|
|||
nix.maxJobs = 5;
|
||||
|
||||
games.enable = false;
|
||||
environment.systemPackages = with pkgs; [
|
||||
yubiswitch
|
||||
vscode
|
||||
];
|
||||
homebrew.casks = [ "itsycal" ];
|
||||
home-manager.sharedModules = [{
|
||||
programs.git.userEmail = "mess@yelp.com";
|
||||
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"
|
||||
'';
|
||||
}];
|
||||
}
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
|
|
|
@ -14,6 +14,7 @@
|
|||
baseDir="$HOME/Applications/Home Manager Apps"
|
||||
rsyncArgs="--archive --checksum --chmod=-w --copy-unsafe-links --delete"
|
||||
$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"
|
||||
fi
|
||||
'';
|
||||
|
|
|
@ -67,19 +67,13 @@
|
|||
matchBlocks."*".extraOptions = {
|
||||
UseKeychain = "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";
|
||||
};
|
||||
matchBlocks.remarkable = {
|
||||
hostname = "10.11.99.1";
|
||||
user = "root";
|
||||
port = 22;
|
||||
};
|
||||
};
|
||||
# vscode
|
||||
vscode = with pkgs; {
|
||||
vscode = {
|
||||
enable = true;
|
||||
package = vscodium;
|
||||
# extensions = [ pijul-vscode ];
|
||||
};
|
||||
};
|
||||
|
|
|
@ -9,6 +9,7 @@ let
|
|||
"luar"
|
||||
"smarttab-kak"
|
||||
"kakoune-sudo-write"
|
||||
"yubiswitch"
|
||||
];
|
||||
in
|
||||
genAttrs pkgs buildPkg
|
||||
|
|
|
@ -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
|
||||
'';
|
||||
}
|
Loading…
Reference in New Issue