diff --git a/flake.lock b/flake.lock index c452d10..d1bfdc9 100644 --- a/flake.lock +++ b/flake.lock @@ -178,11 +178,11 @@ ] }, "locked": { - "lastModified": 1780894562, - "narHash": "sha256-c3430xwxwhHipl3jigUGMMBfpaMylDqytW/kdmB3ZGs=", + "lastModified": 1778958912, + "narHash": "sha256-6pvS9rIF9mZRj1ENwu9fDLHeG1JFDTCpRyy6vJhXkTA=", "owner": "nix-community", "repo": "disko", - "rev": "24fed06cac83bcc44ac8efbb57cab1a82fa0bedc", + "rev": "6e8dc7aa0e65fce67c76e18227a13a7d529f2cdf", "type": "github" }, "original": { @@ -252,13 +252,13 @@ "locked": { "lastModified": 1767039857, "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", - "owner": "NixOS", + "owner": "edolstra", "repo": "flake-compat", "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "edolstra", "repo": "flake-compat", "type": "github" } @@ -399,11 +399,11 @@ ] }, "locked": { - "lastModified": 1778507602, - "narHash": "sha256-kTwur1wV+01SdqskVMSo6JMEpg71ps3HpbFY2GsflKs=", + "lastModified": 1772893680, + "narHash": "sha256-JDqZMgxUTCq85ObSaFw0HhE+lvdOre1lx9iI6vYyOEs=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "61ab0e80d9c7ab14c256b5b453d8b3fb0189ba0a", + "rev": "8baab586afc9c9b57645a734c820e4ac0a604af9", "type": "github" }, "original": { @@ -457,16 +457,16 @@ ] }, "locked": { - "lastModified": 1780883961, - "narHash": "sha256-WU6SUrESuPiEXEUvX4D51AgWrXRJty+sLJBwBaDBGqE=", + "lastModified": 1778905220, + "narHash": "sha256-ox/5IHc8uwy6UTw6N7Shp6uCHIgu/S2PsWeuXsOHSo8=", "owner": "nix-community", "repo": "home-manager", - "rev": "4eb4fec41674d5b059aa2eedf0f98453890546fa", + "rev": "d1686dc7d36cbd1234cb226ad6ef97e882716acb", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-26.05", + "ref": "release-25.11", "repo": "home-manager", "type": "github" } @@ -559,11 +559,11 @@ ] }, "locked": { - "lastModified": 1780816331, - "narHash": "sha256-0BYqs8yKWkOz2Q7+SP18N5E5gmDKSo6LSxIVIa0wWes=", + "lastModified": 1778393439, + "narHash": "sha256-mOtQxUjtKaPHLeoLOY/YEDctmud1X9KwJr4kE1MJ3Wc=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "1a2ea89c917781e88508d9fd2b507f2d2a0e173c", + "rev": "01466c414c7357ae2ce32be4a272a7c69e94ab5f", "type": "github" }, "original": { @@ -582,16 +582,16 @@ ] }, "locked": { - "lastModified": 1780704867, - "narHash": "sha256-JuatomIQeXXZhdfEnBid9VoWyh6IfQgTE/FsM94UsRk=", + "lastModified": 1773912645, + "narHash": "sha256-QHzRqq6gh+t3F/QU9DkP7X63dDDcuIQmaDz12p7ANTg=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "da29f6cc3d7e15eb7bfdae599918851cbd5ea142", + "rev": "25e6dbb8fca3b6e779c5a46fd03bd760b2165bb5", "type": "gitlab" }, "original": { "owner": "simple-nixos-mailserver", - "ref": "nixos-26.05", + "ref": "nixos-25.11", "repo": "nixos-mailserver", "type": "gitlab" } @@ -614,11 +614,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1780749050, - "narHash": "sha256-3av0pIjlOWQ6rDbNOmpUSvbNnJkGORQKKjb4LtCZsIY=", + "lastModified": 1778869304, + "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a799d3e3886da994fa307f817a6bc705ae538eeb", + "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", "type": "github" }, "original": { @@ -629,11 +629,11 @@ }, "nixpkgsUnstable": { "locked": { - "lastModified": 1780749050, - "narHash": "sha256-3av0pIjlOWQ6rDbNOmpUSvbNnJkGORQKKjb4LtCZsIY=", + "lastModified": 1778443072, + "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a799d3e3886da994fa307f817a6bc705ae538eeb", + "rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32", "type": "github" }, "original": { @@ -707,16 +707,16 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1780902259, - "narHash": "sha256-q8yYEC5f1mFlQO9RGna4LTc9QrcvWunX6FYp83munkQ=", + "lastModified": 1778737229, + "narHash": "sha256-6xWoytx8jFW4PF1GjRm/i/53trbpKGfz6zjzQGBr4cI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bd0ff2d3eac24699c3664d5966b9ef36f388e2ca", + "rev": "d7a713c0b7e47c908258e71cba7a2d77cc8d71d5", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-26.05", + "ref": "nixos-25.11", "type": "indirect" } }, @@ -754,16 +754,16 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1780734595, - "narHash": "sha256-DmTfP92QFYRLOGXlMIE54MAgxSJjDWocl3gRNOu72Os=", + "lastModified": 1778737229, + "narHash": "sha256-6xWoytx8jFW4PF1GjRm/i/53trbpKGfz6zjzQGBr4cI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b696460ac78b5ccfc17c854d8c976f20456e943", + "rev": "d7a713c0b7e47c908258e71cba7a2d77cc8d71d5", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-26.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } @@ -895,11 +895,11 @@ ] }, "locked": { - "lastModified": 1780547341, - "narHash": "sha256-Gq8KNx5A7hBB3uGJaj6eQfLDIz5YdLu92gqBcvHvoUo=", + "lastModified": 1777944972, + "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=", "owner": "Mic92", "repo": "sops-nix", - "rev": "9ed65852b6257fbeae4355bc24ecfea307ca759a", + "rev": "c591bf665727040c6cc5cb409079acb22dcce33c", "type": "github" }, "original": { @@ -1040,11 +1040,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1780220602, - "narHash": "sha256-eynAfOmbmxJnkp7YewvCEbShNnnYJ9gLLqkzsYtBPeM=", + "lastModified": 1775636079, + "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "db947814a175b7ca6ded66e21383d938df01c227", + "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba", "type": "github" }, "original": { @@ -1060,11 +1060,11 @@ "nixpkgsUnstable": "nixpkgsUnstable" }, "locked": { - "lastModified": 1780902784, - "narHash": "sha256-xqY+ApLpKx8/sVGx6a6Tt1NUqU8FPaNlitR3R396HFo=", + "lastModified": 1778909971, + "narHash": "sha256-2NvIPWV3oE9mn/6O4rIh+G8JyrA/QDQ+jWaYA2XUydo=", "owner": "vpsfreecz", "repo": "vpsadminos", - "rev": "a791e6b372bb0fb6c9ffd65383517c140f510f8b", + "rev": "d1eef7c80c9f7065d77c6dfba683a01b4eeadef7", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b88ac57..beb7cdb 100644 --- a/flake.nix +++ b/flake.nix @@ -1,10 +1,10 @@ { description = "My system config"; inputs = { - nixpkgs.url = "nixpkgs/nixos-26.05"; + nixpkgs.url = "nixpkgs/nixos-25.11"; nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; - home-manager.url = "github:nix-community/home-manager/release-26.05"; + home-manager.url = "github:nix-community/home-manager/release-25.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; vpsadminos.url = "github:vpsfreecz/vpsadminos"; @@ -26,7 +26,7 @@ }; nixos-mailserver = { - url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-26.05"; + url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -83,8 +83,6 @@ inherit system; config = { allowUnfree = true; - # TODO: remover minio após migrar os dados - permittedInsecurePackages = [ "minio-2025-10-15T17-29-55Z" ]; }; overlays = old_overlays.all; }; diff --git a/hosts/monolith/amdgpu.nix b/hosts/monolith/amdgpu.nix index 7d11bd8..97c8965 100644 --- a/hosts/monolith/amdgpu.nix +++ b/hosts/monolith/amdgpu.nix @@ -1,8 +1,4 @@ { pkgs, ... }: -let - # mesaPkgs = pkgs.unstable.mesa; - mesaPkgs = pkgs; -in { boot.initrd.kernelModules = [ "amdgpu" ]; boot.kernelParams = [ @@ -16,12 +12,12 @@ in # }; # }; - hardware.graphics.package = mesaPkgs.mesa; # Mesa 26 at the time + hardware.graphics.package = pkgs.unstable.mesa; # Mesa 26 at the time hardware.graphics.enable32Bit = true; - hardware.graphics.extraPackages = with mesaPkgs; [ + hardware.graphics.extraPackages = with pkgs; [ # libva needs to match `hardware.graphics.package` - libva + unstable.libva ]; } diff --git a/hosts/monolith/default.nix b/hosts/monolith/default.nix index 0dbc10a..15ba704 100644 --- a/hosts/monolith/default.nix +++ b/hosts/monolith/default.nix @@ -14,6 +14,10 @@ let "noatime" "x-systemd.device-timeout=0" ]; + btrfs_ssd = [ + "ssd" + "discard=async" + ]; in { imports = [ @@ -63,13 +67,22 @@ in "zenpower" ]; - systemd.sleep.settings.Sleep = { - HibernateDelaySec = "30s"; - SuspendState = "mem"; - }; + systemd.sleep.extraConfig = '' + HibernateDelaySec=30s + SuspendState=mem + ''; + fileSystems."/mnt/old" = { + device = "/dev/disk/by-label/BTRFS_ROOT"; + fsType = "btrfs"; + options = [ "nofail" ] ++ btrfs_options ++ btrfs_ssd; + }; # boot.initrd.luks.reusePassphrases = true; boot.initrd.luks.devices = { + "old" = { + bypassWorkqueues = true; + device = "/dev/disk/by-label/CRYPT_ROOT"; + }; "data" = { bypassWorkqueues = true; device = "/dev/disk/by-label/CRYPT_DATA"; @@ -79,6 +92,16 @@ in # device = "/dev/disk/by-label/CRYPT_BIGBOY"; # }; }; + # boot.loader.efi.efiSysMountPoint = "/boot/efi"; + # fileSystems."/boot/efi" = { + # device = "/dev/disk/by-label/NIXBOOT"; + # fsType = "vfat"; + # }; + # fileSystems."/home" = { + # device = "/dev/disk/by-label/BTRFS_ROOT"; + # fsType = "btrfs"; + # options = [ "subvol=home" ] ++ btrfs_options ++ btrfs_ssd; + # }; fileSystems."/home/lelgenio/Downloads/Torrents" = { device = "/dev/disk/by-label/BTRFS_DATA"; fsType = "btrfs"; @@ -106,6 +129,11 @@ in ] ++ btrfs_options; }; + fileSystems."/home/lelgenio/.local/mount/old" = { + device = "/dev/disk/by-label/BTRFS_ROOT"; + fsType = "btrfs"; + options = [ "nofail" ] ++ btrfs_options ++ btrfs_ssd; + }; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's @@ -151,4 +179,19 @@ in "vm.watermark_scale_factor" = 125; "vm.page-cluster" = 0; }; + + # swap + # fileSystems."/swap" = { + # device = "/dev/disk/by-label/BTRFS_ROOT"; + # fsType = "btrfs"; + # # Note these options effect the entire BTRFS filesystem and not just this volume, + # # with the exception of `"subvol=swap"`, the other options are repeated in my other `fileSystem` mounts + # options = [ "subvol=swap" ] ++ btrfs_options ++ btrfs_ssd; + # }; + # swapDevices = [ + # { + # device = "/swap/swapfile"; + # size = (1024 * 16) + (1024 * 2); # RAM size + 2 GB + # } + # ]; } diff --git a/hosts/monolith/monolith-gitlab-runner.nix b/hosts/monolith/monolith-gitlab-runner.nix index 64c68ea..87983a1 100644 --- a/hosts/monolith/monolith-gitlab-runner.nix +++ b/hosts/monolith/monolith-gitlab-runner.nix @@ -15,36 +15,27 @@ in virtualisation.docker.enable = true; services.gitlab-runner = { enable = true; - settings = { - concurrent = 2; - }; + settings.concurrent = 4; services = { - # # runner for building in docker via host's nix-daemon - # # nix store will be readable in runner, might be insecure - # thoreb-telemetria-nix = mkNixRunner config.sops.secrets."gitlab-runners/thoreb-telemetria-nix".path; - # thoreb-itinerario-nix = mkNixRunner config.sops.secrets."gitlab-runners/thoreb-itinerario-nix".path; + # runner for building in docker via host's nix-daemon + # nix store will be readable in runner, might be insecure + thoreb-telemetria-nix = mkNixRunner config.sops.secrets."gitlab-runners/thoreb-telemetria-nix".path; + thoreb-itinerario-nix = mkNixRunner config.sops.secrets."gitlab-runners/thoreb-itinerario-nix".path; - wopus-gitlab-nix = - (mkNixRunnerFull { - authenticationTokenConfigFile = config.sops.secrets."gitlab-runners/wopus-gitlab-nix".path; - # nixCacheSshPrivateKeyPath = config.sops.secrets."gitlab-runners/wopus-ssh-nix-cache-pk".path; - # nixCacheSshPublicKeyPath = config.sops.secrets."gitlab-runners/wopus-ssh-nix-cache-pub".path; - }) - // { - requestConcurrency = 2; - }; + wopus-gitlab-nix = mkNixRunnerFull { + authenticationTokenConfigFile = config.sops.secrets."gitlab-runners/wopus-gitlab-nix".path; + # nixCacheSshPrivateKeyPath = config.sops.secrets."gitlab-runners/wopus-ssh-nix-cache-pk".path; + # nixCacheSshPublicKeyPath = config.sops.secrets."gitlab-runners/wopus-ssh-nix-cache-pub".path; + }; - # default = ({ - # # File should contain at least these two variables: - # # `CI_SERVER_URL` - # # `CI_SERVER_TOKEN` - # authenticationTokenConfigFile = config.sops.secrets."gitlab-runners/docker-images-token".path; - # dockerImage = "debian:stable"; - # dockerPullPolicy = "if-not-present"; - # }) - # // { - # requestConcurrency = 4; - # }; + default = { + # File should contain at least these two variables: + # `CI_SERVER_URL` + # `CI_SERVER_TOKEN` + authenticationTokenConfigFile = config.sops.secrets."gitlab-runners/docker-images-token".path; + dockerImage = "debian:stable"; + dockerPullPolicy = "if-not-present"; + }; }; }; systemd.services.gitlab-runner.serviceConfig.Nice = 10; diff --git a/overlays/default.nix b/overlays/default.nix index 01125e3..a7a3073 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -71,11 +71,6 @@ rec { patches = old.patches ++ [ ../patches/sway/fix-hide_cursor-clearing-focus.patch ]; }); }; - deluge = prev.deluge.overrideAttrs (old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ - prev.libappindicator-gtk3 - ]; - }); } ); diff --git a/system/android.nix b/system/android.nix index 05a5763..8f0b494 100644 --- a/system/android.nix +++ b/system/android.nix @@ -11,6 +11,6 @@ # Open kde connect ports programs.kdeconnect.enable = true; - environment.systemPackages = [ pkgs.android-tools ]; + programs.adb.enable = true; }; } diff --git a/system/bluetooth.nix b/system/bluetooth.nix index 71231ce..a5d00c0 100644 --- a/system/bluetooth.nix +++ b/system/bluetooth.nix @@ -1,6 +1,6 @@ -{ pkgs, config, ... }: +{ pkgs, ... }: { - services.blueman.enable = config.my.desktop == "sway"; + services.blueman.enable = true; hardware.bluetooth = { enable = true; settings = { diff --git a/system/gaming.nix b/system/gaming.nix index fca2e20..c2f9a1d 100644 --- a/system/gaming.nix +++ b/system/gaming.nix @@ -13,14 +13,8 @@ programs.steam.extraPackages = config.fonts.packages ++ (with pkgs; [ - # sway cursors capitaine-cursors bibata-cursors - # gnome cursors - adwaita-icon-theme - # kde cursors - kdePackages.breeze - mangohud xdg-user-dirs gamescope diff --git a/system/kde.nix b/system/kde.nix index 6555071..4dea6ec 100644 --- a/system/kde.nix +++ b/system/kde.nix @@ -15,11 +15,5 @@ services.desktopManager.plasma6.enable = true; # services.xserver.displayManager.autologin.user = "lelgenio"; programs.dconf.enable = true; - - hardware.opentabletdriver.enable = lib.mkForce false; - - environment.systemPackages = with pkgs; [ - kdePackages.partitionmanager - ]; }; } diff --git a/system/media-packages.nix b/system/media-packages.nix index 3f9af01..e35503e 100644 --- a/system/media-packages.nix +++ b/system/media-packages.nix @@ -19,14 +19,14 @@ in obs-studio imagemagick mpc - crosspipe + helvum gimp inkscape krita kdePackages.breeze kdePackages.kdenlive pitivi - pkgsRocm.blender + blender-hip libreoffice godot_4 ]; diff --git a/system/sound.nix b/system/sound.nix index 7db932d..40dd701 100644 --- a/system/sound.nix +++ b/system/sound.nix @@ -7,6 +7,5 @@ pulse.enable = true; alsa.enable = true; jack.enable = true; - extraLadspaPackages = [ pkgs.rnnoise-plugin ]; }; } diff --git a/user/home.nix b/user/home.nix index 165f956..98fc13a 100644 --- a/user/home.nix +++ b/user/home.nix @@ -42,7 +42,6 @@ ./mpd.nix ./sway ./gnome.nix - ./kde.nix ./thunar.nix ./xdg-dirs.nix inputs.nix-index-database.homeModules.nix-index @@ -53,7 +52,7 @@ ]; my = import ./variables.nix // { - # sway.enable = true; + sway.enable = true; pass.enable = true; fish.enable = true; }; @@ -126,8 +125,8 @@ kustomize kubectl-rsh - intelephense - typescript-language-server + nodePackages.intelephense + nodePackages.typescript-language-server flow # js lsp server nil # nix lsp server clang-tools # c/c++ lsp server @@ -157,7 +156,7 @@ sops.age.sshKeyPaths = [ (config.home.homeDirectory + "/.ssh/id_ed25519") ]; xdg.defaultApplications = { - enable = config.my.desktop == "sway"; + enable = true; text-editor = lib.mkDefault "kak.desktop"; image-viewer = lib.mkDefault "pqiv.desktop"; video-player = lib.mkDefault "mpv.desktop"; diff --git a/user/kakoune/default.nix b/user/kakoune/default.nix index 5f9b92c..fe95930 100644 --- a/user/kakoune/default.nix +++ b/user/kakoune/default.nix @@ -134,14 +134,12 @@ in kak-tree-sitter kak-pager kak-man-pager - bash-language-server + nodePackages.bash-language-server shellcheck shfmt - nixd - emmet-cli - prettier + nodePackages.prettier pint-fmt aspell diff --git a/user/kakoune/kak-tree-sitter.nix b/user/kakoune/kak-tree-sitter.nix index 97191ce..59ab3e0 100644 --- a/user/kakoune/kak-tree-sitter.nix +++ b/user/kakoune/kak-tree-sitter.nix @@ -1,6 +1,8 @@ { pkgs, lib, ... }: let + hx-src = pkgs.helix.src; kts-src = pkgs.unstable.kak-tree-sitter-unwrapped.src; + inherit (pkgs) fetchFromGitHub; in with pkgs.tree-sitter-grammars; { @@ -12,6 +14,13 @@ with pkgs.tree-sitter-grammars; + '' [language.${name}.grammar.source.local] path = "${vals.parser}" + [language.${name}.grammar] + compile = "cc" + compile_args = ["-c", "-fpic", "../scanner.c", "../parser.c", "-I", ".."] + compile_flags = ["-O3"] + link = "cc" + link_args = ["-shared", "-fpic", "scanner.o", "parser.o", "-o", "typescript.so"] + link_flags = ["-O3"] [language.${name}.queries.source.local] path = "${vals.queries}" [language.${name}.queries] @@ -39,7 +48,16 @@ with pkgs.tree-sitter-grammars; queries = tree-sitter-javascript + "/queries"; }; typescript = { - parser = tree-sitter-typescript + "/parser"; + parser = + tree-sitter-typescript.overrideAttrs (old: { + src = fetchFromGitHub { + owner = "tree-sitter"; + repo = "tree-sitter-typescript"; + rev = "b1bf4825d9eaa0f3bdeb1e52f099533328acfbdf"; + hash = "sha256-oZKit8kScXcOptmT2ckywL5JlAVe+wuwhuj6ThEI5OQ="; + }; + }) + + "/parser"; queries = kts-src + "/runtime/queries/typescript"; }; }; diff --git a/user/kde.nix b/user/kde.nix deleted file mode 100644 index 3e647b8..0000000 --- a/user/kde.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ - pkgs, - lib, - config, - ... -}: -lib.mkIf (config.my.desktop == "kde") { - services.gpg-agent.pinentry.package = lib.mkForce pkgs.pinentry-qt; -} diff --git a/user/pass.nix b/user/pass.nix index fda64d4..c3b56c6 100644 --- a/user/pass.nix +++ b/user/pass.nix @@ -13,9 +13,6 @@ in config = lib.mkIf cfg.enable { programs.password-store = { enable = true; - settings = { - PASSWORD_STORE_DIR = "${config.xdg.dataHome}/password-store"; - }; package = pkgs.pass.withExtensions ( ex: with ex; [ pass-otp diff --git a/user/pipewire.nix b/user/pipewire.nix index 85cc84b..5e87618 100644 --- a/user/pipewire.nix +++ b/user/pipewire.nix @@ -8,11 +8,10 @@ # RNNoise is a noise supperssion neural network # Here we use it as a plugin for pipewire to create a virtual microphone config = { - xdg.configFile = { - "pipewire/pipewire.conf.d/99-input-denoising.conf".text = '' + home.file = { + ".config/pipewire/pipewire.conf.d/99-input-denoising.conf".text = '' context.modules = [ { name = libpipewire-module-filter-chain - flags = [ nofail ] args = { node.description = "Noise Canceling source" media.name = "Noise Canceling source" @@ -21,7 +20,7 @@ { type = ladspa name = rnnoise - plugin = "librnnoise_ladspa" + plugin = ${pkgs.rnnoise-plugin}/lib/ladspa/librnnoise_ladspa.so label = noise_suppressor_mono control = { "VAD Threshold (%)" 0.0 @@ -45,7 +44,9 @@ } ] ''; + }; + xdg.configFile = { "pipewire/pipewire.conf.d/99-rtp-sink.conf".text = '' context.modules = [ { name = libpipewire-module-rtp-sink @@ -77,10 +78,9 @@ } ] ''; - "systemd/user/pipewire.service.d/override.conf".text = '' [Service] - ExecStartPre=${pkgs.coreutils}/bin/sleep 10s + ExecStartPre=/usr/bin/env sleep 10s ''; }; }; diff --git a/user/sway/default.nix b/user/sway/default.nix index 9a0c791..e82dea3 100644 --- a/user/sway/default.nix +++ b/user/sway/default.nix @@ -118,9 +118,7 @@ in }; # setup cursor based on home.pointerCursor seat."*" = { - xcursor_theme = lib.mkIf ( - config.home.pointerCursor != null - ) "${config.home.pointerCursor.name} ${toString config.home.pointerCursor.size}"; + xcursor_theme = "${config.home.pointerCursor.name} ${toString config.home.pointerCursor.size}"; hide_cursor = "when-typing enable"; }; }; diff --git a/user/thunar.nix b/user/thunar.nix index 3645f50..26b90e9 100644 --- a/user/thunar.nix +++ b/user/thunar.nix @@ -2,8 +2,8 @@ { home.packages = with pkgs; [ _thunar-terminal - (thunar.override { - thunarPlugins = [ + (xfce.thunar.override { + thunarPlugins = with pkgs.xfce; [ thunar-volman thunar-archive-plugin ]; diff --git a/user/variables.nix b/user/variables.nix index 24d1e42..65bc69a 100644 --- a/user/variables.nix +++ b/user/variables.nix @@ -115,7 +115,7 @@ rec { }; dmenu = "bmenu"; - desktop = "kde"; + desktop = "sway"; browser = "firefox-devedition"; editor = "kakoune"; }