diff --git a/flake.lock b/flake.lock index efa69dd..a5697ca 100644 --- a/flake.lock +++ b/flake.lock @@ -123,22 +123,6 @@ } }, "flake-compat_5": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_6": { "flake": false, "locked": { "lastModified": 1733328505, @@ -154,7 +138,7 @@ "type": "github" } }, - "flake-compat_7": { + "flake-compat_6": { "flake": false, "locked": { "lastModified": 1696426674, @@ -170,7 +154,7 @@ "type": "github" } }, - "flake-compat_8": { + "flake-compat_7": { "flake": false, "locked": { "lastModified": 1746162366, @@ -186,7 +170,7 @@ "type": "github" } }, - "flake-compat_9": { + "flake-compat_8": { "flake": false, "locked": { "lastModified": 1696426674, @@ -299,24 +283,6 @@ "inputs": { "nixpkgs-lib": "nixpkgs-lib_5" }, - "locked": { - "lastModified": 1751413152, - "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_7": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_6" - }, "locked": { "lastModified": 1743550720, "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", @@ -331,9 +297,9 @@ "type": "github" } }, - "flake-parts_8": { + "flake-parts_7": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_7" + "nixpkgs-lib": "nixpkgs-lib_6" }, "locked": { "lastModified": 1751413152, @@ -349,9 +315,9 @@ "type": "github" } }, - "flake-parts_9": { + "flake-parts_8": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_8" + "nixpkgs-lib": "nixpkgs-lib_7" }, "locked": { "lastModified": 1749398372, @@ -479,28 +445,6 @@ } }, "gitignore_5": { - "inputs": { - "nixpkgs": [ - "mympv", - "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_6": { "inputs": { "nixpkgs": [ "nini", @@ -522,7 +466,7 @@ "type": "github" } }, - "gitignore_7": { + "gitignore_6": { "inputs": { "nixpkgs": [ "xenumenu", @@ -546,11 +490,11 @@ }, "hardware": { "locked": { - "lastModified": 1752048960, - "narHash": "sha256-gATnkOe37eeVwKKYCsL+OnS2gU4MmLuZFzzWCtaKLI8=", + "lastModified": 1751432711, + "narHash": "sha256-136MeWtckSHTN9Z2WRNRdZ8oRP3vyx3L8UxeBYE+J9w=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "7ced9122cff2163c6a0212b8d1ec8c33a1660806", + "rev": "497ae1357f1ac97f1aea31a4cb74ad0d534ef41f", "type": "github" }, "original": { @@ -650,31 +594,8 @@ }, "hooks_4": { "inputs": { - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_6", "gitignore": "gitignore_5", - "nixpkgs": [ - "mympv", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1750779888, - "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "hooks_5": { - "inputs": { - "flake-compat": "flake-compat_7", - "gitignore": "gitignore_6", "nixpkgs": [ "nini", "nixpkgs" @@ -694,10 +615,10 @@ "type": "github" } }, - "hooks_6": { + "hooks_5": { "inputs": { - "flake-compat": "flake-compat_9", - "gitignore": "gitignore_7", + "flake-compat": "flake-compat_8", + "gitignore": "gitignore_6", "nixpkgs": [ "xenumenu", "nixpkgs" @@ -783,31 +704,10 @@ "url": "https://codeberg.org/helvetica/musicomp.git" } }, - "mympv": { - "inputs": { - "flake-parts": "flake-parts_6", - "hooks": "hooks_4", - "nixpkgs": "nixpkgs_5", - "treefmt": "treefmt_3" - }, - "locked": { - "lastModified": 1752083810, - "narHash": "sha256-tg8vOWF0zkHy713ZsUrIbXEtHNCHSkhIuDQ6ACDf+zc=", - "ref": "refs/heads/main", - "rev": "4ebb58559da32beb024a91fea4a50a72c4b27342", - "revCount": 2, - "type": "git", - "url": "https://codeberg.org/helvetica/mympv.git" - }, - "original": { - "type": "git", - "url": "https://codeberg.org/helvetica/mympv.git" - } - }, "myphps": { "inputs": { - "flake-parts": "flake-parts_7", - "nixpkgs": "nixpkgs_6", + "flake-parts": "flake-parts_6", + "nixpkgs": "nixpkgs_5", "phps": "phps" }, "locked": { @@ -826,10 +726,10 @@ }, "nini": { "inputs": { - "flake-parts": "flake-parts_8", - "hooks": "hooks_5", - "nixpkgs": "nixpkgs_8", - "treefmt": "treefmt_4" + "flake-parts": "flake-parts_7", + "hooks": "hooks_4", + "nixpkgs": "nixpkgs_7", + "treefmt": "treefmt_3" }, "locked": { "lastModified": 1751656583, @@ -852,11 +752,11 @@ ] }, "locked": { - "lastModified": 1752305182, - "narHash": "sha256-6i4Q68G7wzNq1m2+l3lJUYgGZ9PwULvSVJpRSTTC46o=", + "lastModified": 1751774635, + "narHash": "sha256-DuOznGdgMxeSlPpUu6Wkq0ZD5e2Cfv9XRZeZlHWMd1s=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "ad29e2961dd0d58372384563bf00d510fc9f2e15", + "rev": "85686025ba6d18df31cc651a91d5adef63378978", "type": "github" }, "original": { @@ -867,8 +767,8 @@ }, "nixos-cosmic": { "inputs": { - "flake-compat": "flake-compat_8", - "nixpkgs": "nixpkgs_9", + "flake-compat": "flake-compat_7", + "nixpkgs": "nixpkgs_8", "nixpkgs-stable": "nixpkgs-stable_2", "rust-overlay": "rust-overlay_2" }, @@ -963,21 +863,6 @@ } }, "nixpkgs-lib_5": { - "locked": { - "lastModified": 1751159883, - "narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "14a40a1d7fb9afa4739275ac642ed7301a9ba1ab", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixpkgs-lib_6": { "locked": { "lastModified": 1743296961, "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=", @@ -992,7 +877,7 @@ "type": "github" } }, - "nixpkgs-lib_7": { + "nixpkgs-lib_6": { "locked": { "lastModified": 1751159883, "narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=", @@ -1007,7 +892,7 @@ "type": "github" } }, - "nixpkgs-lib_8": { + "nixpkgs-lib_7": { "locked": { "lastModified": 1748740939, "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=", @@ -1054,22 +939,6 @@ "type": "github" } }, - "nixpkgs_10": { - "locked": { - "lastModified": 1750365781, - "narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1748460289, @@ -1119,22 +988,6 @@ } }, "nixpkgs_5": { - "locked": { - "lastModified": 1751792365, - "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { "locked": { "lastModified": 1744463964, "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", @@ -1150,7 +1003,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1744502386, "narHash": "sha256-QAd1L37eU7ktL2WeLLLTmI6P9moz9+a/ONO8qNBYJgM=", @@ -1166,7 +1019,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1751271578, "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", @@ -1182,7 +1035,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1751011381, "narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=", @@ -1198,10 +1051,26 @@ "type": "github" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1750365781, + "narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "phps": { "inputs": { - "flake-compat": "flake-compat_6", - "nixpkgs": "nixpkgs_7", + "flake-compat": "flake-compat_5", + "nixpkgs": "nixpkgs_6", "utils": "utils" }, "locked": { @@ -1305,7 +1174,6 @@ "hxwrap": "hxwrap", "lanzaboote": "lanzaboote", "musicomp": "musicomp", - "mympv": "mympv", "myphps": "myphps", "nini": "nini", "nix-index-database": "nix-index-database", @@ -1314,7 +1182,7 @@ "nixos-cosmic", "nixpkgs" ], - "treefmt": "treefmt_5", + "treefmt": "treefmt_4", "xenumenu": "xenumenu" } }, @@ -1435,7 +1303,7 @@ "treefmt_3": { "inputs": { "nixpkgs": [ - "mympv", + "nini", "nixpkgs" ] }, @@ -1456,7 +1324,6 @@ "treefmt_4": { "inputs": { "nixpkgs": [ - "nini", "nixpkgs" ] }, @@ -1475,26 +1342,6 @@ } }, "treefmt_5": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1752055615, - "narHash": "sha256-19m7P4O/Aw/6+CzncWMAJu89JaKeMh3aMle1CNQSIwM=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "c9d477b5d5bd7f26adddd3f96cfd6a904768d4f9", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, - "treefmt_6": { "inputs": { "nixpkgs": [ "xenumenu", @@ -1560,10 +1407,10 @@ }, "xenumenu": { "inputs": { - "flake-parts": "flake-parts_9", - "hooks": "hooks_6", - "nixpkgs": "nixpkgs_10", - "treefmt": "treefmt_6" + "flake-parts": "flake-parts_8", + "hooks": "hooks_5", + "nixpkgs": "nixpkgs_9", + "treefmt": "treefmt_5" }, "locked": { "lastModified": 1750544859, diff --git a/flake.nix b/flake.nix index fb5e2ca..c9627a1 100644 --- a/flake.nix +++ b/flake.nix @@ -27,7 +27,6 @@ forgesync.url = "git+https://codeberg.org/helvetica/forgesync.git"; nini.url = "git+https://codeberg.org/helvetica/nini.git"; xenumenu.url = "git+https://codeberg.org/helvetica/xenumenu.git"; - mympv.url = "git+https://codeberg.org/helvetica/mympv.git"; lanzaboote = { url = "github:nix-community/lanzaboote/v0.4.2"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/hosts/insomniac/README.md b/hosts/insomniac/README.md new file mode 100644 index 0000000..37baf7f --- /dev/null +++ b/hosts/insomniac/README.md @@ -0,0 +1,8 @@ +shell script that loops a launcher +basically + +while true; do +fuzzel with retroarch steam quit +if quit; then exit; fi +else run command (waiting) +done diff --git a/hosts/insomniac/cage.nix b/hosts/insomniac/cage.nix new file mode 100644 index 0000000..076c85f --- /dev/null +++ b/hosts/insomniac/cage.nix @@ -0,0 +1,47 @@ +{ + lib, + inputs, + pkgs, + ... +}: +let + spec = { + entries = [ + { + displayName = "RetroArch"; + program = "retroarch"; + } + { + displayName = "Steam"; + program = "steam"; + args = [ + "-tenfoot" + ]; + } + ]; + }; + + specFormat = pkgs.formats.json { }; + + launcher = pkgs.writeShellApplication { + name = "launcher"; + runtimeInputs = [ + inputs.xenumenu.packages.${pkgs.system}.default + ]; + text = '' + while true; do + xenumenu --rowcols 3 --exit ${specFormat.generate "spec.json" spec} + done + ''; + }; +in +{ + services.cage = { + enable = true; + program = lib.getExe launcher; + user = "insomniac"; + environment = { + WLR_LIBINPUT_NO_DEVICES = "1"; + }; + }; +} diff --git a/hosts/insomniac/cosmic.nix b/hosts/insomniac/cosmic.nix deleted file mode 100644 index 4c5c6ba..0000000 --- a/hosts/insomniac/cosmic.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - services.displayManager.autoLogin = { - enable = true; - user = "insomniac"; - }; -} diff --git a/hosts/insomniac/networking.nix b/hosts/insomniac/networking.nix index f44e0b7..972104c 100644 --- a/hosts/insomniac/networking.nix +++ b/hosts/insomniac/networking.nix @@ -1,5 +1,6 @@ { - networking.interfaces.enp10s0.wakeOnLan = { + # TODO + networking.interfaces.TODO.wakeOnLan = { enable = true; policy = [ "magic" diff --git a/hosts/insomniac/profiles.nix b/hosts/insomniac/profiles.nix index af1a67d..0f7753c 100644 --- a/hosts/insomniac/profiles.nix +++ b/hosts/insomniac/profiles.nix @@ -1,8 +1,6 @@ { profiles = { - desktop.enable = true; headful.enable = true; dynamic.enable = true; - gaming.enable = true; }; } diff --git a/hosts/insomniac/steam.nix b/hosts/insomniac/steam.nix new file mode 100644 index 0000000..d39f536 --- /dev/null +++ b/hosts/insomniac/steam.nix @@ -0,0 +1,11 @@ +{ + programs.steam = { + enable = true; + extest.enable = true; + protontricks.enable = true; + dedicatedServer.openFirewall = true; + remotePlay.openFirewall = true; + localNetworkGameTransfers.openFirewall = true; + gamescopeSession.enable = true; # TODO + }; +}