Merge branch 'main' of github.com:suasuasuasuasua/nixos-config

Author: suasuasuasuasua

configurations/darwin/mbp3/system.nix

@@ -37,7 +37,6 @@
 
       # customize finder
       finder = {
-        _FXShowPosixPathInTitle = true; # show full path in finder title
         AppleShowAllExtensions = true; # show all file extensions
         FXEnableExtensionChangeWarning = false; # disable warning when changing file extension
         QuitMenuItem = true; # enable quit menu item

modules/home/development/neovim/plugins/custom/oil.nix

@@ -23,24 +23,64 @@ in
         enable = true;
 
         settings = {
+          # Oil will take over directory buffers (e.g. `vim .` or `:e src/`)
+          # Set to false if you want some other plugin (e.g. netrw) to open when you edit directories.
+          default_file_explorer = true;
+
           # Id is automatically added at the beginning, and name at the end
-          # Frr :uryc bvy-pbyhzaf
-          pbyhzaf = [
+          # See :help oil-columns
+          columns = [
             "icon"
-            "crezvffvbaf"
-            "fvmr"
-            "mtime"
+            # "permissions"
+            # "size"
+            # "mtime"
           ];
 
           # Send deleted files to the trash instead of permanently deleting them (:help oil-trash)
           delete_to_trash = false;
+
+          # Configuration for the floating window in oil.open_float
+          float = {
+            # Padding around the floating window
+            padding = 12;
+            # max_width and max_height can be integers or a float between 0 and 1 (e.g. 0.4 for 40%)
+            max_width = 0;
+            max_height = 0;
+            border = "rounded";
+            win_options = {
+              winblend = 0;
+            };
+            # optionally override the oil buffers window title with custom function: fun(winid: integer): string
+            get_win_title = null;
+            # preview_split: Split direction: "auto", "left", "right", "above", "below".
+            preview_split = "auto";
+          };
         };
 
         # NOTE: not recommended according to GitHub
         lazyLoad = {
           enable = false;
         };
       };
+
+      keymaps = [
+        {
+          mode = "n";
+          key = "-";
+          action = "<CMD>Oil<CR>";
+          options = {
+            desc = "Open parent directory";
+          };
+        }
+        {
+          mode = "n";
+          key = "_";
+          action = "<CMD>Oil --float<CR>";
+          options = {
+            desc = "Open parent directory (float)";
+          };
+        }
+      ];
     };
   };
 }

modules/home/development/neovim/plugins/custom/schemastore.nix

@@ -0,0 +1,40 @@
+{
+  lib,
+  config,
+  ...
+}:
+let
+  name = "schemastore";
+  cfg = config.home.development.neovim.plugins.${name};
+in
+{
+  options.home.development.neovim.plugins.${name} = {
+    enable = lib.mkOption {
+      type = lib.types.bool;
+      default = true;
+      description = "Enable ${name} plugin for neovim";
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    programs.nixvim = {
+      # https://github.com/b0o/SchemaStore.nvim/
+      plugins.schemastore = {
+        enable = true;
+
+        # added to jsonls
+        json = {
+          enable = true;
+          # require('schemastore').json.schemas
+          settings = { };
+        };
+        # added to yamlls
+        yaml = {
+          enable = true;
+          # require('schemastore').yaml.schemas
+          settings = { };
+        };
+      };
+    };
+  };
+}

modules/home/development/neovim/plugins/kickstart/nvim-cmp.nix

@@ -7,13 +7,14 @@
       # https://nix-community.github.io/nixvim/plugins/luasnip/index.html
       luasnip = {
         enable = true;
-        lazyLoad = {
-          enable = true;
-          settings = {
-            # LazyFile is a shorthand that lazy.nvim uses
-            event = [ "BufReadPost BufWritePost BufNewFile" ];
-          };
-        };
+        # TODO: sometimes errors with luasnip not found
+        # lazyLoad = {
+        #   enable = true;
+        #   settings = {
+        #     # LazyFile is a shorthand that lazy.nvim uses
+        #     event = [ "BufReadPost BufWritePost BufNewFile" ];
+        #   };
+        # };
       };
       cmp_luasnip.enable = true;
 

modules/home/gui/firefox/profiles.nix

@@ -17,6 +17,19 @@
             name = "gmail";
             url = "https://mail.google.com/";
           }
+          {
+            name = "proton";
+            bookmarks = [
+              {
+                name = "mail";
+                url = "https://mail.proton.me";
+              }
+              {
+                name = "calendar";
+                url = "https://calendar.proton.me";
+              }
+            ];
+          }
           {
             name = "reddit";
             url = "https://reddit.com/";
@@ -26,7 +39,7 @@
             url = "https://news.ycombinator.com/";
           }
           {
-            name = "nix related";
+            name = "nix";
             bookmarks = [
               {
                 name = "nixpkgs";
@@ -67,7 +80,7 @@
             ];
           }
           {
-            name = "macOS related";
+            name = "macOS";
             bookmarks = [
               {
                 name = "brew";

modules/home/gui/firefox/settings.nix

@@ -52,5 +52,5 @@
   "browser.newtabpage.activity-stream.showWeather" = false;
   "browser.newtabpage.activity-stream.feeds.topsites" = false;
   "browser.newtabpage.activity-stream.feeds.section.topstories" = false;
-  "browser.newtabpage.activity-stream.newtabWallpapers.wallpaper" = "light-green";
+  # "browser.newtabpage.activity-stream.newtabWallpapers.wallpaper" = "light-green";
 }

modules/home/gui/vscode/language-configurations.nix

@@ -173,6 +173,21 @@ in
       };
     };
   };
+  javascript = {
+    enable = mkEnableOption "Enable Javascript";
+    extensions = mkOption {
+      type = listOf package;
+      default = [ ];
+    };
+    keybindings = mkOption {
+      type = keybindingSubmodule;
+      default = [ ];
+    };
+    userSettings = mkOption {
+      inherit (jsonFormat) type;
+      default = { };
+    };
+  };
   julia = {
     enable = mkEnableOption "Enable Julia";
     extensions = mkOption {
@@ -491,6 +506,9 @@ in
       inherit (jsonFormat) type;
       default = {
         "typescript.preferences.importModuleSpecifier" = "non-relative";
+        "[typescriptreact]" = {
+          "editor.defaultFormatter" = "esbenp.prettier-vscode";
+        };
       };
     };
   };

modules/home/gui/vscode/profiles.nix

@@ -1,6 +1,7 @@
 {
   options,
   lib,
+  pkgs,
   jsonFormat,
   keybindingSubmodule,
   ...
@@ -126,4 +127,35 @@ in
       default = { };
     };
   };
+  web-development = {
+    enable = mkEnableOption "Enable Web Development Profile";
+    languages = mkOption {
+      type = enumLanguages;
+      default = [
+        "css"
+        "javascript"
+        "just"
+        "html"
+        "markdown"
+        "spell"
+        "toml"
+        "typescript"
+        "yaml"
+      ];
+    };
+    extensions = mkOption {
+      type = listOf package;
+      default = with pkgs.vscode-extensions; [
+        unifiedjs.vscode-mdx # markdown with react
+      ];
+    };
+    keybindings = mkOption {
+      type = keybindingSubmodule;
+      default = [ ];
+    };
+    userSettings = mkOption {
+      inherit (jsonFormat) type;
+      default = { };
+    };
+  };
 }

modules/nixos/desktop/lxqt.nix

@@ -1,6 +1,7 @@
 {
   lib,
   config,
+  pkgs,
   ...
 }:
 let
@@ -24,5 +25,9 @@ in
 
       displayManager.defaultSession = "lxqt";
     };
+
+    environment.systemPackages = with pkgs; [
+      lxqt.lxqt-wayland-session
+    ];
   };
 }

overlays/default.nix

@@ -15,8 +15,13 @@
   };
 
   # Adds pkgs.unstable == inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}
+  # unstable = inputs.nixpkgs-unstable.legacyPackages.${final.system};
   unstable = final: _: {
-    unstable = inputs.nixpkgs-unstable.legacyPackages.${final.system};
+    unstable = import inputs.nixpkgs-unstable {
+      inherit (final) system;
+
+      config.allowUnfree = true; # for unstable packages and extensions
+    };
   };
 
   # nix user repository