fix merge conflict

This commit is contained in:
m3tam3re 2023-02-05 14:51:12 +01:00
parent 9fbd9cbbc9
commit 9e5457972e
12 changed files with 4 additions and 92 deletions

View File

@ -26,10 +26,6 @@
tldr tldr
trash-cli trash-cli
tree tree
<<<<<<< HEAD
=======
unrar
>>>>>>> f7c149b (Various changes in home-config)
unzip unzip
zip zip
]; ];

View File

@ -1,9 +1,5 @@
{ pkgs, ... }: { { pkgs, ... }: {
<<<<<<< HEAD
services.emacs.enable = true;
=======
services.emacs.anable = true; services.emacs.anable = true;
>>>>>>> f7c149b (Various changes in home-config)
programs.emacs = { # 310 programs.emacs = { # 310
enable = true; enable = true;
extraPackages = epkgs: [ extraPackages = epkgs: [

View File

@ -2,11 +2,7 @@
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
appimage-run appimage-run
<<<<<<< HEAD
deploy-rs deploy-rs
=======
deloy-rs
>>>>>>> f7c149b (Various changes in home-config)
nil nil
nix-prefetch-git nix-prefetch-git
nixfmt nixfmt

View File

@ -1,4 +1,3 @@
<<<<<<< HEAD
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
with lib; with lib;
@ -12,14 +11,4 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
home.packages = with pkgs; [ bisq-desktop monero-gui trezord trezor-suite ]; home.packages = with pkgs; [ bisq-desktop monero-gui trezord trezor-suite ];
}; };
=======
{ pkgs, ... }:
{
home.packages = with pkgs; [
bisq-desktop
monero-gui
trezord
trezor-suite
];
>>>>>>> f7c149b (Various changes in home-config)
} }

View File

@ -43,11 +43,7 @@
pasystray pasystray
pavucontrol pavucontrol
picom picom
<<<<<<< HEAD
qt5ct qt5ct
=======
qt5-ct
>>>>>>> f7c149b (Various changes in home-config)
rustdesk rustdesk
unrar unrar
unzip unzip

View File

@ -1,4 +1,3 @@
<<<<<<< HEAD
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
with lib; with lib;
@ -22,19 +21,4 @@ in {
lcms2 lcms2
]; ];
}; };
=======
{ pkgs, ... }:
{
home.packages = with pkgs; [
argyllcms
darktable
gimp-with-plugins
gimpPlugins.gmic
gmic
gmic-qt
imagemagick
inkscape
lcms2
];
>>>>>>> f7c149b (Various changes in home-config)
} }

View File

@ -1,4 +1,3 @@
<<<<<<< HEAD
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
with lib; with lib;
@ -7,7 +6,8 @@ let cfg = config.features.desktop.media;
in { in {
options.features.desktop.media.enable = mkEnableOption "enable media features"; options.features.desktop.media.enable =
mkEnableOption "enable media features";
config = mkIf cfg.enable { config = mkIf cfg.enable {
home.packages = with pkgs; [ home.packages = with pkgs; [
@ -27,24 +27,4 @@ in {
youtube-dl youtube-dl
]; ];
}; };
=======
{ pkgs, ... }:
{
home.packages = with pkgs; [
betterdiscordctl
davinci-resolve
discord
element-desktop
ffmpeg
freetube
gphoto2
handbrake
makemkv
mpv
obs-studio
plexamp
vlc
youtube-dl
];
>>>>>>> f7c149b (Various changes in home-config)
} }

View File

@ -1,8 +1 @@
<<<<<<< HEAD
{ imports = [ ./podman.nix ./qemu.nix ]; } { imports = [ ./podman.nix ./qemu.nix ]; }
=======
imports = [
./podman.nix
./qemu.nix
];
>>>>>>> f7c149b (Various changes in home-config)

View File

@ -1,4 +1,3 @@
<<<<<<< HEAD
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
with lib; with lib;
@ -7,15 +6,8 @@ let cfg = config.features.virtualization.qemu;
in { in {
options.features.virtualization.qemu.enable = mkEnableOption "install qemu tools"; options.features.virtualization.qemu.enable =
mkEnableOption "install qemu tools";
config = config =
mkIf cfg.enable { home.packages = with pkgs; [ virt-manager virtiofsd ]; }; mkIf cfg.enable { home.packages = with pkgs; [ virt-manager virtiofsd ]; };
=======
{ pkgs, ... }:
{
home.packages = with pkgs; [
virt-manager
virtiofsd
];
>>>>>>> f7c149b (Various changes in home-config)
} }

View File

@ -4,10 +4,7 @@ let
in { in {
programs = { programs = {
home-manager.enable = true; home-manager.enable = true;
<<<<<<< HEAD
git.enable = true; git.enable = true;
=======
>>>>>>> f7c149b (Various changes in home-config)
git = { git = {
userName = "m3tam3re"; userName = "m3tam3re";
userEmail = "m@m3tam3re.com"; userEmail = "m@m3tam3re.com";

View File

@ -2,11 +2,7 @@
imports = [ imports = [
./container.nix ./container.nix
./gitea.nix ./gitea.nix
<<<<<<< HEAD
./mariadb.nix ./mariadb.nix
=======
./mysql.nix
>>>>>>> f7c149b (Various changes in home-config)
./n8n.nix ./n8n.nix
./postgres.nix ./postgres.nix
./traefik.nix ./traefik.nix

View File

@ -4,13 +4,10 @@
services.mysql = { services.mysql = {
enable = true; enable = true;
package = pkgs.mariadb; package = pkgs.mariadb;
<<<<<<< HEAD
}; };
services.mysqlBackup = { services.mysqlBackup = {
enable = true; enable = true;
calendar = "03:00:00"; calendar = "03:00:00";
databases = [ "lanakk_blog" ]; databases = [ "lanakk_blog" ];
}; };
=======
>>>>>>> f7c149b (Various changes in home-config)
} }