From 595ee098394f3f0914493d09c3b0ca5ebf85f15f Mon Sep 17 00:00:00 2001
From: Lillian-Violet <git@lillianviolet.dev>
Date: Tue, 31 Dec 2024 21:18:39 +0100
Subject: [PATCH] remove heroic since it doesn't work, add the nextcloud
 symlinks to home manager

---
 home-manager/desktop/default.nix      | 164 +++++++++++++++-----------
 home-manager/hosts/GLaDOS/lillian.nix |   2 +-
 home-manager/shared/default.nix       |   6 +-
 3 files changed, 99 insertions(+), 73 deletions(-)

diff --git a/home-manager/desktop/default.nix b/home-manager/desktop/default.nix
index 827870e..d4369b7 100644
--- a/home-manager/desktop/default.nix
+++ b/home-manager/desktop/default.nix
@@ -1,4 +1,8 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  config,
+  ...
+}: {
   # You can import other home-manager modules here
   imports = [
     # If you want to use modules your own flake exports (from modules/home-manager):
@@ -63,78 +67,100 @@
       allowUnfree = true;
     };
   };
-
   home = {
     username = "lillian";
     homeDirectory = "/home/lillian";
+
+    file = {
+      Music = {
+        source = config.lib.file.mkOutOfStoreSymlink "/home/lillian/Nextcloud/Music";
+        target = "Music";
+      };
+      Pictures = {
+        source = config.lib.file.mkOutOfStoreSymlink "/home/lillian/Nextcloud/Pictures";
+        target = "Pictures";
+      };
+      Scripts = {
+        source = config.lib.file.mkOutOfStoreSymlink "/home/lillian/Nextcloud/Scripts";
+        target = "Scripts";
+      };
+      Videos = {
+        source = config.lib.file.mkOutOfStoreSymlink "/home/lillian/Nextcloud/Videos";
+        target = "Videos";
+      };
+      Documents = {
+        source = config.lib.file.mkOutOfStoreSymlink "/home/lillian/Nextcloud/Documents";
+        target = "Documents";
+      };
+    };
+
+    # Add stuff for your user as you see fit:
+    # programs.neovim.enable = true;
+    # home.packages = with pkgs; [ steam ];
+
+    packages = with pkgs; [
+      # Coding:
+      direnv
+      git
+      git-credential-manager
+      git-credential-manager
+      ruff
+      kate
+
+      # Chat applications:
+      signal-desktop
+      vesktop
+      # cinny-desktop
+
+      # Gaming:
+      prismlauncher
+      steam
+      gamescope
+
+      # Multimedia:
+      freetube
+      vlc
+      fcast-receiver
+      fcast-client
+
+      # Office applications:
+      onlyoffice-bin
+      gimp
+      thunderbird
+
+      # System tools:
+      rage
+      flameshot
+      fzf
+      nextcloud-client
+      nitrokey-app
+      protonvpn-gui
+      virtualbox
+      #watchmate
+      qbittorrent
+
+      # Theming:
+      catppuccin-cursors
+      (catppuccin-kde.override {
+        flavour = ["macchiato"];
+        accents = ["mauve"];
+      })
+      catppuccin-sddm-corners
+
+      # Theming:
+      catppuccin-cursors
+      (catppuccin-kde.override {
+        flavour = ["macchiato"];
+        accents = ["mauve"];
+      })
+      catppuccin-sddm-corners
+
+      # Web browsing:
+      firefoxpwa
+      firefoxpwa
+      ungoogled-chromium
+    ];
   };
-
-  # Add stuff for your user as you see fit:
-  # programs.neovim.enable = true;
-  # home.packages = with pkgs; [ steam ];
-
-  home.packages = with pkgs; [
-    # Coding:
-    direnv
-    git
-    git-credential-manager
-    git-credential-manager
-    ruff
-    kate
-
-    # Chat applications:
-    signal-desktop
-    vesktop
-    # cinny-desktop
-
-    # Gaming:
-    prismlauncher
-    steam
-    gamescope
-
-    # Multimedia:
-    freetube
-    vlc
-    fcast-receiver
-    fcast-client
-
-    # Office applications:
-    onlyoffice-bin
-    gimp
-    thunderbird
-
-    # System tools:
-    rage
-    flameshot
-    fzf
-    nextcloud-client
-    nitrokey-app
-    protonvpn-gui
-    virtualbox
-    #watchmate
-    qbittorrent
-
-    # Theming:
-    catppuccin-cursors
-    (catppuccin-kde.override {
-      flavour = ["macchiato"];
-      accents = ["mauve"];
-    })
-    catppuccin-sddm-corners
-
-    # Theming:
-    catppuccin-cursors
-    (catppuccin-kde.override {
-      flavour = ["macchiato"];
-      accents = ["mauve"];
-    })
-    catppuccin-sddm-corners
-
-    # Web browsing:
-    firefoxpwa
-    firefoxpwa
-    ungoogled-chromium
-  ];
   programs = {
     # vscode = {
     #   enable = true;
diff --git a/home-manager/hosts/GLaDOS/lillian.nix b/home-manager/hosts/GLaDOS/lillian.nix
index f10caa5..4b6023e 100644
--- a/home-manager/hosts/GLaDOS/lillian.nix
+++ b/home-manager/hosts/GLaDOS/lillian.nix
@@ -16,7 +16,7 @@
   ];
 
   home.packages = with pkgs; [
-    heroic
+    # heroic
     r2modman
     ryujinx
     lutris
diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix
index 72d28fe..7bc4ff8 100644
--- a/home-manager/shared/default.nix
+++ b/home-manager/shared/default.nix
@@ -45,9 +45,9 @@
     navi.enable = true;
     yazi = {
       enable = true;
-      package = pkgs.yazi.override {
-        _7zz = pkgs._7zz.override {useUasm = true;};
-      };
+      # package = pkgs.yazi.override {
+      #   _7zz = pkgs._7zz.override {useUasm = true;};
+      # };
     };
   };
   stylix.enable = true;