Cleanup and restore of fcixt

6 files changed, 51 insertions, 44 deletions

diff --git a/common.nix b/common.nix
index f6c036c..bd881bf 100644
--- a/common.nix
+++ b/common.nix
@@ -34,7 +34,7 @@
     enableUserSlices = true;
     enableSystemSlice = true;
     enableRootSlice = true;
-    extraConfig = {
+    settings.OOM = {
       SwapUsedLimit = "50%";
       DefaultMemoryPressureLimit = "50%";
       DefaultMemoryPressureDurationSec = 20;
@@ -77,16 +77,6 @@
     pciutils
     usbutils
     vim
-
-    # TODO: Dev stuff, move later
-    # This could really make the image smaller
-    git
-    pkg-config
-    cmake
-    (hiPrio gcc)
-    gnumake
-    clang
-    rustup
   ];
 
   networking.hosts = {
diff --git a/home-modules/apps/default.nix b/home-modules/apps/default.nix
index ba19780..e9d0109 100644
--- a/home-modules/apps/default.nix
+++ b/home-modules/apps/default.nix
@@ -57,6 +57,13 @@ in
       home.packages = with pkgs; [
         lm_sensors
         nix-output-monitor
+        ripgrep 
+        unzip 
+        iputils 
+        inetutils
+        htop
+        git
+        tree
       ];
       homeapps.zsh.enable = true;
       homeapps.nvim.enable = true;
@@ -71,19 +78,23 @@ in
       ];
     })
     (lib.mkIf cfg.utils.enable {
+      homesv.direnv.enable = true;
       home.packages = with pkgs; [
-        htop
         btop
         nmap
         dig
-        ripgrep
-        unzip
         unrar
         sshfs
         xdg-user-dirs
         zsh
-        ranger
         file
+        bat 
+        jq
+      ];
+    })
+    (lib.mkIf cfg.browser.enable {
+      home.packages = with pkgs; [
+        lynx 
       ];
     })
     (lib.mkIf cfg.note-taking.enable {
@@ -93,18 +104,14 @@ in
     (lib.mkIf cfg.work.enable {
       home.packages = with pkgs; [
         inputs.tatuin.packages.${pkgs.system}.default
+        todoman
       ];
     })
     (lib.mkIf cfg.dev.enable {
-      home.packages = with pkgs; [
-        cmake
-        (hiPrio gcc)
-        gnumake
-        clang
-        rustup
-        pkg-config
-      ];
-      homeapps.nvim.enable = true;
+      homeapps.nvim = { 
+        enable = true; 
+        lsp = true;
+      };
       homesv.direnv.enable = true;
     })
     (lib.mkIf cfg.connectivity.enable {
@@ -127,7 +134,7 @@ in
         settings = {
           global = {
             use-mpris = true;
-            device_name = "Apocalypse Nix";
+            device_name = "${hostconfig.networking.hostName} spotifyd";
           };
           discovery = {
             zeroconf_port = 5352;
diff --git a/home-modules/apps/nvim/default.nix b/home-modules/apps/nvim/default.nix
index f45095f..d868580 100644
--- a/home-modules/apps/nvim/default.nix
+++ b/home-modules/apps/nvim/default.nix
@@ -11,6 +11,7 @@ in
 {
   options.homeapps.nvim = {
     enable = lib.mkEnableOption "Enables neovim configuration";
+    lsp = lib.mkEnableOption "Enables LSP Support and the needed servers";  
   };
 
   config = lib.mkIf config.homeapps.nvim.enable {
@@ -44,7 +45,7 @@ in
       "/home/wilkuu/.npm/bin/"
     ];
 
-    home.packages =
+    home.packages = lib.mkIf config.homeapps.nvim.lsp (
       with pkgs;
       [
         lua
@@ -69,7 +70,6 @@ in
       ++ [
         ts_ls
         vue_ls
-      ];
-
+      ]);
   };
 }
diff --git a/home/live-user.nix b/home/live-user.nix
index 7a8e5c0..f7ece2a 100644
--- a/home/live-user.nix
+++ b/home/live-user.nix
@@ -2,9 +2,14 @@
 {
   imports = [ ../home-modules ];
 
-  homeapps.presets = {
-    browser.enable = true;
-    utils.enable = true;
+  homeapps = { 
+    nvim.enable = true; 
+    nvim.lsp = false;
+
+    presets = {
+      browser.enable = true;
+      utils.enable = true;
+    };
   };
 
   home.username = "live-user";
diff --git a/hosts/test_vm/default.nix b/hosts/test_vm/default.nix
index a627939..7d84448 100644
--- a/hosts/test_vm/default.nix
+++ b/hosts/test_vm/default.nix
@@ -7,7 +7,6 @@
 {
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
-  imports = [ "${inputs.nixpkgs}/nixos/modules/virtualisation/libvirtd.nix" ];
 
   networking.hostName = "cookie_vm"; # Define your hostname.
   networking.networkmanager.enable = true;
@@ -24,4 +23,10 @@
       graphics = true;
     };
   };
+
+  fileSystems."/" = {
+    device = "none";
+    fsType = "tmpfs";
+    options = [ "defaults" "size=2G" "mode=755" ];
+  };
 }
diff --git a/modules/desktop/common.nix b/modules/desktop/common.nix
index 86cb562..4690597 100644
--- a/modules/desktop/common.nix
+++ b/modules/desktop/common.nix
@@ -56,18 +56,18 @@
     };
 
     # fcitx is broken for now
-    # i18n.inputMethod = {
-    #   type = "fcitx5";
-    #   enable = true;
-    #   fcitx5.addons = with pkgs; [
-    #     fcitx5-gtk
-    #     fcitx5-lua
-    #     fcitx5-mozc
-    #     catppuccin-fcitx5
-    #     fcitx5-table-other
-    #     kdePackages.fcitx5-qt
-    #   ];
-    # };
+    i18n.inputMethod = {
+      type = "fcitx5";
+      enable = true;
+      fcitx5.addons = with pkgs; [
+        fcitx5-gtk
+        fcitx5-lua
+        fcitx5-mozc
+        catppuccin-fcitx5
+        fcitx5-table-other
+        kdePackages.fcitx5-qt
+      ];
+    };
 
     fonts.packages = with pkgs; [
       noto-fonts