prepare for multiple hosts
This commit is contained in:
parent
c81e9d0bbc
commit
4de5606de5
7 changed files with 198 additions and 168 deletions
2
.gitignore
vendored
Normal file
2
.gitignore
vendored
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
/configuration.nix
|
||||
/hardware-configuration.nix
|
||||
7
common/configuration.nix
Normal file
7
common/configuration.nix
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
./home-manager.nix
|
||||
];
|
||||
}
|
||||
|
|
@ -1,6 +1,10 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
<home-manager/nixos>
|
||||
];
|
||||
|
||||
home-manager.users.sijmen = {
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
||||
|
|
@ -9,20 +13,26 @@
|
|||
|
||||
packages = with pkgs; [
|
||||
aerc
|
||||
bacon
|
||||
discord
|
||||
fd
|
||||
gimp
|
||||
inkscape
|
||||
mpv
|
||||
pika-backup
|
||||
python3
|
||||
silver-searcher
|
||||
spotify
|
||||
sublime-merge
|
||||
tdesktop
|
||||
tig
|
||||
transmission-gtk
|
||||
unzip
|
||||
virt-manager
|
||||
vscode-fhs
|
||||
w3m
|
||||
wget
|
||||
wl-clipboard
|
||||
tig
|
||||
|
||||
gnome.gnome-tweaks
|
||||
gnomeExtensions.openweather
|
||||
|
|
@ -73,7 +83,7 @@
|
|||
vimAlias = true;
|
||||
|
||||
extraConfig = ''
|
||||
luafile /etc/nixos/nvim.lua
|
||||
luafile /etc/nixos/common/nvim.lua
|
||||
'';
|
||||
|
||||
extraPackages = with pkgs; [
|
||||
|
|
@ -95,6 +105,7 @@
|
|||
nvim-web-devicons
|
||||
pears-nvim
|
||||
plenary-nvim
|
||||
rust-tools-nvim
|
||||
Spacegray-vim
|
||||
vim-closetag
|
||||
vim-nix
|
||||
|
|
@ -3,6 +3,10 @@ local g = vim.g
|
|||
|
||||
vim.cmd [[
|
||||
colorscheme spacegray
|
||||
|
||||
if has("autocmd")
|
||||
au BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g'\"" | endif
|
||||
endif
|
||||
]]
|
||||
|
||||
g.mapleader = ' '
|
||||
|
|
@ -11,6 +15,8 @@ opt.undofile = true
|
|||
opt.undodir = "/home/sijmen/.cache/nvim/undo"
|
||||
opt.backupdir = "/home/sijmen/.cache/nvim/backup"
|
||||
|
||||
opt.shada = "!,'100,<50,s10,h"
|
||||
|
||||
opt.smartindent = true
|
||||
opt.autoindent = true
|
||||
opt.tabstop = 2
|
||||
|
|
@ -34,6 +40,7 @@ opt.incsearch = true
|
|||
opt.hidden = true
|
||||
opt.shortmess = "atI"
|
||||
|
||||
|
||||
require("nvim-tree").setup()
|
||||
|
||||
require("nvim-treesitter.configs").setup {
|
||||
|
|
@ -44,5 +51,7 @@ require("nvim-treesitter.configs").setup {
|
|||
}
|
||||
|
||||
local lspconfig = require("lspconfig")
|
||||
lspconfig.rnix.setup{}
|
||||
lspconfig.pyright.setup{}
|
||||
lspconfig.rnix.setup {}
|
||||
lspconfig.pyright.setup {}
|
||||
|
||||
require("rust-tools").setup {}
|
||||
|
|
@ -1,164 +0,0 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
||||
imports = [
|
||||
./hardware-configuration.nix
|
||||
|
||||
<home-manager/nixos>
|
||||
./home-manager.nix
|
||||
];
|
||||
|
||||
boot = {
|
||||
loader = {
|
||||
timeout = 0;
|
||||
efi.canTouchEfiVariables = true;
|
||||
|
||||
systemd-boot = {
|
||||
enable = true;
|
||||
consoleMode = "auto";
|
||||
};
|
||||
};
|
||||
|
||||
kernelPackages = pkgs.linuxPackages_latest;
|
||||
kernelParams = [
|
||||
"quiet"
|
||||
"splash"
|
||||
"vga=current"
|
||||
"mitigations=off"
|
||||
"udev.log_level=3"
|
||||
];
|
||||
|
||||
initrd = {
|
||||
verbose = false;
|
||||
kernelModules = [ "i915" ];
|
||||
};
|
||||
|
||||
consoleLogLevel = 0;
|
||||
|
||||
plymouth.enable = true;
|
||||
};
|
||||
|
||||
console = {
|
||||
earlySetup = true;
|
||||
font = "${pkgs.terminus_font}/share/consolefonts/ter-132n.psf.gz";
|
||||
packages = with pkgs; [ terminus_font ];
|
||||
keyMap = "us";
|
||||
};
|
||||
|
||||
networking = {
|
||||
hostName = "sijmen-laptop";
|
||||
networkmanager.enable = true;
|
||||
};
|
||||
|
||||
hardware.pulseaudio.enable = true;
|
||||
hardware.bluetooth.enable = true;
|
||||
sound.enable = true;
|
||||
|
||||
time.timeZone = "Europe/Amsterdam";
|
||||
|
||||
# Select internationalisation properties.
|
||||
i18n = {
|
||||
defaultLocale = "en_US.UTF-8";
|
||||
supportedLocales = [
|
||||
"en_US.UTF-8/UTF-8"
|
||||
"nl_NL.UTF-8/UTF-8"
|
||||
];
|
||||
};
|
||||
|
||||
users.users.sijmen = {
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "wheel" ];
|
||||
};
|
||||
|
||||
environment = {
|
||||
gnome.excludePackages = (with pkgs; [
|
||||
gnome-photos
|
||||
gnome-tour
|
||||
]) ++ (with pkgs.gnome; [
|
||||
gnome-calendar
|
||||
gnome-music
|
||||
epiphany # web browser
|
||||
geary # email reader
|
||||
totem # video player
|
||||
tali # poker game
|
||||
iagno # go game
|
||||
hitori # sudoku game
|
||||
atomix # puzzle game
|
||||
]);
|
||||
|
||||
systemPackages = with pkgs; [ gnome.adwaita-icon-theme ];
|
||||
};
|
||||
|
||||
services.pipewire.enable = true;
|
||||
services.printing.enable = true;
|
||||
|
||||
services.xserver = {
|
||||
enable = true;
|
||||
displayManager.gdm.enable = true;
|
||||
desktopManager.gnome.enable = true;
|
||||
};
|
||||
|
||||
services.openssh = {
|
||||
enable = true;
|
||||
passwordAuthentication = false;
|
||||
};
|
||||
|
||||
services.throttled.enable = true;
|
||||
|
||||
services.syncthing = {
|
||||
enable = true;
|
||||
user = "sijmen";
|
||||
dataDir = config.users.users.sijmen.home;
|
||||
overrideDevices = true;
|
||||
overrideFolders = true;
|
||||
|
||||
devices = {
|
||||
nas.id = "5XADATO-6ZKNZFK-YIX2TU3-RTUOAXR-OMWOAH6-OIUB7LE-TWM5B3C-W2I2FQU";
|
||||
desktop-fedora.id = "RE3BCEP-2FVDNPA-C72KDCX-5NRTLD4-DEJZAIX-PJAMJAN-LJDFHOY-WOXNPQW";
|
||||
};
|
||||
|
||||
folders = {
|
||||
"vhuse-qjbcl" = {
|
||||
path = "${config.users.users.sijmen.home}/Sync";
|
||||
devices = [ "nas" "desktop-fedora" ];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
networking.firewall = {
|
||||
allowedTCPPorts = [
|
||||
22 # ssh
|
||||
22000 # syncthing sync
|
||||
51414 # transmission
|
||||
57621 # spotify connect
|
||||
];
|
||||
|
||||
allowedUDPPorts = [
|
||||
21027 # syncthing discovery
|
||||
22000 # syncthing sync
|
||||
];
|
||||
};
|
||||
|
||||
fonts.fonts = with pkgs; [
|
||||
noto-fonts
|
||||
noto-fonts-cjk
|
||||
noto-fonts-emoji
|
||||
nerdfonts
|
||||
];
|
||||
|
||||
programs.steam = {
|
||||
enable = true;
|
||||
remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
|
||||
dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
|
||||
};
|
||||
|
||||
# This value determines the NixOS release from which the default
|
||||
# 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.05"; # Did you read the comment?
|
||||
}
|
||||
1
configuration.nix
Symbolic link
1
configuration.nix
Symbolic link
|
|
@ -0,0 +1 @@
|
|||
thinkpad/configuration.nix
|
||||
164
thinkpad/configuration.nix
Normal file
164
thinkpad/configuration.nix
Normal file
|
|
@ -0,0 +1,164 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
../hardware-configuration.nix
|
||||
../common/configuration.nix
|
||||
];
|
||||
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
||||
boot = {
|
||||
loader = {
|
||||
timeout = 0;
|
||||
efi.canTouchEfiVariables = true;
|
||||
|
||||
systemd-boot = {
|
||||
enable = true;
|
||||
consoleMode = "auto";
|
||||
};
|
||||
};
|
||||
|
||||
kernelPackages = pkgs.linuxPackages_latest;
|
||||
kernelParams = [
|
||||
"quiet"
|
||||
"splash"
|
||||
"vga=current"
|
||||
"mitigations=off"
|
||||
"udev.log_level=3"
|
||||
];
|
||||
|
||||
initrd = {
|
||||
verbose = false;
|
||||
kernelModules = [ "i915" ];
|
||||
};
|
||||
|
||||
consoleLogLevel = 0;
|
||||
|
||||
plymouth.enable = true;
|
||||
};
|
||||
|
||||
console = {
|
||||
earlySetup = true;
|
||||
font = "${pkgs.terminus_font}/share/consolefonts/ter-132n.psf.gz";
|
||||
packages = with pkgs; [ terminus_font ];
|
||||
keyMap = "us";
|
||||
};
|
||||
|
||||
networking = {
|
||||
hostName = "sijmen-laptop";
|
||||
networkmanager.enable = true;
|
||||
};
|
||||
|
||||
hardware.pulseaudio.enable = true;
|
||||
hardware.bluetooth.enable = true;
|
||||
sound.enable = true;
|
||||
|
||||
time.timeZone = "Europe/Amsterdam";
|
||||
|
||||
# Select internationalisation properties.
|
||||
i18n = {
|
||||
defaultLocale = "en_US.UTF-8";
|
||||
supportedLocales = [
|
||||
"en_US.UTF-8/UTF-8"
|
||||
"nl_NL.UTF-8/UTF-8"
|
||||
];
|
||||
};
|
||||
|
||||
users.users.sijmen = {
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "wheel" "libvirtd" ];
|
||||
};
|
||||
|
||||
environment = {
|
||||
gnome.excludePackages = (with pkgs; [
|
||||
gnome-photos
|
||||
gnome-tour
|
||||
]) ++ (with pkgs.gnome; [
|
||||
gnome-calendar
|
||||
gnome-music
|
||||
epiphany # web browser
|
||||
geary # email reader
|
||||
totem # video player
|
||||
tali # poker game
|
||||
iagno # go game
|
||||
hitori # sudoku game
|
||||
atomix # puzzle game
|
||||
]);
|
||||
|
||||
systemPackages = with pkgs; [ gnome.adwaita-icon-theme ];
|
||||
};
|
||||
|
||||
services.pipewire.enable = true;
|
||||
services.printing.enable = true;
|
||||
|
||||
services.xserver = {
|
||||
enable = true;
|
||||
displayManager.gdm.enable = true;
|
||||
desktopManager.gnome.enable = true;
|
||||
};
|
||||
|
||||
services.openssh = {
|
||||
enable = true;
|
||||
passwordAuthentication = false;
|
||||
};
|
||||
|
||||
services.throttled.enable = true;
|
||||
|
||||
services.syncthing = {
|
||||
enable = true;
|
||||
user = "sijmen";
|
||||
dataDir = config.users.users.sijmen.home;
|
||||
overrideDevices = true;
|
||||
overrideFolders = true;
|
||||
|
||||
devices = {
|
||||
nas.id = "5XADATO-6ZKNZFK-YIX2TU3-RTUOAXR-OMWOAH6-OIUB7LE-TWM5B3C-W2I2FQU";
|
||||
desktop-fedora.id = "RE3BCEP-2FVDNPA-C72KDCX-5NRTLD4-DEJZAIX-PJAMJAN-LJDFHOY-WOXNPQW";
|
||||
};
|
||||
|
||||
folders = {
|
||||
"vhuse-qjbcl" = {
|
||||
path = "${config.users.users.sijmen.home}/Sync";
|
||||
devices = [ "nas" "desktop-fedora" ];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
networking.firewall = {
|
||||
allowedTCPPorts = [
|
||||
22 # ssh
|
||||
22000 # syncthing sync
|
||||
51414 # transmission
|
||||
57621 # spotify connect
|
||||
];
|
||||
|
||||
allowedUDPPorts = [
|
||||
21027 # syncthing discovery
|
||||
22000 # syncthing sync
|
||||
];
|
||||
};
|
||||
|
||||
fonts.fonts = with pkgs; [
|
||||
noto-fonts
|
||||
noto-fonts-cjk
|
||||
noto-fonts-emoji
|
||||
nerdfonts
|
||||
];
|
||||
|
||||
programs.steam = {
|
||||
enable = true;
|
||||
remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
|
||||
dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
|
||||
};
|
||||
|
||||
virtualisation.libvirtd.enable = true;
|
||||
|
||||
# This value determines the NixOS release from which the default
|
||||
# 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.05"; # Did you read the comment?
|
||||
}
|
||||
Loading…
Reference in a new issue