From 9c280a2e0803cb0008b2fcb377b930153185ad18 Mon Sep 17 00:00:00 2001
From: NeoTheFox <soniczerops@gmail.com>
Date: Mon, 5 Jul 2021 13:59:19 +0300
Subject: [PATCH] upgraded to 5.13

---
 configuration.nix | 34 +++++++++++++++++++++++++++-------
 kernel.nix        |  4 ++--
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 3621cd6..3172406 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -12,10 +12,16 @@
     [
       ./hardware-configuration.nix
       ./kernel.nix
+      ./samba.nix
     ];
 
   boot.loader.grub.enable = false;
   boot.loader.generic-extlinux-compatible.enable = true;
+  boot.kernel.sysctl = {
+    "vm.swappiness" = 10;
+    "vm.dirty_background_ratio" = 5;
+    "vm.vfs_cache_pressure" = 50;
+  };
 
   networking.hostName = "opi3n"; # Define your hostname.
 
@@ -29,22 +35,35 @@
   # Select internationalisation properties.
   i18n.defaultLocale = "en_US.UTF-8";
   i18n.extraLocaleSettings = {
-    LC_NUMERIC     = "ru_RU.UTF-8"
-    LC_TIME        = "ru_RU.UTF-8"
-    LC_MONETARY    = "ru_RU.UTF-8"
-    LC_PAPER       = "ru_RU.UTF-8"
-    LC_MEASUREMENT = "ru_RU.UTF-8"
+    LC_NUMERIC     = "ru_RU.UTF-8";
+    LC_TIME        = "ru_RU.UTF-8";
+    LC_MONETARY    = "ru_RU.UTF-8";
+    LC_PAPER       = "ru_RU.UTF-8";
+    LC_MEASUREMENT = "ru_RU.UTF-8";
   };
 
   # Enable the X11 windowing system.
+  programs.xwayland.enable = true;
   services.xserver = {
     enable = true;
     layout = "us,ru";
     xkbOptions = "grp:caps_toggle";
     xkbVariant = ",phonetic_winkeys";
     libinput.enable = true;
-    displayManager.startx.enable
-  }
+    displayManager.startx.enable = false;
+    videoDrivers = [ "modesetting" "fbdev" "panfrost" ];
+  };
+
+  services.xserver.displayManager.lightdm = {
+    enable = true;
+    greeters.gtk.enable = true;
+  };
+
+  # i3
+  services.xserver.windowManager.i3.enable = true;  
+  services.xserver.windowManager.i3.extraPackages = with pkgs; [
+    rofi kitty i3status-rust i3lock ncpamixer networkmanager_dmenu
+  ];
 
   # Sway
   programs.sway.enable = true;
@@ -70,6 +89,7 @@
   environment.systemPackages = with pkgs; [
      neovim aria2 fd ranger git curl exa bat bottom
      neofetch tmux mosh rsync synergy ncdu pciutils
+     tldr atool 
   ];
 
   # Some programs need SUID wrappers, can be configured further or are
diff --git a/kernel.nix b/kernel.nix
index 54a2387..6d524a7 100644
--- a/kernel.nix
+++ b/kernel.nix
@@ -5,7 +5,7 @@
 
   boot.kernelPatches = [ { 
     name = "opi3"; 
-    patch = builtins.fetchurl "https://xff.cz/kernels/5.12/patches/all.patch";
+    patch = builtins.fetchurl "https://xff.cz/kernels/5.13/patches/all.patch";
     extraConfig = ''
       EXTRA_FIRMWARE_DIR ${builtins.fetchGit "https://megous.com/git/linux-firmware"}
       EXTRA_FIRMWARE brcm/brcmfmac43456-sdio.bin brcm/brcmfmac43456-sdio.txt brcm/BCM4345C5.hcd
@@ -45,7 +45,7 @@
       USB_MUSB_SUNXI y
       MMC_SUNXI y
       VIDEO_SUNXI y
-      VIDEO_SUNXI_CEDRUS y
+      VIDEO_SUNXI_CEDRUS m
       CLK_SUNXI y
       CLK_SUNXI_CLOCKS y
       CLK_SUNXI_PRCM_SUN6I y