From 9e5457972eb1538d6fc0b893264d9ed91b9abfa6 Mon Sep 17 00:00:00 2001 From: m3tam3re Date: Sun, 5 Feb 2023 14:51:12 +0100 Subject: [PATCH] fix merge conflict --- home/features/cli/default.nix | 4 ---- home/features/coding/emacs.nix | 4 ---- home/features/coding/nix.nix | 4 ---- home/features/desktop/crypto.nix | 11 ----------- home/features/desktop/default.nix | 4 ---- home/features/desktop/design.nix | 16 ---------------- home/features/desktop/media.nix | 24 ++---------------------- home/features/virtualization/default.nix | 7 ------- home/features/virtualization/qemu.nix | 12 ++---------- home/users/m3tam3re/base/default.nix | 3 --- hosts/lkk-nix-1/services/default.nix | 4 ---- hosts/lkk-nix-1/services/mariadb.nix | 3 --- 12 files changed, 4 insertions(+), 92 deletions(-) diff --git a/home/features/cli/default.nix b/home/features/cli/default.nix index e60e433..84617be 100644 --- a/home/features/cli/default.nix +++ b/home/features/cli/default.nix @@ -26,10 +26,6 @@ tldr trash-cli tree -<<<<<<< HEAD -======= - unrar ->>>>>>> f7c149b (Various changes in home-config) unzip zip ]; diff --git a/home/features/coding/emacs.nix b/home/features/coding/emacs.nix index 8987a7f..8efe4c2 100644 --- a/home/features/coding/emacs.nix +++ b/home/features/coding/emacs.nix @@ -1,9 +1,5 @@ { pkgs, ... }: { -<<<<<<< HEAD - services.emacs.enable = true; -======= services.emacs.anable = true; ->>>>>>> f7c149b (Various changes in home-config) programs.emacs = { # 310 enable = true; extraPackages = epkgs: [ diff --git a/home/features/coding/nix.nix b/home/features/coding/nix.nix index c705419..67f4874 100644 --- a/home/features/coding/nix.nix +++ b/home/features/coding/nix.nix @@ -2,11 +2,7 @@ { home.packages = with pkgs; [ appimage-run -<<<<<<< HEAD deploy-rs -======= - deloy-rs ->>>>>>> f7c149b (Various changes in home-config) nil nix-prefetch-git nixfmt diff --git a/home/features/desktop/crypto.nix b/home/features/desktop/crypto.nix index c2eb5e3..ffb0150 100644 --- a/home/features/desktop/crypto.nix +++ b/home/features/desktop/crypto.nix @@ -1,4 +1,3 @@ -<<<<<<< HEAD { config, lib, pkgs, ... }: with lib; @@ -12,14 +11,4 @@ in { config = mkIf cfg.enable { 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) } diff --git a/home/features/desktop/default.nix b/home/features/desktop/default.nix index 9fb9c5c..abe1003 100644 --- a/home/features/desktop/default.nix +++ b/home/features/desktop/default.nix @@ -43,11 +43,7 @@ pasystray pavucontrol picom -<<<<<<< HEAD qt5ct -======= - qt5-ct ->>>>>>> f7c149b (Various changes in home-config) rustdesk unrar unzip diff --git a/home/features/desktop/design.nix b/home/features/desktop/design.nix index e0098ac..526f91b 100644 --- a/home/features/desktop/design.nix +++ b/home/features/desktop/design.nix @@ -1,4 +1,3 @@ -<<<<<<< HEAD { config, lib, pkgs, ... }: with lib; @@ -22,19 +21,4 @@ in { 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) } diff --git a/home/features/desktop/media.nix b/home/features/desktop/media.nix index 1ca2fc7..f2823cd 100644 --- a/home/features/desktop/media.nix +++ b/home/features/desktop/media.nix @@ -1,4 +1,3 @@ -<<<<<<< HEAD { config, lib, pkgs, ... }: with lib; @@ -7,7 +6,8 @@ let cfg = config.features.desktop.media; in { - options.features.desktop.media.enable = mkEnableOption "enable media features"; + options.features.desktop.media.enable = + mkEnableOption "enable media features"; config = mkIf cfg.enable { home.packages = with pkgs; [ @@ -27,24 +27,4 @@ in { 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) } diff --git a/home/features/virtualization/default.nix b/home/features/virtualization/default.nix index 190ec36..c91c9ba 100644 --- a/home/features/virtualization/default.nix +++ b/home/features/virtualization/default.nix @@ -1,8 +1 @@ -<<<<<<< HEAD { imports = [ ./podman.nix ./qemu.nix ]; } -======= -imports = [ - ./podman.nix - ./qemu.nix -]; ->>>>>>> f7c149b (Various changes in home-config) diff --git a/home/features/virtualization/qemu.nix b/home/features/virtualization/qemu.nix index 8b680fa..e9d356c 100644 --- a/home/features/virtualization/qemu.nix +++ b/home/features/virtualization/qemu.nix @@ -1,4 +1,3 @@ -<<<<<<< HEAD { config, lib, pkgs, ... }: with lib; @@ -7,15 +6,8 @@ let cfg = config.features.virtualization.qemu; in { - options.features.virtualization.qemu.enable = mkEnableOption "install qemu tools"; + options.features.virtualization.qemu.enable = + mkEnableOption "install qemu tools"; config = mkIf cfg.enable { home.packages = with pkgs; [ virt-manager virtiofsd ]; }; -======= -{ pkgs, ... }: -{ - home.packages = with pkgs; [ - virt-manager - virtiofsd - ]; ->>>>>>> f7c149b (Various changes in home-config) } diff --git a/home/users/m3tam3re/base/default.nix b/home/users/m3tam3re/base/default.nix index 5602638..cb7a8ac 100644 --- a/home/users/m3tam3re/base/default.nix +++ b/home/users/m3tam3re/base/default.nix @@ -4,10 +4,7 @@ let in { programs = { home-manager.enable = true; -<<<<<<< HEAD git.enable = true; -======= ->>>>>>> f7c149b (Various changes in home-config) git = { userName = "m3tam3re"; userEmail = "m@m3tam3re.com"; diff --git a/hosts/lkk-nix-1/services/default.nix b/hosts/lkk-nix-1/services/default.nix index 6e27b8f..bfdba4b 100644 --- a/hosts/lkk-nix-1/services/default.nix +++ b/hosts/lkk-nix-1/services/default.nix @@ -2,11 +2,7 @@ imports = [ ./container.nix ./gitea.nix -<<<<<<< HEAD ./mariadb.nix -======= - ./mysql.nix ->>>>>>> f7c149b (Various changes in home-config) ./n8n.nix ./postgres.nix ./traefik.nix diff --git a/hosts/lkk-nix-1/services/mariadb.nix b/hosts/lkk-nix-1/services/mariadb.nix index a5430ee..2ce599a 100644 --- a/hosts/lkk-nix-1/services/mariadb.nix +++ b/hosts/lkk-nix-1/services/mariadb.nix @@ -4,13 +4,10 @@ services.mysql = { enable = true; package = pkgs.mariadb; -<<<<<<< HEAD }; services.mysqlBackup = { enable = true; calendar = "03:00:00"; databases = [ "lanakk_blog" ]; }; -======= ->>>>>>> f7c149b (Various changes in home-config) }