From 22df37a20353d4e54e40c58b92a80693d03c7e15 Mon Sep 17 00:00:00 2001 From: 4DBug <4DBug@github.com> Date: Thu, 19 Feb 2026 18:49:49 -0600 Subject: [PATCH] push --- README.md | 31 ++++++++++++++ flake.lock | 12 +++--- modules/hosts/laptop/laptop.nix | 7 +-- modules/hosts/nix/nix.nix | 3 +- modules/software/beets.nix | 76 +++++++++++++++++---------------- modules/software/stylix.nix | 2 +- modules/users/bug.nix | 3 +- 7 files changed, 84 insertions(+), 50 deletions(-) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..1882194 --- /dev/null +++ b/README.md @@ -0,0 +1,31 @@ +# nix + +[dendritic](https://github.com/vic/den) [nix](https://nixos.org/) configuration. + +## hosts +| host | command | +|-|-| +| [desktop](https://github.com/4DBug/nix/tree/master/modules/hosts/nix/nix.nix) | `nh os switch ~/nix --impure -H nix` | +| [laptop](https://github.com/4DBug/nix/tree/master/modules/hosts/nix/laptop.nix) | `nh os switch ~/nix --impure -H laptop` | +| [server](https://github.com/4DBug/nix/tree/master/modules/hosts/nix/box.nix) | `nh os switch ~/nix --impure -H box` | + +## services +| service | location | file | +|-|-|-| +| [invidious](https://github.com/invidious/invidious) | [tube.bug.tools](https://tube.bug.tools/) | /modules/services | +| [glances](https://github.com/nicolargo/glances) | [monitor.bug.tools](https://monitor.bug.tools/) | /modules/services | +| [searxng](https://github.com/searxng/searxng) | [search.bug.tools](https://search.bug.tools/) | /modules/services | +| [redlib](https://github.com/redlib-org/redlibb) | [reddit.bug.tools](https://reddit.bug.tools/) | ./modules/services/searxng/searxng.nix | +| [copyparty](https://github.com/9001/copyparty) | [files.bug.tools](https://files.bug.tools/) | /modules/services | +| [matrix](https://matrix.org/) | [matrix.bug.tools](https://matrix.bug.tools/) | /modules/services | +| [nixos-mailserver](https://gitlab.com/simple-nixos-mailserver/nixos-mailserver) | [mail.bug.tools](https://mail.bug.tools/) | /modules/services | +| [sish](https://docs.ssi.sh/) | [tuns.bug.tools](https://tuns.bug.tools/) | /modules/services | +| [vscode-server](https://github.com/cdr/code-server) | - | /modules/services | + +## software + +| software | file | +|-|-| +| a | b | +| c | d | +| e | f | \ No newline at end of file diff --git a/flake.lock b/flake.lock index dacb5d2..41760a5 100644 --- a/flake.lock +++ b/flake.lock @@ -246,11 +246,11 @@ ] }, "locked": { - "lastModified": 1771422582, - "narHash": "sha256-xK5kl3OBZaF1VwziVMX+SZ2LT9Fbu5o8vRDt78uR7no=", + "lastModified": 1771505064, + "narHash": "sha256-lh9rF+C/nKFyWAqbHIa6tK9L/6N0UaQg7zw15aP4jBM=", "owner": "nix-community", "repo": "home-manager", - "rev": "b3ccd4bb262f4e6d3248b46cede92b90c4a42094", + "rev": "a0a01d8811fd5e99e003078ed64a0e7b531545dd", "type": "github" }, "original": { @@ -307,11 +307,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1771177547, - "narHash": "sha256-trTtk3WTOHz7hSw89xIIvahkgoFJYQ0G43IlqprFoMA=", + "lastModified": 1771207753, + "narHash": "sha256-b9uG8yN50DRQ6A7JdZBfzq718ryYrlmGgqkRm9OOwCE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ac055f38c798b0d87695240c7b761b82fc7e5bc2", + "rev": "d1c15b7d5806069da59e819999d70e1cec0760bf", "type": "github" }, "original": { diff --git a/modules/hosts/laptop/laptop.nix b/modules/hosts/laptop/laptop.nix index 3b1efcb..e6e57e0 100644 --- a/modules/hosts/laptop/laptop.nix +++ b/modules/hosts/laptop/laptop.nix @@ -15,21 +15,22 @@ cloudflare-warp packages development - #cad + cad mpd virtualisation flatpak fish dns openssh + beets ]; nixos = { networking.hostName = "nix"; services.logind.settings.Login = { - HandleLidSwitch = "ignore"; - HandleLidSwitchDocked = "ignore"; + HandleLidSwitch = "ignore"; + HandleLidSwitchDocked = "ignore"; }; }; }; diff --git a/modules/hosts/nix/nix.nix b/modules/hosts/nix/nix.nix index b11a20f..0f831b4 100644 --- a/modules/hosts/nix/nix.nix +++ b/modules/hosts/nix/nix.nix @@ -15,13 +15,14 @@ #cloudflare-warp packages development - #cad + cad mpd virtualisation flatpak fish dns openssh + beets ]; nixos = { diff --git a/modules/software/beets.nix b/modules/software/beets.nix index bf16bb5..cc338fc 100644 --- a/modules/software/beets.nix +++ b/modules/software/beets.nix @@ -1,51 +1,53 @@ { den.aspects.beets = { homeManager = { pkgs, ... }: { - packages = with pkgs; [ - beets - ffmpeg - chromaprint - ]; + home = { + packages = with pkgs; [ + beets + ffmpeg + chromaprint + ]; - file.".config/beets/config.yaml".text = '' - library: ~/.local/share/beets/library.db - directory: ~/Music + file.".config/beets/config.yaml".text = '' + library: ~/.local/share/beets/library.db + directory: ~/Music - import: - write: true - copy: true + import: + write: true + copy: true - plugins: - - convert - - fetchart - - embedart - - fromfilename - - chroma - - smartplaylist + plugins: + - convert + - fetchart + - embedart + - fromfilename + - chroma + - smartplaylist - paths: - default: $artist/$album/$track - $title + paths: + default: $artist/$album/$track - $title - convert: - auto: true - format: opus - formats: - opus: ffmpeg -i $source -y -vn -c:a libopus -b:a 160k $dest - dest: /home/bug/Music + convert: + auto: true + format: opus + formats: + opus: ffmpeg -i $source -y -vn -c:a libopus -b:a 160k $dest + dest: /home/bug/Music - fetchart: - auto: yes - ifempty: yes - art_filename: folder + fetchart: + auto: yes + ifempty: yes + art_filename: folder - embedart: - auto: yes + embedart: + auto: yes - smartplaylist: - playlist_dir: ~/Music/playlists - relative_to: library - output: extm3u - ''; + smartplaylist: + playlist_dir: ~/Music/playlists + relative_to: library + output: extm3u + ''; + }; }; }; } diff --git a/modules/software/stylix.nix b/modules/software/stylix.nix index 03780f5..740ab53 100644 --- a/modules/software/stylix.nix +++ b/modules/software/stylix.nix @@ -7,7 +7,7 @@ stylix = { enable = true; - autoEnable = true; + autoEnable = false; polarity = "dark"; # catppuccin mocha diff --git a/modules/users/bug.nix b/modules/users/bug.nix index 081d7dc..96d6b25 100644 --- a/modules/users/bug.nix +++ b/modules/users/bug.nix @@ -1,5 +1,4 @@ -{ den, ... }: -{ +{ den, ... }: { den.aspects.bug = { includes = [ den.provides.primary-user