dotfiles

commit 077ea5deb3717c5e132c0116e67af6737088bb84
parent 91d5d2bc6b5a8b1cf133968ae62889d04d20af6f
Author: maydayv7 <maydayv7@gmail.com>
Date:   Sun, 24 Sep 2023 17:48:08 +0530

refactor: Drop Unnecessary Packages

Diffstat:

11 files changed, 44 insertions(+), 88 deletions(-)
diff --git a/README.md b/README.md
@@ -182,7 +182,6 @@ github:maydayv7/dotfiles
 - [`packages`](./packages/README.md): locally built custom packages
 - `overlays`: overrides for pre-built packages
 - [`lib`](./lib/README.md): custom functions designed for conveniently defining configuration
-- [`compat`](./lib/compat): compatibility library for older Nix versions
 - [`modules`](./modules/README.md): custom configuration modules for additional functionality
 
 ## Installation
@@ -424,8 +423,9 @@ You can navigate to the `README`'s present in the various directories to know mo
 ### 23.05 (v12)
 
 - Upgrade to NixOS v23.05 (Stoat)!
-- Drop `cod`, `nix-linter`, `gedit`, `touchegg` and `mutter-rounded`
+- Drop `cod`, `nix-linter`, `gedit`, `touchegg`, `vscode-server` and `mutter-rounded`
 - Support Android Virtualisation using Waydroid
+- Drop `compat` Libraries
 - Refactor GNOME Experience
 - Improve XFCE Configuration Handling
 - Improve Automatic Package Update Script
diff --git a/flake.lock b/flake.lock
@@ -1,21 +1,5 @@
 {
   "nodes": {
-    "compatibility": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1673956053,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
     "deploy": {
       "inputs": {
         "flake-compat": "flake-compat",
@@ -67,6 +51,38 @@
         "type": "github"
       }
     },
+    "flake-compat_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1673956053,
+        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_3": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1673956053,
+        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib"
@@ -176,9 +192,7 @@
     },
     "hooks": {
       "inputs": {
-        "flake-compat": [
-          "compatibility"
-        ],
+        "flake-compat": "flake-compat_2",
         "flake-utils": [
           "utils",
           "flake-utils"
@@ -389,7 +403,6 @@
     },
     "root": {
       "inputs": {
-        "compatibility": "compatibility",
         "deploy": "deploy",
         "filter": "filter",
         "gaming": "gaming",
@@ -405,7 +418,6 @@
         "stable": "stable",
         "unstable": "unstable",
         "utils": "utils_2",
-        "vscode": "vscode",
         "windows": "windows",
         "wine": "wine"
       }
@@ -494,22 +506,6 @@
         "type": "github"
       }
     },
-    "vscode": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1684517665,
-        "narHash": "sha256-SaAr66uCQ8CF75jIr23FZjk1+9Kfwm5sQnwV25206Gs=",
-        "owner": "msteen",
-        "repo": "nixos-vscode-server",
-        "rev": "1e1358493df6529d4c7bc4cc3066f76fd16d4ae6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "msteen",
-        "repo": "nixos-vscode-server",
-        "type": "github"
-      }
-    },
     "windows": {
       "inputs": {
         "nixpkgs": [
@@ -532,9 +528,7 @@
     },
     "wine": {
       "inputs": {
-        "flake-compat": [
-          "compatibility"
-        ],
+        "flake-compat": "flake-compat_3",
         "nixpkgs": [
           "unstable"
         ]
diff --git a/flake.nix b/flake.nix
@@ -84,12 +84,6 @@
       rev = "819180647f428a3826bfc917a54449da1e532ce0";
     };
 
-    # Flake Compatibility Library
-    compatibility = {
-      url = "github:edolstra/flake-compat";
-      flake = false;
-    };
-
     # Source Filter Functions
     filter.url = "github:numtide/nix-filter";
     ignore = {
@@ -123,7 +117,6 @@
       url = "github:cachix/pre-commit-hooks.nix";
       inputs.nixpkgs.follows = "stable";
       inputs.nixpkgs-stable.follows = "stable";
-      inputs.flake-compat.follows = "compatibility";
       inputs.flake-utils.follows = "utils/flake-utils";
       inputs.gitignore.follows = "ignore";
     };
@@ -131,12 +124,6 @@
     # Automatic Deployment Tool
     deploy.url = "github:serokell/deploy-rs";
 
-    # VS Code Server Support
-    vscode = {
-      url = "github:msteen/nixos-vscode-server";
-      flake = false;
-    };
-
     # Windows VM Creator
     windows = {
       url = "git+https://git.m-labs.hk/M-Labs/wfvm";
@@ -147,7 +134,6 @@
     wine = {
       url = "github:emmanuelrosa/erosanix";
       inputs.nixpkgs.follows = "unstable";
-      inputs.flake-compat.follows = "compatibility";
     };
   };
 
diff --git a/lib/README.md b/lib/README.md
@@ -32,5 +32,3 @@ The `lib` directory contains custom-made pure Flakes-compatible utility function
 - [`types`](./types.nix): Custom Module Option Types for advanced configuration -
 
   - `mergedAttrs`: Type specifier for merged `attrsets`
-
-The [`compat`](./compat) directory consists of compatibility libraries which enable you to run legacy Nix commands such as `nix-build`, `nix-shell`, and so on...
diff --git a/lib/compat/build.nix b/lib/compat/build.nix
@@ -1 +0,0 @@
-let default = (import ./flake.nix).defaultNix; in default
diff --git a/lib/compat/flake.nix b/lib/compat/flake.nix
@@ -1,15 +0,0 @@
-let
-  flake = import (let
-    lock =
-      (builtins.fromJSON
-        (builtins.readFile ../../flake.lock))
-      .nodes
-      .compatibility
-      .locked;
-  in
-    fetchTarball {
-      url = "https://github.com/edolstra/flake-compat/archive/${lock.rev}.tar.gz";
-      sha256 = lock.narHash;
-    }) {src = ../../.;};
-in
-  flake
diff --git a/lib/compat/nixos/default.nix b/lib/compat/nixos/default.nix
@@ -1,3 +0,0 @@
-_:
-with (import ../flake.nix).defaultNix;
-  nixosConfigurations."${inputs.library.lib.fileContents /etc/hostname}"
diff --git a/lib/compat/shell.nix b/lib/compat/shell.nix
@@ -1 +0,0 @@
-let default = (import ./flake.nix).shellNix; in default
diff --git a/modules/apps/office.nix b/modules/apps/office.nix
@@ -12,7 +12,6 @@ in {
     # Applications
     environment.systemPackages = with pkgs; [
       # Productivity
-      bluej
       gscan2pdf
       handbrake
       hunspell
@@ -23,7 +22,6 @@ in {
 
       # Internet
       google-chrome
-      megasync
       teams
       thunderbird
       whatsapp-for-linux
@@ -43,7 +41,6 @@ in {
       # Persisted Files
       persist.files = [".config/gscan2pdfrc" ".config/zoomus.conf"];
       persist.directories = [
-        ".bluej"
         ".thunderbird"
         ".zoom"
         ".config/google-chrome"
diff --git a/modules/apps/vscode.nix b/modules/apps/vscode.nix
@@ -19,16 +19,10 @@ in {
     user = {
       persist.directories = [".config/Code" ".vscode"];
       home = {
-        imports = ["${inputs.vscode}/modules/vscode-server/home.nix"];
-
         xdg.mimeApps.defaultApplications = util.build.mime files.xdg.mime {
           text = ["code.desktop"];
         };
 
-        #!# Run the following command on first boot:
-        #!# systemctl --user enable auto-fix-vscode-server.service
-        services.vscode-server.enable = true;
-
         programs.vscode = {
           enable = true;
           package = pkgs.vscode;
diff --git a/modules/hardware/virtualisation/android.nix b/modules/hardware/virtualisation/android.nix
@@ -11,14 +11,21 @@
     virtualisation.waydroid.enable = true;
     environment.systemPackages = [pkgs.wl-clipboard];
 
+    #!# Run the following command to install the image:
+    #!# sudo waydroid init -s GAPPS -f
+
     # Environment Setup
     user.groups = ["android"];
+    users.groups.android = {
+      name = "android";
+      gid = 1000;
+    };
     user.persist.directories = [".local/share/waydroid"];
     environment.persist.directories = [
       {
         directory = "/var/lib/waydroid";
         group = "android";
-        mode = "664";
+        mode = "774";
       }
     ];
   };