seang96/nixos-config
1
0
Fork 0
mirror of https://github.com/buckley310/nixos-config.git synced 2024-12-21 19:24:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove legacy options

Browse source
This commit is contained in:
Sean Buckley 2021-06-04 10:45:50 -04:00
parent be223fbad8
commit e58f1623d0
4 changed files with 14 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
default.nix
View file

@ -13,6 +13,5 @@
./modules/security-tools.nix ./modules/security-tools.nix
./modules/status-on-console.nix ./modules/status-on-console.nix
./modules/sway.nix ./modules/sway.nix
./modules/vim.nix
]; ];
} }

12
modules/cli.nix
View file

@ -112,4 +112,16 @@ in
} }
[ "$TERM" = "linux" ] || PROMPT_COMMAND="_update_ps1; $PROMPT_COMMAND" [ "$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
'';
};
};
} }

7
modules/graphical.nix
View file

@ -1,7 +1,4 @@
{ pkgs, config, ... }: { pkgs, config, ... }:
let
legacy = (config.system.nixos.release == "20.09");
in
{ {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
brave brave
@ -53,8 +50,8 @@ in
virtualisation.docker = { enable = true; enableOnBoot = false; }; virtualisation.docker = { enable = true; enableOnBoot = false; };
hardware.pulseaudio.enable = legacy; hardware.pulseaudio.enable = false;
services.pipewire = if legacy then { } else { services.pipewire = {
enable = true; enable = true;
pulse.enable = true; pulse.enable = true;
alsa.enable = true; alsa.enable = true;

23
modules/vim.nix
View file

@ -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
'';
};
};
};
}