diff --git a/flake.nix b/flake.nix index 0adc9eb2..7264b8d6 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,7 @@ inputs = { # Nix environs nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05"; + # nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05"; systems.url = "github:nix-systems/default-linux"; hardware.url = "github:nixos/nixos-hardware"; lanzaboote.url = "github:nix-community/lanzaboote/v0.4.1"; diff --git a/home/users/toothpick/imports.nix b/home/users/toothpick/imports.nix index d574a95e..98f8028a 100644 --- a/home/users/toothpick/imports.nix +++ b/home/users/toothpick/imports.nix @@ -13,6 +13,7 @@ ../../core/tui/shell/toothpick.nix ../../core/tui/alacritty ../../core/tui/foot + ../../core/tui/wezterm ../../core/tui/neovim # core.services ../../core/services/mako @@ -24,6 +25,7 @@ # misc.gui virt-manager xfce.thunar + filezilla # misc.tui ranger diff --git a/nixos/core/network/adampad.nix b/nixos/core/network/adampad.nix new file mode 100644 index 00000000..c51faf9d --- /dev/null +++ b/nixos/core/network/adampad.nix @@ -0,0 +1,15 @@ +{ + networking = { + networkmanager.enable = true; + hostName = "adampad"; + nftables.enable = true; + firewall = { + enable = true; + interfaces = { + "enp7s0" = { + allowedTCPPorts = [22 80 443]; + }; + }; + }; + }; +} diff --git a/nixos/core/networking.nix b/nixos/core/network/cnix.nix similarity index 100% rename from nixos/core/networking.nix rename to nixos/core/network/cnix.nix diff --git a/nixos/core/network/toothpc.nix b/nixos/core/network/toothpc.nix new file mode 100644 index 00000000..95429e7d --- /dev/null +++ b/nixos/core/network/toothpc.nix @@ -0,0 +1,15 @@ +{ + networking = { + networkmanager.enable = true; + hostName = "toothpc"; + nftables.enable = true; + firewall = { + enable = true; + interfaces = { + "enp4s0" = { + allowedTCPPorts = [22 80 443]; + }; + }; + }; + }; +} diff --git a/nixos/hosts/adampad/imports.nix b/nixos/hosts/adampad/imports.nix index cce7e2a2..5b2013b5 100644 --- a/nixos/hosts/adampad/imports.nix +++ b/nixos/hosts/adampad/imports.nix @@ -3,8 +3,8 @@ # core ../../core/fonts.nix ../../core/hyprland.nix - ../../core/networking.nix ../../core/zsh.nix + ../../core/network/adampad.nix # hardware ../../hardware/cnix.nix diff --git a/nixos/hosts/cnix/imports.nix b/nixos/hosts/cnix/imports.nix index cf1ed95a..a35a92d4 100644 --- a/nixos/hosts/cnix/imports.nix +++ b/nixos/hosts/cnix/imports.nix @@ -3,7 +3,7 @@ # core ../../core/fonts.nix ../../core/hyprland.nix - ../../core/networking.nix + ../../core/network/cnix.nix ../../core/zsh.nix # hardware diff --git a/nixos/hosts/toothpc/default.nix b/nixos/hosts/toothpc/default.nix index 907d0d63..cfaf3492 100644 --- a/nixos/hosts/toothpc/default.nix +++ b/nixos/hosts/toothpc/default.nix @@ -77,12 +77,6 @@ in { pkiBundle = "/etc/secureboot"; }; - # Enable networking - networking = { - networkmanager.enable = true; - hostName = "toothpc"; - }; - environment.sessionVariables = { FLAKE = "/home/toothpick/.nix-config"; }; diff --git a/nixos/hosts/toothpc/imports.nix b/nixos/hosts/toothpc/imports.nix index 602853d4..43e4a688 100644 --- a/nixos/hosts/toothpc/imports.nix +++ b/nixos/hosts/toothpc/imports.nix @@ -4,6 +4,7 @@ ../../core/fonts.nix ../../core/hyprland.nix ../../core/zsh.nix + ../../core/network/toothpc.nix # hardware ../../hardware/toothpc.nix