fix: change up some things for my new laptop

4 files changed, 35 insertions, 14 deletions

diff --git a/home-manager/homeModules/hyprland.nix b/home-manager/homeModules/hyprland.nix
index 91e8bd2..df6d61e 100644
--- a/home-manager/homeModules/hyprland.nix
+++ b/home-manager/homeModules/hyprland.nix
@@ -44,7 +44,10 @@
           "$scripts/bitwarden-float.sh"
         ];
         
-        monitor = ",preferred,auto,1,mirror,eDP-1";
+        monitor = [
+          "eDP-1,preferred,auto,2"
+          ",preferred,auto,1,mirror,eDP-1"
+        ];
 
         input = {
           kb_layout = "us,ru";
@@ -77,6 +80,12 @@
           };
         };
 
+        xwayland.force_zero_scaling = true;
+        env = [
+          "GDK_SCALE,2"
+          "XCURSOR_SIZE,32"
+        ];
+
         animations = {
           enabled = 1;
           # bezier = "overshot,0.13,0.99,0.29,1.1,";
@@ -111,7 +120,7 @@
         windowrulev2 = [
           "float, class:^(org.telegram.desktop)$"
           "pin, class:^(org.telegram.desktop)$"
-          "size 30% 975, class:^(org.telegram.desktop)$"
+          "size 30% 845, class:^(org.telegram.desktop)$"
           "move 100%-w-25 73, class:^(org.telegram.desktop)$"
           # firefox
           "float, title:(Sharing Indicator)"
@@ -149,12 +158,12 @@
           "$mainMod, D, exec, killall rofi || rofi -show-icons -show drun"
           "$mainMod, Q, exec, $terminal"
           "$mainMod, B, exec, zen-beta"
-          # "$mainMod, T, exec, telegram-desktop"
+          "$mainMod, T, exec, Telegram"
           "$mainMod, E, exec, emacsclient -c -a emacs"
           "$mainMod CONTROL, E, exec, emacs"
           "$mainMod, T, exec, $scripts/toggle-tg.sh"
           "$mainMod SHIFT, Esc, exec, swww img ${config.wallpaper}"
-          ",XF86HangupPhone, exec, bash $scripts/toggle-vpn.sh"
+          ",XF86Favourites, exec, bash $scripts/toggle-vpn.sh"
           
           # Screenshooting
           ", Print, exec, grimblast save screen"
@@ -197,7 +206,7 @@
           ",0x1008FF13,exec,wpctl set-volume @DEFAULT_SINK@ 5%+"
           ",0x1008FF12,exec,wpctl set-mute @DEFAULT_SINK@ toggle"
           ",XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_SOURCE@ toggle"
-          ",XF86PickupPhone, exec, python3 $scripts/switch-sink.py"
+          ",XF86TouchpadToggle, exec, python3 $scripts/switch-sink.py"
 
           # Brightness
           ",XF86MonBrightnessUp,exec,brightnessctl s +5%"
diff --git a/nixos/general.nix b/nixos/general.nix
index c2fb98a..2162cda 100644
--- a/nixos/general.nix
+++ b/nixos/general.nix
@@ -87,6 +87,13 @@
     pulse.enable = true;
     jack.enable = true;
   };
+
+  programs.gamemode = {
+    enable = true;
+    settings = {
+      gpu.amd_performance_level = "high";
+    };
+  };
   
   environment.systemPackages = with pkgs; [
     neovim
diff --git a/nixos/laptop/configuration.nix b/nixos/laptop/configuration.nix
index 8cf2afb..518fe20 100644
--- a/nixos/laptop/configuration.nix
+++ b/nixos/laptop/configuration.nix
@@ -22,18 +22,18 @@
 
   powerManagement.enable = true;
   services.tlp = {
-    enable = true;
+    enable = false;
     settings = {
+      CPU_SCALING_GOVERNOR_ON_BAT = "performance";
       CPU_SCALING_GOVERNOR_ON_AC = "performance";
-      CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
 
-      CPU_ENERGY_PERF_POLICY_ON_BAT = "power";
+      CPU_ENERGY_PERF_POLICY_ON_BAT = "performance";
       CPU_ENERGY_PERF_POLICY_ON_AC = "performance";
 
       CPU_MIN_PERF_ON_AC = 0;
       CPU_MAX_PERF_ON_AC = 100;
       CPU_MIN_PERF_ON_BAT = 0;
-      CPU_MAX_PERF_ON_BAT = 20;
+      CPU_MAX_PERF_ON_BAT = 100;
 
       USB_AUTOSUSPEND = 0;
     };
@@ -51,6 +51,9 @@
     pkgs.android-udev-rules
   ];
 
+  programs.hyprland.enable = true;
+  services.flatpak.enable = true;
+  
   # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
   system.stateVersion = "23.05";
 }
diff --git a/nixos/laptop/hardware-configuration.nix b/nixos/laptop/hardware-configuration.nix
index 3e2957e..f8d847d 100644
--- a/nixos/laptop/hardware-configuration.nix
+++ b/nixos/laptop/hardware-configuration.nix
@@ -11,6 +11,7 @@
   boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" "sdhci_pci" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
+  boot.kernelParams = [ "amdgpu.sg_display=0" ];
   boot.extraModulePackages = [ ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
@@ -24,15 +25,16 @@
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 
-  hardware.amdgpu.amdvlk = {
-    enable = true;
-    support32Bit.enable = true;
-  };
+  # hardware.amdgpu.amdvlk = {
+  #   enable = true;
+  #   support32Bit.enable = true;
+  # };
+  
   hardware.graphics = {
     enable = true;
     enable32Bit = true;
   };
 
-  services.xserver.videoDrivers = [ "amdgpu" ];
+  services.xserver.videoDrivers = [ "modesetting" ];
   hardware.bluetooth.enable = true;
 }