Some changes

flake.nix

@@ -2,11 +2,11 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
     stylix.url = "github:danth/stylix";
+    nix-gaming.url = "github:fufexan/nix-gaming";
     firefox-gnome-theme = {
       url = "github:rafaelmardojai/firefox-gnome-theme";
       flake = false;
     };
-    nix-gaming.url = "github:fufexan/nix-gaming";
     programsdb = {
       url = "github:wamserma/flake-programs-sqlite";
       inputs.nixpkgs.follows = "nixpkgs";

home-manager.nix

@@ -1,20 +1,18 @@
-{inputs, ...}: {
+{
+  inputs,
+  dirUtils,
+  ...
+}: {
   home-manager = {
     useGlobalPkgs = true;
     useUserPackages = true;
     extraSpecialArgs = {inherit inputs;};
-    users.quadradical = {
+    users.quadradical.home = {
-      home = {
+      username = "quadradical";
-        username = "quadradical";
+      homeDirectory = "/home/quadradical";
-        homeDirectory = "/home/quadradical";
-      };
     };
-    sharedModules = [
+    sharedModules =
-      {home.stateVersion = "23.11";}
+      [{home.stateVersion = "23.11";}]
-      ./home-manager/gtk.nix
+      ++ dirUtils.dirFiles ./home-manager;
-      ./home-manager/vscode.nix
-      ./home-manager/firefox.nix
-      {stylix.targets.hyprland.enable = false;}
-    ];
   };
 }

home-manager/firefox/default.nix

@@ -1,6 +1,6 @@
 {inputs, ...}: {
   home.file.".mozilla/firefox/quadradical/chrome/firefox-gnome-theme".source = inputs.firefox-gnome-theme;
-  home.file.".mozilla/firefox/quadradical/chrome/nord.css".source = ./firefox-nord.css;
+  home.file.".mozilla/firefox/quadradical/chrome/nord.css".source = ./nord.css;
 
   programs.firefox = {
     enable = true;

modules/common-desktop/keyboard.nix

@@ -1 +1 @@
-{ hardware.keyboard.qmk.enable = true; }
+{hardware.keyboard.qmk.enable = true;}

modules/common/command-not-found.nix

@@ -3,6 +3,5 @@
   pkgs,
   ...
 }: {
-  programs.command-not-found.dbPath = "/etc/programs.sqlite";
+  programs.command-not-found.dbPath = inputs.programsdb.packages.${pkgs.system}.programs-sqlite;
-  environment.etc."programs.sqlite".source = inputs.programsdb.packages.${pkgs.system}.programs-sqlite;
 }

modules/common/fish.nix

@@ -6,10 +6,8 @@
       neofetch
     '';
   };
+
   environment = {
-    # systemPackages = with pkgs.fishPlugins; [
-    # ];
-    sessionVariables.fish_greeting = "";
     shells = [pkgs.fish];
     shellAliases = {
       # Utility

modules/common/quadradical.nix

@@ -2,6 +2,6 @@
   users.users.quadradical = {
     isNormalUser = true;
     description = "QuadRadical";
-    extraGroups = ["networkmanager" "wheel" "libvirtd"];
+    extraGroups = ["wheel"];
   };
 }

wrappers/common-desktop/vscode/default.nix

@@ -1,21 +0,0 @@
-{pkgs, ...}: {
-  # wrappers.vscode = {
-  #   basePackage = pkgs.vscodium;
-
-  #   pathAdd = with pkgs.vscode-extensions; [
-  #     mkhl.direnv
-  #     eamodio.gitlens
-  #     jnoortheen.nix-ide
-  #     timonwong.shellcheck
-  #     usernamehw.errorlens
-  #     ritwickdey.liveserver
-  #     dbaeumer.vscode-eslint
-  #     esbenp.prettier-vscode
-  #     oderwat.indent-rainbow
-  #     astro-build.astro-vscode
-  #     pkief.material-icon-theme
-  #     streetsidesoftware.code-spell-checker
-  #     arcticicestudio.nord-visual-studio-code
-  #   ];
-  # };
-}

wrappers/common-desktop/vscodium/default.nix

@@ -0,0 +1,23 @@
+{pkgs, ...}: {
+#  wrappers.vscode = {
+#    basePackage = pkgs.vscodium;
+#    flags = ["--user-data-dir" ./.];
+#
+#    pathAdd = with pkgs.vscode-extensions; [
+#      mkhl.direnv
+#      eamodio.gitlens
+#      dart-code.flutter
+#      jnoortheen.nix-ide
+#      timonwong.shellcheck
+#      usernamehw.errorlens
+#      ritwickdey.liveserver
+#      dbaeumer.vscode-eslint
+#      esbenp.prettier-vscode
+#      oderwat.indent-rainbow
+#      astro-build.astro-vscode
+#      pkief.material-icon-theme
+#      streetsidesoftware.code-spell-checker
+#      arcticicestudio.nord-visual-studio-code
+#    ];
+#  };
+}

wrappers/common-desktop/vscodium/keybindings.json

@@ -0,0 +1,10 @@
+[
+    {
+        "command": "workbench.action.files.saveAll",
+        "key": "ctrl+s"
+    },
+    {
+        "command": "-workbench.action.files.save",
+        "key": "ctrl+s"
+    }
+]

wrappers/common-desktop/vscodium/settings.json

@@ -0,0 +1,75 @@
+{
+  "[astro]": {
+    "editor.defaultFormatter": "astro-build.astro-vscode"
+  },
+  "[nix]": {
+    "editor.defaultFormatter": "jnoortheen.nix-ide",
+    "editor.formatOnSave": true
+  },
+  "[yaml]": {
+    "editor.defaultFormatter": "redhat.vscode-yaml"
+  },
+  "dart.checkForSdkUpdates": false,
+  "dart.debugExternalPackageLibraries": true,
+  "dart.debugSdkLibraries": true,
+  "dart.runPubGetOnPubspecChanges": "never",
+  "diffEditor.ignoreTrimWhitespace": false,
+  "editor.bracketPairColorization.enabled": true,
+  "editor.codeActionsOnSave": {
+    "source.fixAll": "explicit"
+  },
+  "editor.defaultFormatter": "esbenp.prettier-vscode",
+  "editor.detectIndentation": false,
+  "editor.fontLigatures": true,
+  "editor.formatOnSave": true,
+  "editor.guides.bracketPairs": "active",
+  "editor.inlineSuggest.enabled": true,
+  "editor.insertSpaces": false,
+  "editor.minimap.enabled": false,
+  "editor.unicodeHighlight.nonBasicASCII": false,
+  "editor.wordWrap": "on",
+  "errorLens.enabledDiagnosticLevels": [
+    "error"
+  ],
+  "explorer.confirmDelete": false,
+  "explorer.confirmDragAndDrop": false,
+  "explorer.fileNesting.enabled": true,
+  "explorer.fileNesting.expand": false,
+  "git.confirmSync": false,
+  "git.enableSmartCommit": true,
+  "git.mergeEditor": true,
+  "git.openRepositoryInParentFolders": "never",
+  "gitlens.codeLens.enabled": false,
+  "gitlens.currentLine.enabled": false,
+  "gitlens.hovers.currentLine.over": "line",
+  "gitlens.statusBar.enabled": false,
+  "indentRainbow.ignoreErrorLanguages": [
+    "*"
+  ],
+  "javascript.format.semicolons": "remove",
+  "javascript.updateImportsOnFileMove.enabled": "always",
+  "nix.enableLanguageServer": true,
+  "nix.serverPath": "/nix/store/3b0kiw6h7qzqgnx3kdl57m3qkzvh37j0-nil-2024-08-06/bin/nil",
+  "nix.serverSettings": {
+    "nil": {
+      "formatting": {
+        "command": [
+          "alejandra"
+        ]
+      }
+    }
+  },
+  "prettier.semi": false,
+  "prettier.tabWidth": 4,
+  "redhat.telemetry.enabled": false,
+  "terminal.integrated.shellIntegration.enabled": false,
+  "typescript.updateImportsOnFileMove.enabled": "always",
+  "window.dialogStyle": "custom",
+  "window.menuBarVisibility": "compact",
+  "window.titleBarStyle": "custom",
+  "window.zoomLevel": 1,
+  "workbench.colorTheme": "Nord",
+  "workbench.iconTheme": "material-icon-theme",
+  "workbench.sideBar.location": "right",
+  "workbench.startupEditor": "none"
+}

wrappers/common/bat.nix

@@ -1,6 +1,6 @@
 {pkgs, ...}: {
   wrappers.bat = {
     basePackage = pkgs.bat;
-    flags = ["--theme=Nord"];
+    flags = ["--theme" "Nord"];
   };
 }

wrappers/common/fish.nix

@@ -0,0 +1,6 @@
+{pkgs, ...}: {
+  wrappers.fish = {
+    basePackage = pkgs.fish;
+    env.fish_greeting.value = "";
+  };
+}

wrappers/common/neofetch/default.nix

@@ -1,6 +1,6 @@
 {pkgs, ...}: {
   wrappers.neofetch = {
-    basePackage = pkgs.hyfetch;
+    basePackage = pkgs.hyfetch; # Neowofetch
     flags = [
       "--config"
       ./neofetch.conf