From 0eb6aeb456d25e37c2bac3a962dd46d7fba4b7be Mon Sep 17 00:00:00 2001 From: ChaotiCryptidz Date: Sun, 26 Dec 2021 15:43:53 +0000 Subject: [PATCH] start work on allowing use of deploy-rs --- home/apps/telegram/telegram.nix | 6 +- home/apps/vivaldi/vivaldi.nix | 6 +- home/dev/extra.nix | 4 +- home/dev/info.nix | 4 +- home/dev/network.nix | 1 + hosts/lappy.nix | 87 +++++++++++++------------ outputs.nix | 16 +++-- profiles/gaming/gaming.nix | 4 +- profiles/gui/default.nix | 4 +- profiles/sway/sway.nix | 2 +- users/chaoticryptidz/chaoticryptidz.nix | 3 + 11 files changed, 66 insertions(+), 71 deletions(-) diff --git a/home/apps/telegram/telegram.nix b/home/apps/telegram/telegram.nix index 0b7ba6a..26f7907 100644 --- a/home/apps/telegram/telegram.nix +++ b/home/apps/telegram/telegram.nix @@ -1,5 +1 @@ -{ config, pkgs, ... }: { - home.packages = with pkgs; [ - tdesktop - ]; -} +{ config, pkgs, ... }: { home.packages = with pkgs; [ tdesktop ]; } diff --git a/home/apps/vivaldi/vivaldi.nix b/home/apps/vivaldi/vivaldi.nix index 479a35e..9ab2280 100644 --- a/home/apps/vivaldi/vivaldi.nix +++ b/home/apps/vivaldi/vivaldi.nix @@ -1,7 +1,3 @@ { config, pkgs, ... }: { - home.packages = with pkgs; [ - vivaldi - vivaldi-ffmpeg-codecs - vivaldi-widevine - ]; + home.packages = with pkgs; [ vivaldi vivaldi-ffmpeg-codecs vivaldi-widevine ]; } diff --git a/home/dev/extra.nix b/home/dev/extra.nix index a1c3f43..60c6c24 100644 --- a/home/dev/extra.nix +++ b/home/dev/extra.nix @@ -1,3 +1 @@ -{ pkgs, ... }: { - home.packages = with pkgs; [ jq ripgrep fd pv tmux socat ]; -} +{ pkgs, ... }: { home.packages = with pkgs; [ jq ripgrep fd pv tmux socat ]; } diff --git a/home/dev/info.nix b/home/dev/info.nix index 25659af..31fcf3f 100644 --- a/home/dev/info.nix +++ b/home/dev/info.nix @@ -1,3 +1 @@ -{ pkgs, ... }: { - home.packages = with pkgs; [ neofetch inxi htop ]; -} +{ pkgs, ... }: { home.packages = with pkgs; [ neofetch inxi htop ]; } diff --git a/home/dev/network.nix b/home/dev/network.nix index ba37bc4..11f4ab3 100644 --- a/home/dev/network.nix +++ b/home/dev/network.nix @@ -8,5 +8,6 @@ rsync openssh mosh + nmap ]; } diff --git a/hosts/lappy.nix b/hosts/lappy.nix index 6a35949..8584b7d 100644 --- a/hosts/lappy.nix +++ b/hosts/lappy.nix @@ -14,51 +14,52 @@ profiles.gaming ]; - config.home-manager.users.root = { imports = with tree; [ home.base ]; }; - - config.home-manager.users.chaoticryptidz = { - imports = with tree; [ - home.base - home.bluetooth - home.gui - home.gaming - home.dev - home.network_manager - home.sway - home.reversing - home.apps.vivaldi - home.apps.telegram - home.programming - home.programming.languages.go - home.programming.languages.nix - ]; - }; - - config.networking.hostName = "lappy"; - config.time.timeZone = "Europe/London"; - config.powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; - - config.boot = { - loader = { - systemd-boot.enable = true; - efi.canTouchEfiVariables = true; + config = { + home-manager.users.root = { imports = with tree; [ home.base ]; }; + home-manager.users.chaoticryptidz = { + imports = with tree; [ + home.base + home.bluetooth + home.gui + home.gaming + home.dev + home.network_manager + home.sway + home.reversing + home.apps.vivaldi + home.apps.telegram + home.programming + home.programming.languages.go + home.programming.languages.nix + ]; }; - initrd.availableKernelModules = - [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; - kernelModules = [ "kvm-intel" ]; - }; - config.fileSystems = { - "/" = { - device = "/dev/disk/by-uuid/491ec94c-5e6a-4d23-a2a6-bcf4971a6e7b"; - fsType = "ext4"; - }; - "/boot" = { - device = "/dev/disk/by-uuid/61F3-FD84"; - fsType = "vfat"; - }; - }; + networking.hostName = "lappy"; + time.timeZone = "Europe/London"; + powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; - config.system.stateVersion = "21.11"; + boot = { + loader = { + systemd-boot.enable = true; + efi.canTouchEfiVariables = true; + }; + initrd.availableKernelModules = + [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; + kernelModules = [ "kvm-intel" ]; + }; + + fileSystems = { + "/" = { + device = "/dev/disk/by-uuid/491ec94c-5e6a-4d23-a2a6-bcf4971a6e7b"; + fsType = "ext4"; + }; + "/boot" = { + device = "/dev/disk/by-uuid/61F3-FD84"; + fsType = "vfat"; + }; + }; + + system.stateVersion = "21.11"; + }; } diff --git a/outputs.nix b/outputs.nix index 37e5eb9..d1fe11e 100644 --- a/outputs.nix +++ b/outputs.nix @@ -1,4 +1,4 @@ -{ nixpkgs, home-manager, ... }@inputs: +{ self, nixpkgs, home-manager, deploy-rs, ... }@inputs: let mkTree = import ./tree.nix { inherit (nixpkgs) lib; }; tree = mkTree { @@ -13,9 +13,15 @@ let }; }; in { - legacyPackages.tree = tree; - nixosConfigurations = import ./hosts { - nixosSystem = nixpkgs.lib.nixosSystem; - inherit nixpkgs home-manager tree; + #legacyPackages.tree = tree; + nixosConfigurations = import ./hosts { inherit nixpkgs home-manager tree; }; + + deploy.nodes.lappy = { + hostname = "my.server.gov"; + profiles.system = { + user = "root"; + path = deploy-rs.lib.x86_64-linux.activate.nixos + self.nixosConfigurations.lappy; + }; }; } diff --git a/profiles/gaming/gaming.nix b/profiles/gaming/gaming.nix index 15d59e4..04dd32b 100644 --- a/profiles/gaming/gaming.nix +++ b/profiles/gaming/gaming.nix @@ -1,3 +1 @@ -{ pkgs, ... }: { - programs.steam.enable = true; -} +{ pkgs, ... }: { programs.steam.enable = true; } diff --git a/profiles/gui/default.nix b/profiles/gui/default.nix index cd33233..330a975 100644 --- a/profiles/gui/default.nix +++ b/profiles/gui/default.nix @@ -1,3 +1 @@ -{ config, pkgs, ... }: { - fonts.fonts = with pkgs; [ comic-neue comic-code ]; -} +{ config, pkgs, ... }: { fonts.fonts = with pkgs; [ comic-neue comic-code ]; } diff --git a/profiles/sway/sway.nix b/profiles/sway/sway.nix index 3361e55..bd27bf8 100644 --- a/profiles/sway/sway.nix +++ b/profiles/sway/sway.nix @@ -1,7 +1,7 @@ { config, pkgs, ... }: { programs.sway.enable = true; programs.xwayland.enable = true; - services.xserver.enable = true; + #services.xserver.enable = true; #systemd.services.display-manager.enable = true; #services.xserver.displayManager.sddm.enable = true; } diff --git a/users/chaoticryptidz/chaoticryptidz.nix b/users/chaoticryptidz/chaoticryptidz.nix index 7311bc4..90bc3be 100644 --- a/users/chaoticryptidz/chaoticryptidz.nix +++ b/users/chaoticryptidz/chaoticryptidz.nix @@ -3,5 +3,8 @@ isNormalUser = true; extraGroups = [ "wheel" "video" "systemd-journal" "plugdev" "vfio" "input" "uinput" ]; + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL4L1eBZzYXZNGBucTn/eOFp48el9JPiYt9iXQDpBSg/ chaoticryptidz@owo.monster" + ]; }; }