From e34907e038f7d0a3d997c3a0ec271e76ce5d9cc8 Mon Sep 17 00:00:00 2001 From: specCon18 Date: Fri, 21 Jul 2023 02:12:27 -0400 Subject: [PATCH] added katana --- flake.nix | 12 ++++----- hosts/katana/default.nix | 51 ++++++++++++++++++++++++++++++++++++ hosts/katana/networkd.nix | 13 +++++++++ hosts/katana/system-pkgs.nix | 29 ++++++++++++++++++++ hosts/openldap.nix | 42 ----------------------------- machines/katana.nix | 36 +++++++++++++++++++++++++ 6 files changed, 134 insertions(+), 49 deletions(-) create mode 100644 hosts/katana/default.nix create mode 100644 hosts/katana/networkd.nix create mode 100644 hosts/katana/system-pkgs.nix delete mode 100644 hosts/openldap.nix create mode 100644 machines/katana.nix diff --git a/flake.nix b/flake.nix index d38fabe..904eca8 100644 --- a/flake.nix +++ b/flake.nix @@ -69,17 +69,15 @@ ./modules/system/desktop-environments/gnome.nix ] #extra modules to load []; #extra modules to be loaded by home-manager - creatorforge-framework = mkComputer - ./machines/framework.nix #machine specific configuration + katana = mkComputer + ./machines/katana.nix #machine specific configuration "speccon18" #default user [ - nixos-hardware.nixosModules.framework-12th-gen-intel - disko.nixosModules.disko hyprland.nixosModules.default {programs.hyprland.enable = true;} - ./hosts/creatorforge/creatorforge.nix - ./hosts/creatorforge/networkd.nix - ./hosts/creatorforge/system-pkgs.nix + ./hosts/katana/default.nix + ./hosts/katana/networkd.nix + ./hosts/katana/system-pkgs.nix ./modules/system/services/docker.nix ./modules/system/services/openssh.nix ./modules/system/desktop-environments/gnome.nix diff --git a/hosts/katana/default.nix b/hosts/katana/default.nix new file mode 100644 index 0000000..5283845 --- /dev/null +++ b/hosts/katana/default.nix @@ -0,0 +1,51 @@ +{ modulesPath, config, pkgs, lib, self, ... }: + +{ + system.stateVersion = "23.05"; + + # Allow the use of unfree packages + nixpkgs.config.allowUnfree = true; + + # Sound + sound.enable = true; + hardware.pulseaudio.enable = false; + security.rtkit.enable = true; + + # Localization + time.timeZone = "America/Detroit"; + i18n = { + defaultLocale = "en_US.UTF-8"; + extraLocaleSettings = { + LC_ADDRESS = "en_US.UTF-8"; + LC_IDENTIFICATION = "en_US.UTF-8"; + LC_MEASUREMENT = "en_US.UTF-8"; + LC_MONETARY = "en_US.UTF-8"; + LC_NAME = "en_US.UTF-8"; + LC_NUMERIC = "en_US.UTF-8"; + LC_PAPER = "en_US.UTF-8"; + LC_TELEPHONE = "en_US.UTF-8"; + LC_TIME = "en_US.UTF-8"; + }; + }; + + # Enable Services. + services = { + printing.enable = true; + xserver = { + enable = true; + displayManager.gdm.enable = true; + desktopManager.gnome.enable = true; + layout = "us"; + xkbVariant = ""; + }; + pipewire = { + enable = true; + alsa = { + enable = true; + support32Bit = true; + }; + pulse.enable = true; + jack.enable = true; + }; + }; +} \ No newline at end of file diff --git a/hosts/katana/networkd.nix b/hosts/katana/networkd.nix new file mode 100644 index 0000000..777fa9b --- /dev/null +++ b/hosts/katana/networkd.nix @@ -0,0 +1,13 @@ + +{ modulesPath, config, pkgs, lib, self, ... }: + +{ + networking = { + hostName = "katana"; # Define your hostname. + networkmanager.enable = true; #Enable Network Manager + firewall = { + allowedTCPPorts = []; + allowedUDPPorts = []; + }; + }; +} \ No newline at end of file diff --git a/hosts/katana/system-pkgs.nix b/hosts/katana/system-pkgs.nix new file mode 100644 index 0000000..35d3363 --- /dev/null +++ b/hosts/katana/system-pkgs.nix @@ -0,0 +1,29 @@ +{ modulesPath, config, pkgs, lib, self, ... }: +{ + environment.systemPackages = with pkgs; [ + ripgrep + tree + cargo + feh + unrar + unzip + gzip + p7zip + bzip2 + dconf2nix + rustc + bat + exa + mdbook + uutils-coreutils + htop + zsh + tailscale + dig #dns lookup + rage #file encryption + age-plugin-yubikey #plugin for rage to manage yubi-2fa + sops #file based secrets operations + direnv #used for development environments + python39 + ]; +} \ No newline at end of file diff --git a/hosts/openldap.nix b/hosts/openldap.nix deleted file mode 100644 index 64a2370..0000000 --- a/hosts/openldap.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ modulesPath, config, pkgs, lib, ... }: - -{ - imports = [ - (modulesPath + "/profiles/qemu-guest.nix") - ../modules/services/docker.nix - ../modules/users/arouzing.nix - ../modules/users/speccon18.nix - ../modules/services/openssh.nix - ]; - - # base packages - environment.systemPackages = with pkgs; [ - htop - vim - nano - tailscale - ]; - - networking = { - hostName = "openldap"; # Define your hostname. - firewall = { - enable = true; - allowedTCPPorts = []; - allowedUDPPorts = []; - checkReversePath = "loose"; - }; - # networkmanager.enable = true; - }; - - services.tailscale.enable = true; - - time.timeZone = "America/Detroit"; - - ## main services - system.stateVersion = "22.11"; - - ### testing ### - boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "sr_mod" "virtio_blk" ]; - - -} \ No newline at end of file diff --git a/machines/katana.nix b/machines/katana.nix new file mode 100644 index 0000000..f1d77d9 --- /dev/null +++ b/machines/katana.nix @@ -0,0 +1,36 @@ +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot = { + loader = { + systemd-boot.enable = true; + efi.canTouchEfiVariables = true; + }; + initrd = { + availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" ]; + kernelModules = [ ]; + }; + kernelModules = [ "kvm-intel" ]; + extraModulePackages = [ ]; + }; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/55c746b3-b9dc-4c9b-ab56-de68a561f9a3"; + fsType = "ext4"; + }; + + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/0C59-9996"; + fsType = "vfat"; + }; + + swapDevices = [ ]; + + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} \ No newline at end of file