From 82a4fa91690c3e3731b3683422147f8fc4d01ee4 Mon Sep 17 00:00:00 2001 From: kenny Date: Thu, 2 Oct 2025 12:57:45 +0300 Subject: [PATCH] modularized user apps + corrected networking option that was specific to puter --- hosts/puter/default.nix | 3 +- hosts/puter/packages.nix | 53 +++++--------------------- modules/common/networking.nix | 4 -- modules/common/wine.nix | 3 -- modules/userapps/devutils.nix | 34 +++++++++++++++++ modules/userapps/empty.nix | 9 +++++ modules/userapps/internet.nix | 17 +++++++++ modules/userapps/media.nix | 16 ++++++++ modules/userapps/productivity.nix | 17 +++++++++ modules/{common => userapps}/steam.nix | 0 modules/{common => userapps}/utils.nix | 12 +----- 11 files changed, 104 insertions(+), 64 deletions(-) create mode 100644 modules/userapps/devutils.nix create mode 100644 modules/userapps/empty.nix create mode 100644 modules/userapps/internet.nix create mode 100644 modules/userapps/media.nix create mode 100644 modules/userapps/productivity.nix rename modules/{common => userapps}/steam.nix (100%) rename modules/{common => userapps}/utils.nix (63%) diff --git a/hosts/puter/default.nix b/hosts/puter/default.nix index a5c1b72..53b65e9 100644 --- a/hosts/puter/default.nix +++ b/hosts/puter/default.nix @@ -12,13 +12,12 @@ ../../modules/common/nix.nix ../../modules/common/networking.nix ../../modules/common/shell.nix - ../../modules/common/utils.nix ../../modules/common/security.nix - ../../modules/common/steam.nix #../../modules/common/wine.nix ../../modules/common/libvirt.nix ]; networking.hostName = "puter"; # This will be overridden by system/default.nix system.stateVersion = "24.05"; + security.pki.certificates = ["/home/user/.config/bigbox.local.crt"]; } diff --git a/hosts/puter/packages.nix b/hosts/puter/packages.nix index a9da93d..2ae9454 100644 --- a/hosts/puter/packages.nix +++ b/hosts/puter/packages.nix @@ -6,53 +6,18 @@ nixpkgs.config.permittedInsecurePackages = ["qtwebengine-5.15.19"]; nixpkgs.config = {chromium = {enableWideVine = true;};}; + imports = [ + ../../modules/userapps/utils.nix + #../../modules/common/steam.nix + ../../modules/userapps/devutils.nix + ../../modules/userapps/internet.nix + ../../modules/userapps/media.nix + ../../modules/userapps/productivity.nix + ]; + users.users.user = { isNormalUser = true; description = "user"; extraGroups = ["networkmanager" "wheel" "video" "libvirtd"]; - packages = with pkgs; [ - # Dev stuff, most of it might be replaced by devenvs later on - ghostty - tealdeer - vscodium - gcc - python - alejandra - devenv - nodejs - mermaid-cli - rustup - delta - just - kondo - - # Chatting - signal-desktop - element-desktop - - # Productivity apps - obsidian - onlyoffice-desktopeditors - keepassxc - evolution - anki-bin - pomodoro-gtk - #ticker - - # web browsers - ungoogled-chromium - tor-browser-bundle-bin - transmission_4-gtk - - # multimedia - vlc - mpv - yt-dlp - freetube - jellyfin-media-player - feishin - ]; }; - #ciscoPacketTracer8 - #parallel-disk-usage } diff --git a/modules/common/networking.nix b/modules/common/networking.nix index bc6fadc..2234892 100644 --- a/modules/common/networking.nix +++ b/modules/common/networking.nix @@ -29,10 +29,6 @@ settings = {ControlPort = 9051;}; }; - security.pki.certificates = ["/home/user/.config/bigbox.local.crt"]; - - networking.extraHosts = ""; - services.chrony = { enable = true; enableNTS = true; diff --git a/modules/common/wine.nix b/modules/common/wine.nix index 39479cd..4cda4b8 100644 --- a/modules/common/wine.nix +++ b/modules/common/wine.nix @@ -4,11 +4,8 @@ ... }: { environment.systemPackages = with pkgs; [ - # ... - # support both 32-bit and 64-bit applications wineWowPackages.stable - lutris ]; } diff --git a/modules/userapps/devutils.nix b/modules/userapps/devutils.nix new file mode 100644 index 0000000..d6aad89 --- /dev/null +++ b/modules/userapps/devutils.nix @@ -0,0 +1,34 @@ +{ + config, + pkgs, + ... +}: { + programs.neovim = {defaultEditor = true;}; + environment.systemPackages = with pkgs; [ + # Dev stuff, most of it might be replaced by devenvs later on + ghostty + tealdeer + vscodium + gcc + python + alejandra + devenv + nodejs + mermaid-cli + rustup + delta + just + kondo + ciscoPacketTracer8 + # stuff needed by neovim + vimPlugins.LazyVim + texliveSmall # for pdflatex + fzf + lazygit + tree-sitter + neovim + mcfly + luajitPackages.luarocks-nix + tectonic + ]; +} diff --git a/modules/userapps/empty.nix b/modules/userapps/empty.nix new file mode 100644 index 0000000..113af44 --- /dev/null +++ b/modules/userapps/empty.nix @@ -0,0 +1,9 @@ +{ + config, + pkgs, + ... +}: { + programs.neovim = {defaultEditor = true;}; + environment.systemPackages = with pkgs; [ + ]; +} diff --git a/modules/userapps/internet.nix b/modules/userapps/internet.nix new file mode 100644 index 0000000..f822b05 --- /dev/null +++ b/modules/userapps/internet.nix @@ -0,0 +1,17 @@ +{ + config, + pkgs, + ... +}: { + programs.neovim = {defaultEditor = true;}; + environment.systemPackages = with pkgs; [ + # Chatting + signal-desktop + element-desktop + # web browsers + ungoogled-chromium + tor-browser-bundle-bin + librewolf + transmission_4-gtk + ]; +} diff --git a/modules/userapps/media.nix b/modules/userapps/media.nix new file mode 100644 index 0000000..9db4b67 --- /dev/null +++ b/modules/userapps/media.nix @@ -0,0 +1,16 @@ +{ + config, + pkgs, + ... +}: { + programs.neovim = {defaultEditor = true;}; + environment.systemPackages = with pkgs; [ + # multimedia + vlc + mpv + yt-dlp + freetube + jellyfin-media-player + feishin + ]; +} diff --git a/modules/userapps/productivity.nix b/modules/userapps/productivity.nix new file mode 100644 index 0000000..aaca3d6 --- /dev/null +++ b/modules/userapps/productivity.nix @@ -0,0 +1,17 @@ +{ + config, + pkgs, + ... +}: { + programs.neovim = {defaultEditor = true;}; + environment.systemPackages = with pkgs; [ + # Productivity apps + obsidian + onlyoffice-desktopeditors + keepassxc + evolution + anki-bin + pomodoro-gtk + #ticker + ]; +} diff --git a/modules/common/steam.nix b/modules/userapps/steam.nix similarity index 100% rename from modules/common/steam.nix rename to modules/userapps/steam.nix diff --git a/modules/common/utils.nix b/modules/userapps/utils.nix similarity index 63% rename from modules/common/utils.nix rename to modules/userapps/utils.nix index a0700cd..756a6f7 100644 --- a/modules/common/utils.nix +++ b/modules/userapps/utils.nix @@ -5,17 +5,7 @@ }: { programs.neovim = {defaultEditor = true;}; environment.systemPackages = with pkgs; [ - vimPlugins.LazyVim - # stuff needed by neovim - texliveSmall # for pdflatex - fzf - lazygit - tree-sitter - neovim - mcfly - luajitPackages.luarocks-nix - tectonic - + parallel-disk-usage pciutils btop nload