mat
/
dotfiles.nix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reconcile with upstream

main
Matthew Ess 2024-01-23 14:05:02 -05:00
parent dbc79ba9b6
commit a95ba2fa30
6 changed files with 7 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
darwin/homebrew.nix
View File

@ -33,11 +33,11 @@
]; ];
masApps = { masApps = {
Amphetamine = 937984704;
"Draw Things" = 6444050820; "Draw Things" = 6444050820;
GrandPerspective = 1111570163; GrandPerspective = 1111570163;
Reeder = 1529448980;
Tailscale = 1475387142; Tailscale = 1475387142;
TickTick = 966085870; Things = 904280696;
Xcode = 497799835; Xcode = 497799835;
}; };
@ -76,12 +76,10 @@
# terminal emulators # terminal emulators
"ghostty" "ghostty"
"kitty" "kitty"
"warp"
# peripheral tools # peripheral tools
"logi-options-plus" "logi-options-plus"
"qflipper" "qflipper"
"remarkable"
"via" "via"
]; ];
}; };

1
flake.nix
View File

@ -92,7 +92,6 @@
yelpbook-m1 = self.nixos-flake.lib.mkMacosSystem { yelpbook-m1 = self.nixos-flake.lib.mkMacosSystem {
nixpkgs.hostPlatform = "aarch64-darwin"; nixpkgs.hostPlatform = "aarch64-darwin";
users.me = "mess";
imports = [ imports = [
self.darwinModules.default self.darwinModules.default
./systems/darwin/m1.nix ./systems/darwin/m1.nix

1
pkgs/default.nix
View File

@ -22,5 +22,4 @@ inputs: self: super: {
''; '';
}); });
recursive-patched = self.callPackage ./recursive-patched.nix { }; recursive-patched = self.callPackage ./recursive-patched.nix { };
yubiswitch = self.callPackage ./yubiswitch.nix { };
} }

26
pkgs/yubiswitch.nix
View File

@ -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;
}

5
systems/darwin/work.nix
View File

@ -1,8 +1,7 @@
{ pkgs, lib, ... }: { { lib, ... }: {
homebrew.casks = [ "itsycal" ]; homebrew.casks = [ "itsycal" "pallotron-yubiswitch" ];
home-manager.sharedModules = [{ home-manager.sharedModules = [{
launchd.agents.tarsnap.enable = lib.mkForce false; launchd.agents.tarsnap.enable = lib.mkForce false;
home.packages = [ pkgs.yubiswitch ];
programs.ssh.matchBlocks.devbox = { programs.ssh.matchBlocks.devbox = {
hostname = "csdev6"; hostname = "csdev6";
forwardAgent = true; forwardAgent = true;

4
users/config.nix
View File

@ -13,7 +13,9 @@
name = "Matthew Ess"; name = "Matthew Ess";
email = "mess@yelp.com"; email = "mess@yelp.com";
sshKeys = [ sshKeys = [
# TODO: work secretive keys # secretive
"ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLWD/lvxFOdmE48MUKdigYZOAc3bSIyPxW4M7frWe8Nks9cr58Z/1btvUUmAK+u+J6gw5g+Mt9X0uwR7KPQlavg= mat"
"ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOkqyHm9fBDXChdmNgbhxd2U1IpkiD4xjC8AVOvil+uEeKYqDi5mF3oeAGYJrV6BRc7hEO+DQP60pN0wI5tMoYE= yelp"
]; ];
}; };
}; };