From 181babfa2abe8c8e98fca86bebaae5d8cfc18fdb Mon Sep 17 00:00:00 2001 From: Danilo Reyes Date: Wed, 18 Dec 2024 13:30:55 -0600 Subject: [PATCH] list concatenation --- gnome.nix | 37 +++++++++++++---------------- modules/apps/gaming.nix | 49 ++++++++++++++++++--------------------- modules/apps/internet.nix | 40 ++++++++++++++------------------ modules/dev/python.nix | 41 ++++++++++++++++---------------- 4 files changed, 77 insertions(+), 90 deletions(-) diff --git a/gnome.nix b/gnome.nix index f2edede..8eb1f16 100644 --- a/gnome.nix +++ b/gnome.nix @@ -36,25 +36,20 @@ enable = true; style = "adwaita"; }; - users.users.jawz.packages = - builtins.attrValues { - inherit (pkgs) - adw-gtk3 # theme legacy applications - gnome-tweaks # tweaks for the gnome desktop environment - papirus-icon-theme # icon theme - libgda # for pano shell extension - ; - } - ++ builtins.attrValues { - inherit (pkgs.gnomeExtensions) - appindicator # applets for open applications - tactile # window manager - freon # hardware temperature monitor - gamemode-shell-extension # I guess I'm a gamer now? - burn-my-windows # special effects for when closing windows - ; - } - ++ [ - inputs.jawz-scripts.packages.x86_64-linux.pano - ]; + users.users.jawz.packages = builtins.attrValues { + inherit (pkgs) + # adw-gtk3 # theme legacy applications + libgda # for pano shell extension + ; + inherit (pkgs.gnomeExtensions) + appindicator # applets for open applications + tactile # window manager + freon # hardware temperature monitor + gamemode-shell-extension # I guess I'm a gamer now? + burn-my-windows # special effects for when closing windows + ; + inherit (inputs.jawz-scripts.packages.x86_64-linux) + pano + ; + }; } diff --git a/modules/apps/gaming.nix b/modules/apps/gaming.nix index bc40e82..22de41e 100644 --- a/modules/apps/gaming.nix +++ b/modules/apps/gaming.nix @@ -19,32 +19,29 @@ platformOptimizations.enable = true; }; }; - users.users.jawz.packages = - builtins.attrValues { - inherit (pkgs) - shipwright # zelda OoT port - mangohud # fps & stats overlay - lutris # games launcher & emulator hub - cartridges # games launcher - gamemode # optimizes linux to have better gaming performance - heroic # install epic games - protonup-qt # update proton-ge - ns-usbloader # load games into my switch + users.users.jawz.packages = builtins.attrValues { + inherit (pkgs) + shipwright # zelda OoT port + mangohud # fps & stats overlay + lutris # games launcher & emulator hub + cartridges # games launcher + gamemode # optimizes linux to have better gaming performance + heroic # install epic games + protonup-qt # update proton-ge + ns-usbloader # load games into my switch - # emulators - rpcs3 # ps3 - pcsx2 # ps2 - cemu # wii u - dolphin-emu # wii - snes9x-gtk # snes - ryujinx # switch - ; - } - ++ builtins.attrValues { - inherit (inputs.jawz-scripts.packages.x86_64-linux) - polymc # minecraft launcher - citra # 3Ds emulator - ; - }; + # emulators + rpcs3 # ps3 + pcsx2 # ps2 + cemu # wii u + dolphin-emu # wii + snes9x-gtk # snes + ryujinx # switch + ; + inherit (inputs.jawz-scripts.packages.x86_64-linux) + polymc # minecraft launcher + citra # 3Ds emulator + ; + }; }; } diff --git a/modules/apps/internet.nix b/modules/apps/internet.nix index 9b2745a..c9421e1 100644 --- a/modules/apps/internet.nix +++ b/modules/apps/internet.nix @@ -20,27 +20,23 @@ ]; }; }; - users.users.jawz.packages = - builtins.attrValues { - inherit (inputs.jawz-scripts.packages.x86_64-linux) - vdhcoapp # video download helper assistant - talk # nextcloud talk client - ; - } - ++ builtins.attrValues { - inherit (pkgs) - thunderbird # email client - warp # transfer files with based ppl - brave # crypto-browser that at least somewhat integrates with gtk - nextcloud-client # self-hosted google-drive alternative - fragments # beautiful torrent client - tor-browser-bundle-bin # dark web, so dark! - telegram-desktop # furry chat - nicotine-plus # remember Ares? - vesktop # screen share with audio discord - discord-ptb # :3 - teamspeak5_client # ppl say they will use this...? - ; - }; + users.users.jawz.packages = builtins.attrValues { + inherit (inputs.jawz-scripts.packages.x86_64-linux) + vdhcoapp # video download helper assistant + talk # nextcloud talk client + ; + inherit (pkgs) + thunderbird # email client + warp # transfer files with based ppl + brave # crypto-browser that at least somewhat integrates with gtk + nextcloud-client # self-hosted google-drive alternative + fragments # beautiful torrent client + tor-browser-bundle-bin # dark web, so dark! + telegram-desktop # furry chat + nicotine-plus # remember Ares? + vesktop # screen share with audio discord + discord-ptb # :3 + ; + }; }; } diff --git a/modules/dev/python.nix b/modules/dev/python.nix index f5de487..83d3d2d 100644 --- a/modules/dev/python.nix +++ b/modules/dev/python.nix @@ -10,28 +10,27 @@ home-manager.users.jawz.xdg.configFile."python/pythonrc".source = ../../dotfiles/pythonrc; environment.variables.PYTHONSTARTUP = "\${XDG_CONFIG_HOME}/python/pythonrc"; users.users.jawz.packages = - let - packages = builtins.attrValues { - inherit (pkgs) - pipenv # python development workflow for humans - pyright # LSP - ; - }; - pythonPackages = builtins.attrValues { - inherit (pkgs.python3Packages) - black # Python code formatter - editorconfig # follow rules of contributin - flake8 # wraper for pyflakes, pycodestyle and mccabe - isort # sort Python imports - pyflakes # checks source code for errors - pylint # bug and style checker for python - speedtest-cli # check internet speed from the comand line - ; - }; - in - packages + builtins.attrValues { + inherit (pkgs) + pipenv # python development workflow for humans + pyright # LSP + ; + } ++ [ - (pkgs.python3.withPackages (_ps: pythonPackages)) + (pkgs.python3.withPackages ( + _ps: + builtins.attrValues { + inherit (pkgs.python3Packages) + black # Python code formatter + editorconfig # follow rules of contributin + flake8 # wraper for pyflakes, pycodestyle and mccabe + isort # sort Python imports + pyflakes # checks source code for errors + pylint # bug and style checker for python + speedtest-cli # check internet speed from the comand line + ; + } + )) ]; }; }