From e441422dc1eac6ae6bd752adc0c9354baf75671e Mon Sep 17 00:00:00 2001 From: Tyrel Souza Date: Sun, 1 Jan 2023 22:24:23 -0500 Subject: [PATCH] break apart --- flake.nix | 8 ++- hosts/ts-tl-mbp/brew.nix | 12 ++++ hosts/ts-tl-mbp/default.nix | 95 -------------------------------- hosts/ts-tl-mbp/fonts.nix | 10 ++++ hosts/ts-tl-mbp/home-manager.nix | 79 ++++++++++++++++++++++++++ 5 files changed, 108 insertions(+), 96 deletions(-) create mode 100644 hosts/ts-tl-mbp/brew.nix create mode 100644 hosts/ts-tl-mbp/fonts.nix create mode 100644 hosts/ts-tl-mbp/home-manager.nix diff --git a/flake.nix b/flake.nix index 0724ad4..8651f70 100644 --- a/flake.nix +++ b/flake.nix @@ -22,7 +22,13 @@ }; darwinConfigurations."ts-tl-mbp" = darwin.lib.darwinSystem { system = "x86_64-darwin"; - modules = [ home-manager.darwinModules.home-manager ./hosts/ts-tl-mbp/default.nix ]; + modules = [ + home-manager.darwinModules.home-manager + ./hosts/ts-tl-mbp/default.nix + ./hosts/ts-tl-mbp/home-manager.nix + ./hosts/ts-tl-mbp/brew.nix + ./hosts/ts-tl-mbp/fonts.nix + ]; }; }; diff --git a/hosts/ts-tl-mbp/brew.nix b/hosts/ts-tl-mbp/brew.nix new file mode 100644 index 0000000..69aa7bf --- /dev/null +++ b/hosts/ts-tl-mbp/brew.nix @@ -0,0 +1,12 @@ +{ pkgs, config, lib, ... }: +{ + homebrew = { + enable = true; + casks = [ + "alfred" + "discord" + "slack" + "karabiner-elements" + ]; + }; +} diff --git a/hosts/ts-tl-mbp/default.nix b/hosts/ts-tl-mbp/default.nix index 743e4b7..8b12de6 100644 --- a/hosts/ts-tl-mbp/default.nix +++ b/hosts/ts-tl-mbp/default.nix @@ -2,100 +2,5 @@ { services.nix-daemon.enable = true; programs.zsh.enable = true; - system.defaults.dock.autohide = true; - - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.users.tyrel = { pkgs, ... }: { - programs.home-manager.enable = true; - home.stateVersion = "22.05"; - - home.file = { - bin.source = lib.file.mkOutOfStoreSymlink "../../bin"; - }; - - - - home.sessionVariables = { - PAGER = "less -R"; - EDITOR = "nvim"; - }; - - home.packages = with pkgs; [ - ctags - fzf - ripgrep - wget - ]; - - programs.tmux = { - enable = true; - }; - #home.file.".tmux".source = "../../tmux"; - #home.file.".tmux.conf".source = "../../tmux.conf"; - - programs.git = { - enable = true; - includes = [ - { path = "~/code/tyrel.dev/dotfiles/gitconfig"; } - ]; - aliases = { - ap = "add -p"; - }; - extraConfig = { - pull.ff = "only"; - }; - }; - - programs.neovim = { - enable = true; - }; - xdg.configFile = { - "nvim" = { - source = ../../config/nvim; - recursive = true; - }; - }; - - programs.fish = { - enable = true; - }; - xdg.configFile = { - "fish" = { - source = ../../config/fish; - recursive = true; - }; - }; - - - programs.htop = { - enable = true; - }; - #xdg.configFile = { - # "htop" = { - # source = ../../config/htop; - # recursive = true; - # }; - #}; - - }; # -- HomeManager - - homebrew = { - enable = true; - casks = [ - "alfred" - "discord" - "slack" - "karabiner-elements" - ]; - }; - - fonts.fonts = with pkgs; [ - noto-fonts - dejavu_fonts - nerdfonts # Includes font-awesome, material-icons, powerline-fonts - iosevka - ]; - } diff --git a/hosts/ts-tl-mbp/fonts.nix b/hosts/ts-tl-mbp/fonts.nix new file mode 100644 index 0000000..ba2694e --- /dev/null +++ b/hosts/ts-tl-mbp/fonts.nix @@ -0,0 +1,10 @@ +{ pkgs, config, lib, ... }: +{ + fonts.fonts = with pkgs; [ + noto-fonts + dejavu_fonts + nerdfonts # Includes font-awesome, material-icons, powerline-fonts + iosevka + ]; + +} diff --git a/hosts/ts-tl-mbp/home-manager.nix b/hosts/ts-tl-mbp/home-manager.nix new file mode 100644 index 0000000..5c1a51d --- /dev/null +++ b/hosts/ts-tl-mbp/home-manager.nix @@ -0,0 +1,79 @@ +{ pkgs, config, lib, ... }: +{ + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users.tyrel = { pkgs, ... }: { + programs.home-manager.enable = true; + home.stateVersion = "22.05"; + + home.file = { + bin.source = lib.file.mkOutOfStoreSymlink "../../bin"; + }; + + + + home.sessionVariables = { + PAGER = "less -R"; + EDITOR = "nvim"; + }; + + home.packages = with pkgs; [ + ctags + fzf + ripgrep + wget + ]; + + programs.tmux = { + enable = true; + }; + #home.file.".tmux".source = "../../tmux"; + #home.file.".tmux.conf".source = "../../tmux.conf"; + + programs.git = { + enable = true; + includes = [ + { path = "~/code/tyrel.dev/dotfiles/gitconfig"; } + ]; + aliases = { + ap = "add -p"; + }; + extraConfig = { + pull.ff = "only"; + }; + }; + + programs.neovim = { + enable = true; + }; + xdg.configFile = { + "nvim" = { + source = ../../config/nvim; + recursive = true; + }; + }; + + programs.fish = { + enable = true; + }; + xdg.configFile = { + "fish" = { + source = ../../config/fish; + recursive = true; + }; + }; + + + programs.htop = { + enable = true; + }; + #xdg.configFile = { + # "htop" = { + # source = ../../config/htop; + # recursive = true; + # }; + #}; + + }; # -- HomeManager + +}