main #2

Merged
Lithospherical merged 42 commits from jan-leila/nix-config:main into main 2025-06-05 04:13:47 +00:00
5 changed files with 36 additions and 24 deletions
Showing only changes of commit 666504a63a - Show all commits

View file

@ -45,7 +45,9 @@ in {
++ ( ++ (
lib.lists.optionals hardware.directAccess.enable (with pkgs; [ lib.lists.optionals hardware.directAccess.enable (with pkgs; [
#foss platforms #foss platforms
# TODO: move signal to package with impermanence
signal-desktop-bin signal-desktop-bin
# TODO: move bitwarden to package with impermanence
bitwarden bitwarden
ungoogled-chromium ungoogled-chromium
libreoffice libreoffice
@ -55,9 +57,12 @@ in {
freecad freecad
# cura # cura
# kicad-small # kicad-small
# TODO: move makemkv to package with configs set and impermanence
makemkv makemkv
onionshare onionshare
# rhythmbox # rhythmbox
# TODO: move obs to package with impermanence
(lib.mkIf hardware.graphicsAcceleration.enable obs-studio) (lib.mkIf hardware.graphicsAcceleration.enable obs-studio)
# wireshark # wireshark
# rpi-imager # rpi-imager
@ -71,17 +76,22 @@ in {
picard picard
# proprietary platforms # proprietary platforms
# TODO: move discord to package with impermanence
discord discord
# TODO: move obsidian to package with impermanence
obsidian obsidian
# TODO: move prostudiomasters to package with impermanence
prostudiomasters prostudiomasters
(lib.mkIf hardware.graphicsAcceleration.enable davinci-resolve) (lib.mkIf hardware.graphicsAcceleration.enable davinci-resolve)
# development tools # development tools
# androidStudioPackages.canary # androidStudioPackages.canary
# TODO: move idea to package with impermanence and installed extensions
jetbrains.idea-community jetbrains.idea-community
qFlipper qFlipper
# system tools # system tools
# TODO: move protonvpn to package with impermanence and installed extensions
protonvpn-gui protonvpn-gui
openvpn openvpn
noisetorch noisetorch

View file

@ -1,11 +1,21 @@
{config, ...}: { {
config = { lib,
config,
osConfig,
...
}: let
userConfig = osConfig.host.users.leyla;
in {
config = lib.mkIf userConfig.isDesktopUser {
programs = { programs = {
git = { direnv = {
enable = config.user.isDesktopUser || config.user.isTerminalUser; enable = true;
userName = "Leyla Becker"; enableBashIntegration = true;
userEmail = "git@jan-leila.com"; nix-direnv.enable = true;
extraConfig.init.defaultBranch = "main"; config = {
global.hide_env_diff = true;
whitelist.exact = ["${config.home.homeDirectory}/documents/code/nix-config"];
};
}; };
}; };
}; };

View file

@ -341,5 +341,6 @@
}; };
}; };
}; };
# TODO: impermanence module, prob in home-manager-modules?
}; };
} }

View file

@ -1,21 +1,11 @@
{ {config, ...}: {
lib, config = {
config,
osConfig,
...
}: let
userConfig = osConfig.host.users.leyla;
in {
config = lib.mkIf userConfig.isDesktopUser {
programs = { programs = {
direnv = { git = {
enable = true; enable = config.user.isDesktopUser || config.user.isTerminalUser;
enableBashIntegration = true; userName = "Leyla Becker";
nix-direnv.enable = true; userEmail = "git@jan-leila.com";
config = { extraConfig.init.defaultBranch = "main";
global.hide_env_diff = true;
whitelist.exact = ["${config.home.homeDirectory}/documents/code/nix-config"];
};
}; };
}; };
}; };

View file

@ -20,5 +20,6 @@
]; ];
}; };
}; };
# TODO: impermanence module, prob in home-manager-modules?
}; };
} }