From f3e3ab2c135ee29010027efbb7f36a68bfc1f7c4 Mon Sep 17 00:00:00 2001 From: Mats Rauhala Date: Wed, 17 Nov 2021 21:31:01 +0200 Subject: [PATCH] Terminal stuff --- flake.lock | 42 ++++++++++++++++++++++++++++++++++++++++++ flake.nix | 13 ++++++++++++- macbook/masse.nix | 12 ++++++++++++ 3 files changed, 66 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index e784439..39c6d44 100644 --- a/flake.lock +++ b/flake.lock @@ -141,6 +141,26 @@ "type": "github" } }, + "myUrxvt": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1637082527, + "narHash": "sha256-XM9V5hSCeVR1VkXNaLMph86/yk92ncQ4GwKyLeKmu0Q=", + "ref": "master", + "rev": "83dabdb793c2b1e21d7edb79a19096a4287b6b51", + "revCount": 1, + "type": "git", + "url": "https://git.rauhala.info/MasseR/nix-conf-urxvt" + }, + "original": { + "type": "git", + "url": "https://git.rauhala.info/MasseR/nix-conf-urxvt" + } + }, "myVim": { "inputs": { "flake-utils": "flake-utils_4", @@ -162,6 +182,26 @@ "type": "github" } }, + "myZsh": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1637146957, + "narHash": "sha256-5Hn2KMQMVX2OvxEs0dhKDCbNCpBjWe4G2Y5tQb3uwbU=", + "ref": "master", + "rev": "79ea172898de3604e21424c6b6c6051ddc21ed09", + "revCount": 4, + "type": "git", + "url": "https://git.rauhala.info/MasseR/nix-conf-zsh" + }, + "original": { + "type": "git", + "url": "https://git.rauhala.info/MasseR/nix-conf-zsh" + } + }, "nixpkgs": { "locked": { "lastModified": 1622797669, @@ -228,7 +268,9 @@ "home-manager": "home-manager", "kobodl": "kobodl", "myEmacs": "myEmacs", + "myUrxvt": "myUrxvt", "myVim": "myVim", + "myZsh": "myZsh", "nixpkgs": "nixpkgs_3" } } diff --git a/flake.nix b/flake.nix index 109a7a1..5087897 100644 --- a/flake.nix +++ b/flake.nix @@ -15,6 +15,14 @@ url = "github:MasseR/nix-conf-nvim"; inputs.nixpkgs.follows = "nixpkgs"; }; + myZsh = { + url = "git+https://git.rauhala.info/MasseR/nix-conf-zsh"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + myUrxvt = { + url = "git+https://git.rauhala.info/MasseR/nix-conf-urxvt"; + inputs.nixpkgs.follows = "nixpkgs"; + }; kobodl = { url = "github:MasseR/nix-kobodl"; }; @@ -27,7 +35,10 @@ dirs = builtins.attrNames (builtins.readDir ./modules); selfModules = map (module: import (./modules + "/${module}")) dirs; in - selfModules ++ []; + selfModules ++ [ + inputs.myZsh.nixosModule + inputs.myUrxvt.nixosModule + ]; overlays = [ inputs.myEmacs.overlay inputs.myVim.overlay diff --git a/macbook/masse.nix b/macbook/masse.nix index 9448d16..f4aeffa 100644 --- a/macbook/masse.nix +++ b/macbook/masse.nix @@ -58,4 +58,16 @@ }; }; }; + + programs.gpg = { + enable = true; + settings = { + "default-key" = "2104943D6033C8F4F7D4F560BDA6DFEDBCFB6779"; + "default-recipient-self" = ""; + "keyserver-options" = "auto-key-retrieve"; + }; + }; + + programs.myZsh.enable = true; + programs.myUrxvt.enable = true; }