From d564e89c3b2e8e2670a2f9357e11c61cd021994f Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Mon, 8 Jul 2024 12:53:27 +0700 Subject: [PATCH] Rename common gui and misc cli --- flake.nix | 4 ++-- modules/{misc => cli}/default.nix | 0 modules/{misc => cli}/direnv.sh | 0 modules/{misc => cli}/fonts.nix | 0 modules/{misc => cli}/home.nix | 0 modules/{misc => cli}/impermanence.nix | 0 modules/{misc => cli}/nix.nix | 0 .../disabled_queries/c_sharp/injections.scm | 0 modules/{misc => cli}/nvim/default.nix | 2 +- modules/{misc => cli}/nvim/init.lua | 0 modules/{misc => cli}/nvim/lazy-lock.json | 0 modules/{misc => cli}/nvim/lua/.luarc.json | 0 .../{misc => cli}/nvim/lua/plugins/cmp.lua | 0 .../nvim/lua/plugins/colorscheme.lua | 0 .../{misc => cli}/nvim/lua/plugins/git.lua | 0 .../{misc => cli}/nvim/lua/plugins/line.lua | 0 .../{misc => cli}/nvim/lua/plugins/lsp.lua | 0 .../{misc => cli}/nvim/lua/plugins/misc.lua | 0 .../nvim/lua/plugins/motions.lua | 0 .../nvim/lua/plugins/telescope.lua | 0 .../{misc => cli}/nvim/lua/plugins/tree.lua | 0 .../nvim/lua/plugins/treesiter.lua | 0 modules/{misc => cli}/nvim/lua/plugins/ui.lua | 0 modules/{misc => cli}/nvim/lua/settings.lua | 0 .../lua/telescope/_extensions/git_show.lua | 0 modules/{misc => cli}/nvim/spell/en.utf-8.add | 0 .../{misc => cli}/nvim/spell/en.utf-8.add.spl | Bin modules/{misc => cli}/tmux-sessionizer.sh | 0 modules/{misc => cli}/zsh/custom.zsh | 0 modules/{misc => cli}/zsh/default.nix | 0 modules/{misc => cli}/zsh/init.zsh | 0 modules/{misc => cli}/zsh/p10k-tty.zsh | 0 modules/{misc => cli}/zsh/p10k.zsh | 0 modules/{common => gui}/ags/.editorconfig | 0 modules/{common => gui}/ags/.gitignore | 0 modules/{common => gui}/ags/config.js | 0 modules/{common => gui}/ags/covercolors.py | 0 modules/{common => gui}/ags/default.nix | 0 modules/{common => gui}/ags/layouts/bar.js | 0 .../ags/layouts/notifications.js | 0 modules/{common => gui}/ags/layouts/osd.js | 0 .../ags/layouts/quicksettings.js | 0 modules/{common => gui}/ags/misc/menu.js | 10 +++++----- modules/{common => gui}/ags/misc/popup.js | 6 +++--- modules/{common => gui}/ags/misc/utils.js | 0 modules/{common => gui}/ags/modules/audio.js | 12 ++++++------ .../{common => gui}/ags/modules/battery.js | 2 +- .../{common => gui}/ags/modules/bluetooth.js | 8 ++++---- .../{common => gui}/ags/modules/brightness.js | 4 ++-- modules/{common => gui}/ags/modules/clock.js | 2 +- .../{common => gui}/ags/modules/darkmode.js | 0 modules/{common => gui}/ags/modules/dwl.js | 0 modules/{common => gui}/ags/modules/mpris.js | 18 +++++++++--------- .../{common => gui}/ags/modules/network.js | 8 ++++---- .../ags/modules/notifications.js | 16 ++++++++-------- .../ags/modules/powerprofile.js | 2 +- .../{common => gui}/ags/modules/systray.js | 4 ++-- .../ags/services/brightness.js | 0 modules/{common => gui}/ags/services/dwl.js | 0 modules/{common => gui}/ags/shell.nix | 0 modules/{common => gui}/ags/style.css | 0 modules/{common => gui}/ags/tsconfig.json | 6 +++--- modules/{common => gui}/ags/types | 0 modules/{common => gui}/apps.nix | 1 + modules/{common => gui}/ghostty.config | 0 modules/{common => gui}/ghostty.nix | 0 modules/{common => gui}/gtk.nix | 0 modules/{common => gui}/kitty.nix | 0 modules/{common => gui}/rofi/colors.rasi | 0 modules/{common => gui}/rofi/config.rasi | 0 modules/{common => gui}/rofi/default.nix | 0 modules/river/home.nix | 2 +- modules/wsl/home.nix | 2 +- 73 files changed, 55 insertions(+), 54 deletions(-) rename modules/{misc => cli}/default.nix (100%) rename modules/{misc => cli}/direnv.sh (100%) rename modules/{misc => cli}/fonts.nix (100%) rename modules/{misc => cli}/home.nix (100%) rename modules/{misc => cli}/impermanence.nix (100%) rename modules/{misc => cli}/nix.nix (100%) rename modules/{misc => cli}/nvim/after/disabled_queries/c_sharp/injections.scm (100%) rename modules/{misc => cli}/nvim/default.nix (85%) rename modules/{misc => cli}/nvim/init.lua (100%) rename modules/{misc => cli}/nvim/lazy-lock.json (100%) rename modules/{misc => cli}/nvim/lua/.luarc.json (100%) rename modules/{misc => cli}/nvim/lua/plugins/cmp.lua (100%) rename modules/{misc => cli}/nvim/lua/plugins/colorscheme.lua (100%) rename modules/{misc => cli}/nvim/lua/plugins/git.lua (100%) rename modules/{misc => cli}/nvim/lua/plugins/line.lua (100%) rename modules/{misc => cli}/nvim/lua/plugins/lsp.lua (100%) rename modules/{misc => cli}/nvim/lua/plugins/misc.lua (100%) rename modules/{misc => cli}/nvim/lua/plugins/motions.lua (100%) rename modules/{misc => cli}/nvim/lua/plugins/telescope.lua (100%) rename modules/{misc => cli}/nvim/lua/plugins/tree.lua (100%) rename modules/{misc => cli}/nvim/lua/plugins/treesiter.lua (100%) rename modules/{misc => cli}/nvim/lua/plugins/ui.lua (100%) rename modules/{misc => cli}/nvim/lua/settings.lua (100%) rename modules/{misc => cli}/nvim/lua/telescope/_extensions/git_show.lua (100%) rename modules/{misc => cli}/nvim/spell/en.utf-8.add (100%) rename modules/{misc => cli}/nvim/spell/en.utf-8.add.spl (100%) rename modules/{misc => cli}/tmux-sessionizer.sh (100%) rename modules/{misc => cli}/zsh/custom.zsh (100%) rename modules/{misc => cli}/zsh/default.nix (100%) rename modules/{misc => cli}/zsh/init.zsh (100%) rename modules/{misc => cli}/zsh/p10k-tty.zsh (100%) rename modules/{misc => cli}/zsh/p10k.zsh (100%) rename modules/{common => gui}/ags/.editorconfig (100%) rename modules/{common => gui}/ags/.gitignore (100%) rename modules/{common => gui}/ags/config.js (100%) rename modules/{common => gui}/ags/covercolors.py (100%) rename modules/{common => gui}/ags/default.nix (100%) rename modules/{common => gui}/ags/layouts/bar.js (100%) rename modules/{common => gui}/ags/layouts/notifications.js (100%) rename modules/{common => gui}/ags/layouts/osd.js (100%) rename modules/{common => gui}/ags/layouts/quicksettings.js (100%) rename modules/{common => gui}/ags/misc/menu.js (91%) rename modules/{common => gui}/ags/misc/popup.js (94%) rename modules/{common => gui}/ags/misc/utils.js (100%) rename modules/{common => gui}/ags/modules/audio.js (91%) rename modules/{common => gui}/ags/modules/battery.js (90%) rename modules/{common => gui}/ags/modules/bluetooth.js (88%) rename modules/{common => gui}/ags/modules/brightness.js (84%) rename modules/{common => gui}/ags/modules/clock.js (80%) rename modules/{common => gui}/ags/modules/darkmode.js (100%) rename modules/{common => gui}/ags/modules/dwl.js (100%) rename modules/{common => gui}/ags/modules/mpris.js (83%) rename modules/{common => gui}/ags/modules/network.js (90%) rename modules/{common => gui}/ags/modules/notifications.js (91%) rename modules/{common => gui}/ags/modules/powerprofile.js (95%) rename modules/{common => gui}/ags/modules/systray.js (89%) rename modules/{common => gui}/ags/services/brightness.js (100%) rename modules/{common => gui}/ags/services/dwl.js (100%) rename modules/{common => gui}/ags/shell.nix (100%) rename modules/{common => gui}/ags/style.css (100%) rename modules/{common => gui}/ags/tsconfig.json (80%) rename modules/{common => gui}/ags/types (100%) rename modules/{common => gui}/apps.nix (99%) rename modules/{common => gui}/ghostty.config (100%) rename modules/{common => gui}/ghostty.nix (100%) rename modules/{common => gui}/gtk.nix (100%) rename modules/{common => gui}/kitty.nix (100%) rename modules/{common => gui}/rofi/colors.rasi (100%) rename modules/{common => gui}/rofi/config.rasi (100%) rename modules/{common => gui}/rofi/default.nix (100%) diff --git a/flake.nix b/flake.nix index 06b828f..d9655b6 100644 --- a/flake.nix +++ b/flake.nix @@ -56,7 +56,7 @@ modules = [ impermanence.nixosModules.impermanence - ./modules/misc + ./modules/cli (./modules + "/${de}") { nixpkgs.overlays = [ @@ -84,7 +84,7 @@ useUserPackages = true; users.${user} = { imports = [ - ./modules/misc/home.nix + ./modules/cli/home.nix (./modules + "/${de}/home.nix") nix-index-database.hmModules.nix-index ]; diff --git a/modules/misc/default.nix b/modules/cli/default.nix similarity index 100% rename from modules/misc/default.nix rename to modules/cli/default.nix diff --git a/modules/misc/direnv.sh b/modules/cli/direnv.sh similarity index 100% rename from modules/misc/direnv.sh rename to modules/cli/direnv.sh diff --git a/modules/misc/fonts.nix b/modules/cli/fonts.nix similarity index 100% rename from modules/misc/fonts.nix rename to modules/cli/fonts.nix diff --git a/modules/misc/home.nix b/modules/cli/home.nix similarity index 100% rename from modules/misc/home.nix rename to modules/cli/home.nix diff --git a/modules/misc/impermanence.nix b/modules/cli/impermanence.nix similarity index 100% rename from modules/misc/impermanence.nix rename to modules/cli/impermanence.nix diff --git a/modules/misc/nix.nix b/modules/cli/nix.nix similarity index 100% rename from modules/misc/nix.nix rename to modules/cli/nix.nix diff --git a/modules/misc/nvim/after/disabled_queries/c_sharp/injections.scm b/modules/cli/nvim/after/disabled_queries/c_sharp/injections.scm similarity index 100% rename from modules/misc/nvim/after/disabled_queries/c_sharp/injections.scm rename to modules/cli/nvim/after/disabled_queries/c_sharp/injections.scm diff --git a/modules/misc/nvim/default.nix b/modules/cli/nvim/default.nix similarity index 85% rename from modules/misc/nvim/default.nix rename to modules/cli/nvim/default.nix index 47988ee..86986a2 100644 --- a/modules/misc/nvim/default.nix +++ b/modules/cli/nvim/default.nix @@ -11,7 +11,7 @@ tree-sitter ]; }; - xdg.configFile."nvim".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/projects/flake/modules/misc/nvim"; + xdg.configFile."nvim".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/projects/flake/modules/cli/nvim"; programs.zsh.shellAliases = { n = "nvim"; diff --git a/modules/misc/nvim/init.lua b/modules/cli/nvim/init.lua similarity index 100% rename from modules/misc/nvim/init.lua rename to modules/cli/nvim/init.lua diff --git a/modules/misc/nvim/lazy-lock.json b/modules/cli/nvim/lazy-lock.json similarity index 100% rename from modules/misc/nvim/lazy-lock.json rename to modules/cli/nvim/lazy-lock.json diff --git a/modules/misc/nvim/lua/.luarc.json b/modules/cli/nvim/lua/.luarc.json similarity index 100% rename from modules/misc/nvim/lua/.luarc.json rename to modules/cli/nvim/lua/.luarc.json diff --git a/modules/misc/nvim/lua/plugins/cmp.lua b/modules/cli/nvim/lua/plugins/cmp.lua similarity index 100% rename from modules/misc/nvim/lua/plugins/cmp.lua rename to modules/cli/nvim/lua/plugins/cmp.lua diff --git a/modules/misc/nvim/lua/plugins/colorscheme.lua b/modules/cli/nvim/lua/plugins/colorscheme.lua similarity index 100% rename from modules/misc/nvim/lua/plugins/colorscheme.lua rename to modules/cli/nvim/lua/plugins/colorscheme.lua diff --git a/modules/misc/nvim/lua/plugins/git.lua b/modules/cli/nvim/lua/plugins/git.lua similarity index 100% rename from modules/misc/nvim/lua/plugins/git.lua rename to modules/cli/nvim/lua/plugins/git.lua diff --git a/modules/misc/nvim/lua/plugins/line.lua b/modules/cli/nvim/lua/plugins/line.lua similarity index 100% rename from modules/misc/nvim/lua/plugins/line.lua rename to modules/cli/nvim/lua/plugins/line.lua diff --git a/modules/misc/nvim/lua/plugins/lsp.lua b/modules/cli/nvim/lua/plugins/lsp.lua similarity index 100% rename from modules/misc/nvim/lua/plugins/lsp.lua rename to modules/cli/nvim/lua/plugins/lsp.lua diff --git a/modules/misc/nvim/lua/plugins/misc.lua b/modules/cli/nvim/lua/plugins/misc.lua similarity index 100% rename from modules/misc/nvim/lua/plugins/misc.lua rename to modules/cli/nvim/lua/plugins/misc.lua diff --git a/modules/misc/nvim/lua/plugins/motions.lua b/modules/cli/nvim/lua/plugins/motions.lua similarity index 100% rename from modules/misc/nvim/lua/plugins/motions.lua rename to modules/cli/nvim/lua/plugins/motions.lua diff --git a/modules/misc/nvim/lua/plugins/telescope.lua b/modules/cli/nvim/lua/plugins/telescope.lua similarity index 100% rename from modules/misc/nvim/lua/plugins/telescope.lua rename to modules/cli/nvim/lua/plugins/telescope.lua diff --git a/modules/misc/nvim/lua/plugins/tree.lua b/modules/cli/nvim/lua/plugins/tree.lua similarity index 100% rename from modules/misc/nvim/lua/plugins/tree.lua rename to modules/cli/nvim/lua/plugins/tree.lua diff --git a/modules/misc/nvim/lua/plugins/treesiter.lua b/modules/cli/nvim/lua/plugins/treesiter.lua similarity index 100% rename from modules/misc/nvim/lua/plugins/treesiter.lua rename to modules/cli/nvim/lua/plugins/treesiter.lua diff --git a/modules/misc/nvim/lua/plugins/ui.lua b/modules/cli/nvim/lua/plugins/ui.lua similarity index 100% rename from modules/misc/nvim/lua/plugins/ui.lua rename to modules/cli/nvim/lua/plugins/ui.lua diff --git a/modules/misc/nvim/lua/settings.lua b/modules/cli/nvim/lua/settings.lua similarity index 100% rename from modules/misc/nvim/lua/settings.lua rename to modules/cli/nvim/lua/settings.lua diff --git a/modules/misc/nvim/lua/telescope/_extensions/git_show.lua b/modules/cli/nvim/lua/telescope/_extensions/git_show.lua similarity index 100% rename from modules/misc/nvim/lua/telescope/_extensions/git_show.lua rename to modules/cli/nvim/lua/telescope/_extensions/git_show.lua diff --git a/modules/misc/nvim/spell/en.utf-8.add b/modules/cli/nvim/spell/en.utf-8.add similarity index 100% rename from modules/misc/nvim/spell/en.utf-8.add rename to modules/cli/nvim/spell/en.utf-8.add diff --git a/modules/misc/nvim/spell/en.utf-8.add.spl b/modules/cli/nvim/spell/en.utf-8.add.spl similarity index 100% rename from modules/misc/nvim/spell/en.utf-8.add.spl rename to modules/cli/nvim/spell/en.utf-8.add.spl diff --git a/modules/misc/tmux-sessionizer.sh b/modules/cli/tmux-sessionizer.sh similarity index 100% rename from modules/misc/tmux-sessionizer.sh rename to modules/cli/tmux-sessionizer.sh diff --git a/modules/misc/zsh/custom.zsh b/modules/cli/zsh/custom.zsh similarity index 100% rename from modules/misc/zsh/custom.zsh rename to modules/cli/zsh/custom.zsh diff --git a/modules/misc/zsh/default.nix b/modules/cli/zsh/default.nix similarity index 100% rename from modules/misc/zsh/default.nix rename to modules/cli/zsh/default.nix diff --git a/modules/misc/zsh/init.zsh b/modules/cli/zsh/init.zsh similarity index 100% rename from modules/misc/zsh/init.zsh rename to modules/cli/zsh/init.zsh diff --git a/modules/misc/zsh/p10k-tty.zsh b/modules/cli/zsh/p10k-tty.zsh similarity index 100% rename from modules/misc/zsh/p10k-tty.zsh rename to modules/cli/zsh/p10k-tty.zsh diff --git a/modules/misc/zsh/p10k.zsh b/modules/cli/zsh/p10k.zsh similarity index 100% rename from modules/misc/zsh/p10k.zsh rename to modules/cli/zsh/p10k.zsh diff --git a/modules/common/ags/.editorconfig b/modules/gui/ags/.editorconfig similarity index 100% rename from modules/common/ags/.editorconfig rename to modules/gui/ags/.editorconfig diff --git a/modules/common/ags/.gitignore b/modules/gui/ags/.gitignore similarity index 100% rename from modules/common/ags/.gitignore rename to modules/gui/ags/.gitignore diff --git a/modules/common/ags/config.js b/modules/gui/ags/config.js similarity index 100% rename from modules/common/ags/config.js rename to modules/gui/ags/config.js diff --git a/modules/common/ags/covercolors.py b/modules/gui/ags/covercolors.py similarity index 100% rename from modules/common/ags/covercolors.py rename to modules/gui/ags/covercolors.py diff --git a/modules/common/ags/default.nix b/modules/gui/ags/default.nix similarity index 100% rename from modules/common/ags/default.nix rename to modules/gui/ags/default.nix diff --git a/modules/common/ags/layouts/bar.js b/modules/gui/ags/layouts/bar.js similarity index 100% rename from modules/common/ags/layouts/bar.js rename to modules/gui/ags/layouts/bar.js diff --git a/modules/common/ags/layouts/notifications.js b/modules/gui/ags/layouts/notifications.js similarity index 100% rename from modules/common/ags/layouts/notifications.js rename to modules/gui/ags/layouts/notifications.js diff --git a/modules/common/ags/layouts/osd.js b/modules/gui/ags/layouts/osd.js similarity index 100% rename from modules/common/ags/layouts/osd.js rename to modules/gui/ags/layouts/osd.js diff --git a/modules/common/ags/layouts/quicksettings.js b/modules/gui/ags/layouts/quicksettings.js similarity index 100% rename from modules/common/ags/layouts/quicksettings.js rename to modules/gui/ags/layouts/quicksettings.js diff --git a/modules/common/ags/misc/menu.js b/modules/gui/ags/misc/menu.js similarity index 91% rename from modules/common/ags/misc/menu.js rename to modules/gui/ags/misc/menu.js index ada7866..cb3a595 100644 --- a/modules/common/ags/misc/menu.js +++ b/modules/gui/ags/misc/menu.js @@ -13,7 +13,7 @@ App.connect("window-toggled", (_, name, visible) => { * @param {{ * name: string, * activate?: false | (() => void), - * } & import("types/widgets/button").ButtonProps} props + * } & import("../types/widgets/button").ButtonProps} props */ export const Arrow = ({ name, activate, ...props }) => { let deg = 0; @@ -53,7 +53,7 @@ export const Arrow = ({ name, activate, ...props }) => { * deactivate: () => void * activateOnArrow?: boolean * connection: [GObject.Object, () => boolean] - * } & import("types/widgets/box").BoxProps} ArrowToggleButtonProps + * } & import("../types/widgets/box").BoxProps} ArrowToggleButtonProps * @param {ArrowToggleButtonProps} props */ export const ArrowToggleButton = ({ @@ -97,7 +97,7 @@ export const ArrowToggleButton = ({ * activate: () => void * deactivate: () => void * connection: [GObject.Object, () => boolean] - * } & import("types/widgets/box").BoxProps} SimpleToggleButtonProps + * } & import("../types/widgets/box").BoxProps} SimpleToggleButtonProps * @param {SimpleToggleButtonProps} props */ export const SimpleToggleButton = ({ @@ -136,7 +136,7 @@ export const SimpleToggleButton = ({ * icon: Gtk.Widget, * title: string, * content: Gtk.Widget[], - * } & import("types/widgets/revealer").RevealerProps} MenuProps + * } & import("../types/widgets/revealer").RevealerProps} MenuProps * @param {MenuProps} props */ export const Menu = ({ name, icon, title, content, ...props }) => @@ -168,7 +168,7 @@ export const Menu = ({ name, icon, title, content, ...props }) => ...props, }); -/** @param {{type: string} & import("types/widgets/button").ButtonProps} props */ +/** @param {{type: string} & import("../types/widgets/button").ButtonProps} props */ export const SettingsButton = ({ type, ...props }) => Widget.Button({ onClicked: () => { diff --git a/modules/common/ags/misc/popup.js b/modules/gui/ags/misc/popup.js similarity index 94% rename from modules/common/ags/misc/popup.js rename to modules/gui/ags/misc/popup.js index 667c56f..4eea9cf 100644 --- a/modules/common/ags/misc/popup.js +++ b/modules/gui/ags/misc/popup.js @@ -1,8 +1,8 @@ // Stollen from https://github.com/Aylur/dotfiles/blob/main/ags/widget/PopupWindow.ts# -/** @typedef {import('types/widgets/window').WindowProps} WindowProps */ -/** @typedef {import('types/widgets/revealer').RevealerProps} RevealerProps */ -/** @typedef {import('types/widgets/eventbox').EventBoxProps} EventBoxProps */ +/** @typedef {import('../types/widgets/window').WindowProps} WindowProps */ +/** @typedef {import('../types/widgets/revealer').RevealerProps} RevealerProps */ +/** @typedef {import('../types/widgets/eventbox').EventBoxProps} EventBoxProps */ /** @typedef {import('gi://Gtk?version=3.0')} Gtk */ /** diff --git a/modules/common/ags/misc/utils.js b/modules/gui/ags/misc/utils.js similarity index 100% rename from modules/common/ags/misc/utils.js rename to modules/gui/ags/misc/utils.js diff --git a/modules/common/ags/modules/audio.js b/modules/gui/ags/modules/audio.js similarity index 91% rename from modules/common/ags/modules/audio.js rename to modules/gui/ags/modules/audio.js index 1428da5..44bbf13 100644 --- a/modules/common/ags/modules/audio.js +++ b/modules/gui/ags/modules/audio.js @@ -22,7 +22,7 @@ export const getIcon = (volume) => { return `audio-volume-${icon}-symbolic`; }; -/** @param {{type?: "speaker" | "microphone"} & import("types/widgets/icon").IconProps} props */ +/** @param {{type?: "speaker" | "microphone"} & import("../types/widgets/icon.js").IconProps} props */ export const VolumeIndicator = ({ type = "speaker", ...props }) => Widget.Icon(props).hook(audio, (self) => { if (audio[type].is_muted) { @@ -35,7 +35,7 @@ export const VolumeIndicator = ({ type = "speaker", ...props }) => self.tooltip_text = `Volume: ${Math.floor(vol)}%`; }); -/** @param {import("types/widgets/icon").IconProps} props */ +/** @param {import("../types/widgets/icon.js").IconProps} props */ export const MicrophoneIndicator = (props) => Widget.Icon(props).hook(audio, (self) => { self.visible = audio.microphone.is_muted || audio.recorders.length > 0; @@ -44,7 +44,7 @@ export const MicrophoneIndicator = (props) => self.icon = "microphone-sensitivity-high-symbolic"; }); -/** @param {{type?: "speaker" | "microphone"} & import("types/widgets/slider").SliderProps} props */ +/** @param {{type?: "speaker" | "microphone"} & import("../types/widgets/slider.js").SliderProps} props */ const VolumeSlider = ({ type = "speaker", ...props }) => Widget.Slider({ hexpand: true, @@ -60,7 +60,7 @@ const VolumeSlider = ({ type = "speaker", ...props }) => ...props, }); -/** @param {{type?: "speaker" | "microphone"} & import("types/widgets/box").BoxProps} props */ +/** @param {{type?: "speaker" | "microphone"} & import("../types/widgets/box.js").BoxProps} props */ export const Volume = ({ type = "speaker", ...props }) => Widget.Box({ className: "qs-slider", @@ -139,7 +139,7 @@ export const SinkSelector = (props) => ...props, }); -/** @param {import("types/service/audio").Stream} stream */ +/** @param {import("../types/service/audio.js").Stream} stream */ const SinkItem = (stream) => Widget.Button({ hexpand: true, @@ -183,7 +183,7 @@ export const AppMixer = (props) => ...props, }); -/** @param {import("types/service/audio").Stream} stream */ +/** @param {import("../types/service/audio.js").Stream} stream */ const MixerItem = (stream) => Widget.Box({ hexpand: true, diff --git a/modules/common/ags/modules/battery.js b/modules/gui/ags/modules/battery.js similarity index 90% rename from modules/common/ags/modules/battery.js rename to modules/gui/ags/modules/battery.js index 295a2e3..cc721b0 100644 --- a/modules/common/ags/modules/battery.js +++ b/modules/gui/ags/modules/battery.js @@ -1,6 +1,6 @@ const battery = await Service.import("battery"); -/** @param {import("types/widgets/box").BoxProps} props */ +/** @param {import("../types/widgets/box").BoxProps} props */ export const Indicator = ({ ...props }) => Widget.Box({ children: [ diff --git a/modules/common/ags/modules/bluetooth.js b/modules/gui/ags/modules/bluetooth.js similarity index 88% rename from modules/common/ags/modules/bluetooth.js rename to modules/gui/ags/modules/bluetooth.js index dbf470f..b6652f5 100644 --- a/modules/common/ags/modules/bluetooth.js +++ b/modules/gui/ags/modules/bluetooth.js @@ -7,7 +7,7 @@ const connected = Utils.merge( (enabled, devices) => enabled && devices.length > 0, ); -/** @param {{hideIfDisabled?: boolean} & import("types/widgets/icon").IconProps} props */ +/** @param {{hideIfDisabled?: boolean} & import("../types/widgets/icon.js").IconProps} props */ export const Indicator = ({ hideIfDisabled = false, ...props } = {}) => Widget.Icon({ icon: connected.as( @@ -17,7 +17,7 @@ export const Indicator = ({ hideIfDisabled = false, ...props } = {}) => ...props, }); -/** @param {import("types/widgets/label").LabelProps} props */ +/** @param {import("../types/widgets/label.js").LabelProps} props */ export const ConnectedLabel = (props) => Widget.Label(props).hook(bluetooth, (self) => { if (!bluetooth.enabled) self.label = "Disabled"; @@ -28,7 +28,7 @@ export const ConnectedLabel = (props) => else self.label = `${bluetooth.connected_devices.length} Connected`; }); -/** @param {Partial} props */ +/** @param {Partial} props */ export const Toggle = (props) => ArrowToggleButton({ name: "bluetooth", @@ -64,7 +64,7 @@ export const Selection = (props) => ...props, }); -/** @param {import("types/service/bluetooth.js").BluetoothDevice} device */ +/** @param {import("../types/service/bluetooth.js").BluetoothDevice} device */ const DeviceItem = (device) => Widget.Box({ children: [ diff --git a/modules/common/ags/modules/brightness.js b/modules/gui/ags/modules/brightness.js similarity index 84% rename from modules/common/ags/modules/brightness.js rename to modules/gui/ags/modules/brightness.js index 5142210..d639550 100644 --- a/modules/common/ags/modules/brightness.js +++ b/modules/gui/ags/modules/brightness.js @@ -1,6 +1,6 @@ import brightness from "../services/brightness.js"; -/** @param {import("types/widgets/slider").SliderProps} props */ +/** @param {import("../types/widgets/slider.js").SliderProps} props */ const BrightnessSlider = (props) => Widget.Slider({ drawValue: false, @@ -12,7 +12,7 @@ const BrightnessSlider = (props) => ...props, }); -/** @param {import("types/widgets/box").BoxProps} props */ +/** @param {import("../types/widgets/box.js").BoxProps} props */ export const Brightness = (props) => Widget.Box({ className: "qs-slider", diff --git a/modules/common/ags/modules/clock.js b/modules/gui/ags/modules/clock.js similarity index 80% rename from modules/common/ags/modules/clock.js rename to modules/gui/ags/modules/clock.js index 6fae55a..b998872 100644 --- a/modules/common/ags/modules/clock.js +++ b/modules/gui/ags/modules/clock.js @@ -5,7 +5,7 @@ export const clock = Variable(GLib.DateTime.new_now_local(), { }); /** - * @param {{format?: string} & import("types/widgets/label").LabelProps} props + * @param {{format?: string} & import("../types/widgets/label").LabelProps} props */ export const Clock = ({ format = "%a %d %b %H:%M ", ...props } = {}) => Widget.Label({ diff --git a/modules/common/ags/modules/darkmode.js b/modules/gui/ags/modules/darkmode.js similarity index 100% rename from modules/common/ags/modules/darkmode.js rename to modules/gui/ags/modules/darkmode.js diff --git a/modules/common/ags/modules/dwl.js b/modules/gui/ags/modules/dwl.js similarity index 100% rename from modules/common/ags/modules/dwl.js rename to modules/gui/ags/modules/dwl.js diff --git a/modules/common/ags/modules/mpris.js b/modules/gui/ags/modules/mpris.js similarity index 83% rename from modules/common/ags/modules/mpris.js rename to modules/gui/ags/modules/mpris.js index afa4c62..f77f612 100644 --- a/modules/common/ags/modules/mpris.js +++ b/modules/gui/ags/modules/mpris.js @@ -1,6 +1,6 @@ const mpris = await Service.import("mpris"); -/** @param {{player: import("types/service/mpris").MprisPlayer} & import("types/widgets/icon").IconProps} props */ +/** @param {{player: import("../types/service/mpris").MprisPlayer} & import("../types/widgets/icon").IconProps} props */ const PlayerIcon = ({ player, ...props }) => Widget.Icon({ size: 24, @@ -18,7 +18,7 @@ const PlayerIcon = ({ player, ...props }) => ...props, }); -/** @param {{player: import("types/service/mpris").MprisPlayer} & import("types/widgets/label").LabelProps} props */ +/** @param {{player: import("../types/service/mpris").MprisPlayer} & import("../types/widgets/label").LabelProps} props */ const TitleLabel = ({ player, ...props }) => Widget.Label({ wrap: true, @@ -28,7 +28,7 @@ const TitleLabel = ({ player, ...props }) => ...props, }); -/** @param {{player: import("types/service/mpris").MprisPlayer} & import("types/widgets/label").LabelProps} props */ +/** @param {{player: import("../types/service/mpris").MprisPlayer} & import("../types/widgets/label").LabelProps} props */ const ArtistLabel = ({ player, ...props }) => Widget.Label({ wrap: true, @@ -38,7 +38,7 @@ const ArtistLabel = ({ player, ...props }) => ...props, }); -/** @param {{player: import("types/service/mpris").MprisPlayer} & import("types/widgets/button").ButtonProps} props */ +/** @param {{player: import("../types/service/mpris").MprisPlayer} & import("../types/widgets/button").ButtonProps} props */ export const PlayPause = ({ player, ...props }) => Widget.Button({ child: Widget.Icon({ @@ -56,7 +56,7 @@ export const PlayPause = ({ player, ...props }) => ...props, }); -/** @param {{player: import("types/service/mpris").MprisPlayer} & import("types/widgets/button").ButtonProps} props */ +/** @param {{player: import("../types/service/mpris").MprisPlayer} & import("../types/widgets/button").ButtonProps} props */ const PreviousButton = ({ player, ...props }) => Widget.Button({ child: Widget.Icon({ icon: "media-skip-backward-symbolic" }), @@ -65,7 +65,7 @@ const PreviousButton = ({ player, ...props }) => ...props, }); -/** @param {{player: import("types/service/mpris").MprisPlayer} & import("types/widgets/button").ButtonProps} props */ +/** @param {{player: import("../types/service/mpris").MprisPlayer} & import("../types/widgets/button").ButtonProps} props */ const NextButton = ({ player, ...props }) => Widget.Button({ child: Widget.Icon({ icon: "media-skip-forward-symbolic" }), @@ -74,7 +74,7 @@ const NextButton = ({ player, ...props }) => ...props, }); -/** @param {{player: import("types/service/mpris").MprisPlayer} & import("types/widgets/slider").SliderProps} props */ +/** @param {{player: import("../types/service/mpris").MprisPlayer} & import("../types/widgets/slider").SliderProps} props */ const PositionSlider = ({ player, ...props }) => Widget.Slider({ className: "mpris-position-slider", @@ -105,7 +105,7 @@ const PositionSlider = ({ player, ...props }) => // (name) => mpris.getPlayer(name), // ); -/** @param {{player?: import("types/service/mpris").MprisPlayer | null} & import("types/widgets/box").BoxProps} props */ +/** @param {{player?: import("../types/service/mpris").MprisPlayer | null} & import("../types/widgets/box").BoxProps} props */ export const MprisPlayer = ({ player, ...props }) => { if (!player) return Widget.Box({ visible: false }); const colors = getMaterialColors(player); @@ -201,7 +201,7 @@ const ret = Variable({ background: "#222222", onBackground: "#ffffff", }); -/** @param {import("types/service/mpris").MprisPlayer} player */ +/** @param {import("../types/service/mpris").MprisPlayer} player */ export const getMaterialColors = (player) => { // TODO: Move that to a hook to allow graceful disconnections player.connect("changed", (player) => { diff --git a/modules/common/ags/modules/network.js b/modules/gui/ags/modules/network.js similarity index 90% rename from modules/common/ags/modules/network.js rename to modules/gui/ags/modules/network.js index 320d546..aefbb87 100644 --- a/modules/common/ags/modules/network.js +++ b/modules/gui/ags/modules/network.js @@ -2,7 +2,7 @@ import { ArrowToggleButton, Menu, SettingsButton } from "../misc/menu.js"; const network = await Service.import("network"); -/** @param {import("types/widgets/icon").IconProps} props*/ +/** @param {import("../types/widgets/icon.js").IconProps} props*/ export const Indicator = (props) => Widget.Stack({ children: { @@ -18,7 +18,7 @@ export const Indicator = (props) => shown: network.bind("primary").as((p) => p || "wifi"), }); -/** @param {import("types/widgets/label").LabelProps} props */ +/** @param {import("../types/widgets/label.js").LabelProps} props */ export const SSIDLabel = (props) => Widget.Label({ truncate: "end", @@ -31,7 +31,7 @@ export const SSIDLabel = (props) => network.wired.internet !== "disconnected" ? "Wired" : "Not Connected"; }); -/** @param {Partial} props */ +/** @param {Partial} props */ export const Toggle = (props) => ArrowToggleButton({ name: "network", @@ -96,7 +96,7 @@ const Wired = () => }), }); -/** @param {import("types/service/network").Wifi["access_points"][0]} wifi */ +/** @param {import("../types/service/network.js").Wifi["access_points"][0]} wifi */ const WifiItem = (wifi) => Widget.Button({ onClicked: () => Utils.execAsync(`nmcli device wifi connect ${wifi.bssid}`), diff --git a/modules/common/ags/modules/notifications.js b/modules/gui/ags/modules/notifications.js similarity index 91% rename from modules/common/ags/modules/notifications.js rename to modules/gui/ags/modules/notifications.js index 9f1b3ca..7b7c155 100644 --- a/modules/common/ags/modules/notifications.js +++ b/modules/gui/ags/modules/notifications.js @@ -2,7 +2,7 @@ const notifications = await Service.import("notifications"); notifications.popupTimeout = 2000; //in seconds notifications.forceTimeout = true; //force all notifications to timeout -/** @param {import("types/widgets/icon").IconProps} props */ +/** @param {import("../types/widgets/icon").IconProps} props */ export const DNDIndicator = (props) => Widget.Icon({ visible: notifications.bind("dnd"), @@ -10,7 +10,7 @@ export const DNDIndicator = (props) => ...props, }); -/** @param {import("types/widgets/button").ButtonProps} props */ +/** @param {import("../types/widgets/button").ButtonProps} props */ export const DNDToggle = (props) => Widget.Button({ onClicked: () => { @@ -29,7 +29,7 @@ export const DNDToggle = (props) => ...props, }); -/** @param {import("types/widgets/box").BoxProps} props */ +/** @param {import("../types/widgets/box").BoxProps} props */ export const Indicator = ({ ...props }) => Widget.Box({ visible: notifications.bind("notifications").as((x) => x.length > 0), @@ -58,7 +58,7 @@ export const Indicator = ({ ...props }) => }); let old_notif = ""; -/** @param {import("types/service/notifications").Notification} param */ +/** @param {import("../types/service/notifications").Notification} param */ const NotificationIcon = ({ app_entry, app_icon, image }) => { if (image) { return Widget.Box({ @@ -107,7 +107,7 @@ import GLib from "gi://GLib"; const time = (time, format = "%H:%M") => GLib.DateTime.new_from_unix_local(time).format(format); -/** @param {import("types/service/notifications").Notification} notification */ +/** @param {import("../types/service/notifications").Notification} notification */ export const Notification = (notification) => { const content = Widget.Box({ children: [ @@ -207,7 +207,7 @@ export const Notification = (notification) => { }); }; -/** @param {import("types/widgets/scrollable").ScrollableProps} props */ +/** @param {import("../types/widgets/scrollable").ScrollableProps} props */ export const List = (props) => Widget.Scrollable({ vscroll: "automatic", @@ -222,7 +222,7 @@ export const List = (props) => ...props, }); -/** @param {import("types/widgets/box").BoxProps} props */ +/** @param {import("../types/widgets/box").BoxProps} props */ export const Placeholder = (props) => Widget.Box({ vertical: true, @@ -242,7 +242,7 @@ export const Placeholder = (props) => ...props, }); -/** @param {import("types/widgets/button").ButtonProps} props */ +/** @param {import("../types/widgets/button").ButtonProps} props */ export const ClearButton = (props) => Widget.Button({ className: "surface r20 p10", diff --git a/modules/common/ags/modules/powerprofile.js b/modules/gui/ags/modules/powerprofile.js similarity index 95% rename from modules/common/ags/modules/powerprofile.js rename to modules/gui/ags/modules/powerprofile.js index 68d2bb3..21bbfa1 100644 --- a/modules/common/ags/modules/powerprofile.js +++ b/modules/gui/ags/modules/powerprofile.js @@ -5,7 +5,7 @@ const powerProfiles = await Service.import("powerprofiles"); /** @param {string} x */ const capitalize = (x) => x.charAt(0).toUpperCase() + x.slice(1); -/** @param {Partial} props */ +/** @param {Partial} props */ export const Toggle = (props) => ArrowToggleButton({ name: "powerprofile", diff --git a/modules/common/ags/modules/systray.js b/modules/gui/ags/modules/systray.js similarity index 89% rename from modules/common/ags/modules/systray.js rename to modules/gui/ags/modules/systray.js index 8c412d6..e3d5443 100644 --- a/modules/common/ags/modules/systray.js +++ b/modules/gui/ags/modules/systray.js @@ -2,7 +2,7 @@ import { ArrowToggleButton, Menu } from "../misc/menu.js"; const systemtray = await Service.import("systemtray"); -/** @param {Partial} props */ +/** @param {Partial} props */ export const Toggle = (props) => ArrowToggleButton({ name: "systray", @@ -30,7 +30,7 @@ export const Selection = (props) => ...props, }); -/** @param {import('types/service/systemtray').TrayItem} item */ +/** @param {import('../types/service/systemtray.js').TrayItem} item */ const SysTrayItem = (item) => Widget.Button({ css: "margin: 12px;", diff --git a/modules/common/ags/services/brightness.js b/modules/gui/ags/services/brightness.js similarity index 100% rename from modules/common/ags/services/brightness.js rename to modules/gui/ags/services/brightness.js diff --git a/modules/common/ags/services/dwl.js b/modules/gui/ags/services/dwl.js similarity index 100% rename from modules/common/ags/services/dwl.js rename to modules/gui/ags/services/dwl.js diff --git a/modules/common/ags/shell.nix b/modules/gui/ags/shell.nix similarity index 100% rename from modules/common/ags/shell.nix rename to modules/gui/ags/shell.nix diff --git a/modules/common/ags/style.css b/modules/gui/ags/style.css similarity index 100% rename from modules/common/ags/style.css rename to modules/gui/ags/style.css diff --git a/modules/common/ags/tsconfig.json b/modules/gui/ags/tsconfig.json similarity index 80% rename from modules/common/ags/tsconfig.json rename to modules/gui/ags/tsconfig.json index f03f2d1..e564957 100644 --- a/modules/common/ags/tsconfig.json +++ b/modules/gui/ags/tsconfig.json @@ -9,10 +9,10 @@ "checkJs": true, "strict": true, "noImplicitAny": false, - "baseUrl": ".", + "baseUrl": "../../gui/ags", "typeRoots": [ - "./types" + "../../gui/ags/types" ], "skipLibCheck": true } -} \ No newline at end of file +} diff --git a/modules/common/ags/types b/modules/gui/ags/types similarity index 100% rename from modules/common/ags/types rename to modules/gui/ags/types diff --git a/modules/common/apps.nix b/modules/gui/apps.nix similarity index 99% rename from modules/common/apps.nix rename to modules/gui/apps.nix index 61ab148..bb7d6df 100644 --- a/modules/common/apps.nix +++ b/modules/gui/apps.nix @@ -10,6 +10,7 @@ with lib; let editor = "nvim.desktop"; pdf = "org.pwmt.zathura.desktop"; player = "mpv.desktop"; + wallpaper = pkgs.writeShellScriptBin "wallpaper" '' WALLPAPERS=~/wallpapers/ diff --git a/modules/common/ghostty.config b/modules/gui/ghostty.config similarity index 100% rename from modules/common/ghostty.config rename to modules/gui/ghostty.config diff --git a/modules/common/ghostty.nix b/modules/gui/ghostty.nix similarity index 100% rename from modules/common/ghostty.nix rename to modules/gui/ghostty.nix diff --git a/modules/common/gtk.nix b/modules/gui/gtk.nix similarity index 100% rename from modules/common/gtk.nix rename to modules/gui/gtk.nix diff --git a/modules/common/kitty.nix b/modules/gui/kitty.nix similarity index 100% rename from modules/common/kitty.nix rename to modules/gui/kitty.nix diff --git a/modules/common/rofi/colors.rasi b/modules/gui/rofi/colors.rasi similarity index 100% rename from modules/common/rofi/colors.rasi rename to modules/gui/rofi/colors.rasi diff --git a/modules/common/rofi/config.rasi b/modules/gui/rofi/config.rasi similarity index 100% rename from modules/common/rofi/config.rasi rename to modules/gui/rofi/config.rasi diff --git a/modules/common/rofi/default.nix b/modules/gui/rofi/default.nix similarity index 100% rename from modules/common/rofi/default.nix rename to modules/gui/rofi/default.nix diff --git a/modules/river/home.nix b/modules/river/home.nix index ee47333..67e1158 100644 --- a/modules/river/home.nix +++ b/modules/river/home.nix @@ -21,7 +21,7 @@ }; in { imports = [ - ../common/apps.nix + ../gui/apps.nix ]; services.cliphist.enable = true; diff --git a/modules/wsl/home.nix b/modules/wsl/home.nix index fb6d5e7..11d5758 100644 --- a/modules/wsl/home.nix +++ b/modules/wsl/home.nix @@ -1,7 +1,7 @@ {lib, ...}: { imports = [ # Install apps that I open with wslg (and tools like wl-clipboard which works) - ../common/apps.nix + ../gui/apps.nix ]; gtk.enable = lib.mkForce false;