Cian-H/My_NixOS_Config
1
0
Fork 0
mirror of https://github.com/Cian-H/My_NixOS_Config.git synced 2025-12-23 07:21:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switched package lists from with syntax to explicit

Browse Source 
Appranently, the use of `with` for this is discouraged as it can cause
some kinds of compilation/linking issues. Switching to explicit
declaration is a bit more verbose, but probably makes organising into
modules easier in the long run anyway.
This commit is contained in:
Cian Hughes
2025-04-14 10:58:46 +01:00
parent c487bf5807
commit 51f65717a1
6 changed files with 303 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
home-manager/core/packages.nix
View File

@@ -7,18 +7,15 @@
unstablePkgs, unstablePkgs,
... ...
}: { }: {
home.packages = home.packages = [
(with pkgs; [ pkgs.alejandra
alejandra pkgs.git-extras
git-extras pkgs.git-credential-manager
git-credential-manager pkgs.meld
meld pkgs.unzip
unzip unstablePkgs.devenv
]) unstablePkgs.lazygit
++ (with unstablePkgs; [ unstablePkgs.nixd
devenv unstablePkgs.nushell
lazygit ];
nixd
nushell
]);
} }

23
home-manager/homeserver/packages.nix
View File

@@ -7,9 +7,8 @@
unstablePkgs, unstablePkgs,
... ...
}: { }: {
home.packages = home.packages = [
(with pkgs; [ (pkgs.python3.withPackages (
(python3.withPackages (
python-pkgs: [ python-pkgs: [
python-pkgs.pip python-pkgs.pip
python-pkgs.pkginfo python-pkgs.pkginfo
@@ -17,14 +16,12 @@
python-pkgs.setuptools python-pkgs.setuptools
] ]
)) ))
lua54Packages.lua pkgs.lua54Packages.lua
luajitPackages.luarocks pkgs.luajitPackages.luarocks
nodejs-slim pkgs.nodejs-slim
sops pkgs.sops
stylua pkgs.stylua
]) unstablePkgs.podman-tui
++ (with unstablePkgs; [ unstablePkgs.vimPlugins.mason-lspconfig-nvim
podman-tui ];
vimPlugins.mason-lspconfig-nvim
]);
} }

133
home-manager/worklaptop/packages.nix
View File

@@ -7,46 +7,49 @@
unstablePkgs, unstablePkgs,
... ...
}: { }: {
home.packages = home.packages = [
(with pkgs; [ pkgs.bitwarden
bitwarden pkgs.blueman
blueman pkgs.distrobox
distrobox pkgs.ferdium
ferdium pkgs.gimp-with-plugins
gimp-with-plugins pkgs.github-desktop
github-desktop pkgs.helix
helix pkgs.hyperfine
hyperfine pkgs.imagemagick
imagemagick pkgs.inkscape-with-extensions
inkscape-with-extensions pkgs.krita
krita pkgs.lynx
lynx pkgs.neovide
neovide pkgs.nwg-look
nwg-look pkgs.obsidian
obsidian pkgs.obs-studio
obs-studio pkgs.onlyoffice-desktopeditors
onlyoffice-desktopeditors pkgs.pandoc
pandoc pkgs.pavucontrol
pavucontrol pkgs.podman-desktop
podman-desktop pkgs.podman-tui
podman-tui pkgs.qimgv
qimgv pkgs.slack
slack pkgs.smile
smile pkgs.spotify
spotify pkgs.vial
vial pkgs.vivaldi
vivaldi pkgs.vivaldi-ffmpeg-codecs
vivaldi-ffmpeg-codecs pkgs.warpinator
warpinator pkgs.zathura
zathura pkgs.zed-editor
zettlr pkgs.zettlr
unstablePkgs.nextcloud-client
unstablePkgs.zotero
inputs.zen-browser.packages.x86_64-linux.default
# theming # theming
gtk-engine-murrine pkgs.gtk-engine-murrine
gtk_engines pkgs.gtk_engines
phinger-cursors pkgs.phinger-cursors
tokyonight-gtk-theme pkgs.tokyonight-gtk-theme
# Python packages # Python packages
(python3.withPackages ( (pkgs.python3.withPackages (
python-pkgs: [ python-pkgs: [
python-pkgs.pip python-pkgs.pip
python-pkgs.pkginfo python-pkgs.pkginfo
@@ -55,37 +58,29 @@
] ]
)) ))
# Backend dev tools # Backend dev tools
go pkgs.go
lua54Packages.lua pkgs.lua54Packages.lua
luajitPackages.luarocks pkgs.luajitPackages.luarocks
mypy pkgs.mypy
php83 pkgs.php83
poetry pkgs.poetry
poetryPlugins.poetry-plugin-up pkgs.poetryPlugins.poetry-plugin-up
poetryPlugins.poetry-plugin-export pkgs.poetryPlugins.poetry-plugin-export
poetryPlugins.poetry-audit-plugin pkgs.poetryPlugins.poetry-audit-plugin
pre-commit pkgs.pre-commit
rustup pkgs.rustup
sshs pkgs.sshs
steam-run pkgs.steam-run
stylua pkgs.stylua
tree-sitter pkgs.tree-sitter
xarchiver pkgs.xarchiver
# Language Server Protocols # Language Server Protocols
elixir-ls pkgs.elixir-ls
fortls pkgs.fortls
nodePackages_latest.bash-language-server pkgs.nodePackages_latest.bash-language-server
lua-language-server pkgs.lua-language-server
taplo pkgs.taplo
yaml-language-server pkgs.yaml-language-server
zed-editor unstablePkgs.vimPlugins.mason-lspconfig-nvim
])
++ (with unstablePkgs; [
nextcloud-client
vimPlugins.mason-lspconfig-nvim
zotero
])
++ [
inputs.zen-browser.packages.x86_64-linux.default
]; ];
} }

115
nixos/homeserver/configuration.nix
View File

@@ -121,63 +121,60 @@
}; };
# $ nix search wget # $ nix search wget
environment.systemPackages = environment.systemPackages = [
(with pkgs; [ pkgs.atuin
atuin pkgs.bat
bat pkgs.bitwarden-cli
bitwarden-cli pkgs.bottom
bottom pkgs.delta
delta pkgs.du-dust
du-dust pkgs.duf
duf pkgs.fastfetch
fastfetch pkgs.fd
fd pkgs.fzf
fzf pkgs.gh
gh pkgs.git
git pkgs.git-extras
git-extras pkgs.glab
glab pkgs.glow
glow pkgs.gnupg
gnupg pkgs.hexyl
hexyl pkgs.killall
killall pkgs.less
less pkgs.libsecret
libsecret pkgs.netcat-gnu
netcat-gnu pkgs.nix-index
nix-index pkgs.openssl
openssl pkgs.ouch
ouch pkgs.pass
pass pkgs.passh
passh pkgs.pueue
pueue pkgs.pinentry-tty
pinentry-tty pkgs.pkg-config
pkg-config pkgs.podman-compose
podman-compose pkgs.powertop
powertop pkgs.pueue
pueue pkgs.ripgrep
ripgrep pkgs.rm-improved
rm-improved pkgs.starship
starship pkgs.tealdeer
tealdeer pkgs.wget
wget pkgs.wl-clipboard
wl-clipboard pkgs.xclip
xclip pkgs.xcp
xcp pkgs.zellij
zellij pkgs.zoxide
zoxide pkgs.brotli
brotli pkgs.gcc
gcc pkgs.gnumake
gnumake pkgs.micro
micro unstablePkgs.just
]) unstablePkgs.neovim
++ (with unstablePkgs; [ unstablePkgs.nushell
just unstablePkgs.onefetch
neovim unstablePkgs.serie
nushell unstablePkgs.yazi
onefetch ];
serie
yazi
]);
programs.neovim = { programs.neovim = {
enable = true; enable = true;
@@ -261,8 +258,8 @@
enableDefaultPackages = true; enableDefaultPackages = true;
fontDir.enable = true; fontDir.enable = true;
fontconfig.defaultFonts.monospace = ["MonaspiceArNerdFontMono"]; fontconfig.defaultFonts.monospace = ["MonaspiceArNerdFontMono"];
packages = with pkgs; [ packages = [
nerdfonts pkgs.nerdfonts
]; ];
}; };
} }

249
nixos/worklaptop/configuration.nix
View File

@@ -21,15 +21,15 @@
hardware.graphics = { hardware.graphics = {
enable = true; enable = true;
enable32Bit = true; enable32Bit = true;
extraPackages = with pkgs; [ extraPackages = [
intel-compute-runtime pkgs.intel-compute-runtime
intel-media-driver pkgs.intel-media-driver
libglvnd pkgs.libglvnd
libvdpau-va-gl pkgs.libvdpau-va-gl
mesa pkgs.mesa
nvidia-vaapi-driver pkgs.nvidia-vaapi-driver
vaapiIntel pkgs.vaapiIntel
vaapiVdpau pkgs.vaapiVdpau
]; ];
}; };
hardware.nvidia = { hardware.nvidia = {
@@ -173,100 +173,97 @@
''; '';
# $ nix search wget # $ nix search wget
environment.systemPackages = environment.systemPackages = [
(with pkgs; [
# shell env programs # shell env programs
atuin pkgs.atuin
bat pkgs.bat
bitwarden-cli pkgs.bitwarden-cli
bottom pkgs.bottom
delta pkgs.delta
du-dust pkgs.du-dust
duf pkgs.duf
fastfetch pkgs.fastfetch
fd pkgs.fd
fzf pkgs.fzf
gdm pkgs.gdm
gh pkgs.gh
git pkgs.git
git-extras pkgs.git-extras
glab pkgs.glab
glow pkgs.glow
gnupg pkgs.gnupg
grub2_efi pkgs.grub2_efi
hexyl pkgs.hexyl
killall pkgs.killall
less pkgs.less
libsecret pkgs.libsecret
mosh pkgs.mosh
netcat-gnu pkgs.netcat-gnu
nix-index pkgs.nix-index
nix-ld pkgs.nix-ld
nmap pkgs.nmap
nodejs pkgs.nodejs
openssl pkgs.openssl
ouch pkgs.ouch
pass pkgs.pass
passh pkgs.passh
phinger-cursors pkgs.phinger-cursors
pinentry-gnome3 pkgs.pinentry-gnome3
pkg-config pkgs.pkg-config
podman-compose pkgs.podman-compose
powertop pkgs.powertop
pueue pkgs.pueue
qmk pkgs.qmk
qmk-udev-rules pkgs.qmk-udev-rules
qmk_hid pkgs.qmk_hid
ripgrep pkgs.ripgrep
rm-improved pkgs.rm-improved
seahorse pkgs.seahorse
starship pkgs.starship
tealdeer pkgs.tealdeer
wget pkgs.wget
wl-clipboard pkgs.wl-clipboard
xclip pkgs.xclip
xcp pkgs.xcp
xfce.thunar pkgs.xfce.thunar
xfce.tumbler pkgs.xfce.tumbler
zellij pkgs.zellij
zoxide pkgs.zoxide
unstablePkgs.yazi
# package managers # package managers
flatpak pkgs.flatpak
# back-end dev tools # back-end dev tools
brotli pkgs.brotli
gcc pkgs.gcc
gnumake pkgs.gnumake
unstablePkgs.just
unstablePkgs.ruff
unstablePkgs.serie
unstablePkgs.uv
# front-end dev environment # front-end dev environment
micro pkgs.micro
unstablePkgs.ghostty
unstablePkgs.neovim
unstablePkgs.nushell
unstablePkgs.onefetch
# DE and accompanying tools # DE and accompanying tools
wayland pkgs.wayland
wayland-utils pkgs.wayland-utils
sway # More stable, backup DE pkgs.sway # More stable, backup DE
hyprland pkgs.hyprland
hyprlock pkgs.hyprlock
hyprpaper pkgs.hyprpaper
hyprpicker pkgs.hyprpicker
hyprshot pkgs.hyprshot
xdg-desktop-portal-hyprland pkgs.xdg-desktop-portal-hyprland
xdg-desktop-portal-wlr pkgs.xdg-desktop-portal-wlr
xdg-desktop-portal-gtk pkgs.xdg-desktop-portal-gtk
xdg-desktop-portal-xapp pkgs.xdg-desktop-portal-xapp
]) unstablePkgs.libnotify
++ (with unstablePkgs; [ unstablePkgs.swaynotificationcenter
just unstablePkgs.waybar
ghostty unstablePkgs.wofi
libnotify ];
neovim
nushell
onefetch
ruff
serie
swaynotificationcenter
uv
waybar
wofi
yazi
]);
hardware.keyboard.qmk.enable = true; hardware.keyboard.qmk.enable = true;
@@ -292,10 +289,10 @@
# Enable my preferred DE utilities # Enable my preferred DE utilities
programs.thunar.enable = true; programs.thunar.enable = true;
programs.thunar.plugins = with pkgs.xfce; [ programs.thunar.plugins = [
thunar-volman pkgs.xfce.thunar-volman
thunar-archive-plugin pkgs.xfce.thunar-archive-plugin
thunar-media-tags-plugin pkgs.xfce.thunar-media-tags-plugin
]; ];
services.gvfs.enable = true; services.gvfs.enable = true;
services.tumbler.enable = true; services.tumbler.enable = true;
@@ -317,30 +314,30 @@
programs.direnv.nix-direnv.enable = true; programs.direnv.nix-direnv.enable = true;
programs.nix-ld = { programs.nix-ld = {
enable = true; enable = true;
libraries = with pkgs; [ libraries = [
acl pkgs.acl
alsa-lib pkgs.alsa-lib
at-spi2-core pkgs.at-spi2-core
attr pkgs.attr
bzip2 pkgs.bzip2
curl pkgs.curl
dbus pkgs.dbus
expat pkgs.expat
glib pkgs.glib
libsodium pkgs.libsodium
libssh pkgs.libssh
libxml2 pkgs.libxml2
nspr pkgs.nspr
nss pkgs.nss
openssl pkgs.openssl
pango pkgs.pango
stdenv.cc pkgs.stdenv.cc
systemd pkgs.systemd
util-linux pkgs.util-linux
vulkan-loader pkgs.vulkan-loader
xz pkgs.xz
zlib pkgs.zlib
zstd pkgs.zstd
]; ];
}; };

30
nixos/worklaptop/theming.nix
View File

@@ -24,27 +24,27 @@
}; };
}; };
packages = with pkgs; [ packages = [
corefonts pkgs.corefonts
liberation_ttf pkgs.liberation_ttf
nerdfonts pkgs.nerdfonts
nerd-font-patcher pkgs.nerd-font-patcher
noto-fonts pkgs.noto-fonts
noto-fonts-color-emoji pkgs.noto-fonts-color-emoji
vistafonts pkgs.vistafonts
winePackages.fonts pkgs.winePackages.fonts
]; ];
}; };
# Theming packages # Theming packages
environment.systemPackages = with pkgs; [ environment.systemPackages = [
# Cursor # Cursor
hyprcursor pkgs.hyprcursor
# QT # QT
libsForQt5.qtstyleplugin-kvantum pkgs.libsForQt5.qtstyleplugin-kvantum
qt6Packages.qtstyleplugin-kvantum pkgs.qt6Packages.qtstyleplugin-kvantum
# Adwaita (i love gnome, but god damn is adwaita annoying on other DEs) # Adwaita (i love gnome, but god damn is adwaita annoying on other DEs)
adwaita-icon-theme pkgs.adwaita-icon-theme
libadwaita pkgs.libadwaita
]; ];
} }