move config to modules

This commit is contained in:
eneller
2024-01-11 17:59:02 +01:00
parent 98a666c1f6
commit 73383194e1
5 changed files with 63 additions and 64 deletions

22
config/i3.nix Normal file
View File

@@ -0,0 +1,22 @@
{ config, pkgs, ... }:
{
imports = [
./xorg.nix
];
services.xserver.windowManager.i3.enable = true;
environment.systemPackages = with pkgs; [
# might use picom as a compositor
lightdm-slick-greeter
rofi
i3status
i3lock
xfce.xfce4-power-manager
networkmanager
networkmanagerapplet
networkmanager-openvpn
networkmanager-openconnect
libnotify
dunst
];
}

27
config/locale.nix Normal file
View File

@@ -0,0 +1,27 @@
{ config, pkgs, ... }:
{
# Set your time zone.
time.timeZone = "Europe/Berlin";
# Select internationalisation properties.
i18n.defaultLocale = "de_DE.UTF-8";
i18n.extraLocaleSettings = {
LANGUAGE = "en_US.UTF-8";
LC_ALL = "de_DE.UTF-8";
LC_ADDRESS = "de_DE.UTF-8";
LC_IDENTIFICATION = "de_DE.UTF-8";
LC_MEASUREMENT = "de_DE.UTF-8";
LC_MONETARY = "de_DE.UTF-8";
LC_NAME = "de_DE.UTF-8";
LC_NUMERIC = "de_DE.UTF-8";
LC_PAPER = "de_DE.UTF-8";
LC_TELEPHONE = "de_DE.UTF-8";
LC_TIME = "de_DE.UTF-8";
};
services.xserver.layout = "de";
# Configure console keymap
console.keyMap = "de";
}

11
config/xorg.nix Normal file
View File

@@ -0,0 +1,11 @@
{ config, pkgs, ... }:
{
# Enable the X11 windowing system.
services.xserver = {
enable = true;
displayManager.lightdm.enable = true;
xkbVariant = "";
autoRepeatDelay = 200;
autoRepeatInterval = 35;
};
}

View File

@@ -19,7 +19,7 @@
# timeoutStyle = "menu"; # timeoutStyle = "menu";
extraEntries = '' extraEntries = ''
menuentry "Windows 11" { menuentry "Windows 11" {
insmod part_gpt insmod part_gpt
insmod fat insmod fat
insmod search_fs_uuid insmod search_fs_uuid
insmod chain insmod chain
@@ -40,57 +40,6 @@
# Enable networking # Enable networking
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
# Set your time zone.
time.timeZone = "Europe/Berlin";
# Select internationalisation properties.
i18n.defaultLocale = "en_US.UTF-8";
i18n.extraLocaleSettings = {
LC_ADDRESS = "de_DE.UTF-8";
LC_IDENTIFICATION = "de_DE.UTF-8";
LC_MEASUREMENT = "de_DE.UTF-8";
LC_MONETARY = "de_DE.UTF-8";
LC_NAME = "de_DE.UTF-8";
LC_NUMERIC = "de_DE.UTF-8";
LC_PAPER = "de_DE.UTF-8";
LC_TELEPHONE = "de_DE.UTF-8";
LC_TIME = "de_DE.UTF-8";
};
# Enable the X11 windowing system.
services.xserver = {
enable = true;
# Enable the XFCE Desktop Environment.
displayManager.lightdm.enable = true;
# Configure keymap in X11
layout = "de";
xkbVariant = "";
autoRepeatDelay = 200;
autoRepeatInterval = 35;
};
services.xserver.windowManager.i3 = {
enable = true;
extraPackages = with pkgs; [
# might use picom as a compositor
lightdm-slick-greeter
rofi
i3status
i3lock
xfce.xfce4-power-manager
networkmanager
networkmanagerapplet
networkmanager-openvpn
networkmanager-openconnect
libnotify
dunst
];
};
# Configure console keymap
console.keyMap = "de";
# console.font = "FiraMono"; # console.font = "FiraMono";
# Enable CUPS to print documents. # Enable CUPS to print documents.
@@ -141,11 +90,6 @@
less less
wget wget
gitFull gitFull
arandr
autorandr # TODO find an alternative
qutebrowser
thunderbird
alacritty
zsh zsh
zsh-powerlevel10k # TODO set up zsh to replace bash zsh-powerlevel10k # TODO set up zsh to replace bash
tmux tmux
@@ -158,18 +102,11 @@
htop htop
inxi inxi
openssl openssl
gparted
xfce.thunar
ffmpeg ffmpeg
logseq
imagemagick_light imagemagick_light
nextcloud-client # TODO replace with rclone nextcloud-client # TODO replace with rclone
jetbrains.idea-ultimate
vscodium # consider vscodium-fhs
texlive.combined.scheme-medium
python3 python3
ansible ansible
telegram-desktop
]; ];
programs.neovim = { programs.neovim = {

View File

@@ -21,7 +21,9 @@
specialArgs = {inherit inputs;}; specialArgs = {inherit inputs;};
modules = [ modules = [
./configuration.nix ./configuration.nix
./config/locale.nix
./config/gui.nix ./config/gui.nix
./config/i3.nix
# inputs.home-manager.nixosModules.default # inputs.home-manager.nixosModules.default
]; ];
}; };