From 8952fafe65592c6b136377f716a96829e8adb754 Mon Sep 17 00:00:00 2001 From: natto1784 Date: Sun, 30 May 2021 08:26:29 +0530 Subject: [PATCH] nvim:removed colorizer, added TCP ports in configs and misc stuff --- .github/workflows/main.yml | 3 +++ configs/nvim.nix | 1 - configs/nvim/init.lua | 1 - marisa/hardware.nix | 8 +++++++- marisa/networking.nix | 1 + marisa/pkgs.nix | 3 ++- marisa/services.nix | 1 + overlays/suckless/st.patch | 6 +++--- satori/networking.nix | 1 + 9 files changed, 18 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8ca8059..b5c3c6b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,6 +14,9 @@ jobs: - anup - customscripts - mpd_discord_richpresence + - st + - dmenu + - kbd steps: - uses: actions/checkout@v2.3.4 - uses: cachix/install-nix-action@v13 diff --git a/configs/nvim.nix b/configs/nvim.nix index fcf7f28..0a32aad 100644 --- a/configs/nvim.nix +++ b/configs/nvim.nix @@ -8,7 +8,6 @@ customRC ="lua << EOF\n" + builtins.readFile ./nvim/init.lua + "\nEOF\n"; packages.myVimPackage = with pkgs.vimPlugins; { start = [ - nvim-colorizer-lua auto-pairs vim-floaterm vim-rooter diff --git a/configs/nvim/init.lua b/configs/nvim/init.lua index 16f8787..a2507fb 100644 --- a/configs/nvim/init.lua +++ b/configs/nvim/init.lua @@ -4,7 +4,6 @@ require'lspconfig'.clangd.setup{} require'lspconfig'.tsserver.setup{} require'lspconfig'.jedi_language_server.setup{} require'lspconfig'.purescriptls.setup{} -require'colorizer'.setup{} local comm = vim.api.nvim_command local bind = vim.api.nvim_set_keymap diff --git a/marisa/hardware.nix b/marisa/hardware.nix index 9e56b8e..1d53f20 100755 --- a/marisa/hardware.nix +++ b/marisa/hardware.nix @@ -15,7 +15,13 @@ options = [ "bind" ]; }; - swapDevices = [ ]; + swapDevices = [ + { + device = "/swapfile"; + priority = 0; + size = 10240; + } + ]; powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand"; hardware.firmware = [ pkgs.raspberrypiWirelessFirmware ]; diff --git a/marisa/networking.nix b/marisa/networking.nix index 30f2043..cf8b594 100755 --- a/marisa/networking.nix +++ b/marisa/networking.nix @@ -2,6 +2,7 @@ { networking = { hostName = "Marisa"; + firewall.allowedTCPPorts = [ 22 80 ]; wireless = { enable = false; iwd.enable = true; diff --git a/marisa/pkgs.nix b/marisa/pkgs.nix index eb1189f..8a7983e 100755 --- a/marisa/pkgs.nix +++ b/marisa/pkgs.nix @@ -5,7 +5,8 @@ gnumake htop vim - libraspberrypi + tailscale + wireguard ]; programs = { zsh = { diff --git a/marisa/services.nix b/marisa/services.nix index 2df0470..18cd1da 100755 --- a/marisa/services.nix +++ b/marisa/services.nix @@ -5,5 +5,6 @@ enable = true; permitRootLogin = "yes"; }; + tailscale.enable = true; }; } diff --git a/overlays/suckless/st.patch b/overlays/suckless/st.patch index 8b023d6..65dd150 100755 --- a/overlays/suckless/st.patch +++ b/overlays/suckless/st.patch @@ -8,9 +8,9 @@ diff --color -u a/config.def.h b/config.def.h - * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html */ -static char *font = "Liberation Mono:pixelsize=12:antialias=true:autohint=true"; -+static char *font = "Fira Mono:style=Regular:pixelsize=20"; -+static char *font2[] = { "Font Awesome 5 Free Solid:pixelsize=18", -+ "Font Awesome 5 Brands:pixelsize=18" }; ++static char *font = "Fira Mono:style=Regular:pixelsize=18"; ++static char *font2[] = { "Font Awesome 5 Free Solid:pixelsize=16", ++ "Font Awesome 5 Brands:pixelsize=16" }; static int borderpx = 2; /* diff --git a/satori/networking.nix b/satori/networking.nix index fcbca06..5caec17 100644 --- a/satori/networking.nix +++ b/satori/networking.nix @@ -4,6 +4,7 @@ networking = { hostName = "Satori"; wireless.enable = true; # Enables wireless support via wpa_supplicant. + firewall.allowedTCPPorts = [ 22 ]; interfaces = { enp7s0.useDHCP = true; wlp0s20f3 = {