macos modifications

This commit is contained in:
2026-04-20 10:20:35 -05:00
parent dcd8459904
commit 48b0ea202f
6 changed files with 45 additions and 14 deletions
+12 -1
View File
@@ -11,7 +11,8 @@
../default.nix ../default.nix
]; ];
# since darwin needs root now
system.primaryUser = "bhelderman";
# import home grown host specific home-manager modules # import home grown host specific home-manager modules
home-manager.users.bhelderman.imports = [ home-manager.users.bhelderman.imports = [
@@ -29,6 +30,16 @@
user = "bhelderman"; # user owning homebrew prefix user = "bhelderman"; # user owning homebrew prefix
}; };
homebrew = {
enable = true;
brews = [
"ctpv"
];
casks = [
"gnucash"
];
};
system.stateVersion = 6; system.stateVersion = 6;
} }
+11 -1
View File
@@ -7,6 +7,8 @@
program = "lf"; program = "lf";
cfg = config.dots.${program}; cfg = config.dots.${program};
home_dir = config.home.homeDirectory; home_dir = config.home.homeDirectory;
isLinux = pkgs.stdenv.isLinux;
isDarwin = pkgs.stdenv.isDarwin;
in { in {
options.dots.${program} = { options.dots.${program} = {
enable = lib.mkEnableOption "enables ${program}"; enable = lib.mkEnableOption "enables ${program}";
@@ -19,7 +21,15 @@ in {
}; };
# install it to userspace # install it to userspace
home.packages = with pkgs; [lf ctpv trashy]; # home.packages = with pkgs; [lf ctpv trashy];
home.packages =
(with pkgs; [
lf
])
++ lib.optionals isLinux [
pkgs.ctpv
pkgs.trashy
];
# link configs # link configs
xdg.configFile."lf/lfrc" = { xdg.configFile."lf/lfrc" = {
+15 -6
View File
@@ -7,6 +7,8 @@
}: let }: let
program = "nvf"; program = "nvf";
cfg = config.dots.${program}; cfg = config.dots.${program};
isLinux = pkgs.stdenv.isLinux;
isDarwin = pkgs.stdenv.isDarwin;
#sec = sops.secrets; #sec = sops.secrets;
in { in {
options.dots.${program} = { options.dots.${program} = {
@@ -22,11 +24,18 @@ in {
enable = true; enable = true;
settings = { settings = {
vim = { vim = {
clipboard = { clipboard =
enable = true; # On Linux, use wl-copy as you do now
providers.wl-copy.enable = true; if isLinux then {
registers = "unnamedplus,unnamed"; enable = true;
}; providers.wl-copy.enable = true;
registers = "unnamedplus,unnamed";
}
else {
enable = true;
registers = "unnamedplus,unnamed";
};
globals = { globals = {
mapleader = " "; mapleader = " ";
maplocalleader = " "; maplocalleader = " ";
@@ -178,7 +187,7 @@ in {
}; };
languages = { languages = {
enableTreesitter = true; enableTreesitter = isLinux;
nix = { nix = {
enable = true; enable = true;
+3 -2
View File
@@ -7,6 +7,7 @@
program = "xdg"; program = "xdg";
cfg = config.dots.${program}; cfg = config.dots.${program};
home_dir = config.home.homeDirectory; home_dir = config.home.homeDirectory;
isLinux = pkgs.stdenv.isLinux;
in { in {
options.dots.${program} = { options.dots.${program} = {
enable = lib.mkEnableOption "enables ${program}"; enable = lib.mkEnableOption "enables ${program}";
@@ -23,7 +24,7 @@ in {
dataHome = "${home_dir}/.local/share"; dataHome = "${home_dir}/.local/share";
stateHome = "${home_dir}/.local/state"; stateHome = "${home_dir}/.local/state";
userDirs = { userDirs = lib.mkIf isLinux {
enable = true; enable = true;
# writes ~/.config/user-dirs.dirs # writes ~/.config/user-dirs.dirs
desktop = "${home_dir}/desktop"; desktop = "${home_dir}/desktop";
@@ -36,7 +37,7 @@ in {
templates = "${home_dir}/templates"; templates = "${home_dir}/templates";
}; };
mimeApps = { mimeApps = lib.mkIf isLinux {
enable = true; enable = true;
defaultApplications = { defaultApplications = {
"application/pdf" = ["org.pwmt.zathura.desktop"]; "application/pdf" = ["org.pwmt.zathura.desktop"];
+1 -1
View File
@@ -10,11 +10,11 @@
inputs.sops-nix.homeManagerModules.sops inputs.sops-nix.homeManagerModules.sops
#./dots/core #./dots/core
]; ];
# set home manager config based on system type # set home manager config based on system type
home = { home = {
username = "bhelderman"; username = "bhelderman";
homeDirectory = "/Users/bhelderman"; homeDirectory = "/Users/bhelderman";
enableNixpkgsReleaseCheck = false;
# cross party general packages here : ) # cross party general packages here : )
stateVersion = "25.05"; stateVersion = "25.05";
packages = with pkgs; [ packages = with pkgs; [
+3 -3
View File
@@ -13,14 +13,14 @@ in {
dots = { dots = {
btop.enable = true; btop.enable = true;
nvf.enable = false; nvf.enable = true;
lf.enable = false; lf.enable = true;
zsh.enable = true; zsh.enable = true;
ssh.enable = true; ssh.enable = true;
gpg.enable = true; gpg.enable = true;
git.enable = true; git.enable = true;
nh.enable = true; nh.enable = true;
xdg.enable = false; xdg.enable = true;
}; };
home.packages = with pkgs; [ home.packages = with pkgs; [