From 0804bd6792aacd923090ad0d271e58f4e7928762 Mon Sep 17 00:00:00 2001 From: Patrick Neff Date: Tue, 6 Feb 2024 20:26:07 +0100 Subject: [PATCH] Add varaibles to flake --- flake.lock | 61 ++++++++++++++++++++++--------------------- flake.nix | 15 ++++++++--- modules/default.nix | 7 +++-- modules/shell/git.nix | 5 ++-- modules/shell/ssh.nix | 3 +++ 5 files changed, 52 insertions(+), 39 deletions(-) diff --git a/flake.lock b/flake.lock index d109ed2..1858e58 100644 --- a/flake.lock +++ b/flake.lock @@ -271,11 +271,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1705659542, - "narHash": "sha256-WA3xVfAk1AYmFdwghT7mt/erYpsU6JPu9mdTEP/e9HQ=", + "lastModified": 1706981411, + "narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "10cd9c53115061aa6a0a90aad0b0dde6a999cdb9", + "rev": "652fda4ca6dafeb090943422c34ae9145787af37", "type": "github" }, "original": { @@ -290,11 +290,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1706435589, - "narHash": "sha256-yhEYJxMv5BkfmUuNe4QELKo+V5eq1pwhtVs6kEziHfE=", + "lastModified": 1707175763, + "narHash": "sha256-0MKHC6tQ4KEuM5rui6DjKZ/VNiSANB4E+DJ/+wPS1PU=", "owner": "nix-community", "repo": "home-manager", - "rev": "4d54c29bce71f8c261513e0662cc573d30f3e33e", + "rev": "f99eace7c167b8a6a0871849493b1c613d0f1b80", "type": "github" }, "original": { @@ -311,16 +311,17 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "dirtyRev": "bbc31d60a53fef45106e986567070cb4e47713e0-dirty", - "dirtyShortRev": "bbc31d6-dirty", - "lastModified": 1706718229, - "narHash": "sha256-mJgZSFTPlA0N1tG155yH0klQIOyhdE31/g9rTUJUqeg=", + "lastModified": 1707242654, + "narHash": "sha256-RqJufqhfyKWAURH2GpKknbeftqSEm0hO1I15R3udM+0=", + "ref": "refs/heads/master", + "rev": "d9a3d0673598c1d4fa71684490852fd4a76b5235", + "revCount": 13, "type": "git", - "url": "file:///home/odie/Code/nix/neovim-config" + "url": "ssh://gitea@pi1.odie.intranet/odie/neovim-flake" }, "original": { "type": "git", - "url": "file:///home/odie/Code/nix/neovim-config" + "url": "ssh://gitea@pi1.odie.intranet/odie/neovim-flake" } }, "neovim-flake": { @@ -437,11 +438,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1706515015, - "narHash": "sha256-eFfY5A7wlYy3jD/75lx6IJRueg4noE+jowl0a8lIlVo=", + "lastModified": 1705331948, + "narHash": "sha256-qjQXfvrAT1/RKDFAMdl8Hw3m4tLVvMCc8fMqzJv0pP4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f4a8d6d5324c327dcc2d863eb7f3cc06ad630df4", + "rev": "b8dd8be3c790215716e7c12b247f45ca525867e2", "type": "github" }, "original": { @@ -453,11 +454,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1705856552, - "narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=", + "lastModified": 1707092692, + "narHash": "sha256-ZbHsm+mGk/izkWtT4xwwqz38fdlwu7nUUKXTOmm4SyE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "612f97239e2cc474c13c9dafa0df378058c5ad8d", + "rev": "faf912b086576fd1a15fca610166c98d47bc667e", "type": "github" }, "original": { @@ -469,11 +470,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1706191920, - "narHash": "sha256-eLihrZAPZX0R6RyM5fYAWeKVNuQPYjAkCUBr+JNvtdE=", + "lastModified": 1706732774, + "narHash": "sha256-hqJlyJk4MRpcItGYMF+3uHe8HvxNETWvlGtLuVpqLU0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ae5c332cbb5827f6b1f02572496b141021de335f", + "rev": "b8b232ae7b8b144397fdb12d20f592e5e7c1a64d", "type": "github" }, "original": { @@ -501,11 +502,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1706191920, - "narHash": "sha256-eLihrZAPZX0R6RyM5fYAWeKVNuQPYjAkCUBr+JNvtdE=", + "lastModified": 1707092692, + "narHash": "sha256-ZbHsm+mGk/izkWtT4xwwqz38fdlwu7nUUKXTOmm4SyE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ae5c332cbb5827f6b1f02572496b141021de335f", + "rev": "faf912b086576fd1a15fca610166c98d47bc667e", "type": "github" }, "original": { @@ -548,11 +549,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1705916986, - "narHash": "sha256-iBpfltu6QvN4xMpen6jGGEb6jOqmmVQKUrXdOJ32u8w=", + "lastModified": 1707091808, + "narHash": "sha256-LahKBAfGbY836gtpVNnWwBTIzN7yf/uYM/S0g393r0Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d7f206b723e42edb09d9d753020a84b3061a79d8", + "rev": "9f2ee8c91ac42da3ae6c6a1d21555f283458247e", "type": "github" }, "original": { @@ -564,11 +565,11 @@ }, "nur": { "locked": { - "lastModified": 1706713393, - "narHash": "sha256-RYjelBW6OfXqsKJe5mJp1sbKHf3e8ytvwhlxRwx8Trk=", + "lastModified": 1707241543, + "narHash": "sha256-Q4wxwWiG1iT3Tu02K88dcQA4M/k2UBclkO3p87EgVmc=", "owner": "nix-community", "repo": "NUR", - "rev": "6bc9f506e6299fc5e02bb7f5f7d7692b82df628d", + "rev": "9534dd7152380c152b5a14e646a882de59ea51c2", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e964cb1..a42f1c7 100644 --- a/flake.nix +++ b/flake.nix @@ -12,8 +12,8 @@ url = "github:nix-community/neovim-nightly-overlay"; }; neovim = { - #url = "git+ssh://gitea@pi1.odie.intranet/odie/neovim-flake"; - url = "/home/odie/Code/nix/neovim-config"; + url = "git+ssh://gitea@pi1.odie.intranet/odie/neovim-flake"; + #url = "/home/odie/Code/nix/neovim-config"; }; nur.url = "github:nix-community/NUR"; nixgl.url = "github:nix-community/nixGL"; @@ -22,6 +22,15 @@ outputs = inputs@{ self, nixpkgs, flake-utils, home-manager, ... }: let inherit (self) outputs; + + vars = rec { + name = "Patrick Neff"; + username = "odie"; + homeDirectory = "/home/${username}"; + locale = "de_DE.UTF-8"; + email = "odie86@gmail.com"; + }; + inputOverlays = [ inputs.neovim-nightly-overlay.overlays.default inputs.neovim.overlays.default @@ -53,7 +62,7 @@ homeConfigurations = { "odie-full" = home-manager.lib.homeManagerConfiguration { pkgs = mkPkgs "x86_64-linux"; - extraSpecialArgs = { inherit inputs outputs; }; + extraSpecialArgs = { inherit inputs outputs vars; }; modules = homeManagerModules.full; }; }; diff --git a/modules/default.nix b/modules/default.nix index 659cba8..4b88aac 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -1,8 +1,7 @@ -{ pkgs, lib, inputs, ... }: with lib; { +{ pkgs, lib, inputs, vars, ... }: with lib; { home = { - username = "odie"; - homeDirectory = "/home/odie"; - language.base = "de_DE.UTF-8"; + inherit (vars) username homeDirectory; + language.base = vars.locale; packages = with pkgs; [ home-manager ]; diff --git a/modules/shell/git.nix b/modules/shell/git.nix index 06e025d..ec14bbd 100644 --- a/modules/shell/git.nix +++ b/modules/shell/git.nix @@ -1,6 +1,7 @@ { config , pkgs , lib +, vars , ... }: lib.mkIf config.programs.git.enable { home = { @@ -8,8 +9,8 @@ }; programs = { git = { - userName = "Patrick Neff"; - userEmail = "odie86@gmail.com"; + userName = vars.name; + userEmail = vars.email; extraConfig = { push = { default = "matching"; diff --git a/modules/shell/ssh.nix b/modules/shell/ssh.nix index d011ed3..b28b1b5 100644 --- a/modules/shell/ssh.nix +++ b/modules/shell/ssh.nix @@ -4,6 +4,9 @@ ssh = { #addKeysToAgent = "yes"; forwardAgent = true; + extraConfig = '' + AddKeysToAgent yes + ''; }; };