From 15dd66b9da3a4f88d846cb58ed1af24dcc47028f Mon Sep 17 00:00:00 2001 From: pupbrained Date: Sun, 27 Oct 2024 17:54:13 -0400 Subject: [PATCH] updte --- _sources/generated.nix | 3 +- flake.lock | 136 ++++++------- homes/x86_64-linux/marshall@navis/default.nix | 83 +------- modules/home/vscode/default.nix | 2 +- packages/lightly-boehs-qt6/default.nix | 50 ----- packages/lightly-boehs-qt6/missing.patch | 186 ------------------ systems/x86_64-linux/navis/default.nix | 8 +- 7 files changed, 79 insertions(+), 389 deletions(-) delete mode 100644 packages/lightly-boehs-qt6/default.nix delete mode 100644 packages/lightly-boehs-qt6/missing.patch diff --git a/_sources/generated.nix b/_sources/generated.nix index 7b08927..7ab5cb6 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -1,5 +1,6 @@ # This file was generated by nvfetcher, please do not modify it manually. -{fetchFromGitHub}: { +{ fetchgit, fetchurl, fetchFromGitHub, dockerTools }: +{ bang-bang = { pname = "bang-bang"; version = "ec991b80ba7d4dda7a962167b036efc5c2d79419"; diff --git a/flake.lock b/flake.lock index f791f7a..62f9eef 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ ] }, "locked": { - "lastModified": 1728902391, - "narHash": "sha256-44bnoY0nAvbBQ/lVjmn511yL39Sv7SknV0BDxn34P3Q=", + "lastModified": 1729527199, + "narHash": "sha256-D5/YksfRga8Akd04ZtIkuYSIOjXVrAzQIQBSeplokzU=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "9874e08eec85b5542ca22494e127b0cdce46b786", + "rev": "8d732fa8aff8b12ef2b1e2f00fc8153e41312b72", "type": "github" }, "original": { @@ -72,11 +72,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1728407414, - "narHash": "sha256-B8LaxUP93eh+it8RW1pGq4SsU2kj7f0ipzFuhBvpON8=", + "lastModified": 1730036420, + "narHash": "sha256-rv2bz7J6Wo7AenPiu4+ptCB1AFyaMcS77y89zbRAtI8=", "owner": "catppuccin", "repo": "nix", - "rev": "96cf8b4a05fb23a53c027621b1147b5cf9e5439f", + "rev": "0b7bf04628414a402d255924f65e9a0d1a53d92b", "type": "github" }, "original": { @@ -93,11 +93,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1729348269, - "narHash": "sha256-KCjrPNlEgEVFYs8wHIpd4iBelAV9L9QYsynoMYihIFw=", + "lastModified": 1729599319, + "narHash": "sha256-e/4JPcIRte5zkwqmGFrFo3763e0iHURX6N0apz4jbI0=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "528723447ef037a1c081add43f4fd46440c9c3b1", + "rev": "1b86b304c8eb1437d9337a760e7f930826fc4d6d", "type": "github" }, "original": { @@ -136,11 +136,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1729301799, - "narHash": "sha256-lPDL3PD96VUoksnVHs/57FQOIHkTCRf4X0Q7pkC7k40=", + "lastModified": 1729992957, + "narHash": "sha256-0jULWsdTdHaV6rQe/aY3sqzydswd00IOgjdxkEQEva8=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "a9621874555a327ad7702fc973ccdd6aa7738aa4", + "rev": "5ec4c2f99d7ac9c51b209989492657d426a9fdcc", "type": "github" }, "original": { @@ -178,11 +178,11 @@ ] }, "locked": { - "lastModified": 1728901530, - "narHash": "sha256-I9Qd0LnAsEGHtKE9+uVR0iDFmsijWSy7GT0g3jihG4Q=", + "lastModified": 1729982130, + "narHash": "sha256-HmLLQbX07rYD0RXPxbf3kJtUo66XvEIX9Y+N5QHQ9aY=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "a60ac02f9466f85f092e576fd8364dfc4406b5a6", + "rev": "2eb472230a5400c81d9008014888b4bff23bcf44", "type": "github" }, "original": { @@ -798,11 +798,11 @@ ] }, "locked": { - "lastModified": 1729027341, - "narHash": "sha256-IqWD7bA9iJVifvJlB4vs2KUXVhN+d9lECWdNB4jJ0tE=", + "lastModified": 1729414726, + "narHash": "sha256-Dtmm1OU8Ymiy9hVWn/a2B8DhRYo9Eoyx9veERdOBR4o=", "owner": "nix-community", "repo": "home-manager", - "rev": "2a4fd1cfd8ed5648583dadef86966a8231024221", + "rev": "fe56302339bb28e3471632379d733547caec8103", "type": "github" }, "original": { @@ -818,11 +818,11 @@ ] }, "locked": { - "lastModified": 1729321331, - "narHash": "sha256-KVyQq+ez/oB30/WbdNgVD8g/bda34z8NiU187QKQb74=", + "lastModified": 1730016908, + "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=", "owner": "nix-community", "repo": "home-manager", - "rev": "122f70545b29ccb922e655b08acfe05bfb44ec68", + "rev": "e83414058edd339148dc142a8437edb9450574c8", "type": "github" }, "original": { @@ -896,11 +896,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1729378105, - "narHash": "sha256-pcrrLHaHXct4I985PZhNZVYLghwZvQnnjGNToL56DFY=", + "lastModified": 1730054738, + "narHash": "sha256-6ep48rTU19hX84dF3MxJJZ4g+Xh8MswTcZYFf12t7Mg=", "ref": "refs/heads/main", - "rev": "08cc063e175e48cea44d26b7e3762f4b8611f0c5", - "revCount": 5362, + "rev": "5d4b54b01286c10d4b6bf402a772b5938b054ce6", + "revCount": 5383, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -928,11 +928,11 @@ ] }, "locked": { - "lastModified": 1728383680, - "narHash": "sha256-/SeOrMuPEOjngI+MBlzqxQ/sJxkJFIYoef+wJ/PmX2w=", + "lastModified": 1729596320, + "narHash": "sha256-sBPr6O2Ad916f+L7biAjmJVx4TLDITC4joKgeOT47V8=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "d05eb1ffba2ebffb5b4e1b407f134a4dcb411a88", + "rev": "4d7f0b5d8b952f31f7d2e29af22ab0a55ca5c219", "type": "github" }, "original": { @@ -1069,11 +1069,11 @@ ] }, "locked": { - "lastModified": 1728974938, - "narHash": "sha256-pTPEx6WlM+nJVGrRUGx7Di4ljZMwE9HfvlZ6f3NzNfo=", + "lastModified": 1729177642, + "narHash": "sha256-DdKal+ZhB9QD/tnEwFg4cZ4j4YnrkvSljBxnyG+3eE0=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "23170582b0658e6afd913149a58863af3a57b376", + "rev": "bb69165ff372ddbd3228a03513922acd783040e8", "type": "github" }, "original": { @@ -1169,11 +1169,11 @@ ] }, "locked": { - "lastModified": 1728790083, - "narHash": "sha256-grMdAd4KSU6uPqsfLzA1B/3pb9GtGI9o8qb0qFzEU/Y=", + "lastModified": 1729999765, + "narHash": "sha256-LYsavZXitFjjyETZoij8usXjTa7fa9AIF3Sk3MJSX+Y=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "5c54c33aa04df5dd4b0984b7eb861d1981009b22", + "rev": "0e3a8778c2ee218eff8de6aacf3d2fa6c33b2d4f", "type": "github" }, "original": { @@ -1254,11 +1254,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1729181673, - "narHash": "sha256-LDiPhQ3l+fBjRATNtnuDZsBS7hqoBtPkKBkhpoBHv3I=", + "lastModified": 1729691686, + "narHash": "sha256-BAuPWW+9fa1moZTU+jFh+1cUtmsuF8asgzFwejM4wac=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4eb33fe664af7b41a4c446f87d20c9a0a6321fa3", + "rev": "32e940c7c420600ef0d1ef396dc63b04ee9cad37", "type": "github" }, "original": { @@ -1380,8 +1380,8 @@ "nixpkgs_15": { "locked": { "lastModified": 0, - "narHash": "sha256-KOTTUfPkugH52avUvXGxvWy8ibKKj4genodIYUED+Kc=", - "path": "/nix/store/w7nfn4lcfisddz14b0y8n05rjf0dl5lq-source", + "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", + "path": "/nix/store/wb6agba4kfsxpbnb5hzlq58vkjzvbsk6-source", "type": "path" }, "original": { @@ -1406,8 +1406,8 @@ "nixpkgs_17": { "locked": { "lastModified": 0, - "narHash": "sha256-KOTTUfPkugH52avUvXGxvWy8ibKKj4genodIYUED+Kc=", - "path": "/nix/store/w7nfn4lcfisddz14b0y8n05rjf0dl5lq-source", + "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", + "path": "/nix/store/wb6agba4kfsxpbnb5hzlq58vkjzvbsk6-source", "type": "path" }, "original": { @@ -1433,11 +1433,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1729256560, - "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", + "lastModified": 1729413321, + "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", + "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26", "type": "github" }, "original": { @@ -1497,11 +1497,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1728888510, - "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", + "lastModified": 1729413321, + "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", + "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26", "type": "github" }, "original": { @@ -1529,11 +1529,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1729256560, - "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", + "lastModified": 1729880355, + "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", + "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", "type": "github" }, "original": { @@ -1641,11 +1641,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1728778939, - "narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=", + "lastModified": 1729104314, + "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "ff68f91754be6f3427e4986d7949e6273659be1d", + "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", "type": "github" }, "original": { @@ -1719,11 +1719,11 @@ ] }, "locked": { - "lastModified": 1729218602, - "narHash": "sha256-KDmYxpkFWa0Go0WnOpkgQOypVaQxbwgpEutET5ey1VQ=", + "lastModified": 1729909612, + "narHash": "sha256-eXqxxbOagphPfjPptSlv0pQONB3fH15CQ4G8uCu1BW4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "9051466c82b9b3a6ba9e06be99621ad25423ec94", + "rev": "17cadbc36da05e75197d082decb382a5f4208e30", "type": "github" }, "original": { @@ -2029,11 +2029,11 @@ "nixpkgs": "nixpkgs_13" }, "locked": { - "lastModified": 1729242555, - "narHash": "sha256-6jWSWxv2crIXmYSEb3LEVsFkCkyVHNllk61X4uhqfCs=", + "lastModified": 1730025913, + "narHash": "sha256-Y9NtFmP8ciLyRsopcCx1tyoaaStKeq+EndwtGCgww7I=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "d986489c1c757f6921a48c1439f19bfb9b8ecab5", + "rev": "bae131e525cc8718da22fbeb8d8c7c43c4ea502a", "type": "github" }, "original": { @@ -2044,11 +2044,11 @@ }, "unstable": { "locked": { - "lastModified": 1729256560, - "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", + "lastModified": 1729880355, + "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", + "rev": "18536bf04cd71abd345f9579158841376fdd0c5a", "type": "github" }, "original": { @@ -2128,11 +2128,11 @@ "xmonad": "xmonad" }, "locked": { - "lastModified": 1728324446, - "narHash": "sha256-Q8YdaORLH0re1+FD/5xk4YXultXZ/8JkTgIcDt2vr7o=", + "lastModified": 1729508337, + "narHash": "sha256-63EwF+O5y/MQm7cBihGpvhl2w7nYUSV9MhpfqooN5UA=", "owner": "xmonad", "repo": "xmonad-contrib", - "rev": "1c5261d65a56d72bfb49d778f7b1e3482881d368", + "rev": "c5032a43fbb95592d6aac4f906878a9abd744cf0", "type": "github" }, "original": { @@ -2146,11 +2146,11 @@ "nixpkgs": "nixpkgs_18" }, "locked": { - "lastModified": 1729041431, - "narHash": "sha256-X/z68x0FsBmmb8usu+X+ViLw5M6mdVDDB2JLCXiPpG4=", + "lastModified": 1729387354, + "narHash": "sha256-8XBETtCoMPBWu5JGxR45a1JVKsSICYKZ7nNAk/l1bF0=", "owner": "fufexan", "repo": "zen-browser-flake", - "rev": "b46602e979662038f938765e13dbe409fe461831", + "rev": "94fa2a852b261fe733bd3d1d70f452625370761b", "type": "github" }, "original": { diff --git a/homes/x86_64-linux/marshall@navis/default.nix b/homes/x86_64-linux/marshall@navis/default.nix index ab07bde..ca13052 100644 --- a/homes/x86_64-linux/marshall@navis/default.nix +++ b/homes/x86_64-linux/marshall@navis/default.nix @@ -4,82 +4,7 @@ inputs, ... }: let - equibop = with pkgs; (vesktop.overrideAttrs (final: prev: rec { - pname = "Equibop"; - version = "2.0.9"; - - src = fetchFromGitHub { - owner = "Equicord"; - repo = "equibop"; - rev = "v${version}"; - hash = "sha256-imRqr6Gd29t/zFcH73JRJIMozEhig1lHXLyefgB74yM="; - }; - - pnpmDeps = pnpm_9.fetchDeps { - inherit - (final) - pname - version - src - ; - inherit (prev) patches; - hash = "sha256-YaZA1Oz9lJcEm9Ihx37Iooc7l6Zsy65kYAK2KWffh/c="; - }; - - installPhase = - '' - runHook preInstall - '' - + lib.optionalString stdenv.hostPlatform.isLinux '' - mkdir -p $out/opt/Equibop - cp -r dist/*unpacked/resources $out/opt/Equibop/ - - for file in build/icon_*x32.png; do - file_suffix=''${file//build\/icon_} - install -Dm0644 $file $out/share/icons/hicolor/''${file_suffix//x32.png}/apps/equibop.png - done - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - mkdir -p $out/{Applications,bin} - mv dist/mac*/Equibop.App $out/Applications - '' - + '' - runHook postInstall - ''; - - postFixup = - lib.optionalString stdenv.hostPlatform.isLinux '' - makeWrapper ${electron}/bin/electron $out/bin/equibop \ - --add-flags $out/opt/Equibop/resources/app.asar \ - --add-flags \"--enable-speech-dispatcher\" \ - --add-flags \"--enable-blink-features=MiddleClickAutoscroll\" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - makeWrapper $out/Applications/equicord.app/Contents/MacOS/Equibop $out/bin/equibop - ''; - - desktopItems = lib.optional stdenv.hostPlatform.isLinux (makeDesktopItem { - name = "equibop"; - desktopName = "Equibop"; - exec = "equibop %U"; - icon = "equibop"; - startupWMClass = "Equibop"; - genericName = "Internet Messenger"; - keywords = [ - "discord" - "vencord" - "electron" - "chat" - "equicord" - ]; - categories = [ - "Network" - "InstantMessaging" - "Chat" - ]; - }); - })); + sources = import ../../../_sources/generated.nix {inherit (pkgs) fetchFromGitHub;}; in { imports = with inputs; [ catppuccin.homeManagerModules.catppuccin @@ -106,7 +31,10 @@ in { beeper duf eternal-terminal - emacs30-pgtk + ((pkgs.emacsPackagesFor pkgs.emacs30-pgtk).emacsWithPackages (epkgs: + builtins.attrValues { + inherit (epkgs.treesit-grammars) with-all-grammars; + })) emacs-lsp-booster equibop glow @@ -157,6 +85,7 @@ in { ++ (with jetbrains; [ clion rust-rover + phpstorm webstorm idea-ultimate ]) diff --git a/modules/home/vscode/default.nix b/modules/home/vscode/default.nix index a546c6a..b28a554 100644 --- a/modules/home/vscode/default.nix +++ b/modules/home/vscode/default.nix @@ -21,7 +21,7 @@ userSettings = { "files.autoSave" = "afterDelay"; - "editor.fontFamily" = "Iosevka Comfy"; + "editor.fontFamily" = "Iosevka Comfy Motion"; "editor.fontLigatures" = true; "editor.fontSize" = if pkgs.hostPlatform.isDarwin diff --git a/packages/lightly-boehs-qt6/default.nix b/packages/lightly-boehs-qt6/default.nix deleted file mode 100644 index 21a8beb..0000000 --- a/packages/lightly-boehs-qt6/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ - lib, - stdenv, - pkgs, - ... -}: -with pkgs; - stdenv.mkDerivation { - pname = "lightly-boehs-qt6"; - version = "v0.4.2"; - - src = fetchFromGitHub { - owner = "boehs"; - repo = "Lightly"; - rev = "00ca23447844114d41bfc0d37cf8823202c082e8"; - sha256 = "sha256-NpgOcN9sDqgQMjqcfx92bfKohxaJpnwMgxb9MCu9uJM="; - }; - - buildInputs = with kdePackages; [ - kcmutils - kconfig - kdecoration - kirigami - kguiaddons - kcolorscheme - kcoreaddons - ki18n - kiconthemes - kwindowsystem - ]; - - extraCmakeFlags = ["-DBUILD_TESTING=OFF"]; - - nativeBuildInputs = [ - cmake - kdePackages.qttools - kdePackages.extra-cmake-modules - kdePackages.wrapQtAppsHook - ]; - patches = [./missing.patch]; - - meta = with lib; { - description = "A fork of the Lightly breeze theme style that aims to be visually modern and minimalistic"; - mainProgram = "lightly-settings"; - homepage = "https://github.com/boehs/Lightly"; - license = licenses.gpl2Plus; - maintainers = [maintainers.hikari]; - platforms = platforms.all; - }; - } diff --git a/packages/lightly-boehs-qt6/missing.patch b/packages/lightly-boehs-qt6/missing.patch deleted file mode 100644 index fc73038..0000000 --- a/packages/lightly-boehs-qt6/missing.patch +++ /dev/null @@ -1,186 +0,0 @@ -diff --git a/kdecoration/config/CMakeLists.txt b/kdecoration/config/CMakeLists.txt -new file mode 100644 -index 00000000..e4b08f0a ---- /dev/null -+++ b/kdecoration/config/CMakeLists.txt -@@ -0,0 +1,37 @@ -+##### config classes ææææææ -+ -+set(lightlydecoration_config_SRCS -+ ../lightlyexceptionlist.cpp -+ lightlyconfigwidget.cpp -+ lightlydetectwidget.cpp -+ lightlyexceptiondialog.cpp -+ lightlyexceptionlistwidget.cpp -+ lightlyexceptionmodel.cpp -+ lightlyitemmodel.cpp -+) -+ki18n_wrap_ui(lightlydecoration_config_SRCS -+ ui/lightlyconfigurationui.ui -+ ui/lightlydetectwidget.ui -+ ui/lightlyexceptiondialog.ui -+ ui/lightlyexceptionlistwidget.ui -+) -+ -+kcoreaddons_add_plugin(kcm_lightlydecoration SOURCES kcm_lightlydecoration.cpp ${lightlydecoration_config_SRCS} INSTALL_NAMESPACE "${KDECORATION_KCM_PLUGIN_DIR}") -+kconfig_add_kcfg_files(kcm_lightlydecoration ../lightlysettings.kcfgc) -+target_include_directories(kcm_lightlydecoration PRIVATE ${CMAKE_SOURCE_DIR}/kdecoration ${CMAKE_BINARY_DIR}/kdecoration/) -+target_link_libraries(kcm_lightlydecoration -+ PUBLIC -+ Qt6::Core -+ Qt6::Gui -+ Qt6::DBus -+ KDecoration2::KDecoration -+ PRIVATE -+ KF6::CoreAddons -+ KF6::ConfigWidgets -+ KF6::GuiAddons -+ KF6::I18n -+ KF6::IconThemes -+ KF6::WindowSystem -+ KF6::KCMUtils -+) -+kcmutils_generate_desktop_file(kcm_lightlydecoration) -diff --git a/kdecoration/config/kcm_lightlydecoration.cpp b/kdecoration/config/kcm_lightlydecoration.cpp -new file mode 100644 -index 00000000..de9ac802 ---- /dev/null -+++ b/kdecoration/config/kcm_lightlydecoration.cpp -@@ -0,0 +1,6 @@ -+#include "lightlyconfigwidget.h" -+#include -+ -+K_PLUGIN_CLASS_WITH_JSON(Lightly::ConfigWidget, "kcm_lightlydecoration.json") -+ -+#include "kcm_lightlydecoration.moc" -diff --git a/kdecoration/config/kcm_lightlydecoration.json b/kdecoration/config/kcm_lightlydecoration.json -new file mode 100644 -index 00000000..d2013276 ---- /dev/null -+++ b/kdecoration/config/kcm_lightlydecoration.json -@@ -0,0 +1,60 @@ -+{ -+ "KPlugin": { -+ "Description": "Modify the appearance of window decorations", -+ "Description[ar]": "عدّل مظهر زخرفات النّوافذ", -+ "Description[az]": "Pəncərə tərtibatının görünüşünü dəyişdirin", -+ "Description[bg]": "Настройване на външния изглед на прозорците", -+ "Description[ca@valencia]": "Modifica l'aparença de les decoracions de les finestres", -+ "Description[ca]": "Modifica l'aparença de les decoracions de les finestres", -+ "Description[cs]": "Změnit vzhled dekorace oken", -+ "Description[da]": "Ændr vinduesdekorationers udseende", -+ "Description[de]": "Das Erscheinungsbild der Fensterdekoration ändern", -+ "Description[el]": "Τροποποίηση εμφάνισης της διακόσμησης παραθύρου", -+ "Description[en_GB]": "Modify the appearance of window decorations", -+ "Description[es]": "Modificar el aspecto de las decoraciones de las ventanas", -+ "Description[et]": "Akna dekoratsioonide välimuse muutmine", -+ "Description[eu]": "Aldatu leiho apainduren itxura", -+ "Description[fi]": "Muuta ikkunoiden kehysten ulkoasua", -+ "Description[fr]": "Modifier l'apparence des décorations des fenêtres", -+ "Description[gl]": "Modifica a aparencia da decoración da xanela", -+ "Description[he]": "התאם את מראה מסגרות החלונות", -+ "Description[hi]": "विंडो सजावटों की दिखावट को परिवर्तित करें", -+ "Description[hu]": "Az ablakdekorációk megjelenésének módosítása", -+ "Description[ia]": "Modifica le apparentia de decorationes de fenestra", -+ "Description[id]": "Memodifikasi penampilan dekorasi window", -+ "Description[it]": "Modifica l'aspetto delle decorazioni delle finestre", -+ "Description[ja]": "ウィンドウ装飾の外観を編集", -+ "Description[ko]": "창 장식의 모습을 수정합니다", -+ "Description[lt]": "Keisti lango dekoracijų išvaizdą", -+ "Description[nb]": "Endre utseende for vindusdekorasjoner", -+ "Description[nl]": "Wijzig het uiterlijk van vensterdecoraties", -+ "Description[nn]": "Endra utsjånad på vindaugspynt", -+ "Description[pa]": "ਵਿੰਡੋ ਸਜਾਵਟ ਦੀ ਦਿੱਖ ਨੂੰ ਸੋਧੋ", -+ "Description[pl]": "Zmień wygląd i wystrój okien", -+ "Description[pt]": "Modificar a aparência das decorações das janelas", -+ "Description[pt_BR]": "Modifica a aparência das decorações da janela", -+ "Description[ro]": "Modifică aspectul decorațiilor pentru ferestre", -+ "Description[ru]": "Настройка заголовков окон в стиле Breeze", -+ "Description[sk]": "Zmena vzhľadu dekorácie okien", -+ "Description[sl]": "Spremenite videz okrasitve oken", -+ "Description[sr@ijekavian]": "Измијените изглед декорација прозора", -+ "Description[sr@ijekavianlatin]": "Izmijenite izgled dekoracija prozora", -+ "Description[sr@latin]": "Izmenite izgled dekoracija prozora", -+ "Description[sr]": "Измените изглед декорација прозора", -+ "Description[sv]": "Ändra utseendet hos fönsterdekorationer", -+ "Description[tg]": "Тағйир додани ороиши намуди зоҳирии равзанаҳо", -+ "Description[tr]": "Pencere dekorasyonlarının görünümünü değiştir", -+ "Description[uk]": "Зміна вигляду декорацій вікон", -+ "Description[x-test]": "xxModify the appearance of window decorationsxx", -+ "Description[zh_CN]": "修改窗口装饰外观", -+ "Description[zh_TW]": "變更視窗裝飾外觀", -+ "Icon": "preferences-system-windows", -+ "Name": "Lightly: Window Decoration", -+ "ServiceTypes": [ -+ "KCModule" -+ ] -+ }, -+ "X-KDE-Keywords": "Lightly,decoration", -+ "X-KDE-ParentApp": "kcontrol", -+ "X-KDE-Weight": 50 -+} -diff --git a/kstyle/config/lightlystyleconfig.json b/kstyle/config/lightlystyleconfig.json -new file mode 100644 -index 00000000..f4f58aeb ---- /dev/null -+++ b/kstyle/config/lightlystyleconfig.json -@@ -0,0 +1,59 @@ -+{ -+ "KPlugin": { -+ "Description": "Modify the appearance of widgets", -+ "Description[ar]": "عدّل مظهر الودجات", -+ "Description[az]": "Vidjetin görünüşünü dəyişin", -+ "Description[bg]": "Настройване на външния изглед на приставките", -+ "Description[ca@valencia]": "Modifica l'aparença dels ginys", -+ "Description[ca]": "Modifica l'aparença dels ginys", -+ "Description[cs]": "Změnit vzhled widgetů", -+ "Description[da]": "Ændr kontrollers udseende", -+ "Description[de]": "Das Erscheinungsbild der Bedienelemente ändern", -+ "Description[el]": "Τροποποίηση εμφάνισης συστατικών", -+ "Description[en_GB]": "Modify the appearance of widgets", -+ "Description[es]": "Modificar el aspecto de los elementos gráficos", -+ "Description[et]": "Vidinate välimuse muutmine", -+ "Description[eu]": "Aldatu trepeten itxura", -+ "Description[fi]": "Muuta elementtien ulkoasua", -+ "Description[fr]": "Modifier l'apparence des composants graphiques", -+ "Description[gl]": "Modifica a aparencia dos trebellos", -+ "Description[he]": "התאם את המראה של היישומונים", -+ "Description[hi]": "विजेट की दिखावट को परिवर्तित करें", -+ "Description[hu]": "Az elemek megjelenésének módosítása", -+ "Description[ia]": "Modifica le apparentia de widgets", -+ "Description[id]": "Memodifikasi penampilan widget", -+ "Description[it]": "Modifica l'aspetto degli oggetti", -+ "Description[ja]": "ウィジェットの外観を編集", -+ "Description[ko]": "위젯의 모습을 수정합니다", -+ "Description[lt]": "Keisti valdiklių išvaizdą", -+ "Description[nb]": "Endre utseende for skjermelementer", -+ "Description[nl]": "Wijzig het uiterlijk van widgets", -+ "Description[nn]": "Endra utsjånaden på skjermkontrollar", -+ "Description[pl]": "Zmień wygląd interfejsu", -+ "Description[pt]": "Modificar a aparência dos elementos gráficos", -+ "Description[pt_BR]": "Modifica a aparência dos widgets", -+ "Description[ro]": "Modifică aspectul controalelor", -+ "Description[ru]": "Настройка элементов интерфейса в стиле Breeze", -+ "Description[sk]": "Zmena vzhľadu miniaplikácií", -+ "Description[sl]": "Spremenite videz gradnikov", -+ "Description[sr@ijekavian]": "Измијените изглед виџета̂", -+ "Description[sr@ijekavianlatin]": "Izmijenite izgled vidžetâ̂", -+ "Description[sr@latin]": "Izmenite izgled vidžetâ̂", -+ "Description[sr]": "Измените изглед виџета̂", -+ "Description[sv]": "Ändra utseende hos grafiska komponenter", -+ "Description[tg]": "Тағйир додани намуди зоҳирии виҷетҳо", -+ "Description[tr]": "Araç takımlarının görünümünü değiştir", -+ "Description[uk]": "Зміна вигляду віджетів", -+ "Description[x-test]": "xxModify the appearance of widgetsxx", -+ "Description[zh_CN]": "调整窗口部件外观", -+ "Description[zh_TW]": "變更元件外觀", -+ "Icon": "preferences-desktop-theme", -+ "Name": "Lightly: Widget Style", -+ "ServiceTypes": [ -+ "KCModule" -+ ] -+ }, -+ "X-KDE-Keywords": "lightly,widget,style", -+ "X-KDE-ParentApp": "kcontrol", -+ "X-KDE-Weight": 60 -+} diff --git a/systems/x86_64-linux/navis/default.nix b/systems/x86_64-linux/navis/default.nix index bfe2d68..2f8b050 100644 --- a/systems/x86_64-linux/navis/default.nix +++ b/systems/x86_64-linux/navis/default.nix @@ -125,8 +125,8 @@ systemPackages = with pkgs; [ inputs.agenix.packages.${system}.default + ddccontrol-db nautilus - internal.lightly-boehs-qt6 looking-glass-client snowfallorg.flake sound-theme-freedesktop @@ -431,6 +431,7 @@ services = { btrfs.autoScrub.enable = true; + ddccontrol.enable = true; flatpak.enable = true; getty.autologinUser = "marshall"; gnome.gnome-keyring.enable = true; @@ -438,11 +439,6 @@ spice-vdagentd.enable = true; udisks2.enable = true; - emacs = { - enable = true; - package = inputs.emacs.packages.${pkgs.system}.default; - }; - displayManager.cosmic-greeter.enable = true; desktopManager.cosmic.enable = true;