diff options
| -rw-r--r-- | configuration.nix | 3 | ||||
| -rw-r--r-- | home.nix | 66 | ||||
| -rw-r--r-- | overlays-home.nix | 8 | ||||
| -rw-r--r-- | overlays-system.nix | 9 | ||||
| -rw-r--r-- | overlays/default.nix | 12 | ||||
| -rw-r--r-- | packages.nix | 5 |
6 files changed, 82 insertions, 21 deletions
diff --git a/configuration.nix b/configuration.nix index 27759b2..0d6d454 100644 --- a/configuration.nix +++ b/configuration.nix @@ -11,7 +11,7 @@ in { <home-manager/nixos> ./hardware-configuration.nix ./packages.nix - ./overlays/default.nix + ./overlays-system.nix ./login.nix ]; @@ -24,6 +24,7 @@ in { networking = { hostName = "dickhead"; networkmanager.enable = true; + extraHosts = ''''; }; virtualisation.docker.enable = true; @@ -2,19 +2,71 @@ let localPkgs = import ./packages/default.nix { pkgs = pkgs; }; in { - #home.packages = with pkgs; [ - #picom - #]; + imports = [ ./overlays-home.nix ]; + + home.packages = with pkgs; [ + yarn + #pass + ]; + + programs.lsd = { + enable = true; + enableAliases = true; + }; + + programs.git = { + enable = true; + userEmail = "phenax5@gmail.com"; + userName = "Akshay Nair"; + ignores = [ + "tags" + ".vim.session" + "tags.lock" + "tags.temp" + ]; + aliases = { + ignore = "!gi() { curl -sL https://www.toptal.com/developers/gitignore/api/$@ ;}; gi"; + }; + extraConfig = { + "color" = { + "ui" = true; + }; + "color \"diff-highlight\"" = { + oldNormal = "red bold"; + oldHighlight = "red bold 52"; + newNormal = "green bold"; + newHighlight = "green bold 22"; + }; + "color \"diff\"" = { + meta = 11; + frag = "magenta bold"; + commit = "yellow bold"; + old = "red bold"; + new = "green bold"; + whitespace = "red reverse"; + }; + }; + #signing.key = "GPG-KEY-ID"; + #signing.signByDefault = true; + }; + + programs.password-store = { + enable = true; + package = pkgs.pass.withExtensions(exts: [ exts.pass-otp ]); + settings = { + PASSWORD_STORE_DIR = "~/.config/password-store"; + }; + }; services.gpg-agent = { enable = true; maxCacheTtl = 864000; defaultCacheTtl = 864000; enableSshSupport = false; - pinentryFlavor = null; - extraConfig = '' - pinentry-program ${localPkgs.anypinentry}/bin/anypinentry - ''; + #pinentryFlavor = null; + #extraConfig = '' + #pinentry-program /home/imsohexy/nixos/packages/anypinentry/source/anypinentry + #''; }; home.file = { diff --git a/overlays-home.nix b/overlays-home.nix new file mode 100644 index 0000000..00558d3 --- /dev/null +++ b/overlays-home.nix @@ -0,0 +1,8 @@ +{ pkgs, ... }: +let + overlays = import ./overlays/default.nix {}; +in { + nixpkgs.overlays = with overlays; [ + pass-with-dmenu + ]; +} diff --git a/overlays-system.nix b/overlays-system.nix new file mode 100644 index 0000000..e30ddfe --- /dev/null +++ b/overlays-system.nix @@ -0,0 +1,9 @@ +{ pkgs, ... }: +let + overlays = import ./overlays/default.nix {}; +in { + nixpkgs.overlays = with overlays; [ + neovim-nightly + qutebrowser + ]; +} diff --git a/overlays/default.nix b/overlays/default.nix index b806fa9..d4e2b45 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,9 +1,5 @@ -{ pkgs, ... }: -{ - # Overlays - nixpkgs.overlays = [ - (import ./neovim.nix) - (import ./qutebrowser.nix) - (import ./pass.nix) - ]; +_: { + neovim-nightly = import ./neovim.nix; + qutebrowser = import ./qutebrowser.nix; + pass-with-dmenu = import ./pass.nix; } diff --git a/packages.nix b/packages.nix index bbabcbc..3aa0c6b 100644 --- a/packages.nix +++ b/packages.nix @@ -21,9 +21,6 @@ let ctags fzf - git - yarn - nodejs-15_x python3 rustup @@ -53,13 +50,11 @@ let lf libnotify dunst - pass xcwd alsaUtils unzip curl jq - lsd wget gotop killall |