Compare commits
4 Commits
c64dd59dec
...
7318af2f59
Author | SHA1 | Date |
---|---|---|
Alyxia Sother | 7318af2f59 | |
Alyxia Sother | 0d22d6ac7a | |
Alyxia Sother | adec3650aa | |
Alyxia Sother | 573472d75c |
|
@ -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 dotfiles; };
|
specialArgs = { inherit self; inherit dotfiles; };
|
||||||
modules = [
|
modules = [
|
||||||
home-manager.darwinModules.home-manager
|
home-manager.darwinModules.home-manager
|
||||||
./hosts/alymac/default.nix
|
./hosts/alymac/default.nix
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ pkgs, lib, dotfiles, ... }:
|
{ self, pkgs, lib, dotfiles, ... }:
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
let
|
let
|
||||||
|
@ -79,6 +79,7 @@ let
|
||||||
|
|
||||||
fonts = [
|
fonts = [
|
||||||
nerdfonts
|
nerdfonts
|
||||||
|
ibm-plex
|
||||||
];
|
];
|
||||||
|
|
||||||
python = with python311Packages; [
|
python = with python311Packages; [
|
||||||
|
@ -177,7 +178,7 @@ in
|
||||||
home-manager = {
|
home-manager = {
|
||||||
useGlobalPkgs = true;
|
useGlobalPkgs = true;
|
||||||
useUserPackages = true;
|
useUserPackages = true;
|
||||||
extraSpecialArgs = { inherit dotfiles; };
|
extraSpecialArgs = { inherit self; 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 ./.;
|
||||||
|
@ -209,7 +210,6 @@ in
|
||||||
|
|
||||||
taps = [
|
taps = [
|
||||||
"drud/ddev"
|
"drud/ddev"
|
||||||
"homebrew/cask"
|
|
||||||
"homebrew/cask-versions"
|
"homebrew/cask-versions"
|
||||||
"int128/kubelogin"
|
"int128/kubelogin"
|
||||||
];
|
];
|
||||||
|
@ -220,13 +220,17 @@ 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
|
||||||
|
@ -259,6 +263,7 @@ in
|
||||||
"itch"
|
"itch"
|
||||||
"iterm2"
|
"iterm2"
|
||||||
"lens"
|
"lens"
|
||||||
|
"minecraft"
|
||||||
"obs"
|
"obs"
|
||||||
"orbstack"
|
"orbstack"
|
||||||
"phpstorm"
|
"phpstorm"
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
{ pkgs, dotfiles, ... }:
|
{ self, pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
programs.neovim = {
|
programs.neovim = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.neovim-unwrapped;
|
package = pkgs.neovim-unwrapped;
|
||||||
|
|
||||||
extraConfig = "source ${dotfiles}/nvim/init.vim";
|
extraConfig = ''source ~/.dotfiles/nvim/init.vim"source ${self}/nvim/init.vim'';
|
||||||
|
|
||||||
coc = {
|
coc = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
@ -1,11 +1,12 @@
|
||||||
{ dotfiles, ... }:
|
{ self, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
programs.zsh = {
|
programs.zsh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
initExtra = ''
|
initExtra = ''
|
||||||
export GPG_TTY=$(tty)
|
export GPG_TTY=$(tty)
|
||||||
source ${dotfiles}/zsh/zshrc
|
source ~/.dotfiles/zsh/zshrc #source ${self}/zsh/zshrc
|
||||||
|
source "$HOME/.cargo/env"
|
||||||
|
|
||||||
[[ -d "$HOME/.local/bin" ]] || mkdir "$HOME/.local/bin"
|
[[ -d "$HOME/.local/bin" ]] || mkdir "$HOME/.local/bin"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue