diff --git a/hosts/miniserver/configuration.nix b/hosts/miniserver/configuration.nix index d8569ba..978ab26 100644 --- a/hosts/miniserver/configuration.nix +++ b/hosts/miniserver/configuration.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, lib, pkgs, ... }: let version = "23.11"; myEmail = "CaptainJawZ@outlook.com"; diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix index 2c79969..a1c4593 100644 --- a/hosts/server/configuration.nix +++ b/hosts/server/configuration.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, lib, pkgs, ... }: let version = "23.11"; myEmail = "CaptainJawZ@outlook.com"; diff --git a/hosts/workstation/configuration.nix b/hosts/workstation/configuration.nix index 3b428cc..519dca2 100644 --- a/hosts/workstation/configuration.nix +++ b/hosts/workstation/configuration.nix @@ -20,6 +20,7 @@ in { fonts.enable = true; gaming.enable = true; internet.enable = true; + multimedia.enable = true; office.enable = true; }; dev = { @@ -95,44 +96,32 @@ in { }; jawz = { packages = (with pkgs; [ - blanket # background noise - pika-backup # backups - metadata-cleaner # remove any metadata and geolocation from files - # sequeler # friendly SQL client - # czkawka # duplicate finder - # celeste # sync tool for any cloud provider - - easyeffects # equalizer - celluloid # video player - # cozy # audiobooks player - # hakuneko # manga & comic GUI downloader - # gnome-podcasts # podcast player - handbrake # video converter, may be unnecessary - curtail # image compressor - pitivi # video editor - identity # compare images or videos - gnome-obfuscate # censor private information - mousai # poor man shazam - tagger # tag music files obs-studio # screen recorder & streamer - shortwave # listen to world radio + pitivi # video editor + + # celeste # sync tool for any cloud provider + # czkawka # duplicate finder + # sequeler # friendly SQL client + blanket # background noise + metadata-cleaner # remove any metadata and geolocation from files + pika-backup # backups + gnome-obfuscate # censor private information unstable.yt-dlp # downloads videos from most video websites gallery-dl # similar to yt-dlp but for most image gallery websites + (ripgrep.override { withPCRE2 = true; }) # modern grep + du-dust # rusty du similar to gdu + eza # like ls but with colors fd # modern find, faster searches + ffmpeg_5-full # not ffmpreg, the coolest video conversion tool! fzf # fuzzy finder! super cool and useful gdu # disk-space utility checker, somewhat useful - du-dust # rusty du similar to gdu - (ripgrep.override { withPCRE2 = true; }) # modern grep - trash-cli # oop! did not meant to delete that - eza # like ls but with colors gocryptfs # encrypted filesystem! shhh!!! - rmlint # probably my favourite app, amazing dupe finder that integrates well with BTRFS imagemagick # photoshop what?? - - ffmpeg_5-full # not ffmpreg, the coolest video conversion tool! + rmlint # probably my favourite app, amazing dupe finder that integrates well with BTRFS torrenttools # create torrent files from the terminal! + trash-cli # oop! did not meant to delete that vcsi # video thumbnails for torrents, can I replace it with ^? (writeScriptBin "tasks" (builtins.readFile ../../scripts/tasks.sh)) diff --git a/modules/apps.nix b/modules/apps.nix index 2701304..270693a 100644 --- a/modules/apps.nix +++ b/modules/apps.nix @@ -7,6 +7,7 @@ ./apps/fonts.nix ./apps/gaming.nix ./apps/internet.nix + ./apps/multimedia.nix ./apps/office.nix ]; my = { @@ -17,6 +18,7 @@ fonts.enable = lib.mkDefault false; gaming.enable = lib.mkDefault false; internet.enable = lib.mkDefault false; + multimedia.enable = lib.mkDefault false; office.enable = lib.mkDefault false; }; }; diff --git a/modules/apps/art.nix b/modules/apps/art.nix index e0e6c4d..b621005 100644 --- a/modules/apps/art.nix +++ b/modules/apps/art.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, unstable, ... }: +{ config, lib, pkgs, unstable, ... }: let unstable = import (builtins.fetchTarball "https://github.com/nixos/nixpkgs/tarball/master") { diff --git a/modules/apps/dictionaries.nix b/modules/apps/dictionaries.nix index 4972f2a..da9f75e 100644 --- a/modules/apps/dictionaries.nix +++ b/modules/apps/dictionaries.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, unstable, ... }: +{ config, lib, pkgs, unstable, ... }: { options.my.apps.dictionaries.enable = lib.mkEnableOption "enable"; diff --git a/modules/apps/fonts.nix b/modules/apps/fonts.nix index 842a16d..2defad5 100644 --- a/modules/apps/fonts.nix +++ b/modules/apps/fonts.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, unstable, ... }: +{ config, lib, pkgs, unstable, ... }: { options.my.apps.fonts.enable = lib.mkEnableOption "enable"; diff --git a/modules/apps/gaming.nix b/modules/apps/gaming.nix index eb7c54d..e0facd7 100644 --- a/modules/apps/gaming.nix +++ b/modules/apps/gaming.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, lib, pkgs, ... }: { options.my.apps.gaming.enable = lib.mkEnableOption "enable"; diff --git a/modules/apps/internet.nix b/modules/apps/internet.nix index 9873281..a634f1f 100644 --- a/modules/apps/internet.nix +++ b/modules/apps/internet.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, unstable, ... }: +{ config, lib, pkgs, unstable, ... }: { options.my.apps.internet.enable = lib.mkEnableOption "enable"; diff --git a/modules/apps/multimedia.nix b/modules/apps/multimedia.nix new file mode 100644 index 0000000..20f3aed --- /dev/null +++ b/modules/apps/multimedia.nix @@ -0,0 +1,20 @@ +{ config, lib, pkgs, ... }: + +{ + options.my.apps.multimedia.enable = lib.mkEnableOption "enable"; + config = lib.mkIf config.my.apps.multimedia.enable { + users.users.jawz.packages = with pkgs; ([ + # cozy # audiobooks player + # gnome-podcasts # podcast player + # hakuneko # manga & comic GUI downloader + celluloid # video player + curtail # image compressor + easyeffects # equalizer + handbrake # video converter, may be unnecessary + identity # compare images or videos + mousai # poor man shazam + shortwave # listen to world radio + tagger # tag music files + ]); + }; +} diff --git a/modules/apps/office.nix b/modules/apps/office.nix index 3103f2f..e3c3aa1 100644 --- a/modules/apps/office.nix +++ b/modules/apps/office.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, unstable, ... }: +{ config, lib, pkgs, unstable, ... }: { options.my.apps.office.enable = lib.mkEnableOption "enable"; diff --git a/modules/dev/haskell.nix b/modules/dev/haskell.nix index addd712..05f3dd8 100644 --- a/modules/dev/haskell.nix +++ b/modules/dev/haskell.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, lib, pkgs, ... }: { options.my.dev.haskell.enable = lib.mkEnableOption "enable"; diff --git a/modules/dev/nix.nix b/modules/dev/nix.nix index 2e8119f..367f8ab 100644 --- a/modules/dev/nix.nix +++ b/modules/dev/nix.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, lib, pkgs, ... }: { options.my.dev.nix.enable = lib.mkEnableOption "enable"; diff --git a/modules/dev/python.nix b/modules/dev/python.nix index 863150b..08de9bd 100644 --- a/modules/dev/python.nix +++ b/modules/dev/python.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, lib, pkgs, ... }: { options.my.dev.python.enable = lib.mkEnableOption "enable"; diff --git a/modules/services/network.nix b/modules/services/network.nix index bfd4110..2bf4bfd 100644 --- a/modules/services/network.nix +++ b/modules/services/network.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, lib, pkgs, ... }: { options.my.services.network.enable = lib.mkEnableOption "enable"; diff --git a/modules/services/nvidia.nix b/modules/services/nvidia.nix index 2a8b071..ce97052 100644 --- a/modules/services/nvidia.nix +++ b/modules/services/nvidia.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, lib, pkgs, ... }: { options.my.services.nvidia.enable = lib.mkEnableOption "enable"; diff --git a/modules/services/printing.nix b/modules/services/printing.nix index 1bababd..9f724ab 100644 --- a/modules/services/printing.nix +++ b/modules/services/printing.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, lib, pkgs, ... }: let printingDrivers = [ pkgs.hplip pkgs.hplipWithPlugin ]; in { options.my.services.printing.enable = lib.mkEnableOption "enable"; diff --git a/modules/services/sound.nix b/modules/services/sound.nix index e87cb75..e7b21a4 100644 --- a/modules/services/sound.nix +++ b/modules/services/sound.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, lib, pkgs, ... }: # let # nixGaming = import (builtins.fetchTarball # "https://github.com/fufexan/nix-gaming/archive/master.tar.gz");