genebean/dots
1
0
Fork 0
mirror of https://github.com/genebean/dots.git synced 2026-03-27 01:17:42 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing macOS environment and fonts

Browse source
This commit is contained in:
Gene Liverman 2023-09-12 11:47:17 -04:00
parent 5507d25639
commit 62588aba26
3 changed files with 35 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

44
flake.lock generated
View file

@ -17,26 +17,6 @@
"type": "github"
}
},
"darwin": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1692248770,
"narHash": "sha256-tZeFpETKQGbgnaSIO1AGWD27IyTcBm4D+A9d7ulQ4NM=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "511177ffe8226c78c9cf6a92a7b5f2df3684956b",
"type": "github"
},
"original": {
"owner": "lnl7",
"repo": "nix-darwin",
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
@ -76,6 +56,26 @@
}
},
"nix-darwin": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1694497842,
"narHash": "sha256-z03v/m0OwcLBok97KcUgMl8ZFw5Xwsi2z+n6nL7JdXY=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "4496ab26628c5f43d2a5c577a06683c753e32fe2",
"type": "github"
},
"original": {
"owner": "lnl7",
"repo": "nix-darwin",
"type": "github"
}
},
"nix-darwin_2": {
"inputs": {
"nixpkgs": "nixpkgs"
},
@ -97,7 +97,7 @@
"inputs": {
"brew-src": "brew-src",
"flake-utils": "flake-utils",
"nix-darwin": "nix-darwin",
"nix-darwin": "nix-darwin_2",
"nixpkgs": "nixpkgs_2"
},
"locked": {
@ -160,8 +160,8 @@
},
"root": {
"inputs": {
"darwin": "darwin",
"home-manager": "home-manager",
"nix-darwin": "nix-darwin",
"nix-homebrew": "nix-homebrew",
"nixpkgs": "nixpkgs_3"
}

6
flake.nix
View file

@ -6,7 +6,7 @@
nixpkgs.url = "github:nixos/nixpkgs";
# Controls system level software and settings including fonts
darwin = {
nix-darwin = {
url = "github:lnl7/nix-darwin";
inputs.nixpkgs.follows = "nixpkgs";
};
@ -21,7 +21,7 @@
nix-homebrew.url = "github:zhaofengli-wip/nix-homebrew";
}; # end inputs
outputs = { self, nixpkgs, darwin, home-manager, nix-homebrew, ... }: {
outputs = { self, nixpkgs, nix-darwin, home-manager, nix-homebrew, ... }: {
nixosConfigurations.rainbow-planet = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
modules = [
@ -41,7 +41,7 @@
}; # end nixosConfigurations
# This is only set to work with x86 macOS right now... that will need to be updated
darwinConfigurations.Blue-Rock = darwin.lib.darwinSystem {
darwinConfigurations.Blue-Rock = nix-darwin.lib.darwinSystem {
system = "x86_64-darwin";
pkgs = import nixpkgs { system = "x86_64-darwin"; };
modules = [

21
modules/darwin/default.nix
View file

@ -37,12 +37,6 @@
];
};
fonts.fontDir.enable = false; # True will uninstall other fonts, false installs, but doesn't uninstall
fonts.fonts = [ (pkgs.nerdfonts.override { fonts = [
"Hack"
"SourceCodePro"
]; }) ];
homebrew = {
enable = true;
onActivation = {
@ -53,7 +47,7 @@
taps = [
"hashicorp/tap"
# "homebrew/bundle"
# "homebrew/cask-fonts"
"homebrew/cask-fonts"
# "jandedobbeleer/oh-my-posh"
"null-dev/firefox-profile-switcher"
"puppetlabs/puppet"
@ -68,9 +62,9 @@
"cakebrew"
"elgato-stream-deck"
"firefox"
# "font-hack-nerd-font"
# "font-inconsolata-g-for-powerline"
# "font-source-code-pro-for-powerline"
"font-hack-nerd-font"
"font-inconsolata-g-for-powerline"
"font-source-code-pro-for-powerline"
"google-drive"
"iterm2"
"keepingyouawake"
@ -116,7 +110,12 @@
'';
};
programs.zsh.enable = true;
services.nix-daemon.enable = true;
users.users."gene.liverman".home = "/Users/gene.liverman";
users.users."gene.liverman" = {
home = "/Users/gene.liverman";
shell = pkgs.zsh;
};
}