diff --git a/flake.nix b/flake.nix index 647e05f..1a52682 100644 --- a/flake.nix +++ b/flake.nix @@ -39,6 +39,7 @@ firefly = mkNixos [ ./hosts/firefly/system ]; shuttleworth = mkNixos [ ./hosts/shuttleworth/system ]; lacros = mkNixos [ ./hosts/lacros/system ]; + redmond = mkNixos [ ./hosts/redmond/system ]; # Servers cyberspark = mkNixos [ ./hosts/cyberspark/system ]; @@ -50,6 +51,7 @@ "jimbo@firefly" = mkHome [ ./hosts/firefly/home ] nixpkgs.legacyPackages.x86_64-linux; "jimbo@shuttleworth" = mkHome [ ./hosts/shuttleworth/home ] nixpkgs.legacyPackages.aarch64-linux; "jimbo@lacros" = mkHome [ ./hosts/lacros/home ] nixpkgs.legacyPackages.x86_64-linux; + "jimbo@redmond" = mkHome [ ./hosts/redmond/home ] nixpkgs.legacyPackages.x86_64-linux; "jimbo@cyberspark" = mkHome [ ./hosts/cyberspark/home ] nixpkgs.legacyPackages.x86_64-linux; "jimbo@bomberman" = mkHome [ ./hosts/bomberman/home ] nixpkgs.legacyPackages.aarch64-linux; diff --git a/hosts/redmond/home/default.nix b/hosts/redmond/home/default.nix new file mode 100644 index 0000000..b8ab842 --- /dev/null +++ b/hosts/redmond/home/default.nix @@ -0,0 +1,24 @@ +{ config, nur, ... }: +{ + imports = [ + # Apps and programs + ../../../modules/home + ../../../modules/home/users + ../../../modules/home/files + ../../../modules/home/settings + ../../../modules/home/programs + ../../../modules/home/programs/misc/production + ../../../modules/home/programs/misc/gaming/launchers + ../../../modules/home/programs/misc/remote-desktop + ../../../modules/home/sway + ../../../modules/home/utils + + # Misc + ../../../overlays + ../../../variables + ../../../variables/look/colors/green + + # Imports + nur.nixosModules.nur + ]; +} diff --git a/hosts/redmond/id_ed25519.pub b/hosts/redmond/id_ed25519.pub new file mode 100644 index 0000000..0978bb1 --- /dev/null +++ b/hosts/redmond/id_ed25519.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG9uITpyw5WgxT7UnswueFtyWxAqQCZv4h9DfcDkr+kn jimbo@nixos diff --git a/hosts/redmond/system/default.nix b/hosts/redmond/system/default.nix new file mode 100644 index 0000000..cb94503 --- /dev/null +++ b/hosts/redmond/system/default.nix @@ -0,0 +1,27 @@ +{ config, lib, ... }: +{ + imports = [ + ./hardware + + # Apps and programs + ../../../modules/system + ../../../modules/system/accounts + ../../../modules/system/desktop + ../../../modules/system/programs + ../../../modules/system/services + + # Devices and hardware + ../../../modules/system/devices + ../../../modules/system/devices/boot/systemd + ../../../modules/system/devices/networking/wireless + ../../../modules/system/devices/networking/firewall/pc + ../../../modules/system/devices/networking/wireguard/pc + + # Extras + ../../../overlays + ../../../variables + ]; + + networking.hostName = "redmond"; + networking.wireguard.interfaces."${config.ips.wgInt}".ips = [ "${config.ips.wgSpan}.20/24" ]; +} diff --git a/hosts/redmond/system/hardware/default.nix b/hosts/redmond/system/hardware/default.nix new file mode 100644 index 0000000..cc0578f --- /dev/null +++ b/hosts/redmond/system/hardware/default.nix @@ -0,0 +1,38 @@ +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot = { + initrd = { + availableKernelModules = [ + "xhci_pci" + "ahci" + "ehci_pci" + "sd_mod" + "sr_mod" + "sdhci_pci" + "rtsx_usb_sdmmc" + ]; + }; + kernelModules = [ "kvm-amd" ]; + }; + + fileSystems = { + "/" = { + device = "/dev/disk/by-uuid/c0fe8419-88f9-48a0-8c5b-acd4c11f8037"; + fsType = "ext4"; + }; + "/boot" = { + device = "/dev/disk/by-uuid/BF2B-9AE0"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; + }; + + networking.useDHCP = lib.mkDefault true; + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/modules/home/files/assets/wallpapers/leaves/1.png b/modules/home/files/assets/wallpapers/leaves/1.png new file mode 100644 index 0000000..8ec765b Binary files /dev/null and b/modules/home/files/assets/wallpapers/leaves/1.png differ diff --git a/modules/home/files/assets/wallpapers/leaves/2.png b/modules/home/files/assets/wallpapers/leaves/2.png new file mode 100644 index 0000000..69a4568 Binary files /dev/null and b/modules/home/files/assets/wallpapers/leaves/2.png differ diff --git a/modules/home/files/assets/wallpapers/leaves/3.png b/modules/home/files/assets/wallpapers/leaves/3.png new file mode 100644 index 0000000..3312d13 Binary files /dev/null and b/modules/home/files/assets/wallpapers/leaves/3.png differ diff --git a/modules/system/devices/networking/wireguard/pc/default.nix b/modules/system/devices/networking/wireguard/pc/default.nix index a792486..5a4e531 100644 --- a/modules/system/devices/networking/wireguard/pc/default.nix +++ b/modules/system/devices/networking/wireguard/pc/default.nix @@ -10,9 +10,9 @@ listenPort = 51820; privateKey = config.secrets.wgClientPriv; peers = [ - { # 0.0.0.0 makes wg act like a traditional VPN + { publicKey = config.secrets.wgServerPub; - allowedIPs = [ "0.0.0.0/0" ]; + allowedIPs = [ "${config.ips.wgSpan}.0/24" ]; endpoint = "sv.${config.secrets.jimDomain}:51820"; persistentKeepalive = 25; } diff --git a/variables/look/colors/green/default.nix b/variables/look/colors/green/default.nix new file mode 100644 index 0000000..bc7fbb3 --- /dev/null +++ b/variables/look/colors/green/default.nix @@ -0,0 +1,22 @@ +{ lib, config, ... }: +{ + options.look.colors = lib.mkOption { + type = lib.types.attrs; + default = {}; + }; + + config.look.colors = { + prime = "12c949"; #12c949 + accent = "115622"; #115622 + split = "2c7250"; #2c7250 + actSplit = "457551"; #457551 + dark = "101911"; #101911 + mid = "17231c"; #17231c + light = "263327"; #263327 + urgent = "C43823"; #C43823 + text = "C7D3E3"; #C7D3E3 + + folder = "green"; + wallpapers = "leaves"; + }; +}