From 498d6cd6e4909c0471e97d03e91b49b0df94dba3 Mon Sep 17 00:00:00 2001 From: Lukas Wurzinger Date: Sat, 12 Jul 2025 13:55:50 +0200 Subject: [PATCH] stuff --- flake.lock | 259 ++++++++++++++++++++++++++------- flake.nix | 1 + hosts/insomniac/README.md | 8 - hosts/insomniac/cage.nix | 47 ------ hosts/insomniac/cosmic.nix | 6 + hosts/insomniac/networking.nix | 3 +- hosts/insomniac/profiles.nix | 2 + hosts/insomniac/steam.nix | 11 -- 8 files changed, 216 insertions(+), 121 deletions(-) delete mode 100644 hosts/insomniac/README.md delete mode 100644 hosts/insomniac/cage.nix create mode 100644 hosts/insomniac/cosmic.nix delete mode 100644 hosts/insomniac/steam.nix diff --git a/flake.lock b/flake.lock index a5697ca..efa69dd 100644 --- a/flake.lock +++ b/flake.lock @@ -123,6 +123,22 @@ } }, "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, @@ -138,7 +154,7 @@ "type": "github" } }, - "flake-compat_6": { + "flake-compat_7": { "flake": false, "locked": { "lastModified": 1696426674, @@ -154,7 +170,7 @@ "type": "github" } }, - "flake-compat_7": { + "flake-compat_8": { "flake": false, "locked": { "lastModified": 1746162366, @@ -170,7 +186,7 @@ "type": "github" } }, - "flake-compat_8": { + "flake-compat_9": { "flake": false, "locked": { "lastModified": 1696426674, @@ -283,6 +299,24 @@ "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=", @@ -297,9 +331,9 @@ "type": "github" } }, - "flake-parts_7": { + "flake-parts_8": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_6" + "nixpkgs-lib": "nixpkgs-lib_7" }, "locked": { "lastModified": 1751413152, @@ -315,9 +349,9 @@ "type": "github" } }, - "flake-parts_8": { + "flake-parts_9": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib_7" + "nixpkgs-lib": "nixpkgs-lib_8" }, "locked": { "lastModified": 1749398372, @@ -447,7 +481,7 @@ "gitignore_5": { "inputs": { "nixpkgs": [ - "nini", + "mympv", "hooks", "nixpkgs" ] @@ -467,6 +501,28 @@ } }, "gitignore_6": { + "inputs": { + "nixpkgs": [ + "nini", + "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_7": { "inputs": { "nixpkgs": [ "xenumenu", @@ -490,11 +546,11 @@ }, "hardware": { "locked": { - "lastModified": 1751432711, - "narHash": "sha256-136MeWtckSHTN9Z2WRNRdZ8oRP3vyx3L8UxeBYE+J9w=", + "lastModified": 1752048960, + "narHash": "sha256-gATnkOe37eeVwKKYCsL+OnS2gU4MmLuZFzzWCtaKLI8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "497ae1357f1ac97f1aea31a4cb74ad0d534ef41f", + "rev": "7ced9122cff2163c6a0212b8d1ec8c33a1660806", "type": "github" }, "original": { @@ -594,10 +650,10 @@ }, "hooks_4": { "inputs": { - "flake-compat": "flake-compat_6", + "flake-compat": "flake-compat_5", "gitignore": "gitignore_5", "nixpkgs": [ - "nini", + "mympv", "nixpkgs" ] }, @@ -617,8 +673,31 @@ }, "hooks_5": { "inputs": { - "flake-compat": "flake-compat_8", + "flake-compat": "flake-compat_7", "gitignore": "gitignore_6", + "nixpkgs": [ + "nini", + "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_6": { + "inputs": { + "flake-compat": "flake-compat_9", + "gitignore": "gitignore_7", "nixpkgs": [ "xenumenu", "nixpkgs" @@ -704,10 +783,31 @@ "url": "https://codeberg.org/helvetica/musicomp.git" } }, - "myphps": { + "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", "phps": "phps" }, "locked": { @@ -726,10 +826,10 @@ }, "nini": { "inputs": { - "flake-parts": "flake-parts_7", - "hooks": "hooks_4", - "nixpkgs": "nixpkgs_7", - "treefmt": "treefmt_3" + "flake-parts": "flake-parts_8", + "hooks": "hooks_5", + "nixpkgs": "nixpkgs_8", + "treefmt": "treefmt_4" }, "locked": { "lastModified": 1751656583, @@ -752,11 +852,11 @@ ] }, "locked": { - "lastModified": 1751774635, - "narHash": "sha256-DuOznGdgMxeSlPpUu6Wkq0ZD5e2Cfv9XRZeZlHWMd1s=", + "lastModified": 1752305182, + "narHash": "sha256-6i4Q68G7wzNq1m2+l3lJUYgGZ9PwULvSVJpRSTTC46o=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "85686025ba6d18df31cc651a91d5adef63378978", + "rev": "ad29e2961dd0d58372384563bf00d510fc9f2e15", "type": "github" }, "original": { @@ -767,8 +867,8 @@ }, "nixos-cosmic": { "inputs": { - "flake-compat": "flake-compat_7", - "nixpkgs": "nixpkgs_8", + "flake-compat": "flake-compat_8", + "nixpkgs": "nixpkgs_9", "nixpkgs-stable": "nixpkgs-stable_2", "rust-overlay": "rust-overlay_2" }, @@ -863,6 +963,21 @@ } }, "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=", @@ -877,7 +992,7 @@ "type": "github" } }, - "nixpkgs-lib_6": { + "nixpkgs-lib_7": { "locked": { "lastModified": 1751159883, "narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=", @@ -892,7 +1007,7 @@ "type": "github" } }, - "nixpkgs-lib_7": { + "nixpkgs-lib_8": { "locked": { "lastModified": 1748740939, "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=", @@ -939,6 +1054,22 @@ "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, @@ -988,6 +1119,22 @@ } }, "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=", @@ -1003,7 +1150,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1744502386, "narHash": "sha256-QAd1L37eU7ktL2WeLLLTmI6P9moz9+a/ONO8qNBYJgM=", @@ -1019,7 +1166,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1751271578, "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", @@ -1035,7 +1182,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1751011381, "narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=", @@ -1051,26 +1198,10 @@ "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_5", - "nixpkgs": "nixpkgs_6", + "flake-compat": "flake-compat_6", + "nixpkgs": "nixpkgs_7", "utils": "utils" }, "locked": { @@ -1174,6 +1305,7 @@ "hxwrap": "hxwrap", "lanzaboote": "lanzaboote", "musicomp": "musicomp", + "mympv": "mympv", "myphps": "myphps", "nini": "nini", "nix-index-database": "nix-index-database", @@ -1182,7 +1314,7 @@ "nixos-cosmic", "nixpkgs" ], - "treefmt": "treefmt_4", + "treefmt": "treefmt_5", "xenumenu": "xenumenu" } }, @@ -1303,7 +1435,7 @@ "treefmt_3": { "inputs": { "nixpkgs": [ - "nini", + "mympv", "nixpkgs" ] }, @@ -1324,6 +1456,7 @@ "treefmt_4": { "inputs": { "nixpkgs": [ + "nini", "nixpkgs" ] }, @@ -1342,6 +1475,26 @@ } }, "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", @@ -1407,10 +1560,10 @@ }, "xenumenu": { "inputs": { - "flake-parts": "flake-parts_8", - "hooks": "hooks_5", - "nixpkgs": "nixpkgs_9", - "treefmt": "treefmt_5" + "flake-parts": "flake-parts_9", + "hooks": "hooks_6", + "nixpkgs": "nixpkgs_10", + "treefmt": "treefmt_6" }, "locked": { "lastModified": 1750544859, diff --git a/flake.nix b/flake.nix index c9627a1..fb5e2ca 100644 --- a/flake.nix +++ b/flake.nix @@ -27,6 +27,7 @@ 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 deleted file mode 100644 index 37baf7f..0000000 --- a/hosts/insomniac/README.md +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 076c85f..0000000 --- a/hosts/insomniac/cage.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - 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 new file mode 100644 index 0000000..4c5c6ba --- /dev/null +++ b/hosts/insomniac/cosmic.nix @@ -0,0 +1,6 @@ +{ + services.displayManager.autoLogin = { + enable = true; + user = "insomniac"; + }; +} diff --git a/hosts/insomniac/networking.nix b/hosts/insomniac/networking.nix index 972104c..f44e0b7 100644 --- a/hosts/insomniac/networking.nix +++ b/hosts/insomniac/networking.nix @@ -1,6 +1,5 @@ { - # TODO - networking.interfaces.TODO.wakeOnLan = { + networking.interfaces.enp10s0.wakeOnLan = { enable = true; policy = [ "magic" diff --git a/hosts/insomniac/profiles.nix b/hosts/insomniac/profiles.nix index 0f7753c..af1a67d 100644 --- a/hosts/insomniac/profiles.nix +++ b/hosts/insomniac/profiles.nix @@ -1,6 +1,8 @@ { 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 deleted file mode 100644 index d39f536..0000000 --- a/hosts/insomniac/steam.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ - programs.steam = { - enable = true; - extest.enable = true; - protontricks.enable = true; - dedicatedServer.openFirewall = true; - remotePlay.openFirewall = true; - localNetworkGameTransfers.openFirewall = true; - gamescopeSession.enable = true; # TODO - }; -}