Merge remote-tracking branch 'origin/nixos' into nixos
This commit is contained in:
commit
420b5d5d10
40 changed files with 341 additions and 281 deletions
|
|
@ -1,74 +1,84 @@
|
|||
{ lib
|
||||
, config
|
||||
, pkgs
|
||||
, ...
|
||||
}:
|
||||
with lib; {
|
||||
my = {
|
||||
yubikey = {
|
||||
enable = mkDefault true;
|
||||
luksSupport = {
|
||||
|
||||
with lib;
|
||||
let
|
||||
cfg = config.my.profiles.desktop;
|
||||
in
|
||||
{
|
||||
options.my.profiles.desktop.enable = mkEnableOption "desktop profile";
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
my = {
|
||||
yubikey = {
|
||||
enable = mkDefault true;
|
||||
devices = mkDefault [ "enc" ];
|
||||
luksSupport = {
|
||||
enable = mkDefault true;
|
||||
devices = mkDefault [ "enc" ];
|
||||
};
|
||||
};
|
||||
wallpapers.enable = mkDefault true;
|
||||
theming = {
|
||||
enable = mkDefault true;
|
||||
scheme = mkDefault "catppuccin-macchiato";
|
||||
};
|
||||
virtualisation.podman.enable = mkDefault true;
|
||||
|
||||
programs = {
|
||||
chromium.enable = mkDefault true;
|
||||
firefox.enable = mkDefault true;
|
||||
gpg.enable = mkDefault true;
|
||||
hyprland.enable = mkDefault true;
|
||||
logseq.enable = mkDefault true;
|
||||
nvim.enable = mkDefault true;
|
||||
python.versions."311".enable = mkDefault true;
|
||||
spotify.enable = mkDefault true;
|
||||
ssh.enable = mkDefault true;
|
||||
thunar.enable = mkDefault true;
|
||||
wallpaper.enable = mkDefault true;
|
||||
zathura.enable = mkDefault true;
|
||||
};
|
||||
services = {
|
||||
dunst.enable = mkDefault true;
|
||||
gammastep.enable = true;
|
||||
kdeconnect.enable = mkDefault true;
|
||||
printing.enable = true;
|
||||
wireguard.enable = true;
|
||||
};
|
||||
};
|
||||
wallpapers.enable = mkDefault true;
|
||||
theming = {
|
||||
enable = mkDefault true;
|
||||
scheme = mkDefault "catppuccin-macchiato";
|
||||
};
|
||||
virtualisation.podman.enable = mkDefault true;
|
||||
|
||||
programs = {
|
||||
chromium.enable = mkDefault true;
|
||||
firefox.enable = mkDefault true;
|
||||
gpg.enable = mkDefault true;
|
||||
hyprland.enable = mkDefault true;
|
||||
logseq.enable = mkDefault true;
|
||||
nvim.enable = mkDefault true;
|
||||
python.versions."311".enable = mkDefault true;
|
||||
spotify.enable = mkDefault true;
|
||||
ssh.enable = mkDefault true;
|
||||
thunar.enable = mkDefault true;
|
||||
wallpaper.enable = mkDefault true;
|
||||
zathura.enable = mkDefault true;
|
||||
environment.systemPackages = with pkgs; [
|
||||
anki
|
||||
calibre
|
||||
keepassxc
|
||||
nixpkgs-review
|
||||
pavucontrol
|
||||
stable.libreoffice # HACK to fix build error
|
||||
stable.signal-desktop
|
||||
texlive.combined.scheme-full
|
||||
thunderbird
|
||||
vlc
|
||||
];
|
||||
|
||||
programs.nix-ld.enable = true;
|
||||
|
||||
home-manager.users.moritz = {
|
||||
services.nextcloud-client = {
|
||||
enable = true;
|
||||
startInBackground = true;
|
||||
};
|
||||
};
|
||||
services = {
|
||||
dunst.enable = mkDefault true;
|
||||
gammastep.enable = true;
|
||||
kdeconnect.enable = mkDefault true;
|
||||
printing.enable = true;
|
||||
wireguard.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
anki
|
||||
calibre
|
||||
keepassxc
|
||||
nixpkgs-review
|
||||
pavucontrol
|
||||
stable.libreoffice # HACK to fix build error
|
||||
stable.signal-desktop
|
||||
texlive.combined.scheme-full
|
||||
thunderbird
|
||||
vlc
|
||||
];
|
||||
|
||||
programs.nix-ld.enable = true;
|
||||
|
||||
home-manager.users.moritz = {
|
||||
services.nextcloud-client = {
|
||||
enable = true;
|
||||
startInBackground = true;
|
||||
};
|
||||
};
|
||||
services = {
|
||||
illum.enable = true;
|
||||
gnome.gnome-keyring.enable = true;
|
||||
pipewire = {
|
||||
enable = true;
|
||||
alsa.enable = true;
|
||||
pulse.enable = true;
|
||||
illum.enable = true;
|
||||
gnome.gnome-keyring.enable = true;
|
||||
pipewire = {
|
||||
enable = true;
|
||||
alsa.enable = true;
|
||||
pulse.enable = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,23 @@
|
|||
{ pkgs
|
||||
{ lib
|
||||
, config
|
||||
, pkgs
|
||||
, ...
|
||||
}: {
|
||||
programs.steam.enable = true;
|
||||
environment.systemPackages = with pkgs; [
|
||||
lutris
|
||||
legendary-gl
|
||||
heroic
|
||||
mangohud
|
||||
];
|
||||
}:
|
||||
|
||||
with lib;
|
||||
let
|
||||
cfg = config.my.profiles.gaming;
|
||||
in
|
||||
{
|
||||
options.my.profiles.gaming.enable = mkEnableOption "Enable gaming profile";
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
programs.steam.enable = true;
|
||||
environment.systemPackages = with pkgs; [
|
||||
lutris
|
||||
legendary-gl
|
||||
heroic
|
||||
mangohud
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,63 +1,74 @@
|
|||
{ lib, ... }:
|
||||
{ lib
|
||||
, config
|
||||
, ...
|
||||
}:
|
||||
|
||||
with lib;
|
||||
let
|
||||
cfg = config.my.profiles.personal;
|
||||
in
|
||||
{
|
||||
my = {
|
||||
services = {
|
||||
openconnect.enable = true;
|
||||
synology-drive.enable = true;
|
||||
};
|
||||
programs = {
|
||||
ssh.includeSecrets = mkDefault [ ../../secrets/ssh-home.age ];
|
||||
git.signing = mkDefault true;
|
||||
hub.enable = mkDefault true;
|
||||
firefox.arkenfox = {
|
||||
enable = mkDefault true;
|
||||
overrides = mkDefault {
|
||||
## arkenfox overrides
|
||||
# automatic search
|
||||
"keyword.enabled" = true;
|
||||
"browser.search.suggest.enabled" = true;
|
||||
"browser.urlbar.suggest.searches" = true;
|
||||
options.my.profiles.personal.enable = mkEnableOption "personal profile";
|
||||
|
||||
# startup page
|
||||
"browser.startup.homepage" = "https://searxng.moritzboeh.me/";
|
||||
"browser.startup.page" = 1;
|
||||
config = mkIf cfg.enable
|
||||
{
|
||||
my = {
|
||||
services = {
|
||||
openconnect.enable = true;
|
||||
synology-drive.enable = true;
|
||||
};
|
||||
programs = {
|
||||
ssh.includeSecrets = mkDefault [ ../../secrets/ssh-home.age ];
|
||||
git.signing = mkDefault true;
|
||||
hub.enable = mkDefault true;
|
||||
firefox.arkenfox = {
|
||||
enable = mkDefault true;
|
||||
overrides = mkDefault {
|
||||
## arkenfox overrides
|
||||
# automatic search
|
||||
"keyword.enabled" = true;
|
||||
"browser.search.suggest.enabled" = true;
|
||||
"browser.urlbar.suggest.searches" = true;
|
||||
|
||||
# drm
|
||||
"media.eme.enabled" = true;
|
||||
# startup page
|
||||
"browser.startup.homepage" = "https://searxng.moritzboeh.me/";
|
||||
"browser.startup.page" = 1;
|
||||
|
||||
# sanitisation
|
||||
"privacy.clearOnShutdown.history" = false;
|
||||
# drm
|
||||
"media.eme.enabled" = true;
|
||||
|
||||
# disable letterboxing
|
||||
"privacy.resistFingerprinting.letterboxing" = false;
|
||||
# sanitisation
|
||||
"privacy.clearOnShutdown.history" = false;
|
||||
|
||||
## OTHER
|
||||
# Dont show warning when accessing about:config
|
||||
"browser.aboutConfig.showWarning" = false;
|
||||
# disable letterboxing
|
||||
"privacy.resistFingerprinting.letterboxing" = false;
|
||||
|
||||
# Hide bookmarks
|
||||
"browser.toolbars.bookmarks.visibility" = "never";
|
||||
## OTHER
|
||||
# Dont show warning when accessing about:config
|
||||
"browser.aboutConfig.showWarning" = false;
|
||||
|
||||
# Smooth scrolling
|
||||
"general.smoothScroll.lines.durationMaxMS" = 125;
|
||||
"general.smoothScroll.lines.durationMinMS" = 125;
|
||||
"general.smoothScroll.mouseWheel.durationMaxMS" = 200;
|
||||
"general.smoothScroll.mouseWheel.durationMinMS" = 100;
|
||||
"general.smoothScroll.msdPhysics.enabled" = true;
|
||||
"general.smoothScroll.other.durationMaxMS" = 125;
|
||||
"general.smoothScroll.other.durationMinMS" = 125;
|
||||
"general.smoothScroll.pages.durationMaxMS" = 125;
|
||||
"general.smoothScroll.pages.durationMinMS" = 125;
|
||||
"mousewheel.min_line_scroll_amount" = 40;
|
||||
"mousewheel.system_scroll_override_on_root_content.enabled" = true;
|
||||
"mousewheel.system_scroll_override_on_root_content.horizontal.factor" = 175;
|
||||
"mousewheel.system_scroll_override_on_root_content.vertical.factor" = 175;
|
||||
"toolkit.scrollbox.horizontalScrollDistance" = 6;
|
||||
"toolkit.scrollbox.verticalScrollDistance" = 2;
|
||||
# Hide bookmarks
|
||||
"browser.toolbars.bookmarks.visibility" = "never";
|
||||
|
||||
# Smooth scrolling
|
||||
"general.smoothScroll.lines.durationMaxMS" = 125;
|
||||
"general.smoothScroll.lines.durationMinMS" = 125;
|
||||
"general.smoothScroll.mouseWheel.durationMaxMS" = 200;
|
||||
"general.smoothScroll.mouseWheel.durationMinMS" = 100;
|
||||
"general.smoothScroll.msdPhysics.enabled" = true;
|
||||
"general.smoothScroll.other.durationMaxMS" = 125;
|
||||
"general.smoothScroll.other.durationMinMS" = 125;
|
||||
"general.smoothScroll.pages.durationMaxMS" = 125;
|
||||
"general.smoothScroll.pages.durationMinMS" = 125;
|
||||
"mousewheel.min_line_scroll_amount" = 40;
|
||||
"mousewheel.system_scroll_override_on_root_content.enabled" = true;
|
||||
"mousewheel.system_scroll_override_on_root_content.horizontal.factor" = 175;
|
||||
"mousewheel.system_scroll_override_on_root_content.vertical.factor" = 175;
|
||||
"toolkit.scrollbox.horizontalScrollDistance" = 6;
|
||||
"toolkit.scrollbox.verticalScrollDistance" = 2;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,23 @@
|
|||
{ pkgs }:
|
||||
{ lib
|
||||
, config
|
||||
, pkgs
|
||||
, ...
|
||||
}:
|
||||
|
||||
with lib;
|
||||
let
|
||||
cfg = config.my.profiles.ripping;
|
||||
in
|
||||
|
||||
{
|
||||
environment.systemPackages = with pkgs; [
|
||||
# ripping
|
||||
abcde
|
||||
handbrake
|
||||
picard
|
||||
];
|
||||
options.my.profiles.ripping.enable = mkEnableOption "ripping profile";
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
environment.systemPackages = with pkgs; [
|
||||
# ripping
|
||||
abcde
|
||||
handbrake
|
||||
picard
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue