From bfb5ea11bec87b5530e2f4e634bd3fb5fb07f4e8 Mon Sep 17 00:00:00 2001 From: Adrian Gunnar Lauterer Date: Tue, 6 May 2025 15:23:28 +0200 Subject: [PATCH] sway updates --- flake.lock | 570 +++++++++++++++++++++ home/gunalx/fonts.nix | 2 +- home/gunalx/sway.nix | 16 +- home/gunalx/swaylock.nix | 51 +- home/root/fonts.nix | 2 +- machines/aragon/configuration.nix | 10 +- machines/aragon/hardware-configuration.nix | 13 +- profiles/base.nix | 4 +- profiles/desktop.nix | 6 +- profiles/sound.nix | 6 +- profiles/sway.nix | 2 +- 11 files changed, 632 insertions(+), 50 deletions(-) create mode 100644 flake.lock diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..4c62c33 --- /dev/null +++ b/flake.lock @@ -0,0 +1,570 @@ +{ + "nodes": { + "base16-schemes": { + "flake": false, + "locked": { + "lastModified": 1696158499, + "narHash": "sha256-5yIHgDTPjoX/3oDEfLSQ0eJZdFL1SaCfb9d6M0RmOTM=", + "owner": "tinted-theming", + "repo": "base16-schemes", + "rev": "a9112eaae86d9dd8ee6bb9445b664fba2f94037a", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-schemes", + "type": "github" + } + }, + "devenv": { + "inputs": { + "flake-compat": "flake-compat_2", + "nix": "nix", + "nixpkgs": "nixpkgs_4", + "pre-commit-hooks": "pre-commit-hooks" + }, + "locked": { + "lastModified": 1706018268, + "narHash": "sha256-d24+re0t8b6HYGzAPZCIJed85n23RUFXQa2yuHoW0uQ=", + "owner": "cachix", + "repo": "devenv", + "rev": "ad0ae333b210e31237e1fc4a7ddab71a01785add", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "devenv", + "type": "github" + } + }, + "fenix": { + "inputs": { + "nixpkgs": [ + "ozai", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src" + }, + "locked": { + "lastModified": 1706336364, + "narHash": "sha256-mJ5i2YIVKv6jTN2+l3oOUUej2NUVjJX/H3bAq6019ks=", + "owner": "nix-community", + "repo": "fenix", + "rev": "eb683549b7d76b12d1a009f888b91b70ed34485f", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "ozai", + "devenv", + "pre-commit-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1660459072, + "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1746171682, + "narHash": "sha256-EyXUNSa+H+YvGVuQJP1nZskXAowxKYp79RNUsNdQTj4=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "50eee705bbdbac942074a8c120e8194185633675", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-24.11", + "repo": "home-manager", + "type": "github" + } + }, + "lowdown-src": { + "flake": false, + "locked": { + "lastModified": 1633514407, + "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", + "owner": "kristapsdz", + "repo": "lowdown", + "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", + "type": "github" + }, + "original": { + "owner": "kristapsdz", + "repo": "lowdown", + "type": "github" + } + }, + "matrix-synapse-next": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1735857245, + "narHash": "sha256-AKLLPrgXTxgzll3DqVUMa4QlPlRN3QceutgFBmEf8Nk=", + "owner": "dali99", + "repo": "nixos-matrix-modules", + "rev": "da9dc0479ffe22362793c87dc089035facf6ec4d", + "type": "github" + }, + "original": { + "owner": "dali99", + "repo": "nixos-matrix-modules", + "type": "github" + } + }, + "nix": { + "inputs": { + "lowdown-src": "lowdown-src", + "nixpkgs": [ + "ozai", + "devenv", + "nixpkgs" + ], + "nixpkgs-regression": "nixpkgs-regression" + }, + "locked": { + "lastModified": 1676545802, + "narHash": "sha256-EK4rZ+Hd5hsvXnzSzk2ikhStJnD63odF7SzsQ8CuSPU=", + "owner": "domenkozar", + "repo": "nix", + "rev": "7c91803598ffbcfe4a55c44ac6d49b2cf07a527f", + "type": "github" + }, + "original": { + "owner": "domenkozar", + "ref": "relaxed-flakes", + "repo": "nix", + "type": "github" + } + }, + "nix-colors": { + "inputs": { + "base16-schemes": "base16-schemes", + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1707825078, + "narHash": "sha256-hTfge2J2W+42SZ7VHXkf4kjU+qzFqPeC9k66jAUBMHk=", + "owner": "misterio77", + "repo": "nix-colors", + "rev": "b01f024090d2c4fc3152cd0cf12027a7b8453ba1", + "type": "github" + }, + "original": { + "owner": "misterio77", + "repo": "nix-colors", + "type": "github" + } + }, + "nix-minecraft": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1746151214, + "narHash": "sha256-rwimRjWUa4EgjWo8YU8GWL/D4ZDBHkE32y/DtBP0RwE=", + "owner": "Infinidoge", + "repo": "nix-minecraft", + "rev": "a97ba80db972f4a9ebb86948644d9c7cd95fc546", + "type": "github" + }, + "original": { + "owner": "Infinidoge", + "repo": "nix-minecraft", + "type": "github" + } + }, + "nixos-hardware": { + "locked": { + "lastModified": 1745955289, + "narHash": "sha256-mmV2oPhQN+YF2wmnJzXX8tqgYmUYXUj3uUUBSTmYN5o=", + "owner": "NixOS", + "repo": "nixos-hardware", + "rev": "72081c9fbbef63765ae82bff9727ea79cc86bd5b", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "master", + "repo": "nixos-hardware", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1706098335, + "narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a77ab169a83a4175169d78684ddd2e54486ac651", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-23.11", + "type": "indirect" + } + }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1697935651, + "narHash": "sha256-qOfWjQ2JQSQL15KLh6D7xQhx0qgZlYZTYlcEiRuAMMw=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "e1e11fdbb01113d85c7f41cada9d2847660e3902", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixpkgs-regression": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1685801374, + "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1742889210, + "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "698214a32beb4f4c8e3942372c694f40848b360d", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1746055187, + "narHash": "sha256-3dqArYSMP9hM7Qpy5YWhnSjiqniSaT2uc5h2Po7tmg0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3e362ce63e16b9572d8c2297c04f7c19ab6725a5", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1678875422, + "narHash": "sha256-T3o6NcQPwXjxJMn2shz86Chch4ljXgZn746c2caGxd8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "126f49a01de5b7e35a43fd43f891ecf6d3a51459", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "ozai": { + "inputs": { + "devenv": "devenv", + "fenix": "fenix", + "nixpkgs": [ + "unstable" + ] + }, + "locked": { + "lastModified": 1712434594, + "narHash": "sha256-Ct0StUM5GLxtA1NGhwekDbT0JLSrjwAmsXAODrjI9G4=", + "ref": "refs/heads/main", + "rev": "9844e6890892d22ac6c1164a6c6a18c4de6b2832", + "revCount": 27, + "type": "git", + "url": "https://git.pvv.ntnu.no/Projects/ozai.git" + }, + "original": { + "type": "git", + "url": "https://git.pvv.ntnu.no/Projects/ozai.git" + } + }, + "ozai-webui": { + "inputs": { + "nixpkgs": [ + "unstable" + ] + }, + "locked": { + "lastModified": 1725761562, + "narHash": "sha256-RhckkJU4isKgN5Lgvmt7UdRJtsXVBaeT4vPr8HCkJdc=", + "ref": "refs/heads/main", + "rev": "0f06a245c12408bef6dce87d6f3d4a342d5dc874", + "revCount": 32, + "type": "git", + "url": "https://git.pvv.ntnu.no/adriangl/ozai-webui.git" + }, + "original": { + "type": "git", + "url": "https://git.pvv.ntnu.no/adriangl/ozai-webui.git" + } + }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": [ + "ozai", + "devenv", + "flake-compat" + ], + "flake-utils": "flake-utils_2", + "gitignore": "gitignore", + "nixpkgs": [ + "ozai", + "devenv", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1704725188, + "narHash": "sha256-qq8NbkhRZF1vVYQFt1s8Mbgo8knj+83+QlL5LBnYGpI=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "ea96f0c05924341c551a797aaba8126334c505d2", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, + "root": { + "inputs": { + "home-manager": "home-manager", + "matrix-synapse-next": "matrix-synapse-next", + "nix-colors": "nix-colors", + "nix-minecraft": "nix-minecraft", + "nixos-hardware": "nixos-hardware", + "nixpkgs": "nixpkgs_3", + "ozai": "ozai", + "ozai-webui": "ozai-webui", + "sops-nix": "sops-nix", + "unstable": "unstable" + } + }, + "rust-analyzer-src": { + "flake": false, + "locked": { + "lastModified": 1706295183, + "narHash": "sha256-VSyMaUsXfjb31B8/uT5cM5qXC1VOHLVsCi/bQuo3O/g=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "596e5c77cf5b2b660b3ac2ce732fa0596c246d9b", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, + "sops-nix": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1745310711, + "narHash": "sha256-ePyTpKEJTgX0gvgNQWd7tQYQ3glIkbqcW778RpHlqgA=", + "owner": "Mic92", + "repo": "sops-nix", + "rev": "5e3e92b16d6fdf9923425a8d4df7496b2434f39c", + "type": "github" + }, + "original": { + "owner": "Mic92", + "repo": "sops-nix", + "type": "github" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "unstable": { + "locked": { + "lastModified": 1746141548, + "narHash": "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f02fddb8acef29a8b32f10a335d44828d7825b78", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/home/gunalx/fonts.nix b/home/gunalx/fonts.nix index d0a8310..ec49006 100644 --- a/home/gunalx/fonts.nix +++ b/home/gunalx/fonts.nix @@ -4,7 +4,7 @@ home.packages = with pkgs; [ nerdfonts noto-fonts - noto-fonts-cjk + noto-fonts-cjk-sans noto-fonts-emoji liberation_ttf fira-code diff --git a/home/gunalx/sway.nix b/home/gunalx/sway.nix index b71f9e4..0a7ce71 100644 --- a/home/gunalx/sway.nix +++ b/home/gunalx/sway.nix @@ -86,7 +86,7 @@ in #fonts nerdfonts noto-fonts - noto-fonts-cjk + noto-fonts-cjk-sans noto-fonts-emoji liberation_ttf fira-code @@ -156,7 +156,19 @@ in { #wallpaper {command = "swww-daemon";} - {command = "while true; do for wallpaper in $WALLPAPER_DIR/*; do swww img $wallpaper; sleep 15; done; done;";} + {command = ''sleep 3 \ + wallpapers=("/home/gunalx/Pictures/wallpapers"/*.{jpg,jpeg,png,gif}) \ + transitions=(fade left right top bottom wipe wave grow center outer) \ + i=0 \ + while true; do \ + img="''${wallpapers[i % ''${#wallpapers[@]}]}" \ + trans="''${transitions[i % ''${#transitions[@]}]}" \ + swww img "$img" --transition-type "$trans" --transition-fps 60 --transition-duration 3 \ + ((i++)) \ + sleep 15m \ + done + '';} + #{command = "while true; do for wallpaper in $WALLPAPER_DIR/*; do swww img $wallpaper; sleep 15; done; done;";} #idlelock {command = ''swayidle \ diff --git a/home/gunalx/swaylock.nix b/home/gunalx/swaylock.nix index 970c0d8..45ccc6a 100644 --- a/home/gunalx/swaylock.nix +++ b/home/gunalx/swaylock.nix @@ -3,33 +3,40 @@ let palette = config.colorScheme.palette; in { - imports = [ - ]; - programs.swaylock = { enable = true; package = pkgs.swaylock-effects; settings = { - color = palette.base00; - screenshots = true; - grace = 15; - clock = true; - submit-on-touch = true; - indicator-idle-visible = true; - indicator-radius = 100; - indicator-thickness = 7; - ring-color = palette.base05; - key-hl-color = palette.base03; - tect-color = palette.base00; - line-colot = palette.base00; - innside-color = palette.base04; - seperator-color = palette.base00; - fade-in = 0.1; - effect-scale = 0.6; - effect-blur = "7x3"; + # screen & indicator + color = palette.base00; # --color + screenshots = true; # --screenshots + fade-in = 0.1; # --fade-in + scaling = "fill"; # e.g. --scaling=fill + + # authentication grace + grace = 15; # --grace + submit-on-touch = true; # --submit-on-touch + + # clock + clock = true; # --clock + + # indicator visuals + indicator-idle-visible = true; # --indicator-idle-visible + indicator-radius = 100; # --indicator-radius + indicator-thickness = 7; # --indicator-thickness + + # indicator colors + ring-color = palette.base05; # --ring-color + key-hl-color = palette.base03; # --key-hl-color + text-color = palette.base00; # --text-color + inside-color = palette.base04; # --inside-color + line-color = palette.base00; # --line-color + separator-color = palette.base00; # --separator-color + + # effects + effect-scale = 0.6; # --effect-scale + effect-blur = "7x3"; # --effect-blur }; }; - - } diff --git a/home/root/fonts.nix b/home/root/fonts.nix index d0a8310..ec49006 100644 --- a/home/root/fonts.nix +++ b/home/root/fonts.nix @@ -4,7 +4,7 @@ home.packages = with pkgs; [ nerdfonts noto-fonts - noto-fonts-cjk + noto-fonts-cjk-sans noto-fonts-emoji liberation_ttf fira-code diff --git a/machines/aragon/configuration.nix b/machines/aragon/configuration.nix index c0697c4..7df53a7 100644 --- a/machines/aragon/configuration.nix +++ b/machines/aragon/configuration.nix @@ -53,15 +53,7 @@ # Enable the X11 windowing system. services.xserver.enable = true; services.xserver.videoDrivers = [ "amdgpu" ]; - hardware.opengl.extraPackages = with pkgs; [ - rocm-opencl-icd - rocm-opencl-runtime - amdvlk - ]; - hardware.opengl.driSupport = true; - # For 32 bit applications - hardware.opengl.driSupport32Bit = true; # Enable touchpad support (enabled default in most desktopManager). # services.xserver.libinput.enable = true; @@ -124,7 +116,7 @@ ollama rpi-imager prismlauncher - cura + #cura #seems broken dependencies. prusa-slicer openscad diff --git a/machines/aragon/hardware-configuration.nix b/machines/aragon/hardware-configuration.nix index dabc4d8..f0148bf 100644 --- a/machines/aragon/hardware-configuration.nix +++ b/machines/aragon/hardware-configuration.nix @@ -18,19 +18,16 @@ systemd.tmpfiles.rules = [ "L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}" ]; - hardware.opengl.extraPackages = with pkgs; [ - rocmPackages.clr.icd - #amdvlk - libva-utils - ]; + nixpkgs.config.rocmSupport = true; + #hardware.opengl.extraPackages32 = with pkgs; [ # driversi686Linux.amdvlk #]; - hardware.opengl.driSupport = true; # This is already enabled by default - hardware.opengl.driSupport32Bit = true; # For 32 bit applications - + environment.systemPackages = with pkgs; [ lact ]; +systemd.packages = with pkgs; [ lact ]; +systemd.services.lactd.wantedBy = ["multi-user.target"]; fileSystems."/" = diff --git a/profiles/base.nix b/profiles/base.nix index 0d347da..f5b5ec1 100644 --- a/profiles/base.nix +++ b/profiles/base.nix @@ -80,7 +80,9 @@ imports = }; - environment.interactiveShellInit = '' + environment.interactiveShellInit = '' + #atuin import auto + # Colors RESET='\[\e[0m\]' BOLD='\[\e[1m\]' diff --git a/profiles/desktop.nix b/profiles/desktop.nix index ec8b092..64d2764 100644 --- a/profiles/desktop.nix +++ b/profiles/desktop.nix @@ -15,7 +15,9 @@ imports = environment.systemPackages = with pkgs; [ openscad - cura + + #cura # broken + prusa-slicer #libsForQt5.qt5ct #qt6Packages.qt6ct @@ -27,7 +29,7 @@ imports = fonts.packages = with pkgs; [ noto-fonts - noto-fonts-cjk + noto-fonts-cjk-sans noto-fonts-emoji liberation_ttf fira-code diff --git a/profiles/sound.nix b/profiles/sound.nix index 0823d78..8732bdc 100644 --- a/profiles/sound.nix +++ b/profiles/sound.nix @@ -7,7 +7,6 @@ imports = ]; - sound.enable = true; hardware.pulseaudio.enable = false; security.rtkit.enable = true; services.pipewire = { @@ -35,7 +34,7 @@ imports = vital picoloop #bespokesynth-with-vst2 #always takes ages compiling - fmsynth + #fmsynth polyphone #soundfont editor #vocaloids @@ -61,7 +60,8 @@ imports = headset nuclear spotifyd - spotify-qt + spotify-player + spotify spotify-tray tenacity diff --git a/profiles/sway.nix b/profiles/sway.nix index 6834095..be0e206 100644 --- a/profiles/sway.nix +++ b/profiles/sway.nix @@ -49,7 +49,7 @@ imports = fonts.packages = with pkgs; [ noto-fonts - noto-fonts-cjk + noto-fonts-cjk-sans noto-fonts-emoji liberation_ttf fira-code