clean

flake.nix

@@ -13,7 +13,7 @@
     username = "joy";
     domain = "joygnu.org";
     mail = "mail@joygnu.org";
-    nixpath = "nix/";
+    nixpath = "~/nix";
     pkgs-stable = nixpkgs-stable.legacyPackages.x86_64-linux;
 
     nixosconf = {modules}:

modules/games/norisk/default.nix

@@ -8,8 +8,8 @@
   customPkgs =
     pkgs
     // {
-      noriskclient = pkgs.appimageTools.wrapType1 {
+      no-risk-client = pkgs.appimageTools.wrapType1 {
-        name = "noriskclient";
+        name = "no-risk-client";
         version = "0.5.13";
 
         src = pkgs.fetchurl {
@@ -23,14 +23,14 @@
 in {
   config = lib.mkIf config.games.enable {
     environment.systemPackages = [
-      customPkgs.noriskclient
+      customPkgs.no-risk-client
     ];
 
     home-manager.users.${username}.xdg = {
       desktopEntries = {
-        NoRiskClient = {
+        no-risk-client = {
-          name = "NoRisk Client";
+          name = "no-risk-client";
-          exec = "noriskclient";
+          exec = "no-risk-client";
           icon = pkgs.fetchurl {
             url = iconurl;
             sha256 = iconsha256;

modules/hardware/lact/default.nix

@@ -13,5 +13,6 @@
     systemd.packages = with pkgs; [lact];
     systemd.services.lactd.wantedBy = ["multi-user.target"];
     hardware.amdgpu.initrd.enable = true;
+    hardware.graphics.enable = true;
   };
 }

modules/programs/bat/default.nix

@@ -1,4 +1,4 @@
-{lib, ...}: {
+{
   programs.bat = {
     enable = true;
   };

modules/programs/helix/default.nix

@@ -22,25 +22,7 @@
   };
 
   home.packages = with pkgs; [
-    texlab
-    texliveFull
     nil
-    clang-tools
-    javascript-typescript-langserver
-    vscode-langservers-extracted
-    rust-analyzer
-    lldb_18
-    lua-language-server
-    jdt-language-server
-    gopls
-    dockerfile-language-server-nodejs
-    python312Packages.python-lsp-server
-    omnisharp-roslyn
-    dotnetCorePackages.dotnet_8.sdk
-    go
-    marksman
     pandoc
-    multimarkdown
-    # md2pdf
   ];
 }

modules/programs/zsh/default.nix

@@ -17,19 +17,17 @@
     shellAliases = {
       cn = "cd ~/nix";
       ls = "${pkgs.eza}/bin/eza --icons -a --group-directories-first";
-      v = "hx";
+      v = "${pkgs.helix}/bin/hx";
-      cat = "bat";
+      cat = "${pkgs.bat}/bin/bat";
       lg = "${pkgs.lazygit}/bin/lazygit";
       rs = "z ~ && ssh root@45.145.42.193";
       hs = "z ~ && ssh ${username}@${domain}";
       su = "z ~ && su";
-      ip = "sh ~/${nixpath}modules/programs/zsh/scripts/ip.sh";
+      ip = "sh ${nixpath}/modules/programs/zsh/scripts/ip.sh";
-      rb = "sh ~/${nixpath}modules/programs/zsh/scripts/rebuild.sh";
+      rb = "sh ${nixpath}/modules/programs/zsh/scripts/rebuild.sh";
       fr = "doas systemctl reboot --firmware";
-      up = "nix flake update --flake ~/${nixpath}";
+      up = "nix flake update --flake ${nixpath}";
       del = "doas nix-collect-garbage -d";
-      dn = "dotnet new console";
-      dr = "dotnet run";
     };
 
     oh-my-zsh = {

modules/system/misc/default.nix

@@ -6,5 +6,4 @@
   users.defaultUserShell = pkgs.zsh;
   services.xserver.excludePackages = [pkgs.xterm];
   programs.nano.enable = false;
-  programs.java.enable = true;
 }

modules/wm/home/gtk/default.nix

@@ -1,4 +1,8 @@
-{pkgs, ...}: let
+{
+  pkgs,
+  config,
+  ...
+}: let
   gruvboxPlus = import ./gruvbox-plus.nix {inherit pkgs;};
 in {
   home.file = {
@@ -9,5 +13,6 @@ in {
     enable = true;
     iconTheme.package = gruvboxPlus;
     iconTheme.name = "GruvboxPlus";
+    gtk2.configLocation = "${config.home.homeDirectory}/.config/gtk-2.0/gtkrc";
   };
 }

modules/wm/home/misc/default.nix

@@ -1,13 +1,9 @@
 {
   pkgs,
-  config,
   lib,
   ...
 }: {
   home.packages = with pkgs; [
-    hyprpicker
-    playerctl
-    rofimoji
     pwvucontrol
     pulseaudioFull
     sent
@@ -19,7 +15,6 @@
     boxbuddy
     ferdium
     drawio
-    distrobox
     obs-studio
     transmission_4-gtk
     gnome-clocks
@@ -29,7 +24,6 @@
     kdePackages.kdenlive
     sqlitebrowser
   ];
-  gtk.gtk2.configLocation = "${config.home.homeDirectory}/.config/gtk-2.0/gtkrc";
   xresources.path = ".config/.Xresources";
   nixpkgs.config.allowUnfreePredicate = pkg:
     builtins.elem (lib.getName pkg) [

modules/wm/home/rofi/default.nix

@@ -6,7 +6,7 @@
   programs.rofi = {
     enable = true;
     package = pkgs.rofi-wayland;
-    theme = "~/${nixpath}modules/wm/home/rofi/gruvbox-material.rasi";
+    theme = "${nixpath}/modules/wm/home/rofi/gruvbox-material.rasi";
     extraConfig = {
       display-drun = "";
       show-icons = true;

modules/wm/hyprland/default.nix

@@ -13,7 +13,7 @@
       enable = true;
       settings = {
         "$mod" = "SUPER";
-        "$sciPath" = "~/${nixpath}modules/wm/hyprland/scripts";
+        "$sciPath" = "${nixpath}/modules/wm/hyprland/scripts";
         cursor = {
           inactive_timeout = "3";
         };
@@ -81,14 +81,13 @@
           "$mod, M, exec, mbsync -a && foot -e neomutt"
           "$mod, N, exec, foot -e newsboat"
           "$mod, A, exec, rofi -show drun"
-          "$mod, F, exec, freetube"
+          "$mod, C, exec, ${pkgs.hyprpicker}/bin/hyprpicker -a"
-          "$mod, C, exec, hyprpicker -a"
+          "$mod+Shift, Z, exec, ${pkgs.grim}/bin/grim - | ${pkgs.swappy}/bin/swappy -f -"
-          "$mod+Shift, Z, exec, grim - | swappy -f -"
           ''$mod,T, exec,  ${pkgs.grim}/bin/grim -g "$(${pkgs.slurp}/bin/slurp)" - | ${pkgs.tesseract}/bin/tesseract - stdout -l deu --psm 6 | wl-copy''
           ''$mod,Z, exec, ${pkgs.grim}/bin/grim -g "$(${pkgs.slurp}/bin/slurp)" - | ${pkgs.swappy}/bin/swappy -f -''
           "$mod, V, exec, cliphist list | rofi show -dmenu | cliphist decode | wl-copy"
           "$mod, O, exec, sh $sciPath/mpv.sh"
-          "$mod, B, exec, rofimoji"
+          "$mod, B, exec, ${pkgs.rofimoji}/bin/rofimoji"
           "$mod, F, exec, foot -e hx"
           # controls
           "$mod, Q, killactive"
@@ -103,9 +102,9 @@
           "$mod, P, exec, hyprctl dispatch togglefloating && hyprctl dispatch resizeactive exact 854 480 && hyprctl dispatch movewindow d && hyprctl dispatch movewindow r && hyprctl dispatch pin"
           # cmus
           "$mod, D, exec, [float; pin; size 80% 80%;] sh $sciPath/cmus.sh"
-          "$mod, space, exec, playerctl play-pause"
+          "$mod, space, exec, ${pkgs.playerctl}/bin/playerctl play-pause"
-          "$mod, comma, exec, playerctl previous"
+          "$mod, comma, exec, ${pkgs.playerctl}/bin/playerctl previous"
-          "$mod, period, exec, playerctl next"
+          "$mod, period, exec, ${pkgs.playerctl}/bin/playerctl next"
           "$mod, equal, exec, cmus-remote -v +10%"
           "$mod, minus, exec, cmus-remote -v -10%"
           # Move focus