forked from Bun/nixos-config
The big variable overhaul
This commit is contained in:
parent
3f0a235dc8
commit
6dab8fc029
36 changed files with 269 additions and 326 deletions
|
@ -1,4 +1,4 @@
|
|||
{pkgs, ...}: {
|
||||
{pkgs, outputs, ...}: {
|
||||
# Install Neovim and plugins
|
||||
programs.neovim = {
|
||||
enable = true;
|
||||
|
@ -28,10 +28,7 @@
|
|||
nvim-colorizer-lua
|
||||
vim-monokai-pro
|
||||
];
|
||||
extraConfig = let
|
||||
# Import colors
|
||||
colors = import ../common/colors.nix;
|
||||
in ''
|
||||
extraConfig = ''
|
||||
lua <<EOF
|
||||
-- Set up nvim-cmp
|
||||
local cmp = require'cmp'
|
||||
|
@ -81,8 +78,8 @@
|
|||
let g:airline_theme='onedark'
|
||||
let g:airline#extensions#tabline#enabled = 1
|
||||
hi Normal guibg=none ctermbg=235
|
||||
hi Visual guibg=#${colors.mid} ctermbg=238
|
||||
hi Pmenu guibg=#${colors.mid} ctermbg=238
|
||||
hi Visual guibg=#${outputs.look.colors.mid} ctermbg=238
|
||||
hi Pmenu guibg=#${outputs.look.colors.mid} ctermbg=238
|
||||
hi EndOfBuffer guibg=none ctermbg=235
|
||||
hi LineNr guibg=none ctermbg=none
|
||||
lua require'colorizer'.setup()
|
||||
|
|
|
@ -1,8 +1,5 @@
|
|||
{pkgs, config, ...}: {
|
||||
programs.zsh = let
|
||||
auth = import ../common/auth.nix;
|
||||
nixcfg = import ../common/nixcfg.nix;
|
||||
in {
|
||||
{pkgs, config, outputs, ...}: {
|
||||
programs.zsh = {
|
||||
enable = true;
|
||||
autosuggestion.enable = true;
|
||||
syntaxHighlighting.enable = true;
|
||||
|
@ -13,14 +10,14 @@
|
|||
};
|
||||
shellAliases = {
|
||||
# NixOS aliases
|
||||
nixcfg = "${nixcfg.open}";
|
||||
nixclean = "${auth.method} nix-store --gc; nix-collect-garbage -d";
|
||||
nixpurge = "${auth.method} nix-collect-garbage --delete-old";
|
||||
nixoptimize = "${auth.method} nix store optimise";
|
||||
nixcfg = "${outputs.cmd.nixcfg}";
|
||||
nixclean = "${outputs.cmd.auth} nix-store --gc; nix-collect-garbage -d";
|
||||
nixpurge = "${outputs.cmd.auth} nix-collect-garbage --delete-old";
|
||||
nixoptimize = "${outputs.cmd.auth} nix store optimise";
|
||||
|
||||
# Flake commands
|
||||
flakedate = "${auth.method} nix flake update /etc/nixos";
|
||||
sysswitch = "${auth.method} nixos-rebuild switch --flake /etc/nixos";
|
||||
flakedate = "${outputs.cmd.auth} nix flake update /etc/nixos";
|
||||
sysswitch = "${outputs.cmd.auth} nixos-rebuild switch --flake /etc/nixos";
|
||||
homeswitch = "home-manager switch --flake /etc/nixos";
|
||||
nixswitch = "sysswitch; homeswitch";
|
||||
nixdate = "flakedate && sysswitch; homeswitch";
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue