diff --git a/flake.lock b/flake.lock index 28dd52d..cc33d9f 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ "cask-fonts": { "flake": false, "locked": { - "lastModified": 1713817471, - "narHash": "sha256-ap9Tq5WVukuOHDotvF+p0IQpcy8NsDORp1gQCcWvn4Q=", + "lastModified": 1714444667, + "narHash": "sha256-eWM0uB/QiptHbIzH+8yzsXFOWRX48yooFWOreSDfv/g=", "owner": "homebrew", "repo": "homebrew-cask-fonts", - "rev": "5dbe07c7e101165698b5f60ffb0b72d438410e7e", + "rev": "93bac1ec51db32b671b3c1cce12a4b9dfbd95652", "type": "github" }, "original": { @@ -128,11 +128,11 @@ ] }, "locked": { - "lastModified": 1713992342, - "narHash": "sha256-bW7K4WPo6jhYMo4ZUGoJfog6xJV0XZh8adXqZKunRoc=", + "lastModified": 1714430505, + "narHash": "sha256-SSJQ/KOy8uISnoZgqDoRha7g7PFLSFP/BtMWm0wUz8Q=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f072c127c041eec36621b8e38a531fe0fe07961", + "rev": "f8e6694edabe4aaa7a85aac47b43ea5d978b116d", "type": "github" }, "original": { @@ -144,11 +144,11 @@ "homebrew-cask": { "flake": false, "locked": { - "lastModified": 1714023431, - "narHash": "sha256-1Ab0LsCMiaGzgSXpzxW60GKkzQ94o8sasag11dMKnLE=", + "lastModified": 1714451093, + "narHash": "sha256-eWF+DoscTe1q+V7AK+JyXyI78iPSoKC5YCHNA74e7vI=", "owner": "homebrew", "repo": "homebrew-cask", - "rev": "8fb90cc5dd29e2003fa7a8be4cb9076da491e462", + "rev": "2645f5afac026403bc02596590f2fc56ede4df05", "type": "github" }, "original": { @@ -160,11 +160,11 @@ "homebrew-core": { "flake": false, "locked": { - "lastModified": 1714027916, - "narHash": "sha256-fPPf74TVg5rLWYKx7P2dIV9tF9NBJOWtQ7X/spAHUVA=", + "lastModified": 1714451058, + "narHash": "sha256-2OynGCZFa3HD3LizrcnGVa1voijuI9ZXK/iE3wLK5NM=", "owner": "homebrew", "repo": "homebrew-core", - "rev": "eb13b8fe3930f7e917904087f51f3b5afab8b6de", + "rev": "e071ff1388a74e9c978f361b6183c22fcf4c725b", "type": "github" }, "original": { @@ -341,11 +341,11 @@ }, "unstable": { "locked": { - "lastModified": 1713895582, - "narHash": "sha256-cfh1hi+6muQMbi9acOlju3V1gl8BEaZBXBR9jQfQi4U=", + "lastModified": 1714253743, + "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "572af610f6151fd41c212f897c71f7056e3fb518", + "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", "type": "github" }, "original": { diff --git a/gunther/configuration.nix b/gunther/configuration.nix index 1b3ebc5..ed8cf9b 100755 --- a/gunther/configuration.nix +++ b/gunther/configuration.nix @@ -19,6 +19,9 @@ }; }; + # optimize power usage + powerManagement.enable = true; + # optimize storage nix.optimise.automatic = true; diff --git a/gunther/hardware-configuration.nix b/gunther/hardware-configuration.nix index 02a15e5..e7e50a1 100644 --- a/gunther/hardware-configuration.nix +++ b/gunther/hardware-configuration.nix @@ -8,10 +8,11 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "amdgpu" ]; + boot.initrd.kernelModules = [ "amdgpu" ]; + boot.kernelModules = [ "amdgpu" ]; boot.extraModulePackages = [ ]; + boot.kernelParams = [ "video=DP-1:2560x1440@144" "video=HDMI-A-1:1920x1080@75" ]; fileSystems."/" = { device = "/dev/disk/by-uuid/2191540a-8cf9-400e-b4bc-9dbf71527b07"; diff --git a/gunther/hypr/hyprland.nix b/gunther/hypr/hyprland.nix index 9a23006..09d053b 100644 --- a/gunther/hypr/hyprland.nix +++ b/gunther/hypr/hyprland.nix @@ -6,13 +6,13 @@ xwayland.enable = true; settings = { workspace = [ - "1, monitor:HDMI-A-3, default:true, persistent:true" - "2, monitor:DP-3 , default:true, persistent:true" + "1, monitor:HDMI-A-1, default:true, persistent:true" + "2, monitor:DP-1 , default:true, persistent:true" "special:scratchpad, on-created-empty:foot" ]; monitor = [ - "DP-3 , 2560x1440@144, 1920x0, 1" - "HDMI-A-5, 1920x1080@75 , 0x0 , 1" + "DP-1 , 2560x1440@144, 1920x0, 1" + "HDMI-A-1, 1920x1080@75 , 0x0 , 1" ]; input = { kb_layout = "de"; @@ -84,10 +84,14 @@ "$mod, 2, workspace, 2" "$mod, 3, workspace, 3" "$mod, 4, workspace, 4" + "$mod, 5, workspace, 5" + "$mod, 6, workspace, 6" "$modd, 1, movetoworkspacesilent, 1" "$modd, 2, movetoworkspacesilent, 2" "$modd, 3, movetoworkspacesilent, 3" "$modd, 4, movetoworkspacesilent, 4" + "$modd, 5, movetoworkspacesilent, 5" + "$modd, 6, movetoworkspacesilent, 6" # fullscreen "$mod, F11, fullscreen, 0"