ran linter
This commit is contained in:
parent
5da0753b7c
commit
dcd5accea0
23 changed files with 372 additions and 309 deletions
|
@ -1,8 +1,7 @@
|
|||
{ inputs, ... }:
|
||||
{
|
||||
imports = [ ./leyla ./ester ./eve ];
|
||||
{inputs, ...}: {
|
||||
imports = [./leyla ./ester ./eve];
|
||||
|
||||
users.mutableUsers = false;
|
||||
|
||||
home-manager.extraSpecialArgs = { inherit inputs; };
|
||||
}
|
||||
home-manager.extraSpecialArgs = {inherit inputs;};
|
||||
}
|
||||
|
|
|
@ -1,8 +1,11 @@
|
|||
{ lib, config, pkgs, ... }:
|
||||
let
|
||||
cfg = config.users.ester;
|
||||
in
|
||||
{
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
cfg = config.users.ester;
|
||||
in {
|
||||
options.users.ester = {
|
||||
isFullUser = lib.mkEnableOption "ester";
|
||||
};
|
||||
|
@ -25,9 +28,10 @@ in
|
|||
}
|
||||
|
||||
(
|
||||
if cfg.isFullUser then {
|
||||
if cfg.isFullUser
|
||||
then {
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "networkmanager" "users" ];
|
||||
extraGroups = ["networkmanager" "users"];
|
||||
|
||||
hashedPasswordFile = config.sops.secrets."passwords/ester".path;
|
||||
|
||||
|
@ -36,10 +40,11 @@ in
|
|||
bitwarden
|
||||
discord
|
||||
];
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
isSystemUser = true;
|
||||
}
|
||||
)
|
||||
];
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,8 +1,11 @@
|
|||
{ lib, config, pkgs, ... }:
|
||||
let
|
||||
cfg = config.users.eve;
|
||||
in
|
||||
{
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
cfg = config.users.eve;
|
||||
in {
|
||||
options.users.eve = {
|
||||
isFullUser = lib.mkEnableOption "eve";
|
||||
};
|
||||
|
@ -25,9 +28,10 @@ in
|
|||
}
|
||||
|
||||
(
|
||||
if cfg.isFullUser then {
|
||||
if cfg.isFullUser
|
||||
then {
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "networkmanager" "users" ];
|
||||
extraGroups = ["networkmanager" "users"];
|
||||
|
||||
hashedPasswordFile = config.sops.secrets."passwords/eve".path;
|
||||
|
||||
|
@ -38,10 +42,11 @@ in
|
|||
makemkv
|
||||
signal-desktop
|
||||
];
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
isSystemUser = true;
|
||||
}
|
||||
)
|
||||
];
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,9 +1,12 @@
|
|||
{ lib, config, pkgs, ... }:
|
||||
let
|
||||
cfg = config.users.leyla;
|
||||
in
|
||||
{
|
||||
imports =[
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
cfg = config.users.leyla;
|
||||
in {
|
||||
imports = [
|
||||
./packages.nix
|
||||
];
|
||||
|
||||
|
@ -31,12 +34,13 @@ in
|
|||
}
|
||||
|
||||
(
|
||||
if (cfg.isFullUser || cfg.isThinUser) then {
|
||||
if (cfg.isFullUser || cfg.isThinUser)
|
||||
then {
|
||||
isNormalUser = true;
|
||||
extraGroups = lib.mkMerge [
|
||||
["networkmanager" "wheel" "users"]
|
||||
(
|
||||
lib.mkIf (!cfg.isThinUser) [ "adbusers" ]
|
||||
lib.mkIf (!cfg.isThinUser) ["adbusers"]
|
||||
)
|
||||
];
|
||||
|
||||
|
@ -48,7 +52,8 @@ in
|
|||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKBiZkg1c2aaNHiieBX4cEziqvJVj9pcDfzUrKU/mO0I leyla@twilight"
|
||||
];
|
||||
};
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
isSystemUser = true;
|
||||
}
|
||||
)
|
||||
|
@ -66,4 +71,4 @@ in
|
|||
|
||||
home-manager.users.leyla = lib.mkIf (cfg.isFullUser || cfg.isThinUser) (import ./home.nix);
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
# Home Manager needs a bit of information about you and the paths it should
|
||||
# manage.
|
||||
home = {
|
||||
|
@ -73,11 +75,11 @@
|
|||
};
|
||||
|
||||
programs = {
|
||||
# Let Home Manager install and manage itself.
|
||||
# Let Home Manager install and manage itself.
|
||||
home-manager.enable = true;
|
||||
git = {
|
||||
enable = true;
|
||||
userName = "Leyla Becker";
|
||||
userName = "Leyla Becker";
|
||||
userEmail = "git@jan-leila.com";
|
||||
extraConfig.init.defaultBranch = "main";
|
||||
};
|
||||
|
@ -89,18 +91,18 @@
|
|||
"org/gnome/desktop/interface".color-scheme = "prefer-dark";
|
||||
|
||||
"org/gnome/shell" = {
|
||||
disable-user-extensions = false; # enables user extensions
|
||||
enabled-extensions = [
|
||||
# Put UUIDs of extensions that you want to enable here.
|
||||
# If the extension you want to enable is packaged in nixpkgs,
|
||||
# you can easily get its UUID by accessing its extensionUuid
|
||||
# field (look at the following example).
|
||||
pkgs.gnomeExtensions.dash-to-dock.extensionUuid
|
||||
|
||||
# Alternatively, you can manually pass UUID as a string.
|
||||
# "dash-to-dock@micxgx.gmail.com"
|
||||
];
|
||||
};
|
||||
disable-user-extensions = false; # enables user extensions
|
||||
enabled-extensions = [
|
||||
# Put UUIDs of extensions that you want to enable here.
|
||||
# If the extension you want to enable is packaged in nixpkgs,
|
||||
# you can easily get its UUID by accessing its extensionUuid
|
||||
# field (look at the following example).
|
||||
pkgs.gnomeExtensions.dash-to-dock.extensionUuid
|
||||
|
||||
# Alternatively, you can manually pass UUID as a string.
|
||||
# "dash-to-dock@micxgx.gmail.com"
|
||||
];
|
||||
};
|
||||
|
||||
"org/gnome/shell/extensions/dash-to-dock" = {
|
||||
"dock-position" = "LEFT";
|
||||
|
|
|
@ -1,8 +1,12 @@
|
|||
{ lib, config, pkgs, inputs, ... }:
|
||||
let
|
||||
cfg = config.users.leyla;
|
||||
in
|
||||
{
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}: let
|
||||
cfg = config.users.leyla;
|
||||
in {
|
||||
imports = [
|
||||
../../overlays/intellij.nix
|
||||
../../overlays/vscodium.nix
|
||||
|
@ -70,41 +74,43 @@ in
|
|||
obsidian
|
||||
steam
|
||||
(lib.mkIf cfg.hasGPU davinci-resolve)
|
||||
|
||||
|
||||
# development tools
|
||||
(vscode-with-extensions.override {
|
||||
vscode = vscodium;
|
||||
vscodeExtensions = with open-vsx; [
|
||||
# vs code feel extensions
|
||||
ms-vscode.atom-keybindings
|
||||
akamud.vscode-theme-onedark
|
||||
streetsidesoftware.code-spell-checker
|
||||
streetsidesoftware.code-spell-checker-german
|
||||
streetsidesoftware.code-spell-checker-italian
|
||||
jeanp413.open-remote-ssh
|
||||
vscodeExtensions = with open-vsx;
|
||||
[
|
||||
# vs code feel extensions
|
||||
ms-vscode.atom-keybindings
|
||||
akamud.vscode-theme-onedark
|
||||
streetsidesoftware.code-spell-checker
|
||||
streetsidesoftware.code-spell-checker-german
|
||||
streetsidesoftware.code-spell-checker-italian
|
||||
jeanp413.open-remote-ssh
|
||||
|
||||
# nix extensions
|
||||
pinage404.nix-extension-pack
|
||||
jnoortheen.nix-ide
|
||||
# nix extensions
|
||||
pinage404.nix-extension-pack
|
||||
jnoortheen.nix-ide
|
||||
|
||||
# html extensions
|
||||
formulahendry.auto-rename-tag
|
||||
ms-vscode.live-server
|
||||
|
||||
# js extensions
|
||||
dsznajder.es7-react-js-snippets
|
||||
dbaeumer.vscode-eslint
|
||||
standard.vscode-standard
|
||||
firsttris.vscode-jest-runner
|
||||
stylelint.vscode-stylelint
|
||||
tauri-apps.tauri-vscode
|
||||
# html extensions
|
||||
formulahendry.auto-rename-tag
|
||||
ms-vscode.live-server
|
||||
|
||||
# misc extensions
|
||||
bungcip.better-toml
|
||||
] ++ (with vscode-marketplace; [
|
||||
# js extensions
|
||||
karyfoundation.nearley
|
||||
]);
|
||||
# js extensions
|
||||
dsznajder.es7-react-js-snippets
|
||||
dbaeumer.vscode-eslint
|
||||
standard.vscode-standard
|
||||
firsttris.vscode-jest-runner
|
||||
stylelint.vscode-stylelint
|
||||
tauri-apps.tauri-vscode
|
||||
|
||||
# misc extensions
|
||||
bungcip.better-toml
|
||||
]
|
||||
++ (with vscode-marketplace; [
|
||||
# js extensions
|
||||
karyfoundation.nearley
|
||||
]);
|
||||
})
|
||||
androidStudioPackages.canary
|
||||
jetbrains.idea-community
|
||||
|
@ -126,4 +132,4 @@ in
|
|||
)
|
||||
]
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue