From ee7590b4b6d039358ce881e2fd9eb11f293144f8 Mon Sep 17 00:00:00 2001 From: xbazzi Date: Sun, 24 Aug 2025 14:26:42 -0600 Subject: [PATCH] feat: cs2 resolution fix. --- flake.lock | 577 ++++++++++++++++++++++++++++++++++-- flake.nix | 23 +- home/hyprland.nix | 3 + home/packages.nix | 3 +- system/default.nix | 1 + system/hyprland-plugins.nix | 15 + system/packages.nix | 6 +- system/ssh.nix | 20 +- 8 files changed, 612 insertions(+), 36 deletions(-) create mode 100644 system/hyprland-plugins.nix diff --git a/flake.lock b/flake.lock index a0dce1b..346fd51 100755 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,38 @@ { "nodes": { + "aquamarine": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1753216019, + "narHash": "sha256-zik7WISrR1ks2l6T1MZqZHb/OqroHdJnSnAehkE0kCk=", + "owner": "hyprwm", + "repo": "aquamarine", + "rev": "be166e11d86ba4186db93e10c54a141058bdce49", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "aquamarine", + "type": "github" + } + }, "base16": { "inputs": { "fromYaml": "fromYaml" @@ -99,6 +132,22 @@ } }, "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1696426674, @@ -114,6 +163,20 @@ "type": "github" } }, + "flake-compat_3": { + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "revCount": 57, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -156,6 +219,24 @@ "type": "github" } }, + "flake-utils": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "fromYaml": { "flake": false, "locked": { @@ -173,6 +254,28 @@ } }, "gitignore": { + "inputs": { + "nixpkgs": [ + "hyprland", + "pre-commit-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gitignore_2": { "inputs": { "nixpkgs": [ "lanzaboote", @@ -218,11 +321,11 @@ ] }, "locked": { - "lastModified": 1755313937, - "narHash": "sha256-pQb7bNcolxYGRiylUCrTddiF+qW2wsUiM9+eRIDUrVU=", + "lastModified": 1755810213, + "narHash": "sha256-QdenO8f0PTg+tC6HuSvngKcbRZA5oZKmjUT+MXKOLQg=", "owner": "nix-community", "repo": "home-manager", - "rev": "2a749f4790a14f7168be67cdf6e548ef1c944e10", + "rev": "6911d3e7f475f7b3558b4f5a6aba90fa86099baa", "type": "github" }, "original": { @@ -231,9 +334,246 @@ "type": "github" } }, + "hyprcursor": { + "inputs": { + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1753964049, + "narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=", + "owner": "hyprwm", + "repo": "hyprcursor", + "rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprcursor", + "type": "github" + } + }, + "hyprgraphics": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1754305013, + "narHash": "sha256-u+M2f0Xf1lVHzIPQ7DsNCDkM1NYxykOSsRr4t3TbSM4=", + "owner": "hyprwm", + "repo": "hyprgraphics", + "rev": "4c1d63a0f22135db123fc789f174b89544c6ec2d", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprgraphics", + "type": "github" + } + }, + "hyprland": { + "inputs": { + "aquamarine": "aquamarine", + "hyprcursor": "hyprcursor", + "hyprgraphics": "hyprgraphics", + "hyprland-protocols": "hyprland-protocols", + "hyprland-qtutils": "hyprland-qtutils", + "hyprlang": "hyprlang", + "hyprutils": "hyprutils", + "hyprwayland-scanner": "hyprwayland-scanner", + "nixpkgs": "nixpkgs", + "pre-commit-hooks": "pre-commit-hooks", + "systems": "systems", + "xdph": "xdph" + }, + "locked": { + "lastModified": 1755883465, + "narHash": "sha256-/yviTS9piazXoZAmnN0dXnYjDAFvooBnzJfPw2Gi30Y=", + "owner": "hyprwm", + "repo": "Hyprland", + "rev": "0d45b277d6c750377b336034b8adc53eae238d91", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "Hyprland", + "type": "github" + } + }, + "hyprland-plugins": { + "inputs": { + "hyprland": [ + "hyprland" + ], + "nixpkgs": [ + "nixpkgs" + ], + "systems": [ + "hyprland-plugins", + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1755183521, + "narHash": "sha256-wrP8TM2lb2x0+PyTc7Uc3yfVBeIlYW7+hFeG14N9Cr8=", + "owner": "hyprwm", + "repo": "hyprland-plugins", + "rev": "c1ddebb423acc7c88653c04de5ddafee64dac89a", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-plugins", + "type": "github" + } + }, + "hyprland-protocols": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1749046714, + "narHash": "sha256-kymV5FMnddYGI+UjwIw8ceDjdeg7ToDVjbHCvUlhn14=", + "owner": "hyprwm", + "repo": "hyprland-protocols", + "rev": "613878cb6f459c5e323aaafe1e6f388ac8a36330", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-protocols", + "type": "github" + } + }, + "hyprland-qt-support": { + "inputs": { + "hyprlang": [ + "hyprland", + "hyprland-qtutils", + "hyprlang" + ], + "nixpkgs": [ + "hyprland", + "hyprland-qtutils", + "nixpkgs" + ], + "systems": [ + "hyprland", + "hyprland-qtutils", + "systems" + ] + }, + "locked": { + "lastModified": 1749154592, + "narHash": "sha256-DO7z5CeT/ddSGDEnK9mAXm1qlGL47L3VAHLlLXoCjhE=", + "owner": "hyprwm", + "repo": "hyprland-qt-support", + "rev": "4c8053c3c888138a30c3a6c45c2e45f5484f2074", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-qt-support", + "type": "github" + } + }, + "hyprland-qtutils": { + "inputs": { + "hyprland-qt-support": "hyprland-qt-support", + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "hyprutils": [ + "hyprland", + "hyprland-qtutils", + "hyprlang", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1753819801, + "narHash": "sha256-tHe6XeNeVeKapkNM3tcjW4RuD+tB2iwwoogWJOtsqTI=", + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "rev": "b308a818b9dcaa7ab8ccab891c1b84ebde2152bc", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-qtutils", + "type": "github" + } + }, + "hyprlang": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1753622892, + "narHash": "sha256-0K+A+gmOI8IklSg5It1nyRNv0kCNL51duwnhUO/B8JA=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "23f0debd2003f17bd65f851cd3f930cff8a8c809", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, "hyprshell": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1754807024, @@ -249,10 +589,60 @@ "url": "https://gitgud.foo/thegrind/hypr-shell.git" } }, + "hyprutils": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1754481650, + "narHash": "sha256-6u6HdEFJh5gY6VfyMQbhP7zDdVcqOrCDTkbiHJmAtMI=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "df6b8820c4a0835d83d0c7c7be86fbc555f1f7fd", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, + "hyprwayland-scanner": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1751897909, + "narHash": "sha256-FnhBENxihITZldThvbO7883PdXC/2dzW4eiNvtoV5Ao=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "fcca0c61f988a9d092cbb33e906775014c61579d", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, "lanzaboote": { "inputs": { "crane": "crane", - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "flake-parts": "flake-parts", "nixpkgs": [ "nixpkgs" @@ -275,13 +665,28 @@ "type": "github" } }, + "nix-filter": { + "locked": { + "lastModified": 1731533336, + "narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=", + "owner": "numtide", + "repo": "nix-filter", + "rev": "f7653272fd234696ae94229839a99b73c9ab7de0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "nix-filter", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1755186698, - "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", + "lastModified": 1754725699, + "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", + "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054", "type": "github" }, "original": { @@ -309,11 +714,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1755186698, - "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", + "lastModified": 1755615617, + "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1755615617, + "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", + "rev": "20075955deac2583bb12f07151c2df830ef346b4", "type": "github" }, "original": { @@ -348,13 +769,36 @@ "type": "github" } }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": "flake-compat", + "gitignore": "gitignore", + "nixpkgs": [ + "hyprland", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1754416808, + "narHash": "sha256-c6yg0EQ9xVESx6HGDOCMcyRSjaTpNJP10ef+6fRcofA=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "9c52372878df6911f9afc1e2a1391f55e4dfc864", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ "lanzaboote", "flake-compat" ], - "gitignore": "gitignore", + "gitignore": "gitignore_2", "nixpkgs": [ "lanzaboote", "nixpkgs" @@ -378,10 +822,13 @@ "root": { "inputs": { "home-manager": "home-manager", + "hyprland": "hyprland", + "hyprland-plugins": "hyprland-plugins", "hyprshell": "hyprshell", "lanzaboote": "lanzaboote", - "nixpkgs": "nixpkgs_2", - "stylix": "stylix" + "nixpkgs": "nixpkgs_3", + "stylix": "stylix", + "winapps": "winapps" } }, "rust-overlay": { @@ -418,7 +865,7 @@ "nixpkgs" ], "nur": "nur", - "systems": "systems", + "systems": "systems_2", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -426,11 +873,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1755378131, - "narHash": "sha256-0GKZEzTUcaoama56xaagKnMk5hqMbTUfGF4KfzLwje4=", + "lastModified": 1755708361, + "narHash": "sha256-RmqBx2EamhIk0WVhQSNb8iehaVhilO7D0YAnMoFPqJQ=", "owner": "danth", "repo": "stylix", - "rev": "82242e0f9b1d91b6f170807a6ec622cfdb816eac", + "rev": "2355da455d7188228aaf20ac16ea9386e5aa6f0c", "type": "github" }, "original": { @@ -440,6 +887,36 @@ } }, "systems": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_3": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -534,6 +1011,70 @@ "repo": "base16-zed", "type": "github" } + }, + "winapps": { + "inputs": { + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils", + "nix-filter": "nix-filter", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1755613008, + "narHash": "sha256-uR4m7NXqMGILkbokBfWcQ4xB+K1pzGhaROsB0g8HrNA=", + "owner": "winapps-org", + "repo": "winapps", + "rev": "650e32dfdff47f6496b895a88c6ac5ac15d22487", + "type": "github" + }, + "original": { + "owner": "winapps-org", + "repo": "winapps", + "type": "github" + } + }, + "xdph": { + "inputs": { + "hyprland-protocols": [ + "hyprland", + "hyprland-protocols" + ], + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1753633878, + "narHash": "sha256-js2sLRtsOUA/aT10OCDaTjO80yplqwOIaLUqEe0nMx0=", + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "rev": "371b96bd11ad2006ed4f21229dbd1be69bed3e8a", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 78f5d55..c7b0fe7 100755 --- a/flake.nix +++ b/flake.nix @@ -23,11 +23,17 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + winapps = { + url = "github:winapps-org/winapps"; + inputs.nixpkgs.follows = "nixpkgs"; + }; - # hyprland-plugins = { - # url = "github:hyprwm/hyprland-plugins"; - # inputs.nixpkgs.follows = "hyprland"; - # }; + hyprland.url = "github:hyprwm/Hyprland"; + hyprland-plugins = { + url = "github:hyprwm/hyprland-plugins"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.hyprland.follows = "hyprland"; + }; # walker = { # url = "github:abenz1267/walker"; @@ -56,7 +62,7 @@ }; outputs = - { nixpkgs, lanzaboote, ... }@inputs: + { nixpkgs, lanzaboote, winapps, ... }@inputs: let system = "x86_64-linux"; pkgs = import nixpkgs { @@ -91,19 +97,20 @@ nixosConfigurations = { nixos = nixpkgs.lib.nixosSystem { inherit system; - specialArgs = { inherit inputs; }; + specialArgs = { inherit inputs system; }; modules = [ inputs.stylix.nixosModules.stylix lanzaboote.nixosModules.lanzaboote ./system/default.nix ( - { pkgs, lib, ... }: + { pkgs, lib, system ? pkgs.system, ... }: { environment.systemPackages = [ # For debugging and troubleshooting Secure Boot. pkgs.sbctl - # (inputs.nixpkgs.legacyPackages.${pkgs.system}.claude-code) + winapps.packages."${system}".winapps + winapps.packages."${system}".winapps-launcher # optional ]; diff --git a/home/hyprland.nix b/home/hyprland.nix index 0ee28a5..36b3bb8 100644 --- a/home/hyprland.nix +++ b/home/hyprland.nix @@ -231,6 +231,7 @@ exec-once = [ "noisetorch" "hyprpaper" + ''hyprctl plugin load "$HYPR_PLUGIN_DIR/lib/libhyprexpo.so"'' # "sleep 2 && waybar &" # "hypridle &" # "hyprpanel &" @@ -252,6 +253,8 @@ ]; plugins = [ + # inputs.hyprland-plugins.packages.${pkgs.system}.hyprfocus + # pkgs.hyprlandPlugins.csgo-vulkan-fix # legacyPackages.x86_64-linux.hyprlandPlugins.csgo-vulkan-fix # inputs.hyprland-plugins.packages.${pkgs.stdenv.hostPlatform.system}.hyprbars # inputs.hyprland-plugins.packages.${pkgs.system}.csgo-vulkan-fix diff --git a/home/packages.nix b/home/packages.nix index cf2d454..39f10dd 100755 --- a/home/packages.nix +++ b/home/packages.nix @@ -15,13 +15,13 @@ wl-clipboard # copy screenshot to clipboard bat yazi + jetbrains.datagrip # Hyprland hypridle hyprlock hyprpanel wofi - hyprlandPlugins.csgo-vulkan-fix # Python python3Packages.gpustat @@ -35,5 +35,4 @@ #inputs.nixvim.packages.${pkgs.system}.default ]; services.gnome-keyring.enable = true; - } diff --git a/system/default.nix b/system/default.nix index 20cf9a5..b207d60 100755 --- a/system/default.nix +++ b/system/default.nix @@ -9,6 +9,7 @@ ./stylix.nix ./ghub.nix ./sddm.nix + ./hyprland-plugins.nix # ./gnome.nix # ./lanzaboote.nix ./nvidia.nix diff --git a/system/hyprland-plugins.nix b/system/hyprland-plugins.nix new file mode 100644 index 0000000..6c42446 --- /dev/null +++ b/system/hyprland-plugins.nix @@ -0,0 +1,15 @@ +{ lib, pkgs, inputs, ...}: + +with lib; let + hyprPluginPkgs = inputs.hyprland-plugins.packages.${pkgs.system}; + hypr-plugin-dir = pkgs.symlinkJoin { + name = "hyrpland-plugins"; + paths = with hyprPluginPkgs; [ + csgo-vulkan-fix + #...plugins + ]; + }; +in +{ + environment.sessionVariables = { HYPR_PLUGIN_DIR = hypr-plugin-dir; }; +} \ No newline at end of file diff --git a/system/packages.nix b/system/packages.nix index 2091595..2684fbe 100755 --- a/system/packages.nix +++ b/system/packages.nix @@ -72,6 +72,7 @@ }) gamescope google-chrome + wootility # Qt # kdePackages.qt5compat @@ -99,9 +100,8 @@ localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers }; programs.gamemode.enable = true; - hardware.opengl.enable = true; - - # nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ + hardware.graphics.enable = true; + hardware.wooting.enable = true; # "steam" # "steam-original" # "steam-unwrapped" diff --git a/system/ssh.nix b/system/ssh.nix index fca911e..dfdaaab 100644 --- a/system/ssh.nix +++ b/system/ssh.nix @@ -29,10 +29,10 @@ IdentitiesOnly yes IdentityFile ~/.ssh/gt_id_ed25519 - Host prod1 - HostName prod1 + Host prod2-mgmt + HostName prod2-mgmt ForwardAgent yes - Port 22222 + Port 22 User xbazzi PubkeyAuthentication yes IdentityFile ~/.ssh/lan_id_ed25519 @@ -47,8 +47,8 @@ IdentityFile ~/.ssh/lan_id_ed25519 IdentitiesOnly yes - Host prod2-mgmt - HostName prod2-mgmt + Host prod4-mgmt + HostName prod4-mgmt ForwardAgent yes Port 22 User xbazzi @@ -56,6 +56,16 @@ IdentityFile ~/.ssh/lan_id_ed25519 IdentitiesOnly yes + Host prod1 + HostName prod1 + ForwardAgent yes + Port 22222 + User xbazzi + PubkeyAuthentication yes + IdentityFile ~/.ssh/lan_id_ed25519 + IdentitiesOnly yes + + Host prod2 HostName prod2 ForwardAgent yes