diff --git a/hosts/creatorforge.nix b/hosts/creatorforge.nix index ee56c0d..3abb401 100644 --- a/hosts/creatorforge.nix +++ b/hosts/creatorforge.nix @@ -46,7 +46,6 @@ allowedUDPPorts = []; checkReversePath = "loose"; }; - # networkmanager.enable = true; }; services.tailscale.enable = true; diff --git a/hosts/openldap.nix b/hosts/openldap.nix index e7e4fcc..64a2370 100644 --- a/hosts/openldap.nix +++ b/hosts/openldap.nix @@ -1,9 +1,7 @@ { modulesPath, config, pkgs, lib, ... }: { - imports = - [ # Include the results of the hardware scan. - # ../modules/base/hardware.nix + imports = [ (modulesPath + "/profiles/qemu-guest.nix") ../modules/services/docker.nix ../modules/users/arouzing.nix @@ -20,27 +18,25 @@ ]; networking = { - firewall.checkReversePath = "loose"; hostName = "openldap"; # Define your hostname. + firewall = { + enable = true; + allowedTCPPorts = []; + allowedUDPPorts = []; + checkReversePath = "loose"; + }; # networkmanager.enable = true; }; services.tailscale.enable = true; - time.timeZone = "America/New_York"; + time.timeZone = "America/Detroit"; - # Open ports in the firewall. - networking.firewall = { - enable = true; - allowedTCPPorts = []; - allowedUDPPorts = []; - }; ## main services system.stateVersion = "22.11"; ### testing ### - boot.initrd.availableKernelModules = - [ "ata_piix" "uhci_hcd" "virtio_pci" "sr_mod" "virtio_blk" ]; + boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "sr_mod" "virtio_blk" ]; } \ No newline at end of file diff --git a/machines/framework.nix b/machines/framework.nix index 193257d..d52bf6a 100644 --- a/machines/framework.nix +++ b/machines/framework.nix @@ -31,10 +31,6 @@ disko.devices = import ../modules/disko/luks-lvm.nix { disks = [ "/dev/nvme0n1" ]; }; - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. networking.useDHCP = lib.mkDefault true; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; diff --git a/machines/proxmox-vm.nix b/machines/proxmox-vm.nix index 4dd7e4a..27161f8 100644 --- a/machines/proxmox-vm.nix +++ b/machines/proxmox-vm.nix @@ -19,14 +19,7 @@ swapDevices = [ ]; - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. networking.useDHCP = lib.mkDefault true; - # networking.interfaces.docker0.useDHCP = lib.mkDefault true; - # networking.interfaces.enp6s18.useDHCP = lib.mkDefault true; - # networking.interfaces.tailscale0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; @@ -40,24 +33,11 @@ }; extraModulePackages = [ ]; loader = { - # systemd-boot.enable = true; grub = { - # Even if there is a separate no-fs partition ("/dev/disk/by-partlabel/no-fs" i.e. "/dev/vda2"), - # which will be used the bootloader, do not set it as loader.grub.device. - # GRUB installation fails, unless the whole disk is selected. device = "/dev/vda"; }; timeout = 0; }; }; -# fileSystems."/" = { -# device = "/dev/disk/by-label/nixos"; -# autoResize = true; -# fsType = "ext4"; -# }; -# fileSystems."/boot" = lib.mkIf hasBootPartition { -# device = "/dev/disk/by-label/ESP"; -# fsType = "vfat"; -# }; services.qemuGuest.enable = lib.mkDefault true; } \ No newline at end of file diff --git a/modules/services/openssh.nix b/modules/services/openssh.nix index abdd037..61569a6 100644 --- a/modules/services/openssh.nix +++ b/modules/services/openssh.nix @@ -4,11 +4,9 @@ services.openssh = lib.mkDefault { enable = true; openFirewall = true; - #settings = lib.mkDefault { - passwordAuthentication = false; - permitRootLogin = "no"; - kbdInteractiveAuthentication = false; - #}; + passwordAuthentication = false; + permitRootLogin = "no"; + kbdInteractiveAuthentication = false; startWhenNeeded = true; kexAlgorithms = [ "curve25519-sha256@libssh.org" ]; }; diff --git a/modules/services/pipewire.nix b/modules/services/pipewire.nix index 9481f9b..2918735 100644 --- a/modules/services/pipewire.nix +++ b/modules/services/pipewire.nix @@ -1,8 +1,6 @@ # https://nixos.wiki/wiki/PipeWire { config, pkgs, lib, ... }: { - # Remove sound.enable or turn it off if you had it set previously, it seems to cause conflicts with pipewire - #sound.enable = false; # rtkit is optional but recommended security.rtkit.enable = true; services.pipewire = { diff --git a/users/speccon18/home.nix b/users/speccon18/home.nix index 0225953..2e2d1de 100644 --- a/users/speccon18/home.nix +++ b/users/speccon18/home.nix @@ -1,7 +1,4 @@ -{ pkgs, config, lib, ... }: { -#Home manager configuration -#imports = [ ./../../home ./../../home/nixos ]; - +{ pkgs, config, lib, ... }: { home = { username = "speccon18"; homeDirectory = "/home/speccon18"; @@ -29,7 +26,6 @@ ]; }; - programs = { nushell = { enable = true; @@ -50,7 +46,6 @@ direnv = { enable = true; enableZshIntegration = lib.mkDefault true; - #enableNushellIntegration = true; }; home-manager = { enable = true; @@ -60,54 +55,11 @@ package = pkgs.vscode.fhs; enableExtensionUpdateCheck = true; enableUpdateCheck = false; - extensions = [ -# "tlahmann.alex-linter" -# "astro-build.astro-vscode" -# "aaron-bond.better-comments" -# "bungcip.better-toml" -# "antfu.browse-lite" -# "firefox-devtools.vscode-firefox-debug" -# "ms-vscode-remote.remote-containers" -# "ms-azuretools.vscode-docker" -# "editorconfig.editorconfig" -# "dbaeumer.vscode-eslint" -# "donjayamanne.githistory" -# "felipecaputo.git-project-manager" -# "github.copilot" -# "eamodio.gitlens" -# "graphql.vscode-graphql" -# "graphql.vscode-graphql-syntax" -# "oderwat.indent-rainbow" -# "skellock.just" -# "monokai.theme-monokai-pro-vscode" -# "bbenoist.nix" -# "jnoortheen.nix-ide" -# "christian-kohler.path-intellisense" -# "csstools.postcss" -# "esbenp.prettier-vscode" -# "ms-vscode-remote.remote-ssh" -# "ms-vscode-remote.remote-ssh-edit" -# "ms-vscode.remote-server" -# "ms-vscode-remote.vscode-remote-extensionpack" -# "ms-vscode.remote-explorer" -# "rust-lang.rust-analyzer" -# "rhalaly.scope-to-this" -# "svelte.svelte-vscode" -# "bradlc.vscode-tailwindcss" -# "tauri-apps.tauri-vscode" -# "antfu.vite" -# "zixuanchen.vitest-explorer" -# "vscode-icons-team.vscode-icons" -# "thenuprojectcontributors.vscode-nushell-lang" -# "ms-vscode-remote.remote-wsl" -# "redhat.vscode-yaml" - ]; }; git = { enable = true; userName = "specCon18"; userEmail = "steven.carpenter@skdevstudios.com"; - # delta.enable = true; extraConfig = { init = { defaultBranch = "main";