douzeb/mrflos-nixos-config-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(nvim): version 0.10

Browse source
This commit is contained in:
mrflos 2024-08-19 17:41:19 +03:00
parent 3673a7ea06
commit 9d69a35a79
3 changed files with 29 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
modules/console.nix
View file

@ -1,6 +1,11 @@
# cli programs should be available on servers and desktop # cli programs should be available on servers and desktop
{ pkgs, ... }: { config, pkgs, ... }:
let
unstable = import
(builtins.fetchTarball https://github.com/nixos/nixpkgs/tarball/7afa2c97ebb0585d00c64c112344483e89e00545)
# reuse the current configuration
{ config = config.nixpkgs.config; };
in
{ {
programs.zsh.enable = true; programs.zsh.enable = true;
# programs.fzf = { # programs.fzf = {
@ -8,6 +13,14 @@
# keybindings = true; # keybindings = true;
# }; # };
# programs.neovim = {
# enable = true;
# defaultEditor = true;
# package = unstable.neovim;
# viAlias = true;
# vimAlias = true;
# };
# List packages installed in system profile. To search, run: # List packages installed in system profile. To search, run:
# $ nix search wget # $ nix search wget
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
@ -41,7 +54,7 @@
mpc-cli mpc-cli
mpd mpd
neofetch neofetch
neovim unstable.neovim
ollama ollama
pandoc pandoc
pass pass

11
modules/home-config.nix
View file

@ -1,5 +1,10 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
let let
# unstable = import
# (builtins.fetchTarball https://github.com/nixos/nixpkgs/tarball/7afa2c97ebb0585d00c64c112344483e89e00545)
# # reuse the current configuration
# { config = config.nixpkgs.config; };
#
#startupScript = pkgs.pkgs.writeShellScriptBin "hyprland-start" '' #startupScript = pkgs.pkgs.writeShellScriptBin "hyprland-start" ''
# ${pkgs.waybar}/bin/waybar & # ${pkgs.waybar}/bin/waybar &
# ${pkgs.swww}/bin/swww init & # ${pkgs.swww}/bin/swww init &
@ -184,8 +189,8 @@ in {
core.fileMode = false; core.fileMode = false;
}; };
}; };
neovim = { neovim = {
enable = true;
defaultEditor = true; defaultEditor = true;
viAlias = true; viAlias = true;
vimAlias = true; vimAlias = true;
@ -209,10 +214,14 @@ in {
nixedit = "vi /etc/nixos"; nixedit = "vi /etc/nixos";
nixupdate = "sudo nix-channel --update && sudo nixos-rebuild switch"; nixupdate = "sudo nix-channel --update && sudo nixos-rebuild switch";
nixclean = "sudo nix-env --delete-generations old --profile /nix/var/nix/profiles/system && sudo /nix/var/nix/profiles/system/bin/switch-to-configuration switch && sudo nix-store --gc"; nixclean = "sudo nix-env --delete-generations old --profile /nix/var/nix/profiles/system && sudo /nix/var/nix/profiles/system/bin/switch-to-configuration switch && sudo nix-store --gc";
socks = "ssh -N -f -C -D 9090 mrflos@yunohost.yeswiki.net -p 6742";
vi = "/run/current-system/sw/bin/nvim";
vim = "/run/current-system/sw/bin/nvim";
yeswiki-updater = "cd /home/mrflos/Developpements/yeswiki-installer/ && sudo php yeswiki-updater.php"; yeswiki-updater = "cd /home/mrflos/Developpements/yeswiki-installer/ && sudo php yeswiki-updater.php";
}; };
initExtra = '' initExtra = ''
export BUN_INSTALL="$HOME/.bun" export BUN_INSTALL="$HOME/.bun"
export PHP_CS_FIXER_IGNORE_ENV=1
export PATH="$HOME/.local/bin:$BUN_INSTALL/bin:$PATH" export PATH="$HOME/.local/bin:$BUN_INSTALL/bin:$PATH"
eval "$(atuin init zsh)" eval "$(atuin init zsh)"
eval "$(zoxide init zsh)" eval "$(zoxide init zsh)"

4
modules/local-dev.nix
View file

@ -8,7 +8,7 @@
# `brew install`, always `brew services restart`, `brew link`, `brew unlink mysql` (if it is installed) # `brew install`, always `brew services restart`, `brew link`, `brew unlink mysql` (if it is installed)
{ {
name = "mariadb"; name = "mariadb";
restart_service = true; #restart_service = true;
link = true; link = true;
conflicts_with = [ "mysql" ]; conflicts_with = [ "mysql" ];
} }
@ -32,7 +32,9 @@
gcc gcc
go go
nixfmt-rfc-style nixfmt-rfc-style
lua
lua-language-server lua-language-server
luarocks
nixpkgs-fmt nixpkgs-fmt
nodejs nodejs
nodePackages.eslint nodePackages.eslint