diff --git a/configuration.nix b/configuration.nix index 24e3566..99b6d17 100644 --- a/configuration.nix +++ b/configuration.nix @@ -17,7 +17,7 @@ }; }; - boot.initrd.kernelModules = [ "amdgpu" "coretemp"]; + boot.initrd.kernelModules = [ "amdgpu" "coretemp" ]; services.hardware.bolt.enable = true; @@ -51,11 +51,11 @@ xkb.layout = "de"; xkb.variant = ""; enable = true; - dpi = 100; + dpi = 120; displayManager = { setupCommands = '' - ${pkgs.xorg.xrandr}/bin/xrandr --output eDP-1 --dpi 240 --mode 3840x2160; + ${pkgs.xorg.xrandr}/bin/xrandr --output eDP-1 --mode 3840x2160; ''; }; @@ -77,6 +77,7 @@ services.gvfs.enable = true; + # VPN services services.openvpn.servers = { KIT = { autoStart = false; @@ -84,6 +85,9 @@ }; }; + # Bluetooth + services.blueman.enable = true; + # Configure console keymap console.keyMap = "de"; diff --git a/hardware_configuration.nix b/hardware_configuration.nix index 9cd2df8..404e135 100644 --- a/hardware_configuration.nix +++ b/hardware_configuration.nix @@ -42,4 +42,7 @@ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + + hardware.bluetooth.enable = true; # enables support for Bluetooth + hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot } diff --git a/programm_configs/autorandr.nix b/programm_configs/autorandr.nix index e43eecf..20560c2 100644 --- a/programm_configs/autorandr.nix +++ b/programm_configs/autorandr.nix @@ -1,39 +1,51 @@ { pkgs, ... }: +let + fingerprints = { + HDMI-2-2 = "00ffffffffffff0030aee06557394834311d0103803c22782eb9a5a356509f260e5054adcf00d1c08180818a9500b300714f01010101023a801871382d40582c450056502100001e2a4480a0703827403020350056502100001a000000fd00314c365a15000a202020202020000000fc004c454e204c3237692d32380a20015f020327f14b010203040514111213101f230907078301000065030c001000681a00000101304c00011d007251d01e206e28550056502100001e8c0ad08a20e02d10103e96005650210000188c0ad090204031200c40550056502100001800000000000000000000000000000000000000000000000000000000000000000000f8"; + eDP-1 = "00ffffffffffff004c83414100000000131d0104b5221378029491ae513eb7240b505400000001010101010101010101010101010101f0d40040f17018803020440058c21000001bf0d40040f17018803020440058c21000001b0000000f00ff093cff093c2c800000000000000000fe0041544e413536575230382d3020011502030f00e3058000e6060501736d0700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ab"; + eDP-2 = "00ffffffffffff004c83414100000000131d0104b5221378029491ae513eb7240b505400000001010101010101010101010101010101f0d40040f17018803020440058c21000001bf0d40040f17018803020440058c21000001b0000000f00ff093cff093c2c800000000000000000fe0041544e413536575230382d3020011502030f00e3058000e6060501736d0700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ab"; + }; + monitorconf = { + enable = true; + primary = true; + position = "5760x0"; + mode = "1920x1080"; + #gamma = "1.0:0.909:0.833"; + rate = "60.00"; + scale = { + x = 1.0; + y = 1.0; + }; + }; + internalconf = { + enable = true; + primary = false; + position = "0x0"; + mode = "3840x2160"; + #gamma = "1.0:0.909:0.833"; + rate = "60.00"; + scale = { + x = 0.5; + y = 0.5; + }; + }; +in { programs.autorandr = { enable = true; profiles = { - "docked" = { - fingerprint = { - HDMI-2-2 = "00ffffffffffff0030aee06557394834311d0103803c22782eb9a5a356509f260e5054adcf00d1c08180818a9500b300714f01010101023a801871382d40582c450056502100001e2a4480a0703827403020350056502100001a000000fd00314c365a15000a202020202020000000fc004c454e204c3237692d32380a20015f020327f14b010203040514111213101f230907078301000065030c001000681a00000101304c00011d007251d01e206e28550056502100001e8c0ad08a20e02d10103e96005650210000188c0ad090204031200c40550056502100001800000000000000000000000000000000000000000000000000000000000000000000f8"; - - eDP-1 = "00ffffffffffff004c83414100000000131d0104b5221378029491ae513eb7240b505400000001010101010101010101010101010101f0d40040f17018803020440058c21000001bf0d40040f17018803020440058c21000001b0000000f00ff093cff093c2c800000000000000000fe0041544e413536575230382d3020011502030f00e3058000e6060501736d0700000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ab"; - }; + "docked1" = { + fingerprint = fingerprints; config = { - HDMI-2-2 = { - enable = true; - primary = true; - position = "5760x0"; - mode = "1920x1080"; - #gamma = "1.0:0.909:0.833"; - rate = "60.00"; - scale = { - x = 1.0; - y = 1.0; - }; - }; - eDP-1 = { - enable = true; - primary = false; - position = "0x0"; - mode = "3840x2160"; - #gamma = "1.0:0.909:0.833"; - rate = "60.00"; - scale = { - x = 0.5; - y = 0.5; - }; - }; + HDMI-2-2 = monitorconf; + eDP-1 = internalconf; + }; + }; + "docked2" = { + fingerprint = fingerprints; + config = { + HDMI-2-2 = monitorconf; + eDP-2 = internalconf; }; }; }; diff --git a/programm_configs/i3.nix b/programm_configs/i3.nix index 15b6ab1..a06d37d 100644 --- a/programm_configs/i3.nix +++ b/programm_configs/i3.nix @@ -47,6 +47,11 @@ in always = true; notification = false; } + { + command = "blueman-applet"; + always = true; + notification = false; + } ]; };