mirror of
https://github.com/buckley310/nixos-config.git
synced 2024-11-09 18:47:02 +00:00
remove legacy options
This commit is contained in:
parent
be223fbad8
commit
e58f1623d0
4 changed files with 14 additions and 29 deletions
|
@ -13,6 +13,5 @@
|
|||
./modules/security-tools.nix
|
||||
./modules/status-on-console.nix
|
||||
./modules/sway.nix
|
||||
./modules/vim.nix
|
||||
];
|
||||
}
|
||||
|
|
|
@ -112,4 +112,16 @@ in
|
|||
}
|
||||
[ "$TERM" = "linux" ] || PROMPT_COMMAND="_update_ps1; $PROMPT_COMMAND"
|
||||
'';
|
||||
|
||||
programs.neovim = {
|
||||
enable = true;
|
||||
viAlias = true;
|
||||
vimAlias = true;
|
||||
configure = {
|
||||
packages.sconfig.start = [ pkgs.vimPlugins.vim-nix ];
|
||||
customRC = ''
|
||||
set nowrap scrolloff=9
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,7 +1,4 @@
|
|||
{ pkgs, config, ... }:
|
||||
let
|
||||
legacy = (config.system.nixos.release == "20.09");
|
||||
in
|
||||
{
|
||||
environment.systemPackages = with pkgs; [
|
||||
brave
|
||||
|
@ -53,8 +50,8 @@ in
|
|||
|
||||
virtualisation.docker = { enable = true; enableOnBoot = false; };
|
||||
|
||||
hardware.pulseaudio.enable = legacy;
|
||||
services.pipewire = if legacy then { } else {
|
||||
hardware.pulseaudio.enable = false;
|
||||
services.pipewire = {
|
||||
enable = true;
|
||||
pulse.enable = true;
|
||||
alsa.enable = true;
|
||||
|
|
|
@ -1,23 +0,0 @@
|
|||
{ config, pkgs, ... }:
|
||||
let
|
||||
legacy = (config.system.nixos.release == "20.09");
|
||||
in
|
||||
{
|
||||
|
||||
environment.systemPackages = if legacy then [ pkgs.vim ] else [ ];
|
||||
|
||||
programs = if legacy then { } else {
|
||||
neovim = {
|
||||
enable = true;
|
||||
viAlias = true;
|
||||
vimAlias = true;
|
||||
configure = {
|
||||
packages.sconfig.start = [ pkgs.vimPlugins.vim-nix ];
|
||||
customRC = ''
|
||||
set nowrap scrolloff=9
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
}
|
Loading…
Reference in a new issue