diff --git a/hosts/work/core/packages.nix b/hosts/work/core/packages.nix index a18d166..1ce456c 100644 --- a/hosts/work/core/packages.nix +++ b/hosts/work/core/packages.nix @@ -66,6 +66,7 @@ in thunderbird-bin telegram-desktop element-desktop + fluxer # Gaming lact @@ -119,6 +120,7 @@ in syncplay kdePackages.gwenview kdePackages.kimageformats + kdePackages.ark #Theming mint-themes @@ -130,7 +132,7 @@ in # 3rd party args.pins.affinity-nix.packages."${pkgs.stdenv.hostPlatform.system}".v3 args.pins.wire.packages.${builtins.currentSystem}.wire - (import args.pins.nixpkgs-jelly { }).jellyfin-desktop + jellyfin-desktop args.pins.dune.packages.default # For work diff --git a/hosts/work/hjem-rum/niri.nix b/hosts/work/hjem-rum/niri.nix index 6b6897b..eaea379 100644 --- a/hosts/work/hjem-rum/niri.nix +++ b/hosts/work/hjem-rum/niri.nix @@ -10,6 +10,9 @@ ] ]; config = '' + debug { + render-drm-device "/dev/dri/renderD128" + } input { keyboard { xkb { @@ -35,6 +38,9 @@ transform "normal" mode "2560x1600@165.000000" } + output "DP-5" { + mode "2560x1440@144.002" + } screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png" prefer-no-csd layout { diff --git a/hosts/work/hjem-rum/themes/zed-theme.nix b/hosts/work/hjem-rum/themes/zed-theme.nix index 905a07c..92eb25f 100644 --- a/hosts/work/hjem-rum/themes/zed-theme.nix +++ b/hosts/work/hjem-rum/themes/zed-theme.nix @@ -355,12 +355,12 @@ font_weight = null; }; "selector" = { - color = "#d003e2"; # Unmodified + color = "#f92a72"; # Only place i found this change is css class or id types like .classname {} or #idname {} font_style = null; font_weight = null; }; "selector.pseudo" = { - color = "#d003e2"; # Unmodified + color = "#f59762"; # Only place i found this change is css :hover and such font_style = null; font_weight = null; }; @@ -390,7 +390,7 @@ font_weight = null; }; "tag" = { - color = "#d003e2"; # Unmodified + color = "#AE81FF"; # The place i found this gets changed is css normal tags like body {} font_style = null; font_weight = null; }; diff --git a/npins/sources.json b/npins/sources.json index c08aa8a..b199a6a 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -21,9 +21,9 @@ }, "branch": "main", "submodules": false, - "revision": "665ecd75c62273d2e206e66d6aae4975cbfdc969", + "revision": "089c27a70c778208bc9da84c6d41572c2f7ebcc2", "url": null, - "hash": "sha256-tgjCoQCc5COOWSY89/xOchTzhdB1oYb/WUc1M5LdNco=" + "hash": "sha256-AbiZWpypaBIw9rm1g2pG+Q8DD+N/UUSG8pylwd3rfTc=" }, "flake-compat": { "type": "Git", @@ -143,20 +143,6 @@ "url": "https://github.com/NixOS/nixpkgs/archive/00c21e4c93d963c50d4c0c89bfa84ed6e0694df2.tar.gz", "hash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=" }, - "nixpkgs-jelly": { - "type": "Git", - "repository": { - "type": "GitHub", - "owner": "vikingnope", - "repo": "nixpkgs" - }, - "branch": "jellyfin-media-player--rename-to-jellyfin-desktop", - "submodules": false, - "revision": "108c36953a75771675e0056bb94f2467784353cf", - "url": "https://github.com/vikingnope/nixpkgs/archive/108c36953a75771675e0056bb94f2467784353cf.tar.gz", - "hash": "sha256-fT0cIx5RWgk21myuAe2zcg/dpGq+NaifOfNjuEbq1no=", - "frozen": true - }, "nixpkgs-master": { "type": "Git", "repository": { diff --git a/overlays/default/overlay.nix b/overlays/default/overlay.nix index 779ddab..41e73fb 100644 --- a/overlays/default/overlay.nix +++ b/overlays/default/overlay.nix @@ -2,7 +2,7 @@ (final: prev: rec { calc-rs = prev.callPackage ../../packages/calc-rs { }; configarr = prev.callPackage ../../packages/configarr { }; - # dune = prev.callPackage ../../packages/dune { }; + fluxer = prev.callPackage ../../packages/fluxer { }; elysia = prev.callPackage ../../packages/elysia { }; safenet_authentication_client = prev.callPackage ../../packages/safenet_authentication_client { }; btrustbiss = prev.callPackage ../../packages/btrustbiss { inherit safenet_authentication_client; }; diff --git a/packages/elysia/default.nix b/packages/elysia/default.nix deleted file mode 100644 index d6e5738..0000000 --- a/packages/elysia/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ - stdenv, - writeText, - autoPatchelfHook, - ffmpeg, - wayland, - makeWrapper, - lib, - libxkbcommon, - ... -}: -stdenv.mkDerivation rec { - pname = "elysia"; - version = "0.1"; - src = builtins.fetchurl { - url = "https://dawn.wine/elysia/elysia/releases/download/v${version}/elysia"; - }; - elysia-src = fetchTarball { - url = "https://dawn.wine/elysia/elysia/archive/v${version}.tar.gz"; - }; - - nativeBuildInputs = [ - makeWrapper - ]; - - buildInputs = [ - autoPatchelfHook - wayland - ffmpeg.lib - ]; - - dontUnpack = true; - installPhase = '' - mkdir -p $out/bin/ - - cp ${src} $out/bin/elysia - chmod +x $out/bin/elysia - - wrapProgram $out/bin/elysia \ - --prefix LD_LIBRARY_PATH : ${ - lib.makeLibraryPath [ - wayland - libxkbcommon - ] - } - - - mkdir -p $out/share/applications/ - substitute ${writeText "elysia.desktop" '' - [Desktop Entry] - Name=Elysia - Comment=Universal anime game launcher - Exec=@out@/bin/elysia - Icon=elysia - Terminal=false - Type=Application - Categories=Game;Utility; - Keywords=game;launcher;hoyo;genshin;honkai;endfield; - StartupNotify=true - StartupWMClass=elysia - ''} $out/share/applications/elysia.desktop --subst-var out - - - - mkdir -p $out/share/icons/hicolor/512x512/ - cp ${elysia-src}/assets/elysia.png $out/share/icons/hicolor/512x512/elysia.png - ''; -} diff --git a/packages/fluxer/default.nix b/packages/fluxer/default.nix new file mode 100644 index 0000000..f3931d7 --- /dev/null +++ b/packages/fluxer/default.nix @@ -0,0 +1,105 @@ +{ + stdenv, + autoPatchelfHook, + makeWrapper, + glib, + nspr, + nss, + dbus, + at-spi2-atk, + cups, + cairo, + gtk3, + pango, + libX11, + libXcomposite, + libXdamage, + libXext, + libXtst, + libXt, + libXfixes, + libXrandr, + libgbm, + expat, + libxcb, + libxkbcommon, + eudev, + alsa-lib, + lib, + libGL, + writeText, + ... +}: +stdenv.mkDerivation { + pname = "fluxer"; + version = "0.0.8"; + + src = builtins.fetchurl { + url = "https://api.fluxer.app/dl/desktop/stable/linux/x64/fluxer-stable-0.0.8-x64.tar.gz"; + }; + + nativeBuildInputs = [ + autoPatchelfHook + makeWrapper + ]; + + buildInputs = [ + glib + nspr + nss + dbus.lib + at-spi2-atk + cups.lib + cairo + gtk3 + pango + libX11 + libXcomposite + libXdamage + libXext + libXtst + libXt + libXfixes + libXrandr + libgbm + expat + libxcb + libxkbcommon + eudev + alsa-lib + ]; + + installPhase = '' + mkdir -p $out/runtime + mkdir -p $out/bin + + cp -r ./* $out/runtime + ls -la $out/runtime + ln -sf $out/runtime/fluxer $out/bin/fluxer + + wrapProgram $out/bin/fluxer \ + --prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath [ + libGL + ] + } + + mkdir -p $out/share/applications/ + substitute ${writeText "fluxer.desktop" '' + [Desktop Entry] + Name=Fluxer + Comment=OSS messaging platform + Exec=@out@/bin/fluxer + Icon=fluxer + Terminal=false + Type=Application + StartupNotify=true + StartupWMClass=fluxer + ''} $out/share/applications/fluxer.desktop --subst-var out + + + + mkdir -p $out/share/icons/hicolor/512x512/ + cp $out/runtime/resources/512x512.png $out/share/icons/hicolor/512x512/fluxer.png + ''; +}