+
4.4.3. nixpkgs-fmt
Adds functions for formatting nix code.
@@ -13623,7 +13620,7 @@ My laptop, sadly soon to be replaced by a new one, since most basic functions ar
Author: Leon Schwarzäugl
-
Created: 2024-07-25 Do 16:53
+
Created: 2024-07-25 Do 17:05
Validate
diff --git a/modules/home/input.nix b/modules/home/input.nix
index 63f523c..a35e6b0 100644
--- a/modules/home/input.nix
+++ b/modules/home/input.nix
@@ -30,5 +30,4 @@ in
default = { };
};
-
}
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 09de9cb..a580653 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -1,3 +1,4 @@
{
wallpaper = import ./wallpaper.nix;
+ hardware = import ./hardware.nix;
}
diff --git a/modules/nixos/hardware.nix b/modules/nixos/hardware.nix
new file mode 100644
index 0000000..61a24de
--- /dev/null
+++ b/modules/nixos/hardware.nix
@@ -0,0 +1,11 @@
+{ lib, ... }:
+
+{
+ options.swarselsystems.hasBluetooth = lib.mkEnableOption "bluetooth availability";
+ options.swarselsystems.hasFingerprint = lib.mkEnableOption "fingerprint sensor availability";
+ options.swarselsystems.trackpoint.isAvailable = lib.mkEnableOption "trackpoint availability";
+ options.swarselsystems.trackpoint.device = lib.mkOption {
+ type = lib.types.str;
+ default = "";
+ };
+}
diff --git a/profiles/common/nixos/default.nix b/profiles/common/nixos/default.nix
index 753f0af..0dc82de 100644
--- a/profiles/common/nixos/default.nix
+++ b/profiles/common/nixos/default.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ lib, ... }:
{
imports = [
./xserver.nix
@@ -24,6 +24,7 @@
./hardwarecompatibility.nix
./login.nix
./stylix.nix
+ ./power-profiles-daemon.nix
];
@@ -31,4 +32,6 @@
useGlobalPkgs = true;
useUserPackages = true;
};
+
+ system.stateVersion = lib.mkDefault "23.05";
}
diff --git a/profiles/common/nixos/hardware.nix b/profiles/common/nixos/hardware.nix
index 4263901..a0908ba 100644
--- a/profiles/common/nixos/hardware.nix
+++ b/profiles/common/nixos/hardware.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, config, lib, ... }:
{
hardware = {
@@ -7,6 +7,11 @@
enable32Bit = true;
};
+ trackpoint = lib.mkIf config.swarselsystems.trackpoint.isAvailable {
+ enable = true;
+ device = config.swarselsystems.trackpoint.device;
+ };
+
pulseaudio = {
enable = true;
package = pkgs.pulseaudioFull;
@@ -14,7 +19,7 @@
enableAllFirmware = true;
- bluetooth = {
+ bluetooth = lib.mkIf config.swarselsystems.hasBluetooth {
powerOnBoot = true;
settings = {
General = {
@@ -23,4 +28,6 @@
};
};
};
+
+ services.fprintd.enable = lib.mkIf config.swarselsystems.hasFingerprint true;
}
diff --git a/profiles/common/nixos/network.nix b/profiles/common/nixos/network.nix
index 6c09c2d..a5242ed 100644
--- a/profiles/common/nixos/network.nix
+++ b/profiles/common/nixos/network.nix
@@ -1,204 +1,214 @@
-{ config, ... }:
+{ lib, config, ... }:
{
- networking.networkmanager = {
- enable = true;
- ensureProfiles = {
- environmentFiles = [
- "${config.sops.templates."network-manager.env".path}"
- ];
- profiles = {
- "Ernest Routerford" = {
- connection = {
- id = "Ernest Routerford";
- permissions = "";
- type = "wifi";
- };
- ipv4 = {
- dns-search = "";
- method = "auto";
- };
- ipv6 = {
- addr-gen-mode = "stable-privacy";
- dns-search = "";
- method = "auto";
- };
- wifi = {
- mac-address-blacklist = "";
- mode = "infrastructure";
- ssid = "Ernest Routerford";
- };
- wifi-security = {
- auth-alg = "open";
- key-mgmt = "wpa-psk";
- psk = "$ERNEST";
- };
- };
+ networking = {
+ nftables.enable = lib.mkDefault true;
+ enableIPv6 = lib.mkDefault true;
+ firewall = {
+ checkReversePath = lib.mkDefault false;
+ enable = lib.mkDefault true;
+ allowedUDPPorts = [ 51820 ]; # 34197: factorio; 4380 27036 14242: barotrauma; 51820: wireguard
+ };
- LAN-Party = {
- connection = {
- autoconnect = "false";
- id = "LAN-Party";
- type = "ethernet";
+ networkmanager = {
+ enable = true;
+ ensureProfiles = {
+ environmentFiles = [
+ "${config.sops.templates."network-manager.env".path}"
+ ];
+ profiles = {
+ "Ernest Routerford" = {
+ connection = {
+ id = "Ernest Routerford";
+ permissions = "";
+ type = "wifi";
+ };
+ ipv4 = {
+ dns-search = "";
+ method = "auto";
+ };
+ ipv6 = {
+ addr-gen-mode = "stable-privacy";
+ dns-search = "";
+ method = "auto";
+ };
+ wifi = {
+ mac-address-blacklist = "";
+ mode = "infrastructure";
+ ssid = "Ernest Routerford";
+ };
+ wifi-security = {
+ auth-alg = "open";
+ key-mgmt = "wpa-psk";
+ psk = "$ERNEST";
+ };
};
- ethernet = {
- auto-negotiate = "true";
- cloned-mac-address = "preserve";
- mac-address = "90:2E:16:D0:A1:87";
- };
- ipv4 = { method = "shared"; };
- ipv6 = {
- addr-gen-mode = "stable-privacy";
- method = "auto";
- };
- proxy = { };
- };
- eduroam = {
- "802-1x" = {
- eap = "ttls;";
- identity = "$EDUID";
- password = "$EDUPASS";
- phase2-auth = "mschapv2";
+ LAN-Party = {
+ connection = {
+ autoconnect = "false";
+ id = "LAN-Party";
+ type = "ethernet";
+ };
+ ethernet = {
+ auto-negotiate = "true";
+ cloned-mac-address = "preserve";
+ mac-address = "90:2E:16:D0:A1:87";
+ };
+ ipv4 = { method = "shared"; };
+ ipv6 = {
+ addr-gen-mode = "stable-privacy";
+ method = "auto";
+ };
+ proxy = { };
};
- connection = {
- id = "eduroam";
- type = "wifi";
- };
- ipv4 = { method = "auto"; };
- ipv6 = {
- addr-gen-mode = "default";
- method = "auto";
- };
- proxy = { };
- wifi = {
- mode = "infrastructure";
- ssid = "eduroam";
- };
- wifi-security = {
- auth-alg = "open";
- key-mgmt = "wpa-eap";
- };
- };
- local = {
- connection = {
- autoconnect = "false";
- id = "local";
- type = "ethernet";
+ eduroam = {
+ "802-1x" = {
+ eap = "ttls;";
+ identity = "$EDUID";
+ password = "$EDUPASS";
+ phase2-auth = "mschapv2";
+ };
+ connection = {
+ id = "eduroam";
+ type = "wifi";
+ };
+ ipv4 = { method = "auto"; };
+ ipv6 = {
+ addr-gen-mode = "default";
+ method = "auto";
+ };
+ proxy = { };
+ wifi = {
+ mode = "infrastructure";
+ ssid = "eduroam";
+ };
+ wifi-security = {
+ auth-alg = "open";
+ key-mgmt = "wpa-eap";
+ };
};
- ethernet = { };
- ipv4 = {
- address1 = "10.42.1.1/24";
- method = "shared";
- };
- ipv6 = {
- addr-gen-mode = "stable-privacy";
- method = "auto";
- };
- proxy = { };
- };
- HH40V_39F5 = {
- connection = {
- id = "HH40V_39F5";
- type = "wifi";
+ local = {
+ connection = {
+ autoconnect = "false";
+ id = "local";
+ type = "ethernet";
+ };
+ ethernet = { };
+ ipv4 = {
+ address1 = "10.42.1.1/24";
+ method = "shared";
+ };
+ ipv6 = {
+ addr-gen-mode = "stable-privacy";
+ method = "auto";
+ };
+ proxy = { };
};
- ipv4 = { method = "auto"; };
- ipv6 = {
- addr-gen-mode = "stable-privacy";
- method = "auto";
- };
- proxy = { };
- wifi = {
- band = "bg";
- mode = "infrastructure";
- ssid = "HH40V_39F5";
- };
- wifi-security = {
- key-mgmt = "wpa-psk";
- psk = "$FRAUNS";
- };
- };
- magicant = {
- connection = {
- id = "magicant";
- type = "wifi";
+ HH40V_39F5 = {
+ connection = {
+ id = "HH40V_39F5";
+ type = "wifi";
+ };
+ ipv4 = { method = "auto"; };
+ ipv6 = {
+ addr-gen-mode = "stable-privacy";
+ method = "auto";
+ };
+ proxy = { };
+ wifi = {
+ band = "bg";
+ mode = "infrastructure";
+ ssid = "HH40V_39F5";
+ };
+ wifi-security = {
+ key-mgmt = "wpa-psk";
+ psk = "$FRAUNS";
+ };
};
- ipv4 = { method = "auto"; };
- ipv6 = {
- addr-gen-mode = "default";
- method = "auto";
- };
- proxy = { };
- wifi = {
- mode = "infrastructure";
- ssid = "magicant";
- };
- wifi-security = {
- auth-alg = "open";
- key-mgmt = "wpa-psk";
- psk = "$HANDYHOTSPOT";
- };
- };
- "sweden-aes-128-cbc-udp-dns" = {
- connection = {
- autoconnect = "false";
- id = "PIA Sweden";
- type = "vpn";
+ magicant = {
+ connection = {
+ id = "magicant";
+ type = "wifi";
+ };
+ ipv4 = { method = "auto"; };
+ ipv6 = {
+ addr-gen-mode = "default";
+ method = "auto";
+ };
+ proxy = { };
+ wifi = {
+ mode = "infrastructure";
+ ssid = "magicant";
+ };
+ wifi-security = {
+ auth-alg = "open";
+ key-mgmt = "wpa-psk";
+ psk = "$HANDYHOTSPOT";
+ };
};
- ipv4 = { method = "auto"; };
- ipv6 = {
- addr-gen-mode = "stable-privacy";
- method = "auto";
- };
- proxy = { };
- vpn = {
- auth = "sha1";
- ca =
- "${config.users.users.swarsel.home}/.dotfiles/secrets/certs/sweden-aes-128-cbc-udp-dns-ca.pem";
- challenge-response-flags = "2";
- cipher = "aes-128-cbc";
- compress = "yes";
- connection-type = "password";
- crl-verify-file = "${config.users.users.swarsel.home}/.dotfiles/secrets/certs/sweden-aes-128-cbc-udp-dns-crl-verify.pem";
- dev = "tun";
- password-flags = "0";
- remote = "sweden.privacy.network:1198";
- remote-cert-tls = "server";
- reneg-seconds = "0";
- service-type = "org.freedesktop.NetworkManager.openvpn";
- username = "$VPNUSER";
- };
- vpn-secrets = { password = "$VPNPASS"; };
- };
- Hotspot = {
- connection = {
- autoconnect = "false";
- id = "Hotspot";
- type = "wifi";
+ "sweden-aes-128-cbc-udp-dns" = {
+ connection = {
+ autoconnect = "false";
+ id = "PIA Sweden";
+ type = "vpn";
+ };
+ ipv4 = { method = "auto"; };
+ ipv6 = {
+ addr-gen-mode = "stable-privacy";
+ method = "auto";
+ };
+ proxy = { };
+ vpn = {
+ auth = "sha1";
+ ca =
+ "${config.users.users.swarsel.home}/.dotfiles/secrets/certs/sweden-aes-128-cbc-udp-dns-ca.pem";
+ challenge-response-flags = "2";
+ cipher = "aes-128-cbc";
+ compress = "yes";
+ connection-type = "password";
+ crl-verify-file = "${config.users.users.swarsel.home}/.dotfiles/secrets/certs/sweden-aes-128-cbc-udp-dns-crl-verify.pem";
+ dev = "tun";
+ password-flags = "0";
+ remote = "sweden.privacy.network:1198";
+ remote-cert-tls = "server";
+ reneg-seconds = "0";
+ service-type = "org.freedesktop.NetworkManager.openvpn";
+ username = "$VPNUSER";
+ };
+ vpn-secrets = { password = "$VPNPASS"; };
};
- ipv4 = { method = "shared"; };
- ipv6 = {
- addr-gen-mode = "default";
- method = "ignore";
- };
- proxy = { };
- wifi = {
- mode = "ap";
- ssid = "Hotspot-fourside";
- };
- wifi-security = {
- group = "ccmp;";
- key-mgmt = "wpa-psk";
- pairwise = "ccmp;";
- proto = "rsn;";
- psk = "$HOTSPOT";
- };
- };
+ Hotspot = {
+ connection = {
+ autoconnect = "false";
+ id = "Hotspot";
+ type = "wifi";
+ };
+ ipv4 = { method = "shared"; };
+ ipv6 = {
+ addr-gen-mode = "default";
+ method = "ignore";
+ };
+ proxy = { };
+ wifi = {
+ mode = "ap";
+ ssid = "Hotspot-fourside";
+ };
+ wifi-security = {
+ group = "ccmp;";
+ key-mgmt = "wpa-psk";
+ pairwise = "ccmp;";
+ proto = "rsn;";
+ psk = "$HOTSPOT";
+ };
+ };
+
+ };
};
};
};
diff --git a/profiles/common/nixos/power-profiles-daemon.nix b/profiles/common/nixos/power-profiles-daemon.nix
new file mode 100644
index 0000000..fb22812
--- /dev/null
+++ b/profiles/common/nixos/power-profiles-daemon.nix
@@ -0,0 +1,4 @@
+{ ... }:
+{
+ services.power-profiles-daemon.enable = true;
+}
diff --git a/profiles/fourside/default.nix b/profiles/fourside/default.nix
index 12b61d2..9412040 100644
--- a/profiles/fourside/default.nix
+++ b/profiles/fourside/default.nix
@@ -1,14 +1,15 @@
-{ inputs, outputs, config, ... }:
+{ inputs, outputs, config, pkgs, ... }:
{
imports = [
inputs.nixos-hardware.nixosModules.lenovo-thinkpad-p14s-amd-gen2
./hardware-configuration.nix
- ./nixos.nix
../optional/nixos/steam.nix
../optional/nixos/virtualbox.nix
+ ../optional/nixos/autologin.nix
+ ../optional/nixos/nswitch-rcm.nix
inputs.home-manager.nixosModules.home-manager
{
@@ -26,12 +27,37 @@
};
};
- # ------ -----
- # | DP-4 | |eDP-1|
- # ------ -----
+ boot = {
+ loader.systemd-boot.enable = true;
+ loader.efi.canTouchEfiVariables = true;
+ kernelPackages = pkgs.linuxPackages_latest;
+ };
+
+
+ networking = {
+ hostName = "fourside";
+ firewall.enable = true;
+ };
+
+ hardware.graphics.extraPackages = with pkgs; [
+ vulkan-loader
+ vulkan-validation-layers
+ vulkan-extension-layer
+ ];
+
+ services = {
+ thinkfan.enable = false;
+ fwupd.enable = true;
+ };
swarselsystems = {
wallpaper = ../../wallpaper/lenovowp.png;
+ hasBluetooth = true;
+ hasFingerprint = true;
+ trackpoint = {
+ isAvailable = true;
+ device = "TPPS/2 Elan TrackPoint";
+ };
};
home-manager.users.swarsel.swarselsystems = {
@@ -42,6 +68,9 @@
path = "/sys/devices/platform/thinkpad_hwmon/hwmon/";
input-filename = "temp1_input";
};
+ # ------ -----
+ # | DP-4 | |eDP-1|
+ # ------ -----
monitors = {
main = {
name = "California Institute of Technology 0x1407 Unknown";
diff --git a/profiles/fourside/nixos.nix b/profiles/fourside/nixos.nix
index e3b4f8e..0990207 100644
--- a/profiles/fourside/nixos.nix
+++ b/profiles/fourside/nixos.nix
@@ -2,10 +2,6 @@
{
- services = {
- getty.autologinUser = "swarsel";
- greetd.settings.initial_session.user = "swarsel";
- };
boot = {
loader.systemd-boot.enable = true;
@@ -14,53 +10,10 @@
};
- networking = {
- hostName = "fourside"; # Define your hostname.
- nftables.enable = true;
- enableIPv6 = false;
- firewall.checkReversePath = false;
- firewall = {
- enable = true;
- allowedUDPPorts = [ 4380 27036 14242 34197 51820 ]; # 34197: factorio; 4380 27036 14242: barotrauma; 51820: wireguard
- allowedTCPPorts = [ ]; # 34197: factorio; 4380 27036 14242: barotrauma; 51820: wireguard
- allowedTCPPortRanges = [
- { from = 27015; to = 27030; } # barotrauma
- { from = 27036; to = 27037; } # barotrauma
- ];
- allowedUDPPortRanges = [
- { from = 27000; to = 27031; } # barotrauma
- { from = 58962; to = 58964; } # barotrauma
- ];
- };
- };
-
-
-
- hardware = {
- graphics = {
- enable = true;
- enable32Bit = true;
- extraPackages = with pkgs; [
- vulkan-loader
- vulkan-validation-layers
- vulkan-extension-layer
- ];
- };
- bluetooth.enable = true;
- trackpoint = {
- enable = true;
- device = "TPPS/2 Elan TrackPoint";
- };
- };
-
-
- # Configure keymap in X11 (only used for login)
-
services.thinkfan = {
enable = false;
};
services.power-profiles-daemon.enable = true;
- services.fprintd.enable = true;
services.fwupd.enable = true;
services.nswitch-rcm = {
@@ -72,10 +25,6 @@
};
- environment.systemPackages = with pkgs; [
- ];
-
- system.stateVersion = "23.05";
}
diff --git a/profiles/optional/nixos/autologin.nix b/profiles/optional/nixos/autologin.nix
new file mode 100644
index 0000000..34a5d8a
--- /dev/null
+++ b/profiles/optional/nixos/autologin.nix
@@ -0,0 +1,7 @@
+{ ... }:
+{
+ services = {
+ getty.autologinUser = "swarsel";
+ greetd.settings.initial_session.user = "swarsel";
+ };
+}
diff --git a/profiles/optional/nixos/gaming.nix b/profiles/optional/nixos/gaming.nix
new file mode 100644
index 0000000..aa65116
--- /dev/null
+++ b/profiles/optional/nixos/gaming.nix
@@ -0,0 +1,24 @@
+{ pkgs, ... }:
+{
+ networking = {
+ firewall = {
+ allowedUDPPorts = [ 4380 27036 14242 34197 ]; # 34197: factorio; 4380 27036 14242: barotrauma;
+ allowedTCPPorts = [ ]; # 34197: factorio; 4380 27036 14242: barotrauma; 51820: wireguard
+ allowedTCPPortRanges = [
+ { from = 27015; to = 27030; } # barotrauma
+ { from = 27036; to = 27037; } # barotrauma
+ ];
+ allowedUDPPortRanges = [
+ { from = 27000; to = 27031; } # barotrauma
+ { from = 58962; to = 58964; } # barotrauma
+ ];
+ };
+ };
+
+ programs.steam = {
+ enable = true;
+ extraCompatPackages = [
+ pkgs.proton-ge-bin
+ ];
+ };
+}
diff --git a/profiles/optional/nixos/nswitch-rcm.nix b/profiles/optional/nixos/nswitch-rcm.nix
new file mode 100644
index 0000000..6af5a91
--- /dev/null
+++ b/profiles/optional/nixos/nswitch-rcm.nix
@@ -0,0 +1,10 @@
+{ pkgs, ... }:
+{
+ services.nswitch-rcm = {
+ enable = true;
+ package = pkgs.fetchurl {
+ url = "https://github.com/Atmosphere-NX/Atmosphere/releases/download/1.3.2/fusee.bin";
+ hash = "sha256-5AXzNsny45SPLIrvWJA9/JlOCal5l6Y++Cm+RtlJppI=";
+ };
+ };
+}
diff --git a/programs/emacs/init.el b/programs/emacs/init.el
index bb475bc..5d05c68 100644
--- a/programs/emacs/init.el
+++ b/programs/emacs/init.el
@@ -184,7 +184,7 @@ create a new one."
swarsel-swarsel-org-filepath)
;; Dynamic scoping to the rescue
(let ((org-confirm-babel-evaluate nil))
- (org-html-export-to-html)
+ ;; (org-html-export-to-html)
(org-babel-tangle)
(swarsel/run-formatting))))