From d08153e69154b7d8da2b7c4b7e2241e947212554 Mon Sep 17 00:00:00 2001 From: worble Date: Sat, 11 Jan 2025 23:48:55 +0000 Subject: [PATCH] move home up a level --- home-manager/development/vscode.nix | 26 ++++++++++-------- .../anime4k/GLSL_Mac_Linux_High-end.zip | Bin .../anime4k/GLSL_Mac_Linux_Low-end.zip | Bin tuxedo/configuration.nix | 2 +- tuxedo/{home-manager => }/home.nix | 12 ++++---- update.sh | 2 +- 6 files changed, 23 insertions(+), 19 deletions(-) rename tuxedo/{home-manager => }/anime4k/GLSL_Mac_Linux_High-end.zip (100%) rename tuxedo/{home-manager => }/anime4k/GLSL_Mac_Linux_Low-end.zip (100%) rename tuxedo/{home-manager => }/home.nix (96%) diff --git a/home-manager/development/vscode.nix b/home-manager/development/vscode.nix index b286446..143be14 100644 --- a/home-manager/development/vscode.nix +++ b/home-manager/development/vscode.nix @@ -6,6 +6,8 @@ in { home.packages = with pkgs;[ (nerdfonts.override { fonts = [ "SpaceMono" ]; }) + shellcheck + biome ]; programs = { @@ -13,17 +15,19 @@ in enable = true; package = pkgs.vscodium; mutableExtensionsDir = false; - extensions = [ - vs-extensions.biomejs.biome - vs-extensions.mkhl.direnv - vs-extensions.dracula-theme.theme-dracula - vs-extensions.dbaeumer.vscode-eslint - vs-extensions.eamodio.gitlens - vs-extensions.pkief.material-icon-theme - vs-extensions.jnoortheen.nix-ide - vs-extensions.esbenp.prettier-vscode - vs-extensions.bradlc.vscode-tailwindcss - vs-extensions.humao.rest-client + extensions = with vs-extensions;[ + biomejs.biome + mkhl.direnv + dracula-theme.theme-dracula + dbaeumer.vscode-eslint + eamodio.gitlens + pkief.material-icon-theme + jnoortheen.nix-ide + esbenp.prettier-vscode + bradlc.vscode-tailwindcss + humao.rest-client + rogalmic.bash-debug + loriscro.super ]; userSettings = { "workbench.iconTheme" = "material-icon-theme"; diff --git a/tuxedo/home-manager/anime4k/GLSL_Mac_Linux_High-end.zip b/tuxedo/anime4k/GLSL_Mac_Linux_High-end.zip similarity index 100% rename from tuxedo/home-manager/anime4k/GLSL_Mac_Linux_High-end.zip rename to tuxedo/anime4k/GLSL_Mac_Linux_High-end.zip diff --git a/tuxedo/home-manager/anime4k/GLSL_Mac_Linux_Low-end.zip b/tuxedo/anime4k/GLSL_Mac_Linux_Low-end.zip similarity index 100% rename from tuxedo/home-manager/anime4k/GLSL_Mac_Linux_Low-end.zip rename to tuxedo/anime4k/GLSL_Mac_Linux_Low-end.zip diff --git a/tuxedo/configuration.nix b/tuxedo/configuration.nix index 59d0b0a..f26c638 100644 --- a/tuxedo/configuration.nix +++ b/tuxedo/configuration.nix @@ -48,7 +48,7 @@ home-manager = { extraSpecialArgs = { inherit inputs; }; users = { - "worble" = import ./home-manager/home.nix; + "worble" = import ./home.nix; }; }; } diff --git a/tuxedo/home-manager/home.nix b/tuxedo/home.nix similarity index 96% rename from tuxedo/home-manager/home.nix rename to tuxedo/home.nix index 99f4082..f1b9119 100644 --- a/tuxedo/home-manager/home.nix +++ b/tuxedo/home.nix @@ -2,12 +2,12 @@ { imports = [ - ../../home-manager/fonts.nix - ../../home-manager/terminal.nix - ../../home-manager/firefox/firefox.nix - ../../home-manager/development/tools.nix - ../../home-manager/development/vscode.nix - ../../home-manager/gaming.nix + ../home-manager/fonts.nix + ../home-manager/terminal.nix + ../home-manager/firefox/firefox.nix + ../home-manager/development/tools.nix + ../home-manager/development/vscode.nix + ../home-manager/gaming.nix ]; terminal.nixUpdateLocation = "/home/worble/Projects/nixos#tuxedo"; diff --git a/update.sh b/update.sh index 75a8db3..75f60b2 100755 --- a/update.sh +++ b/update.sh @@ -1,2 +1,2 @@ #!/usr/bin/env bash -sudo nixos-rebuild switch --flake '/home/worble/Projects/nixos#starlite' \ No newline at end of file +sudo nixos-rebuild switch --flake '/home/worble/Projects/nixos#output' \ No newline at end of file