diff options
| -rw-r--r-- | home/default.nix | 2 | ||||
| -rw-r--r-- | options.nix | 2 | ||||
| -rw-r--r-- | pkgs/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/ly/default.nix | 28 | ||||
| -rw-r--r-- | pkgs/ly/deps.nix | 37 | ||||
| -rw-r--r-- | system/desktops/ly.nix | 21 |
6 files changed, 13 insertions, 78 deletions
diff --git a/home/default.nix b/home/default.nix index 0f5a1ac..da7ca3b 100644 --- a/home/default.nix +++ b/home/default.nix @@ -43,8 +43,6 @@ in { ++ (with pkgs; optionals config.desktops.enable [ # social - discord - element-desktop gajim thunderbird-latest # programs diff --git a/options.nix b/options.nix index 57e48db..7995623 100644 --- a/options.nix +++ b/options.nix @@ -514,8 +514,6 @@ in { default = optionals config.desktops.enable [ "wl-clip-persist -c both" "thunderbird" - "discord" - "element-desktop" ]; }; diff --git a/pkgs/default.nix b/pkgs/default.nix index b447dd7..1069328 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -16,5 +16,4 @@ in { inherit inputs options; }; libfprint-2-tod1-vfs0090 = pkgs.callPackage ./libfprint-2-tod1-vfs0090 {}; - ly = pkgs.callPackage ./ly {}; } diff --git a/pkgs/ly/default.nix b/pkgs/ly/default.nix deleted file mode 100644 index f05a6ab..0000000 --- a/pkgs/ly/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - ly, - callPackage, - fetchFromGitea, - makeBinaryWrapper, - zig_0_14, - ... -}: -ly.overrideAttrs { - version = "1.2.0"; - - src = fetchFromGitea { - domain = "codeberg.org"; - owner = "AnErrupTion"; - repo = "ly"; - rev = "d7a4535007bb98e78a21ccf4f57dfbbe3a145e9d"; - hash = "sha256-4jrtcj+6ZlHiBH/AEYmCZ2GyejEXrR/O8gAqt+jXjCQ="; - }; - - nativeBuildInputs = [ - makeBinaryWrapper - zig_0_14.hook - ]; - - postPatch = '' - ln -s ${callPackage ./deps.nix {}} $ZIG_GLOBAL_CACHE_DIR/p - ''; -} diff --git a/pkgs/ly/deps.nix b/pkgs/ly/deps.nix deleted file mode 100644 index a4b2029..0000000 --- a/pkgs/ly/deps.nix +++ /dev/null @@ -1,37 +0,0 @@ -# generated by zon2nix (https://github.com/nix-community/zon2nix) -{ - linkFarm, - fetchzip, - fetchgit, -}: -linkFarm "zig-packages" [ - { - name = "N-V-__8AAB9qAACwl56piR-krrhXSPxCvEskA52cmaTWXYk_"; - path = fetchzip { - url = "https://github.com/ziglibs/ini/archive/e18d36665905c1e7ba0c1ce3e8780076b33e3002.tar.gz"; - hash = "sha256-PmhXsK+mTmOrRC4u8cs9ol2XwKZv0HVRXpntaR5CJiw="; - }; - } - { - name = "N-V-__8AAMruBACJ7xT-O64hnS7lNeTiZQMketHdkHKrR1A8"; - path = fetchgit { - url = "https://github.com/AnErrupTion/termbox2"; - rev = "e975d250ee6567773400e9d5b0b5c2f175349c57"; - hash = "sha256-V1RangzmT2U0jtnOQPOXZ3s9imaCDTqS4egC69YKpTs="; - }; - } - { - name = "clap-0.10.0-oBajB434AQBDh-Ei3YtoKIRxZacVPF1iSwp3IX_ZB8f0"; - path = fetchzip { - url = "https://github.com/Hejsil/zig-clap/archive/refs/tags/0.10.0.tar.gz"; - hash = "sha256-leXnA97ITdvmBhD2YESLBZAKjBg+G4R/+PPPRslz/ec="; - }; - } - { - name = "zigini-0.3.1-BSkB7XJGAAB2E-sKyzhTaQCBlYBL8yqzE4E_jmSY99sC"; - path = fetchzip { - url = "https://github.com/Kawaii-Ash/zigini/archive/2ed3d417f17fab5b0ee8cad8a63c6d62d7ac1042.tar.gz"; - hash = "sha256-7UTzOauaAx7TjHotj8LrB/vAh/mwSLa2Uwsb9Ku/9rg="; - }; - } -] diff --git a/system/desktops/ly.nix b/system/desktops/ly.nix index 3ff2c1d..49469b2 100644 --- a/system/desktops/ly.nix +++ b/system/desktops/ly.nix @@ -13,17 +13,14 @@ in { # display manager services.displayManager.ly = { enable = true; - package = inputs.self.packages.${system}.ly; settings = let base = "0x00${config.theme.colors.base}"; text = "0x00${config.theme.colors.text}"; bold = "0x01${config.theme.colors.text}"; error = "0x00${config.theme.colors.error}"; - save_file = pkgs.writeText "ly-prefs" '' - ${config.user} - 1 - ''; + red = "0x00${config.theme.colors.normal.red}"; + blue = "0x00${config.theme.colors.normal.blue}"; in { # general clear_password = true; @@ -34,9 +31,6 @@ in { session_log = "/dev/null"; # state (evil) tty = 1; - save = false; - load = true; - save_file = toString save_file; # background bg = base; error_bg = base; @@ -45,6 +39,11 @@ in { fg = text; error_fg = error; border_fg = bold; + # animation + animation = "colormix"; + colormix_col1 = blue; + colormix_col2 = red; + colormix_col3 = "0x20000000"; }; }; @@ -56,5 +55,11 @@ in { systemd.services.display-manager = { environment.XDG_CURRENT_DESKTOP = "X-NIXOS-SYSTEMD-AWARE"; }; + + # write save file + environment.etc."ly/save.txt".text = '' + 0 + ${config.user}:1 + ''; }; } |