From ee28bb7c42ddddc9b9ee953deceb5435325eea08 Mon Sep 17 00:00:00 2001 From: Satria Date: Wed, 25 Mar 2026 18:34:03 +0700 Subject: [PATCH] cleanup and rename --- modules/home/core/apps.nix | 94 ++++++++++++------- modules/home/core/{zed.nix => code.nix} | 0 modules/home/core/{zsh.nix => shell.nix} | 0 modules/home/core/xdg.nix | 25 ----- modules/home/default.nix | 2 +- modules/home/desktop.nix | 23 +++-- .../{scheme-handlers.nix => handlers.nix} | 0 .../home/misc/{kde-connect.nix => phone.nix} | 0 modules/home/rice/{waybar.nix => bar.nix} | 0 .../rice/{hyprland.nix => compositor.nix} | 0 modules/home/rice/{hypridle.nix => idle.nix} | 0 .../rice/{hyprlock.nix => lockscreen.nix} | 0 modules/home/rice/{wlogout.nix => logout.nix} | 0 modules/home/rice/{rofi.nix => menu.nix} | 0 modules/home/rice/{dunst.nix => notifs.nix} | 0 15 files changed, 71 insertions(+), 73 deletions(-) rename modules/home/core/{zed.nix => code.nix} (100%) rename modules/home/core/{zsh.nix => shell.nix} (100%) delete mode 100644 modules/home/core/xdg.nix rename modules/home/misc/{scheme-handlers.nix => handlers.nix} (100%) rename modules/home/misc/{kde-connect.nix => phone.nix} (100%) rename modules/home/rice/{waybar.nix => bar.nix} (100%) rename modules/home/rice/{hyprland.nix => compositor.nix} (100%) rename modules/home/rice/{hypridle.nix => idle.nix} (100%) rename modules/home/rice/{hyprlock.nix => lockscreen.nix} (100%) rename modules/home/rice/{wlogout.nix => logout.nix} (100%) rename modules/home/rice/{rofi.nix => menu.nix} (100%) rename modules/home/rice/{dunst.nix => notifs.nix} (100%) diff --git a/modules/home/core/apps.nix b/modules/home/core/apps.nix index 657bc7e..99fb001 100644 --- a/modules/home/core/apps.nix +++ b/modules/home/core/apps.nix @@ -1,43 +1,67 @@ { pkgs, ... }: { nixpkgs.config.allowUnfree = true; + xdg = { + autostart.enable = true; + mimeApps = { + enable = true; + defaultApplications = { + "text/plain" = "nvim.desktop"; + "text/html" = "brave-browser.desktop"; + "application/pdf" = "brave-browser.desktop"; + "x-scheme-handler/http" = "brave-browser.desktop"; + "x-scheme-handler/https" = "brave-browser.desktop"; + "x-terminal-emulator" = "kitty.desktop"; + "inode/directory" = "pcmanfm-qt.desktop"; + "audio/mpeg" = "vlc.desktop"; + "audio/mp3" = "vlc.desktop"; + "audio/wav" = "vlc.desktop"; + "audio/flac" = "vlc.desktop"; + "video/mp4" = "vlc.desktop"; + "video/x-matroska" = "vlc.desktop"; + "video/webm" = "vlc.desktop"; + "video/x-msvideo" = "vlc.desktop"; + }; + }; + }; + home.packages = with pkgs; [ - zed-editor - # kicad-small - # arduino-ide + zed-editor + # kicad-small + # arduino-ide - slack - discord - # protonmail-desktop # https://www.reddit.com/r/NixOS/comments/1rm9alf/protonmail_in_nixos/ - - vlc - brave - libreoffice - appimage-run - # keepassxc + slack + discord + # protonmail-desktop # https://www.reddit.com/r/NixOS/comments/1rm9alf/protonmail_in_nixos/ + + vlc + brave + libreoffice + appimage-run + # keepassxc - virt-manager - # winboat - - remmina - moonlight-qt - # rustdesk - - - # inkscape - # davinci-resolve - # kdePackages.kdenlive - (wrapOBS { - plugins = with obs-studio-plugins; [ - wlrobs - obs-backgroundremoval - obs-pipewire-audio-capture - ]; - }) + virt-manager + # winboat + + remmina + moonlight-qt + # rustdesk + + + # inkscape + # davinci-resolve + # kdePackages.kdenlive + (wrapOBS { + plugins = with obs-studio-plugins; [ + wlrobs + obs-backgroundremoval + obs-pipewire-audio-capture + ]; + }) - ferium - portablemc - steamguard-cli - # modrinth-app - ]; + ferium + portablemc + steamguard-cli + # modrinth-app + ]; } diff --git a/modules/home/core/zed.nix b/modules/home/core/code.nix similarity index 100% rename from modules/home/core/zed.nix rename to modules/home/core/code.nix diff --git a/modules/home/core/zsh.nix b/modules/home/core/shell.nix similarity index 100% rename from modules/home/core/zsh.nix rename to modules/home/core/shell.nix diff --git a/modules/home/core/xdg.nix b/modules/home/core/xdg.nix deleted file mode 100644 index ffc2a13..0000000 --- a/modules/home/core/xdg.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ ... }: { - xdg = { - autostart.enable = true; - mimeApps = { - enable = true; - defaultApplications = { - "text/plain" = "nvim.desktop"; - "text/html" = "brave-browser.desktop"; - "application/pdf" = "brave-browser.desktop"; - "x-scheme-handler/http" = "brave-browser.desktop"; - "x-scheme-handler/https" = "brave-browser.desktop"; - "x-terminal-emulator" = "kitty.desktop"; - "inode/directory" = "pcmanfm-qt.desktop"; - "audio/mpeg" = "vlc.desktop"; - "audio/mp3" = "vlc.desktop"; - "audio/wav" = "vlc.desktop"; - "audio/flac" = "vlc.desktop"; - "video/mp4" = "vlc.desktop"; - "video/x-matroska" = "vlc.desktop"; - "video/webm" = "vlc.desktop"; - "video/x-msvideo" = "vlc.desktop"; - }; - }; - }; -} \ No newline at end of file diff --git a/modules/home/default.nix b/modules/home/default.nix index 23334fd..8fa2337 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -1,7 +1,7 @@ { username, ... }: { imports = [ + ./core/shell.nix ./core/cli.nix - ./core/zsh.nix ]; home = { diff --git a/modules/home/desktop.nix b/modules/home/desktop.nix index a7a0bc1..3fbd229 100644 --- a/modules/home/desktop.nix +++ b/modules/home/desktop.nix @@ -1,20 +1,19 @@ { pkgs, ... }: { imports = [ - ./rice/hyprland.nix - ./rice/hyprlock.nix - ./rice/waybar.nix - ./rice/rofi.nix - ./rice/wlogout.nix - ./rice/hypridle.nix - ./rice/dunst.nix + ./rice/compositor.nix + ./rice/lockscreen.nix + ./rice/keybinds.nix + ./rice/logout.nix + ./rice/notifs.nix ./rice/cursor.nix ./rice/theme.nix - ./rice/keybinds.nix - ./misc/scheme-handlers.nix - ./misc/kde-connect.nix + ./rice/menu.nix + ./rice/idle.nix + ./rice/bar.nix + ./misc/handlers.nix + ./misc/phone.nix ./core/apps.nix - ./core/zed.nix - ./core/xdg.nix + ./core/code.nix ]; services = { diff --git a/modules/home/misc/scheme-handlers.nix b/modules/home/misc/handlers.nix similarity index 100% rename from modules/home/misc/scheme-handlers.nix rename to modules/home/misc/handlers.nix diff --git a/modules/home/misc/kde-connect.nix b/modules/home/misc/phone.nix similarity index 100% rename from modules/home/misc/kde-connect.nix rename to modules/home/misc/phone.nix diff --git a/modules/home/rice/waybar.nix b/modules/home/rice/bar.nix similarity index 100% rename from modules/home/rice/waybar.nix rename to modules/home/rice/bar.nix diff --git a/modules/home/rice/hyprland.nix b/modules/home/rice/compositor.nix similarity index 100% rename from modules/home/rice/hyprland.nix rename to modules/home/rice/compositor.nix diff --git a/modules/home/rice/hypridle.nix b/modules/home/rice/idle.nix similarity index 100% rename from modules/home/rice/hypridle.nix rename to modules/home/rice/idle.nix diff --git a/modules/home/rice/hyprlock.nix b/modules/home/rice/lockscreen.nix similarity index 100% rename from modules/home/rice/hyprlock.nix rename to modules/home/rice/lockscreen.nix diff --git a/modules/home/rice/wlogout.nix b/modules/home/rice/logout.nix similarity index 100% rename from modules/home/rice/wlogout.nix rename to modules/home/rice/logout.nix diff --git a/modules/home/rice/rofi.nix b/modules/home/rice/menu.nix similarity index 100% rename from modules/home/rice/rofi.nix rename to modules/home/rice/menu.nix diff --git a/modules/home/rice/dunst.nix b/modules/home/rice/notifs.nix similarity index 100% rename from modules/home/rice/dunst.nix rename to modules/home/rice/notifs.nix