Compare commits

..

No commits in common. "7318af2f592707118577bfd3c0d145f5565c826a" and "c64dd59decd950d9bd8b9adb988927b2b1953c3a" have entirely different histories.

4 changed files with 8 additions and 14 deletions

View file

@ -20,7 +20,7 @@
outputs = { self, nixpkgs, home-manager, dotfiles, darwin }: { outputs = { self, nixpkgs, home-manager, dotfiles, darwin }: {
darwinConfigurations."alymac" = darwin.lib.darwinSystem { darwinConfigurations."alymac" = darwin.lib.darwinSystem {
system = "x86_64-darwin"; system = "x86_64-darwin";
specialArgs = { inherit self; inherit dotfiles; }; specialArgs = { inherit dotfiles; };
modules = [ modules = [
home-manager.darwinModules.home-manager home-manager.darwinModules.home-manager
./hosts/alymac/default.nix ./hosts/alymac/default.nix

View file

@ -1,4 +1,4 @@
{ self, pkgs, lib, dotfiles, ... }: { pkgs, lib, dotfiles, ... }:
with lib; with lib;
let let
@ -79,7 +79,6 @@ let
fonts = [ fonts = [
nerdfonts nerdfonts
ibm-plex
]; ];
python = with python311Packages; [ python = with python311Packages; [
@ -178,7 +177,7 @@ in
home-manager = { home-manager = {
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
extraSpecialArgs = { inherit self; inherit dotfiles; }; extraSpecialArgs = { inherit dotfiles; };
users.alyxia = { pkgs, ... }: { users.alyxia = { pkgs, ... }: {
# Defined further above, generates a list of files to import. # Defined further above, generates a list of files to import.
imports = validFiles ./.; imports = validFiles ./.;
@ -210,6 +209,7 @@ in
taps = [ taps = [
"drud/ddev" "drud/ddev"
"homebrew/cask"
"homebrew/cask-versions" "homebrew/cask-versions"
"int128/kubelogin" "int128/kubelogin"
]; ];
@ -220,17 +220,13 @@ in
"composer" "composer"
"croc" "croc"
"ddev" "ddev"
"deno"
"dotnet" "dotnet"
"ferium"
"gradle" "gradle"
"kubelogin" "kubelogin"
"mkcert" "mkcert"
"nss" "nss"
"pinentry-mac" "pinentry-mac"
"pkg-config" "pkg-config"
"poetry"
"rustup"
"sdl2" "sdl2"
# Fyra crap, but from Homebrew because someone doesn't know how to # Fyra crap, but from Homebrew because someone doesn't know how to
@ -263,7 +259,6 @@ in
"itch" "itch"
"iterm2" "iterm2"
"lens" "lens"
"minecraft"
"obs" "obs"
"orbstack" "orbstack"
"phpstorm" "phpstorm"

View file

@ -1,11 +1,11 @@
{ self, pkgs, ... }: { pkgs, dotfiles, ... }:
{ {
programs.neovim = { programs.neovim = {
enable = true; enable = true;
package = pkgs.neovim-unwrapped; package = pkgs.neovim-unwrapped;
extraConfig = ''source ~/.dotfiles/nvim/init.vim"source ${self}/nvim/init.vim''; extraConfig = "source ${dotfiles}/nvim/init.vim";
coc = { coc = {
enable = true; enable = true;

View file

@ -1,12 +1,11 @@
{ self, ... }: { dotfiles, ... }:
{ {
programs.zsh = { programs.zsh = {
enable = true; enable = true;
initExtra = '' initExtra = ''
export GPG_TTY=$(tty) export GPG_TTY=$(tty)
source ~/.dotfiles/zsh/zshrc #source ${self}/zsh/zshrc source ${dotfiles}/zsh/zshrc
source "$HOME/.cargo/env"
[[ -d "$HOME/.local/bin" ]] || mkdir "$HOME/.local/bin" [[ -d "$HOME/.local/bin" ]] || mkdir "$HOME/.local/bin"