diff --git a/core/default.nix b/core/default.nix
index 3e06fc4..9232051 100644
--- a/core/default.nix
+++ b/core/default.nix
@@ -59,7 +59,6 @@ in {
       };
     };
     neovim = {
-      package = pkgs.neovim;
       enable = true;
       viAlias = true;
       vimAlias = true;
diff --git a/core/issue.nix b/core/issue.nix
index c904960..5d8abea 100644
--- a/core/issue.nix
+++ b/core/issue.nix
@@ -1,7 +1,9 @@
-{
-  environment.etc."issue".text = ''
+let
+  issue_text = ''
     \d  \t
     This is \e{cyan}\n\e{reset} [\e{lightblue}\l\e{reset}] (\s \m \r)
   '';
-  environment.etc."issue.logo".text = environment.etc."issue".text;
+in {
+  environment.etc."issue".text = issue_text;
+  environment.etc."issue.logo".text = issue_text;
 }
diff --git a/hosts/nom/default.nix b/hosts/nom/default.nix
index 0b79f75..04e3f47 100644
--- a/hosts/nom/default.nix
+++ b/hosts/nom/default.nix
@@ -33,7 +33,7 @@
   console = {
     font = "ter-v28n";
     keyMap = "de-latin1-nodeadkeys";
-    packages = with pkgs; [terminus_font];
+    packages = pkgs.terminus_font;
   };
 
   environment.systemPackages = with pkgs; [wireguard-tools powertop];
diff --git a/users/common/git.nix b/users/common/git.nix
index ebee0cc..97f43e4 100644
--- a/users/common/git.nix
+++ b/users/common/git.nix
@@ -1,8 +1,4 @@
-{
-  lib,
-  pkgs,
-  ...
-}: {
+{lib, ...}: {
   programs.gitui.enable = true;
   programs.git = {
     enable = true;
@@ -20,7 +16,7 @@
     };
     aliases = {
       unstash = "stash pop";
-      s = status;
+      s = "status";
       tags = "tag -l";
       t = "tag -s -m ''";
       ci = "commit -v -S";
@@ -33,6 +29,6 @@
     gs = "git status";
     ga = "git add";
     gc = "git commit -v -S";
-    gca = "${gci} --amend";
+    gca = "${gc} --amend";
   };
 }