diff --git a/nixos/msi/configuration.nix b/nixos/msi/configuration.nix index b518cd9..aa74f25 100644 --- a/nixos/msi/configuration.nix +++ b/nixos/msi/configuration.nix @@ -11,6 +11,7 @@ in [ # Include the results of the hardware scan. ./hardware-configuration.nix ./nvidia.nix + ./home.nix ]; # Use the systemd-boot EFI boot loader. @@ -82,19 +83,6 @@ in # Enable touchpad support (enabled default in most desktopManager). services.libinput.enable = true; - # Define a user account. Don't forget to set a password with ‘passwd’. - users.users.kamov = { - isNormalUser = true; - extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. - packages = with pkgs; [ - anki - discord - spotify - firefox-devedition - unstable.neovide - ]; - }; - # Enable unfree packages nixpkgs.config.allowUnfree = true; @@ -130,9 +118,8 @@ in enableSSHSupport = true; }; }; - steam = { - enable = true; - }; + steam.enable = true; + fish.enable = true; git = { enable = true; config = { diff --git a/nixos/msi/home.nix b/nixos/msi/home.nix new file mode 100644 index 0000000..6c52caf --- /dev/null +++ b/nixos/msi/home.nix @@ -0,0 +1,24 @@ +{ config, lib, pkgs, ... }: +let + unstable = import {}; + packages = (with pkgs; [ + anki + discord + firefox-devedition + krita + qbittorrent + spotify + vlc + ]) ++ (with unstable; [ + neovide + ]); +in +{ + # Define a user account. Don't forget to set a password with ‘passwd’. + users.users.kamov = { + isNormalUser = true; + extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. + packages = packages; + shell = pkgs.fish; + }; +} diff --git a/nvim/lua/config/plugins.lua b/nvim/lua/config/plugins.lua index 4b29982..34630fd 100644 --- a/nvim/lua/config/plugins.lua +++ b/nvim/lua/config/plugins.lua @@ -79,6 +79,8 @@ return { ensure_installed = { -- neovim 'vimdoc', 'lua', 'query', 'fennel', + -- nix + 'nix', -- data 'json', 'xml', 'yaml', 'toml', -- markdown