From 347c8bd00c18e8f935a8e6406bb720ab5b260cfb Mon Sep 17 00:00:00 2001 From: natto1784 Date: Wed, 21 Jul 2021 22:32:32 +0530 Subject: [PATCH] Ayo the pizza here (restructuring) --- .github/workflows/main.yml | 5 +- colemak-dh.xkm | Bin 13088 -> 0 bytes flake.nix | 54 +++++++++++------- hm-switch | 2 +- hosts/README.md | 3 + hosts/{servers => }/marisa/boot.nix | 0 hosts/marisa/default.nix | 12 ++++ hosts/{servers => }/marisa/hardware.nix | 0 hosts/{servers => }/marisa/networking.nix | 0 hosts/{servers => }/marisa/services.nix | 5 +- hosts/personal/README.md | 1 - hosts/personal/satori.nix | 17 ------ hosts/{servers => }/remilia/boot.nix | 0 hosts/remilia/default.nix | 12 ++++ hosts/{servers => }/remilia/hardware.nix | 0 hosts/{servers => }/remilia/mailserver.nix | 0 hosts/{servers => }/remilia/networking.nix | 0 hosts/{servers => }/remilia/services.nix | 2 +- hosts/{personal => }/satori/boot.nix | 0 hosts/{personal => }/satori/cirno.png | Bin hosts/satori/default.nix | 13 +++++ hosts/{personal => }/satori/hardware.nix | 0 hosts/{personal => }/satori/networking.nix | 0 hosts/{personal => }/satori/pkgs.nix | 0 hosts/{personal => }/satori/services.nix | 2 +- hosts/{personal => }/satori/stuff.nix | 0 hosts/servers/marisa.nix | 16 ------ hosts/servers/marisa/cachix.nix | 14 ----- hosts/servers/marisa/cachix/rpi4.nix | 12 ---- hosts/servers/remilia.nix | 17 ------ hosts/servers/remilia/builder.nix | 14 ----- {hosts/servers/marisa => modules}/builder.nix | 2 +- {hosts/personal/common => modules}/colemak-dh | 0 .../servers/pkgs.nix => modules/min-pkgs.nix | 5 +- .../stuff.nix => modules/min-stuff.nix | 0 .../common => modules}/nvidia-offload.nix | 0 configs/nvim.nix => modules/nvim/default.nix | 4 +- {configs => modules}/nvim/gruvbox.patch | 0 {configs => modules}/nvim/init.lua | 0 .../personal/common => modules}/pipewire.nix | 0 {hosts/personal/common => modules}/xorg.nix | 0 41 files changed, 86 insertions(+), 126 deletions(-) delete mode 100644 colemak-dh.xkm create mode 100644 hosts/README.md rename hosts/{servers => }/marisa/boot.nix (100%) create mode 100755 hosts/marisa/default.nix rename hosts/{servers => }/marisa/hardware.nix (100%) rename hosts/{servers => }/marisa/networking.nix (100%) rename hosts/{servers => }/marisa/services.nix (95%) delete mode 100644 hosts/personal/README.md delete mode 100644 hosts/personal/satori.nix rename hosts/{servers => }/remilia/boot.nix (100%) create mode 100755 hosts/remilia/default.nix rename hosts/{servers => }/remilia/hardware.nix (100%) rename hosts/{servers => }/remilia/mailserver.nix (100%) rename hosts/{servers => }/remilia/networking.nix (100%) rename hosts/{servers => }/remilia/services.nix (97%) rename hosts/{personal => }/satori/boot.nix (100%) rename hosts/{personal => }/satori/cirno.png (100%) create mode 100644 hosts/satori/default.nix rename hosts/{personal => }/satori/hardware.nix (100%) rename hosts/{personal => }/satori/networking.nix (100%) rename hosts/{personal => }/satori/pkgs.nix (100%) rename hosts/{personal => }/satori/services.nix (95%) rename hosts/{personal => }/satori/stuff.nix (100%) delete mode 100755 hosts/servers/marisa.nix delete mode 100644 hosts/servers/marisa/cachix.nix delete mode 100644 hosts/servers/marisa/cachix/rpi4.nix delete mode 100755 hosts/servers/remilia.nix delete mode 100644 hosts/servers/remilia/builder.nix rename {hosts/servers/marisa => modules}/builder.nix (85%) rename {hosts/personal/common => modules}/colemak-dh (100%) rename hosts/servers/pkgs.nix => modules/min-pkgs.nix (91%) rename hosts/servers/stuff.nix => modules/min-stuff.nix (100%) rename {hosts/personal/common => modules}/nvidia-offload.nix (100%) rename configs/nvim.nix => modules/nvim/default.nix (86%) rename {configs => modules}/nvim/gruvbox.patch (100%) rename {configs => modules}/nvim/init.lua (100%) rename {hosts/personal/common => modules}/pipewire.nix (100%) rename {hosts/personal/common => modules}/xorg.nix (100%) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b5c3c6b..a16f201 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,11 +12,10 @@ jobs: matrix: pkg: - anup - - customscripts - - mpd_discord_richpresence + - discord + - proxychains - st - dmenu - - kbd steps: - uses: actions/checkout@v2.3.4 - uses: cachix/install-nix-action@v13 diff --git a/colemak-dh.xkm b/colemak-dh.xkm deleted file mode 100644 index d08701a9f3185fe0c9321f6bc375c69db224b322..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13088 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 Cw$Jha diff --git a/flake.nix b/flake.nix index da8af40..4cf4497 100644 --- a/flake.nix +++ b/flake.nix @@ -40,6 +40,22 @@ }; }) // ( + let + personalModules = [ + ./modules/nvidia-offload.nix + ./modules/pipewire.nix + ./modules/xorg.nix + ]; + commonModules = [ + ./modules/nvim + ./modules/vault-agent.nix + ]; + serverModules = [ + ./modules/builder.nix + ./modules/min-pkgs.nix + ./modules/min-stuff.nix + ]; + in { hm-configs = { natto = inputs.home-manager.lib.homeManagerConfiguration { @@ -61,48 +77,44 @@ #Home laptop Satori = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - modules = [ - ./hosts/personal/satori.nix + modules = [ + ./hosts/satori inputs.agenix.nixosModules.age inputs.home-manager.nixosModules.home-manager { nixpkgs.pkgs = self.legacyPackages.x86_64-linux; } - ]; + ] + ++ personalModules + ++ commonModules; }; + #Home server (RPi4) Marisa = nixpkgs.lib.nixosSystem { system = "aarch64-linux"; - modules = [ - ./modules/vault-agent.nix - ./hosts/servers/marisa.nix + modules = [ + ./hosts/marisa #inputs.mailserver.nixosModules.mailserver { nixpkgs.pkgs = self.legacyPackages.aarch64-linux; } - ]; - }; - #idk, maybe to try cross compiling Marisa on home laptop later? - Marisus = nixpkgs.lib.nixosSystem { - system = "aarch64-linux"; - modules = [ - ./hosts/servers/marisa.nix - { - nixpkgs.pkgs = (self.legacyPackages.x86_64-linux) // {crossSystem.config = "aarch64-unknown-linux-gnu";}; - } - ]; + ] + ++ commonModules + ++ serverModules; }; + #Oracle Cloud VM Remilia = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - modules = [ - ./modules/vault-agent.nix - ./hosts/servers/remilia.nix + modules = [ + ./hosts/remilia inputs.mailserver.nixosModules.mailserver { nixpkgs.pkgs = self.legacyPackages.x86_64-linux; } - ]; + ] + ++ commonModules + ++ serverModules; }; }; }); diff --git a/hm-switch b/hm-switch index bd895a6..1c1ef02 100755 --- a/hm-switch +++ b/hm-switch @@ -3,7 +3,7 @@ echo "You're about to switch your home-manager configuration as '$USER'" read -p "Continue (y/n)?" conf -if [ ${conf,,} == "n" ]; then +if [ ${conf,,} != "y" ]; then echo "If this is not you, then log into your profile first!" exit 1 else diff --git a/hosts/README.md b/hosts/README.md new file mode 100644 index 0000000..a909ca3 --- /dev/null +++ b/hosts/README.md @@ -0,0 +1,3 @@ +Satori is my home laptop\ +Marisa is my Raspberry Pi 4 (B)\ +Remilia is my cloud VM diff --git a/hosts/servers/marisa/boot.nix b/hosts/marisa/boot.nix similarity index 100% rename from hosts/servers/marisa/boot.nix rename to hosts/marisa/boot.nix diff --git a/hosts/marisa/default.nix b/hosts/marisa/default.nix new file mode 100755 index 0000000..a02b114 --- /dev/null +++ b/hosts/marisa/default.nix @@ -0,0 +1,12 @@ +{config, pkgs, ...}: +{ + imports = + [ + ./networking.nix + ./hardware.nix + ./boot.nix + ./services.nix + ]; + programs.gnupg.agent.enable = pkgs.lib.mkForce false; + system.stateVersion = "21.05"; +} diff --git a/hosts/servers/marisa/hardware.nix b/hosts/marisa/hardware.nix similarity index 100% rename from hosts/servers/marisa/hardware.nix rename to hosts/marisa/hardware.nix diff --git a/hosts/servers/marisa/networking.nix b/hosts/marisa/networking.nix similarity index 100% rename from hosts/servers/marisa/networking.nix rename to hosts/marisa/networking.nix diff --git a/hosts/servers/marisa/services.nix b/hosts/marisa/services.nix similarity index 95% rename from hosts/servers/marisa/services.nix rename to hosts/marisa/services.nix index 1a72faa..6822bd5 100755 --- a/hosts/servers/marisa/services.nix +++ b/hosts/marisa/services.nix @@ -6,8 +6,7 @@ permitRootLogin = "yes"; }; vault = { - package = pkgs.vault-bin; - enable = true; + package = pkgs.vault-bin; enable = true; tlsCertFile = "/var/certs/cert.pem"; tlsKeyFile = "/var/certs/key.pem"; address = "0.0.0.0:8800"; @@ -97,5 +96,5 @@ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPX1HDzWpoaOcU8GDEGuDzXgxkCpyeqxRR6gLs/8JgHw" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK06ZUa9BKmZ6m+xapBjOAm10OCLzxIm8ais20wQC47m" ]; - security.pki.certificateFiles = [ ../../../cert.pem ]; + security.pki.certificateFiles = [ ../../cert.pem ]; } diff --git a/hosts/personal/README.md b/hosts/personal/README.md deleted file mode 100644 index 7599078..0000000 --- a/hosts/personal/README.md +++ /dev/null @@ -1 +0,0 @@ -Satori is my home laptop diff --git a/hosts/personal/satori.nix b/hosts/personal/satori.nix deleted file mode 100644 index 95965ce..0000000 --- a/hosts/personal/satori.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ lib, config, ...}: -{ - imports = - [ - ./satori/hardware.nix - ./satori/stuff.nix - ./satori/pkgs.nix - ./satori/networking.nix - ./satori/boot.nix - ./satori/services.nix - ./common/nvidia-offload.nix - ./common/pipewire.nix - ./common/xorg.nix - ../../configs/nvim.nix - ]; - system.stateVersion = "21.05"; -} diff --git a/hosts/servers/remilia/boot.nix b/hosts/remilia/boot.nix similarity index 100% rename from hosts/servers/remilia/boot.nix rename to hosts/remilia/boot.nix diff --git a/hosts/remilia/default.nix b/hosts/remilia/default.nix new file mode 100755 index 0000000..81e3af3 --- /dev/null +++ b/hosts/remilia/default.nix @@ -0,0 +1,12 @@ +{lib, config, ...}: +{ + imports = + [ + ./networking.nix + ./hardware.nix + ./boot.nix + ./services.nix + ./mailserver.nix + ]; + system.stateVersion = "21.11"; +} diff --git a/hosts/servers/remilia/hardware.nix b/hosts/remilia/hardware.nix similarity index 100% rename from hosts/servers/remilia/hardware.nix rename to hosts/remilia/hardware.nix diff --git a/hosts/servers/remilia/mailserver.nix b/hosts/remilia/mailserver.nix similarity index 100% rename from hosts/servers/remilia/mailserver.nix rename to hosts/remilia/mailserver.nix diff --git a/hosts/servers/remilia/networking.nix b/hosts/remilia/networking.nix similarity index 100% rename from hosts/servers/remilia/networking.nix rename to hosts/remilia/networking.nix diff --git a/hosts/servers/remilia/services.nix b/hosts/remilia/services.nix similarity index 97% rename from hosts/servers/remilia/services.nix rename to hosts/remilia/services.nix index a0e813b..2beea3e 100755 --- a/hosts/servers/remilia/services.nix +++ b/hosts/remilia/services.nix @@ -75,5 +75,5 @@ "git.weirdnatto.in".email = "git+acme@weirdnatto.in"; }; }; - security.pki.certificateFiles = [ ../../../cert.pem ]; + security.pki.certificateFiles = [ ../../cert.pem ]; } diff --git a/hosts/personal/satori/boot.nix b/hosts/satori/boot.nix similarity index 100% rename from hosts/personal/satori/boot.nix rename to hosts/satori/boot.nix diff --git a/hosts/personal/satori/cirno.png b/hosts/satori/cirno.png similarity index 100% rename from hosts/personal/satori/cirno.png rename to hosts/satori/cirno.png diff --git a/hosts/satori/default.nix b/hosts/satori/default.nix new file mode 100644 index 0000000..3fb351e --- /dev/null +++ b/hosts/satori/default.nix @@ -0,0 +1,13 @@ +{ lib, config, ...}: +{ + imports = + [ + ./hardware.nix + ./stuff.nix + ./pkgs.nix + ./networking.nix + ./boot.nix + ./services.nix + ]; + system.stateVersion = "21.05"; +} diff --git a/hosts/personal/satori/hardware.nix b/hosts/satori/hardware.nix similarity index 100% rename from hosts/personal/satori/hardware.nix rename to hosts/satori/hardware.nix diff --git a/hosts/personal/satori/networking.nix b/hosts/satori/networking.nix similarity index 100% rename from hosts/personal/satori/networking.nix rename to hosts/satori/networking.nix diff --git a/hosts/personal/satori/pkgs.nix b/hosts/satori/pkgs.nix similarity index 100% rename from hosts/personal/satori/pkgs.nix rename to hosts/satori/pkgs.nix diff --git a/hosts/personal/satori/services.nix b/hosts/satori/services.nix similarity index 95% rename from hosts/personal/satori/services.nix rename to hosts/satori/services.nix index a9a6f6c..4aeefd9 100644 --- a/hosts/personal/satori/services.nix +++ b/hosts/satori/services.nix @@ -31,7 +31,7 @@ #printing.wantedBy = lib.mkForce []; #vault.wantedBy = lib.mkForce []; }; - security.pki.certificateFiles = [ ../../../cert.pem ]; + security.pki.certificateFiles = [ ../../cert.pem ]; /* virtualisation.libvirtd = { enable = true; onBoot = "ignore"; diff --git a/hosts/personal/satori/stuff.nix b/hosts/satori/stuff.nix similarity index 100% rename from hosts/personal/satori/stuff.nix rename to hosts/satori/stuff.nix diff --git a/hosts/servers/marisa.nix b/hosts/servers/marisa.nix deleted file mode 100755 index f184bd9..0000000 --- a/hosts/servers/marisa.nix +++ /dev/null @@ -1,16 +0,0 @@ -{config, pkgs, ...}: -{ - imports = - [ - ./pkgs.nix - ./stuff.nix - ./marisa/networking.nix - ./marisa/hardware.nix - ./marisa/boot.nix - ./marisa/services.nix - ./marisa/builder.nix - ../../configs/nvim.nix - ]; - programs.gnupg.agent.enable = pkgs.lib.mkForce false; - system.stateVersion = "21.05"; -} diff --git a/hosts/servers/marisa/cachix.nix b/hosts/servers/marisa/cachix.nix deleted file mode 100644 index cce90a3..0000000 --- a/hosts/servers/marisa/cachix.nix +++ /dev/null @@ -1,14 +0,0 @@ - -# WARN: this file will get overwritten by $ cachix use -{ pkgs, lib, ... }: - -let - folder = ./cachix; - toImport = name: value: folder + ("/" + name); - filterCaches = key: value: value == "regular" && lib.hasSuffix ".nix" key; - imports = lib.mapAttrsToList toImport (lib.filterAttrs filterCaches (builtins.readDir folder)); -in { - inherit imports; - nix.binaryCaches = ["https://cache.nixos.org/"]; -} - \ No newline at end of file diff --git a/hosts/servers/marisa/cachix/rpi4.nix b/hosts/servers/marisa/cachix/rpi4.nix deleted file mode 100644 index f678710..0000000 --- a/hosts/servers/marisa/cachix/rpi4.nix +++ /dev/null @@ -1,12 +0,0 @@ - -{ - nix = { - binaryCaches = [ - "https://rpi4.cachix.org" - ]; - binaryCachePublicKeys = [ - "rpi4.cachix.org-1:fMaYBuIlj/Sa9YTXnXMXoXnVZEoVhnFxOkxseKKlku8=" - ]; - }; -} - \ No newline at end of file diff --git a/hosts/servers/remilia.nix b/hosts/servers/remilia.nix deleted file mode 100755 index 9f94606..0000000 --- a/hosts/servers/remilia.nix +++ /dev/null @@ -1,17 +0,0 @@ -{lib, config, ...}: -{ - imports = - [ - ./pkgs.nix - ./stuff.nix - ./remilia/networking.nix - ./remilia/hardware.nix - ./remilia/boot.nix - ./remilia/services.nix - ./remilia/builder.nix - ./remilia/mailserver.nix - ../../configs/nvim.nix - ]; - # programs.gnupg.agent.enable = lib.mkForce false; - system.stateVersion = "21.11"; -} diff --git a/hosts/servers/remilia/builder.nix b/hosts/servers/remilia/builder.nix deleted file mode 100644 index 4ded076..0000000 --- a/hosts/servers/remilia/builder.nix +++ /dev/null @@ -1,14 +0,0 @@ -{config, ...}: -{ - nix.buildMachines = [ { - hostName = "Satori"; - system = "x86_64-linux"; - maxJobs = 4; - speedFactor = 2; - supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ]; - }] ; - nix.distributedBuilds = true; - nix.extraOptions = '' - builders-use-substitutes = true - ''; -} diff --git a/hosts/servers/marisa/builder.nix b/modules/builder.nix similarity index 85% rename from hosts/servers/marisa/builder.nix rename to modules/builder.nix index db0c60b..72479d9 100644 --- a/hosts/servers/marisa/builder.nix +++ b/modules/builder.nix @@ -2,7 +2,7 @@ { nix.buildMachines = [ { hostName = "Satori"; - system = "aarch64-linux"; + systems = ["x86_64-linux" "aarch64-linux"]; maxJobs = 4; speedFactor = 2; supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ]; diff --git a/hosts/personal/common/colemak-dh b/modules/colemak-dh similarity index 100% rename from hosts/personal/common/colemak-dh rename to modules/colemak-dh diff --git a/hosts/servers/pkgs.nix b/modules/min-pkgs.nix similarity index 91% rename from hosts/servers/pkgs.nix rename to modules/min-pkgs.nix index 0a2dcec..af7aada 100755 --- a/hosts/servers/pkgs.nix +++ b/modules/min-pkgs.nix @@ -6,7 +6,9 @@ vim wireguard vault + tree-sitter ]; + programs = { zsh = { enable = true; @@ -24,13 +26,12 @@ }; }; }; + nix = { package = pkgs.nixUnstable; extraOptions = '' experimental-features = nix-command ca-references flakes - builders-use-substitutes = true ''; trustedUsers = [ "root" ]; }; - documentation.enable = false; } diff --git a/hosts/servers/stuff.nix b/modules/min-stuff.nix similarity index 100% rename from hosts/servers/stuff.nix rename to modules/min-stuff.nix diff --git a/hosts/personal/common/nvidia-offload.nix b/modules/nvidia-offload.nix similarity index 100% rename from hosts/personal/common/nvidia-offload.nix rename to modules/nvidia-offload.nix diff --git a/configs/nvim.nix b/modules/nvim/default.nix similarity index 86% rename from configs/nvim.nix rename to modules/nvim/default.nix index bbb2d42..2fcda6f 100644 --- a/configs/nvim.nix +++ b/modules/nvim/default.nix @@ -10,7 +10,7 @@ configure = { customRC = '' lua << EOF - ${builtins.readFile ./nvim/init.lua} + ${builtins.readFile ./init.lua} EOF ''; packages.myVimPackage = with pkgs.unstable.vimPlugins; { @@ -30,7 +30,7 @@ vim-vsnip nvim-treesitter vim-nix - (gruvbox.overrideAttrs (oa: { patches = [ ./nvim/gruvbox.patch ]; })) + (gruvbox.overrideAttrs (oa: { patches = [ ./gruvbox.patch ]; })) ]; }; }; diff --git a/configs/nvim/gruvbox.patch b/modules/nvim/gruvbox.patch similarity index 100% rename from configs/nvim/gruvbox.patch rename to modules/nvim/gruvbox.patch diff --git a/configs/nvim/init.lua b/modules/nvim/init.lua similarity index 100% rename from configs/nvim/init.lua rename to modules/nvim/init.lua diff --git a/hosts/personal/common/pipewire.nix b/modules/pipewire.nix similarity index 100% rename from hosts/personal/common/pipewire.nix rename to modules/pipewire.nix diff --git a/hosts/personal/common/xorg.nix b/modules/xorg.nix similarity index 100% rename from hosts/personal/common/xorg.nix rename to modules/xorg.nix