From fcddc9a7d42fe0dff2b7c674ee065951ef60907b Mon Sep 17 00:00:00 2001 From: L-Nafaryus Date: Wed, 10 Jan 2024 22:32:33 +0500 Subject: [PATCH] astora + catarina: adjust network settings --- config/nvim/init.lua | 5 +++++ nixosConfigurations/astora/default.nix | 12 ++++++++++++ nixosConfigurations/astora/hardware.nix | 8 ++++++++ nixosConfigurations/catarina/default.nix | 12 ++++++++++++ nixosConfigurations/catarina/hardware.nix | 10 ++++++++++ 5 files changed, 47 insertions(+) diff --git a/config/nvim/init.lua b/config/nvim/init.lua index 98952e4..1dd52c0 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -1,2 +1,7 @@ -- bootstrap lazy.nvim, LazyVim and your plugins require("config.lazy") + +vim.o.tabstop = 4 -- A TAB character looks like 4 spaces +vim.o.expandtab = true -- Pressing the TAB key will insert spaces instead of a TAB character +vim.o.softtabstop = 4 -- Number of spaces inserted instead of a TAB character +vim.o.shiftwidth = 4 -- Number of spaces inserted when indenting diff --git a/nixosConfigurations/astora/default.nix b/nixosConfigurations/astora/default.nix index 7d1de3a..6d8d866 100644 --- a/nixosConfigurations/astora/default.nix +++ b/nixosConfigurations/astora/default.nix @@ -119,6 +119,18 @@ }; }; + programs.ssh.extraConfig = '' + Host astora + HostName 192.168.156.101 + Port 22 + User nafaryus + + Host catarina + HostName 192.168.156.102 + Port 22 + User nafaryus + ''; + programs.direnv.enable = true; fonts.packages = with pkgs; [ nerdfonts ]; diff --git a/nixosConfigurations/astora/hardware.nix b/nixosConfigurations/astora/hardware.nix index 8930323..7d935e9 100644 --- a/nixosConfigurations/astora/hardware.nix +++ b/nixosConfigurations/astora/hardware.nix @@ -128,6 +128,14 @@ enable = true; allowedTCPPorts = [ 80 443 ]; }; + + interfaces.wlo1.ipv4.addresses = [ { + address = "192.168.156.101"; + prefixLength = 24; + } ]; + + defaultGateway = "192.168.156.1"; + nameservers = [ "192.168.156.1" "8.8.8.8" ]; }; # Common diff --git a/nixosConfigurations/catarina/default.nix b/nixosConfigurations/catarina/default.nix index 1d3e1b9..3c241e1 100644 --- a/nixosConfigurations/catarina/default.nix +++ b/nixosConfigurations/catarina/default.nix @@ -122,6 +122,18 @@ }; }; + programs.ssh.extraConfig = '' + Host astora + HostName 192.168.156.101 + Port 22 + User nafaryus + + Host catarina + HostName 192.168.156.102 + Port 22 + User nafaryus + ''; + programs.direnv.enable = true; fonts.packages = with pkgs; [ nerdfonts ]; diff --git a/nixosConfigurations/catarina/hardware.nix b/nixosConfigurations/catarina/hardware.nix index 3cc7743..ca2aaea 100644 --- a/nixosConfigurations/catarina/hardware.nix +++ b/nixosConfigurations/catarina/hardware.nix @@ -112,8 +112,18 @@ enable = true; allowedTCPPorts = [ 80 443 ]; }; + + interfaces.enp9s0.ipv4.addresses = [ { + address = "192.168.156.102"; + prefixLength = 24; + } ]; + + defaultGateway = "192.168.156.1"; + nameservers = [ "192.168.156.1" "8.8.8.8" ]; }; + services.logind.lidSwitchExternalPower = "ignore"; + # Common time.timeZone = "Asia/Yekaterinburg";