From 7e965fe19510caef0d00f0205dc84fb686c16a3d Mon Sep 17 00:00:00 2001 From: elwrcl Date: Sun, 4 Oct 2026 22:31:17 +0300 Subject: [PATCH] sometnh --- hosts/copland.ulu.nix | 1 + modules/home/home-valw.ulu.nix | 3 -- modules/home/niri/desktop-niri-execs.ulu.nix | 8 +++- modules/nixos/common/common-packages.ulu.nix | 11 ++---- .../desktop/desktop-display-theme.ulu.nix | 38 +++++++++++++++++++ modules/nixos/desktop/desktop-display.ulu.nix | 7 ---- 6 files changed, 49 insertions(+), 19 deletions(-) create mode 100644 modules/nixos/desktop/desktop-display-theme.ulu.nix diff --git a/hosts/copland.ulu.nix b/hosts/copland.ulu.nix index a3b6bd2..d0995e2 100644 --- a/hosts/copland.ulu.nix +++ b/hosts/copland.ulu.nix @@ -137,6 +137,7 @@ in config.flake.nixosModules.common-fonts config.flake.nixosModules.common-kmscon config.flake.nixosModules.desktop-display + config.flake.nixosModules.desktop-display-theme config.flake.nixosModules.desktop-audio config.flake.nixosModules.desktop-niri config.flake.nixosModules.desktop-xdg-mime diff --git a/modules/home/home-valw.ulu.nix b/modules/home/home-valw.ulu.nix index 87cedae..dee4360 100644 --- a/modules/home/home-valw.ulu.nix +++ b/modules/home/home-valw.ulu.nix @@ -7,13 +7,10 @@ programs.valw = { enable = true; - # Checked by valw itself when the configuration is built. settings = { capture.window_shadow = true; - # Noctalia's annotator, in the shell's theme (saves a new file). editor.backend = "noctalia"; }; - # A bar button, the toolbar as a Noctalia panel, a control-center tile. noctalia.enable = true; }; }; diff --git a/modules/home/niri/desktop-niri-execs.ulu.nix b/modules/home/niri/desktop-niri-execs.ulu.nix index 079ff3f..afe97fa 100644 --- a/modules/home/niri/desktop-niri-execs.ulu.nix +++ b/modules/home/niri/desktop-niri-execs.ulu.nix @@ -7,8 +7,12 @@ "prefer-no-csd" = true; spawn-at-startup = [ { command = [ "noctalia" ]; } - # valw's paint shader behind the overview (see the layer rule). - { command = [ "valw" "backdrop" ]; } + { + command = [ + "valw" + "backdrop" + ]; + } ]; }; }; diff --git a/modules/nixos/common/common-packages.ulu.nix b/modules/nixos/common/common-packages.ulu.nix index 254cda5..97f8237 100644 --- a/modules/nixos/common/common-packages.ulu.nix +++ b/modules/nixos/common/common-packages.ulu.nix @@ -16,20 +16,19 @@ environment.systemPackages = with pkgs; [ # apps onlyoffice-desktopeditors + kdePackages.kdenlive whatsapp-electron telegram-desktop - element-desktop prismlauncher + gparted-full moonlight-qt - qbittorrent obs-studio + spotifast localsend picotool sunshine - spotify - heroic + zapzap loupe - equibop gimp wine @@ -72,8 +71,6 @@ # agents github-copilot-cli - claude-mergetool - claude-monitor claude-code # cli diff --git a/modules/nixos/desktop/desktop-display-theme.ulu.nix b/modules/nixos/desktop/desktop-display-theme.ulu.nix new file mode 100644 index 0000000..e8d2d5b --- /dev/null +++ b/modules/nixos/desktop/desktop-display-theme.ulu.nix @@ -0,0 +1,38 @@ +{ ... }: +{ + flake.nixosModules.desktop-display-theme = + { config, ... }: + let + p = config.home-manager.users.elars.elars.theme.palette; + in + { + console.colors = [ + p.base00 + p.base08 + p.base0B + p.base0A + p.base0D + p.base0E + p.base0C + p.base05 + p.base03 + p.base08 + p.base0B + p.base09 + p.base0D + p.base0E + p.base0C + p.base07 + ]; + services.displayManager.ly.settings = { + full_color = false; + fg = "0x00000008"; # base05 + bg = "0x00000000"; # slot 0, base00 + border_fg = "0x01000001"; # base03 + error_fg = "0x01000002"; # base08 + colormix_col1 = "0x00000008"; # base05 + colormix_col2 = "0x00000004"; # base0A + colormix_col3 = "0x00000001"; # base00 + }; + }; +} diff --git a/modules/nixos/desktop/desktop-display.ulu.nix b/modules/nixos/desktop/desktop-display.ulu.nix index 3374f8a..8930a5b 100644 --- a/modules/nixos/desktop/desktop-display.ulu.nix +++ b/modules/nixos/desktop/desktop-display.ulu.nix @@ -8,15 +8,8 @@ enable = true; settings = { animation = "colormix"; - colormix_col1 = "0x00FFFFFF"; - colormix_col2 = "0x00808080"; - colormix_col3 = "0x00080808"; bigclock = "en"; bigclock_12hr = false; - fg = "0x00FFFFFF"; - bg = "0x00000000"; - border_fg = "0x00FFFFFF"; - error_fg = "0x01FF0000"; blank_box = true; hide_borders = false; margin_box_h = 2;