NeoTheFox/orangepi3
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

upgraded to 5.13

Browse Source
This commit is contained in:
NeoTheFox 2021-07-05 13:59:19 +03:00
parent 0e4947b28c
commit 9c280a2e08
2 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
configuration.nix
View File

@ -12,10 +12,16 @@
[ [
./hardware-configuration.nix ./hardware-configuration.nix
./kernel.nix ./kernel.nix
./samba.nix
]; ];
boot.loader.grub.enable = false; boot.loader.grub.enable = false;
boot.loader.generic-extlinux-compatible.enable = true; 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. networking.hostName = "opi3n"; # Define your hostname.
@ -29,22 +35,35 @@
# Select internationalisation properties. # Select internationalisation properties.
i18n.defaultLocale = "en_US.UTF-8"; i18n.defaultLocale = "en_US.UTF-8";
i18n.extraLocaleSettings = { i18n.extraLocaleSettings = {
LC_NUMERIC = "ru_RU.UTF-8" LC_NUMERIC = "ru_RU.UTF-8";
LC_TIME = "ru_RU.UTF-8" LC_TIME = "ru_RU.UTF-8";
LC_MONETARY = "ru_RU.UTF-8" LC_MONETARY = "ru_RU.UTF-8";
LC_PAPER = "ru_RU.UTF-8" LC_PAPER = "ru_RU.UTF-8";
LC_MEASUREMENT = "ru_RU.UTF-8" LC_MEASUREMENT = "ru_RU.UTF-8";
}; };
# Enable the X11 windowing system. # Enable the X11 windowing system.
programs.xwayland.enable = true;
services.xserver = { services.xserver = {
enable = true; enable = true;
layout = "us,ru"; layout = "us,ru";
xkbOptions = "grp:caps_toggle"; xkbOptions = "grp:caps_toggle";
xkbVariant = ",phonetic_winkeys"; xkbVariant = ",phonetic_winkeys";
libinput.enable = true; 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 # Sway
programs.sway.enable = true; programs.sway.enable = true;
@ -70,6 +89,7 @@
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
neovim aria2 fd ranger git curl exa bat bottom neovim aria2 fd ranger git curl exa bat bottom
neofetch tmux mosh rsync synergy ncdu pciutils neofetch tmux mosh rsync synergy ncdu pciutils
tldr atool
]; ];
# Some programs need SUID wrappers, can be configured further or are # Some programs need SUID wrappers, can be configured further or are

4
kernel.nix
View File

@ -5,7 +5,7 @@
boot.kernelPatches = [ { boot.kernelPatches = [ {
name = "opi3"; 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 = '' extraConfig = ''
EXTRA_FIRMWARE_DIR ${builtins.fetchGit "https://megous.com/git/linux-firmware"} EXTRA_FIRMWARE_DIR ${builtins.fetchGit "https://megous.com/git/linux-firmware"}
EXTRA_FIRMWARE brcm/brcmfmac43456-sdio.bin brcm/brcmfmac43456-sdio.txt brcm/BCM4345C5.hcd EXTRA_FIRMWARE brcm/brcmfmac43456-sdio.bin brcm/brcmfmac43456-sdio.txt brcm/BCM4345C5.hcd
@ -45,7 +45,7 @@
USB_MUSB_SUNXI y USB_MUSB_SUNXI y
MMC_SUNXI y MMC_SUNXI y
VIDEO_SUNXI y VIDEO_SUNXI y
VIDEO_SUNXI_CEDRUS y VIDEO_SUNXI_CEDRUS m
CLK_SUNXI y CLK_SUNXI y
CLK_SUNXI_CLOCKS y CLK_SUNXI_CLOCKS y
CLK_SUNXI_PRCM_SUN6I y CLK_SUNXI_PRCM_SUN6I y