mirror of
				https://github.com/nmasur/dotfiles
				synced 2025-11-04 04:43:15 +00:00 
			
		
		
		
	Compare commits
	
		
			1 Commits
		
	
	
		
			b4470727e5
			...
			eblume-mol
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					068cdbf5d4 | 
							
								
								
									
										52
									
								
								flake.lock
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										52
									
								
								flake.lock
									
									
									
										generated
									
									
									
								
							@@ -304,72 +304,55 @@
 | 
				
			|||||||
        "type": "github"
 | 
					        "type": "github"
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    "markview-nvim-src": {
 | 
					 | 
				
			||||||
      "flake": false,
 | 
					 | 
				
			||||||
      "locked": {
 | 
					 | 
				
			||||||
        "lastModified": 1719592662,
 | 
					 | 
				
			||||||
        "narHash": "sha256-E1lHSjbnOOIeieaFJ+INvxJHCbfVS3mwbQ6wrlKeGSQ=",
 | 
					 | 
				
			||||||
        "owner": "OXY2DEV",
 | 
					 | 
				
			||||||
        "repo": "markview.nvim",
 | 
					 | 
				
			||||||
        "rev": "f60219dce7283192d549f21847fcf8537bf6d260",
 | 
					 | 
				
			||||||
        "type": "github"
 | 
					 | 
				
			||||||
      },
 | 
					 | 
				
			||||||
      "original": {
 | 
					 | 
				
			||||||
        "owner": "OXY2DEV",
 | 
					 | 
				
			||||||
        "repo": "markview.nvim",
 | 
					 | 
				
			||||||
        "type": "github"
 | 
					 | 
				
			||||||
      }
 | 
					 | 
				
			||||||
    },
 | 
					 | 
				
			||||||
    "nextcloud-cookbook": {
 | 
					    "nextcloud-cookbook": {
 | 
				
			||||||
      "flake": false,
 | 
					      "flake": false,
 | 
				
			||||||
      "locked": {
 | 
					      "locked": {
 | 
				
			||||||
        "lastModified": 1719431638,
 | 
					        "lastModified": 1702545935,
 | 
				
			||||||
        "narHash": "sha256-a8ekMnEzudHGiqHF53jPtgsVTOTc2QLuPg6YtTw5h68=",
 | 
					        "narHash": "sha256-19LN1nYJJ0RMWj6DrYPvHzocTyhMfYdpdhBFch3fpHE=",
 | 
				
			||||||
        "type": "tarball",
 | 
					        "type": "tarball",
 | 
				
			||||||
        "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.1/cookbook-0.11.1.tar.gz"
 | 
					        "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.0/cookbook-0.11.0.tar.gz"
 | 
				
			||||||
      },
 | 
					      },
 | 
				
			||||||
      "original": {
 | 
					      "original": {
 | 
				
			||||||
        "type": "tarball",
 | 
					        "type": "tarball",
 | 
				
			||||||
        "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.1/cookbook-0.11.1.tar.gz"
 | 
					        "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.0/cookbook-0.11.0.tar.gz"
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    "nextcloud-external": {
 | 
					    "nextcloud-external": {
 | 
				
			||||||
      "flake": false,
 | 
					      "flake": false,
 | 
				
			||||||
      "locked": {
 | 
					      "locked": {
 | 
				
			||||||
        "lastModified": 1710338675,
 | 
					        "lastModified": 1699624334,
 | 
				
			||||||
        "narHash": "sha256-bJJ/dVmE1o04QCyrxD0sko0okRsnxJmT6sOTOmBiifs=",
 | 
					        "narHash": "sha256-RCL2RP5twRDLxI/KfAX6QLYQOzqZmSWsfrC5ZQIwTD4=",
 | 
				
			||||||
        "type": "tarball",
 | 
					        "type": "tarball",
 | 
				
			||||||
        "url": "https://github.com/nextcloud-releases/external/releases/download/v5.4.0/external-v5.4.0.tar.gz"
 | 
					        "url": "https://github.com/nextcloud-releases/external/releases/download/v5.3.1/external-v5.3.1.tar.gz"
 | 
				
			||||||
      },
 | 
					      },
 | 
				
			||||||
      "original": {
 | 
					      "original": {
 | 
				
			||||||
        "type": "tarball",
 | 
					        "type": "tarball",
 | 
				
			||||||
        "url": "https://github.com/nextcloud-releases/external/releases/download/v5.4.0/external-v5.4.0.tar.gz"
 | 
					        "url": "https://github.com/nextcloud-releases/external/releases/download/v5.3.1/external-v5.3.1.tar.gz"
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    "nextcloud-news": {
 | 
					    "nextcloud-news": {
 | 
				
			||||||
      "flake": false,
 | 
					      "flake": false,
 | 
				
			||||||
      "locked": {
 | 
					      "locked": {
 | 
				
			||||||
        "lastModified": 1718102703,
 | 
					        "lastModified": 1703426420,
 | 
				
			||||||
        "narHash": "sha256-XNGjf7SWgJYFdVNOh3ED0jxSG0GJwWImVQq4cJT1Lo4=",
 | 
					        "narHash": "sha256-AENBJH/bEob5JQvw4WEi864mdLYJ5Mqe78HJH6ceCpI=",
 | 
				
			||||||
        "type": "tarball",
 | 
					        "type": "tarball",
 | 
				
			||||||
        "url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha7/news.tar.gz"
 | 
					        "url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha3/news.tar.gz"
 | 
				
			||||||
      },
 | 
					      },
 | 
				
			||||||
      "original": {
 | 
					      "original": {
 | 
				
			||||||
        "type": "tarball",
 | 
					        "type": "tarball",
 | 
				
			||||||
        "url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha7/news.tar.gz"
 | 
					        "url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha3/news.tar.gz"
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    "nextcloud-snappymail": {
 | 
					    "nextcloud-snappymail": {
 | 
				
			||||||
      "flake": false,
 | 
					      "flake": false,
 | 
				
			||||||
      "locked": {
 | 
					      "locked": {
 | 
				
			||||||
        "lastModified": 1719799046,
 | 
					        "narHash": "sha256-7oJEJ6t6iS/pcnSHashf1AkOEf+gKizpQHBy9XwY4Yo=",
 | 
				
			||||||
        "narHash": "sha256-1bPStkTKgVCc/puq0G7EiEZy/xrNlNXaO/tiOaZ/Ovw=",
 | 
					        "type": "file",
 | 
				
			||||||
        "type": "tarball",
 | 
					        "url": "https://github.com/nmasur/snappymail-nextcloud/releases/download/v2.36.1/snappymail-2.36.1-nextcloud.tar.gz"
 | 
				
			||||||
        "url": "https://github.com/nmasur/snappymail-nextcloud/releases/download/v2.36.3/snappymail-2.36.3-nextcloud.tar.gz"
 | 
					 | 
				
			||||||
      },
 | 
					      },
 | 
				
			||||||
      "original": {
 | 
					      "original": {
 | 
				
			||||||
        "type": "tarball",
 | 
					        "type": "file",
 | 
				
			||||||
        "url": "https://github.com/nmasur/snappymail-nextcloud/releases/download/v2.36.3/snappymail-2.36.3-nextcloud.tar.gz"
 | 
					        "url": "https://github.com/nmasur/snappymail-nextcloud/releases/download/v2.36.1/snappymail-2.36.1-nextcloud.tar.gz"
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    "nix2vim": {
 | 
					    "nix2vim": {
 | 
				
			||||||
@@ -587,7 +570,6 @@
 | 
				
			|||||||
        "hmts-nvim-src": "hmts-nvim-src",
 | 
					        "hmts-nvim-src": "hmts-nvim-src",
 | 
				
			||||||
        "home-manager": "home-manager",
 | 
					        "home-manager": "home-manager",
 | 
				
			||||||
        "mac-app-util": "mac-app-util",
 | 
					        "mac-app-util": "mac-app-util",
 | 
				
			||||||
        "markview-nvim-src": "markview-nvim-src",
 | 
					 | 
				
			||||||
        "nextcloud-cookbook": "nextcloud-cookbook",
 | 
					        "nextcloud-cookbook": "nextcloud-cookbook",
 | 
				
			||||||
        "nextcloud-external": "nextcloud-external",
 | 
					        "nextcloud-external": "nextcloud-external",
 | 
				
			||||||
        "nextcloud-news": "nextcloud-news",
 | 
					        "nextcloud-news": "nextcloud-news",
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										13
									
								
								flake.nix
									
									
									
									
									
								
							
							
						
						
									
										13
									
								
								flake.nix
									
									
									
									
									
								
							@@ -127,10 +127,6 @@
 | 
				
			|||||||
      url = "github:mfussenegger/nvim-lint";
 | 
					      url = "github:mfussenegger/nvim-lint";
 | 
				
			||||||
      flake = false;
 | 
					      flake = false;
 | 
				
			||||||
    };
 | 
					    };
 | 
				
			||||||
    markview-nvim-src = {
 | 
					 | 
				
			||||||
      url = "github:OXY2DEV/markview.nvim";
 | 
					 | 
				
			||||||
      flake = false;
 | 
					 | 
				
			||||||
    };
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    # Tree-Sitter Grammars
 | 
					    # Tree-Sitter Grammars
 | 
				
			||||||
    tree-sitter-bash = {
 | 
					    tree-sitter-bash = {
 | 
				
			||||||
@@ -181,24 +177,23 @@
 | 
				
			|||||||
    # Nextcloud Apps
 | 
					    # Nextcloud Apps
 | 
				
			||||||
    nextcloud-news = {
 | 
					    nextcloud-news = {
 | 
				
			||||||
      # https://github.com/nextcloud/news/releases
 | 
					      # https://github.com/nextcloud/news/releases
 | 
				
			||||||
      url = "https://github.com/nextcloud/news/releases/download/25.0.0-alpha7/news.tar.gz";
 | 
					      url = "https://github.com/nextcloud/news/releases/download/25.0.0-alpha3/news.tar.gz";
 | 
				
			||||||
      flake = false;
 | 
					      flake = false;
 | 
				
			||||||
    };
 | 
					    };
 | 
				
			||||||
    nextcloud-external = {
 | 
					    nextcloud-external = {
 | 
				
			||||||
      # https://github.com/nextcloud-releases/external/releases
 | 
					      # https://github.com/nextcloud-releases/external/releases
 | 
				
			||||||
      url = "https://github.com/nextcloud-releases/external/releases/download/v5.4.0/external-v5.4.0.tar.gz";
 | 
					      url = "https://github.com/nextcloud-releases/external/releases/download/v5.3.1/external-v5.3.1.tar.gz";
 | 
				
			||||||
      flake = false;
 | 
					      flake = false;
 | 
				
			||||||
    };
 | 
					    };
 | 
				
			||||||
    nextcloud-cookbook = {
 | 
					    nextcloud-cookbook = {
 | 
				
			||||||
      # https://github.com/christianlupus-nextcloud/cookbook-releases/releases/
 | 
					      # https://github.com/christianlupus-nextcloud/cookbook-releases/releases/
 | 
				
			||||||
      url = "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.1/cookbook-0.11.1.tar.gz";
 | 
					      url = "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.0/cookbook-0.11.0.tar.gz";
 | 
				
			||||||
      flake = false;
 | 
					      flake = false;
 | 
				
			||||||
    };
 | 
					    };
 | 
				
			||||||
    nextcloud-snappymail = {
 | 
					    nextcloud-snappymail = {
 | 
				
			||||||
      # https://github.com/the-djmaze/snappymail/releases
 | 
					      # https://github.com/the-djmaze/snappymail/releases
 | 
				
			||||||
      # https://snappymail.eu/repository/nextcloud
 | 
					      # https://snappymail.eu/repository/nextcloud
 | 
				
			||||||
      # url = "https://snappymail.eu/repository/nextcloud/snappymail-2.36.3-nextcloud.tar.gz";
 | 
					      url = "file+https://github.com/nmasur/snappymail-nextcloud/releases/download/v2.36.1/snappymail-2.36.1-nextcloud.tar.gz";
 | 
				
			||||||
      url = "https://github.com/nmasur/snappymail-nextcloud/releases/download/v2.36.3/snappymail-2.36.3-nextcloud.tar.gz";
 | 
					 | 
				
			||||||
      flake = false;
 | 
					      flake = false;
 | 
				
			||||||
    };
 | 
					    };
 | 
				
			||||||
  };
 | 
					  };
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -34,6 +34,7 @@ inputs.darwin.lib.darwinSystem {
 | 
				
			|||||||
        dark = true;
 | 
					        dark = true;
 | 
				
			||||||
      };
 | 
					      };
 | 
				
			||||||
      mail.user = globals.user;
 | 
					      mail.user = globals.user;
 | 
				
			||||||
 | 
					      mole.enable = true;
 | 
				
			||||||
      atuin.enable = true;
 | 
					      atuin.enable = true;
 | 
				
			||||||
      charm.enable = true;
 | 
					      charm.enable = true;
 | 
				
			||||||
      neovim.enable = true;
 | 
					      neovim.enable = true;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -8,6 +8,7 @@
 | 
				
			|||||||
    ./firefox.nix
 | 
					    ./firefox.nix
 | 
				
			||||||
    ./kitty.nix
 | 
					    ./kitty.nix
 | 
				
			||||||
    ./media.nix
 | 
					    ./media.nix
 | 
				
			||||||
 | 
					    ./mole.nix
 | 
				
			||||||
    ./obsidian.nix
 | 
					    ./obsidian.nix
 | 
				
			||||||
    ./qbittorrent.nix
 | 
					    ./qbittorrent.nix
 | 
				
			||||||
    ./slack.nix
 | 
					    ./slack.nix
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -34,13 +34,10 @@
 | 
				
			|||||||
      programs.rofi.terminal = lib.mkIf pkgs.stdenv.isLinux (lib.mkDefault "${pkgs.kitty}/bin/kitty");
 | 
					      programs.rofi.terminal = lib.mkIf pkgs.stdenv.isLinux (lib.mkDefault "${pkgs.kitty}/bin/kitty");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      # Display images in the terminal
 | 
					      # Display images in the terminal
 | 
				
			||||||
      programs.fish.interactiveShellInit = # fish
 | 
					      programs.fish.shellAliases = {
 | 
				
			||||||
        ''
 | 
					        icat = "kitty +kitten icat";
 | 
				
			||||||
          if test "$TERM" = "xterm-kitty"
 | 
					        ssh = "kitty +kitten ssh";
 | 
				
			||||||
              alias icat="kitty +kitten icat"
 | 
					      };
 | 
				
			||||||
              alias ssh="kitty +kitten ssh"
 | 
					 | 
				
			||||||
          end
 | 
					 | 
				
			||||||
        '';
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
      programs.kitty = {
 | 
					      programs.kitty = {
 | 
				
			||||||
        enable = true;
 | 
					        enable = true;
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										110
									
								
								modules/common/applications/mole.nix
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										110
									
								
								modules/common/applications/mole.nix
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,110 @@
 | 
				
			|||||||
 | 
					{
 | 
				
			||||||
 | 
					  config,
 | 
				
			||||||
 | 
					  pkgs,
 | 
				
			||||||
 | 
					  lib,
 | 
				
			||||||
 | 
					  ...
 | 
				
			||||||
 | 
					}:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					let
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  # Build kdl-py
 | 
				
			||||||
 | 
					  kdl-py = pkgs.python311.pkgs.buildPythonPackage rec {
 | 
				
			||||||
 | 
					    pname = "kdl-py";
 | 
				
			||||||
 | 
					    version = "1.2.0";
 | 
				
			||||||
 | 
					    pyproject = true;
 | 
				
			||||||
 | 
					    src = pkgs.fetchPypi {
 | 
				
			||||||
 | 
					      inherit pname version;
 | 
				
			||||||
 | 
					      hash = "sha256-Y/P0bGJ33trc5E3PyUZyv25r8zMLkBIuATTCKFfimXM=";
 | 
				
			||||||
 | 
					    };
 | 
				
			||||||
 | 
					    build-system = [ pkgs.python311.pkgs.setuptools ];
 | 
				
			||||||
 | 
					    # has no tests
 | 
				
			||||||
 | 
					    doCheck = false;
 | 
				
			||||||
 | 
					  };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  mole = pkgs.python311.pkgs.buildPythonPackage rec {
 | 
				
			||||||
 | 
					    pname = "mole";
 | 
				
			||||||
 | 
					    version = "0.7.1";
 | 
				
			||||||
 | 
					    pyproject = true;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    src = pkgs.fetchFromGitHub {
 | 
				
			||||||
 | 
					      owner = "eblume";
 | 
				
			||||||
 | 
					      repo = pname;
 | 
				
			||||||
 | 
					      rev = "30bb052a97050b1fa89c287855d834f7952b195a";
 | 
				
			||||||
 | 
					      sha256 = "sha256-DUWsfyICCfFQ2ZQBYSQVoA3eLdKC8djUylKgGdHIyJo=";
 | 
				
			||||||
 | 
					    };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    patches = [
 | 
				
			||||||
 | 
					      (builtins.toString (
 | 
				
			||||||
 | 
					        pkgs.writeText "pyproject.toml.patch" ''
 | 
				
			||||||
 | 
					          diff --git a/pyproject.toml b/pyproject.toml
 | 
				
			||||||
 | 
					          index 12ce0f5..787e978 100644
 | 
				
			||||||
 | 
					          --- a/pyproject.toml
 | 
				
			||||||
 | 
					          +++ b/pyproject.toml
 | 
				
			||||||
 | 
					          @@ -12,11 +12,11 @@ packages = [
 | 
				
			||||||
 | 
					           [tool.poetry.dependencies]
 | 
				
			||||||
 | 
					           python = "^3.11"
 | 
				
			||||||
 | 
					           # Now back to the regular dependencies
 | 
				
			||||||
 | 
					          -typer = {extras = ["all"], version = "^0.9"}
 | 
				
			||||||
 | 
					          +typer = {extras = ["all"], version = "^0.12"}
 | 
				
			||||||
 | 
					           todoist-api-python = "^2.1.3"
 | 
				
			||||||
 | 
					           openai = "^1.2.4"
 | 
				
			||||||
 | 
					           rich = "^13.4.2"
 | 
				
			||||||
 | 
					          -watchdog = "^3.0.0"
 | 
				
			||||||
 | 
					          +watchdog = "^4.0.0"
 | 
				
			||||||
 | 
					           pydub = "^0.25.1"
 | 
				
			||||||
 | 
					           requests = "^2.31.0"
 | 
				
			||||||
 | 
					           pyyaml = "^6.0.1"
 | 
				
			||||||
 | 
					        ''
 | 
				
			||||||
 | 
					      ))
 | 
				
			||||||
 | 
					    ];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    # Used during build time
 | 
				
			||||||
 | 
					    nativeBuildInputs = [ pkgs.python311Packages.poetry-core ];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    # Used during run time
 | 
				
			||||||
 | 
					    buildInputs = [
 | 
				
			||||||
 | 
					      pkgs._1password
 | 
				
			||||||
 | 
					      pkgs.nb-cli
 | 
				
			||||||
 | 
					    ];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    # Both build and run time
 | 
				
			||||||
 | 
					    propagatedBuildInputs = [
 | 
				
			||||||
 | 
					      pkgs.python311Packages.typer
 | 
				
			||||||
 | 
					      pkgs.python311Packages.todoist-api-python
 | 
				
			||||||
 | 
					      pkgs.python311Packages.openai
 | 
				
			||||||
 | 
					      pkgs.python311Packages.rich
 | 
				
			||||||
 | 
					      pkgs.python311Packages.watchdog
 | 
				
			||||||
 | 
					      pkgs.python311Packages.pydub
 | 
				
			||||||
 | 
					      pkgs.python311Packages.requests
 | 
				
			||||||
 | 
					      pkgs.python311Packages.pyyaml
 | 
				
			||||||
 | 
					      pkgs.python311Packages.pydantic
 | 
				
			||||||
 | 
					      pkgs.python311Packages.pendulum
 | 
				
			||||||
 | 
					      kdl-py
 | 
				
			||||||
 | 
					      pkgs.ffmpeg
 | 
				
			||||||
 | 
					    ];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    build-system = [ pkgs.python311.pkgs.setuptools ];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    # has no tests
 | 
				
			||||||
 | 
					    doCheck = false;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					in
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  options = {
 | 
				
			||||||
 | 
					    mole = {
 | 
				
			||||||
 | 
					      enable = lib.mkEnableOption {
 | 
				
			||||||
 | 
					        description = "Enable Mole.";
 | 
				
			||||||
 | 
					        default = false;
 | 
				
			||||||
 | 
					      };
 | 
				
			||||||
 | 
					    };
 | 
				
			||||||
 | 
					  };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  config = lib.mkIf config.mole.enable {
 | 
				
			||||||
 | 
					    home-manager.users.${config.user} = {
 | 
				
			||||||
 | 
					      home.packages = [ mole ];
 | 
				
			||||||
 | 
					    };
 | 
				
			||||||
 | 
					  };
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@@ -10,7 +10,7 @@
 | 
				
			|||||||
    pkgs.vimPlugins.vim-eunuch # File manipulation commands
 | 
					    pkgs.vimPlugins.vim-eunuch # File manipulation commands
 | 
				
			||||||
    pkgs.vimPlugins.vim-fugitive # Git commands
 | 
					    pkgs.vimPlugins.vim-fugitive # Git commands
 | 
				
			||||||
    pkgs.vimPlugins.vim-repeat # Better repeat using .
 | 
					    pkgs.vimPlugins.vim-repeat # Better repeat using .
 | 
				
			||||||
    pkgs.vimPlugins.markview-nvim # Markdown preview
 | 
					    pkgs.vimPlugins.glow-nvim # Markdown preview popup
 | 
				
			||||||
    pkgs.vimPlugins.nvim-colorizer-lua # Hex color previews
 | 
					    pkgs.vimPlugins.nvim-colorizer-lua # Hex color previews
 | 
				
			||||||
    pkgs.vimPlugins.which-key-nvim # Keybind helper
 | 
					    pkgs.vimPlugins.which-key-nvim # Keybind helper
 | 
				
			||||||
  ];
 | 
					  ];
 | 
				
			||||||
@@ -21,7 +21,7 @@
 | 
				
			|||||||
      names = false;
 | 
					      names = false;
 | 
				
			||||||
    };
 | 
					    };
 | 
				
			||||||
  };
 | 
					  };
 | 
				
			||||||
  setup.markview = { };
 | 
					  setup.glow = { };
 | 
				
			||||||
  setup.which-key = { };
 | 
					  setup.which-key = { };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  vim.o = {
 | 
					  vim.o = {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -14,6 +14,11 @@
 | 
				
			|||||||
    open_mapping = dsl.rawLua "[[<c-\\>]]";
 | 
					    open_mapping = dsl.rawLua "[[<c-\\>]]";
 | 
				
			||||||
    hide_numbers = true;
 | 
					    hide_numbers = true;
 | 
				
			||||||
    direction = "float";
 | 
					    direction = "float";
 | 
				
			||||||
 | 
					    float_opts = {
 | 
				
			||||||
 | 
					      width = dsl.rawLua "vim.o.columns - 4";
 | 
				
			||||||
 | 
					      height = dsl.rawLua "vim.o.lines - 4";
 | 
				
			||||||
 | 
					      row = 0;
 | 
				
			||||||
 | 
					    };
 | 
				
			||||||
  };
 | 
					  };
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  lua = ''
 | 
					  lua = ''
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -71,8 +71,8 @@ key("n", "co", ":copen<CR>")
 | 
				
			|||||||
key("n", "cq", ":cclose<CR>")
 | 
					key("n", "cq", ":cclose<CR>")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
-- Other
 | 
					-- Other
 | 
				
			||||||
key("n", "<A-CR>", ":noh<CR>", { silent = true }) --- Clear search in VimWiki
 | 
					key("n", "<A-CR>", ":noh<CR>", { silent = true })           --- Clear search in VimWiki
 | 
				
			||||||
key("n", "Y", "y$") --- Copy to end of line
 | 
					key("n", "Y", "y$")                                         --- Copy to end of line
 | 
				
			||||||
key("v", "<C-r>", "y<Esc>:%s/<C-r>+//gc<left><left><left>") --- Substitute selected
 | 
					key("v", "<C-r>", "y<Esc>:%s/<C-r>+//gc<left><left><left>") --- Substitute selected
 | 
				
			||||||
key("v", "D", "y'>gp") --- Duplicate selected
 | 
					key("v", "D", "y'>gp")                                      --- Duplicate selected
 | 
				
			||||||
key("x", "<Leader>p", '"_dP') --- Paste but keep register
 | 
					key("x", "<Leader>p", '"_dP')                               --- Paste but keep register
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -885,28 +885,6 @@ in
 | 
				
			|||||||
                              }
 | 
					                              }
 | 
				
			||||||
                            ];
 | 
					                            ];
 | 
				
			||||||
                          }
 | 
					                          }
 | 
				
			||||||
                          {
 | 
					 | 
				
			||||||
                            matcher = {
 | 
					 | 
				
			||||||
                              id = "byName";
 | 
					 | 
				
			||||||
                              options = "localhost:8086";
 | 
					 | 
				
			||||||
                            };
 | 
					 | 
				
			||||||
                            properties = [
 | 
					 | 
				
			||||||
                              {
 | 
					 | 
				
			||||||
                                id = "displayName";
 | 
					 | 
				
			||||||
                                value = "InfluxDB";
 | 
					 | 
				
			||||||
                              }
 | 
					 | 
				
			||||||
                              {
 | 
					 | 
				
			||||||
                                id = "links";
 | 
					 | 
				
			||||||
                                value = [
 | 
					 | 
				
			||||||
                                  {
 | 
					 | 
				
			||||||
                                    targetBlank = true;
 | 
					 | 
				
			||||||
                                    title = "";
 | 
					 | 
				
			||||||
                                    url = "https://${config.hostnames.influxdb}";
 | 
					 | 
				
			||||||
                                  }
 | 
					 | 
				
			||||||
                                ];
 | 
					 | 
				
			||||||
                              }
 | 
					 | 
				
			||||||
                            ];
 | 
					 | 
				
			||||||
                          }
 | 
					 | 
				
			||||||
                          {
 | 
					                          {
 | 
				
			||||||
                            matcher = {
 | 
					                            matcher = {
 | 
				
			||||||
                              id = "byName";
 | 
					                              id = "byName";
 | 
				
			||||||
@@ -951,28 +929,6 @@ in
 | 
				
			|||||||
                              }
 | 
					                              }
 | 
				
			||||||
                            ];
 | 
					                            ];
 | 
				
			||||||
                          }
 | 
					                          }
 | 
				
			||||||
                          {
 | 
					 | 
				
			||||||
                            matcher = {
 | 
					 | 
				
			||||||
                              id = "byName";
 | 
					 | 
				
			||||||
                              options = "localhost:9000";
 | 
					 | 
				
			||||||
                            };
 | 
					 | 
				
			||||||
                            properties = [
 | 
					 | 
				
			||||||
                              {
 | 
					 | 
				
			||||||
                                id = "displayName";
 | 
					 | 
				
			||||||
                                value = "The Lounge";
 | 
					 | 
				
			||||||
                              }
 | 
					 | 
				
			||||||
                              {
 | 
					 | 
				
			||||||
                                id = "links";
 | 
					 | 
				
			||||||
                                value = [
 | 
					 | 
				
			||||||
                                  {
 | 
					 | 
				
			||||||
                                    targetBlank = true;
 | 
					 | 
				
			||||||
                                    title = "";
 | 
					 | 
				
			||||||
                                    url = "https://${config.hostnames.irc}";
 | 
					 | 
				
			||||||
                                  }
 | 
					 | 
				
			||||||
                                ];
 | 
					 | 
				
			||||||
                              }
 | 
					 | 
				
			||||||
                            ];
 | 
					 | 
				
			||||||
                          }
 | 
					 | 
				
			||||||
                          {
 | 
					                          {
 | 
				
			||||||
                            matcher = {
 | 
					                            matcher = {
 | 
				
			||||||
                              id = "byName";
 | 
					                              id = "byName";
 | 
				
			||||||
@@ -2365,7 +2321,7 @@ in
 | 
				
			|||||||
                      datasourceUid = promUid;
 | 
					                      datasourceUid = promUid;
 | 
				
			||||||
                      model = {
 | 
					                      model = {
 | 
				
			||||||
                        editorMode = "code";
 | 
					                        editorMode = "code";
 | 
				
			||||||
                        expr = ''systemd_unit_state{name=~"cloudflared-tunnel-.*", state="active", job!="tempest"}'';
 | 
					                        expr = ''systemd_unit_state{name=~"cloudflared-tunnel-.*", state="active"}'';
 | 
				
			||||||
                        hide = false;
 | 
					                        hide = false;
 | 
				
			||||||
                        instant = true;
 | 
					                        instant = true;
 | 
				
			||||||
                        intervalMs = 1000;
 | 
					                        intervalMs = 1000;
 | 
				
			||||||
@@ -2462,7 +2418,7 @@ in
 | 
				
			|||||||
                  execErrState = "Error";
 | 
					                  execErrState = "Error";
 | 
				
			||||||
                  for = "5m";
 | 
					                  for = "5m";
 | 
				
			||||||
                  annotations = {
 | 
					                  annotations = {
 | 
				
			||||||
                    description = "Cloudflare Tunnel for {{ index $labels \"job\" }}.";
 | 
					                    description = "Cloudflare Tunnel for {{ $job }}.";
 | 
				
			||||||
                    summary = "Cloudflare Tunnel is down.";
 | 
					                    summary = "Cloudflare Tunnel is down.";
 | 
				
			||||||
                  };
 | 
					                  };
 | 
				
			||||||
                  isPaused = false;
 | 
					                  isPaused = false;
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -26,8 +26,6 @@
 | 
				
			|||||||
        trusted_domains = [ config.hostnames.content ];
 | 
					        trusted_domains = [ config.hostnames.content ];
 | 
				
			||||||
        trusted_proxies = [ "127.0.0.1" ];
 | 
					        trusted_proxies = [ "127.0.0.1" ];
 | 
				
			||||||
        maintenance_window_start = 4; # Run jobs at 4am UTC
 | 
					        maintenance_window_start = 4; # Run jobs at 4am UTC
 | 
				
			||||||
        log_type = "file";
 | 
					 | 
				
			||||||
        loglevel = 1; # Include all actions in the log
 | 
					 | 
				
			||||||
      };
 | 
					      };
 | 
				
			||||||
      extraAppsEnable = true;
 | 
					      extraAppsEnable = true;
 | 
				
			||||||
      extraApps = {
 | 
					      extraApps = {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -38,10 +38,6 @@ in
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
  config = {
 | 
					  config = {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    services.victoriametrics.extraOptions = [
 | 
					 | 
				
			||||||
      "-promscrape.config=${(pkgs.formats.yaml { }).generate "scrape.yml" prometheusConfig}"
 | 
					 | 
				
			||||||
    ];
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    systemd.services.vmauth = lib.mkIf config.services.victoriametrics.enable {
 | 
					    systemd.services.vmauth = lib.mkIf config.services.victoriametrics.enable {
 | 
				
			||||||
      description = "VictoriaMetrics basic auth proxy";
 | 
					      description = "VictoriaMetrics basic auth proxy";
 | 
				
			||||||
      after = [ "network.target" ];
 | 
					      after = [ "network.target" ];
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -38,6 +38,5 @@ in
 | 
				
			|||||||
    base16-nvim = plugin "base16-nvim" inputs.base16-nvim-src;
 | 
					    base16-nvim = plugin "base16-nvim" inputs.base16-nvim-src;
 | 
				
			||||||
    baleia-nvim = plugin "baleia-nvim" inputs.baleia-nvim-src;
 | 
					    baleia-nvim = plugin "baleia-nvim" inputs.baleia-nvim-src;
 | 
				
			||||||
    hmts-nvim = plugin "hmts-nvim" inputs.hmts-nvim-src;
 | 
					    hmts-nvim = plugin "hmts-nvim" inputs.hmts-nvim-src;
 | 
				
			||||||
    markview-nvim = plugin "markview-nvim" inputs.markview-nvim-src;
 | 
					 | 
				
			||||||
  };
 | 
					  };
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user