diff --git a/flake.nix b/flake.nix index 486649a..182dee4 100644 --- a/flake.nix +++ b/flake.nix @@ -54,7 +54,10 @@ "dev-lt-63" = home-manager.lib.homeManagerConfiguration { pkgs = nixpkgs.legacyPackages."x86_64-linux"; - modules = [ ./system/dev-lt-63/home.nix ]; + modules = [ + ./system/dev-lt-63/home.nix + ./shared/home + ]; }; }; diff --git a/shared/home/default.nix b/shared/home/default.nix index 488cf49..59b18ec 100644 --- a/shared/home/default.nix +++ b/shared/home/default.nix @@ -6,6 +6,7 @@ ./fish.nix ./git.nix ./nix.nix + ./programs.nix ./gui ]; diff --git a/shared/home/fish.nix b/shared/home/fish.nix index cf9e3b9..0694bae 100644 --- a/shared/home/fish.nix +++ b/shared/home/fish.nix @@ -1,5 +1,4 @@ -# Shell configuration, including common tools used within the shell and -# shell functions/aliases. +# Configuration of the shell. { pkgs, lib, config, ... }: @@ -21,11 +20,8 @@ in with lib; { shellAliases = {} // cfg.extraAliases; }; - # Configure useful additions to the shell - programs.direnv.enable = true; - programs.skim.enable = true; + # Configure the prompt programs.starship.enable = true; - programs.zoxide.enable = true; }; diff --git a/shared/home/programs.nix b/shared/home/programs.nix new file mode 100644 index 0000000..2a83a11 --- /dev/null +++ b/shared/home/programs.nix @@ -0,0 +1,34 @@ +# Configures misc programs that have shared config values between +# machines. These are intended to be very simple, so if it becomes +# needed to do extra configuration for example, consider putting +# the affected programs in their own modules. + +{ pkgs, ... }: { + + home.packages = (import ../env.nix pkgs); + + # CLI for accessing my passwords + programs.rbw = { + enable = true; + settings = { + email = "me@riley.lgbt"; + base_url = "https://vault.steph.tools"; + pinentry = "curses"; + }; + }; + + # It's like `top` but cooler + programs.bottom.enable = true; + + programs.exa = { + enable = true; + extraOptions = [ + "--group-directories-first" + ]; + }; + + programs.direnv.enable = true; + programs.skim.enable = true; + programs.zoxide.enable = true; + +} \ No newline at end of file diff --git a/shared/lib.nix b/shared/lib.nix new file mode 100644 index 0000000..4169dcd --- /dev/null +++ b/shared/lib.nix @@ -0,0 +1,13 @@ +{ pkgs, ... }: + +with pkgs; rec { + + nixGL = + let src = fetchGit { ref = "main"; url = "https://github.com/guibou/nixGL.git"; }; + in (import src {}).auto.nixGLDefault; + + nixGLWrapper = program: writeShellScriptBin program.pname '' + ${nixGL}/bin/nixGL ${program}/bin/${program.pname} "$@" + ''; + +} \ No newline at end of file diff --git a/system/dev-lt-63/home.nix b/system/dev-lt-63/home.nix index e69de29..0742e12 100644 --- a/system/dev-lt-63/home.nix +++ b/system/dev-lt-63/home.nix @@ -0,0 +1,12 @@ +{ config, pkgs, lib, ... }: + +{ + home = { + username = "riley"; + homeDirectory = "/home/riley"; + stateVersion = "22.05"; + }; + programs = { + home-manager.enable = false; + }; +} \ No newline at end of file