Compare commits

..

No commits in common. "c022070323fc88c088fed47065e09c5448a35eba" and "778fcb1b9df47c22678bf8269ed3d0612dcd1e5b" have entirely different histories.

4 changed files with 18 additions and 24 deletions

View File

@ -30,9 +30,9 @@ in
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
boot.initrd.kernelModules = [ "amdgpu" ]; boot.initrd.kernelModules = [ ];
boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ]; boot.extraModulePackages = with config.boot.kernelPackages; [ /*v4l2loopback*/ ];
boot.supportedFilesystems = [ "ntfs" "btrfs" "vfat" "exfat" "ext4" ]; boot.supportedFilesystems = [ "ntfs" "btrfs" "vfat" "exfat" "ext4" ];
@ -53,7 +53,5 @@ in
memtest86.enable = true; memtest86.enable = true;
}; };
boot.plymouth.enable = true;
boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
} }

View File

@ -24,8 +24,16 @@
services.gvfs.enable = true; services.gvfs.enable = true;
services.xserver.xkb.layout = "pl";
time.timeZone = "Europe/Warsaw";
i18n.defaultLocale = "pl_PL.UTF-8";
services.xserver.xkb.layout = "pl";
console = {
enable = true;
earlySetup = true;
font = "${pkgs.kbd}/share/consolefonts/lat2-16.psfu.gz";
keyMap = "pl";
};
services.xserver.enable = true; services.xserver.enable = true;
services.xserver.videoDrivers = [ "amdgpu" ]; services.xserver.videoDrivers = [ "amdgpu" ];

View File

@ -1,4 +1,4 @@
{ config, pkgs, lib, ... }: { config, pkgs, ... }:
{ {
imports = [ imports = [
./nix.nix ./nix.nix
@ -9,21 +9,5 @@
./desktop ./desktop
]; ];
time.timeZone = lib.mkDefault "Europe/Warsaw";
i18n.defaultLocale = lib.mkDefault "pl_PL.UTF-8";
console = {
enable = lib.mkDefault true;
earlySetup = lib.mkDefault true;
font = lib.mkDefault "LatArCyrHeb-16";
keyMap = lib.mkDefault "pl";
};
programs.tmux = {
enable = lib.mkDefault true;
clock24 = lib.mkDefault true;
};
environment.systemPackages = lib.mkIf config.programs.tmux.enable [ pkgs.tmux.terminfo ];
} }

View File

@ -11,6 +11,10 @@ in
enable = true; enable = true;
enableGlobalCompInit=false; enableGlobalCompInit=false;
interactiveShellInit = '' interactiveShellInit = ''
if [[ $(${pkgs.coreutils}/bin/echo $TTY | ${pkgs.gnugrep}/bin/grep "/dev/tty") ]] && [[ "$TERM" == "linux" ]]; then
setfont lat2-16 -m 8859-2
fi
if [[ ''${__MATERUS_HM_ZSH:-0} == 0 ]]; then if [[ ''${__MATERUS_HM_ZSH:-0} == 0 ]]; then
source ${pkgs.grml-zsh-config}/etc/zsh/zshrc source ${pkgs.grml-zsh-config}/etc/zsh/zshrc
fi fi