From 4891bd75373dc78a8139be0b9cd5ddb64ac6fcf8 Mon Sep 17 00:00:00 2001 From: Felix Albrigtsen Date: Mon, 18 Dec 2023 23:52:17 +0100 Subject: [PATCH] voyager: add home-manager --- flake.nix | 5 +++++ hosts/voyager/configuration.nix | 38 --------------------------------- hosts/voyager/home.nix | 19 +++++++++++++++++ 3 files changed, 24 insertions(+), 38 deletions(-) create mode 100644 hosts/voyager/home.nix diff --git a/flake.nix b/flake.nix index 93282ec..a79c43c 100644 --- a/flake.nix +++ b/flake.nix @@ -48,6 +48,11 @@ ./hosts/voyager/configuration.nix voyager-addons.nixosModules.default sops-nix.nixosModules.sops + home-manager.nixosModules.home-manager { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users."felixalb" = import ./hosts/voyager/home.nix; + } ]; }; edison = nixpkgs.lib.nixosSystem { diff --git a/hosts/voyager/configuration.nix b/hosts/voyager/configuration.nix index db54c43..74406a0 100644 --- a/hosts/voyager/configuration.nix +++ b/hosts/voyager/configuration.nix @@ -39,45 +39,7 @@ environment.variables = { EDITOR = "vim"; }; environment.systemPackages = with pkgs; [ - ((vim_configurable.override { }).customize{ - name = "vim"; - vimrcConfig.packages.myplugins = with pkgs.vimPlugins; { - start = [ vim-nix vim-lastplace vim-commentary ]; - opt = []; - }; - vimrcConfig.customRC = '' - " your custom vimrc - set number - set relativenumber - set nu rnu - set signcolumn=number - - set hlsearch - set smartcase - set incsearch - - set autoindent - set expandtab - set shiftwidth=2 - set tabstop=2 - set smartindent - set smarttab - - set ruler - - set undolevels=1000 - - set nocompatible - set backspace=indent,eol,start - " Turn on syntax highlighting by default - syntax on - " ... - ''; - } - ) zfs - screen - eza ]; services.snappymail = { diff --git a/hosts/voyager/home.nix b/hosts/voyager/home.nix new file mode 100644 index 0000000..84fa68e --- /dev/null +++ b/hosts/voyager/home.nix @@ -0,0 +1,19 @@ +{ pkgs, lib, ... }: +{ + home.packages = with pkgs; [ + bat + bottom + ncdu + neofetch + ]; + + imports = [ + ./../../home/base.nix + ]; + + programs = { + zsh.shellAliases."rebuild" = "sudo nixos-rebuild switch --flake /config"; + }; + + home.stateVersion = "23.05"; +}