diff --git a/flake.lock b/flake.lock index 1f00bf2..8c7a418 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1747763032, - "narHash": "sha256-9j3oCbemeH7bTVXJ3pDWxOptbxDx2SdK1jY2AHpjQiw=", + "lastModified": 1780099287, + "narHash": "sha256-efIPwVGtIWIjWcznhaop6XN6HxnOL8800hF6CBNvlqQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "29dda415f5b2178278283856c6f9f7b48a2a4353", + "rev": "7d8127d308c3fb9664f7e643eec944be74ebb37d", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1747542820, - "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", + "lastModified": 1779560665, + "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", + "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786", "type": "github" }, "original": { @@ -35,10 +35,27 @@ "type": "indirect" } }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1780243769, + "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "home-manager": "home-manager", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "nixpkgs-unstable": "nixpkgs-unstable" } } }, diff --git a/flake.nix b/flake.nix index 6df3690..a95a075 100644 --- a/flake.nix +++ b/flake.nix @@ -3,8 +3,9 @@ inputs = { nixpkgs.url = "nixpkgs/nixos-unstable"; + nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; home-manager.url = "github:nix-community/home-manager"; - home-manager.inputs.nixpkgs.follows = "nixpkgs"; + home-manager.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = inputs @ { self, nixpkgs, home-manager, ... }: { @@ -49,9 +50,10 @@ { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; + home-manager.extraSpecialArgs = { inherit inputs; }; home-manager.users.emmathorpe.imports = [ ./emmathorpe/home.nix ./system/modules/work/default.nix ]; - } + } ]; }; }; diff --git a/system/modules/work/default.nix b/system/modules/work/default.nix index 791ad55..ec1ce06 100644 --- a/system/modules/work/default.nix +++ b/system/modules/work/default.nix @@ -1,20 +1,54 @@ { config, pkgs, inputs, lib, ... }: +let + unstable = import inputs.nixpkgs-unstable { + inherit (pkgs.stdenv.hostPlatform) system; + config.allowUnfree = true; + }; +in { programs.git = { - userEmail = "emma.thorpe@cloud.com"; + settings = { + commit.gpgsign = true; + tag.gpgsign = true; + gpg.format = "ssh"; + user.signingkey = "~/.ssh/id_ed25519.pub"; + user.email = "emma.thorpe@citrix.com"; + }; }; home.packages = [ - pkgs.kubectl - pkgs.tenv - pkgs.kubernetes-helm - pkgs.azure-cli - pkgs.kubelogin - pkgs.curl + pkgs.kubectl + pkgs.argo-rollouts + pkgs.tenv + pkgs.kubernetes-helm + pkgs.azure-cli + pkgs.kubelogin + pkgs.curl + pkgs.notation + pkgs.powershell + pkgs.nuget + pkgs.gedit + pkgs.lens + pkgs.python3 + pkgs.gnumake + pkgs.gcc + pkgs.libiconv + pkgs.autoconf + pkgs.automake + pkgs.pkg-config + pkgs.wget + unstable.claude-code + pkgs.google-cloud-sdk ]; + home.shellAliases = { + docker = "/run/current-system/sw/bin/docker"; + }; programs.tmux = { extraConfig = '' set -g status-right "#(/run/current-system/sw/bin/bash $HOME/code/kube-tmux/kube.tmux 250 red black)" ''; - }; + }; + programs.go = { + enable = true; + }; }