From 2b1bc8551440eb60d263b5d963ce866d10be374a Mon Sep 17 00:00:00 2001 From: lsoriano-mcm Date: Fri, 6 Jun 2025 19:26:24 -0500 Subject: [PATCH] added user override configuration --- info.default.nix | 51 ++++++++++++++++++++++++++++++++++++ info.local.nix | 52 +++++++++++++++++++++++++++++++++++++ info.nix | 57 ++++++----------------------------------- modules/desktop/app.nix | 2 +- modules/editor.nix | 12 ++++----- pkgs/kitty/default.nix | 4 ++- 6 files changed, 121 insertions(+), 57 deletions(-) create mode 100644 info.default.nix create mode 100644 info.local.nix diff --git a/info.default.nix b/info.default.nix new file mode 100644 index 0000000..1d5ce07 --- /dev/null +++ b/info.default.nix @@ -0,0 +1,51 @@ +{ + hostname = "nixos"; + username = "biscuit"; + timezone = "America/Chicago"; + + vpnEnable = true; + vpnSecretFile = "/home/biscuit/Wireguard/secret"; + + allowUnfree = true; + touchpadSupport = false; + + termFont = "JetBrainsMono Nerd Font"; # e.g., JetBrainsMono Nerd Font + + shellAliases = { + update = '' + if [[ $(uname) == "Darwin" ]]; then + 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) &"; + }; + + # 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. + 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/info.local.nix b/info.local.nix new file mode 100644 index 0000000..cb6af42 --- /dev/null +++ b/info.local.nix @@ -0,0 +1,52 @@ +{ + hostname = "nixos"; + username = "biscuit"; + timezone = "America/Chicago"; + + vpnEnable = true; + vpnSecretFile = "/home/biscuit/Wireguard/secret"; + + allowUnfree = true; + touchpadSupport = false; + + termFont = "JetBrainsMono Nerd Font"; # e.g., JetBrainsMono Nerd Font + + shellAliases = { + update = '' + if [[ $(uname) == "Darwin" ]]; then + 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) &"; + }; + + # Custom Applications + linux-apps = pkgs: + with pkgs; [ + delfin + ]; + + sshExtraConfig = '' + Host macair + User lsoriano + HostName 192.168.68.81 + ''; + + # BUILD (optional), you can remove these blocks. + trustedUsers = [ + "lsoriano" + "@groups" + "biscuit" + ]; + buildMachines = [ + { + hostName = "192.168.68.81"; + sshUser = "lsoriano"; + sshKey = "/home/biscuit/.ssh/id_rsa.pub"; + system = "x86_64-linux"; + supportedFeatures = ["big-parallel" "kvm" "nixos-test"]; + } + ]; +} diff --git a/info.nix b/info.nix index c9376e6..c5188ab 100644 --- a/info.nix +++ b/info.nix @@ -1,49 +1,8 @@ -{ - hostname = "nixos"; - username = "biscuit"; - timezone = "America/Chicago"; - - vpnEnable = true; - vpnSecretFile = "/home/biscuit/Wireguard/secret"; - - allowUnfree = true; - touchpadSupport = false; - - termFont = "JetBrainsMono Nerd Font"; # e.g., JetBrainsMono Nerd Font - - shellAliases = { - ll = "ls -l"; - upd = "sudo nixos-rebuild switch --flake ~/Nixos/#desktop"; - hupd = "home-manager switch --flake ~/Nixos/#desktop"; - agu = "pkill gjs & ags run ~/Nixos/pkgs/ags/biscuit/app.ts & disown (jobs -p) &"; - neo = "nix run github:fred-drake/neovim#"; - }; - - # Custom Applications - apps = pkgs: - with pkgs; [ - delfin - ]; - - sshExtraConfig = '' - Host macair - User lsoriano - HostName 192.168.68.81 - ''; - - # BUILD (optional), you can remove these blocks. - trustedUsers = [ - "lsoriano" - "@groups" - "biscuit" - ]; - buildMachines = [ - { - hostName = "192.168.68.81"; - sshUser = "lsoriano"; - sshKey = "/home/biscuit/.ssh/id_rsa.pub"; - system = "x86_64-linux"; - supportedFeatures = ["big-parallel" "kvm" "nixos-test"]; - } - ]; -} +let + default = import ./info.default.nix; + local = + if builtins.pathExists ./info.local.nix + then import ./info.local.nix + else {}; +in + default // local diff --git a/modules/desktop/app.nix b/modules/desktop/app.nix index 1c8eac9..2c9523c 100644 --- a/modules/desktop/app.nix +++ b/modules/desktop/app.nix @@ -1,5 +1,5 @@ {pkgs, ...}: let info = import ../../info.nix; in { - home.packages = info.apps pkgs; + home.packages = info.linux-apps pkgs; } diff --git a/modules/editor.nix b/modules/editor.nix index 9627ac8..8877889 100644 --- a/modules/editor.nix +++ b/modules/editor.nix @@ -1,11 +1,11 @@ {...}: { imports = [ - ../../pkgs/fastfetch/default.nix - ../../pkgs/git/default.nix - ../../pkgs/kitty/default.nix - ../../pkgs/neovim/default.nix - ../../pkgs/fish/default.nix - ../../pkgs/starship/default.nix + ../pkgs/fastfetch/default.nix + ../pkgs/git/default.nix + ../pkgs/kitty/default.nix + ../pkgs/neovim/default.nix + ../pkgs/fish/default.nix + ../pkgs/starship/default.nix # ../../pkgs/zsh/default.nix ]; } diff --git a/pkgs/kitty/default.nix b/pkgs/kitty/default.nix index f5660dc..f8a7658 100755 --- a/pkgs/kitty/default.nix +++ b/pkgs/kitty/default.nix @@ -8,7 +8,9 @@ font_size = 12.0; font_family = termFont; - + bold_font = "auto"; + italic_font = "auto"; + bold_italic_font = "auto"; # optimization input_delay = 0; repaint_delay = 2;