cba to do real commit

flake.nix

@@ -17,7 +17,7 @@
 
         inputs.flake-parts.flakeModules.easyOverlay
 
-        ./lib/args.nix # args that is passsed to the flake, moved away from the main file
+        ./lib/makesys.nix # args that is passsed to the flake, moved away from the main file
       ];
 
       flake = let
@@ -127,6 +127,13 @@
       flake = false;
     };
 
+    isabel-nvim = {
+      type = "git";
+      url = "https://github.com/isabelroses/nvim";
+      submodules = false;
+      flake = false;
+    };
+
     # nur's
     nur.url = "github:nix-community/nur";
     bella-nur.url = "github:isabelroses/nur";

home/default.nix

@@ -12,14 +12,16 @@
     else "${config.modules.system.username}";
 in {
   home-manager = {
+    verbose = true;
     useUserPackages = true;
     useGlobalPkgs = true;
+    backupFileExtension = "old";
     extraSpecialArgs = {
       inherit inputs self inputs' self';
     };
     users = {
       # home directory for the user
-      ${user} = ../home/${user};
+      ${user} = ./${user};
     };
   };
 }

home/isabel/default.nix

@@ -8,10 +8,8 @@
 in {
   imports = [
     # external home-manager modules
-    inputs.hyprland.homeManagerModules.default
+    inputs.hyprland.homeManagerModules.default 
     inputs.catppuccin.homeManagerModules.catppuccin
-    inputs.sops.homeManagerModules.sops
-    #inputs.bella-nur.homeManagerModules.default
 
     # programs sets
     ./programs
@@ -25,9 +23,7 @@ in {
     # dev shells
     ./shells
   ];
-  config = {
-    catppuccin.flavour = "mocha";
-
+  config = { 
     # reload system units when changing configs
     systemd.user.startServices = mkDefault "sd-switch"; # or "legacy" if "sd-switch" breaks again
 

home/isabel/programs/cli/confs/nushell/default.nix

@@ -30,7 +30,7 @@ in {
         environmentVariables = {
           EDITOR = "nvim";
           GIT_EDITOR = "nvim";
-          VISUAL = "neovide";
+          VISUAL = "code";
           TERMINAL = "alacritty";
         };
       in {

home/isabel/programs/gui/confs/editors/nvim/default.nix

@@ -1,14 +1,19 @@
 {
   pkgs,
   lib,
+  config,
   osConfig,
+  inputs,
   ...
 }:
 with lib; let
   cfg = osConfig.modules.programs.default;
 in {
   config = mkIf (cfg.editor == "nvim") {
-    xdg.configFile."nvim".source = ./config;
+    home.file."${config.xdg.configHome}/nvim" = {
+      source = inputs.isabel-nvim;
+    };
+
     programs.neovim = {
       enable = true;
       package = pkgs.neovim-unwrapped;
@@ -24,42 +29,6 @@ in {
         alejandra # nix formatter
       ];
       plugins = with pkgs.vimPlugins; [
-        copilot-lua
-        lsp_lines-nvim
-        vim-nix
-        nvim-ts-autotag
-        cmp-nvim-lsp-signature-help
-        cmp-buffer
-        comment-nvim
-        lsp_lines-nvim
-        null-ls-nvim
-        vim-fugitive
-        friendly-snippets
-        luasnip
-        rust-tools-nvim
-        crates-nvim
-        vim-illuminate
-        cmp_luasnip
-        nvim-cmp
-        impatient-nvim
-        indent-blankline-nvim
-        telescope-nvim
-        nvim-web-devicons
-        cmp-nvim-lsp
-        cmp-path
-        catppuccin-nvim
-        lspkind-nvim
-        nvim-lspconfig
-        hop-nvim
-        alpha-nvim
-        nvim-autopairs
-        nvim-colorizer-lua
-        nvim-ts-rainbow
-        gitsigns-nvim
-        #neo-tree-nvim
-        nvim-tree-lua
-        toggleterm-nvim
-        todo-comments-nvim
         (nvim-treesitter.withPlugins (plugins:
           with plugins; [
             tree-sitter-python

home/isabel/programs/gui/wayland.nix

@@ -6,12 +6,10 @@
 }:
 with lib; let
   env = osConfig.modules.usrEnv;
-  device = osConfig.modules.device;
   programs = osConfig.modules.programs;
   sys = osConfig.modules.system;
-  acceptedTypes = ["laptop" "desktop" "hybrid" "lite"];
 in {
-  config = mkIf (builtins.elem device.type acceptedTypes && env.isWayland && programs.gui.enable && sys.video.enable) {
+  config = mkIf (env.isWayland && programs.gui.enable && sys.video.enable) {
     home.packages = with pkgs; [
       swappy
       #swaynotificationcenter