haak/dotfiles
1
0
Fork 0
Code Issues Pull requests Wiki Activity Actions

remove desktop environment from server; consolidate much-needed caps:esc switch to common users file

Browse source
This commit is contained in:
Haak Saxberg 2022-08-09 17:36:58 -07:00
parent b5948db3da
commit f739cc8fde
4 changed files with 10 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

3
nix/deployments/nixops.nix
View file

@ -26,6 +26,9 @@
server = { server = {
deployment.targetHost = "192.168.1.65"; deployment.targetHost = "192.168.1.65";
imports = [ ../system/xps11/configuration.nix ]; imports = [ ../system/xps11/configuration.nix ];
networking.wireless.networks.N904.pskRaw = (
(import ../system/framework/keys.nix).wifi.N904.pskRaw
);
}; };
nas = { nas = {

4
nix/system/common/users.nix
View file

@ -9,6 +9,10 @@
]; ];
}; };
# run the following command to swap escape and caps-lock keys, like a
# civilized person:
services.xserver.xkbOptions = "caps:swapescape";
users.extraUsers.haak = { users.extraUsers.haak = {
shell = pkgs.zsh; shell = pkgs.zsh;
}; };

3
nix/system/framework/configuration.nix
View file

@ -142,9 +142,6 @@
desktopManager.gnome.enable = true; desktopManager.gnome.enable = true;
layout = "us"; layout = "us";
# run the following command to swap escape and caps-lock keys, like a
# civilized person:
xkbOptions = "caps:swapescape";
}; };
services.syncthing = { services.syncthing = {

31
nix/system/xps11/configuration.nix
View file

@ -19,10 +19,10 @@
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
networking.networkmanager.enable = true; # networking.networkmanager.enable = true;
networking.hostName = "athena"; # Define your hostname. networking.hostName = "athena"; # Define your hostname.
# Create entries for /etc/wpa_supplicant.conf by running `wpa_passphrase SSID PASSWORD` # Create entries for /etc/wpa_supplicant.conf by running `wpa_passphrase SSID PASSWORD`
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
# The global useDHCP flag is deprecated, therefore explicitly set to false here. # The global useDHCP flag is deprecated, therefore explicitly set to false here.
# Per-interface useDHCP will be mandatory in the future, so this generated config # Per-interface useDHCP will be mandatory in the future, so this generated config
@ -49,21 +49,12 @@
# $ nix search wget # $ nix search wget
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
cachix cachix
# configure local network sharing, launch app on startup, and auto-connect
# in the preferences menu
mullvad-vpn
p7zip p7zip
# Do NOT use qbittorrent unless you have set up interface binding with your
# VPN: https://web.archive.org/web/20210426203101/https://mullvad.net/en/help/bittorrent/
qbittorrent
wget wget
zsh
]; ];
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
fonts.fonts = with pkgs; [ fira-code ];
# Open ports in the firewall. # Open ports in the firewall.
networking.firewall = { networking.firewall = {
allowedTCPPorts = [ allowedTCPPorts = [
@ -147,11 +138,6 @@
}; };
}; };
# VPN setup
services.mullvad-vpn.enable = true;
networking.wireguard.enable = true;
networking.firewall.checkReversePath = "loose";
# Some programs need SUID wrappers, can be configured further or are # Some programs need SUID wrappers, can be configured further or are
# started in user sessions. # started in user sessions.
# programs.mtr.enable = true; # programs.mtr.enable = true;
@ -162,10 +148,7 @@
# Enable the OpenSSH daemon. # Enable the OpenSSH daemon.
services.openssh.enable = true; services.openssh.enable = true;
# Enable the X11 windowing system.
services.xserver.enable = true;
services.xserver.layout = "us"; services.xserver.layout = "us";
services.xserver.xkbOptions = "caps:swapescape";
services.plex = { services.plex = {
enable = true; enable = true;
@ -174,15 +157,7 @@
}; };
# Enable touchpad support. # Enable touchpad support.
services.xserver.libinput.enable = true; # services.xserver.libinput.enable = true;
# Enable the KDE Desktop Environment.
services.xserver = {
displayManager.sddm.enable = true;
desktopManager.plasma5.enable = true;
};
location.provider = "geoclue2";
# This value determines the NixOS release with which your system is to be # This value determines the NixOS release with which your system is to be
# compatible, in order to avoid breaking some software such as database # compatible, in order to avoid breaking some software such as database