mirror of
https://github.com/nmasur/dotfiles
synced 2024-11-10 02:52:55 +00:00
fixes to get darwin to build
This commit is contained in:
parent
d7b2f36dfe
commit
e2189397fc
@ -25,7 +25,7 @@
|
|||||||
nix.extraOptions = "experimental-features = nix-command flakes";
|
nix.extraOptions = "experimental-features = nix-command flakes";
|
||||||
|
|
||||||
# Pin a state version to prevent warnings
|
# Pin a state version to prevent warnings
|
||||||
system.stateVersion = "22.11";
|
# system.stateVersion = "22.11";
|
||||||
|
|
||||||
# Basic common system packages for all devices
|
# Basic common system packages for all devices
|
||||||
environment.systemPackages = with pkgs; [ git vim wget curl ];
|
environment.systemPackages = with pkgs; [ git vim wget curl ];
|
||||||
|
@ -5,18 +5,23 @@ darwin.lib.darwinSystem {
|
|||||||
system = "x86_64-darwin";
|
system = "x86_64-darwin";
|
||||||
specialArgs = { };
|
specialArgs = { };
|
||||||
modules = [
|
modules = [
|
||||||
globals // { user = "Noah.Masur" }
|
|
||||||
home-manager.darwinModules.home-manager
|
home-manager.darwinModules.home-manager
|
||||||
{
|
{
|
||||||
gui.enable = true;
|
user = "Noah.Masur";
|
||||||
|
fullName = globals.fullName;
|
||||||
|
gitEmail = globals.gitEmail;
|
||||||
|
mailServer = globals.mailServer;
|
||||||
|
dotfilesRepo = globals.dotfilesRepo;
|
||||||
|
gui = {
|
||||||
|
enable = true;
|
||||||
|
colorscheme = globals.gui.colorscheme;
|
||||||
|
};
|
||||||
nixpkgs.overlays = [ nur.overlay ];
|
nixpkgs.overlays = [ nur.overlay ];
|
||||||
}
|
}
|
||||||
../common.nix
|
../common.nix
|
||||||
../../modules/darwin
|
../../modules/darwin
|
||||||
../../modules/applications/1password.nix
|
|
||||||
../../modules/applications/alacritty.nix
|
../../modules/applications/alacritty.nix
|
||||||
../../modules/applications/discord.nix
|
../../modules/applications/discord.nix
|
||||||
../../modules/applications/firefox.nix
|
|
||||||
../../modules/applications/obsidian.nix
|
../../modules/applications/obsidian.nix
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
size = 14.0;
|
size = 14.0;
|
||||||
normal = {
|
normal = {
|
||||||
family =
|
family =
|
||||||
builtins.head config.fonts.fontconfig.defaultFonts.monospace;
|
builtins.head (if pkgs.stdenv.isDarwin then config.fonts.fonts else config.fonts.fontconfig.defaultFonts.monospace);
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
key_bindings = [
|
key_bindings = [
|
||||||
|
@ -1,5 +1,27 @@
|
|||||||
{ ... }: {
|
{ lib, ... }: {
|
||||||
|
|
||||||
imports = [ ./system.nix ./tmux.nix ./utilities.nix ./hammerspoon.nix ];
|
imports = [ ./system.nix ./tmux.nix ./utilities.nix ./hammerspoon.nix ];
|
||||||
|
|
||||||
|
|
||||||
|
options = with lib; {
|
||||||
|
|
||||||
|
user = mkOption {
|
||||||
|
type = types.str;
|
||||||
|
description = "Primary user of the system";
|
||||||
|
};
|
||||||
|
|
||||||
|
gui = {
|
||||||
|
enable = mkEnableOption {
|
||||||
|
description = "Enable graphics";
|
||||||
|
default = false;
|
||||||
|
};
|
||||||
|
|
||||||
|
colorscheme = mkOption {
|
||||||
|
type = types.attrs;
|
||||||
|
description = "Base16 color scheme";
|
||||||
|
};
|
||||||
|
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -11,6 +11,8 @@
|
|||||||
"trash" # Delete files and folders to trash instead of rm
|
"trash" # Delete files and folders to trash instead of rm
|
||||||
];
|
];
|
||||||
casks = [
|
casks = [
|
||||||
|
"firefox" # Firefox packaging on Nix is broken for MacOS
|
||||||
|
"1password" # 1Password packaging on Nix is broken for MacOS
|
||||||
"scroll-reverser" # Different scroll style for mouse vs. trackpad
|
"scroll-reverser" # Different scroll style for mouse vs. trackpad
|
||||||
"meetingbar" # Show meetings in menu bar
|
"meetingbar" # Show meetings in menu bar
|
||||||
"gitify" # Git notifications in menu bar
|
"gitify" # Git notifications in menu bar
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
AppleInterfaceStyle = "Dark";
|
AppleInterfaceStyle = "Dark";
|
||||||
|
|
||||||
# Don't change from dark to light automatically
|
# Don't change from dark to light automatically
|
||||||
AppleInterfaceSwitchesAutomatically = false;
|
# AppleInterfaceSwitchesAutomatically = false;
|
||||||
|
|
||||||
# Enable full keyboard access for all controls (e.g. enable Tab in modal dialogs)
|
# Enable full keyboard access for all controls (e.g. enable Tab in modal dialogs)
|
||||||
AppleKeyboardUIMode = 3;
|
AppleKeyboardUIMode = 3;
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
home-manager.users.${config.user} = {
|
home-manager.users.${config.user} = {
|
||||||
|
|
||||||
home.packages = [
|
home.packages = with pkgs; [
|
||||||
visidata # CSV inspector
|
visidata # CSV inspector
|
||||||
dos2unix # Convert Windows text files
|
dos2unix # Convert Windows text files
|
||||||
inetutils # Includes telnet
|
inetutils # Includes telnet
|
||||||
@ -32,9 +32,11 @@
|
|||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
fonts.fonts = with pkgs;
|
|
||||||
[ (nerdfonts.override { fonts = [ "fira-mono" ]; }) ];
|
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
fonts.fonts = with pkgs;
|
||||||
|
[ (nerdfonts.override { fonts = [ "FiraCode" ]; }) ];
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
|
|
||||||
programs.himalaya = { enable = true; };
|
programs.himalaya = { enable = true; };
|
||||||
programs.mbsync = { enable = true; };
|
programs.mbsync = { enable = true; };
|
||||||
services.mbsync = {
|
services.mbsync = lib.mkIf pkgs.stdenv.isLinux {
|
||||||
enable = true;
|
enable = true;
|
||||||
frequency = "*:0/5";
|
frequency = "*:0/5";
|
||||||
};
|
};
|
||||||
@ -39,7 +39,7 @@
|
|||||||
himalaya = {
|
himalaya = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
downloads-dir = config.userDirs.download;
|
downloads-dir = if pkgs.stdenv.isDarwin then "$HOME/Downloads" else config.userDirs.download;
|
||||||
smtp-insecure = true;
|
smtp-insecure = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user