Reconcile with upstream
parent
dbc79ba9b6
commit
a95ba2fa30
|
@ -33,11 +33,11 @@
|
|||
];
|
||||
|
||||
masApps = {
|
||||
Amphetamine = 937984704;
|
||||
"Draw Things" = 6444050820;
|
||||
GrandPerspective = 1111570163;
|
||||
Reeder = 1529448980;
|
||||
Tailscale = 1475387142;
|
||||
TickTick = 966085870;
|
||||
Things = 904280696;
|
||||
Xcode = 497799835;
|
||||
};
|
||||
|
||||
|
@ -76,12 +76,10 @@
|
|||
# terminal emulators
|
||||
"ghostty"
|
||||
"kitty"
|
||||
"warp"
|
||||
|
||||
# peripheral tools
|
||||
"logi-options-plus"
|
||||
"qflipper"
|
||||
"remarkable"
|
||||
"via"
|
||||
];
|
||||
};
|
||||
|
|
|
@ -92,7 +92,6 @@
|
|||
|
||||
yelpbook-m1 = self.nixos-flake.lib.mkMacosSystem {
|
||||
nixpkgs.hostPlatform = "aarch64-darwin";
|
||||
users.me = "mess";
|
||||
imports = [
|
||||
self.darwinModules.default
|
||||
./systems/darwin/m1.nix
|
||||
|
|
|
@ -22,5 +22,4 @@ inputs: self: super: {
|
|||
'';
|
||||
});
|
||||
recursive-patched = self.callPackage ./recursive-patched.nix { };
|
||||
yubiswitch = self.callPackage ./yubiswitch.nix { };
|
||||
}
|
||||
|
|
|
@ -1,26 +0,0 @@
|
|||
{ lib, stdenv, fetchurl, undmg, unzip }:
|
||||
let version = "0.16";
|
||||
in stdenv.mkDerivation {
|
||||
pname = "yubiswitch";
|
||||
inherit version;
|
||||
|
||||
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
|
||||
'';
|
||||
|
||||
meta.platforms = lib.platforms.darwin;
|
||||
}
|
|
@ -1,8 +1,7 @@
|
|||
{ pkgs, lib, ... }: {
|
||||
homebrew.casks = [ "itsycal" ];
|
||||
{ lib, ... }: {
|
||||
homebrew.casks = [ "itsycal" "pallotron-yubiswitch" ];
|
||||
home-manager.sharedModules = [{
|
||||
launchd.agents.tarsnap.enable = lib.mkForce false;
|
||||
home.packages = [ pkgs.yubiswitch ];
|
||||
programs.ssh.matchBlocks.devbox = {
|
||||
hostname = "csdev6";
|
||||
forwardAgent = true;
|
||||
|
|
|
@ -13,7 +13,9 @@
|
|||
name = "Matthew Ess";
|
||||
email = "mess@yelp.com";
|
||||
sshKeys = [
|
||||
# TODO: work secretive keys
|
||||
# secretive
|
||||
"ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLWD/lvxFOdmE48MUKdigYZOAc3bSIyPxW4M7frWe8Nks9cr58Z/1btvUUmAK+u+J6gw5g+Mt9X0uwR7KPQlavg= mat"
|
||||
"ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOkqyHm9fBDXChdmNgbhxd2U1IpkiD4xjC8AVOvil+uEeKYqDi5mF3oeAGYJrV6BRc7hEO+DQP60pN0wI5tMoYE= yelp"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue