move the username variable fully into the flake

This commit is contained in:
Andreas Zweili 2022-01-24 12:18:17 +01:00
parent fb96fb5ec2
commit 260c6cdf74
15 changed files with 17 additions and 54 deletions

View File

@ -23,7 +23,7 @@
}: }:
let let
system = "x86_64-linux"; system = "x86_64-linux";
username = import ./username.nix; username = "andreas";
overlay-unstable = final: prev: { overlay-unstable = final: prev: {
unstable = import nixpkgs-unstable { unstable = import nixpkgs-unstable {
system = "x86_64-linux"; system = "x86_64-linux";
@ -41,7 +41,7 @@
}; };
mkComputer = configurationNix: homeManagerRole: extraModules: nixpkgs.lib.nixosSystem { mkComputer = configurationNix: homeManagerRole: extraModules: nixpkgs.lib.nixosSystem {
inherit system pkgs; inherit system pkgs;
specialArgs = { inherit self system inputs; }; specialArgs = { inherit self system inputs username; };
modules = ( modules = (
[ [
# System configuration for this host # System configuration for this host
@ -55,7 +55,7 @@
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users.${username}.imports = [ home-manager.users.${username}.imports = [
(import homeManagerRole { inherit self pkgs; }) (import homeManagerRole { inherit pkgs username; })
]; ];
} }
] ++ extraModules ] ++ extraModules

View File

@ -1,7 +1,4 @@
{ self, ... }: { username, ... }:
let
username = import "${self}/username.nix";
in
{ {
# Home Manager needs a bit of information about you and the # Home Manager needs a bit of information about you and the
# paths it should manage. # paths it should manage.

View File

@ -1,7 +1,7 @@
{ self, pkgs, ... }: { pkgs, username, ... }:
{ {
imports = [ imports = [
(import ./common { inherit self; }) (import ./common { inherit username; })
./software/work-desktop ./software/work-desktop
./software/autorandr ./software/autorandr
./software/czkawka ./software/czkawka

View File

@ -1,7 +1,4 @@
{ pkgs, ... }: { pkgs, username, ... }:
let
username = import ../../username.nix;
in
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
vagrant vagrant

View File

@ -1,7 +1,4 @@
{ self, pkgs, ... }: { pkgs, username, ... }:
let
username = import "${self}/username.nix";
in
{ {
services.code-server = { services.code-server = {
enable = true; enable = true;

View File

@ -1,7 +1,4 @@
{ self, pkgs, ... }: { self, pkgs, username, ... }:
let
username = import "${self}/username.nix";
in
{ {
imports = [ imports = [
"${self}/modules/cli" "${self}/modules/cli"

View File

@ -1,7 +1,4 @@
{ self, pkgs, ... }: { pkgs, username, ... }:
let
username = import "${self}/username.nix";
in
{ {
virtualisation.docker = virtualisation.docker =
{ {

View File

@ -1,7 +1,4 @@
{ self, pkgs, ... }: { pkgs, username, ... }:
let
username = import "${self}/username.nix";
in
{ {
programs.droidcam.enable = true; programs.droidcam.enable = true;
# required for USB connection # required for USB connection

View File

@ -1,7 +1,4 @@
{ self, pkgs, ... }: { pkgs, username, ... }:
let
username = import "${self}/username.nix";
in
{ {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
gnome.eog gnome.eog

View File

@ -1,7 +1,4 @@
{ self, pkgs, ... }: { pkgs, username, ... }:
let
username = import "${self}/username.nix";
in
{ {
services.espanso.enable = true; services.espanso.enable = true;
home-manager.users.${username} = { home-manager.users.${username} = {

View File

@ -1,7 +1,4 @@
{ self, pkgs, ... }: { pkgs, username, ... }:
let
username = import "${self}/username.nix";
in
{ {
nix.extraOptions = '' nix.extraOptions = ''
keep-outputs = true keep-outputs = true

View File

@ -1,7 +1,4 @@
{ self, ... }: { username, ... }:
let
username = import "${self}/username.nix";
in
{ {
services.restic.backups.${username} = { services.restic.backups.${username} = {
user = username; user = username;

View File

@ -1,7 +1,4 @@
{ self, ... }: { username, ... }:
let
username = import "${self}/username.nix";
in
{ {
programs.steam.enable = true; programs.steam.enable = true;
hardware.steam-hardware.enable = true; hardware.steam-hardware.enable = true;

View File

@ -1,7 +1,4 @@
{ self, pkgs, ... }: { pkgs, username, ... }:
let
username = import "${self}/username.nix";
in
{ {
programs.xonsh = { programs.xonsh = {
enable = true; enable = true;

View File

@ -1 +0,0 @@
"andreas"