From 004fdd32076b3c71ce6bb0e31ce8f07ee6a2cd60 Mon Sep 17 00:00:00 2001 From: Daniel Meiburg Date: Tue, 26 Sep 2023 17:05:24 +0200 Subject: [PATCH] Update flake --- .gitmodules | 3 +++ configuration.nix | 12 +++++++++++- dotfiles | 1 + flake.lock | 30 +++++++----------------------- git/config | 24 ++++++++++++++++++++++++ hardware-configuration.nix | 2 -- home.nix | 18 +++++++++++------- 7 files changed, 57 insertions(+), 33 deletions(-) create mode 100644 .gitmodules create mode 160000 dotfiles create mode 100644 git/config diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..013e4c7 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "dotfiles"] + path = dotfiles + url = ssh://git@git.dmeiburg.de:2222/dm/dotfiles.git diff --git a/configuration.nix b/configuration.nix index a01660f..3b61d19 100644 --- a/configuration.nix +++ b/configuration.nix @@ -36,7 +36,7 @@ LC_TELEPHONE = "de_DE.UTF-8"; LC_TIME = "de_DE.UTF-8"; }; - fonts.fonts = with pkgs; [ + fonts.packages = with pkgs; [ noto-fonts font-awesome ]; @@ -73,6 +73,16 @@ ]; }; + # enable nitrokeys + services.udev.packages = [ pkgs.nitrokey-udev-rules ]; + programs = { + ssh.startAgent = false; + gnupg.agent = { + enable = true; + enableSSHSupport = true; + }; + }; + nixpkgs.config.allowUnfree = true; environment.systemPackages = with pkgs; [ diff --git a/dotfiles b/dotfiles new file mode 160000 index 0000000..cb8d0a0 --- /dev/null +++ b/dotfiles @@ -0,0 +1 @@ +Subproject commit cb8d0a0a4494c450610853717e5b9cd453e9b517 diff --git a/flake.lock b/flake.lock index c2a7242..a7d4623 100644 --- a/flake.lock +++ b/flake.lock @@ -4,15 +4,14 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "utils": "utils" + ] }, "locked": { - "lastModified": 1678006026, - "narHash": "sha256-cGOfrU7JsKHAWXbPVDTOu2yyMb7GeWdUtJQNQSqht+w=", + "lastModified": 1695224363, + "narHash": "sha256-+hfjJLUMck5G92RVFDZA7LWkR3kOxs5zQ7RPW9t3eM8=", "owner": "nix-community", "repo": "home-manager", - "rev": "68ba59578352815ac372b17fb3df9db39afb1407", + "rev": "408ba13188ff9ce309fa2bdd2f81287d79773b00", "type": "github" }, "original": { @@ -23,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1677932085, - "narHash": "sha256-+AB4dYllWig8iO6vAiGGYl0NEgmMgGHpy9gzWJ3322g=", + "lastModified": 1695145219, + "narHash": "sha256-Eoe9IHbvmo5wEDeJXKFOpKUwxYJIOxKUesounVccNYk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3c5319ad3aa51551182ac82ea17ab1c6b0f0df89", + "rev": "5ba549eafcf3e33405e5f66decd1a72356632b96", "type": "github" }, "original": { @@ -42,21 +41,6 @@ "home-manager": "home-manager", "nixpkgs": "nixpkgs" } - }, - "utils": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } } }, "root": "root", diff --git a/git/config b/git/config new file mode 100644 index 0000000..474e15c --- /dev/null +++ b/git/config @@ -0,0 +1,24 @@ +[user] + email = key@dmeiburg.de + name = Daniel Meiburg + signingkey = 782C4A83DD7B9E4A64B12EDEE5827ECFFE0AA4F2 +[alias] + br = branch + co = checkout + cm = commit + l = log --oneline --graph +[commit] + gpgSign = true +[init] + defaultBranch = master +[filter "lfs"] + clean = git-lfs clean -- %f + smudge = git-lfs smudge -- %f + process = git-lfs filter-process + required = true +[difftool] + prompt = true +[diff] + tool = nvimdiff +[difftool "nvimdiff"] + cmd = "nvim -d \"$LOCAL\" \"$REMOTE\"" diff --git a/hardware-configuration.nix b/hardware-configuration.nix index 82e88e4..21bd749 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -37,6 +37,4 @@ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - # high-resolution display - hardware.video.hidpi.enable = lib.mkDefault true; } diff --git a/home.nix b/home.nix index fc1f4e4..9e1b7de 100644 --- a/home.nix +++ b/home.nix @@ -4,6 +4,11 @@ home.packages = with pkgs; [ firefox gnupg + htop + ripgrep + pavucontrol + fish + pass # All of the below is for sway wl-clipboard mako @@ -13,13 +18,12 @@ programs.home-manager = { enable = true; }; - programs.git = { - enable = true; - userName = "Daniel Meiburg"; - userEmail = "key@dmeiburg.de"; - signing.key = "782C4A83DD7B9E4A64B12EDEE5827ECFFE0AA4F2"; - signing.signByDefault = true; - }; + home.file = { + ".config/git" = { + source = ./git; + recursive = true; + }; + }; programs.kitty = { enable = true; theme = "Solarized Dark";