machines: aramis: home: enable discord

5 minutes is too short.

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1638837456,
+        "lastModified": 1640802000,
-        "narHash": "sha256-WHLOxthAGx/wXw3QUa/lFE3mr6cQtnXfFYZ0DNyYwt4=",
+        "narHash": "sha256-ZiI94Zv/IgW64fqKrtVaQqfUCkn9STvAjgfFmvtqcQ8=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "57806bf7e340f4cae705c91748d4fdf8519293a9",
+        "rev": "c5558c88b2941bf94886dfdede6926b1ba5f5629",
         "type": "github"
       },
       "original": {
@@ -44,11 +44,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1638571010,
+        "lastModified": 1641355100,
-        "narHash": "sha256-KSO7u13VRLdklQTKYJaBSfVcurEvw+HifAsHR7V2i5E=",
+        "narHash": "sha256-rg5VlPXjmmTxlHJllm3udjuMd2QjHPN1OuaAHn3fe1k=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "781d25b315def05cd7ede3765226c54216f0b1fe",
+        "rev": "426ab2cf111fca61308bd86fe652e14aa12cc2d2",
         "type": "github"
       },
       "original": {
@@ -60,11 +60,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1638806821,
+        "lastModified": 1641230035,
-        "narHash": "sha256-v2qd2Bsmzft53s43eCbN+4ocrLksRdFLyF/MAGuWuDA=",
+        "narHash": "sha256-hFyqihERaTbLxCOlugy/rpp22VLtLh8SPRnA2uu3F/8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "bc5d68306b40b8522ffb69ba6cff91898c2fbbff",
+        "rev": "78cd22c1b8604de423546cd49bfe264b786eca13",
         "type": "github"
       },
       "original": {
@@ -76,11 +76,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1638891267,
+        "lastModified": 1641355656,
-        "narHash": "sha256-oj0u21aQSwmYHKlvV00/jIsTw83zjAVhWeUWeTUGM00=",
+        "narHash": "sha256-8R99GoEDO34mKzS5b47pnmEOSZA9zEWppM+JbR0gouQ=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "e06e0894dd2b1dc6835b386060b1dcee513775f4",
+        "rev": "777c477c1dce9e5f2b47ca79b1db11a59207391a",
         "type": "github"
       },
       "original": {
@@ -100,11 +100,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1637745948,
+        "lastModified": 1639823344,
-        "narHash": "sha256-DmQG1bZk24eS+BAHwnHPyYIadMLKbq0d1b//iapYIPU=",
+        "narHash": "sha256-jlsQb2y6A5dB1R0wVPLOfDGM0wLyfYqEJNzMtXuzCXw=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "c3b4f94350b0e59c2546fa85890cc70d03616b9c",
+        "rev": "ff9c0b459ddc4b79c06e19d44251daa8e9cd1746",
         "type": "github"
       },
       "original": {

home/default.nix

@@ -5,6 +5,7 @@
     ./bluetooth
     ./comma
     ./direnv
+    ./discord
     ./documentation
     ./feh
     ./firefox

home/discord/default.nix

@@ -0,0 +1,23 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.my.home.discord;
+
+  jsonFormat = pkgs.formats.json { };
+in
+{
+  options.my.home.discord = with lib; {
+    enable = mkEnableOption "discord configuration";
+  };
+
+  config = lib.mkIf cfg.enable {
+    home.packages = with pkgs; [
+      discord
+    ];
+
+    xdg.configFile."discord/settings.json".source =
+      jsonFormat.generate "discord.json" {
+        # Do not keep me from using the app just to force an update
+        SKIP_HOST_UPDATE = true;
+      };
+  };
+}

home/vim/after/plugin/mappings/fzf.vim

@@ -1,38 +1,5 @@
 " Only git-tracked files, Vim needs to be in a Git repository
-nnoremap <Leader>fg :GFiles<CR>
+nnoremap <Leader>ff :GFiles<CR>
-
-" All files
-nnoremap <Leader>ff :Files<CR>
 
 " Currently open buffers
 nnoremap <Leader>fb :Buffers<CR>
-
-" Buffer history
-nnoremap <Leader>fh :History<CR>
-
-" Tags in buffer
-nnoremap <Leader>ft :BTags<CR>
-
-" Tags in all project files
-nnoremap <Leader>fT :Tags<CR>
-
-" Snippets for the current fileytpe (using Ultisnips)
-nnoremap <Leader>fs :Snippets<CR>
-
-" All available commands
-nnoremap <Leader>f: :Commands<CR>
-
-" All commits (using fugitive)
-nnoremap <Leader>fc :Commits<CR>
-
-" All commits for the current buffer (using fugitive)
-nnoremap <Leader>fC :BCommits<CR>
-
-" Select normal mode mapping by searching for its name
-nmap <Leader><Tab> <Plug>(fzf-maps-n)
-
-" Select visual mode mapping by searching for its name
-xmap <Leader><Tab> <Plug>(fzf-maps-x)
-
-" Select operator pending mode mapping by searching for its name
-omap <Leader><Tab> <Plug>(fzf-maps-o)

home/wm/default.nix

@@ -78,7 +78,7 @@ in
 
       timeout = mkOption {
         type = types.ints.between 1 60;
-        default = 5;
+        default = 15;
         example = 1;
         description = "Inactive time interval to lock the screen automatically";
       };

machines/aramis/home.nix

@@ -1,6 +1,8 @@
 { pkgs, ... }:
 {
   my.home = {
+    # Some amount of social life
+    discord.enable = true;
     # Image viewver
     feh.enable = true;
     # Firefo profile and extensions
@@ -14,6 +16,7 @@
       jellyfin-media-player # Wraps the webui and mpv together
       pavucontrol # Audio mixer GUI
       quasselClient # IRC client
+      teams # Work requires it...
       transgui # Transmission remote
     ];
     # Minimal video player

modules/system/nix/default.nix

@@ -1,5 +1,5 @@
 # Nix related settings
-{ config, inputs, lib, pkgs, ... }:
+{ config, inputs, lib, options, pkgs, ... }:
 let
   cfg = config.my.system.nix;
 in
@@ -8,6 +8,8 @@ in
     enable = my.mkDisableOption "nix configuration";
 
     addToRegistry = my.mkDisableOption "add inputs and self to registry";
+
+    addToNixPath = my.mkDisableOption "add inputs and self to nix path";
   };
 
   config = lib.mkIf cfg.enable (lib.mkMerge [
@@ -31,5 +33,13 @@ in
         nur.flake = inputs.nur;
       };
     })
+
+    (lib.mkIf cfg.addToNixPath {
+      nix.nixPath = options.nix.nixPath.default ++ [
+        "self=${inputs.self}"
+        "pkgs=${inputs.nixpkgs}"
+        "nur=${inputs.nur}"
+      ];
+    })
   ]);
 }