diff options
| -rw-r--r-- | home/darwin.nix | 13 | ||||
| -rw-r--r-- | home/emacs.nix | 12 | ||||
| -rw-r--r-- | home/home.nix | 69 | ||||
| -rw-r--r-- | home/tmux.nix | 20 | ||||
| -rw-r--r-- | home/yubikey.nix | 28 |
5 files changed, 10 insertions, 132 deletions
diff --git a/home/darwin.nix b/home/darwin.nix index ef2787d..b4a49d8 100644 --- a/home/darwin.nix +++ b/home/darwin.nix @@ -3,11 +3,10 @@ home.stateVersion = "23.05"; imports = [ - ./git.nix - ./zsh.nix ./dev.nix - ./tmux.nix + ./git.nix ./ssh.nix + ./zsh.nix ]; home.packages = with pkgs; [ @@ -22,6 +21,14 @@ tree ]; + home.sessionVariables = { + EDITOR = "emacsclient -a="; + VISUAL = "emacsclient -a="; + LESS = "-FRSXM"; + LESSCHARSET = "utf-8"; + PAGER = "less"; + }; + programs = { direnv = { enable = true; diff --git a/home/emacs.nix b/home/emacs.nix deleted file mode 100644 index dbc5411..0000000 --- a/home/emacs.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ lib, config, pkgs, ... }: -{ - home.packages = with pkgs; [ - # see https://github.com/hlissner/doom-emacs/issues/4138 - (aspellWithDicts (dicts: with dicts; [ en en-computers en-science ])) - ]; - - home.sessionVariables = { - EDITOR = "emacsclient -a="; - VISUAL = "emacsclient -a="; - }; -} diff --git a/home/home.nix b/home/home.nix deleted file mode 100644 index 42517b9..0000000 --- a/home/home.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ config, lib, pkgs, ... }: -{ - imports = [ - ./git.nix - ./ssh.nix - ./zsh.nix - ]; - - home.packages = with pkgs; [ - dive # explore layers in docker images - jq - ripgrep - util-linux - xdg-utils - - age - rage - age-plugin-yubikey - - # tools inside the tools directory - tools.git-blame-stats - tools.git-broom - tools.ipconverter - tools.seqstat - - # tools from external repositories - # x509-info - # gh-ssh-keys - # masked-emails - ]; - - programs.direnv = { - enable = true; - nix-direnv.enable = true; - config = { - global.disable_stdin = true; - global.strict_env = true; - }; - }; - - xdg = { - enable = true; - # File types - mime.enable = true; - # File associatons - mimeApps = { enable = true; }; - # User directories - userDirs = { - enable = true; - createDirectories = true; - desktop = "${config.home.homeDirectory}/documents"; - documents = "${config.home.homeDirectory}/documents"; - download = "${config.home.homeDirectory}/downloads"; - music = "${config.home.homeDirectory}/media/music"; - pictures = "${config.home.homeDirectory}/media/pictures"; - publicShare = "${config.home.homeDirectory}/documents/public"; - templates = "${config.home.homeDirectory}/documents/templates"; - videos = "${config.home.homeDirectory}/media/videos"; - }; - }; - - home.sessionVariables = with config.xdg; { - LESS = "-FRSXM"; - LESSCHARSET = "utf-8"; - LESSHISTFILE = "${dataHome}/less/history"; - LESSKEY = "${configHome}/less/lesskey"; - PAGER = "less"; - }; -} diff --git a/home/tmux.nix b/home/tmux.nix deleted file mode 100644 index 22f8683..0000000 --- a/home/tmux.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ ... }: -{ - programs.tmux = { - enable = true; - - terminal = "xterm-256color"; - escapeTime = 0; - aggressiveResize = true; - baseIndex = 1; - shortcut = "z"; - clock24 = true; - historyLimit = 50000; # Bigger buffer - - extraConfig = '' - setw -g mouse on - - set-option -g renumber-windows on - ''; - }; -} diff --git a/home/yubikey.nix b/home/yubikey.nix deleted file mode 100644 index b18ce5d..0000000 --- a/home/yubikey.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ pkgs, lib, config, ... }: -{ - home.packages = with pkgs; [ yubikey-manager yubikey-touch-detector ]; - - systemd.user.sockets.yubikey-touch-detector = { - Unit.Description = "Unix socket activation for YubiKey touch detector service"; - Socket = { - ListenStream = "%t/yubikey-touch-detector.socket"; - RemoveOnStop = true; - }; - Install.WantedBy = [ "sockets.target" ]; - }; - - systemd.user.services.yubikey-touch-detector = { - Unit = { - Description = "Detects when your YubiKey is waiting for a touch"; - Requires = "yubikey-touch-detector.socket"; - }; - Service = { - ExecStart = "${pkgs.yubikey-touch-detector}/bin/yubikey-touch-detector --libnotify"; - EnvironmentFile = "-%E/yubikey-touch-detector/service.conf"; - }; - Install = { - Also = "yubikey-touch-detector.socket"; - WantedBy = [ "default.target" ]; - }; - }; -} |