From fba2849d709fcafa500ca2392e58b15255f4ef5b Mon Sep 17 00:00:00 2001 From: Akshay Nair Date: Fri, 12 Jan 2024 22:55:55 +0530 Subject: new laptop, new me --- configuration.nix | 2 +- hardware/thinkpad-e14/hardware-configuration.nix | 4 ++-- home.nix | 9 +++++---- packages.nix | 6 +++--- packages/anypinentry/source | 2 +- scripts/monitor.sh | 9 +++++---- 6 files changed, 17 insertions(+), 15 deletions(-) diff --git a/configuration.nix b/configuration.nix index 7a3ac96..8f37b76 100644 --- a/configuration.nix +++ b/configuration.nix @@ -112,7 +112,7 @@ in enable = true; autorun = false; displayManager.startx.enable = true; - videoDrivers = [ "intel" "modesetting" ]; + # videoDrivers = [ "intel" "modesetting" ]; libinput = { enable = true; touchpad = { diff --git a/hardware/thinkpad-e14/hardware-configuration.nix b/hardware/thinkpad-e14/hardware-configuration.nix index ae0d6fe..20a864a 100644 --- a/hardware/thinkpad-e14/hardware-configuration.nix +++ b/hardware/thinkpad-e14/hardware-configuration.nix @@ -74,8 +74,8 @@ vaapiVdpau libvdpau-va-gl # intel-ocl - # intel-media-driver - # intel-gmmlib + intel-media-driver + intel-gmmlib vulkan-tools mesa.drivers ]; diff --git a/home.nix b/home.nix index 612d9b2..3859d5e 100644 --- a/home.nix +++ b/home.nix @@ -82,10 +82,11 @@ in maxCacheTtl = 864000; defaultCacheTtl = 864000; enableSshSupport = false; - #pinentryFlavor = null; - #extraConfig = '' - #pinentry-program /home/imsohexy/nixos/packages/anypinentry/source/anypinentry - #''; + pinentryFlavor = "qt"; + # pinentryFlavor = null; + # extraConfig = '' + # pinentry-program ${localPkgs.anypinentry}/bin/anypinentry + # ''; }; home.file = { diff --git a/packages.nix b/packages.nix index 6ef601e..1b0994a 100644 --- a/packages.nix +++ b/packages.nix @@ -149,9 +149,9 @@ in programs.adb.enable = true; - programs.steam.enable = true; - hardware.steam-hardware.enable = true; - programs.gamemode.enable = true; + programs.steam.enable = false; + hardware.steam-hardware.enable = false; + programs.gamemode.enable = false; # Security wrappers # security.wrappers = { diff --git a/packages/anypinentry/source b/packages/anypinentry/source index 89b0ade..3302995 160000 --- a/packages/anypinentry/source +++ b/packages/anypinentry/source @@ -1 +1 @@ -Subproject commit 89b0adef42d95372c243cb8b86e1190172259fb7 +Subproject commit 3302995faca21c4b003a517c4dae12ef8d7f7971 diff --git a/scripts/monitor.sh b/scripts/monitor.sh index bc719b9..2660a6b 100755 --- a/scripts/monitor.sh +++ b/scripts/monitor.sh @@ -2,14 +2,15 @@ source "$HOME/scripts/modules/rofi-menu.sh"; -PRIMARY="eDP1"; +PRIMARY="eDP-1"; +SECONDARY_DEFAULT="HDMI-1" list-monitors() { xrandr --listmonitors | grep -v 'Monitors:' | awk '{print $4 " (" $3 ")"}'; } -monitor-off() { xrandr --output ${1:-"HDMI1"} --off; }; +monitor-off() { xrandr --output ${1:-$SECONDARY_DEFAULT} --off; }; monitor-on() { - xrandr --output ${2:-"HDMI1"} --auto --${1:-"right-of"} $PRIMARY; + xrandr --output ${2:-$SECONDARY_DEFAULT} --auto --${1:-"right-of"} $PRIMARY; } show-menu() { @@ -20,7 +21,7 @@ case $1 in ls) list-monitors ;; on) monitor-on "$2" "$3" ;; sidekick) - xrandr --output ${3:-"HDMI1"} --auto --${2:-"left-of"} $PRIMARY --rotate right --brightness 1.5 + xrandr --output ${3:-$SECONDARY_DEFAULT} --auto --${2:-"left-of"} $PRIMARY --rotate right --brightness 1.5 ;; off) monitor-off "$2" ;; menu) show-menu ;; -- cgit v1.3.1