From 91ec7ba336dcdec82742ddc2c0914ef7955afae2 Mon Sep 17 00:00:00 2001 From: albert Date: Tue, 30 Jul 2024 22:22:49 +0900 Subject: [PATCH] Updates --- flake.lock | 66 +++++++++---------- flake.nix | 12 ++-- .../software/gui/firefox/arkenfox-user.js | 2 +- .../desktops/plasma6/default.nix | 1 + .../desktops/plasma6/plasma-manager.nix | 30 ++++----- nixos/hosts/nixos-desktop/default.nix | 16 ++++- 6 files changed, 69 insertions(+), 58 deletions(-) diff --git a/flake.lock b/flake.lock index e9b37717..06e28851 100644 --- a/flake.lock +++ b/flake.lock @@ -186,11 +186,11 @@ ] }, "locked": { - "lastModified": 1722028105, - "narHash": "sha256-0ButnGQ1bCMIDblzC6NBSL71Wi6JmHGweI3scoV8CgM=", + "lastModified": 1722217815, + "narHash": "sha256-8r5AJ3n8WEDw3rsZLALSuFQ5kJyWOcssNZvPxYLr2yc=", "owner": "nix-community", "repo": "disko", - "rev": "5b01cea8b5753de9c2febd27203c530be14745ff", + "rev": "1e6f8a7b4634fc051cc9361959bf414fcf17e094", "type": "github" }, "original": { @@ -612,11 +612,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1722082611, - "narHash": "sha256-V3l8hVgAjRr5aVWx7sTHTUFUz+wtlQvEzN7O4Y1qyc8=", + "lastModified": 1722329086, + "narHash": "sha256-e/fSi0WER06N8WCvpht62fkGtWfe5ckDxr6zNYkwkFw=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "2250c381fcb652273c0eba5e093dcdb31beeb3f8", + "rev": "f5a3a7dff44d131807fc1a89fbd8576cd870334a", "type": "github" }, "original": { @@ -631,11 +631,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1721563874, - "narHash": "sha256-xsiynNj2qUbssiD5m+8ftWrGQflyOo5C4lPbqragiMc=", + "lastModified": 1722168631, + "narHash": "sha256-16XBXW86ceQC+jRx7feCREZo696kvIzpKYmN2LnKfaE=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "e0ea775feda9f162a153ee1ca8d93367dd0ee028", + "rev": "4ce8efe904950cd85bda9624ff1c2ec55fe2ab6f", "type": "github" }, "original": { @@ -732,11 +732,11 @@ }, "nixlib": { "locked": { - "lastModified": 1721523216, - "narHash": "sha256-/NjnIKkBoqKdvOS8unooDg0HqMaRUwYLbyn0ntjEckQ=", + "lastModified": 1722128034, + "narHash": "sha256-L8rwzYPsLo/TYtydPJoQyYOfetuiyQYnTWYcyB8UE/s=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "31a99025ce3784c20dd11dafa5260e80e314f59e", + "rev": "d15f6f6021693898fcd2c6a9bb13707383da9bbc", "type": "github" }, "original": { @@ -753,11 +753,11 @@ ] }, "locked": { - "lastModified": 1721869487, - "narHash": "sha256-zcusn81g+0gO+tSMhfs4W+wAP9As/MWNTBCbS+Ggp7A=", + "lastModified": 1722214420, + "narHash": "sha256-qfHC1p5hcErGcE672/KhBkyWYloekQpqIxtcbcUVYkA=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "c12f9a969c8cdf14618774515c7c6c96aef753c7", + "rev": "75cbb2a5e19c18840d105a72d036c6c92fc46c5d", "type": "github" }, "original": { @@ -768,11 +768,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1722114937, - "narHash": "sha256-MOZ9woPwdpFJcHx3wic2Mlw9aztdKjMnFT3FaeLzJkM=", + "lastModified": 1722332872, + "narHash": "sha256-2xLM4sc5QBfi0U/AANJAW21Bj4ZX479MHPMPkB+eKBU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e67b60fb1b2c3aad2202d95b91d4c218cf2a4fdd", + "rev": "14c333162ba53c02853add87a0000cbd7aa230c2", "type": "github" }, "original": { @@ -800,11 +800,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1721523216, - "narHash": "sha256-/NjnIKkBoqKdvOS8unooDg0HqMaRUwYLbyn0ntjEckQ=", + "lastModified": 1722128034, + "narHash": "sha256-L8rwzYPsLo/TYtydPJoQyYOfetuiyQYnTWYcyB8UE/s=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "31a99025ce3784c20dd11dafa5260e80e314f59e", + "rev": "d15f6f6021693898fcd2c6a9bb13707383da9bbc", "type": "github" }, "original": { @@ -868,11 +868,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1722112635, - "narHash": "sha256-k2/M8GgIAUmVklo5oV9Wbmg/vg024BAUr+3ZiiYXuWQ=", + "lastModified": 1722171028, + "narHash": "sha256-NWY1LnxdZOGFt5/VHcL4GPGSP6iBniOZBHz3WCxwhZI=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "9cf33b411239ce941e5c5870b3fc582ac1bba9f2", + "rev": "6642ef653bf2fcd39b118ada1371ba4519bdcc7b", "type": "github" }, "original": { @@ -1004,11 +1004,11 @@ }, "nur": { "locked": { - "lastModified": 1722123906, - "narHash": "sha256-mlWl7wlHvJnhgSTtGxHzQav8wKvfOi1vfNTefEGVHPA=", + "lastModified": 1722344484, + "narHash": "sha256-uva9Z0hZepnhclQVftO+Wh2WPEVlpoPRU7EGrP1deqY=", "owner": "nix-community", "repo": "NUR", - "rev": "86c5c9f9aeefa98727dccf233ebf9ada1298ae50", + "rev": "21d2573308314a35a4355081823b3eb144d6f021", "type": "github" }, "original": { @@ -1025,11 +1025,11 @@ ] }, "locked": { - "lastModified": 1721724566, - "narHash": "sha256-6H+OTxXkOrh3P+15bhkQJY7OaBrQVzx4Pz+pCn6rtIg=", + "lastModified": 1722270845, + "narHash": "sha256-AZpGInW/QlVZ4SOn9Mn1YZ0n5Ikiqha3xImWIC7DnNE=", "owner": "pjones", "repo": "plasma-manager", - "rev": "b967e042896de0f64513d4596e3d1f3eae445d1c", + "rev": "dfc0dc44aa9ffb8c4c388c31bd839189e6027350", "type": "github" }, "original": { @@ -1092,11 +1092,11 @@ ] }, "locked": { - "lastModified": 1722046723, - "narHash": "sha256-G7/gHz8ORRvHd1/RIURrdcswKRPe9K0FsIYR4v5jSWo=", + "lastModified": 1722219664, + "narHash": "sha256-xMOJ+HW4yj6e69PvieohUJ3dBSdgCfvI0nnCEe6/yVc=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "56baac5e6b2743d4730e664ea64f6d8a2aad0fbb", + "rev": "a6fbda5d9a14fb5f7c69b8489d24afeb349c7bb4", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e7490092..bbab807e 100644 --- a/flake.nix +++ b/flake.nix @@ -54,8 +54,8 @@ in { nixosConfigurations = { # Linode VMs - osaka-linode-01 = libx.mkHost { hostname = "osaka-linode-01"; type = "small";}; - milan-linode-01 = libx.mkHost { hostname = "milan-linode-01"; type = "small";}; + osaka-linode-01 = libx.mkHost { hostname = "osaka-linode-01"; type = "small";}; + milan-linode-01 = libx.mkHost { hostname = "milan-linode-01"; type = "small";}; frankfurt-linode-01 = libx.mkHost { hostname = "frankfurt-linode-01"; type = "small";}; # Servers @@ -66,7 +66,7 @@ # User Machines nixos-desktop = libx.mkHost { hostname = "nixos-desktop"; unfree = true; desktop = "plasma6"; }; nixos-framework = libx.mkHost { hostname = "nixos-framework"; unfree = true; desktop = "plasma6"; }; - steamdeck = libx.mkDeck { hostname = "steamdeck"; desktop = "plasma6"; theme = "stylix"; }; + steamdeck = libx.mkDeck { hostname = "steamdeck"; desktop = "plasma6"; }; # Raspberry Pi's backups-rpi4 = libx.mkHost { hostname = "backups-rpi4"; system = "aarch64-linux"; type = "small"; }; @@ -76,8 +76,8 @@ }; homeConfigurations = { # Linode VMs - "albert@osaka-linode-01" = libx.mkHome { hostname = "osaka-linode-01"; type = "small"; }; - "albert@milan-linode-01" = libx.mkHome { hostname = "milan-linode-01"; type = "small"; }; + "albert@osaka-linode-01" = libx.mkHome { hostname = "osaka-linode-01"; type = "small"; }; + "albert@milan-linode-01" = libx.mkHome { hostname = "milan-linode-01"; type = "small"; }; "albert@frankfurt-linode-01" = libx.mkHome { hostname = "frankfurt-linode-01"; type = "small"; }; # Servers @@ -88,7 +88,7 @@ # User Machines "albert@nixos-desktop" = libx.mkHome { hostname = "nixos-desktop"; desktop = "plasma6"; }; "albert@nixos-framework" = libx.mkHome { hostname = "nixos-framework"; desktop = "plasma6"; }; - "albert@steamdeck" = libx.mkHome { hostname = "steamdeck"; desktop = "plasma6"; }; + "albert@steamdeck" = libx.mkHome { hostname = "steamdeck"; desktop = "plasma6"; }; # Raspberry Pi's "albert@backups-rpi4" = libx.mkHome { hostname = "backups-rpi4"; system = "aarch64-linux"; type = "small"; }; diff --git a/home-manager/common/software/gui/firefox/arkenfox-user.js b/home-manager/common/software/gui/firefox/arkenfox-user.js index 3f4c3538..a03fa584 100644 --- a/home-manager/common/software/gui/firefox/arkenfox-user.js +++ b/home-manager/common/software/gui/firefox/arkenfox-user.js @@ -310,4 +310,4 @@ user_pref("privacy.clearOnShutdown.cookies", false); // Cookies user_pref("privacy.resistFingerprinting", false); // [FF41+] // Nightride.FM fix -user_pref("media.mediasource.enabled", false); +// user_pref("media.mediasource.enabled", false); diff --git a/home-manager/hosts/nixos-desktop/desktops/plasma6/default.nix b/home-manager/hosts/nixos-desktop/desktops/plasma6/default.nix index 9a01b6b0..c67c3034 100644 --- a/home-manager/hosts/nixos-desktop/desktops/plasma6/default.nix +++ b/home-manager/hosts/nixos-desktop/desktops/plasma6/default.nix @@ -4,6 +4,7 @@ ]; programs.plasma.powerdevil = { + # Temporary, prevents the monitor from turning on and displaying "artwork" that's super bright and annoying autoSuspend.action = "nothing"; }; } diff --git a/home-manager/hosts/nixos-desktop/desktops/plasma6/plasma-manager.nix b/home-manager/hosts/nixos-desktop/desktops/plasma6/plasma-manager.nix index e55a455c..e58b100f 100644 --- a/home-manager/hosts/nixos-desktop/desktops/plasma6/plasma-manager.nix +++ b/home-manager/hosts/nixos-desktop/desktops/plasma6/plasma-manager.nix @@ -3,12 +3,12 @@ enable = true; shortcuts = { "ActivityManager"."switch-to-activity-9982d9dc-b198-41d5-a705-737dd3eaf019" = [ ]; - "KDE Keyboard Layout Switcher"."Switch to Last-Used Keyboard Layout" = "Meta+Alt+L,none,Switch to Last-Used Keyboard Layout"; - "KDE Keyboard Layout Switcher"."Switch to Next Keyboard Layout" = "Meta+Alt+K,none,Switch to Next Keyboard Layout"; + "KDE Keyboard Layout Switcher"."Switch to Last-Used Keyboard Layout" = "none,Meta+Alt+L,Switch to Last-Used Keyboard Layout"; + "KDE Keyboard Layout Switcher"."Switch to Next Keyboard Layout" = "none,Meta+Alt+K,Switch to Next Keyboard Layout"; "kaccess"."Toggle Screen Reader On and Off" = "Meta+Alt+S"; "kcm_touchpad"."Disable Touchpad" = "Touchpad Off"; "kcm_touchpad"."Enable Touchpad" = "Touchpad On"; - "kcm_touchpad"."Toggle Touchpad" = ["Touchpad Toggle" "Meta+Ctrl+Zenkaku Hankaku,Touchpad Toggle,Toggle Touchpad"]; + "kcm_touchpad"."Toggle Touchpad" = "Touchpad Toggle"; "kmix"."decrease_microphone_volume" = "Microphone Volume Down"; "kmix"."decrease_volume" = "Volume Down"; "kmix"."decrease_volume_small" = "Shift+Volume Down"; @@ -27,14 +27,14 @@ "kwin"."Activate Window Demanding Attention" = "Meta+Ctrl+A"; "kwin"."Cycle Overview" = [ ]; "kwin"."Cycle Overview Opposite" = [ ]; - "kwin"."Decrease Opacity" = [ ]; + "kwin"."Decrease Opacity" = "none,,Decrease Opacity of Active Window by 5%"; "kwin"."Edit Tiles" = "Meta+T"; "kwin"."Expose" = "Ctrl+F9"; "kwin"."ExposeAll" = ["Ctrl+F10" "Launch (C),Ctrl+F10" "Launch (C),Toggle Present Windows (All desktops)"]; "kwin"."ExposeClass" = "Ctrl+F7"; "kwin"."ExposeClassCurrentDesktop" = [ ]; "kwin"."Grid View" = "Meta+G"; - "kwin"."Increase Opacity" = "none,,Increase Opacity of Active Window by 5%"; + "kwin"."Increase Opacity" = [ ]; "kwin"."Kill Window" = "Meta+Ctrl+Esc"; "kwin"."Move Tablet to Next Output" = [ ]; "kwin"."MoveMouseToCenter" = "Meta+F6"; @@ -175,7 +175,7 @@ "kwin"."Window to Screen 6" = "none,,Move Window to Screen 6"; "kwin"."Window to Screen 7" = "none,,Move Window to Screen 7"; "kwin"."view_actual_size" = "Meta+0"; - "kwin"."view_zoom_in" = ["Meta++" "Meta+=\\, Zoom In,Meta++" "Meta+=,Zoom In"]; + "kwin"."view_zoom_in" = ["Meta++" "Meta+=,Meta++" "Meta+=,Zoom In"]; "kwin"."view_zoom_out" = "Meta+-"; "mediacontrol"."mediavolumedown" = "none,,Media volume down"; "mediacontrol"."mediavolumeup" = "none,,Media volume up"; @@ -255,20 +255,18 @@ "kscreenlockerrc"."Greeter/Wallpaper/org.kde.color/General"."Color" = "0,0,0"; "kscreenlockerrc"."Greeter/Wallpaper/org.kde.image/General"."Image" = "/etc/nixos/git/wallpapers/default/wallpaper1.png"; "kscreenlockerrc"."Greeter/Wallpaper/org.kde.image/General"."PreviewImage" = "/etc/nixos/git/wallpapers/default/wallpaper1.png"; - "kwinrc"."Desktops"."Id_1" = "f1d14135-6478-470c-b733-2af4fc87a530"; - "kwinrc"."Desktops"."Id_2" = "49bba898-2682-46a9-bd52-f3dff4960310"; - "kwinrc"."Desktops"."Id_3" = "f4804a7c-184f-494b-9128-47dd62d97350"; - "kwinrc"."Desktops"."Id_4" = "fa224688-bb2b-4b25-9188-c5cdffddc6f1"; - "kwinrc"."Desktops"."Number[$i]" = 4; - "kwinrc"."Desktops"."Number\x5b$i\x5d" = 4; - "kwinrc"."Desktops"."Rows" = 1; + "kwalletrc"."Wallet"."First Use" = false; + "kwinrc"."NightColor"."Active" = true; + "kwinrc"."NightColor"."LatitudeFixed" = 35.67; + "kwinrc"."NightColor"."LongitudeFixed" = 135.06; + "kwinrc"."NightColor"."Mode" = "Location"; + "kwinrc"."NightColor"."NightTemperature" = 4500; "kwinrc"."Tiling"."padding" = 6; - "kwinrc"."Tiling/20ccce0f-090d-5c62-8664-c18316d4b125"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; + "kwinrc"."Tiling/20ccce0f-090d-5c62-8664-c18316d4b125"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"layoutDirection\":\"vertical\",\"tiles\":[{\"height\":0.5},{\"height\":0.5}],\"width\":0.28593749999999996},{\"width\":0.42994791666666754},{\"layoutDirection\":\"vertical\",\"tiles\":[{\"height\":0.5},{\"height\":0.5}],\"width\":0.2841145833333325}]}"; "kwinrc"."Tiling/6f05b79e-e479-5ef5-88ba-52dea7a75dd5"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"layoutDirection\":\"vertical\",\"tiles\":[{\"height\":0.5},{\"height\":0.5}],\"width\":0.3170312500000004},{\"width\":0.42494791666666737},{\"layoutDirection\":\"vertical\",\"tiles\":[{\"height\":0.5},{\"height\":0.5}],\"width\":0.25802083333333226}]}"; - "kwinrc"."Tiling/91ea1083-8eb3-59af-b2ce-03778d8cef2a"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; + "kwinrc"."Tiling/91ea1083-8eb3-59af-b2ce-03778d8cef2a"."tiles" = "{\"layoutDirection\":\"vertical\",\"tiles\":[{\"height\":0.3601562499999998},{\"height\":0.63984375}]}"; "kwinrc"."Tiling/d02c035d-eef0-5c68-aa2f-2e83d0ba08b1"."tiles" = "{\"layoutDirection\":\"horizontal\",\"tiles\":[{\"width\":0.25},{\"width\":0.5},{\"width\":0.25}]}"; "kwinrc"."Tiling/e5159c0a-c653-5a64-a969-4b3420493375"."tiles" = "{\"layoutDirection\":\"vertical\",\"tiles\":[{\"height\":0.41679687500000095},{\"height\":0.5832031249999989}]}"; - "kwinrc"."Xwayland"."Scale" = 1; "kwinrc"."org.kde.kdecoration2"."BorderSize" = "None"; "kwinrc"."org.kde.kdecoration2"."BorderSizeAuto" = false; "plasma-localerc"."Formats"."LANG" = "en_US.UTF-8"; diff --git a/nixos/hosts/nixos-desktop/default.nix b/nixos/hosts/nixos-desktop/default.nix index 472e7586..2d2cbefc 100644 --- a/nixos/hosts/nixos-desktop/default.nix +++ b/nixos/hosts/nixos-desktop/default.nix @@ -10,11 +10,16 @@ ../../common/services/podman.nix ../../common/services/tailscale-autoconnect.nix ../../common/modules/builder.nix - ../../common/modules/nvidia-535.nix + # ../../common/modules/nvidia-535.nix ]; #### TEMPORARY TODO #### - environment.variables = { MOZ_ENABLE_WAYLAND = 0; }; + environment.variables = { + MOZ_ENABLE_WAYLAND = 0; + __GL_YIELD = "usleep"; + KWIN_TRIPLE_BUFFER = 1; + + }; services.displayManager.sddm = { wayland.enable = true; @@ -51,6 +56,13 @@ opengl = { enable = true; }; + nvidia = { + modesetting.enable = true; + forceFullCompositionPipeline = true; + nvidiaSettings = true; + open = false; + package = config.boot.kernelPackages.nvidiaPackages.production; + }; }; environment.systemPackages = [