flake.nix

@@ -38,7 +38,6 @@
     # This is a function that generates an attribute by calling a function you
     # pass to it, with each system as an argument
     forAllSystems = nixpkgs.lib.genAttrs systems;
-    vars = import ./vars.nix;
   in {
     # Your custom packages
     # Accessible through 'nix build', 'nix shell', etc
@@ -60,7 +59,7 @@
     # Available through 'nixos-rebuild --flake .#your-hostname'
     nixosConfigurations = {
       adalbert = nixpkgs.lib.nixosSystem {
-        specialArgs = {inherit inputs outputs vars;};
+        specialArgs = {inherit inputs outputs;};
         modules = [
           ./hosts/adalbert
         ];
@@ -72,7 +71,7 @@
     homeConfigurations = {
       "ghoscht@adalbert" = home-manager.lib.homeManagerConfiguration {
         pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
-        extraSpecialArgs = {inherit inputs outputs vars;};
+        extraSpecialArgs = {inherit inputs outputs;};
         modules = [
           ./home/ghoscht/adalbert.nix
         ];

hosts/adalbert/default.nix

@@ -25,13 +25,13 @@
     ./hardware-configuration.nix
 
     ../common/global
+    ../common/users/ghoscht
     ../common/optional/desktop/awesome.nix
 
     ../common/optional/systemd-boot.nix
     ../common/optional/wireshark.nix
     ../common/optional/gamemode.nix
     ../common/optional/kde-connect.nix
-    ../common/optional/gnome-keyring.nix
   ];
 
   nixpkgs = {

hosts/common/global/default.nix

@@ -2,13 +2,11 @@
 {
   inputs,
   outputs,
-  config,
   ...
 }: {
   imports =
     [
       inputs.home-manager.nixosModules.home-manager
-      ./user.nix
       ./fish.nix
       ./locale.nix
       ./nix.nix

hosts/common/global/power-button.nix

@@ -4,7 +4,7 @@
   ...
 }: {
   services.logind.extraConfig = ''
-    # don't shutdown when power button is short-pressed
+    # don’t shutdown when power button is short-pressed
      HandlePowerKey=ignore
   '';
 }

hosts/common/optional/gnome-keyring.nix

@@ -1,12 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  vars,
-  ...
-}: let
-in {
-  security.pam.services.${vars.user}.enableGnomeKeyring = true;
-  services.gnome.gnome-keyring.enable = true;
-  programs.seahorse.enable = true;
-}

hosts/common/users/ghoscht/default.nix

@@ -1,15 +1,11 @@
 {
-  inputs,
-  outputs,
   pkgs,
   config,
-  vars,
   ...
 }: let
   ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
 in {
-  imports = builtins.attrValues outputs.nixosModules; #propagates imports downwards
+  users.users.ghoscht = {
-  users.users.${vars.user} = {
     isNormalUser = true;
     shell = pkgs.fish;
     extraGroups =
@@ -42,5 +38,5 @@ in {
     packages = [pkgs.home-manager];
   };
 
-  home-manager.users.${vars.user} = import ../../../home/${vars.user}/${config.networking.hostName}.nix;
+  home-manager.users.ghoscht = import ../../../../home/ghoscht/${config.networking.hostName}.nix;
 }

vars.nix

@@ -1,7 +0,0 @@
-{
-  # Global variables used in NixOS and HomeManager which will probably never change
-  user = "ghoscht";
-  location = "$HOME/.setup";
-  terminal = "alacritty";
-  editor = "nvim";
-}