From 551302a00e6219db52c65d13128516c8d96858ed Mon Sep 17 00:00:00 2001 From: biscuit Date: Wed, 25 Jun 2025 09:18:25 -0500 Subject: [PATCH] removed other configs --- config.default.nix | 80 ----------------------------------------- config.local.nix | 81 ----------------------------------------- config.nix | 89 +++++++++++++++++++++++++++++++++++++++++----- 3 files changed, 81 insertions(+), 169 deletions(-) delete mode 100644 config.default.nix delete mode 100644 config.local.nix diff --git a/config.default.nix b/config.default.nix deleted file mode 100644 index c8232d2..0000000 --- a/config.default.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ - hostname = "nixos"; - username = "biscuit"; - timezone = "America/Chicago"; - - vpn = { - vpnEnable = true; - vpnSecretFile = "/home/biscuit/Wireguard/secret"; - }; - - gitProfile = { - user = "biscuit"; - email = "biscuit@sakamoto.dev"; - defaultBranch = "master"; - }; - - terminal = { - termFont = "JetBrainsMono Nerd Font"; # e.g., JetBrainsMono Nerd Font - termSize = "11"; - 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 --impure && home-manager switch --flake ~/.config/nixos#desktop --impure - 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; - - logitech-hardware = { - enable = false; - }; - - # Custom Applications - linux-apps = { - gamingDesktop = true; # adds steam - my-apps = pkgs: - with pkgs; [ - jellyfin-media-player - ]; - }; - - hyprconf = { - monitor = [ - # hyprctl monitors all - # monitor, resolution@refreshrate, position (e.g., 0x0 is middle, 0x1080 is top), scale - ",highres@highrr,auto,auto" - ]; - }; - - 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/config.local.nix b/config.local.nix deleted file mode 100644 index 8070073..0000000 --- a/config.local.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ - hostname = "Lees-MacbookAir"; - username = "lsoriano"; - timezone = "America/Chicago"; - - vpn = { - vpnEnable = false; - vpnSecretFile = "/home/biscuit/Wireguard/secret"; - }; - - gitProfile = { - user = "biscuit"; - email = "biscuit@sakamoto.dev"; - defaultBranch = "master"; - }; - - terminal = { - termFont = "JetBrainsMono Nerd Font"; # e.g., JetBrainsMono Nerd Font - termSize = "18"; - termShell = "fish"; - shellAliases = { - ls = "ls --color=auto"; - update = '' - sh -c ' - if [ "$(uname)" = "Darwin" ]; then - sudo darwin-rebuild switch --flake ~/.config/nixos#macos - else - sudo nixos-rebuild switch --flake ~/.config/nixos#desktop --impure && home-manager switch --flake ~/.config/nixos#desktop --impure - 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; - - logitech-hardware = { - enable = false; - }; - - # Custom Applications - linux-apps = { - gamingDesktop = true; # adds steam - my-apps = pkgs: - with pkgs; [ - jellyfin-media-player - ]; - }; - - hyprconf = { - monitor = [ - "DP-1,highres@165,0x1080,auto" - "HDMI-A-4,highres@highrr,0x0,auto" - ]; - }; - - 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/config.nix b/config.nix index 74685a8..024d182 100644 --- a/config.nix +++ b/config.nix @@ -1,8 +1,81 @@ -let - default = import ./config.default.nix; - local = - if builtins.pathExists ./config.local.nix - then import ./config.local.nix - else {}; -in - default // local +{ + hostname = "TEXAS"; + username = "kenji"; + timezone = "America/Chicago"; + + vpn = { + vpnEnable = false; + vpnSecretFile = "/home/biscuit/Wireguard/secret"; + }; + + gitProfile = { + user = "biscuit"; + email = "biscuit@sakamoto.dev"; + defaultBranch = "master"; + }; + + terminal = { + termFont = "JetBrainsMono Nerd Font"; # e.g., JetBrainsMono Nerd Font + termSize = "18"; + termShell = "fish"; + shellAliases = { + ls = "ls --color=auto"; + update = '' + sh -c ' + if [ "$(uname)" = "Darwin" ]; then + sudo darwin-rebuild switch --flake ~/.config/nixos#macos + else + sudo nixos-rebuild switch --flake ~/.config/nixos#desktop --impure && home-manager switch --flake ~/.config/nixos#desktop --impure + 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; + + logitech-hardware = { + enable = false; + }; + + # Custom Applications + linux-apps = { + gamingDesktop = true; # adds steam + my-apps = pkgs: + with pkgs; [ + jellyfin-media-player + ]; + }; + + hyprconf = { + monitor = [ + "DP-1,highres@165,0x1080,auto" + "HDMI-A-4,highres@highrr,0x0,auto" + ]; + }; + + 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"]; + } + ]; + }; +}