refactor(nix): give alias to long symlink func and misc refactor

config/hypr/main.conf

@@ -41,6 +41,7 @@ exec-once = spotify & sleep 5; hyprctl dispatch movetoworkspacesilent special:sp
 
 # Some default env vars.
 env = XCURSOR_SIZE,24
+exec-once=hyprctl setcursor Dracula-cursors 24
 
 # For all categories, see https://wiki.hyprland.org/Configuring/Variables/
 input {

nixos/flake.lock

@@ -21,11 +21,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1673956053,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "lastModified": 1696267196,
+        "narHash": "sha256-AAQ/2sD+0D18bb8hKuEEVpHUYD1GmO2Uh/taFamn6XQ=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "rev": "4f910c9827911b1ec2bf26b5a062cd09f8d89f85",
         "type": "github"
       },
       "original": {
@@ -268,11 +268,11 @@
       },
       "locked": {
         "dir": "contrib",
-        "lastModified": 1696187451,
-        "narHash": "sha256-AiGMtsPP6DiCgBjHJSPlr49+Oov2WdTDPd+ffZgkT5o=",
+        "lastModified": 1696290351,
+        "narHash": "sha256-R7J772e09d3XPWcBy3qKBN5U6K4agU+3Ji6yeZ0Ewfw=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "9ce1623837a817c3f4f5deff9c8ba862578b6009",
+        "rev": "3c76038755b5c0c63604f2baa481491bb0efe2e1",
         "type": "github"
       },
       "original": {
@@ -291,11 +291,11 @@
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1696205061,
-        "narHash": "sha256-HXUmII41X0fDSQouFa86KWnvGmdipNmF5hIx9hEH9EU=",
+        "lastModified": 1696291508,
+        "narHash": "sha256-QJaBtzGkCRGvTOD15j4YEJp6KV0nUP3WAiRaVg8KdRw=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "de6f29f963bdc8476981f5327b24d441cb2f49eb",
+        "rev": "855bcce88dd0157c1cb9bd2a709360cdb694a4b3",
         "type": "github"
       },
       "original": {
@@ -372,11 +372,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1696009558,
-        "narHash": "sha256-/1nNL8lCF0gn38XaFyu2ufpWcBFwCDZyYUxdZkM6GxU=",
+        "lastModified": 1696234590,
+        "narHash": "sha256-mgOzQYTvaTT4bFopVOadlndy2RPwLy60rDjIWOGujwo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c182df2e68bd97deb32c7e4765adfbbbcaf75b60",
+        "rev": "f902cb49892d300ff15cb237e48aa1cad79d68c3",
         "type": "github"
       },
       "original": {

nixos/home/dconf.nix

@@ -17,8 +17,6 @@
 
     "org/gnome/desktop/interface" = {
       color-scheme = "prefer-dark";
-      gtk-theme = "Dracula";
-      icon-theme = "Flat-Remix-Violet-Dark";
     };
   };
 }

nixos/home/dotfiles.nix

@@ -1,26 +1,30 @@
 { config, pkgs, ... }: let
   configDir = (import ../vars.nix).configDir;
+  symlink = config.lib.file.mkOutOfStoreSymlink;
 in
 {
   xdg.configFile = {
-    "swayosd/style.css".source     = config.lib.file.mkOutOfStoreSymlink "${configDir}/swayosd/style.css";
+    "swayosd/style.css".source     = symlink "${configDir}/swayosd/style.css";
 
     "gtklock/config.ini".source    = pkgs.writeText "config.ini" ''
-                                      [main]
-                                      modules=${pkgs.gtklock-powerbar-module}/lib/gtklock/powerbar-module.so;${pkgs.gtklock-playerctl-module}/lib/gtklock/playerctl-module.so
+      [main]
+      modules=${builtins.concatStringsSep ";" [
+        "${pkgs.gtklock-powerbar-module}/lib/gtklock/powerbar-module.so"
+        "${pkgs.gtklock-playerctl-module}/lib/gtklock/playerctl-module.so"
+      ]}
                                     '';
-    "gtklock/style.css".source     = config.lib.file.mkOutOfStoreSymlink "${configDir}/gtklock/style.css";
+    "gtklock/style.css".source     = symlink "${configDir}/gtklock/style.css";
 
-    "ripgrep".source               = config.lib.file.mkOutOfStoreSymlink "${configDir}/ripgrep";
+    "ripgrep".source               = symlink "${configDir}/ripgrep";
 
-    "discord/settings.json".source = config.lib.file.mkOutOfStoreSymlink "${configDir}/discord/settings.json";
+    "discord/settings.json".source = symlink "${configDir}/discord/settings.json";
 
-    "dolphinrc".source             = config.lib.file.mkOutOfStoreSymlink "${configDir}/dolphinrc";
-    "kdeglobals".source            = config.lib.file.mkOutOfStoreSymlink "${configDir}/kdeglobals";
-    "kiorc".source                 = config.lib.file.mkOutOfStoreSymlink "${configDir}/kiorc";
-    "mimeapps.list".source         = config.lib.file.mkOutOfStoreSymlink "${configDir}/mimeapps.list";
-    "neofetch".source              = config.lib.file.mkOutOfStoreSymlink "${configDir}/neofetch";
-    "swappy".source                = config.lib.file.mkOutOfStoreSymlink "${configDir}/swappy";
+    "dolphinrc".source             = symlink "${configDir}/dolphinrc";
+    "kdeglobals".source            = symlink "${configDir}/kdeglobals";
+    "kiorc".source                 = symlink "${configDir}/kiorc";
+    "mimeapps.list".source         = symlink "${configDir}/mimeapps.list";
+    "neofetch".source              = symlink "${configDir}/neofetch";
+    "swappy".source                = symlink "${configDir}/swappy";
   };
 
   programs = {

nixos/home/hyprland.nix

@@ -1,10 +1,10 @@
 { pkgs, config, hyprland, hyprgrass, ags, ... }: let
   configDir = (import ../vars.nix).configDir;
+  symlink = config.lib.file.mkOutOfStoreSymlink;
 in
 {
   home.packages = [
     pkgs.sassc
-    pkgs.flat-remix-icon-theme
     pkgs.coloryou
   ];
 
@@ -16,7 +16,7 @@ in
   programs.ags = {
     enable = true;
     package = ags.packages.x86_64-linux.default;
-    configDir = config.lib.file.mkOutOfStoreSymlink "${configDir}/ags";
+    configDir = symlink "${configDir}/ags";
   };
 
   wayland.windowManager.hyprland = {
@@ -40,7 +40,7 @@ in
   };
 
   xdg.configFile = {
-    "hypr/main.conf".source       = config.lib.file.mkOutOfStoreSymlink "${configDir}/hypr/main.conf";
-    "hypr/hyprpaper.conf".source  = config.lib.file.mkOutOfStoreSymlink "${configDir}/hypr/hyprpaper.conf";
+    "hypr/main.conf".source       = symlink "${configDir}/hypr/main.conf";
+    "hypr/hyprpaper.conf".source  = symlink "${configDir}/hypr/hyprpaper.conf";
   };
 }

nixos/home/nvim.nix

@@ -1,5 +1,4 @@
-{ pkgs, lib, ... }:
-let
+{ pkgs, lib, ... }: let
   # installs a vim plugin from git with a given tag / branch
   plugin = owner: repo: rev: hash: pkgs.vimUtils.buildVimPlugin {
     pname = "${lib.strings.sanitizeDerivationName repo}";
@@ -9,12 +8,14 @@ let
     };
   };
 in
+
 {
   xdg.configFile = {
     "../.gradle/gradle.properties".source = pkgs.writeText "gradle.properties" ''
       org.gradle.java.home = ${pkgs.temurin-bin-17}
     '';
   };
+
   programs.neovim = {
     enable = true;
     package = pkgs.neovim-nightly;
@@ -67,6 +68,7 @@ in
         };
       };
     };
+
     plugins = with pkgs.vimPlugins; [
       vim-which-key
 

nixos/home/packages.nix

@@ -68,7 +68,6 @@
     (with gnome; [
       gnome-calculator
       seahorse
-      adwaita-icon-theme
 
     ]) ++ [
 
@@ -91,7 +90,7 @@
     virt-manager
     gradle
     gradle-completion # not working
-    jdk19_headless
+    temurin-bin-17
     #camunda-modeler
 
     protonmail-bridge
@@ -105,8 +104,6 @@
     libnotify
     libinput
     playerctl
-    dracula-theme
-    dracula-icon-theme
     steam-run
     wineWowPackages.stable
     cabextract
@@ -150,7 +147,6 @@
     swappy
     fontfor
     qt5ct
-    lxappearance
     imagemagick
     usbutils
     evtest

nixos/home/theme.nix

@@ -1,8 +1,26 @@
 { pkgs, ... }:
 
 {
+  gtk = {
+    enable = true;
+    theme = {
+      name = "Dracula";
+      package = pkgs.dracula-theme;
+    };
+
+    iconTheme = {
+      name = "Flat-Remix-Violet-Dark";
+      package = pkgs.flat-remix-icon-theme;
+    };
+
+    cursorTheme = {
+      name = "Dracula-cursors";
+      package = pkgs.dracula-icon-theme;
+    };
+  };
+
   xdg.configFile = {
-    "../.themes/Dracula".source   = "${pkgs.dracula-theme}/share/themes/Dracula";
+    "../.themes/Dracula".source           = "${pkgs.dracula-theme}/share/themes/Dracula";
 
     "Kvantum/Dracula".source              = "${pkgs.dracula-theme}/share/Kvantum/Dracula";
     "Kvantum/Dracula-Solid".source        = "${pkgs.dracula-theme}/share/Kvantum/Dracula-Solid";