Compare commits

..

No commits in common. "22be469030e1a7f8a2a1b8ad7f25bd2138563f4c" and "36294d8cc131676fe131e887dc8f1ca524e4e44e" have entirely different histories.

16 changed files with 69 additions and 307 deletions

View File

@ -9,11 +9,11 @@
]
},
"locked": {
"lastModified": 1696775529,
"narHash": "sha256-TYlE4B0ktPtlJJF9IFxTWrEeq+XKG8Ny0gc2FGEAdj0=",
"lastModified": 1694793763,
"narHash": "sha256-y6gTE1C9mIoSkymRYyzCmv62PFgy+hbZ5j8fuiQK5KI=",
"owner": "ryantm",
"repo": "agenix",
"rev": "daf42cb35b2dc614d1551e37f96406e4c4a2d3e4",
"rev": "572baca9b0c592f71982fca0790db4ce311e3c75",
"type": "github"
},
"original": {
@ -252,28 +252,6 @@
"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": [
@ -347,29 +325,6 @@
}
},
"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",
@ -570,11 +525,11 @@
"nixpkgs-lib": "nixpkgs-lib_3"
},
"locked": {
"lastModified": 1698579227,
"narHash": "sha256-KVWjFZky+gRuWennKsbo6cWyo7c/z/VgCte5pR9pEKg=",
"lastModified": 1690933134,
"narHash": "sha256-ab989mN63fQZBFrkk4Q8bYxQCktuHmBIBqUG1jl6/FQ=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "f76e870d64779109e41370848074ac4eaa1606ec",
"rev": "59cf3f1447cfc75087e7273b04b31e689a8599fb",
"type": "github"
},
"original": {
@ -699,11 +654,11 @@
"rust-overlay": "rust-overlay_3"
},
"locked": {
"lastModified": 1698790188,
"narHash": "sha256-sAp4RIto3fDjb/HJ4NR3HlHo3J8R7tK4/qSGYkhudUA=",
"lastModified": 1694822684,
"narHash": "sha256-SVw6wEiMLgbVNED0y3l62Ws3PLzK8qufTRpYbvUjNm4=",
"owner": "helix-editor",
"repo": "helix",
"rev": "a069b928973aad99b85dffb9d5ade7dae4b58c43",
"rev": "941dc6c614d684804c3580c4ae8b3c4368aab217",
"type": "github"
},
"original": {
@ -719,11 +674,11 @@
]
},
"locked": {
"lastModified": 1698873617,
"narHash": "sha256-FfGFcfbULwbK1vD+H0rslIOfmy4g8f2hXiPkQG3ZCTk=",
"lastModified": 1694643239,
"narHash": "sha256-pv2k/5FvyirDE8g4TNehzwZ0T4UOMMmqWSQnM/luRtE=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "48b0a30202516e25d9885525fbb200a045f23f26",
"rev": "d9b88b43524db1591fb3d9410a21428198d75d49",
"type": "github"
},
"original": {
@ -859,11 +814,11 @@
"systems": "systems_5"
},
"locked": {
"lastModified": 1697228369,
"narHash": "sha256-j36FKeM8/K2EfmJAOueW88cgBaJLpROzX+HMUSmf9H4=",
"lastModified": 1697213072,
"narHash": "sha256-5rOidod1imEK5vRs77AfsZscFU+1QKniL0Tt4A9OeBI=",
"owner": "yusdacra",
"repo": "musikspider",
"rev": "6a8d5158c61154cf35c93dc30cac68beff85bf72",
"rev": "89f99b7324c0dcc37e4d7a8eb4ab1f3a75a349cc",
"type": "github"
},
"original": {
@ -916,7 +871,7 @@
"nci_2": {
"inputs": {
"crane": "crane_5",
"dream2nix": "dream2nix_3",
"dream2nix": "dream2nix_2",
"mk-naked-shell": "mk-naked-shell_2",
"nixpkgs": [
"musikquad",
@ -949,11 +904,11 @@
]
},
"locked": {
"lastModified": 1698826948,
"narHash": "sha256-Th05oofIIhsN2bmJNsb0Xev3+RJgtk8stjHZX9EdWA0=",
"lastModified": 1694765281,
"narHash": "sha256-Edj2wyiszLXpZ6tXrZY6tJEOLJeGQAYd5cM8XfBPk1s=",
"owner": "viperML",
"repo": "nh",
"rev": "23d21975231d569afbe3973eb19d955c650f8f08",
"rev": "8896f7f3647d3adc24adae3d51793a6837eb2b17",
"type": "github"
},
"original": {
@ -964,11 +919,11 @@
},
"nix-filter": {
"locked": {
"lastModified": 1694857738,
"narHash": "sha256-bxxNyLHjhu0N8T3REINXQ2ZkJco0ABFPn6PIe2QUfqo=",
"lastModified": 1687178632,
"narHash": "sha256-HS7YR5erss0JCaUijPeyg2XrisEb959FIct3n2TMGbE=",
"owner": "numtide",
"repo": "nix-filter",
"rev": "41fd48e00c22b4ced525af521ead8792402de0ea",
"rev": "d90c75e8319d0dd9be67d933d8eb9d0894ec9174",
"type": "github"
},
"original": {
@ -985,11 +940,11 @@
]
},
"locked": {
"lastModified": 1697038389,
"narHash": "sha256-hbzFPXyQQxJObRdb+CsylUXii29UfFV7866WWgWYs6Y=",
"lastModified": 1694400214,
"narHash": "sha256-QHESodq9FQpjWshfxmdYePnEAPaNPsYEd3iBe/JYjqk=",
"owner": "nix-community",
"repo": "nixd",
"rev": "29904e121cc775e7caaf4fffa6bc7da09376a43b",
"rev": "69b533e8d643c5dcbda7962d4dff808d72165783",
"type": "github"
},
"original": {
@ -1020,11 +975,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1698853384,
"narHash": "sha256-/FQ2WeCjdjdNo9eGTO7JruGAjO2Ccime8y1OU4/Aesk=",
"lastModified": 1694710316,
"narHash": "sha256-uRh46iIC86D8BD1wCDA5gRrt+hslUXiD0kx/UjnjBcs=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "11d50c5d52472ed40d3cb109daad03c836d2b328",
"rev": "570256327eb6ca6f7bebe8d93af49459092a0c43",
"type": "github"
},
"original": {
@ -1035,11 +990,11 @@
},
"nixos-persistence": {
"locked": {
"lastModified": 1697303681,
"narHash": "sha256-caJ0rXeagaih+xTgRduYtYKL1rZ9ylh06CIrt1w5B4g=",
"lastModified": 1694622745,
"narHash": "sha256-z397+eDhKx9c2qNafL1xv75lC0Q4nOaFlhaU1TINqb8=",
"owner": "nix-community",
"repo": "impermanence",
"rev": "0f317c2e9e56550ce12323eb39302d251618f5b5",
"rev": "e9643d08d0d193a2e074a19d4d90c67a874d932e",
"type": "github"
},
"original": {
@ -1103,11 +1058,11 @@
"nixpkgs-lib_3": {
"locked": {
"dir": "lib",
"lastModified": 1696019113,
"narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=",
"lastModified": 1690881714,
"narHash": "sha256-h/nXluEqdiQHs1oSgkOOWF+j8gcJMWhwnZ9PFabN6q0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a",
"rev": "9e1960bc196baf6881340d53dccb203a951745a2",
"type": "github"
},
"original": {
@ -1138,11 +1093,11 @@
},
"nixpkgs-master": {
"locked": {
"lastModified": 1698952266,
"narHash": "sha256-wUWW5tisJUKooJZlPVpf3WGDjtd1vbfeP6QaNBT16Hk=",
"lastModified": 1694874640,
"narHash": "sha256-2TGogij/TyUFGIUE7F69CVW2L/u7JsGnDxXV0knX0K0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "50c3db1d8e5e19dce3af31c0a8fcb468bc94652e",
"rev": "624c20171e9473f114f91d6c08f8a4e49ca3752e",
"type": "github"
},
"original": {
@ -1155,11 +1110,11 @@
"nixpkgs-wayland": {
"flake": false,
"locked": {
"lastModified": 1698934489,
"narHash": "sha256-Slv//YnC4pZxsLRxHQbff4iGWs6ejuCs5217Ovjjwjk=",
"lastModified": 1694867154,
"narHash": "sha256-9WSzb10vk8pcKydg0RAUa7Z9YMRekVqOrBrEPqZzDvc=",
"owner": "nix-community",
"repo": "nixpkgs-wayland",
"rev": "149b64ed3031d58f920154e365a7e3deebd0248a",
"rev": "0b64693b3e90070f0fd8075b9bd8a255701b1ac9",
"type": "github"
},
"original": {
@ -1201,11 +1156,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1698611440,
"narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=",
"lastModified": 1694767346,
"narHash": "sha256-5uH27SiVFUwsTsqC5rs3kS7pBoNhtoy9QfTP9BmknGk=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735",
"rev": "ace5093e36ab1e95cb9463863491bee90d5a4183",
"type": "github"
},
"original": {
@ -1217,11 +1172,11 @@
},
"nur": {
"locked": {
"lastModified": 1698950687,
"narHash": "sha256-AKkChLuvzogM8pwi2srRYjPDndg0EbPgw0wuNMmDtjk=",
"lastModified": 1694866994,
"narHash": "sha256-uo50mKCooOkNvJRBl/O4AOKa2QztMvda0aFppp2QrBE=",
"owner": "nix-community",
"repo": "NUR",
"rev": "25fe4f96599b744f6258c2f0272ab5e402b31e59",
"rev": "5f8282ce5ce11225ae6cd5fff355685fef0c132e",
"type": "github"
},
"original": {
@ -1352,52 +1307,12 @@
"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",
@ -1544,45 +1459,6 @@
"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",
@ -1752,11 +1628,11 @@
]
},
"locked": {
"lastModified": 1698887753,
"narHash": "sha256-6sIAOzMKkXEYnOpNIfoWO+QYCCz5uR/EzDwE+pEVFEc=",
"lastModified": 1694827048,
"narHash": "sha256-2c1mjR2IHkfk/PoWhBZh4pbSAe34CZmuaUo0B6X3NLw=",
"owner": "nix-community",
"repo": "nix-vscode-extensions",
"rev": "c6080604ecf7c35da91d96ee0fb2601b20c1f5a1",
"rev": "bdd7fee1c2b085c15101cae04cf62260d8f77555",
"type": "github"
},
"original": {

View File

@ -56,9 +56,6 @@
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";

View File

@ -1,7 +0,0 @@
{
programs.weylus = {
enable = true;
users = ["patriot"];
openFirewall = true;
};
}

View File

@ -6,7 +6,7 @@
pkg =
inputs.musikspider.packages.${pkgs.system}.musikspider.overrideAttrs
(old: {
LOCAL_MUSIKQUAD_SERVER = "http://127.0.0.1:5005";
LOCAL_MUSIKQUAD_SERVER = "http://localhost:5005";
PUBLIC_MUSIKQUAD_SERVER = "mq.gaze.systems";
PUBLIC_BASEURL = "ms.gaze.systems";
});
@ -28,7 +28,7 @@ in {
Restart = "on-failure";
RestartSec = 5;
WorkingDirectory = "/var/lib/musikspider";
Environment = "HOME=/var/lib/musikspider";
Environment="HOME=/var/lib/musikspider";
EnvironmentFile = pkgs.writeText "musikspider-env" ''
PORT=${port}
'';

View File

@ -110,4 +110,5 @@ in {
config = {safe.directory = ["/etc/nixos"];};
};
};
nixpkgs.config.allowUnfree = true;
}

View File

@ -1,5 +1,5 @@
{inputs}: final: prev: {
prismlauncher = prev.prismlauncher.overrideAttrs (old: {
patches = [((toString inputs.self) + "/pkgs-set/patches/prismlauncher-offline.patch")];
});
# prismlauncher = prev.prismlauncher.overrideAttrs (old: {
# patches = [((toString inputs.self) + "/pkgs-set/patches/prismlauncher-offline.patch")];
# });
}

View File

@ -1,22 +1,5 @@
{
lib,
stdenv,
fetchurl,
alsa-lib,
autoconf,
automake,
dssi,
gtk2,
libjack2,
ladspaH,
ladspaPlugins,
liblo,
pkg-config,
fluidsynth,
rpm2targz,
libtool,
...
}:
{ lib, stdenv, fetchurl, alsa-lib, autoconf, automake, dssi, gtk2, libjack2,
ladspaH, ladspaPlugins, liblo, pkg-config, fluidsynth, rpm2targz, libtool, ... }:
stdenv.mkDerivation rec {
pname = "fluidsynth-dssi";
version = "1.9.9";
@ -26,8 +9,8 @@ stdenv.mkDerivation rec {
sha256 = "sha256-DJSrdxQpjvQTzio6e3p/iSYJWu+AbydyKkeKsRQA6qc=";
};
nativeBuildInputs = [autoconf automake pkg-config rpm2targz libtool];
buildInputs = [alsa-lib dssi gtk2 libjack2 ladspaH ladspaPlugins liblo fluidsynth.dev];
nativeBuildInputs = [ autoconf automake pkg-config rpm2targz libtool ];
buildInputs = [ alsa-lib dssi gtk2 libjack2 ladspaH ladspaPlugins liblo fluidsynth.dev ];
unpackPhase = ''
rpm2targz $src

View File

@ -1,8 +1,4 @@
{
stdenv,
libsForQt5,
...
}:
{stdenv, libsForQt5, ...}:
stdenv.mkDerivation {
pname = "phantomstyle";
version = "309c97";

View File

@ -1,15 +0,0 @@
{pkgs, ...}: {
systemd.user.services.arrpc = {
Install = {
WantedBy = ["default.target"];
};
Unit = {
Description = "arrpc";
};
Service = {
ExecStart = "${pkgs.arrpc}/bin/arrpc";
Restart = "on-failure";
RestartSec = 5;
};
};
}

View File

@ -1,15 +0,0 @@
{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;
};
};
}

View File

@ -3,11 +3,7 @@
config,
...
}: {
home.persistence."${config.system.persistDir}${config.home.homeDirectory}".directories = [
".mozilla"
".floorp"
];
home.packages = [(pkgs.lib.hiPrio pkgs.floorp)];
home.persistence."${config.system.persistDir}${config.home.homeDirectory}".directories = [".mozilla"];
programs.firefox = {
enable = true;
package = pkgs.firefox-wayland.override {
@ -66,9 +62,8 @@
]
++ (with myExtensions; [
youtube-disable-number-seek
styl-us
showdex
better-twitter-extension
better-clean-twitter
]);
extraConfig = builtins.readFile (
builtins.fetchurl {

View File

@ -2,7 +2,5 @@
{"slug":"catppuccin-mocha-sky"},
{"slug":"youtube-disable-number-seek"},
{"slug":"showdex"},
{"slug":"styl-us"},
{"slug":"better-twitter-extension"},
{"slug":"better-clean-twitter"}
{"slug":"styl-us"}
]

View File

@ -4,46 +4,6 @@
lib,
stdenv,
}: {
"better-clean-twitter" = buildFirefoxXpiAddon {
pname = "better-clean-twitter";
version = "1.3.2";
addonId = "bct@presti.me";
url = "https://addons.mozilla.org/firefox/downloads/file/4124387/better_clean_twitter-1.3.2.xpi";
sha256 = "094d99c7678c3247a0b07a2d0d942df969daafe567d392a52a6f0b40ce7382bd";
meta = with lib; {
homepage = "https://presti.me";
description = "Remove all the annoying clutter from your Twitter.";
license = licenses.gpl3;
mozPermissions = [
"*://twitter.com/*"
"*://api.twitter.com/*"
"activeTab"
"storage"
"tabs"
"scripting"
"webRequest"
"nativeMessaging"
"https://twitter.com/*"
];
platforms = platforms.all;
};
};
"better-twitter-extension" = buildFirefoxXpiAddon {
pname = "better-twitter-extension";
version = "2.1.2";
addonId = "{ef32ca60-1728-4011-a585-4de439fe7ba7}";
url = "https://addons.mozilla.org/firefox/downloads/file/4056346/better_twitter_extension-2.1.2.xpi";
sha256 = "25cf90586def269d7a54d8b4fd71aa63529e25ed6689df4c05b0d7f8c3fabca9";
meta = with lib; {
description = "Hide what is not important on <a href=\"https://prod.outgoing.prod.webservices.mozgcp.net/v1/26ca20fd517be4e3078c65b14f44521b572c8c48532db6c37d90ff3a2ee15167/http%3A//Twitter.com\" rel=\"nofollow\">Twitter.com</a>";
mozPermissions = [
"storage"
"https://twitter.com/*"
"https://mobile.twitter.com/*"
];
platforms = platforms.all;
};
};
"catppuccin-mocha-sky" = buildFirefoxXpiAddon {
pname = "catppuccin-mocha-sky";
version = "2.0";

View File

@ -1,3 +1,3 @@
{pkgs, ...}: {
home.packages = with pkgs; [godot_4];
home.packages = with pkgs; [godot godot-headless godot-server];
}

View File

@ -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";

View File

@ -114,9 +114,7 @@ in {
["zoxide" "zsh" "fzf" "starship" "direnv"]
# dev stuff
["helix" "git" "ssh"]
["godot"]
["musikcube" "musikcubed"]
["arrpc" "discordrp-mpris"]
];
in
l.flatten [
@ -146,20 +144,17 @@ in {
".vst"
]
++ mkPaths ".local/share" [
"bottles"
"direnv"
"zsh"
"keyrings"
"yuzu"
# "lutris"
# "Terraria"
"PrismLauncher"
# "PrismLauncher"
]
++ mkPaths ".config" [
# "lutris"
"dconf"
"retroarch"
"yuzu"
];
files = l.flatten [
".config/gnome-initial-setup-done"
@ -223,7 +218,7 @@ in {
helvum
nix-output-monitor
inputs.nh.packages.${pkgs.system}.default
prismlauncher
# prismlauncher
# steamPackages.steamcmd
# steam-tui
gtkcord4
@ -237,11 +232,9 @@ in {
(retroarch.override {
cores = with libretro; [desmume citra];
})
yuzu
# wineWowPackages.stagingFull
# lutris
distrobox
bottles
];
};
programs = {