diff --git a/flake.lock b/flake.lock index 36eba21..11441a9 100644 --- a/flake.lock +++ b/flake.lock @@ -136,6 +136,24 @@ "type": "github" } }, + "flake-parts_3": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1769996383, + "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -296,6 +314,21 @@ "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1769909678, + "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "72716169fe93074c333e8d0173151350670b824c", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "nixpkgs-master": { "locked": { "lastModified": 1771681141, @@ -406,6 +439,22 @@ "type": "github" } }, + "nixpkgs_6": { + "locked": { + "lastModified": 1771008912, + "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a82ccc39b39b621151d6732718e3e250109076fa", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "flake-parts": "flake-parts_2", @@ -462,7 +511,8 @@ "nixpkgs-master": "nixpkgs-master", "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", - "vpngate": "vpngate" + "vpngate": "vpngate", + "weathr": "weathr" } }, "systems": { @@ -528,6 +578,25 @@ "repo": "vpngate", "type": "github" } + }, + "weathr": { + "inputs": { + "flake-parts": "flake-parts_3", + "nixpkgs": "nixpkgs_6" + }, + "locked": { + "lastModified": 1771787430, + "narHash": "sha256-XnkDOzS64bUHylsKaHC9Q2Nkq14OUYC6OKrUZDfNCPY=", + "owner": "Veirt", + "repo": "weathr", + "rev": "65f1610698cd9678a38b7f0e6dcf1084695a9e0a", + "type": "github" + }, + "original": { + "owner": "Veirt", + "repo": "weathr", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 0f23e05..04316b9 100644 --- a/flake.nix +++ b/flake.nix @@ -16,18 +16,18 @@ inputs.nixpkgs.follows = "nixpkgs"; }; vpngate.url = "github:davegallant/vpngate"; + weathr.url = "github:Veirt/weathr"; }; outputs = { - self, darwin, - determinate, home-manager, nixpkgs, nixpkgs-unstable, nixpkgs-master, vpngate, + weathr, ... }@inputs: let @@ -101,6 +101,7 @@ users.dave.imports = [ ./home.nix inputs.nixvim.homeModules.nixvim + weathr.homeModules.weathr ]; extraSpecialArgs = { inherit unstable master; }; }; @@ -144,6 +145,7 @@ users."dave.gallant".imports = [ ./home.nix inputs.nixvim.homeModules.nixvim + weathr.homeModules.weathr ]; extraSpecialArgs = { inherit unstable master; }; }; diff --git a/home.nix b/home.nix index f323482..a544c5d 100644 --- a/home.nix +++ b/home.nix @@ -171,7 +171,8 @@ in tf = "terraform"; tree = "eza --tree"; v = "nvim"; - } // lib.optionalAttrs stdenv.isLinux { + } + // lib.optionalAttrs stdenv.isLinux { zed = "zeditor"; }; }; @@ -398,6 +399,13 @@ in }; }; + weathr = { + enable = true; + settings = { + hide_hud = true; + }; + }; + zed-editor = { enable = stdenv.isLinux; package = unstable.zed-editor; diff --git a/hosts/hephaestus.nix b/hosts/hephaestus.nix index d093afa..8881370 100644 --- a/hosts/hephaestus.nix +++ b/hosts/hephaestus.nix @@ -234,9 +234,9 @@ }; services.mullvad-vpn = { - enable = true; - package = pkgs.mullvad-vpn; - }; + enable = true; + package = pkgs.mullvad-vpn; + }; services.ollama = { package = pkgs.ollama;