mirror of
https://git.sr.ht/~rouven/nixos-config
synced 2025-01-19 01:21:39 +01:00
formatting
This commit is contained in:
parent
9e4582d351
commit
68d67965f5
GPG key ID:
B95E8FE6B11C4D09
2 changed files with 179 additions and 177 deletions
|
|
@ -11,6 +11,7 @@
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
modules = [
|
modules = [
|
||||||
./hosts/thinkpad/configuration.nix
|
./hosts/thinkpad/configuration.nix
|
||||||
|
home-manager.nixosModules.home-manager
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,208 +1,209 @@
|
||||||
{ config, pkgs, lib, ... }:
|
{ config, pkgs, lib, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
imports =
|
imports =
|
||||||
[ # Include the results of the hardware scan.
|
[
|
||||||
./hardware-configuration.nix
|
# Include the results of the hardware scan.
|
||||||
];
|
./hardware-configuration.nix
|
||||||
|
];
|
||||||
|
|
||||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||||
|
|
||||||
# Use the systemd-boot EFI boot loader.
|
# Use the systemd-boot EFI boot loader.
|
||||||
boot.loader.systemd-boot.enable = true;
|
boot.loader.systemd-boot.enable = true;
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
|
|
||||||
networking.hostName = "thinkpad"; # Define your hostname.
|
networking.hostName = "thinkpad"; # Define your hostname.
|
||||||
networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.
|
networking.networkmanager.enable = true; # Easiest to use and most distros use this by default.
|
||||||
networking.firewall = {
|
networking.firewall = {
|
||||||
allowedUDPPorts = [51820];
|
allowedUDPPorts = [ 51820 ];
|
||||||
checkReversePath = false;
|
checkReversePath = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
# Set your time zone.
|
# Set your time zone.
|
||||||
time.timeZone = "Europe/Berlin";
|
time.timeZone = "Europe/Berlin";
|
||||||
|
|
||||||
# Select internationalisation properties.
|
# Select internationalisation properties.
|
||||||
i18n.defaultLocale = "en_US.UTF-8";
|
i18n.defaultLocale = "en_US.UTF-8";
|
||||||
console = {
|
console = {
|
||||||
font = "Lat2-Terminus16";
|
font = "Lat2-Terminus16";
|
||||||
useXkbConfig = true; # use xkbOptions in tty.
|
useXkbConfig = true; # use xkbOptions in tty.
|
||||||
};
|
};
|
||||||
|
|
||||||
# Enable the X11 windowing system.
|
# Enable the X11 windowing system.
|
||||||
services.xserver = {
|
services.xserver = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
displayManager = {
|
displayManager = {
|
||||||
lightdm.enable = true;
|
lightdm.enable = true;
|
||||||
defaultSession = "none+awesome";
|
defaultSession = "none+awesome";
|
||||||
};
|
};
|
||||||
windowManager.awesome = {
|
windowManager.awesome = {
|
||||||
enable = true;
|
enable = true;
|
||||||
luaModules = with pkgs.luaPackages; [
|
luaModules = with pkgs.luaPackages; [
|
||||||
luarocks
|
luarocks
|
||||||
vicious
|
vicious
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
libinput.enable = true;
|
libinput.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Configure keymap in X11
|
|
||||||
services.xserver.layout = "us";
|
|
||||||
services.xserver.xkbVariant = "dvorak-alt-intl";
|
|
||||||
services.xserver.displayManager.sessionCommands =
|
|
||||||
"${pkgs.xorg.xmodmap}/bin/xmodmap ${pkgs.writeText "xkb-layout" ''
|
|
||||||
keycode 108 = Mode_switch
|
|
||||||
keycode 94 = Shift_L NoSymbol Shift_L
|
|
||||||
keysym a = a A adiaeresis Adiaeresis
|
|
||||||
keysym o = o O odiaeresis Odiaeresis
|
|
||||||
keysym u = u U udiaeresis Udiaeresis
|
|
||||||
keysym s = s S ssharp
|
|
||||||
''}";
|
|
||||||
|
|
||||||
# Enable sound.
|
# Configure keymap in X11
|
||||||
sound.enable = true;
|
services.xserver.layout = "us";
|
||||||
hardware.pulseaudio.enable = true;
|
services.xserver.xkbVariant = "dvorak-alt-intl";
|
||||||
hardware.bluetooth.enable = true;
|
services.xserver.displayManager.sessionCommands =
|
||||||
|
"${pkgs.xorg.xmodmap}/bin/xmodmap ${pkgs.writeText "xkb-layout" ''
|
||||||
|
keycode 108 = Mode_switch
|
||||||
|
keycode 94 = Shift_L NoSymbol Shift_L
|
||||||
|
keysym a = a A adiaeresis Adiaeresis
|
||||||
|
keysym o = o O odiaeresis Odiaeresis
|
||||||
|
keysym u = u U udiaeresis Udiaeresis
|
||||||
|
keysym s = s S ssharp
|
||||||
|
''}";
|
||||||
|
|
||||||
environment.variables = { EDITOR = "vim"; };
|
# Enable sound.
|
||||||
|
sound.enable = true;
|
||||||
|
hardware.pulseaudio.enable = true;
|
||||||
|
hardware.bluetooth.enable = true;
|
||||||
|
|
||||||
# enable polkit
|
environment.variables = { EDITOR = "vim"; };
|
||||||
security.polkit.enable = true;
|
|
||||||
|
|
||||||
# Define a user account.
|
# enable polkit
|
||||||
users.users.rouven = {
|
security.polkit.enable = true;
|
||||||
isNormalUser = true;
|
|
||||||
extraGroups = [ "wheel" "video" "network" "libvirtd"];
|
|
||||||
};
|
|
||||||
|
|
||||||
# List packages installed in system profile. To search, run:
|
# Define a user account.
|
||||||
# $ nix search wget
|
users.users.rouven = {
|
||||||
environment.systemPackages = with pkgs; [
|
isNormalUser = true;
|
||||||
((vim_configurable.override { }).customize{
|
extraGroups = [ "wheel" "video" "network" "libvirtd" ];
|
||||||
name = "vim";
|
};
|
||||||
vimrcConfig.packages.myplugins = with pkgs.vimPlugins; {
|
|
||||||
start = [ vim-nix vim-lastplace ];
|
|
||||||
opt = [];
|
|
||||||
};
|
|
||||||
vimrcConfig.customRC = ''
|
|
||||||
|
|
||||||
" basic commands bound to uppercase key
|
# List packages installed in system profile. To search, run:
|
||||||
command Q q
|
# $ nix search wget
|
||||||
command W w
|
environment.systemPackages = with pkgs; [
|
||||||
command Wq wq
|
((vim_configurable.override { }).customize {
|
||||||
command WQ wq
|
name = "vim";
|
||||||
|
vimrcConfig.packages.myplugins = with pkgs.vimPlugins; {
|
||||||
set number relativenumber
|
start = [ vim-nix vim-lastplace ];
|
||||||
set tabstop=4
|
opt = [ ];
|
||||||
set shiftwidth=4
|
};
|
||||||
set smartcase
|
vimrcConfig.customRC = ''
|
||||||
set colorcolumn=120
|
|
||||||
set nowrap
|
|
||||||
syntax on
|
|
||||||
highlight ColorColumn ctermbg=darkgray
|
|
||||||
|
|
||||||
nnoremap ; :
|
|
||||||
nnoremap : ;
|
|
||||||
vnoremap ; :
|
|
||||||
vnoremap : ;
|
|
||||||
|
|
||||||
" set space as leader
|
|
||||||
nnoremap <SPACE> <Nop>
|
|
||||||
let mapleader = " "
|
|
||||||
|
|
||||||
|
|
||||||
" beautify indents
|
|
||||||
:set list lcs=tab:\|\
|
|
||||||
|
|
||||||
"remove ex-mode shortcut
|
|
||||||
nmap Q <Nop>
|
|
||||||
|
|
||||||
" quickfixlist binds
|
|
||||||
nnoremap <C-j> :cnext<CR>
|
|
||||||
nnoremap <C-k> :cprev<CR>
|
|
||||||
|
|
||||||
" locallist binds
|
|
||||||
nnoremap <C-l> :lnext<CR>
|
|
||||||
nnoremap <C-h> :lprev<CR>
|
|
||||||
|
|
||||||
" split keybinds
|
|
||||||
nnoremap <leader>s :sp<CR>
|
|
||||||
nnoremap <leader>v :vs<CR>
|
|
||||||
|
|
||||||
nnoremap <leader>h <C-w>h
|
|
||||||
nnoremap <leader>j <C-w>j
|
|
||||||
nnoremap <leader>k <C-w>k
|
|
||||||
nnoremap <leader>l <C-w>l
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
)
|
|
||||||
# essentials
|
|
||||||
wget
|
|
||||||
git
|
|
||||||
gcc
|
|
||||||
htop
|
|
||||||
tmux
|
|
||||||
dig
|
|
||||||
traceroute
|
|
||||||
killall
|
|
||||||
xorg.xmodmap
|
|
||||||
# libs
|
|
||||||
libyubikey
|
|
||||||
libfido2
|
|
||||||
# dev
|
|
||||||
jdk
|
|
||||||
maven
|
|
||||||
# virtualisation
|
|
||||||
virt-manager
|
|
||||||
];
|
|
||||||
|
|
||||||
programs.gnupg.agent = {
|
" basic commands bound to uppercase key
|
||||||
enable = true;
|
command Q q
|
||||||
enableSSHSupport = true;
|
command W w
|
||||||
};
|
command Wq wq
|
||||||
|
command WQ wq
|
||||||
|
|
||||||
|
set number relativenumber
|
||||||
|
set tabstop=4
|
||||||
|
set shiftwidth=4
|
||||||
|
set smartcase
|
||||||
|
set colorcolumn=120
|
||||||
|
set nowrap
|
||||||
|
syntax on
|
||||||
|
highlight ColorColumn ctermbg=darkgray
|
||||||
|
|
||||||
|
nnoremap ; :
|
||||||
|
nnoremap : ;
|
||||||
|
vnoremap ; :
|
||||||
|
vnoremap : ;
|
||||||
|
|
||||||
|
" set space as leader
|
||||||
|
nnoremap <SPACE> <Nop>
|
||||||
|
let mapleader = " "
|
||||||
|
|
||||||
|
|
||||||
|
" beautify indents
|
||||||
|
:set list lcs=tab:\|\
|
||||||
|
|
||||||
|
"remove ex-mode shortcut
|
||||||
|
nmap Q <Nop>
|
||||||
|
|
||||||
|
" quickfixlist binds
|
||||||
|
nnoremap <C-j> :cnext<CR>
|
||||||
|
nnoremap <C-k> :cprev<CR>
|
||||||
|
|
||||||
|
" locallist binds
|
||||||
|
nnoremap <C-l> :lnext<CR>
|
||||||
|
nnoremap <C-h> :lprev<CR>
|
||||||
|
|
||||||
|
" split keybinds
|
||||||
|
nnoremap <leader>s :sp<CR>
|
||||||
|
nnoremap <leader>v :vs<CR>
|
||||||
|
|
||||||
|
nnoremap <leader>h <C-w>h
|
||||||
|
nnoremap <leader>j <C-w>j
|
||||||
|
nnoremap <leader>k <C-w>k
|
||||||
|
nnoremap <leader>l <C-w>l
|
||||||
|
'';
|
||||||
|
}
|
||||||
|
)
|
||||||
|
# essentials
|
||||||
|
wget
|
||||||
|
git
|
||||||
|
gcc
|
||||||
|
htop
|
||||||
|
tmux
|
||||||
|
dig
|
||||||
|
traceroute
|
||||||
|
killall
|
||||||
|
xorg.xmodmap
|
||||||
|
# libs
|
||||||
|
libyubikey
|
||||||
|
libfido2
|
||||||
|
# dev
|
||||||
|
jdk
|
||||||
|
maven
|
||||||
|
# virtualisation
|
||||||
|
virt-manager
|
||||||
|
];
|
||||||
|
|
||||||
programs.light.enable = true; # display brightness manager
|
programs.gnupg.agent = {
|
||||||
programs.kdeconnect.enable = true;
|
enable = true;
|
||||||
|
enableSSHSupport = true;
|
||||||
|
};
|
||||||
|
|
||||||
# List services that you want to enable:
|
programs.light.enable = true; # display brightness manager
|
||||||
services.blueman.enable = true;
|
programs.kdeconnect.enable = true;
|
||||||
services.devmon.enable = true;
|
|
||||||
services.pcscd.enable = true; # yubikey and smartcard stuff
|
|
||||||
services.printing.enable = true;
|
|
||||||
services.fprintd.enable = true;
|
|
||||||
|
|
||||||
# Automatically configure displays
|
# List services that you want to enable:
|
||||||
services.autorandr.enable = true;
|
services.blueman.enable = true;
|
||||||
|
services.devmon.enable = true;
|
||||||
|
services.pcscd.enable = true; # yubikey and smartcard stuff
|
||||||
|
services.printing.enable = true;
|
||||||
|
services.fprintd.enable = true;
|
||||||
|
|
||||||
|
# Automatically configure displays
|
||||||
|
services.autorandr.enable = true;
|
||||||
|
|
||||||
|
|
||||||
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
|
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
|
||||||
"steam"
|
"steam"
|
||||||
"steam-original"
|
"steam-original"
|
||||||
"steam-runtime"
|
"steam-runtime"
|
||||||
"steam-run"
|
"steam-run"
|
||||||
];
|
];
|
||||||
|
|
||||||
programs.steam.enable = true;
|
|
||||||
|
|
||||||
services.udev.packages = [ pkgs.yubikey-personalization ];
|
programs.steam.enable = true;
|
||||||
|
|
||||||
virtualisation.libvirtd.enable = true;
|
services.udev.packages = [ pkgs.yubikey-personalization ];
|
||||||
|
|
||||||
# Copy the NixOS configuration file and link it from the resulting system
|
virtualisation.libvirtd.enable = true;
|
||||||
# (/run/current-system/configuration.nix). This is useful in case you
|
|
||||||
# accidentally delete configuration.nix.
|
|
||||||
system.copySystemConfiguration = true;
|
|
||||||
|
|
||||||
# This value determines the NixOS release from which the default
|
# Copy the NixOS configuration file and link it from the resulting system
|
||||||
# settings for stateful data, like file locations and database versions
|
# (/run/current-system/configuration.nix). This is useful in case you
|
||||||
# on your system were taken. It‘s perfectly fine and recommended to leave
|
# accidentally delete configuration.nix.
|
||||||
# this value at the release version of the first install of this system.
|
system.copySystemConfiguration = true;
|
||||||
# Before changing this value read the documentation for this option
|
|
||||||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
# This value determines the NixOS release from which the default
|
||||||
system.stateVersion = "22.11"; # Did you read the comment?
|
# settings for stateful data, like file locations and database versions
|
||||||
|
# on your system were taken. It‘s perfectly fine and recommended to leave
|
||||||
|
# this value at the release version of the first install of this system.
|
||||||
|
# Before changing this value read the documentation for this option
|
||||||
|
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
||||||
|
system.stateVersion = "22.11"; # Did you read the comment?
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue