From 7db56ac8c311180875f1f4d2abdbfa0c7bfd03e4 Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Sat, 1 Jun 2024 19:31:05 +0200 Subject: [PATCH] updated flake --- flake.lock | 104 +++++++++++++++--------------- modules/gui/default.nix | 1 + modules/gui/steam.nix | 6 +- modules/gui/stylix.nix | 3 +- modules/wms/wayland/hypr/land.nix | 11 ---- modules/wms/wayland/variables.nix | 11 ++-- 6 files changed, 65 insertions(+), 71 deletions(-) diff --git a/flake.lock b/flake.lock index b9eceb3..37bb519 100644 --- a/flake.lock +++ b/flake.lock @@ -261,11 +261,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1716972855, - "narHash": "sha256-u09wfqXJGMpmU6WRo0sYa16wfz/GPr5OQvUFS0VgPJo=", + "lastModified": 1717260669, + "narHash": "sha256-0+XM3B4nIwUtbbZPIOXzGHtO8JjNgjukAIDa25wmjr8=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "30b19743d243f97e0a6d71ff9fe3522e1b7bc581", + "rev": "177491c08fa49c820cb22181f41f6fe85416fe64", "type": "github" }, "original": { @@ -282,11 +282,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1716877613, - "narHash": "sha256-GOCKwLphClUGKw0gFDZZmF2UM3vLLLnWrFbAH2AINCI=", + "lastModified": 1717223092, + "narHash": "sha256-ih8NPk3Jn5EAILOGQZ+KS5NLmu6QmwohJX+36MaTAQE=", "owner": "nix-community", "repo": "fenix", - "rev": "08ea8011dd25421c104a5f44d16a713a27d93fde", + "rev": "9a025daf6799e3af80b677f0af57ef76432c3fcf", "type": "github" }, "original": { @@ -718,11 +718,11 @@ ] }, "locked": { - "lastModified": 1716930911, - "narHash": "sha256-t4HT5j3Jy7skRB5PINnxcEBCkgE89rGBpwTI7YS4Ffo=", + "lastModified": 1717097707, + "narHash": "sha256-HC5vJ3oYsjwsCaSbkIPv80e4ebJpNvFKQTBOGlHvjLs=", "owner": "nix-community", "repo": "home-manager", - "rev": "a9b36cbe9292a649222b89fdb9ae9907e9c74086", + "rev": "0eb314b4f0ba337e88123e0b1e57ef58346aafd9", "type": "github" }, "original": { @@ -739,11 +739,11 @@ ] }, "locked": { - "lastModified": 1716457508, - "narHash": "sha256-ZxzffLuWRyuMrkVVq7wastNUqeO0HJL9xqfY1QsYaqo=", + "lastModified": 1717052710, + "narHash": "sha256-LRhOxzXmOza5SymhOgnEzA8EAQp+94kkeUYWKKpLJ/U=", "owner": "nix-community", "repo": "home-manager", - "rev": "850cb322046ef1a268449cf1ceda5fd24d930b05", + "rev": "29c69d9a466e41d46fd3a7a9d0591ef9c113c2ae", "type": "github" }, "original": { @@ -833,11 +833,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1716968065, - "narHash": "sha256-kuVKS98JUgJ71Z3sRUo+YnQgmX8xdXoZZbBPyIZMWYs=", + "lastModified": 1717186020, + "narHash": "sha256-PQF/ng2hSQsKKsn4N+4RmVu+4ljzsrSsrAm5Yp7wADM=", "ref": "refs/heads/main", - "rev": "a60c7283e677ed81a466d1c0c864c8a05e192cac", - "revCount": 4750, + "rev": "a54ab301602e205f273969c093cf494d38ba4a98", + "revCount": 4752, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -860,11 +860,11 @@ ] }, "locked": { - "lastModified": 1715722806, - "narHash": "sha256-KrSLG2H3KGELxTFdiBhv8U6D53Q3UsJsQO+KgEabsNA=", + "lastModified": 1717171694, + "narHash": "sha256-LN2lrcGdAMpkooleWSOV+/q1+wx1f3pSBs1TWeoMCkA=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "c28d1011f4868c1a1ee80b10d9ee79900686df82", + "rev": "e0cad229c3d799c7f72b1217ab2eb300ceecf3ac", "type": "github" }, "original": { @@ -977,11 +977,11 @@ ] }, "locked": { - "lastModified": 1716511055, - "narHash": "sha256-5Fe/DGgvMhPEMl9VdVxv3zvwRcwNDmW5eRJ0gk72w7U=", + "lastModified": 1716993688, + "narHash": "sha256-vo5k2wQekfeoq/2aleQkBN41dQiQHNTniZeVONWiWLs=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "0bea8222f6e83247dd13b055d83e64bce02ee532", + "rev": "c0d5b8c54d6828516c97f6be9f2d00c63a363df4", "type": "github" }, "original": { @@ -1057,11 +1057,11 @@ ] }, "locked": { - "lastModified": 1716431440, - "narHash": "sha256-331cJMya1uuIKaq6wWfrHmBbg/cE7LW6d7W3CMornzQ=", + "lastModified": 1717036060, + "narHash": "sha256-Bm1pBy1goxIz9PD0PRJ9ZgQzl7MQOQ6n5IB4wLNdXrA=", "owner": "nixpak", "repo": "nixpak", - "rev": "809ba0a420bc57c6eca2f5fdfef9919604c8903f", + "rev": "3a68b5453f75b1c8e5d31859a654e061a57dc059", "type": "github" }, "original": { @@ -1121,11 +1121,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1716633019, - "narHash": "sha256-xim1b5/HZYbWaZKyI7cn9TJCM6ewNVZnesRr00mXeS4=", + "lastModified": 1716991068, + "narHash": "sha256-Av0UWCCiIGJxsZ6TFc+OiKCJNqwoxMNVYDBChmhjNpo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9d29cd266cebf80234c98dd0b87256b6be0af44e", + "rev": "25cf937a30bf0801447f6bf544fc7486c6309234", "type": "github" }, "original": { @@ -1143,11 +1143,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1716974396, - "narHash": "sha256-w11TUayMJNfMGsHLf2cls6eEd7iXZ6sW5AiTrU3NcAQ=", + "lastModified": 1717175759, + "narHash": "sha256-KiM5ue/UNQt8ktoqCV4yFqhHxM31U94Mf/piKW9dZ4c=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "00cc3d49f5814783295348d168caddd84059c71f", + "rev": "93b225ddba91179248b378913a91defbc6aeb899", "type": "github" }, "original": { @@ -1158,11 +1158,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1716509168, - "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", + "lastModified": 1716948383, + "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bfb7a882678e518398ce9a31a881538679f6f092", + "rev": "ad57eef4ef0659193044870c731987a6df5cf56b", "type": "github" }, "original": { @@ -1190,11 +1190,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1716769173, - "narHash": "sha256-7EXDb5WBw+d004Agt+JHC/Oyh/KTUglOaQ4MNjBbo5w=", + "lastModified": 1716948383, + "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9ca3f649614213b2aaf5f1e16ec06952fe4c2632", + "rev": "ad57eef4ef0659193044870c731987a6df5cf56b", "type": "github" }, "original": { @@ -1222,11 +1222,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1716509168, - "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", + "lastModified": 1716948383, + "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bfb7a882678e518398ce9a31a881538679f6f092", + "rev": "ad57eef4ef0659193044870c731987a6df5cf56b", "type": "github" }, "original": { @@ -1283,11 +1283,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1716972603, - "narHash": "sha256-rfOOyiBW42bI+Nj3Cs7H3dZL4vdRelUWL5YSDniVcYM=", + "lastModified": 1717255175, + "narHash": "sha256-MtsnAwzY2cmufUoFQvI/1mTzd3FKbZLCb8zF4jXkZLY=", "owner": "nix-community", "repo": "nixvim", - "rev": "b113bc69ea5c04c37020a63afa687abfb2d43474", + "rev": "df3aa867137227bda9e44beab82a63443d700f18", "type": "github" }, "original": { @@ -1298,11 +1298,11 @@ }, "nur": { "locked": { - "lastModified": 1716972321, - "narHash": "sha256-iB8kNkc+p/9NwmrXgnChB6JFcUtSBSdGESRVliiTCMI=", + "lastModified": 1717258745, + "narHash": "sha256-6J5MOggjjXlLtbSROzCI/wba91WXeK/2qcz9vcvEN1k=", "owner": "nix-community", "repo": "NUR", - "rev": "3ced449a2fdd845ffde002790691bedf6958f00c", + "rev": "39bf5f1311fcf35a55df966ae774da7bf8e35d30", "type": "github" }, "original": { @@ -1336,11 +1336,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1716828004, - "narHash": "sha256-mUZtVS2S+leFcMpBgbqkMnZm4II1qBM21pW8UnivVSo=", + "lastModified": 1717169693, + "narHash": "sha256-qBruki5NHrSqIw5ulxtwFmVsb6W/aOKOMjsCJjfalA4=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "b32f181f477576bb203879f7539608f3327b6178", + "rev": "d6d735e6f20ef78b16a79886fe28bd69cf059504", "type": "github" }, "original": { @@ -1456,11 +1456,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1716895458, - "narHash": "sha256-W9Y/+K4L7JcF5xcXO4MVGQk/0DgzHrp/IjlHyLeYExY=", + "lastModified": 1717212835, + "narHash": "sha256-fSNsRokB3YaTmJOcSdDzKJOFWq/bQ/FCoMGpF12sF5c=", "owner": "danth", "repo": "stylix", - "rev": "5234b3d467aa803ad8d3fe898ef5673246045984", + "rev": "266db7f00cad4a465e0ce43d91798fda10716212", "type": "github" }, "original": { diff --git a/modules/gui/default.nix b/modules/gui/default.nix index a8d69de..faa2fb6 100644 --- a/modules/gui/default.nix +++ b/modules/gui/default.nix @@ -12,6 +12,7 @@ _: { ./anyrun ./rofi.nix ./kitty.nix + #./vivado.nix ./steam.nix ./waybar.nix ./schizofox.nix diff --git a/modules/gui/steam.nix b/modules/gui/steam.nix index eedc568..d16accb 100644 --- a/modules/gui/steam.nix +++ b/modules/gui/steam.nix @@ -19,6 +19,10 @@ in { dedicatedServer.openFirewall = true; gamescopeSession.enable = mkIf cfg.gamescope true; }; - home-manager.users.${username} = {}; + programs.gamemode.enable = true; + environment.systemPackages = [pkgs.protonup]; + environment.sessionVariables = { + STEAM_EXTRA_COMPAT_TOOLS_PATHS = "/home/${username}/.steam/root/compatibilitytoolds.d"; + }; }; } diff --git a/modules/gui/stylix.nix b/modules/gui/stylix.nix index a40bd0f..a6c9072 100644 --- a/modules/gui/stylix.nix +++ b/modules/gui/stylix.nix @@ -5,6 +5,7 @@ ... }: let cfg = config.modules.programs.stylix; + inherit (config.modules.other.system) username; in { options.modules.programs.stylix.enable = lib.mkEnableOption "stylix"; config = lib.mkIf cfg.enable { @@ -50,7 +51,7 @@ in { targets = { console.enable = true; fish.enable = true; - grub.enable = true; + grub.enable = false; grub.useImage = true; gtk.enable = true; lightdm.enable = true; diff --git a/modules/wms/wayland/hypr/land.nix b/modules/wms/wayland/hypr/land.nix index da89d53..cb79512 100644 --- a/modules/wms/wayland/hypr/land.nix +++ b/modules/wms/wayland/hypr/land.nix @@ -53,7 +53,6 @@ in { # Monitor config monitor = [ - #"eDP-1,1920x1080,0x0,1" "DP-2,1920x1080,0x0,1" "HDMI-A-2,1920x1080,1920x0,1" "HDMI-A-1,1920x1080,3840x0,1" @@ -62,16 +61,6 @@ in { ]; # Workspace config workspace = [ - #"1, monitor:eDP-1, default:true" - #"2, monitor:eDP-1" - #"3, monitor:eDP-1" - #"4, monitor:eDP-1" - #"5, monitor:eDP-1" - #"6, monitor:eDP-1" - #"7, monitor:eDP-1" - #"8, monitor:eDP-1" - #"9, monitor:eDP-1" - #"10, monitor:eDP-1" "1,monitor:HDMI-A-1, default:true" "2,monitor:HDMI-A-1" diff --git a/modules/wms/wayland/variables.nix b/modules/wms/wayland/variables.nix index 1327214..43ef01f 100644 --- a/modules/wms/wayland/variables.nix +++ b/modules/wms/wayland/variables.nix @@ -16,14 +16,13 @@ in { __GL_GSYNC_ALLOWED = "0"; __GL_VRR_ALLOWED = "0"; DISABLE_QT5_COMPAT = "0"; - GDK_BACKEND = "wayland,x11"; + GDK_BACKEND = "wayland"; ANKI_WAYLAND = "1"; - DIRENV_LOG_FORMAT = ""; - WLR_DRM_NO_ATOMIC = "1"; - QT_AUTO_SCREEN_SCALE_FACTOR = "1"; + #WLR_DRM_NO_ATOMIC = "1"; + #QT_AUTO_SCREEN_SCALE_FACTOR = "1"; QT_QPA_PLATFORM = "wayland"; DISABLE_QT_COMPAT = "0"; - QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; + #QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; MOZ_ENABLE_WAYLAND = "1"; XDG_SESSION_TYPE = "wayland"; SDL_VIDEODRIVER = "wayland"; @@ -37,7 +36,7 @@ in { XDG_CURRENT_DESKTOP = "Hyprland"; XDG_SESSION_DESKTOP = "Hyprland"; ELECTRON_OZONE_PLATFORM_HINT = "auto"; - WLR_RENDERER_ALLOW_SOFTWARE = "1"; + #WLR_RENDERER_ALLOW_SOFTWARE = "1"; # Needed anymore? LIBSEAT_BACKEND = "logind"; };