From 3cfb9e733a0e7f1a178aef23666bdb0b55387184 Mon Sep 17 00:00:00 2001 From: Hadi <112569860+anotherhadi@users.noreply.github.com> Date: Wed, 26 Jun 2024 10:32:58 +0200 Subject: [PATCH] update --- docs/TODO.md | 1 - docs/scripts/create_guest_config.sh | 11 ++--- flake.nix | 6 +-- home/laptop.nix => hosts/laptop/home.nix | 45 +++++++++---------- .../sops/laptop.nix => hosts/laptop/sops.nix | 2 +- home/server.nix => hosts/server/home.nix | 13 +++--- 6 files changed, 38 insertions(+), 40 deletions(-) rename home/laptop.nix => hosts/laptop/home.nix (61%) rename home/system/sops/laptop.nix => hosts/laptop/sops.nix (90%) rename home/server.nix => hosts/server/home.nix (73%) diff --git a/docs/TODO.md b/docs/TODO.md index d74ec62..0ab8e0d 100644 --- a/docs/TODO.md +++ b/docs/TODO.md @@ -8,7 +8,6 @@ feel free to contribute <3 ([CONTRIBUTING.md](CONTRIBUTING.md)) - [ ] Themes - [ ] Upload new wallpapers - [ ] MacOS theme - - [ ] GithubFetch: Neofetch like, github calendar in the terminal - [ ] Write a hyprland shortcuts markdown file (Parse the hyprland settings conf) - [ ] Tofi (Wofi but terminal based) diff --git a/docs/scripts/create_guest_config.sh b/docs/scripts/create_guest_config.sh index 38237e3..02b97db 100644 --- a/docs/scripts/create_guest_config.sh +++ b/docs/scripts/create_guest_config.sh @@ -10,13 +10,10 @@ LAPTOP_CONFIG="./hosts/laptop" GUEST_CONFIG="./hosts/guest" -cp "$LAPTOP_CONFIG/configuration.nix" "$GUEST_CONFIG/configuration.nix" -cp "$LAPTOP_CONFIG/variables.nix" "$GUEST_CONFIG/variables.nix" - # Remove the NVIDIA driver import config=$(cat "$LAPTOP_CONFIG/configuration.nix") -config=$(echo "$config" | sed 's/..\/shared\/nvidia/# ..\/shared\/nvidia/') -config=$(echo "$config" | sed 's/..\/shared\/prime/# ..\/shared\/prime/') +config=$(echo "$config" | sed 's/..\/modules\/nvidia/# ..\/modules\/nvidia/') +config=$(echo "$config" | sed 's/..\/modules\/prime/# ..\/modules\/prime/') echo "$config" >"$GUEST_CONFIG/configuration.nix" variables=$(cat "$LAPTOP_CONFIG/variables.nix") @@ -27,3 +24,7 @@ variables=$(echo "$variables" | sed 's/sops = true/sops = false/') variables=$(echo "$variables" | sed 's/obsidian = true/obsidian = false/') variables=$(echo "$variables" | sed 's/tailscale = true/tailscale = false/') echo "$variables" >"$GUEST_CONFIG/variables.nix" + +home=$(cat "$LAPTOP_CONFIG/home.nix") +home=$(echo "$config" | sed 's/\.\/sops.nix/# .\/sops.nix/') +echo "$home" >"$GUEST_CONFIG/home.nix" \ No newline at end of file diff --git a/flake.nix b/flake.nix index ddeb175..10ea814 100644 --- a/flake.nix +++ b/flake.nix @@ -41,7 +41,7 @@ home-manager = { useGlobalPkgs = true; useUserPackages = true; - users."hadi" = import ./home/laptop.nix; + users."hadi" = import ./hosts/laptop/home.nix; extraSpecialArgs = { inherit inputs; }; }; } @@ -60,7 +60,7 @@ home-manager = { useGlobalPkgs = true; useUserPackages = true; - users."hadi" = import ./home/server.nix; + users."hadi" = import ./hosts/server/home.nix; extraSpecialArgs = { inherit inputs; }; }; } @@ -79,7 +79,7 @@ useGlobalPkgs = true; useUserPackages = true; users."yourusername" = import # CHANGEME - ./home/laptop.nix; # you can also create a new ./home/yourhostname.nix + ./hosts/yourhostname/home.nix; # CHANGEME extraSpecialArgs = { inherit inputs; }; }; } diff --git a/home/laptop.nix b/hosts/laptop/home.nix similarity index 61% rename from home/laptop.nix rename to hosts/laptop/home.nix index 6298d8a..393b140 100644 --- a/home/laptop.nix +++ b/hosts/laptop/home.nix @@ -1,34 +1,34 @@ { pkgs, config, ... }: { imports = [ - ../hosts/laptop/variables.nix # CHANGEME, replace with your host + ./variables.nix # Programs - ./programs/btop - ./programs/cava - ./programs/kitty - ./programs/nextcloud - ./programs/nvim - ./programs/qutebrowser - ./programs/spicetify - ./programs/zathura - ./programs/shell - ./programs/git + ../../home/programs/btop + ../../home/programs/cava + ../../home/programs/kitty + ../../home/programs/nextcloud + ../../home/programs/nvim + ../../home/programs/qutebrowser + ../../home/programs/spicetify + ../../home/programs/zathura + ../../home/programs/shell + ../../home/programs/git # Scripts - ./scripts # All scripts + ../../home/scripts # All scripts # System (Desktop environment like stuff) - ./system/dunst - ./system/gtk - ./system/hyprland - ./system/waybar - ./system/wlogout - ./system/wofi - ./system/mime - ./system/udiskie + ../../home/system/dunst + ../../home/system/gtk + ../../home/system/hyprland + ../../home/system/waybar + ../../home/system/wlogout + ../../home/system/wofi + ../../home/system/mime + ../../home/system/udiskie - ./system/sops/laptop.nix # You should probably remove this line + ./sops.nix # You should probably remove this line ]; home = { @@ -92,12 +92,11 @@ # Import wallpapers into $HOME/wallpapers file."wallpapers" = { recursive = true; - source = ./wallpapers; + source = ../../home/wallpapers; }; stateVersion = "24.05"; }; programs.home-manager.enable = true; - } diff --git a/home/system/sops/laptop.nix b/hosts/laptop/sops.nix similarity index 90% rename from home/system/sops/laptop.nix rename to hosts/laptop/sops.nix index cebdcd0..caf869d 100644 --- a/home/system/sops/laptop.nix +++ b/hosts/laptop/sops.nix @@ -5,7 +5,7 @@ sops = { age.keyFile = "/home/hadi/.config/sops/age/keys.txt"; - defaultSopsFile = ../../../secrets/laptop.yaml; + defaultSopsFile = ../../secrets/laptop.yaml; secrets = { sshconfig = { path = "/home/hadi/.ssh/config"; }; github-key = { path = "/home/hadi/.ssh/github"; }; diff --git a/home/server.nix b/hosts/server/home.nix similarity index 73% rename from home/server.nix rename to hosts/server/home.nix index cbf3370..eb238b8 100644 --- a/home/server.nix +++ b/hosts/server/home.nix @@ -1,16 +1,16 @@ { pkgs, config, ... }: { imports = [ - ../hosts/server/variables.nix + ./variables.nix # Programs - ./programs/btop - ./programs/nvim - ./programs/git - ./programs/shell + ../../home/programs/btop + ../../home/programs/nvim + ../../home/programs/git + ../../home/programs/shell # Scripts - ./scripts # All scripts + ../../home/scripts # All scripts ]; home = { @@ -42,5 +42,4 @@ }; programs.home-manager.enable = true; - }