modified nix files tailored for nixos, must make modular to merge into master

home/core.nix

@@ -21,6 +21,7 @@
     fh
     aria2
     yt-dlp
+    imv
 
     # misc
     cowsay
@@ -45,13 +46,13 @@
     statix
 
     # productivity
-    iterm2
+    # iterm2
     discord
     obsidian
     vscode
     weechat
     # iamb
-    ollama
+    # ollama
 
     # games?
     # prismlauncher

home/flatpak.nix

@@ -1,12 +1,6 @@
 {...}: {
   services.flatpak = {
-    remotes = [
-      {
-        name = "flathub";
-        location = "https://dl.flathub.org/repo/flathub.flatpakrepo";
-      }
-    ];
-
+    enable = true;
     packages = [
       "com.github.tchx84.Flatseal"
       "com.slack.Slack"

home/shell.nix

@@ -69,4 +69,19 @@
       fi
     '';
   };
+
+
+  programs.bash = {
+    enable = true;
+    initExtra = ''
+      if [[ -z "$BASH_EXECUTION_STRING" ]]; then
+        if [[ -n "$ZSH_VERSION" ]]; then
+          LOGIN_OPTION="--login"
+        else
+          LOGIN_OPTION=""
+        fi
+        exec ${pkgs.fish}/bin/fish $LOGIN_OPTION
+      fi
+    '';
+  };
 }

home/sway.nix

@@ -1,6 +1,6 @@
-{pkgs, ...}: let
+{lib, pkgs, ...}: let
   dirs = {
-    defaults = ./defaults;
+    defaults = ../defaults;
   };
 in {
   wayland.windowManager.sway = {
@@ -13,8 +13,9 @@ in {
       gtk = true;
     };
   };
-
-  programs.wofi.enable = pkgs.stdenv.isLinux;
+  xdg.configFile."sway/config".source = lib.mkForce (dirs.defaults + /sway/config);
+  xdg.configFile."waybar/config".source = lib.mkForce (dirs.defaults + /waybar/config);
+  programs.rofi.enable = pkgs.stdenv.isLinux;
   programs.mako.enable = pkgs.stdenv.isLinux;
   # programs.cliphist.enable = pkgs.stdenv.isLinux;
   programs.waybar = {