oibot/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Modularize flake

Browse source
This commit is contained in:
Tobias Ostner 2023-09-18 22:31:41 +02:00
parent bfaf82d523
commit 55d5ad7e1e
3 changed files with 36 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

8
.config/nix/flake.nix
View file

@ -7,16 +7,16 @@
darwin.inputs.nixpkgs.follows = "nixpkgs"; darwin.inputs.nixpkgs.follows = "nixpkgs";
}; };
outputs = inputs: { outputs = inputs@{ nixpkgs, home-manager, darwin, ... }: {
darwinConfigurations.TobAir = inputs.darwin.lib.darwinSystem { darwinConfigurations.TobAir = darwin.lib.darwinSystem {
system = "aarch64-darwin"; system = "aarch64-darwin";
pkgs = import inputs.nixpkgs { pkgs = import nixpkgs {
system = "aarch64-darwin"; system = "aarch64-darwin";
config.allowUnfree = true; config.allowUnfree = true;
}; };
modules = [ modules = [
./modules/darwin ./modules/darwin
inputs.home-manager.darwinModules.home-manager home-manager.darwinModules.home-manager
{ {
home-manager = { home-manager = {
useGlobalPkgs = true; useGlobalPkgs = true;

27
.config/nix/modules/darwin/default.nix
View file

@ -1,8 +1,11 @@
({ pkgs, ... }: { ({ pkgs, ... }: {
programs.zsh.enable = true; programs.zsh.enable = true;
environment.shells = [ pkgs.bash pkgs.zsh pkgs.fish ]; environment = {
environment.loginShell = pkgs.zsh; shells = with pkgs; [ bash zsh fish ];
environment.systemPath = [ "/opt/homebrew/bin" ]; loginShell = pkgs.zsh;
systemPath = [ "/opt/homebrew/bin" ];
pathsToLink = [ "/Applications" ];
};
fonts.fonts = [ fonts.fonts = [
(pkgs.nerdfonts.override { (pkgs.nerdfonts.override {
fonts = [ fonts = [
@ -53,14 +56,16 @@
alt - m : yabai -m window --toggle zoom-fullscreen alt - m : yabai -m window --toggle zoom-fullscreen
''; '';
}; };
system.defaults.dock.autohide = true; system.defaults = {
system.defaults.dock.mru-spaces = false; dock.autohide = true;
system.defaults.dock.orientation = "right"; dock.mru-spaces = false;
system.defaults.NSGlobalDomain.InitialKeyRepeat = 14; dock.orientation = "right";
system.defaults.NSGlobalDomain.KeyRepeat = 1; NSGlobalDomain.InitialKeyRepeat = 14;
system.defaults.finder.AppleShowAllExtensions = true; NSGlobalDomain.KeyRepeat = 1;
system.defaults.finder.AppleShowAllFiles = true; finder.AppleShowAllExtensions = true;
system.defaults.finder.CreateDesktop = false; finder.AppleShowAllFiles = true;
finder.CreateDesktop = false;
};
users.users.tobi.home = "/Users/tobi"; users.users.tobi.home = "/Users/tobi";
homebrew = { homebrew = {
enable = true; enable = true;

24
.config/nix/modules/home-manager/default.nix
View file

@ -2,12 +2,12 @@
home.username = "tobi"; home.username = "tobi";
home.homeDirectory = "/Users/tobi"; home.homeDirectory = "/Users/tobi";
home.stateVersion = "23.05"; home.stateVersion = "23.05";
home.packages = [ home.packages = with pkgs; [
pkgs.raycast raycast
pkgs.ripgrep ripgrep
pkgs.fd fd
pkgs.curl curl
pkgs.less less
]; ];
home.sessionVariables = { home.sessionVariables = {
PAGER = "less"; PAGER = "less";
@ -17,7 +17,16 @@
programs.home-manager.enable = true; programs.home-manager.enable = true;
programs.bat.enable = true; programs.bat.enable = true;
programs.git.enable = true; programs.git.enable = true;
programs.zsh.enable = true; programs.zsh = {
enable = true;
enableCompletion = true;
syntaxHighlighting.enable = true;
shellAliases = {
ls = "ls --color=auto -F";
nixswitch = "pushd ~/.config/nix; darwin-rebuild switch --flake .#";
nixup = "pushd ~/.config/nix; nix flake update";
};
};
programs.starship = { programs.starship = {
enable = true; enable = true;
enableZshIntegration = true; enableZshIntegration = true;
@ -30,5 +39,4 @@
settings.font.size = 14; settings.font.size = 14;
settings.font.normal.family = "Iosevka Comfy"; settings.font.normal.family = "Iosevka Comfy";
}; };
programs.kitty.enable = true;
} }