martials/nixos-configuration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

✨ [shared] Updated Zed config, changed user config to just username

Browse Source
This commit is contained in:
Martin Berg Alstad 2025-04-18 19:49:14 +02:00
parent 31c25681c5
commit e97dd6f5ce
Signed by: martials
GPG Key ID: 848D71DE0590C199
6 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
flake.nix
View File

@ -95,10 +95,7 @@
];
defaultAttrs = {
user = {
name = common.username;
password = "temp"; # TODO
};
username = common.username;
version = common.system.version;
wayland.enable = true;
nvidia.enable = false;
@ -120,7 +117,7 @@
{
hostName,
system,
user,
username,
...
}@systemConfig:
@ -157,7 +154,7 @@
systemConfig
;
};
users.${user.name} = import ./hosts/${hostName}/home-manager;
users.${username} = import ./hosts/${hostName}/home-manager;
};
}
{

2
hosts/pi4/default.nix
View File

@ -22,7 +22,7 @@
users = {
mutableUsers = false;
users.${systemConfig.user.name} = {
users.${systemConfig.username} = {
isNormalUser = true;
hashedPasswordFile = config.sops.secrets.password.path;
extraGroups = [ "wheel" ];

2
shared/home-manager/default.nix
View File

@ -28,7 +28,7 @@ in
];
home = {
username = systemConfig.user.name;
username = systemConfig.username;
homeDirectory = dir.home;
sessionVariables = {

12
shared/home-manager/development/zed.nix
View File

@ -27,17 +27,17 @@
version = "2";
};
autosave = "on_focus_change";
auto_update = false;
base_keymap = "JetBrains";
buffer_font_family = font;
features = {
edit_completion_provider = "zed";
};
icon_theme = "Catppuccin Mocha";
# icon_theme = { TODO replace icon theme above with below
# mode = theme.mode;
# light = "Catppuccin Mocha";
# dark = "Catppuccin Mocha";
# };
icon_theme = {
mode = theme.mode;
light = "Catppuccin Latte";
dark = "Catppuccin Mocha";
};
ui_font_family = font;
ui_font_size = fontSize;
buffer_font_size = fontSize;

2
shared/modules/security/sops.nix
View File

@ -14,7 +14,7 @@
defaultSopsFile = lib.custom.relativeToRoot "shared/secrets/secrets.yaml";
defaultSopsFormat = "yaml";
age.keyFile = "/home/${systemConfig.user.name}/.config/sops/age/keys.txt";
age.keyFile = "/home/${systemConfig.username}/.config/sops/age/keys.txt";
secrets.password.neededForUsers = true;
};
}

2
shared/modules/users.nix
View File

@ -1,6 +1,6 @@
{ config, systemConfig, ... }:
let
username = systemConfig.user.name;
username = systemConfig.username;
in
{
users.users.${username} = {