mirror of
https://github.com/Cian-H/My_NixOS_Config.git
synced 2025-12-23 07:21:58 +00:00
Switched package lists from with syntax to explicit
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:
@@ -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
|
|
||||||
]);
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,24 +7,21 @@
|
|||||||
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
|
python-pkgs.python-lsp-server
|
||||||
python-pkgs.python-lsp-server
|
python-pkgs.setuptools
|
||||||
python-pkgs.setuptools
|
]
|
||||||
]
|
))
|
||||||
))
|
pkgs.lua54Packages.lua
|
||||||
lua54Packages.lua
|
pkgs.luajitPackages.luarocks
|
||||||
luajitPackages.luarocks
|
pkgs.nodejs-slim
|
||||||
nodejs-slim
|
pkgs.sops
|
||||||
sops
|
pkgs.stylua
|
||||||
stylua
|
unstablePkgs.podman-tui
|
||||||
])
|
unstablePkgs.vimPlugins.mason-lspconfig-nvim
|
||||||
++ (with unstablePkgs; [
|
];
|
||||||
podman-tui
|
|
||||||
vimPlugins.mason-lspconfig-nvim
|
|
||||||
]);
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,85 +7,80 @@
|
|||||||
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
|
||||||
# theming
|
unstablePkgs.nextcloud-client
|
||||||
gtk-engine-murrine
|
unstablePkgs.zotero
|
||||||
gtk_engines
|
inputs.zen-browser.packages.x86_64-linux.default
|
||||||
phinger-cursors
|
# theming
|
||||||
tokyonight-gtk-theme
|
pkgs.gtk-engine-murrine
|
||||||
# Python packages
|
pkgs.gtk_engines
|
||||||
(python3.withPackages (
|
pkgs.phinger-cursors
|
||||||
python-pkgs: [
|
pkgs.tokyonight-gtk-theme
|
||||||
python-pkgs.pip
|
# Python packages
|
||||||
python-pkgs.pkginfo
|
(pkgs.python3.withPackages (
|
||||||
python-pkgs.python-lsp-server
|
python-pkgs: [
|
||||||
python-pkgs.setuptools
|
python-pkgs.pip
|
||||||
]
|
python-pkgs.pkginfo
|
||||||
))
|
python-pkgs.python-lsp-server
|
||||||
# Backend dev tools
|
python-pkgs.setuptools
|
||||||
go
|
]
|
||||||
lua54Packages.lua
|
))
|
||||||
luajitPackages.luarocks
|
# Backend dev tools
|
||||||
mypy
|
pkgs.go
|
||||||
php83
|
pkgs.lua54Packages.lua
|
||||||
poetry
|
pkgs.luajitPackages.luarocks
|
||||||
poetryPlugins.poetry-plugin-up
|
pkgs.mypy
|
||||||
poetryPlugins.poetry-plugin-export
|
pkgs.php83
|
||||||
poetryPlugins.poetry-audit-plugin
|
pkgs.poetry
|
||||||
pre-commit
|
pkgs.poetryPlugins.poetry-plugin-up
|
||||||
rustup
|
pkgs.poetryPlugins.poetry-plugin-export
|
||||||
sshs
|
pkgs.poetryPlugins.poetry-audit-plugin
|
||||||
steam-run
|
pkgs.pre-commit
|
||||||
stylua
|
pkgs.rustup
|
||||||
tree-sitter
|
pkgs.sshs
|
||||||
xarchiver
|
pkgs.steam-run
|
||||||
# Language Server Protocols
|
pkgs.stylua
|
||||||
elixir-ls
|
pkgs.tree-sitter
|
||||||
fortls
|
pkgs.xarchiver
|
||||||
nodePackages_latest.bash-language-server
|
# Language Server Protocols
|
||||||
lua-language-server
|
pkgs.elixir-ls
|
||||||
taplo
|
pkgs.fortls
|
||||||
yaml-language-server
|
pkgs.nodePackages_latest.bash-language-server
|
||||||
zed-editor
|
pkgs.lua-language-server
|
||||||
])
|
pkgs.taplo
|
||||||
++ (with unstablePkgs; [
|
pkgs.yaml-language-server
|
||||||
nextcloud-client
|
unstablePkgs.vimPlugins.mason-lspconfig-nvim
|
||||||
vimPlugins.mason-lspconfig-nvim
|
];
|
||||||
zotero
|
|
||||||
])
|
|
||||||
++ [
|
|
||||||
inputs.zen-browser.packages.x86_64-linux.default
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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
|
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.gdm
|
||||||
gdm
|
pkgs.gh
|
||||||
gh
|
pkgs.git
|
||||||
git
|
pkgs.git-extras
|
||||||
git-extras
|
pkgs.glab
|
||||||
glab
|
pkgs.glow
|
||||||
glow
|
pkgs.gnupg
|
||||||
gnupg
|
pkgs.grub2_efi
|
||||||
grub2_efi
|
pkgs.hexyl
|
||||||
hexyl
|
pkgs.killall
|
||||||
killall
|
pkgs.less
|
||||||
less
|
pkgs.libsecret
|
||||||
libsecret
|
pkgs.mosh
|
||||||
mosh
|
pkgs.netcat-gnu
|
||||||
netcat-gnu
|
pkgs.nix-index
|
||||||
nix-index
|
pkgs.nix-ld
|
||||||
nix-ld
|
pkgs.nmap
|
||||||
nmap
|
pkgs.nodejs
|
||||||
nodejs
|
pkgs.openssl
|
||||||
openssl
|
pkgs.ouch
|
||||||
ouch
|
pkgs.pass
|
||||||
pass
|
pkgs.passh
|
||||||
passh
|
pkgs.phinger-cursors
|
||||||
phinger-cursors
|
pkgs.pinentry-gnome3
|
||||||
pinentry-gnome3
|
pkgs.pkg-config
|
||||||
pkg-config
|
pkgs.podman-compose
|
||||||
podman-compose
|
pkgs.powertop
|
||||||
powertop
|
pkgs.pueue
|
||||||
pueue
|
pkgs.qmk
|
||||||
qmk
|
pkgs.qmk-udev-rules
|
||||||
qmk-udev-rules
|
pkgs.qmk_hid
|
||||||
qmk_hid
|
pkgs.ripgrep
|
||||||
ripgrep
|
pkgs.rm-improved
|
||||||
rm-improved
|
pkgs.seahorse
|
||||||
seahorse
|
pkgs.starship
|
||||||
starship
|
pkgs.tealdeer
|
||||||
tealdeer
|
pkgs.wget
|
||||||
wget
|
pkgs.wl-clipboard
|
||||||
wl-clipboard
|
pkgs.xclip
|
||||||
xclip
|
pkgs.xcp
|
||||||
xcp
|
pkgs.xfce.thunar
|
||||||
xfce.thunar
|
pkgs.xfce.tumbler
|
||||||
xfce.tumbler
|
pkgs.zellij
|
||||||
zellij
|
pkgs.zoxide
|
||||||
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
|
||||||
# front-end dev environment
|
unstablePkgs.just
|
||||||
micro
|
unstablePkgs.ruff
|
||||||
# DE and accompanying tools
|
unstablePkgs.serie
|
||||||
wayland
|
unstablePkgs.uv
|
||||||
wayland-utils
|
# front-end dev environment
|
||||||
sway # More stable, backup DE
|
pkgs.micro
|
||||||
hyprland
|
unstablePkgs.ghostty
|
||||||
hyprlock
|
unstablePkgs.neovim
|
||||||
hyprpaper
|
unstablePkgs.nushell
|
||||||
hyprpicker
|
unstablePkgs.onefetch
|
||||||
hyprshot
|
# DE and accompanying tools
|
||||||
xdg-desktop-portal-hyprland
|
pkgs.wayland
|
||||||
xdg-desktop-portal-wlr
|
pkgs.wayland-utils
|
||||||
xdg-desktop-portal-gtk
|
pkgs.sway # More stable, backup DE
|
||||||
xdg-desktop-portal-xapp
|
pkgs.hyprland
|
||||||
])
|
pkgs.hyprlock
|
||||||
++ (with unstablePkgs; [
|
pkgs.hyprpaper
|
||||||
just
|
pkgs.hyprpicker
|
||||||
ghostty
|
pkgs.hyprshot
|
||||||
libnotify
|
pkgs.xdg-desktop-portal-hyprland
|
||||||
neovim
|
pkgs.xdg-desktop-portal-wlr
|
||||||
nushell
|
pkgs.xdg-desktop-portal-gtk
|
||||||
onefetch
|
pkgs.xdg-desktop-portal-xapp
|
||||||
ruff
|
unstablePkgs.libnotify
|
||||||
serie
|
unstablePkgs.swaynotificationcenter
|
||||||
swaynotificationcenter
|
unstablePkgs.waybar
|
||||||
uv
|
unstablePkgs.wofi
|
||||||
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
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -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
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user