From 7f620d0c54636f8731ac41985a14041b92597087 Mon Sep 17 00:00:00 2001 From: unexplrd Date: Tue, 15 Apr 2025 12:40:44 +0300 Subject: [PATCH] hosts/legion/: use workstation modules stylix: add sulphurpool theme Signed-off-by: unexplrd --- hosts/legion/configuration.nix | 4 +- hosts/legion/users/user/common.nix | 14 --- hosts/legion/users/user/flatpak.nix | 117 ------------------ .../legion/users/user/home-configuration.nix | 6 +- hosts/legion/users/user/programs.nix | 88 ------------- modules/nixos/system/misc/stylix/default.nix | 26 ++++ 6 files changed, 31 insertions(+), 224 deletions(-) delete mode 100644 hosts/legion/users/user/common.nix delete mode 100644 hosts/legion/users/user/flatpak.nix delete mode 100644 hosts/legion/users/user/programs.nix diff --git a/hosts/legion/configuration.nix b/hosts/legion/configuration.nix index f68dd2d..545d2c1 100644 --- a/hosts/legion/configuration.nix +++ b/hosts/legion/configuration.nix @@ -2,12 +2,12 @@ imports = with inputs; [ self.nixosModules.desktop self.nixosModules.system + ../dunamis/programs.nix ./boot.nix ./disko.nix ./hardware.nix ./networking.nix ./nix.nix - ./programs.nix ./services.nix ./sops.nix ./users.nix @@ -18,7 +18,7 @@ locale.ukrainian.enable = true; module.stylix = { enable = true; - theme = "nord"; + theme = "sulphurpool"; }; opentabletdriver.enable = false; qmk-vial.enable = true; diff --git a/hosts/legion/users/user/common.nix b/hosts/legion/users/user/common.nix deleted file mode 100644 index 71c96e3..0000000 --- a/hosts/legion/users/user/common.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - inputs, - osConfig, - ... -}: { - imports = with inputs; [ - nix-index-database.hmModules.nix-index - self.homeModules.desktop - self.homeModules.programs - ]; - inherit (osConfig) desktop; - home.stateVersion = osConfig.system.stateVersion; - home.sessionPath = ["$HOME/.local/bin"]; -} diff --git a/hosts/legion/users/user/flatpak.nix b/hosts/legion/users/user/flatpak.nix deleted file mode 100644 index c683c8f..0000000 --- a/hosts/legion/users/user/flatpak.nix +++ /dev/null @@ -1,117 +0,0 @@ -{inputs, ...}: { - imports = with inputs; [ - nix-flatpak.homeManagerModules.nix-flatpak - ]; - services.flatpak = { - enable = true; - uninstallUnmanaged = true; - update.auto = { - enable = true; - onCalendar = "weekly"; - }; - remotes = [ - { - name = "flathub"; - location = "https://dl.flathub.org/repo/flathub.flatpakrepo"; - } - { - name = "hero-persson"; - location = "https://hero-persson.github.io/unmojang-flatpak/index.flatpakrepo"; - } - ]; - packages = [ - # browsers - "app.zen_browser.zen" - "io.github.ungoogled_software.ungoogled_chromium" - "net.mullvad.MullvadBrowser" - "org.torproject.torbrowser-launcher" - - # misc - "com.bitwarden.desktop" - "com.github.tchx84.Flatseal" - "com.logseq.Logseq" - "com.obsproject.Studio" - "com.usebottles.bottles" - "de.capypara.FieldMonitor" - "de.haeckerfelix.Fragments" - "org.nicotine_plus.Nicotine" - - # chatting - "im.riot.Riot" - "io.github.spacingbat3.webcord" - "org.mozilla.Thunderbird" - "org.signal.Signal" - "org.telegram.desktop" - "io.github.kukuruzka165.materialgram" - - # media - "io.freetubeapp.FreeTube" - #music - "io.bassi.Amberol" - "org.atheme.audacious" - - # gaming - "com.heroicgameslauncher.hgl" - "com.valvesoftware.Steam" - "net.lutris.Lutris" - { - appId = "org.unmojang.FjordLauncher"; - origin = "hero-persson"; - } - "org.freedesktop.Platform.VulkanLayer.MangoHud//24.08" - "org.freedesktop.Platform.VulkanLayer.gamescope//24.08" - ]; - overrides = { - "global" = { - # Force Wayland by default - Context = { - sockets = ["wayland" "!x11" "!fallback-x11"]; - filesystems = [ - "!home" - "!host" - "!~/.ssh" - "/nix/store:ro" - "xdg-config/gtk-3.0:ro" - "xdg-config/gtk-4.0:ro" - "xdg-run/pipewire-0" - "~/.local/share/icons:ro" - ]; - }; - Environment = { - ELECTRON_OZONE_PLATFORM_HINT = "wayland"; - }; - }; - "com.valvesoftware.Steam" = { - Context = { - sockets = ["x11" "wayland"]; - filesystems = ["/storage/games/steam"]; - }; - Environment.STEAM_FORCE_DESKTOPUI_SCALING = "1.3"; - }; - "org.signal.Signal" = { - Environment.SIGNAL_PASSWORD_STORE = "gnome-libsecret"; - }; - "com.obsproject.Studio" = { - Context.filesystems = ["~/vids"]; - }; - "com.logseq.Logseq" = { - Context.filesystems = [ - "~/docs/logseq" - "~/docs/nure/2025/logseq" - "~/syncthing/logseq" - ]; - }; - "net.lutris.Lutris".Context = { - sockets = ["x11" "wayland"]; - filesystems = ["/storage/games/lutris" "~/games/lutris"]; - }; - "com.heroicgameslauncher.hgl".Context = { - sockets = ["x11" "wayland"]; - filesystems = ["/storage/games/heroic" "~/games/heroic"]; - }; - "com.usebottles.Bottles" = { - Context.sockets = ["x11" "wayland"]; - }; - }; - }; -} diff --git a/hosts/legion/users/user/home-configuration.nix b/hosts/legion/users/user/home-configuration.nix index 8499b4a..9d61093 100644 --- a/hosts/legion/users/user/home-configuration.nix +++ b/hosts/legion/users/user/home-configuration.nix @@ -1,7 +1,7 @@ { imports = [ - ./common.nix - ./flatpak.nix - ./programs.nix + ../../../dunamis/users/user/common.nix + ../../../dunamis/users/user/flatpak.nix + ../../../dunamis/users/user/programs.nix ]; } diff --git a/hosts/legion/users/user/programs.nix b/hosts/legion/users/user/programs.nix deleted file mode 100644 index ab9d4b0..0000000 --- a/hosts/legion/users/user/programs.nix +++ /dev/null @@ -1,88 +0,0 @@ -{pkgs, ...}: { - console.yazi.enable = true; - editor.helix.enable = true; - shell = { - fish.enable = true; - oh-my-posh.enable = true; - }; - syncthing.enable = true; - terminal.wezterm.enable = true; - terminal.ghostty.enable = true; - - services = { - pueue.enable = true; # process queue in rust - ssh-agent.enable = true; - }; - - programs = { - bat.enable = true; # cat in rust - btop = { - enable = true; - settings.update_ms = 200; - }; - direnv.enable = true; - direnv.silent = true; - eza.enable = true; # ls in rust - fd.enable = true; # find in rust - fzf.enable = true; # fuzzy finder in rust - git = { - enable = true; - delta.enable = true; # diff in rust - signing.format = "ssh"; - aliases = { - cl = "clone"; - co = "checkout"; - pom = "push origin main"; - }; - }; - gitui.enable = true; # git ui in rust - jujutsu.enable = true; # vcs in rust - keychain = { - enable = true; - keys = ["id_ed25519"]; - }; - nix-index-database.comma.enable = true; - nix-index.enable = true; - nix-your-shell.enable = true; - pay-respects.enable = true; # thefuck in rust - ripgrep.enable = true; # grep in rust - zoxide.enable = true; - }; - - home.packages = with pkgs; [ - alejandra # nix formatter in rust - devenv # programming deps in rust - dua # disk space usage in rust - fend # calculator in rust - flatpak # flatpak cli - jj-fzf # fuzzy finder jujutsu tui - just # make in rust - mprocs # process runner in rust - ouch # archive manager in rust - overskride # bluetooth gui in rust - pika-backup # borg gui in rust - pinentry-qt # pinentry for rbw - procs # ps in rust - rbw # bitwarden cli in rust - sd # sed in rust - silicon # create code pics in rust - trashy # trash cli in rust - # vial # qmk keyboard configuring app - virt-manager # libvirt gui - waycheck # check wayland protocols - ]; - - xdg.desktopEntries = { - uni = { - actions."Copy".exec = "fish -c \"~/.local/bin/uni --copy\""; - categories = ["Utility" "X-Launch" "Network"]; - comment = "Select and open or copy URLs from a list."; - exec = "fish -c \"~/.local/bin/uni\""; - icon = "web-browser"; - name = "Uni URL Handler"; - startupNotify = true; - terminal = false; - type = "Application"; - }; - }; -} diff --git a/modules/nixos/system/misc/stylix/default.nix b/modules/nixos/system/misc/stylix/default.nix index 5c048d1..dd73ef6 100644 --- a/modules/nixos/system/misc/stylix/default.nix +++ b/modules/nixos/system/misc/stylix/default.nix @@ -107,6 +107,32 @@ size = 24; }; }; + + sulphurpool = { + polarity = "dark"; + scheme = "${pkgs.base16-schemes}/share/themes/atelier-sulphurpool.yaml"; + wallpaper = builtins.fetchurl { + url = "https://w.wallhaven.cc/full/rd/wallhaven-rd5q3m.jpg"; + name = "wallhaven-rd5q3m.jpg"; + sha256 = "sha256:1sa2739vwwv1xafzjvxlg3kvq26xmcxg6hrwq29q40j617r63sy6"; + }; + + serif = { + package = iosevkaPackage; + name = "Iosevka Nerd Font Propo"; + }; + + monospace = { + package = iosevkaTermPackage; + name = "IosevkaTerm Nerd Font Mono"; + }; + + cursor = { + package = pkgs.bibata-cursors; + name = "Bibata-Modern-Classic"; + size = 24; + }; + }; }; in { imports = with inputs; [