Mirror/nix-git
Mirror/nix-git
1
0
Fork 0
mirror of https://codeberg.org/privacy1st/nix-git synced 2025-02-11 08:50:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: code style

Browse Source
This commit is contained in:
Daniel Langbein 2025-02-09 21:35:44 +01:00
parent e604600dbc
commit 16566f25e3
Signed by: langfingaz
GPG Key ID: 6C47C753F0823002
53 changed files with 74 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -391,7 +391,7 @@ journalctl --user --follow
While I was on a bike tour I did some config changes to update my NixOS servers using only my smartphone and Nitrokey (GPG smartcard):
- `home-manager.users.yoda.programs.git.signing.signByDefault = false;`
- `home-manager.users."yoda".programs.git.signing.signByDefault = false;`
- Import `../../modules/git.nix` in `hosts/yodaNas/configuration.nix`
- Import `./../modules/docker-pushrm.nix` in `hosts/yodaNas/configuration.nix`
- In `hieve.nix`, set `allowLocalDeployment` to `true` for `yodaNas` and `yodaHedgehog`

2
hosts/pi3bplus/configuration.nix
View File

@ -56,7 +56,7 @@
enable = true;
settings.PasswordAuthentication = false;
};
users.users.root.openssh.authorizedKeys.keys = [
users.users."root".openssh.authorizedKeys.keys = [
(builtins.readFile ./assets/ssh/nitrokey.pub)
];

2
hosts/yodaHedgehog/ssh-client-root.nix
View File

@ -1,6 +1,6 @@
{ config, pkgs, ... }:
{
home-manager.users.root = { osConfig, config, pkgs, ... }: {
home-manager.users."root" = { osConfig, config, pkgs, ... }: {
# SSH client configuration.
programs.ssh = {

2
hosts/yodaYoga/BikeTripPlanner.nix
View File

@ -13,7 +13,7 @@
];
# Download BikeTripPlanner Git repository.
home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
home-manager.users."yoda" = { osConfig, config, pkgs, ... }: {
home.file."readonly-git/BikeTripPlanner".source = (builtins.fetchGit {
url = "https://github.com/langbein-daniel/BikeTripPlanner";
#rev = "6d4daf18235189825b0c314901b1617ece6d8641";

2
iso-aarch64.nix
View File

@ -34,7 +34,7 @@
enable = true;
settings.PasswordAuthentication = false;
};
users.users.root.openssh.authorizedKeys.keys = [
users.users."root".openssh.authorizedKeys.keys = [
(builtins.readFile ./assets/ssh/nitrokey.pub)
];
hardware.enableRedistributableFirmware = true;

2
modules/android.nix
View File

@ -4,7 +4,7 @@
# https://nixos.wiki/wiki/Android#adb_setup
programs.adb.enable = true;
users.users.yoda.extraGroups = [ "adbusers" "plugdev" ];
users.users."yoda".extraGroups = [ "adbusers" "plugdev" ];
# plugdev group: https://developer.android.com/studio/run/device
# How to add user to new group: https://superuser.com/a/1352988

2
modules/ark.nix
View File

@ -36,7 +36,7 @@ in
"unrar"
];
users.users.yoda = {
users.users."yoda" = {
packages = with pkgs; [
ark-with-unrar # Archive manager: Compress and decompress
];

2
modules/autostart.nix
View File

@ -3,7 +3,7 @@
# See also:
# Temporary workaround until https://github.com/nix-community/home-manager/issues/3447 is merged.
home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
home-manager.users."yoda" = { osConfig, config, pkgs, ... }: {
home.file."keepassxc" = {
target = ".config/autostart/org.keepassxc.KeePassXC.desktop";
source = (pkgs.keepassxc + "/share/applications/org.keepassxc.KeePassXC.desktop");

4
modules/base-minimal.nix
View File

@ -51,7 +51,7 @@
# Define a user account.
# Don't forget to set a password with `passwd`.
users.users.yoda = {
users.users."yoda" = {
isNormalUser = true;
description = "Yoda";
extraGroups = [ "wheel" ];
@ -74,7 +74,7 @@
# Options only for build.system.vm - they won’t get applied when building build.system.toplevel aka the normal system config.
# https://discourse.nixos.org/t/wayland-compositors-an-build-vm-not-working/46486/2
virtualisation.vmVariant = {
users.users.yoda.initialPassword = "asdf";
users.users."yoda".initialPassword = "asdf";
virtualisation.qemu.options = [
"-device virtio-vga-gl"
"-display sdl,gl=on,show-cursor=off"

2
modules/base.nix
View File

@ -32,7 +32,7 @@
# Enable networking.
networking.networkmanager.enable = true;
#
users.users.yoda = {
users.users."yoda" = {
extraGroups = [ "networkmanager" ];
};

4
modules/bash.nix
View File

@ -18,10 +18,10 @@ in
# Required by home-manager programs.bash.enableCompletion
environment.pathsToLink = [ "/share/bash-completion" ];
home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
home-manager.users."yoda" = { osConfig, config, pkgs, ... }: {
programs.bash = bash-config;
};
home-manager.users.root = { osConfig, config, pkgs, ... }: {
home-manager.users."root" = { osConfig, config, pkgs, ... }: {
programs.bash = bash-config;
};
}

4
modules/blackbox.nix
View File

@ -3,7 +3,7 @@
# A direct integration in Nautilus is still in progress: https://gitlab.gnome.org/raggesilver/blackbox/-/issues/20
# Thus, we use nautilus-open-any-terminal.
users.users.yoda = {
users.users."yoda" = {
packages = with pkgs; [
blackbox-terminal # Terminal emulator. Can show notifications for commands finished in the background.
nautilus-open-any-terminal # For Nautilus (GNOME files) integration
@ -11,7 +11,7 @@
};
programs.dconf.enable = true;
home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
home-manager.users."yoda" = { osConfig, config, pkgs, ... }: {
dconf.settings = {
# For Nautilus (GNOME files) integration
"com/github/stunkymonkey/nautilus-open-any-terminal" = {

4
modules/boxes.nix
View File

@ -7,7 +7,7 @@
# Open issue: HiDPI support. https://gitlab.gnome.org/GNOME/gnome-boxes/-/issues/635
users.users.yoda = {
users.users."yoda" = {
packages = with pkgs; [
gnome-boxes # Virtual machines
];
@ -16,7 +16,7 @@
# libvirt is a dependency of GNOME Boxes
# https://nixos.wiki/wiki/Libvirt
virtualisation.libvirtd.enable = true;
users.users.yoda.extraGroups = [ "libvirtd" ];
users.users."yoda".extraGroups = [ "libvirtd" ];
# Required for USB redirection to work, see
# https://github.com/NixOS/nixpkgs/issues/39129#issuecomment-382569032

2
modules/digikam-rawtherapee-hugin-gimp.nix
View File

@ -1,6 +1,6 @@
{ config, pkgs, ... }:
{
users.users.yoda = {
users.users."yoda" = {
packages = with pkgs; [
# TODO: Temporary fix until exiftool fix is landed in NixOS stable
# https://github.com/NixOS/nixpkgs/issues/332561

2
modules/dosbox-x.nix
View File

@ -1,6 +1,6 @@
{ config, pkgs, ... }:
{
users.users.yoda = {
users.users."yoda" = {
packages = with pkgs; [
dosbox-x # Virtual machines with DOS-based Windows such as Windows 3.x and Windows 9x
];

2
modules/element-desktop.nix
View File

@ -18,7 +18,7 @@
# Workaround: Use Flatpak version ...
# Discussion on GitHub: https://github.com/NixOS/nixpkgs/issues/343806 AMD GPUs and NixOS - 'Cannot find target for triple amdgcn-- Unable to find target for this triple (no targets are registered)'
users.users.yoda = {
users.users."yoda" = {
packages = with pkgs; [
# Matrix chat client.
element-desktop

2
modules/file-roller.nix
View File

@ -1,6 +1,6 @@
{ lib, config, pkgs, ... }:
{
users.users.yoda = {
users.users."yoda" = {
packages = with pkgs; [
file-roller # Archive manager: Compress and decompress
lz4 # Add support to extract lz4 archives

4
modules/firefox.nix
View File

@ -1,6 +1,6 @@
{ config, pkgs, lib, ... }:
{
users.users.yoda = {
users.users."yoda" = {
packages = with pkgs; [
firefox # Web browser
];
@ -14,7 +14,7 @@
# Required for dconf.settings
programs.dconf.enable = true;
home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
home-manager.users."yoda" = { osConfig, config, pkgs, ... }: {
dconf.settings = {
"org/gnome/shell" = {
favorite-apps = ["firefox.desktop"];

2
modules/freetube.nix
View File

@ -1,6 +1,6 @@
{ config, pkgs, lib, ... }:
{
users.users.yoda = {
users.users."yoda" = {
packages = with pkgs; [
unstable.freetube # YouTube client.
];

2
modules/fwupd-gnome.nix
View File

@ -3,7 +3,7 @@
# Enable firmware update daemon
services.fwupd.enable = true;
users.users.yoda = {
users.users."yoda" = {
packages = with pkgs; [
# Install firmware on devices supported by fwupd.
gnome-firmware

8
modules/fzf.nix
View File

@ -17,19 +17,19 @@ let
};
in
{
home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
home-manager.users."yoda" = { osConfig, config, pkgs, ... }: {
programs.fzf = fzf-config;
};
home-manager.users.root = { osConfig, config, pkgs, ... }: {
home-manager.users."root" = { osConfig, config, pkgs, ... }: {
programs.fzf = fzf-config;
};
users.users.yoda = {
users.users."yoda" = {
packages = with pkgs; [
fd
];
};
users.users.root = {
users.users."root" = {
packages = with pkgs; [
fd
];

2
modules/games.nix
View File

@ -42,7 +42,7 @@
"dotnet-sdk-6.0.428"
];
users.users.yoda = {
users.users."yoda" = {
packages = with pkgs; [
#
# Sandbox

4
modules/ghostwriter.nix
View File

@ -1,6 +1,6 @@
{ config, pkgs, lib, ... }:
{
users.users.yoda = {
users.users."yoda" = {
packages = with pkgs; [
libsForQt5.ghostwriter # Markdown editor
];
@ -9,7 +9,7 @@
# This fixes blurry fonts with fractional scaling on Wayland.
environment.sessionVariables.QT_QPA_PLATFORM = lib.mkIf (config.services.xserver.displayManager.gdm.wayland) "wayland";
home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
home-manager.users."yoda" = { osConfig, config, pkgs, ... }: {
home.file.".config/kde.org/ghostwriter.conf" = {
text = ''
[Application]

4
modules/git.nix
View File

@ -1,12 +1,12 @@
{ config, pkgs, ... }:
{
users.users.yoda = {
users.users."yoda" = {
packages = with pkgs; [
git
];
};
home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
home-manager.users."yoda" = { osConfig, config, pkgs, ... }: {
programs.git = {
enable = true;
userName = "Daniel Langbein";

2
modules/gnome-config.nix
View File

@ -23,7 +23,7 @@
programs.dconf.enable = true;
home-manager.users.yoda = { osConfig, config, pkgs, lib, ... }: {
home-manager.users."yoda" = { osConfig, config, pkgs, lib, ... }: {
home.file = {
# Templates to create new Files with Nautilus.
# It is also possible to group them by category

4
modules/gnome-extensions.nix
View File

@ -11,7 +11,7 @@
programs.dconf.enable = true;
users.users.yoda = {
users.users."yoda" = {
packages = with pkgs.gnomeExtensions; [
caffeine
#openweather
@ -26,7 +26,7 @@
# If on X11: Enable dependency of "x11-gestures".
services.touchegg.enable = lib.mkIf (! config.services.xserver.displayManager.gdm.wayland) true;
home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
home-manager.users."yoda" = { osConfig, config, pkgs, ... }: {
# TODO: Alternative
# home.packages = with pkgs.gnomeExtensions; [
# caffeine

2
modules/gnome-fractional-scaling.nix
View File

@ -22,7 +22,7 @@
programs.dconf.enable = true;
home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
home-manager.users."yoda" = { osConfig, config, pkgs, ... }: {
dconf.settings = {
"org/gnome/mutter" = {
experimental-features = ["scale-monitor-framebuffer" "xwayland-native-scaling"];

4
modules/gnome-terminal.nix
View File

@ -1,6 +1,6 @@
{ config, pkgs, ... }:
{
users.users.yoda = {
users.users."yoda" = {
packages = with pkgs; [
#gnome.gnome-terminal # Terminal emulator
nautilus-open-any-terminal # For Nautilus (GNOME files) integration
@ -10,7 +10,7 @@
# For Nautilus (GNOME files) integration
programs.dconf.enable = true;
home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
home-manager.users."yoda" = { osConfig, config, pkgs, ... }: {
dconf.settings = {
# For Nautilus (GNOME files) integration
"com/github/stunkymonkey/nautilus-open-any-terminal" = {

2
modules/gnome-wallpaper.nix
View File

@ -4,7 +4,7 @@
programs.dconf.enable = true;
home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
home-manager.users."yoda" = { osConfig, config, pkgs, ... }: {
dconf.settings = {
"org/gnome/desktop/background" = {
"picture-uri" = "/home/yoda/.config/background";

2
modules/headless.nix
View File

@ -1,6 +1,6 @@
{ config, pkgs, ... }:
{
users.users.yoda = {
users.users."yoda" = {
packages = with pkgs; [
#zenith # Terminal resource monitor / task manager
btop # Terminal resource monitor / task manager

4
modules/home-manager.nix
View File

@ -19,12 +19,12 @@ in
# https://nix-community.github.io/home-manager/index.html#sec-install-nixos-module
home-manager.useGlobalPkgs = true;
home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
home-manager.users."yoda" = { osConfig, config, pkgs, ... }: {
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
# Switching to a higher state version typically requires performing some manual steps, such as data conversion or moving files.
home.stateVersion = "24.11";
};
home-manager.users.root = { osConfig, config, pkgs, ... }: {
home-manager.users."root" = { osConfig, config, pkgs, ... }: {
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
# Switching to a higher state version typically requires performing some manual steps, such as data conversion or moving files.
home.stateVersion = "24.11";

4
modules/jetbrains-ide.nix
View File

@ -41,14 +41,14 @@ in
# TODO: Currently markdown previews are broken anyways because of issues with the sandboxed webbrowser on NixOS
];
users.users.yoda = {
users.users."yoda" = {
packages = with pkgs; [
jetbrains."${version}"
];
};
programs.dconf.enable = true;
home-manager.users.yoda = { osConfig, config, pkgs, lib, ... }: {
home-manager.users."yoda" = { osConfig, config, pkgs, lib, ... }: {
dconf.settings = {
"org/gnome/shell" = {
favorite-apps = ["${version}.desktop"];

2
modules/joplin-desktop.nix
View File

@ -3,7 +3,7 @@
# TODO: Only if display scaling != 1
environment.sessionVariables.NIXOS_OZONE_WL = lib.mkIf (config.services.xserver.displayManager.gdm.wayland) "1";
users.users.yoda = {
users.users."yoda" = {
packages = with pkgs; [
joplin-desktop # Markdown notes
];

4
modules/nitrokey-gpg-smartcard.nix
View File

@ -121,7 +121,7 @@
# pinentry-gnome
#];
#users.users.yoda = {
#users.users."yoda" = {
# packages = with pkgs; [
# #pinentry-curses
# pinentry-gnome
@ -146,7 +146,7 @@
# Smartcard daemon.
services.pcscd.enable = true;
home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
home-manager.users."yoda" = { osConfig, config, pkgs, ... }: {
# Disable GNOME Keyring. See comment above.
#

4
modules/obsidian.nix
View File

@ -10,14 +10,14 @@
"obsidian"
];
users.users.yoda = {
users.users."yoda" = {
packages = with pkgs; [
obsidian # Markdown notes
];
};
programs.dconf.enable = true;
home-manager.users.yoda = { osConfig, config, pkgs, lib, ... }: {
home-manager.users."yoda" = { osConfig, config, pkgs, lib, ... }: {
dconf.settings = {
"org/gnome/shell" = {
favorite-apps = ["obsidian.desktop"];

2
modules/print-and-scan.nix
View File

@ -58,7 +58,7 @@
extraBackends = [ pkgs.hplip ];
};
users.users.yoda = {
users.users."yoda" = {
extraGroups = [ "scanner" "lp" ];
packages = with pkgs; [
simple-scan # GNOME Document Scanner

2
modules/programs-base.nix
View File

@ -6,7 +6,7 @@
./signal-desktop.nix
];
users.users.yoda = {
users.users."yoda" = {
packages = with pkgs; [
#zenith # Terminal resource monitor / task manager
btop # Terminal resource monitor / task manager

2
modules/programs-gnome.nix
View File

@ -7,7 +7,7 @@
./blackbox.nix # Terminal emulator.
];
users.users.yoda = {
users.users."yoda" = {
packages = with pkgs; [
gnome-tweaks
dconf-editor

2
modules/programs-kde.nix
View File

@ -11,7 +11,7 @@
"dotnet-runtime-6.0.36"
];
users.users.yoda = {
users.users."yoda" = {
packages = with pkgs; [
# Preinstalled
# kdePackages.ark # Archive manager

2
modules/programs.nix
View File

@ -4,7 +4,7 @@
./thunderbird.nix # email
];
users.users.yoda = {
users.users."yoda" = {
packages = with pkgs; [
#
# CLI apps

4
modules/rnote.nix
View File

@ -1,13 +1,13 @@
{ config, pkgs, lib, ... }:
{
users.users.yoda = {
users.users."yoda" = {
packages = with pkgs; [
unstable.rnote # Handwritten notes
];
};
programs.dconf.enable = true;
home-manager.users.yoda = { osConfig, config, pkgs, lib, ... }: {
home-manager.users."yoda" = { osConfig, config, pkgs, lib, ... }: {
dconf.settings = {
"org/gnome/shell" = {
favorite-apps = lib.mkIf (osConfig.networking.hostName == "yodaTab") ["com.github.flxzt.rnote.desktop"];

4
modules/signal-desktop.nix
View File

@ -1,6 +1,6 @@
{ config, pkgs, lib, ... }:
{
users.users.yoda = {
users.users."yoda" = {
packages = with pkgs; [
signal-desktop # Signal client
];
@ -23,7 +23,7 @@
})
];
home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
home-manager.users."yoda" = { osConfig, config, pkgs, ... }: {
dconf.settings = {
"org/gnome/shell" = {
favorite-apps = ["signal-desktop.desktop"];

2
modules/spaceFM.nix
View File

@ -1,6 +1,6 @@
{ config, pkgs, lib, ... }:
{
users.users.yoda = {
users.users."yoda" = {
packages = with pkgs; [
spaceFM
];

2
modules/ssh-client.nix
View File

@ -1,6 +1,6 @@
{ config, pkgs, ... }:
{
home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
home-manager.users."yoda" = { osConfig, config, pkgs, ... }: {
# SSH client configuration.
programs.ssh = {

2
modules/syncthing.nix
View File

@ -14,7 +14,7 @@
# };
# We run Syncthing as user service.
home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
home-manager.users."yoda" = { osConfig, config, pkgs, ... }: {
services.syncthing = {
enable = true;
};

2
modules/thunderbird.nix
View File

@ -8,7 +8,7 @@ in
# https://github.com/dr460nf1r3/dr460nixed/blob/main/home-manager/email.nix
# https://github.com/yurrriq/dotfiles/blob/main/machines/nixps/home.nix
home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
home-manager.users."yoda" = { osConfig, config, pkgs, ... }: {
accounts.email.accounts = {
"personal" = {
address = "daniel@systemli.org";

2
modules/tor-browser.nix
View File

@ -1,6 +1,6 @@
{ config, pkgs, lib, ... }:
{
users.users.yoda = {
users.users."yoda" = {
packages = with pkgs; [
tor-browser-bundle-bin # Tor web browser.
];

2
modules/uni-vpn.nix
View File

@ -9,7 +9,7 @@
./t-telesec.nix
];
users.users.yoda = {
users.users."yoda" = {
packages = with pkgs; [
networkmanager-openconnect # Openconnect VPN
];

2
modules/veracrypt.nix
View File

@ -11,7 +11,7 @@
"veracrypt"
];
users.users.yoda = {
users.users."yoda" = {
packages = with pkgs; [
veracrypt # Encrypted filesystem
];

4
modules/virt-manager.nix
View File

@ -5,7 +5,7 @@
# libvirt is a dependency of Virt-manager
# https://nixos.wiki/wiki/Libvirt
virtualisation.libvirtd.enable = true;
users.users.yoda.extraGroups = [ "libvirtd" ];
users.users."yoda".extraGroups = [ "libvirtd" ];
# Required for USB redirection to work with GNOME boxes. Maybe this is also required for virt-Manager?
# See
@ -18,7 +18,7 @@
# TODO: nixpkgs virtio-win
programs.virt-manager.enable = true;
programs.dconf.enable = true;
home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
home-manager.users."yoda" = { osConfig, config, pkgs, ... }: {
dconf.settings = {
"org/virt-manager/virt-manager/connections" = {
autoconnect = ["qemu:///system"];

2
modules/vlc-dvd-blu-ray.nix
View File

@ -44,7 +44,7 @@ let
vlc = pkgs.vlc.override { inherit libbluray; };
in
{
users.users.yoda = {
users.users."yoda" = {
packages = [
vlc # Video (DVD, Blu-ray) and audio player
pkgs.dvdbackup # Create ackups of personal DVDs

2
modules/xdg.nix
View File

@ -7,7 +7,7 @@
# # Inside the following Home Manager configuration block,
# # `config` refers to Home Manager configuration.
# home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
# home-manager.users."yoda" = { osConfig, config, pkgs, ... }: {
# xdg = {
# enable = true;
# # This updates the desktop database. https://github.com/nix-community/home-manager/blob/0e0e9669547e45ea6cca2de4044c1a384fd0fe55/modules/misc/xdg-mime.nix#L45-L58

6
modules/zsh.nix
View File

@ -57,14 +57,14 @@ in
# Inside the following Home Manager configuration block,
# `config` refers to Home Manager configuration.
home-manager.users.yoda = { osConfig, config, pkgs, ... }: {
home-manager.users."yoda" = { osConfig, config, pkgs, ... }: {
programs.zsh = zsh-config // {
# nix-repl: config.home-manager.users.yoda.programs.zsh.history.path
# nix-repl: config.home-manager.users."yoda".programs.zsh.history.path
# -> ~/.local/share/.histfile
history.path = "${config.xdg.dataHome}/.histfile";
};
};
home-manager.users.root = { osConfig, config, pkgs, ... }: {
home-manager.users."root" = { osConfig, config, pkgs, ... }: {
programs.zsh = zsh-config // {
history.path = "${config.xdg.dataHome}/.histfile";
};