From 4dee2bf44f1df07f2873d9b5f6678c2902849987 Mon Sep 17 00:00:00 2001 From: lsoriano-mcm Date: Mon, 9 Jun 2025 09:58:14 -0500 Subject: [PATCH] test --- .gitignore | 2 -- config.default.nix | 4 +-- config.local.nix | 59 ++++++++++++++++++++++++++++++++++++++++++ nixos/macos/darwin.nix | 4 +-- pkgs/zsh/default.nix | 1 + 5 files changed, 64 insertions(+), 6 deletions(-) create mode 100644 config.local.nix diff --git a/.gitignore b/.gitignore index 41f17f5..e69de29 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +0,0 @@ -info.local.nix -config.local.nix diff --git a/config.default.nix b/config.default.nix index 5fe6dcc..286673f 100644 --- a/config.default.nix +++ b/config.default.nix @@ -1,6 +1,6 @@ { hostname = "nixos"; - username = "biscuit"; + username = "lsoriano"; timezone = "America/Chicago"; vpn = { @@ -10,7 +10,7 @@ terminal = { termFont = "JetBrainsMono Nerd Font"; # e.g., JetBrainsMono Nerd Font - termSize = "20"; + termSize = "11"; termShell = "zsh"; shellAliases = { ls = "ls --color=auto"; diff --git a/config.local.nix b/config.local.nix new file mode 100644 index 0000000..8639daa --- /dev/null +++ b/config.local.nix @@ -0,0 +1,59 @@ +{ + hostname = "MacBook-Nix"; + username = "lsoriano"; + timezone = "America/Chicago"; + + vpn = { + vpnEnable = false; + vpnSecretFile = "/home/biscuit/Wireguard/secret"; + }; + + terminal = { + termFont = "JetBrainsMono Nerd Font"; # e.g., JetBrainsMono Nerd Font + termSize = "24"; + termShell = "fish"; + shellAliases = { + ls = "ls --color=auto"; + update = '' + if [[ $(uname) == "Darwin" ]]; then + sudo darwin-rebuild switch --flake ~/.config/nixos#macos + else + sudo nixos-rebuild switch --flake ~/.config/nixos#desktop && home-manager switch --flake ~/.config/nixos#desktop + fi + ''; + agu = "pkill gjs & ags run ~/.config/nixos/pkgs/ags/biscuit/app.ts & disown (jobs -p) &"; + }; + }; + + allowUnfree = true; # allows installation of commercial apps. + touchpadSupport = false; + + # Custom Applications + linux-apps = pkgs: + with pkgs; [ + delfin + ]; + + sshExtraConfig = '' + Host macair + User biscuit + HostName 192.168.68.81 + ''; + + # BUILD (optional), you can remove these blocks. + builder = { + trustedUsers = [ + "@groups" + "biscuit" + ]; + buildMachines = [ + { + hostName = "192.168.68.81"; + sshUser = "biscuit"; + sshKey = "/home/biscuit/.ssh/id_rsa.pub"; + system = "x86_64-linux"; + supportedFeatures = ["big-parallel" "kvm" "nixos-test"]; + } + ]; + }; +} diff --git a/nixos/macos/darwin.nix b/nixos/macos/darwin.nix index 193a1d2..0ffe4ed 100644 --- a/nixos/macos/darwin.nix +++ b/nixos/macos/darwin.nix @@ -8,8 +8,8 @@ # List packages installed in system profile. To search by name, run: # $ nix-env -qaP | grep wget environment.systemPackages = with pkgs; [ - vim - neovim + python313 + python3Packages.virtualenv ]; # Auto upgrade nix package and the daemon service. diff --git a/pkgs/zsh/default.nix b/pkgs/zsh/default.nix index 13c549a..930298f 100644 --- a/pkgs/zsh/default.nix +++ b/pkgs/zsh/default.nix @@ -18,6 +18,7 @@ antidote = { enable = true; plugins = [ + "MichaelAquilina/zsh-autoswitch-virtualenv" "jeffreytse/zsh-vi-mode" "zdharma-continuum/fast-syntax-highlighting kind:defer" "zsh-users/zsh-autosuggestions kind:defer"