diff --git a/flake.lock b/flake.lock index 3244644..4650b2e 100644 --- a/flake.lock +++ b/flake.lock @@ -87,7 +87,7 @@ }, "devshell": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1741473158, @@ -221,7 +221,7 @@ }, "home-manager_2": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1745782215, @@ -593,7 +593,7 @@ "hyprlang": "hyprlang_2", "hyprutils": "hyprutils_2", "hyprwayland-scanner": "hyprwayland-scanner_2", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "pre-commit-hooks": "pre-commit-hooks_2", "systems": "systems_2", "xdph": "xdph_2" @@ -825,6 +825,22 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1693565476, + "narHash": "sha256-ya00zHt7YbPo3ve/wNZ/6nts61xt7wK/APa6aZAfey0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "aa8aa7e2ea35ce655297e8322dc82bf77a31d04b", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1744868846, "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", @@ -840,7 +856,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1722073938, "narHash": "sha256-OpX0StkL8vpXyWOGUD6G+MA26wAXK6SpT94kLJXo6B4=", @@ -856,7 +872,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1745526057, "narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=", @@ -872,7 +888,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1744932701, "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", @@ -888,7 +904,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1745377448, "narHash": "sha256-jhZDfXVKdD7TSEGgzFJQvEEZ2K65UMiqW5YJ2aIqxMA=", @@ -904,7 +920,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1735554305, "narHash": "sha256-zExSA1i/b+1NMRhGGLtNfFGXgLtgo+dcuzHzaWA6w3Q=", @@ -972,14 +988,33 @@ "home-manager": "home-manager", "hyprland": "hyprland", "nixpkgs": "nixpkgs_2", + "sk-extract": "sk-extract", "sops-nix": "sops-nix", "xremap": "xremap" } }, - "sops-nix": { + "sk-extract": { "inputs": { "nixpkgs": "nixpkgs_3" }, + "locked": { + "lastModified": 1751159013, + "narHash": "sha256-ROTyPZ5CxbNmCrXiQBQDyJOfEJrF2ZGExVoAcXwiEMA=", + "ref": "refs/heads/main", + "rev": "95063ba566db81a0a40e49d9ba02060a93087562", + "revCount": 65, + "type": "git", + "url": "https://git.skdevstudios.com/specCon18/sk_extract.git" + }, + "original": { + "type": "git", + "url": "https://git.skdevstudios.com/specCon18/sk_extract.git" + } + }, + "sops-nix": { + "inputs": { + "nixpkgs": "nixpkgs_4" + }, "locked": { "lastModified": 1750119275, "narHash": "sha256-Rr7Pooz9zQbhdVxux16h7URa6mA80Pb/G07T4lHvh0M=", @@ -1026,7 +1061,7 @@ }, "treefmt-nix": { "inputs": { - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1745780832, @@ -1137,7 +1172,7 @@ "flake-parts": "flake-parts", "home-manager": "home-manager_2", "hyprland": "hyprland_2", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "treefmt-nix": "treefmt-nix", "xremap": "xremap_2" }, diff --git a/flake.nix b/flake.nix index aa5af54..fa8d3b8 100644 --- a/flake.nix +++ b/flake.nix @@ -10,6 +10,7 @@ sops-nix.url = "github:Mic92/sops-nix"; xremap.url = "github:xremap/nix-flake"; hyprland.url = "github:hyprwm/Hyprland"; + sk-extract.url = "git+https://git.skdevstudios.com/specCon18/sk_extract.git"; }; outputs = { self, nixpkgs, ... }@inputs: { diff --git a/hosts/katana.nix b/hosts/katana.nix index 86a620c..db3f704 100644 --- a/hosts/katana.nix +++ b/hosts/katana.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, self, ... }: +{ config, pkgs, lib, self,inputs, ... }: { system.stateVersion = "23.05"; @@ -144,6 +144,7 @@ yubioath-flutter # Yubico Authenticator Client lazygit # Git tui written in rust glow # Markdown renderer for terminal + inputs.sk-extract.packages.${system}.default ]; # Fonts diff --git a/modules/home-manager/home.nix b/modules/home-manager/home.nix index 08bc45f..006e955 100644 --- a/modules/home-manager/home.nix +++ b/modules/home-manager/home.nix @@ -12,6 +12,7 @@ ./zellij.nix ./zoxide.nix ./zsh.nix + ./ssh.nix ]; speccon18.hm.alacritty.enable = true; speccon18.hm.direnv.enable = true; @@ -24,7 +25,7 @@ speccon18.hm.zoxide.enable = true; speccon18.hm.zsh.enable = true; speccon18.hm.rio.enable = false; - + speccon18.hm.ssh.enable = true; # Home Manager needs a bit of information about you and the paths it should # manage. home = { diff --git a/modules/home-manager/ssh.nix b/modules/home-manager/ssh.nix new file mode 100644 index 0000000..63261f5 --- /dev/null +++ b/modules/home-manager/ssh.nix @@ -0,0 +1,17 @@ +{pkgs, config, lib, ...}:{ + options.speccon18.hm.ssh.enable = lib.mkEnableOption "enables specs personal git preferences"; + config = lib.mkIf config.speccon18.hm.ssh.enable { + programs.ssh = { + enable = true; + + matchBlocks = { + "git.skdevstudios.com" = { + hostname = "git.skdevstudios.com"; + user = "git"; + port = 2223; + identityFile = "~/.ssh/id_ed25519"; # Adjust as needed + }; + }; + }; + }; +}