diff --git a/hosts/Dimaga/default.nix b/hosts/Dimaga/default.nix index 3caf383..9e05a84 100644 --- a/hosts/Dimaga/default.nix +++ b/hosts/Dimaga/default.nix @@ -31,7 +31,7 @@ syncthing = { enable = true; autostart = true; - enableTray = true; + enableTray = false; }; }; }; @@ -43,4 +43,4 @@ memorySize = 2048; cores = 2; }; -} \ No newline at end of file +} diff --git a/hosts/Shura/default.nix b/hosts/Shura/default.nix index cddd790..ace13f3 100644 --- a/hosts/Shura/default.nix +++ b/hosts/Shura/default.nix @@ -44,14 +44,14 @@ in enable = true; services.syncthing = { enable = true; - enableTray = true; + enableTray = false; # Recent versions of STT don't recognize Gnome's tray. Uninstalling for now. }; }; gremlin = { enable = true; services.syncthing = { enable = true; - enableTray = true; + enableTray = false; }; }; }; diff --git a/hosts/common/nixos-upgrade.sh b/hosts/common/nixos-upgrade.sh index 0f59902..13dedcf 100755 --- a/hosts/common/nixos-upgrade.sh +++ b/hosts/common/nixos-upgrade.sh @@ -29,8 +29,9 @@ while [[ $# -gt 0 ]]; do exit ;; *) - echo "Unknown argument $1" - exit 1 + #echo "Unknown argument $1" + #exit 1 + break ;; esac done diff --git a/modules/users/aires/default.nix b/modules/users/aires/default.nix index ea49e79..1794c0a 100644 --- a/modules/users/aires/default.nix +++ b/modules/users/aires/default.nix @@ -47,59 +47,64 @@ with lib; ../common/gnome.nix ]; - home = { - # The state version is required and should stay at the version you originally installed. - stateVersion = "24.05"; + home = { + # The state version is required and should stay at the version you originally installed. + stateVersion = "24.05"; - # Basic setup - username = "aires"; - homeDirectory = "/home/aires"; + # Basic setup + username = "aires"; + homeDirectory = "/home/aires"; - # Install extra packages, specifically gnome extensions - packages = lib.mkIf config.host.ui.gnome.enable [ - pkgs.gnomeExtensions.wallpaper-slideshow - ]; - }; + # Install extra packages, specifically gnome extensions + packages = lib.mkIf config.host.ui.gnome.enable [ + pkgs.gnomeExtensions.wallpaper-slideshow + ]; - programs = { - # Let home Manager install and manage itself. - home-manager.enable = true; + # Set environment variables + sessionVariables = { + KUBECONFIG = "/home/aires/.kube/config"; + }; + }; - # Set up git - git = { - enable = true; - # Username and email set in nix-secrets - extraConfig = { - push.autoSetupRemote = "true"; - }; - }; + programs = { + # Let home Manager install and manage itself. + home-manager.enable = true; - # Set up Zsh - zsh = { - enable = true; - oh-my-zsh = { - enable = true; - plugins = [ - "git" - ]; - theme = "gentoo"; - }; - autosuggestion.enable = true; - syntaxHighlighting.enable = true; - history.ignoreDups = true; # Do not enter command lines into the history list if they are duplicates of the previous event. - prezto = { - git.submoduleIgnore = "untracked"; # Ignore submodules when they are untracked. - }; - shellAliases = { - dry-build = "cd ~/Development/nix-configuration && nix flake update && nixos-rebuild dry-build --flake ."; - update = "upgrade"; - upgrade = "cd ~/Development/nix-configuration && nixos-upgrade"; - protontricks = "flatpak run com.github.Matoking.protontricks"; - please = "sudo"; - }; - loginExtra = "fastfetch"; - }; - }; + # Set up git + git = { + enable = true; + # Username and email set in nix-secrets + extraConfig = { + push.autoSetupRemote = "true"; + }; + }; + + # Set up Zsh + zsh = { + enable = true; + oh-my-zsh = { + enable = true; + plugins = [ + "git" + ]; + theme = "gentoo"; + }; + autosuggestion.enable = true; + syntaxHighlighting.enable = true; + history.ignoreDups = true; # Do not enter command lines into the history list if they are duplicates of the previous event. + prezto = { + git.submoduleIgnore = "untracked"; # Ignore submodules when they are untracked. + }; + shellAliases = { + dry-build = "cd ~/Development/nix-configuration && nix flake update && nixos-rebuild dry-build --flake ."; + update = "upgrade"; + upgrade = "cd ~/Development/nix-configuration && nixos-upgrade"; + protontricks = "flatpak run com.github.Matoking.protontricks"; + please = "sudo"; + }; + loginExtra = "fastfetch"; + }; + }; # SSH set up in nix-secrets diff --git a/modules/users/gremlin/default.nix b/modules/users/gremlin/default.nix index a8b83ae..2897b2c 100644 --- a/modules/users/gremlin/default.nix +++ b/modules/users/gremlin/default.nix @@ -46,54 +46,64 @@ with lib; ../common/gnome.nix ]; - home = { - # Basic setup - username = "gremlin"; - homeDirectory = "/home/gremlin"; + home = { + # Basic setup + username = "gremlin"; + homeDirectory = "/home/gremlin"; - # The state version is required and should stay at the version you originally installed. - stateVersion = "24.05"; - }; + # The state version is required and should stay at the version you originally installed. + stateVersion = "24.05"; - programs = { - # Let home Manager install and manage itself. - home-manager.enable = true; + # Set environment variables + sessionVariables = { + KUBECONFIG = "/home/gremlin/.kube/config"; + }; + + # Install packages specific to Gremlin + packages = [ + pkgs.awscli2 + ]; + }; - # Set up git - git = { - # Name and email set in nix-secrets - enable = true; - extraConfig = { - push.autoSetupRemote = "true"; - }; - }; + programs = { + # Let home Manager install and manage itself. + home-manager.enable = true; - # Set up Zsh - zsh = { - enable = true; - # Install and source the p10k theme - plugins = [ - { name = "powerlevel10k"; src = pkgs.zsh-powerlevel10k; file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme"; } - { name = "powerlevel10k-config"; src = ./p10k-config; file = "p10k.zsh"; } - ]; - autosuggestion.enable = true; - syntaxHighlighting.enable = true; - history.ignoreDups = true; # Do not enter command lines into the history list if they are duplicates of the previous event. - prezto = { - git.submoduleIgnore = "untracked"; # Ignore submodules when they are untracked. - }; - shellAliases = { - please = "sudo"; - }; + # Set up git + git = { + # Name and email set in nix-secrets + enable = true; + extraConfig = { + push.autoSetupRemote = "true"; + }; + }; - oh-my-zsh = { - enable = true; - plugins = [ - "git" - ]; - }; - }; - }; + # Set up Zsh + zsh = { + enable = true; + # Install and source the p10k theme + plugins = [ + { name = "powerlevel10k"; src = pkgs.zsh-powerlevel10k; file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme"; } + { name = "powerlevel10k-config"; src = ./p10k-config; file = "p10k.zsh"; } + ]; + autosuggestion.enable = true; + syntaxHighlighting.enable = true; + history.ignoreDups = true; # Do not enter command lines into the history list if they are duplicates of the previous event. + prezto = { + git.submoduleIgnore = "untracked"; # Ignore submodules when they are untracked. + }; + shellAliases = { + please = "sudo"; + }; + + oh-my-zsh = { + enable = true; + plugins = [ + "git" + ]; + }; + }; + }; # SSH entries set in nix-secrets };