diff --git a/hosts/elara/default.nix b/hosts/elara/default.nix index c1004eb..3f70c11 100644 --- a/hosts/elara/default.nix +++ b/hosts/elara/default.nix @@ -12,7 +12,6 @@ inputs.sas.nixosModules.default ./hardware - ./build-tarball.nix ./options.nix ../common/configs/system diff --git a/hosts/elara/build-tarball.nix b/hosts/elara/hardware/build-tarball.nix similarity index 100% rename from hosts/elara/build-tarball.nix rename to hosts/elara/hardware/build-tarball.nix diff --git a/hosts/elara/hardware/default.nix b/hosts/elara/hardware/default.nix index 94a897c..8795688 100644 --- a/hosts/elara/hardware/default.nix +++ b/hosts/elara/hardware/default.nix @@ -1,10 +1,12 @@ { ... }: { - imports = [ ./display.nix ]; + imports = [ + ./build-tarball.nix + ./display.nix + ]; wsl = { enable = true; - defaultUser = "nikara"; startMenuLaunchers = true; }; } diff --git a/hosts/elara/users/nikara/configs/console/sas/default.nix b/hosts/elara/users/nikara/configs/console/sas/default.nix index 709c7f8..6597521 100644 --- a/hosts/elara/users/nikara/configs/console/sas/default.nix +++ b/hosts/elara/users/nikara/configs/console/sas/default.nix @@ -57,6 +57,7 @@ in gcc gopls go-tools + delve golangci-lint golangci-lint-langserver ] diff --git a/hosts/elara/users/nikara/configs/gui/obsidian/default.nix b/hosts/elara/users/nikara/configs/gui/obsidian/default.nix new file mode 100644 index 0000000..93ab500 --- /dev/null +++ b/hosts/elara/users/nikara/configs/gui/obsidian/default.nix @@ -0,0 +1,5 @@ +{ user, home }: +{ ... }: +{ + home-manager.users.${user}.programs.obsidian.vaults."Documents/Obsidian/master".enable = true; +} diff --git a/hosts/elara/users/nikara/configs/gui/vscode/default.nix b/hosts/elara/users/nikara/configs/gui/vscode/default.nix index a2c2280..0e39d1a 100644 --- a/hosts/elara/users/nikara/configs/gui/vscode/default.nix +++ b/hosts/elara/users/nikara/configs/gui/vscode/default.nix @@ -23,8 +23,6 @@ }; copilot.enable = true; - - profiles.default.userSettings."window.autoDetectColorScheme" = lib.mkForce false; }; home.sessionVariables.DONT_PROMPT_WSL_INSTALL = "1"; diff --git a/hosts/elara/users/nikara/default.nix b/hosts/elara/users/nikara/default.nix index 40bd8c9..7e9b173 100644 --- a/hosts/elara/users/nikara/default.nix +++ b/hosts/elara/users/nikara/default.nix @@ -45,17 +45,20 @@ in (import ../../../common/configs/user/console/zoxide { inherit user home; }) (import ../../../common/configs/user/console/zsh { inherit user home; }) - (import ../../../common/configs/user/gui/theme { inherit user home; }) (import ../../../common/configs/user/gui/gtk { inherit user home; }) + (import ../../../common/configs/user/gui/obsidian { inherit user home; }) (import ../../../common/configs/user/gui/qt { inherit user home; }) + (import ../../../common/configs/user/gui/theme { inherit user home; }) (import ../../../common/configs/user/gui/vscode { inherit user home; }) (import ./configs/console/gpg { inherit user home; }) (import ./configs/console/podman { inherit user home; }) (import ./configs/console/sas { inherit user home; }) (import ./configs/console/ssh { inherit user home; }) - (import ./configs/gui/vscode { inherit user home; }) (import ./configs/console/wsl { inherit user home; }) + + (import ./configs/gui/obsidian { inherit user home; }) + (import ./configs/gui/vscode { inherit user home; }) ]; # mkpasswd -s @@ -80,7 +83,7 @@ in uid = lib.strings.toInt (builtins.readFile ./uid); }; - services.getty.autologinUser = user; + wsl.defaultUser = user; home-manager.users.${user}.home = { username = user;