From 97d2dc116954a4f3180f33eb19a6511c1807d0bd Mon Sep 17 00:00:00 2001 From: Pim Kunis Date: Wed, 18 Oct 2023 21:06:38 +0200 Subject: [PATCH] enable git diff in git commit remove old garbage --- configuration.nix | 11 ++--------- home/flake.nix | 29 ----------------------------- home/git/default.nix | 1 + 3 files changed, 3 insertions(+), 38 deletions(-) delete mode 100644 home/flake.nix diff --git a/configuration.nix b/configuration.nix index 261a705..8fa40e6 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,14 +1,7 @@ -{ pkgs, config, ... }: - -let - stateVersion = "23.05"; - home-manager = builtins.fetchTarball {url = "https://github.com/nix-community/home-manager/archive/release-${stateVersion}.tar.gz"; sha256 = "0rwzab51hnr6cmm1w5zmfh29gbkg6byv8jnr7frcv5kd6m8kna41"; }; -in -{ +{ pkgs, config, ... }: { imports = [ ./hardware-configuration.nix - (import "${home-manager}/nixos") ]; boot = { @@ -58,7 +51,7 @@ in ]; }; - system.stateVersion = stateVersion; + system.stateVersion = "23.05"; programs.ssh.knownHosts = { dmz = { diff --git a/home/flake.nix b/home/flake.nix deleted file mode 100644 index 3b1720f..0000000 --- a/home/flake.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - description = "Home Manager configuration of pim"; - - inputs = { - # Specify the source of Home Manager and Nixpkgs. - nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; - home-manager = { - url = "github:nix-community/home-manager/release-23.05"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - }; - - outputs = { nixpkgs, home-manager, ... }: - let - system = "x86_64-linux"; - pkgs = nixpkgs.legacyPackages.${system}; - in { - homeConfigurations."pim" = home-manager.lib.homeManagerConfiguration { - inherit pkgs; - - # Specify your home configuration modules here, for example, - # the path to your home.nix. - modules = [ ./home.nix ]; - - # Optionally use extraSpecialArgs - # to pass through arguments to home.nix - }; - }; -} diff --git a/home/git/default.nix b/home/git/default.nix index f641c54..46d1a42 100644 --- a/home/git/default.nix +++ b/home/git/default.nix @@ -6,6 +6,7 @@ userEmail = "pim@kunis.nl"; extraConfig = { push.autoSetupRemote = true; + commit.verbose = true; }; includes = [{ path = "~/git/suecode/.gitconfig";