diff --git a/flake.lock b/flake.lock index 396fa31..7ac01d9 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1708543581, - "narHash": "sha256-wvhsh4J+Q9ED8oAWG+iz5uNOw70nagF+aeetlGpLkqs=", + "lastModified": 1709684144, + "narHash": "sha256-7j+EjESpJYRx6tRkeTd6YgQxFUWXJ1vmhnwh0S8jlaA=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "ea3fd13e24d7d3a74cf803bef3e6133b5d708d1b", + "rev": "fb87e332c59ce386a095b3e81bb1abbcc9cc3e5c", "type": "github" }, "original": { @@ -53,36 +53,18 @@ "nixpkgs": [ "hyprland", "nixpkgs" - ] - }, - "locked": { - "lastModified": 1708005943, - "narHash": "sha256-9TT3xk++LI5/SPYgjYX34xZ4ebR93c1uerIq+SE/ues=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "aeb3e012adc7b3235335c540b214b82267c2b983", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprlang_2": { - "inputs": { - "nixpkgs": [ + ], + "systems": [ "hyprland", - "xdph", - "nixpkgs" + "systems" ] }, "locked": { - "lastModified": 1704287638, - "narHash": "sha256-TuRXJGwtK440AXQNl5eiqmQqY4LZ/9+z/R7xC0ie3iA=", + "lastModified": 1708787654, + "narHash": "sha256-7ACgM3ZuAhPqurXHUvR2nWMRcnmzGGPjLK6q4DSTelI=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "6624f2bb66d4d27975766e81f77174adbe58ec97", + "rev": "0fce791ba2334aca183f2ed42399518947550d0d", "type": "github" }, "original": { @@ -93,11 +75,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1707546158, - "narHash": "sha256-nYYJTpzfPMDxI8mzhQsYjIUX+grorqjKEU9Np6Xwy/0=", + "lastModified": 1708807242, + "narHash": "sha256-sRTRkhMD4delO/hPxxi+XwLqPn8BuUq6nnj4JqLwOu0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d934204a0f8d9198e1e4515dd6fec76a139c87f0", + "rev": "73de017ef2d18a04ac4bfd0c02650007ccb31c2a", "type": "github" }, "original": { @@ -109,11 +91,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1708475490, - "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", + "lastModified": 1709479366, + "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0e74ca98a74bc7270d28838369593635a5db3260", + "rev": "b8697e57f10292a6165a20f03d2f42920dfaf973", "type": "github" }, "original": { @@ -122,27 +104,10 @@ "type": "indirect" } }, - "personalpkgs": { - "locked": { - "lastModified": 1701902328, - "narHash": "sha256-3tiiSEgQRPps0aV40belvLk1k4Max7oRh/+hZGLtfGc=", - "owner": "langedev", - "repo": "nixpkgs", - "rev": "162f092c27afe0949253753f088c2babfba5b902", - "type": "github" - }, - "original": { - "owner": "langedev", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "hyprland": "hyprland", - "nixpkgs": "nixpkgs_2", - "personalpkgs": "personalpkgs" + "nixpkgs": "nixpkgs_2" } }, "systems": { @@ -164,18 +129,18 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1706359063, - "narHash": "sha256-5HUTG0p+nCJv3cn73AmFHRZdfRV5AD5N43g8xAePSKM=", + "lastModified": 1708558866, + "narHash": "sha256-Mz6hCtommq7RQfcPnxLINigO4RYSNt23HeJHC6mVmWI=", "owner": "wlroots", "repo": "wlroots", - "rev": "00b869c1a96f300a8f25da95d624524895e0ddf2", + "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "00b869c1a96f300a8f25da95d624524895e0ddf2", + "rev": "0cb091f1a2d345f37d2ee445f4ffd04f7f4ec9e5", "type": "gitlab" } }, @@ -185,7 +150,10 @@ "hyprland", "hyprland-protocols" ], - "hyprlang": "hyprlang_2", + "hyprlang": [ + "hyprland", + "hyprlang" + ], "nixpkgs": [ "hyprland", "nixpkgs" @@ -196,11 +164,11 @@ ] }, "locked": { - "lastModified": 1706521509, - "narHash": "sha256-AInZ50acOJ3wzUwGzNr1TmxGTMx+8j6oSTzz4E7Vbp8=", + "lastModified": 1708696469, + "narHash": "sha256-shh5wmpeYy3MmsBfkm4f76yPsBDGk6OLYRVG+ARy2F0=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "c06fd88b3da492b8f9067be021b9184f7012b5a8", + "rev": "1b713911c2f12b96c2574474686e4027ac4bf826", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f727dc2..7efa651 100644 --- a/flake.nix +++ b/flake.nix @@ -1,20 +1,21 @@ { inputs = { nixpkgs.url = "nixpkgs/nixos-unstable"; - personalpkgs.url = "github:langedev/nixpkgs/nixos-unstable"; + # personalpkgs.url = "github:langedev/nixpkgs/nixos-unstable"; hyprland.url = "github:hyprwm/Hyprland"; }; - outputs = { self, nixpkgs, personalpkgs, hyprland, ... }: - let - personal-overlay = final: prev: { - personal = personalpkgs.legacyPackages.${prev.system}; - }; - in { + outputs = { self, nixpkgs, hyprland, ... }: + # let + # personal-overlay = final: prev: { + # personal = personalpkgs.legacyPackages.${prev.system}; + # }; + # in { + { nixosConfigurations.onizuka = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ - ({ config, pkgs, ... }: { nixpkgs.overlays = [ personal-overlay ]; }) + # ({ config, pkgs, ... }: { nixpkgs.overlays = [ personal-overlay ]; }) hyprland.nixosModules.default { programs.hyprland.enable = true; } ./systems/shared @@ -25,7 +26,7 @@ nixosConfigurations.jibril = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ - ({ config, pkgs, ... }: { nixpkgs.overlays = [ personal-overlay ]; }) + # ({ config, pkgs, ... }: { nixpkgs.overlays = [ personal-overlay ]; }) hyprland.nixosModules.default { programs.hyprland.enable = true; } ./systems/shared diff --git a/modules/etc/steam/default.nix b/modules/etc/steam/default.nix new file mode 100644 index 0000000..192899c --- /dev/null +++ b/modules/etc/steam/default.nix @@ -0,0 +1,9 @@ +{ config, pkgs, lib, ... }: + +{ + programs.steam = { + enable = true; + remotePlay.openFirewall = true; + dedicatedServer.openFirewall = true; + }; +} diff --git a/systems/onizuka/default.nix b/systems/onizuka/default.nix index 8bc25ef..b8d7de5 100644 --- a/systems/onizuka/default.nix +++ b/systems/onizuka/default.nix @@ -5,5 +5,6 @@ imports = [ ./hardware.nix ../../modules/graphics/nvidia + ../../modules/etc/steam ]; }