diff --git a/flake.lock b/flake.lock index cea0e05e..65602225 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1640802000, - "narHash": "sha256-ZiI94Zv/IgW64fqKrtVaQqfUCkn9STvAjgfFmvtqcQ8=", + "lastModified": 1638837456, + "narHash": "sha256-WHLOxthAGx/wXw3QUa/lFE3mr6cQtnXfFYZ0DNyYwt4=", "owner": "ryantm", "repo": "agenix", - "rev": "c5558c88b2941bf94886dfdede6926b1ba5f5629", + "rev": "57806bf7e340f4cae705c91748d4fdf8519293a9", "type": "github" }, "original": { @@ -44,11 +44,11 @@ ] }, "locked": { - "lastModified": 1641355100, - "narHash": "sha256-rg5VlPXjmmTxlHJllm3udjuMd2QjHPN1OuaAHn3fe1k=", + "lastModified": 1638571010, + "narHash": "sha256-KSO7u13VRLdklQTKYJaBSfVcurEvw+HifAsHR7V2i5E=", "owner": "nix-community", "repo": "home-manager", - "rev": "426ab2cf111fca61308bd86fe652e14aa12cc2d2", + "rev": "781d25b315def05cd7ede3765226c54216f0b1fe", "type": "github" }, "original": { @@ -60,11 +60,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1641230035, - "narHash": "sha256-hFyqihERaTbLxCOlugy/rpp22VLtLh8SPRnA2uu3F/8=", + "lastModified": 1638806821, + "narHash": "sha256-v2qd2Bsmzft53s43eCbN+4ocrLksRdFLyF/MAGuWuDA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "78cd22c1b8604de423546cd49bfe264b786eca13", + "rev": "bc5d68306b40b8522ffb69ba6cff91898c2fbbff", "type": "github" }, "original": { @@ -76,11 +76,11 @@ }, "nur": { "locked": { - "lastModified": 1641355656, - "narHash": "sha256-8R99GoEDO34mKzS5b47pnmEOSZA9zEWppM+JbR0gouQ=", + "lastModified": 1638891267, + "narHash": "sha256-oj0u21aQSwmYHKlvV00/jIsTw83zjAVhWeUWeTUGM00=", "owner": "nix-community", "repo": "NUR", - "rev": "777c477c1dce9e5f2b47ca79b1db11a59207391a", + "rev": "e06e0894dd2b1dc6835b386060b1dcee513775f4", "type": "github" }, "original": { @@ -100,11 +100,11 @@ ] }, "locked": { - "lastModified": 1639823344, - "narHash": "sha256-jlsQb2y6A5dB1R0wVPLOfDGM0wLyfYqEJNzMtXuzCXw=", + "lastModified": 1637745948, + "narHash": "sha256-DmQG1bZk24eS+BAHwnHPyYIadMLKbq0d1b//iapYIPU=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "ff9c0b459ddc4b79c06e19d44251daa8e9cd1746", + "rev": "c3b4f94350b0e59c2546fa85890cc70d03616b9c", "type": "github" }, "original": { diff --git a/home/default.nix b/home/default.nix index 82d2cc3e..b88dfed2 100644 --- a/home/default.nix +++ b/home/default.nix @@ -5,7 +5,6 @@ ./bluetooth ./comma ./direnv - ./discord ./documentation ./feh ./firefox diff --git a/home/discord/default.nix b/home/discord/default.nix deleted file mode 100644 index 7348bb4f..00000000 --- a/home/discord/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ 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; - }; - }; -} diff --git a/home/vim/after/plugin/mappings/fzf.vim b/home/vim/after/plugin/mappings/fzf.vim index 6bf4a446..8cfb8b87 100644 --- a/home/vim/after/plugin/mappings/fzf.vim +++ b/home/vim/after/plugin/mappings/fzf.vim @@ -1,5 +1,38 @@ " Only git-tracked files, Vim needs to be in a Git repository -nnoremap ff :GFiles +nnoremap fg :GFiles + +" All files +nnoremap ff :Files " Currently open buffers nnoremap fb :Buffers + +" Buffer history +nnoremap fh :History + +" Tags in buffer +nnoremap ft :BTags + +" Tags in all project files +nnoremap fT :Tags + +" Snippets for the current fileytpe (using Ultisnips) +nnoremap fs :Snippets + +" All available commands +nnoremap f: :Commands + +" All commits (using fugitive) +nnoremap fc :Commits + +" All commits for the current buffer (using fugitive) +nnoremap fC :BCommits + +" Select normal mode mapping by searching for its name +nmap (fzf-maps-n) + +" Select visual mode mapping by searching for its name +xmap (fzf-maps-x) + +" Select operator pending mode mapping by searching for its name +omap (fzf-maps-o) diff --git a/home/wm/default.nix b/home/wm/default.nix index 1d5a3711..eae9f144 100644 --- a/home/wm/default.nix +++ b/home/wm/default.nix @@ -78,7 +78,7 @@ in timeout = mkOption { type = types.ints.between 1 60; - default = 15; + default = 5; example = 1; description = "Inactive time interval to lock the screen automatically"; }; diff --git a/machines/aramis/home.nix b/machines/aramis/home.nix index 1c816a75..404a4d01 100644 --- a/machines/aramis/home.nix +++ b/machines/aramis/home.nix @@ -1,8 +1,6 @@ { pkgs, ... }: { my.home = { - # Some amount of social life - discord.enable = true; # Image viewver feh.enable = true; # Firefo profile and extensions @@ -16,7 +14,6 @@ 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 diff --git a/modules/system/nix/default.nix b/modules/system/nix/default.nix index 9b59f84b..0f2f8c36 100644 --- a/modules/system/nix/default.nix +++ b/modules/system/nix/default.nix @@ -1,5 +1,5 @@ # Nix related settings -{ config, inputs, lib, options, pkgs, ... }: +{ config, inputs, lib, pkgs, ... }: let cfg = config.my.system.nix; in @@ -8,8 +8,6 @@ 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 [ @@ -33,13 +31,5 @@ in nur.flake = inputs.nur; }; }) - - (lib.mkIf cfg.addToNixPath { - nix.nixPath = options.nix.nixPath.default ++ [ - "self=${inputs.self}" - "pkgs=${inputs.nixpkgs}" - "nur=${inputs.nur}" - ]; - }) ]); }