diff --git a/flake.lock b/flake.lock index 0a0b81f..c4edc97 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ ] }, "locked": { - "lastModified": 1694793763, - "narHash": "sha256-y6gTE1C9mIoSkymRYyzCmv62PFgy+hbZ5j8fuiQK5KI=", + "lastModified": 1696775529, + "narHash": "sha256-TYlE4B0ktPtlJJF9IFxTWrEeq+XKG8Ny0gc2FGEAdj0=", "owner": "ryantm", "repo": "agenix", - "rev": "572baca9b0c592f71982fca0790db4ce311e3c75", + "rev": "daf42cb35b2dc614d1551e37f96406e4c4a2d3e4", "type": "github" }, "original": { @@ -252,6 +252,28 @@ "type": "github" } }, + "discordrp-mpris": { + "inputs": { + "dream2nix": "dream2nix_2", + "nixpkgs": [ + "nixpkgs" + ], + "src": "src" + }, + "locked": { + "lastModified": 1699715608, + "narHash": "sha256-fHJ3ms11DIjTiec5b+TJQXOIjG8BIvQAUnw/KyhlA+M=", + "owner": "yusdacra", + "repo": "discordrp-mpris-flake", + "rev": "5d606e87841d74d169f8906b2323b5122a3a29ed", + "type": "github" + }, + "original": { + "owner": "yusdacra", + "repo": "discordrp-mpris-flake", + "type": "github" + } + }, "dream2nix": { "inputs": { "all-cabal-json": [ @@ -325,6 +347,29 @@ } }, "dream2nix_2": { + "inputs": { + "nixpkgs": [ + "discordrp-mpris", + "nixpkgs" + ], + "purescript-overlay": "purescript-overlay", + "pyproject-nix": "pyproject-nix" + }, + "locked": { + "lastModified": 1699600290, + "narHash": "sha256-WdCM7kvHhHPQf8QA9Q/DG8FXjm9C0Q6dxxg1Rd0gdSo=", + "owner": "nix-community", + "repo": "dream2nix", + "rev": "3f1cbc8e937b49dcf0fc9cc91b542af554b09013", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "dream2nix", + "type": "github" + } + }, + "dream2nix_3": { "inputs": { "devshell": [ "musikquad", @@ -525,11 +570,11 @@ "nixpkgs-lib": "nixpkgs-lib_3" }, "locked": { - "lastModified": 1690933134, - "narHash": "sha256-ab989mN63fQZBFrkk4Q8bYxQCktuHmBIBqUG1jl6/FQ=", + "lastModified": 1698579227, + "narHash": "sha256-KVWjFZky+gRuWennKsbo6cWyo7c/z/VgCte5pR9pEKg=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "59cf3f1447cfc75087e7273b04b31e689a8599fb", + "rev": "f76e870d64779109e41370848074ac4eaa1606ec", "type": "github" }, "original": { @@ -654,11 +699,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1694822684, - "narHash": "sha256-SVw6wEiMLgbVNED0y3l62Ws3PLzK8qufTRpYbvUjNm4=", + "lastModified": 1698790188, + "narHash": "sha256-sAp4RIto3fDjb/HJ4NR3HlHo3J8R7tK4/qSGYkhudUA=", "owner": "helix-editor", "repo": "helix", - "rev": "941dc6c614d684804c3580c4ae8b3c4368aab217", + "rev": "a069b928973aad99b85dffb9d5ade7dae4b58c43", "type": "github" }, "original": { @@ -674,11 +719,11 @@ ] }, "locked": { - "lastModified": 1694643239, - "narHash": "sha256-pv2k/5FvyirDE8g4TNehzwZ0T4UOMMmqWSQnM/luRtE=", + "lastModified": 1698873617, + "narHash": "sha256-FfGFcfbULwbK1vD+H0rslIOfmy4g8f2hXiPkQG3ZCTk=", "owner": "nix-community", "repo": "home-manager", - "rev": "d9b88b43524db1591fb3d9410a21428198d75d49", + "rev": "48b0a30202516e25d9885525fbb200a045f23f26", "type": "github" }, "original": { @@ -814,11 +859,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1697213072, - "narHash": "sha256-5rOidod1imEK5vRs77AfsZscFU+1QKniL0Tt4A9OeBI=", + "lastModified": 1697228369, + "narHash": "sha256-j36FKeM8/K2EfmJAOueW88cgBaJLpROzX+HMUSmf9H4=", "owner": "yusdacra", "repo": "musikspider", - "rev": "89f99b7324c0dcc37e4d7a8eb4ab1f3a75a349cc", + "rev": "6a8d5158c61154cf35c93dc30cac68beff85bf72", "type": "github" }, "original": { @@ -871,7 +916,7 @@ "nci_2": { "inputs": { "crane": "crane_5", - "dream2nix": "dream2nix_2", + "dream2nix": "dream2nix_3", "mk-naked-shell": "mk-naked-shell_2", "nixpkgs": [ "musikquad", @@ -904,11 +949,11 @@ ] }, "locked": { - "lastModified": 1694765281, - "narHash": "sha256-Edj2wyiszLXpZ6tXrZY6tJEOLJeGQAYd5cM8XfBPk1s=", + "lastModified": 1698826948, + "narHash": "sha256-Th05oofIIhsN2bmJNsb0Xev3+RJgtk8stjHZX9EdWA0=", "owner": "viperML", "repo": "nh", - "rev": "8896f7f3647d3adc24adae3d51793a6837eb2b17", + "rev": "23d21975231d569afbe3973eb19d955c650f8f08", "type": "github" }, "original": { @@ -919,11 +964,11 @@ }, "nix-filter": { "locked": { - "lastModified": 1687178632, - "narHash": "sha256-HS7YR5erss0JCaUijPeyg2XrisEb959FIct3n2TMGbE=", + "lastModified": 1694857738, + "narHash": "sha256-bxxNyLHjhu0N8T3REINXQ2ZkJco0ABFPn6PIe2QUfqo=", "owner": "numtide", "repo": "nix-filter", - "rev": "d90c75e8319d0dd9be67d933d8eb9d0894ec9174", + "rev": "41fd48e00c22b4ced525af521ead8792402de0ea", "type": "github" }, "original": { @@ -940,11 +985,11 @@ ] }, "locked": { - "lastModified": 1694400214, - "narHash": "sha256-QHESodq9FQpjWshfxmdYePnEAPaNPsYEd3iBe/JYjqk=", + "lastModified": 1697038389, + "narHash": "sha256-hbzFPXyQQxJObRdb+CsylUXii29UfFV7866WWgWYs6Y=", "owner": "nix-community", "repo": "nixd", - "rev": "69b533e8d643c5dcbda7962d4dff808d72165783", + "rev": "29904e121cc775e7caaf4fffa6bc7da09376a43b", "type": "github" }, "original": { @@ -975,11 +1020,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1694710316, - "narHash": "sha256-uRh46iIC86D8BD1wCDA5gRrt+hslUXiD0kx/UjnjBcs=", + "lastModified": 1698853384, + "narHash": "sha256-/FQ2WeCjdjdNo9eGTO7JruGAjO2Ccime8y1OU4/Aesk=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "570256327eb6ca6f7bebe8d93af49459092a0c43", + "rev": "11d50c5d52472ed40d3cb109daad03c836d2b328", "type": "github" }, "original": { @@ -990,11 +1035,11 @@ }, "nixos-persistence": { "locked": { - "lastModified": 1694622745, - "narHash": "sha256-z397+eDhKx9c2qNafL1xv75lC0Q4nOaFlhaU1TINqb8=", + "lastModified": 1697303681, + "narHash": "sha256-caJ0rXeagaih+xTgRduYtYKL1rZ9ylh06CIrt1w5B4g=", "owner": "nix-community", "repo": "impermanence", - "rev": "e9643d08d0d193a2e074a19d4d90c67a874d932e", + "rev": "0f317c2e9e56550ce12323eb39302d251618f5b5", "type": "github" }, "original": { @@ -1019,22 +1064,6 @@ "type": "github" } }, - "nixpkgs-floorp": { - "locked": { - "lastModified": 1697124353, - "narHash": "sha256-Zdpiv74nvmSPyl56ntJuTt9Udg1qt8GHqDv9InkChJA=", - "owner": "christoph-heiss", - "repo": "nixpkgs", - "rev": "7da03ef9701a350b383e9bc36639ae0ad3481e4d", - "type": "github" - }, - "original": { - "owner": "christoph-heiss", - "ref": "new/floorp", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-lib": { "locked": { "dir": "lib", @@ -1074,11 +1103,11 @@ "nixpkgs-lib_3": { "locked": { "dir": "lib", - "lastModified": 1690881714, - "narHash": "sha256-h/nXluEqdiQHs1oSgkOOWF+j8gcJMWhwnZ9PFabN6q0=", + "lastModified": 1696019113, + "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9e1960bc196baf6881340d53dccb203a951745a2", + "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a", "type": "github" }, "original": { @@ -1109,11 +1138,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1694874640, - "narHash": "sha256-2TGogij/TyUFGIUE7F69CVW2L/u7JsGnDxXV0knX0K0=", + "lastModified": 1698952266, + "narHash": "sha256-wUWW5tisJUKooJZlPVpf3WGDjtd1vbfeP6QaNBT16Hk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "624c20171e9473f114f91d6c08f8a4e49ca3752e", + "rev": "50c3db1d8e5e19dce3af31c0a8fcb468bc94652e", "type": "github" }, "original": { @@ -1126,11 +1155,11 @@ "nixpkgs-wayland": { "flake": false, "locked": { - "lastModified": 1694867154, - "narHash": "sha256-9WSzb10vk8pcKydg0RAUa7Z9YMRekVqOrBrEPqZzDvc=", + "lastModified": 1698934489, + "narHash": "sha256-Slv//YnC4pZxsLRxHQbff4iGWs6ejuCs5217Ovjjwjk=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "0b64693b3e90070f0fd8075b9bd8a255701b1ac9", + "rev": "149b64ed3031d58f920154e365a7e3deebd0248a", "type": "github" }, "original": { @@ -1172,11 +1201,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1694767346, - "narHash": "sha256-5uH27SiVFUwsTsqC5rs3kS7pBoNhtoy9QfTP9BmknGk=", + "lastModified": 1698611440, + "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ace5093e36ab1e95cb9463863491bee90d5a4183", + "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735", "type": "github" }, "original": { @@ -1188,11 +1217,11 @@ }, "nur": { "locked": { - "lastModified": 1694866994, - "narHash": "sha256-uo50mKCooOkNvJRBl/O4AOKa2QztMvda0aFppp2QrBE=", + "lastModified": 1698950687, + "narHash": "sha256-AKkChLuvzogM8pwi2srRYjPDndg0EbPgw0wuNMmDtjk=", "owner": "nix-community", "repo": "NUR", - "rev": "5f8282ce5ce11225ae6cd5fff355685fef0c132e", + "rev": "25fe4f96599b744f6258c2f0272ab5e402b31e59", "type": "github" }, "original": { @@ -1323,12 +1352,52 @@ "type": "github" } }, + "purescript-overlay": { + "inputs": { + "nixpkgs": [ + "discordrp-mpris", + "dream2nix", + "nixpkgs" + ], + "slimlock": "slimlock" + }, + "locked": { + "lastModified": 1696022621, + "narHash": "sha256-eMjFmsj2G1E0Q5XiibUNgFjTiSz0GxIeSSzzVdoN730=", + "owner": "thomashoneyman", + "repo": "purescript-overlay", + "rev": "047c7933abd6da8aa239904422e22d190ce55ead", + "type": "github" + }, + "original": { + "owner": "thomashoneyman", + "repo": "purescript-overlay", + "type": "github" + } + }, + "pyproject-nix": { + "flake": false, + "locked": { + "lastModified": 1699067645, + "narHash": "sha256-SJOEPVFARVfS0qQQqbnGywt8uOZMmlV1PazQtGNNCfQ=", + "owner": "adisbladis", + "repo": "pyproject.nix", + "rev": "56b5a6ae1ac63a0a3a044d602a3b5d09a5d10dc0", + "type": "github" + }, + "original": { + "owner": "adisbladis", + "repo": "pyproject.nix", + "type": "github" + } + }, "root": { "inputs": { "agenix": "agenix", "bernbot": "bernbot", "blog": "blog", "conduit": "conduit", + "discordrp-mpris": "discordrp-mpris", "helix": "helix", "home": "home", "limbusart": "limbusart", @@ -1340,7 +1409,6 @@ "nixos-hardware": "nixos-hardware", "nixos-persistence": "nixos-persistence", "nixpkgs": "nixpkgs_3", - "nixpkgs-floorp": "nixpkgs-floorp", "nixpkgs-master": "nixpkgs-master", "nixpkgs-wayland": "nixpkgs-wayland", "nur": "nur", @@ -1476,6 +1544,45 @@ "type": "github" } }, + "slimlock": { + "inputs": { + "nixpkgs": [ + "discordrp-mpris", + "dream2nix", + "purescript-overlay", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1688610262, + "narHash": "sha256-Wg0ViDotFWGWqKIQzyYCgayeH8s4U1OZcTiWTQYdAp4=", + "owner": "thomashoneyman", + "repo": "slimlock", + "rev": "b5c6cdcaf636ebbebd0a1f32520929394493f1a6", + "type": "github" + }, + "original": { + "owner": "thomashoneyman", + "repo": "slimlock", + "type": "github" + } + }, + "src": { + "flake": false, + "locked": { + "lastModified": 1658082819, + "narHash": "sha256-o4utv6yhDoE1iVFkwRKWZZLGQUCAPL/2Pz58SBVZZhM=", + "owner": "FichteFoll", + "repo": "discordrp-mpris", + "rev": "911aa5a9ce21bee059389631f24e105883a4ad48", + "type": "github" + }, + "original": { + "owner": "FichteFoll", + "repo": "discordrp-mpris", + "type": "github" + } + }, "stylix": { "inputs": { "base16": "base16", @@ -1645,11 +1752,11 @@ ] }, "locked": { - "lastModified": 1694827048, - "narHash": "sha256-2c1mjR2IHkfk/PoWhBZh4pbSAe34CZmuaUo0B6X3NLw=", + "lastModified": 1698887753, + "narHash": "sha256-6sIAOzMKkXEYnOpNIfoWO+QYCCz5uR/EzDwE+pEVFEc=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "bdd7fee1c2b085c15101cae04cf62260d8f77555", + "rev": "c6080604ecf7c35da91d96ee0fb2601b20c1f5a1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0172a6d..04eb01e 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,6 @@ description = "config!!!"; inputs = { - nixpkgs-floorp.url = "github:christoph-heiss/nixpkgs/new/floorp"; nixpkgs-master.url = "github:nixos/nixpkgs/master"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nur.url = "github:nix-community/NUR"; @@ -57,6 +56,9 @@ nh.url = "github:viperML/nh"; nh.inputs.nixpkgs.follows = "nixpkgs"; + discordrp-mpris.url = "github:yusdacra/discordrp-mpris-flake"; + discordrp-mpris.inputs.nixpkgs.follows = "nixpkgs"; + # vfio.url = "github:yusdacra/nixos-vfio"; # vfio.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/hosts/tkaronto/modules/weylus.nix.disabled b/hosts/tkaronto/modules/weylus.nix.disabled new file mode 100644 index 0000000..1f94f85 --- /dev/null +++ b/hosts/tkaronto/modules/weylus.nix.disabled @@ -0,0 +1,7 @@ +{ + programs.weylus = { + enable = true; + users = ["patriot"]; + openFirewall = true; + }; +} diff --git a/modules/base/default.nix b/modules/base/default.nix index 1fb4be0..758e411 100644 --- a/modules/base/default.nix +++ b/modules/base/default.nix @@ -110,5 +110,4 @@ in { config = {safe.directory = ["/etc/nixos"];}; }; }; - nixpkgs.config.allowUnfree = true; } diff --git a/pkgs-set/overlays/floorp.nix b/pkgs-set/overlays/floorp.nix deleted file mode 100644 index 353fad2..0000000 --- a/pkgs-set/overlays/floorp.nix +++ /dev/null @@ -1,4 +0,0 @@ -{inputs}: -final: prev: { - floorp = inputs.nixpkgs-floorp.legacyPackages.${final.system}.floorp; -} diff --git a/users/modules/arrpc/default.nix b/users/modules/arrpc/default.nix new file mode 100644 index 0000000..061b8b1 --- /dev/null +++ b/users/modules/arrpc/default.nix @@ -0,0 +1,15 @@ +{pkgs, ...}: { + systemd.user.services.arrpc = { + Install = { + WantedBy = ["default.target"]; + }; + Unit = { + Description = "arrpc"; + }; + Service = { + ExecStart = "${pkgs.arrpc}/bin/arrpc"; + Restart = "on-failure"; + RestartSec = 5; + }; + }; +} diff --git a/users/modules/discordrp-mpris/default.nix b/users/modules/discordrp-mpris/default.nix new file mode 100644 index 0000000..c1404a0 --- /dev/null +++ b/users/modules/discordrp-mpris/default.nix @@ -0,0 +1,15 @@ +{inputs, pkgs, ...}: { + systemd.user.services.discordrp-mpris = { + Install = { + WantedBy = ["default.target"]; + }; + Unit = { + Description = "discordrp-mpris"; + }; + Service = { + ExecStart = "${inputs.discordrp-mpris.packages.${pkgs.system}.default}/bin/discordrp-mpris"; + Restart = "on-failure"; + RestartSec = 5; + }; + }; +} diff --git a/users/modules/firefox/default.nix b/users/modules/firefox/default.nix index c459eac..b9932d3 100644 --- a/users/modules/firefox/default.nix +++ b/users/modules/firefox/default.nix @@ -3,7 +3,11 @@ config, ... }: { - home.persistence."${config.system.persistDir}${config.home.homeDirectory}".directories = [".mozilla"]; + home.persistence."${config.system.persistDir}${config.home.homeDirectory}".directories = [ + ".mozilla" + ".floorp" + ]; + home.packages = [(pkgs.lib.hiPrio pkgs.floorp)]; programs.firefox = { enable = true; package = pkgs.firefox-wayland.override { diff --git a/users/modules/musikcubed/default.nix b/users/modules/musikcubed/default.nix index 2792551..194da8a 100644 --- a/users/modules/musikcubed/default.nix +++ b/users/modules/musikcubed/default.nix @@ -21,9 +21,9 @@ in { }; config = lib.mkIf cfg.enable { systemd.user.services.musikcubed = { - # Install = { - # WantedBy = ["default.target"]; - # }; + Install = { + WantedBy = ["default.target"]; + }; Unit = { Description = "musikcubed"; After = "network.target"; diff --git a/users/patriot/default.nix b/users/patriot/default.nix index e2419c7..3a66717 100644 --- a/users/patriot/default.nix +++ b/users/patriot/default.nix @@ -116,6 +116,7 @@ in { ["helix" "git" "ssh"] ["godot"] ["musikcube" "musikcubed"] + ["arrpc" "discordrp-mpris"] ]; in l.flatten [