staging

home-manager/cobray.nix

@@ -1,7 +1,4 @@
-{
+{pkgs, ...}: {
-  pkgs,
-  ...
-}: {
   imports = [
     ./modules/dunst.nix
     ./modules/fish.nix
@@ -13,6 +10,7 @@
     ./modules/rofi.nix
     ./modules/starship.nix
     ./modules/zellij.nix
+    ./modules/ffmpeg.nix
   ];
 
   home.username = "cobray";

home-manager/modules/ffmpeg.nix

@@ -0,0 +1,8 @@
+{pkgs, ...}: {
+  home.packages = with pkgs; [
+    (ffmpeg.override {
+      withXcb = true;
+      withXlib = true;
+    })
+  ];
+}

hosts/local-packages.nix

@@ -14,91 +14,63 @@ in {
   environment.systemPackages = with pkgs; [
     brave # TODO: make a module to save browser stuff
     vesktop
-    git
-    nodejs
-    wget
-    curl
-    tree
-    gnumake
-    gcc
-    socat
-    ffmpeg
-    gnused
-    gdb
-    stdenv.cc.cc.lib
-    nix-prefetch-git
-    binutils
-    hashcat
-    cmake
-    ninja
-    pkg-config
-    autoconf
-    automake
-    libtool
-    gawk
     obs-studio
+    spotify
+    flameshot
+    mpv
+    udiskie
+    git
+    git-lfs
+    gitAndTools.gh
+    gitAndTools.diff-so-fancy
     lazygit
     lazydocker
-    jdk17
+    mercurial
+    nodejs
+    nodePackages.pnpm
+    nodePackages.typescript
+    yarn
     bun
-    maven
-    gradle
-    visualvm
-    jdt-language-server
-    htop
-    btop
-    nvtopPackages.full
-    fd
-    fzf
-    jq
-    bash
-    customPkgs.fish-rust
-    go
-    ollama
-    sqls
     deno
-    redis
+    go
-    cloudflared
+    go-tools
+    gopls
+    rustc
     rustup
     cargo-edit
     cargo-watch
     cargo-outdated
     cargo-audit
-    openssl
+    rust-analyzer
-    openssl.dev
+    python3Packages.debugpy
+    customPkgs.python-ngx-lsp
+    gcc
+    stdenv.cc.cc.lib
+    gnumake
+    cmake
+    ninja
+    binutils
+    gdb
     pkg-config
-    libxml2
+    autoconf
-    zlib
+    automake
+    libtool
+    nasm
+    elixir
+    swift
+    zig
     ghc
     cabal-install
     stack
     haskell-language-server
-    postgresql
+    jdk17
-    sqlite
+    maven
-    spotify
+    gradle
-    git-lfs
+    visualvm
-    gitAndTools.gh
+    jdt-language-server
-    gitAndTools.diff-so-fancy
-    ani-cli
-    yt-dlp
-    nmap
-    psmisc
-    ugrep
-    unzip
-    starship
-    flameshot
-    yarn
-    mpv
-    httpie
-    wrk
-    nodePackages.pnpm
-    zlib.dev
-    udiskie
-    rust-analyzer
     clang-tools
     vscode-langservers-extracted
     nodePackages.eslint
-    gopls
     lua-language-server
     marksman
     nil
@@ -120,23 +92,53 @@ in {
     hadolint
     shellcheck
     cppcheck
-    go-tools
     rubocop
     phpPackages.php-codesniffer
     phpPackages.phpstan
     checkstyle
     tflint
     sqlfluff
-    rustc
+    wget
-    mercurial
+    curl
+    tree
+    socat
+    gnused
+    gawk
+    nmap
+    psmisc
+    ugrep
+    unzip
+    starship
+    htop
+    btop
+    nvtopPackages.full
+    fd
+    fzf
+    jq
+    bash
+    customPkgs.fish-rust
+    xorg.xdpyinfo
+    slop
+    dunst
+    pulseaudio
+    ani-cli
+    yt-dlp
+    httpie
+    wrk
+    cloudflared
+    hashcat
+    nix-prefetch-git
+    openssl
+    openssl.dev
+    libxml2
+    zlib
+    zlib.dev
+    postgresql
+    sqlite
+    redis
+    sqls
+    ollama
     tree-sitter
     luajitPackages.jsregexp
-    nodePackages.typescript
-    nasm
-    elixir
-    swift
-    zig
-    python3Packages.debugpy
-    customPkgs.python-ngx-lsp
   ];
 }