mirror of
https://codeberg.org/tmayoff/.dotfiles.git
synced 2025-12-06 08:48:34 -05:00
Merge branch 'main' of github.com:tmayoff/.dotfiles
This commit is contained in:
Tyler Mayoff
commit
3d68f30796
8 changed files with 72 additions and 59 deletions
|
|
@ -211,5 +211,5 @@ shift-down = ['volume set 0', 'mode main']
|
|||
|
||||
[workspace-to-monitor-force-assignment]
|
||||
1 = 'built-in'
|
||||
2 = ['^DELL U2723QE \(1\)$']
|
||||
3 = ['^DELL U2723QE \(2\)$', '3']
|
||||
2 = ['^DELL U2723QE \(1\)$', 'BenQ EX2710 \(2\)$']
|
||||
3 = ['^DELL U2723QE \(2\)$', 'BenQ EX2710 \(1\)$']
|
||||
|
|
|
|||
81
dot_config/flake/flake.lock
generated
81
dot_config/flake/flake.lock
generated
|
|
@ -17,18 +17,21 @@
|
|||
},
|
||||
"darwin": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs"
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1738277753,
|
||||
"narHash": "sha256-iyFcCOk0mmDiv4ut9mBEuMxMZIym3++0qN1rQBg8FW0=",
|
||||
"lastModified": 1737421067,
|
||||
"narHash": "sha256-/hgw8fDKDpko0XqOw1e9tX8lS2Hqecg7W/JsONun6Qc=",
|
||||
"owner": "lnl7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "49b807fa7c37568d7fbe2aeaafb9255c185412f9",
|
||||
"rev": "cae8d1c4a3bd37be5887203fe3b0c3a860c53a07",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "lnl7",
|
||||
"ref": "nix-darwin-24.11",
|
||||
"repo": "nix-darwin",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -70,7 +73,7 @@
|
|||
"inputs": {
|
||||
"crane": "crane",
|
||||
"flake-utils": "flake-utils",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
|
|
@ -95,11 +98,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1738448366,
|
||||
"narHash": "sha256-4ATtQqBlgsGqkHTemta0ydY6f7JBRXz4Hf574NHQpkg=",
|
||||
"lastModified": 1739051380,
|
||||
"narHash": "sha256-p1QSLO8DJnANY+ppK7fjD8GqfCrEIDjso1CSRHsXL7Y=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "18fa9f323d8adbb0b7b8b98a8488db308210ed93",
|
||||
"rev": "5af1b9a0f193ab6138b89a8e0af8763c21bbf491",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -111,7 +114,7 @@
|
|||
"nixgl": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_2",
|
||||
"nixpkgs": "nixpkgs_3"
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1713543440,
|
||||
|
|
@ -128,38 +131,6 @@
|
|||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1736241350,
|
||||
"narHash": "sha256-CHd7yhaDigUuJyDeX0SADbTM9FXfiWaeNyY34FL1wQU=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "8c9fd3e564728e90829ee7dbac6edc972971cd0f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1738410390,
|
||||
"narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "3a228057f5b619feb3186e986dbe76278d707b6e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1728018373,
|
||||
"narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=",
|
||||
|
|
@ -175,7 +146,23 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1739020877,
|
||||
"narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "a79cfe0ebd24952b580b1cf08cd906354996d547",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1660551188,
|
||||
"narHash": "sha256-a1LARMMYQ8DPx1BgoI/UN4bXe12hhZkCNqdxNi6uS0g=",
|
||||
|
|
@ -190,13 +177,13 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1738277201,
|
||||
"narHash": "sha256-6L+WXKCw5mqnUIExvqkD99pJQ41xgyCk6z/H9snClwk=",
|
||||
"lastModified": 1738843498,
|
||||
"narHash": "sha256-7x+Q4xgFj9UxZZO9aUDCR8h4vyYut4zPUvfj3i+jBHE=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "666e1b3f09c267afd66addebe80fb05a5ef2b554",
|
||||
"rev": "f5a32fa27df91dfc4b762671a0e0a859a8a0058f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -212,7 +199,7 @@
|
|||
"helix": "helix",
|
||||
"home-manager": "home-manager",
|
||||
"nixgl": "nixgl",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"nixpkgs-unstable": "nixpkgs-unstable"
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -55,9 +55,8 @@
|
|||
./home/hinge/darwin.nix
|
||||
home-manager.darwinModules.home-manager
|
||||
{
|
||||
# pkgs = allPkgs."aarch64-darwin";
|
||||
#home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.useGlobalPkgs = false;
|
||||
home-manager.useUserPackages = false;
|
||||
|
||||
home-manager.extraSpecialArgs = {inherit inputs outputs;};
|
||||
home-manager.users."tyler.mayoff" = import ./home/hinge/hinge.nix;
|
||||
|
|
|
|||
|
|
@ -77,6 +77,8 @@
|
|||
|
||||
programs.zellij = {
|
||||
enable = true;
|
||||
enableFishIntegration = false;
|
||||
enableZshIntegration = false;
|
||||
};
|
||||
|
||||
programs.starship = {
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@
|
|||
set -gx DEBEMAIL "tyler@tylermayoff.com"
|
||||
|
||||
fish_add_path $HOME/.local/bin
|
||||
fish_add_path /opt/homebrew/bin
|
||||
fish_add_path /opt/homebrew/opt/llvm@18/bin
|
||||
# fish_add_path /opt/homebrew/bin
|
||||
# fish_add_path /opt/homebrew/opt/llvm@18/bin
|
||||
|
||||
if test -e $HOME/.config/fish/variables-$(hostname)fish
|
||||
source $HOME/.config/fish/variables-$(hostname).fish
|
||||
|
|
|
|||
|
|
@ -1,11 +1,28 @@
|
|||
{pkgs, ...}: {
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
# services.aerospace.enable = true;
|
||||
|
||||
imports = [
|
||||
# ../fish.nix
|
||||
];
|
||||
|
||||
users.users."tyler.mayoff".shell = pkgs.fish;
|
||||
nix.extraOptions =
|
||||
''
|
||||
auto-optimise-store = true
|
||||
experimental-features = nix-command flakes
|
||||
''
|
||||
+ lib.optionalString (pkgs.system == "aarch64-darwin") ''
|
||||
extra-platforms = x86_64-darwin aarch64-darwin
|
||||
'';
|
||||
|
||||
users.knownUsers = ["tyler.mayoff"];
|
||||
users.users."tyler.mayoff" = {
|
||||
uid = 502;
|
||||
shell = pkgs.fish;
|
||||
};
|
||||
|
||||
services.sketchybar.enable = true;
|
||||
|
||||
|
|
@ -13,7 +30,11 @@
|
|||
|
||||
environment.systemPackages = with pkgs; [
|
||||
pinentry_mac
|
||||
];
|
||||
llvmPackages_19.clang-tools
|
||||
|
||||
# android-tools
|
||||
jdk17
|
||||
];
|
||||
programs.fish.enable = true;
|
||||
programs.zsh.enable = true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -29,14 +29,16 @@
|
|||
just
|
||||
yarn
|
||||
cocoapods
|
||||
# android-tools
|
||||
jdk17
|
||||
];
|
||||
|
||||
sessionVariables = {
|
||||
ANDROID_HOME = "/Users/tyler.mayoff/Library/Android/sdk";
|
||||
PATH = "$PATH:/Users/tyler.mayoff/Library/Android/sdk/platform-tools";
|
||||
};
|
||||
|
||||
file.".gnupg/gpg-agent.conf".text = ''
|
||||
pinentry-program ${pkgs.pinentry_mac}/Applications/pinentry-mac.app/Contents/MacOS/pinentry-mac
|
||||
'';
|
||||
};
|
||||
|
||||
home.stateVersion = "24.11";
|
||||
|
|
|
|||
|
|
@ -36,6 +36,8 @@
|
|||
gc -m $"($message)"
|
||||
}
|
||||
|
||||
use ${pkgs.nu_scripts}/share/nu_scripts/nu-hooks/nu-hooks/direnv/direnv.nu *
|
||||
|
||||
use ${pkgs.nu_scripts}/share/nu_scripts/aliases/git/git-aliases.nu *
|
||||
use ${pkgs.nu_scripts}/share/nu_scripts/custom-completions/git/git-completions.nu *
|
||||
use ${pkgs.nu_scripts}/share/nu_scripts/custom-completions/just/just-completions.nu *
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue