diff --git a/flake.lock b/flake.lock index 1281ca16..99106188 100644 --- a/flake.lock +++ b/flake.lock @@ -592,11 +592,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1729905757, - "narHash": "sha256-4KlQKI/SqiF25pMr7tLZbqHXFdEeoT1KZF+b/6Af7yw=", + "lastModified": 1729957831, + "narHash": "sha256-xI4wC3/KqK+GhLVZWDzSXncLqO6vF0DXYvykXdtnCdE=", "owner": "hyprwm", "repo": "hyprland", - "rev": "0b29caf9ab86518ff474eed5e7d19c12f96ebbd0", + "rev": "c356e425008cba8bd0c87487a2c79b9be4eda2aa", "type": "github" }, "original": { @@ -700,11 +700,11 @@ ] }, "locked": { - "lastModified": 1729890296, - "narHash": "sha256-7xSf7awy/cvYPlky8Bkh69N6eZUpR8PYMH52wJPznQg=", + "lastModified": 1729967244, + "narHash": "sha256-AfgcduDOjfBCpe4vzjhiuIiRRhmi03sLaN0fX+JrZ3E=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "ae3bb0fd43d6129520ec4b1f022976e7b929dcde", + "rev": "29dd33d6a46242ec49f0145946fd7e05d6970e0d", "type": "github" }, "original": { @@ -747,6 +747,35 @@ "type": "github" } }, + "hyprsysteminfo": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1729184813, + "narHash": "sha256-ARrsIQPFCHWjVl9Sxh8tedIoEsvnV4nORaDmYCyK+kk=", + "owner": "hyprwm", + "repo": "hyprsysteminfo", + "rev": "8b271e2ba39a5a9299e4e7bb60245a71704f5a89", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprsysteminfo", + "type": "github" + } + }, "hyprutils": { "inputs": { "nixpkgs": [ @@ -1149,11 +1178,11 @@ }, "nur": { "locked": { - "lastModified": 1729953915, - "narHash": "sha256-h/YwhMlIfFJyNQmbNgkwVyBCF6j0zQAyGaKJM+451VY=", + "lastModified": 1729971220, + "narHash": "sha256-m8FayBFkRGljYTZDWygQdDqoD7ScUSm1iPi6iAvfSw0=", "owner": "nix-community", "repo": "NUR", - "rev": "3070deb34475f92fff996245f31a888ca70cfc4f", + "rev": "e51ca268e4ffb736cc9db0ef2c8bf36ef026ffdc", "type": "github" }, "original": { @@ -1230,6 +1259,7 @@ "hyprland-contrib": "hyprland-contrib", "hyprlock": "hyprlock", "hyprpaper": "hyprpaper", + "hyprsysteminfo": "hyprsysteminfo", "lanzaboote": "lanzaboote", "microfetch": "microfetch", "nix-gaming": "nix-gaming", diff --git a/flake.nix b/flake.nix index f30765f6..5001d845 100644 --- a/flake.nix +++ b/flake.nix @@ -89,6 +89,15 @@ }; }; + hyprsysteminfo = { + url = "github:hyprwm/hyprsysteminfo"; + inputs = { + hyprutils.follows = "hyprland/hyprutils"; + nixpkgs.follows = "hyprland/nixpkgs"; + systems.follows = "hyprland/systems"; + }; + }; + # Chaotic chaotic.url = "https://flakehub.com/f/chaotic-cx/nyx/*.tar.gz"; diff --git a/hosts/cnix/modules.nix b/hosts/cnix/modules.nix index 43c1f76e..e18e1ba5 100644 --- a/hosts/cnix/modules.nix +++ b/hosts/cnix/modules.nix @@ -1,6 +1,12 @@ { nixos = { boot = { + kernel = { + extraBlacklistedModules = []; + extraKernelParams = []; + hardware = "amd"; + variant = "cachyos"; + }; loader = { default = { enable = false; @@ -9,45 +15,11 @@ enable = true; }; }; - kernel = { - variant = "cachyos"; - hardware = "amd"; - extraKernelParams = []; - extraBlacklistedModules = []; - }; - }; - gaming = { - steam = { - enable = true; - }; - gamescope = { - enable = true; - }; - lutris = { - enable = true; - }; - gamemode = { - enable = true; - optimizeGpu = { - enable = true; - }; - }; - }; - gui = { - gnome = { - enable = false; - }; - hyprland = { - enable = true; - }; }; hardware = { bluetooth = { enable = true; }; - logitech = { - enable = true; - }; graphics = { amd = { enable = true; @@ -57,6 +29,9 @@ enable = false; }; }; + logitech = { + enable = true; + }; network = { enable = true; hostName = "cnix"; @@ -71,131 +46,49 @@ }; }; }; - studio = { - blender = { - enable = true; - hip = { - enable = true; - }; - }; - gimp = { - enable = true; - }; - inkscape = { - enable = true; - }; - beekeeper = { - enable = false; - }; - mysql-workbench = { - enable = false; - }; - }; - services = { - network = { - blueman = { - enable = true; - }; - mullvad = { - enable = true; - }; - samba = { - enable = false; - }; - openssh = { - enable = true; - }; - }; - security = { - agenix = { - enable = true; - cnix = { - enable = true; - }; - }; - gnome-keyring = { - enable = false; - }; - }; - session = { - dbus = { - enable = true; - }; - dconf = { - enable = true; - }; - }; - system = { - fwupd = { - enable = true; - }; - greetd = { - enable = true; - gnomeKeyring = { - enable = false; - }; - autologin = { - enable = false; - user = "cnst"; - }; - }; - gvfs = { - enable = true; - }; - locate = { - enable = true; - }; - nix-ld = { - enable = false; - }; - pcscd = { - enable = true; - }; - pipewire = { - enable = true; - }; - powerd = { - enable = true; - }; - udisks = { - enable = true; - }; - zram = { - enable = true; - }; - kanata = { - enable = true; - }; - }; - }; - system = { - devpkgs = { - enable = true; - }; - fonts = { - enable = true; - }; - locale = { - enable = true; - timeZone = "Europe/Stockholm"; - defaultLocale = "en_US.UTF-8"; - extraLocale = "sv_SE.UTF-8"; - }; - xdg = { - enable = true; - xdgOpenUsePortal = true; - }; - }; - utils = { + programs = { android = { enable = true; }; anyrun = { enable = false; }; + beekeeper = { + enable = false; + }; + blender = { + enable = true; + hip = { + enable = true; + }; + }; corectrl = { enable = true; }; + gamemode = { + enable = true; + optimizeGpu = { + enable = true; + }; + }; + gamescope = { + enable = true; + }; + gimp = { + enable = true; + }; + gnome = { + enable = false; + }; + hyprland = { + enable = true; + }; + inkscape = { + enable = true; + }; + lutris = { + enable = true; + }; microfetch = { enable = true; }; @@ -205,6 +98,9 @@ enable = true; }; }; + mysql-workbench = { + enable = false; + }; nh = { enable = true; clean = { @@ -218,6 +114,9 @@ obsidian = { enable = true; }; + steam = { + enable = true; + }; yubikey = { enable = true; }; @@ -225,5 +124,92 @@ enable = true; }; }; + services = { + agenix = { + enable = true; + cnix = { + enable = true; + }; + }; + blueman = { + enable = true; + }; + dbus = { + enable = true; + }; + dconf = { + enable = true; + }; + fwupd = { + enable = true; + }; + gnome-keyring = { + enable = false; + }; + greetd = { + autologin = { + enable = false; + user = "cnst"; + }; + enable = true; + gnomeKeyring = { + enable = false; + }; + }; + gvfs = { + enable = true; + }; + kanata = { + enable = true; + }; + locate = { + enable = true; + }; + mullvad = { + enable = true; + }; + nix-ld = { + enable = false; + }; + openssh = { + enable = true; + }; + pcscd = { + enable = true; + }; + pipewire = { + enable = true; + }; + powerd = { + enable = true; + }; + samba = { + enable = false; + }; + udisks = { + enable = true; + }; + zram = { + enable = true; + }; + }; + system = { + devpkgs = { + enable = true; + }; + fonts = { + enable = true; + }; + locale = { + defaultLocale = "en_US.UTF-8"; + enable = true; + extraLocale = "sv_SE.UTF-8"; + timeZone = "Europe/Stockholm"; + }; + xdg = { + enable = true; + xdgOpenUsePortal = true; + }; + }; }; } diff --git a/hosts/cnixpad/modules.nix b/hosts/cnixpad/modules.nix index bfbfd46c..b90541cf 100644 --- a/hosts/cnixpad/modules.nix +++ b/hosts/cnixpad/modules.nix @@ -1,6 +1,12 @@ -{pkgs, ...}: { +{ nixos = { boot = { + kernel = { + extraBlacklistedModules = []; + extraKernelParams = []; + hardware = "amd"; + variant = "stable"; + }; loader = { default = { enable = true; @@ -9,28 +15,11 @@ enable = false; }; }; - kernel = { - variant = "stable"; - hardware = "amd"; - extraKernelParams = []; - extraBlacklistedModules = []; - }; - }; - gui = { - gnome = { - enable = false; - }; - hyprland = { - enable = true; - }; }; hardware = { bluetooth = { enable = true; }; - logitech = { - enable = false; - }; graphics = { amd = { enable = true; @@ -40,6 +29,9 @@ enable = false; }; }; + logitech = { + enable = true; + }; network = { enable = true; hostName = "cnixpad"; @@ -54,126 +46,49 @@ }; }; }; - studio = { - blender = { - enable = false; - hip = { - enable = false; - }; - }; - gimp = { - enable = false; - }; - inkscape = { - enable = false; - }; - beekeeper = { - enable = false; - }; - mysql-workbench = { - enable = false; - }; - }; - services = { - network = { - blueman = { - enable = true; - }; - mullvad = { - enable = true; - }; - samba = { - enable = false; - }; - openssh = { - enable = true; - }; - }; - security = { - agenix = { - enable = true; - cnixpad = { - enable = true; - }; - }; - gnome-keyring = { - enable = true; - }; - }; - session = { - dbus = { - enable = true; - }; - dconf = { - enable = true; - }; - }; - system = { - fwupd = { - enable = true; - }; - greetd = { - enable = true; - gnomeKeyring.enable = false; - autologin = { - enable = false; - user = "cnst"; - }; - }; - gvfs = { - enable = true; - }; - locate = { - enable = true; - }; - nix-ld = { - enable = false; - }; - pipewire = { - enable = true; - }; - powerd = { - enable = true; - }; - udisks = { - enable = true; - }; - zram = { - enable = false; - }; - }; - }; - system = { - devpkgs = { - enable = true; - }; - fonts = { - enable = true; - }; - locale = { - enable = true; - timeZone = "Europe/Stockholm"; - defaultLocale = "en_US.UTF-8"; - extraLocale = "sv_SE.UTF-8"; - }; - xdg = { - enable = true; - xdgOpenUsePortal = true; - }; - }; - utils = { + programs = { android = { enable = true; }; anyrun = { enable = false; }; - brightnessctl = { - enable = true; + beekeeper = { + enable = false; + }; + blender = { + enable = false; + hip = { + enable = false; + }; }; corectrl = { enable = false; }; + gamemode = { + enable = false; + optimizeGpu = { + enable = false; + }; + }; + gamescope = { + enable = false; + }; + gimp = { + enable = false; + }; + gnome = { + enable = false; + }; + hyprland = { + enable = true; + }; + inkscape = { + enable = false; + }; + lutris = { + enable = false; + }; microfetch = { enable = true; }; @@ -183,6 +98,9 @@ enable = false; }; }; + mysql-workbench = { + enable = false; + }; nh = { enable = true; clean = { @@ -196,9 +114,102 @@ obsidian = { enable = true; }; + steam = { + enable = false; + }; + yubikey = { + enable = true; + }; zsh = { enable = true; }; }; + services = { + agenix = { + enable = true; + cnixpad = { + enable = true; + }; + }; + blueman = { + enable = true; + }; + dbus = { + enable = true; + }; + dconf = { + enable = true; + }; + fwupd = { + enable = true; + }; + gnome-keyring = { + enable = false; + }; + greetd = { + autologin = { + enable = false; + user = "cnst"; + }; + enable = true; + gnomeKeyring = { + enable = false; + }; + }; + gvfs = { + enable = true; + }; + kanata = { + enable = false; + }; + locate = { + enable = true; + }; + mullvad = { + enable = true; + }; + nix-ld = { + enable = false; + }; + openssh = { + enable = true; + }; + pcscd = { + enable = true; + }; + pipewire = { + enable = true; + }; + powerd = { + enable = true; + }; + samba = { + enable = false; + }; + udisks = { + enable = true; + }; + zram = { + enable = false; + }; + }; + system = { + devpkgs = { + enable = true; + }; + fonts = { + enable = true; + }; + locale = { + defaultLocale = "en_US.UTF-8"; + enable = true; + extraLocale = "sv_SE.UTF-8"; + timeZone = "Europe/Stockholm"; + }; + xdg = { + enable = true; + xdgOpenUsePortal = true; + }; + }; }; } diff --git a/hosts/toothpc/modules.nix b/hosts/toothpc/modules.nix index 1527a464..e5df8cc8 100644 --- a/hosts/toothpc/modules.nix +++ b/hosts/toothpc/modules.nix @@ -1,6 +1,12 @@ -{pkgs, ...}: { +{ nixos = { boot = { + kernel = { + extraBlacklistedModules = []; + extraKernelParams = []; + hardware = "nvidia"; + variant = "stable"; + }; loader = { default = { enable = false; @@ -9,54 +15,23 @@ enable = true; }; }; - kernel = { - variant = "stable"; - hardware = "nvidia"; - extraKernelParams = []; - extraBlacklistedModules = []; - }; - }; - gaming = { - steam = { - enable = true; - }; - gamescope = { - enable = true; - }; - lutris = { - enable = true; - }; - gamemode = { - enable = true; - optimizeGpu = { - enable = false; - }; - }; - }; - gui = { - gnome = { - enable = false; - }; - hyprland = { - enable = true; - }; }; hardware = { bluetooth = { enable = false; }; - logitech = { - enable = true; - }; graphics = { amd = { enable = false; }; nvidia = { enable = true; - package = "latest"; # set to beta/latest/stable/production depending on your needs + package = "latest"; }; }; + logitech = { + enable = true; + }; network = { enable = true; hostName = "toothpc"; @@ -71,127 +46,47 @@ }; }; }; - studio = { + programs = { + android = { + enable = true; + }; + anyrun = { + enable = false; + }; + beekeeper = { + enable = true; + }; blender = { enable = false; hip = { enable = false; }; }; + corectrl = { + enable = false; + }; + gamemode = { + enable = true; + optimizeGpu = { + enable = false; + }; + }; + gamescope = { + enable = false; + }; gimp = { + enable = false; + }; + gnome = { + enable = false; + }; + hyprland = { enable = true; }; inkscape = { - enable = true; - }; - beekeeper = { - enable = true; - }; - mysql-workbench = { - enable = true; - }; - }; - services = { - network = { - blueman = { - enable = false; - }; - mullvad = { - enable = true; - }; - samba = { - enable = false; - }; - openssh = { - enable = true; - }; - }; - security = { - agenix = { - enable = true; - toothpc = { - enable = true; - }; - }; - gnome-keyring = { - enable = true; - }; - }; - session = { - dbus = { - enable = true; - }; - dconf = { - enable = true; - }; - xserver = { - videoDrivers = ["nvidia"]; - xkbLayout = "se"; - }; - }; - system = { - fwupd = { - enable = true; - }; - greetd = { - enable = true; - gnomeKeyring = { - enable = false; - }; - autologin = { - enable = false; - user = "toothpick"; - }; - }; - gvfs = { - enable = true; - }; - locate = { - enable = true; - }; - nix-ld = { - enable = false; - }; - pipewire = { - enable = true; - }; - powerd = { - enable = true; - }; - udisks = { - enable = true; - }; - zram = { - enable = true; - }; - }; - }; - system = { - devpkgs = { - enable = true; - }; - fonts = { - enable = true; - }; - locale = { - enable = true; - timeZone = "Europe/Stockholm"; - defaultLocale = "en_US.UTF-8"; - extraLocale = "sv_SE.UTF-8"; - }; - xdg = { - enable = true; - xdgOpenUsePortal = true; - }; - }; - utils = { - android = { enable = false; }; - anyrun = { - enable = true; - }; - corectrl = { + lutris = { enable = false; }; microfetch = { @@ -203,6 +98,9 @@ enable = true; }; }; + mysql-workbench = { + enable = true; + }; nh = { enable = true; clean = { @@ -213,15 +111,109 @@ npm = { enable = true; }; - yubikey = { - enable = false; - }; obsidian = { - enable = false; + enable = true; + }; + steam = { + enable = true; + }; + yubikey = { + enable = true; }; zsh = { enable = true; }; }; + services = { + agenix = { + enable = true; + toothpc = { + enable = true; + }; + }; + blueman = { + enable = false; + }; + dbus = { + enable = true; + }; + dconf = { + enable = true; + }; + fwupd = { + enable = true; + }; + gnome-keyring = { + enable = false; + }; + greetd = { + autologin = { + enable = false; + user = "toothpick"; + }; + enable = true; + gnomeKeyring = { + enable = false; + }; + }; + gvfs = { + enable = true; + }; + kanata = { + enable = false; + }; + locate = { + enable = true; + }; + mullvad = { + enable = true; + }; + nix-ld = { + enable = false; + }; + openssh = { + enable = true; + }; + pcscd = { + enable = true; + }; + pipewire = { + enable = true; + }; + powerd = { + enable = true; + }; + samba = { + enable = false; + }; + udisks = { + enable = true; + }; + xserver = { + videoDrivers = ["nvidia"]; + xkbLayout = "se"; + }; + zram = { + enable = true; + }; + }; + system = { + devpkgs = { + enable = true; + }; + fonts = { + enable = true; + }; + locale = { + defaultLocale = "en_US.UTF-8"; + enable = true; + extraLocale = "sv_SE.UTF-8"; + timeZone = "Europe/Stockholm"; + }; + xdg = { + enable = true; + xdgOpenUsePortal = true; + }; + }; }; } diff --git a/modules/default.nix b/modules/default.nix index d11f847e..a0e8b9f2 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -2,69 +2,52 @@ flake.nixosModules = { home = { imports = [ - ./home/browsers/chromium - ./home/browsers/firefox - ./home/browsers/zen + ./home/programs/alacritty + ./home/programs/anyrun + ./home/programs/bash + ./home/programs/chromium + ./home/programs/discord + ./home/programs/eza + ./home/programs/firefox + ./home/programs/foot + ./home/programs/helix + ./home/programs/hyprland + ./home/programs/hyprlock + ./home/programs/jujutsu + ./home/programs/kitty + ./home/programs/misc + ./home/programs/mpv + ./home/programs/neovim + ./home/programs/rofi + ./home/programs/ssh + ./home/programs/tuirun + ./home/programs/vscode + ./home/programs/waybar + ./home/programs/wezterm + ./home/programs/yazi + ./home/programs/zathura + ./home/programs/zellij + ./home/programs/zen + ./home/programs/zsh - ./home/comm/discord - - ./home/devtools/helix - ./home/devtools/neovim - ./home/devtools/vscode - - # ./home/gaming/steam - # ./home/gaming/mangohud - # ./home/gaming/lutris - - ./home/cli/alacritty - ./home/cli/bash - ./home/cli/foot - ./home/cli/jujutsu - ./home/cli/kitty - ./home/cli/wezterm - ./home/cli/zellij - ./home/cli/zsh - - ./home/userd/blueman-applet - ./home/userd/copyq - ./home/userd/dconf - ./home/userd/gpg - ./home/userd/gtk - ./home/userd/mako - ./home/userd/polkit - ./home/userd/syncthing - ./home/userd/udiskie - ./home/userd/xdg - - ./home/utils/anyrun - ./home/utils/eza - ./home/utils/misc - ./home/utils/mpv - ./home/utils/rofi - ./home/utils/ssh - ./home/utils/tuirun - ./home/utils/waybar - ./home/utils/yazi - ./home/utils/zathura - - ./home/wm/hyprland - ./home/wm/utils/hypridle - ./home/wm/utils/hyprlock - ./home/wm/utils/hyprpaper + ./home/services/blueman-applet + ./home/services/copyq + ./home/services/dconf + ./home/services/gpg + ./home/services/gtk + ./home/services/hypridle + ./home/services/hyprpaper + ./home/services/mako + ./home/services/polkit + ./home/services/syncthing + ./home/services/udiskie + ./home/services/xdg ]; }; nixos = { imports = [ - ./nixos/boot/loader ./nixos/boot/kernel - - ./nixos/gaming/gamemode - ./nixos/gaming/gamescope - ./nixos/gaming/lutris - ./nixos/gaming/steam - - ./nixos/gui/gnome - ./nixos/gui/hyprland + ./nixos/boot/loader ./nixos/hardware/bluetooth ./nixos/hardware/graphics/amd @@ -72,52 +55,54 @@ ./nixos/hardware/logitech ./nixos/hardware/network - ./nixos/studio/blender - ./nixos/studio/gimp - ./nixos/studio/inkscape - ./nixos/studio/beekeeper - ./nixos/studio/mysql-workbench + ./nixos/programs/android + ./nixos/programs/anyrun + ./nixos/programs/beekeeper + ./nixos/programs/blender + ./nixos/programs/brightnessctl + ./nixos/programs/corectrl + ./nixos/programs/gamemode + ./nixos/programs/gamescope + ./nixos/programs/gimp + ./nixos/programs/gnome + ./nixos/programs/hyprland + ./nixos/programs/inkscape + ./nixos/programs/lutris + ./nixos/programs/microfetch + ./nixos/programs/misc + ./nixos/programs/mysql-workbench + ./nixos/programs/nh + ./nixos/programs/npm + ./nixos/programs/obsidian + ./nixos/programs/steam + ./nixos/programs/yubikey + ./nixos/programs/zsh - ./nixos/services/network/blueman - ./nixos/services/network/mullvad - ./nixos/services/network/samba - ./nixos/services/network/openssh - - ./nixos/services/security/agenix - ./nixos/services/security/gnome-keyring - - ./nixos/services/session/dbus - ./nixos/services/session/dconf - ./nixos/services/session/xserver - - ./nixos/services/system/fwupd - ./nixos/services/system/greetd - ./nixos/services/system/gvfs - ./nixos/services/system/locate - ./nixos/services/system/nix-ld - ./nixos/services/system/pcscd - ./nixos/services/system/pipewire - ./nixos/services/system/powerd - ./nixos/services/system/udisks - ./nixos/services/system/zram - ./nixos/services/system/kanata + ./nixos/services/agenix + ./nixos/services/blueman + ./nixos/services/dbus + ./nixos/services/dconf + ./nixos/services/fwupd + ./nixos/services/gnome-keyring + ./nixos/services/greetd + ./nixos/services/gvfs + ./nixos/services/kanata + ./nixos/services/locate + ./nixos/services/mullvad + ./nixos/services/nix-ld + ./nixos/services/openssh + ./nixos/services/pcscd + ./nixos/services/pipewire + ./nixos/services/powerd + ./nixos/services/samba + ./nixos/services/udisks + ./nixos/services/xserver + ./nixos/services/zram ./nixos/system/devpkgs ./nixos/system/fonts ./nixos/system/locale ./nixos/system/xdg - - ./nixos/utils/android - ./nixos/utils/anyrun - ./nixos/utils/brightnessctl - ./nixos/utils/corectrl - ./nixos/utils/microfetch - ./nixos/utils/misc - ./nixos/utils/nh - ./nixos/utils/npm - ./nixos/utils/obsidian - ./nixos/utils/yubikey - ./nixos/utils/zsh ]; }; options = { diff --git a/modules/home/cli/alacritty/default.nix b/modules/home/programs/alacritty/default.nix similarity index 94% rename from modules/home/cli/alacritty/default.nix rename to modules/home/programs/alacritty/default.nix index 791d480e..8a93a370 100644 --- a/modules/home/cli/alacritty/default.nix +++ b/modules/home/programs/alacritty/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.home.cli.alacritty; + cfg = config.home.programs.alacritty; in { options = { - home.cli.alacritty.enable = mkEnableOption "Enables firefox"; + home.programs.alacritty.enable = mkEnableOption "Enables firefox"; }; config = mkIf cfg.enable { programs.alacritty = { diff --git a/modules/home/utils/anyrun/default.nix b/modules/home/programs/anyrun/default.nix similarity index 75% rename from modules/home/utils/anyrun/default.nix rename to modules/home/programs/anyrun/default.nix index e0a87c5d..1d5361aa 100644 --- a/modules/home/utils/anyrun/default.nix +++ b/modules/home/programs/anyrun/default.nix @@ -5,13 +5,13 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.home.utils.anyrun; + cfg = config.home.programs.anyrun; in { imports = [ inputs.anyrun.homeManagerModules.default ]; options = { - home.utils.anyrun.enable = mkEnableOption "Enables anyrun"; + home.programs.anyrun.enable = mkEnableOption "Enables anyrun"; }; config = mkIf cfg.enable { programs.anyrun = { diff --git a/modules/home/cli/bash/default.nix b/modules/home/programs/bash/default.nix similarity index 64% rename from modules/home/cli/bash/default.nix rename to modules/home/programs/bash/default.nix index aa300488..cb2acb23 100644 --- a/modules/home/cli/bash/default.nix +++ b/modules/home/programs/bash/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.home.cli.bash; + cfg = config.home.programs.bash; in { options = { - home.cli.bash.enable = mkEnableOption "Enables bash"; + home.programs.bash.enable = mkEnableOption "Enables bash"; }; config = mkIf cfg.enable { programs.bash = { diff --git a/modules/home/browsers/chromium/default.nix b/modules/home/programs/chromium/default.nix similarity index 83% rename from modules/home/browsers/chromium/default.nix rename to modules/home/programs/chromium/default.nix index ec27b901..dbea5db1 100644 --- a/modules/home/browsers/chromium/default.nix +++ b/modules/home/programs/chromium/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.home.browsers.chromium; + cfg = config.home.programs.chromium; in { options = { - home.browsers.chromium.enable = mkEnableOption "Enables chromium"; + home.programs.chromium.enable = mkEnableOption "Enables chromium"; }; config = mkIf cfg.enable { programs.chromium = { diff --git a/modules/home/comm/discord/default.nix b/modules/home/programs/discord/default.nix similarity index 93% rename from modules/home/comm/discord/default.nix rename to modules/home/programs/discord/default.nix index 59843e2c..e9fce91e 100644 --- a/modules/home/comm/discord/default.nix +++ b/modules/home/programs/discord/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.home.comm.discord; + cfg = config.home.programs.discord; in { options = { - home.comm.discord.enable = mkEnableOption "Enables discord"; + home.programs.discord.enable = mkEnableOption "Enables discord"; }; config = mkIf cfg.enable { home.packages = with pkgs; [vesktop]; diff --git a/modules/home/utils/eza/default.nix b/modules/home/programs/eza/default.nix similarity index 78% rename from modules/home/utils/eza/default.nix rename to modules/home/programs/eza/default.nix index 5674b11c..1777d443 100644 --- a/modules/home/utils/eza/default.nix +++ b/modules/home/programs/eza/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.home.utils.eza; + cfg = config.home.programs.eza; in { options = { - home.utils.eza.enable = mkEnableOption "Enables eza"; + home.programs.eza.enable = mkEnableOption "Enables eza"; }; config = mkIf cfg.enable { programs.eza = { diff --git a/modules/home/browsers/firefox/default.nix b/modules/home/programs/firefox/default.nix similarity index 91% rename from modules/home/browsers/firefox/default.nix rename to modules/home/programs/firefox/default.nix index cb56d247..6009556d 100644 --- a/modules/home/browsers/firefox/default.nix +++ b/modules/home/programs/firefox/default.nix @@ -6,13 +6,13 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.home.browsers.firefox; + cfg = config.home.programs.firefox; in { imports = [ inputs.nur.hmModules.nur ]; options = { - home.browsers.firefox.enable = mkEnableOption "Enables firefox"; + home.programs.firefox.enable = mkEnableOption "Enables firefox"; }; config = mkIf cfg.enable { programs.firefox = { diff --git a/modules/home/cli/foot/default.nix b/modules/home/programs/foot/default.nix similarity index 93% rename from modules/home/cli/foot/default.nix rename to modules/home/programs/foot/default.nix index e66f85f5..509ff485 100644 --- a/modules/home/cli/foot/default.nix +++ b/modules/home/programs/foot/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.home.cli.foot; + cfg = config.home.programs.foot; in { options = { - home.cli.foot.enable = mkEnableOption "Enables foot cli"; + home.programs.foot.enable = mkEnableOption "Enables foot programs"; }; config = mkIf cfg.enable { programs.foot = { @@ -21,7 +21,7 @@ in { # term=foot (or xterm-256color if built with -Dterminfo=disabled) # login-shell=no - # app-id=foot # globally set wayland app-id. Default values are "foot" and "footclient" for desktop and server mode + # app-id=foot # globally set wayland app-id. Default values are "foot" and "footprogramsent" for desktop and server mode # title=foot # locked-title=no @@ -136,7 +136,7 @@ in { # font= # color= # hide-when-maximized=no - # double-click-to-maximize=yes + # double-programsck-to-maximize=yes # border-width=0 # border-color= # button-width=26 @@ -155,21 +155,21 @@ in { # scrollback-down-line=none # scrollback-home=none # scrollback-end=none - # clipboard-copy=Control+Shift+c XF86Copy - # clipboard-paste=Control+Shift+v XF86Paste + # programspboard-copy=Control+Shift+c XF86Copy + # programspboard-paste=Control+Shift+v XF86Paste # primary-paste=Shift+Insert # search-start=Control+Shift+r # font-increase=Control+plus Control+equal Control+KP_Add # font-decrease=Control+minus Control+KP_Subtract # font-reset=Control+0 Control+KP_0 - # spawn-cli=Control+Shift+n + # spawn-programs=Control+Shift+n # minimize=none # maximize=none # fullscreen=none # pipe-visible=[sh -c "xurls | fuzzel | xargs -r firefox"] none # pipe-scrollback=[sh -c "xurls | fuzzel | xargs -r firefox"] none # pipe-selected=[xargs -r firefox] none - # pipe-command-output=[wl-copy] none # Copy last command's output to the clipboard + # pipe-command-output=[wl-copy] none # Copy last command's output to the programspboard # show-urls-launch=Control+Shift+o # show-urls-copy=none # show-urls-persistent=none @@ -202,7 +202,7 @@ in { # extend-backward-to-word-boundary=Control+Shift+Left # extend-backward-to-next-whitespace=none # extend-line-up=Shift+Up - # clipboard-paste=Control+v Control+Shift+v Control+y XF86Paste + # programspboard-paste=Control+v Control+Shift+v Control+y XF86Paste # primary-paste=Shift+Insert # unicode-input=none # quit=none diff --git a/modules/home/devtools/helix/default.nix b/modules/home/programs/helix/default.nix similarity index 97% rename from modules/home/devtools/helix/default.nix rename to modules/home/programs/helix/default.nix index 5e680a06..55034d8f 100644 --- a/modules/home/devtools/helix/default.nix +++ b/modules/home/programs/helix/default.nix @@ -6,7 +6,7 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.home.devtools.helix; + cfg = config.home.programs.helix; in { imports = [ ./lang.nix @@ -14,7 +14,7 @@ in { ]; options = { - home.devtools.helix.enable = mkEnableOption "Enable helix"; + home.programs.helix.enable = mkEnableOption "Enable helix"; }; config = mkIf cfg.enable { diff --git a/modules/home/devtools/helix/lang.nix b/modules/home/programs/helix/lang.nix similarity index 100% rename from modules/home/devtools/helix/lang.nix rename to modules/home/programs/helix/lang.nix diff --git a/modules/home/devtools/helix/theme.nix b/modules/home/programs/helix/theme.nix similarity index 100% rename from modules/home/devtools/helix/theme.nix rename to modules/home/programs/helix/theme.nix diff --git a/modules/home/wm/hyprland/toothpick/appearance.nix b/modules/home/programs/hyprland/cnst/appearance.nix similarity index 90% rename from modules/home/wm/hyprland/toothpick/appearance.nix rename to modules/home/programs/hyprland/cnst/appearance.nix index e8937d63..2af1bb56 100644 --- a/modules/home/wm/hyprland/toothpick/appearance.nix +++ b/modules/home/programs/hyprland/cnst/appearance.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.home.wm.hyprland.toothpick.appearance; + cfg = config.home.programs.hyprland.cnst.appearance; in { options = { - home.wm.hyprland.toothpick.appearance.enable = mkEnableOption "Enables appearance settings in Hyprland"; + home.programs.hyprland.cnst.appearance.enable = mkEnableOption "Enables appearance settings in Hyprland"; }; config = mkIf cfg.enable { wayland.windowManager.hyprland.settings = { diff --git a/modules/home/wm/hyprland/cnst/default.nix b/modules/home/programs/hyprland/cnst/default.nix similarity index 64% rename from modules/home/wm/hyprland/cnst/default.nix rename to modules/home/programs/hyprland/cnst/default.nix index 22831ecf..bcac9877 100644 --- a/modules/home/wm/hyprland/cnst/default.nix +++ b/modules/home/programs/hyprland/cnst/default.nix @@ -7,22 +7,22 @@ ... }: let inherit (lib) mkIf mkEnableOption mkDefault; - cfg = config.home.wm.hyprland.cnst; + cfg = config.home.programs.hyprland.cnst; in { imports = [ - "${umodPath}/wm/hyprland/cnst/appearance.nix" - "${umodPath}/wm/hyprland/cnst/inputs.nix" - "${umodPath}/wm/hyprland/cnst/keybinds.nix" - "${umodPath}/wm/hyprland/cnst/rules.nix" - "${umodPath}/wm/hyprland/cnst/startup.nix" + "${umodPath}/programs/hyprland/cnst/appearance.nix" + "${umodPath}/programs/hyprland/cnst/inputs.nix" + "${umodPath}/programs/hyprland/cnst/keybinds.nix" + "${umodPath}/programs/hyprland/cnst/rules.nix" + "${umodPath}/programs/hyprland/cnst/startup.nix" ]; options = { - home.wm.hyprland.cnst.enable = mkEnableOption "Enable Hyprland"; + home.programs.hyprland.cnst.enable = mkEnableOption "Enable Hyprland"; }; config = mkIf cfg.enable { - home.wm.hyprland.cnst = { + home.programs.hyprland.cnst = { appearance.enable = mkDefault cfg.enable; inputs.enable = mkDefault cfg.enable; keybinds.enable = mkDefault cfg.enable; diff --git a/modules/home/wm/hyprland/cnst/inputs.nix b/modules/home/programs/hyprland/cnst/inputs.nix similarity index 93% rename from modules/home/wm/hyprland/cnst/inputs.nix rename to modules/home/programs/hyprland/cnst/inputs.nix index 70a1b057..9f95df4d 100644 --- a/modules/home/wm/hyprland/cnst/inputs.nix +++ b/modules/home/programs/hyprland/cnst/inputs.nix @@ -9,10 +9,10 @@ if osConfig.networking.hostName == "cnixpad" then "ctrl:swapcaps" else ""; - cfg = config.home.wm.hyprland.cnst.inputs; + cfg = config.home.programs.hyprland.cnst.inputs; in { options = { - home.wm.hyprland.cnst.inputs.enable = mkEnableOption "Enables input settings in Hyprland"; + home.programs.hyprland.cnst.inputs.enable = mkEnableOption "Enables input settings in Hyprland"; }; config = mkIf cfg.enable { wayland.windowManager.hyprland.settings = { diff --git a/modules/home/wm/hyprland/cnst/keybinds.nix b/modules/home/programs/hyprland/cnst/keybinds.nix similarity index 96% rename from modules/home/wm/hyprland/cnst/keybinds.nix rename to modules/home/programs/hyprland/cnst/keybinds.nix index 436a39c5..ad426129 100644 --- a/modules/home/wm/hyprland/cnst/keybinds.nix +++ b/modules/home/programs/hyprland/cnst/keybinds.nix @@ -14,10 +14,10 @@ if osConfig.networking.hostName == "cnixpad" then "foot" else "alacritty"; - cfg = config.home.wm.hyprland.cnst.keybinds; + cfg = config.home.programs.hyprland.cnst.keybinds; in { options = { - home.wm.hyprland.cnst.keybinds.enable = mkEnableOption "Enables keybind settings in Hyprland"; + home.programs.hyprland.cnst.keybinds.enable = mkEnableOption "Enables keybind settings in Hyprland"; }; config = mkIf cfg.enable { wayland.windowManager.hyprland.settings = { diff --git a/modules/home/wm/hyprland/cnst/rules.nix b/modules/home/programs/hyprland/cnst/rules.nix similarity index 92% rename from modules/home/wm/hyprland/cnst/rules.nix rename to modules/home/programs/hyprland/cnst/rules.nix index 92780b29..710dd4ca 100644 --- a/modules/home/wm/hyprland/cnst/rules.nix +++ b/modules/home/programs/hyprland/cnst/rules.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.home.wm.hyprland.cnst.rules; + cfg = config.home.programs.hyprland.cnst.rules; in { options = { - home.wm.hyprland.cnst.rules.enable = mkEnableOption "Enables window rule settings in Hyprland"; + home.programs.hyprland.cnst.rules.enable = mkEnableOption "Enables window rule settings in Hyprland"; }; config = mkIf cfg.enable { diff --git a/modules/home/wm/hyprland/cnst/startup.nix b/modules/home/programs/hyprland/cnst/startup.nix similarity index 85% rename from modules/home/wm/hyprland/cnst/startup.nix rename to modules/home/programs/hyprland/cnst/startup.nix index 454e0bf4..8701d0f9 100644 --- a/modules/home/wm/hyprland/cnst/startup.nix +++ b/modules/home/programs/hyprland/cnst/startup.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.home.wm.hyprland.cnst.startup; + cfg = config.home.programs.hyprland.cnst.startup; in { options = { - home.wm.hyprland.cnst.startup.enable = mkEnableOption "Enables startup settings in Hyprland"; + home.programs.hyprland.cnst.startup.enable = mkEnableOption "Enables startup settings in Hyprland"; }; config = mkIf cfg.enable { wayland.windowManager.hyprland.settings = { diff --git a/modules/home/programs/hyprland/default.nix b/modules/home/programs/hyprland/default.nix new file mode 100644 index 00000000..e456108d --- /dev/null +++ b/modules/home/programs/hyprland/default.nix @@ -0,0 +1,6 @@ +{umodPath, ...}: { + imports = [ + "${umodPath}/programs/hyprland/cnst" + "${umodPath}/programs/hyprland/toothpick" + ]; +} diff --git a/modules/home/wm/hyprland/cnst/appearance.nix b/modules/home/programs/hyprland/toothpick/appearance.nix similarity index 89% rename from modules/home/wm/hyprland/cnst/appearance.nix rename to modules/home/programs/hyprland/toothpick/appearance.nix index bf821566..f2d0ed85 100644 --- a/modules/home/wm/hyprland/cnst/appearance.nix +++ b/modules/home/programs/hyprland/toothpick/appearance.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.home.wm.hyprland.cnst.appearance; + cfg = config.home.programs.hyprland.toothpick.appearance; in { options = { - home.wm.hyprland.cnst.appearance.enable = mkEnableOption "Enables appearance settings in Hyprland"; + home.programs.hyprland.toothpick.appearance.enable = mkEnableOption "Enables appearance settings in Hyprland"; }; config = mkIf cfg.enable { wayland.windowManager.hyprland.settings = { diff --git a/modules/home/wm/hyprland/toothpick/default.nix b/modules/home/programs/hyprland/toothpick/default.nix similarity index 62% rename from modules/home/wm/hyprland/toothpick/default.nix rename to modules/home/programs/hyprland/toothpick/default.nix index 711d1ea0..2a52b9b7 100644 --- a/modules/home/wm/hyprland/toothpick/default.nix +++ b/modules/home/programs/hyprland/toothpick/default.nix @@ -7,22 +7,22 @@ ... }: let inherit (lib) mkIf mkEnableOption mkDefault; - cfg = config.home.wm.hyprland.toothpick; + cfg = config.home.programs.hyprland.toothpick; in { imports = [ - "${umodPath}/wm/hyprland/toothpick/appearance.nix" - "${umodPath}/wm/hyprland/toothpick/inputs.nix" - "${umodPath}/wm/hyprland/toothpick/keybinds.nix" - "${umodPath}/wm/hyprland/toothpick/rules.nix" - "${umodPath}/wm/hyprland/toothpick/startup.nix" + "${umodPath}/programs/hyprland/toothpick/appearance.nix" + "${umodPath}/programs/hyprland/toothpick/inputs.nix" + "${umodPath}/programs/hyprland/toothpick/keybinds.nix" + "${umodPath}/programs/hyprland/toothpick/rules.nix" + "${umodPath}/programs/hyprland/toothpick/startup.nix" ]; options = { - home.wm.hyprland.toothpick.enable = mkEnableOption "Enable Hyprland"; + home.programs.hyprland.toothpick.enable = mkEnableOption "Enable Hyprland"; }; config = mkIf cfg.enable { - home.wm.hyprland.toothpick = { + home.programs.hyprland.toothpick = { appearance.enable = mkDefault cfg.enable; inputs.enable = mkDefault cfg.enable; keybinds.enable = mkDefault cfg.enable; diff --git a/modules/home/wm/hyprland/toothpick/inputs.nix b/modules/home/programs/hyprland/toothpick/inputs.nix similarity index 92% rename from modules/home/wm/hyprland/toothpick/inputs.nix rename to modules/home/programs/hyprland/toothpick/inputs.nix index 26beb914..f4564c35 100644 --- a/modules/home/wm/hyprland/toothpick/inputs.nix +++ b/modules/home/programs/hyprland/toothpick/inputs.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.home.wm.hyprland.toothpick.inputs; + cfg = config.home.programs.hyprland.toothpick.inputs; in { options = { - home.wm.hyprland.toothpick.inputs.enable = mkEnableOption "Enables input settings in Hyprland"; + home.programs.hyprland.toothpick.inputs.enable = mkEnableOption "Enables input settings in Hyprland"; }; config = mkIf cfg.enable { wayland.windowManager.hyprland.settings = { diff --git a/modules/home/wm/hyprland/toothpick/keybinds.nix b/modules/home/programs/hyprland/toothpick/keybinds.nix similarity index 96% rename from modules/home/wm/hyprland/toothpick/keybinds.nix rename to modules/home/programs/hyprland/toothpick/keybinds.nix index bd2b00a1..744f3927 100644 --- a/modules/home/wm/hyprland/toothpick/keybinds.nix +++ b/modules/home/programs/hyprland/toothpick/keybinds.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.home.wm.hyprland.toothpick.keybinds; + cfg = config.home.programs.hyprland.toothpick.keybinds; in { options = { - home.wm.hyprland.toothpick.keybinds.enable = mkEnableOption "Enables keybind settings in Hyprland"; + home.programs.hyprland.toothpick.keybinds.enable = mkEnableOption "Enables keybind settings in Hyprland"; }; config = mkIf cfg.enable { wayland.windowManager.hyprland.settings = { diff --git a/modules/home/wm/hyprland/toothpick/rules.nix b/modules/home/programs/hyprland/toothpick/rules.nix similarity index 92% rename from modules/home/wm/hyprland/toothpick/rules.nix rename to modules/home/programs/hyprland/toothpick/rules.nix index 7371caaf..b0fbdb2b 100644 --- a/modules/home/wm/hyprland/toothpick/rules.nix +++ b/modules/home/programs/hyprland/toothpick/rules.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.home.wm.hyprland.toothpick.rules; + cfg = config.home.programs.hyprland.toothpick.rules; in { options = { - home.wm.hyprland.toothpick.rules.enable = mkEnableOption "Enables window rule settings in Hyprland"; + home.programs.hyprland.toothpick.rules.enable = mkEnableOption "Enables window rule settings in Hyprland"; }; config = mkIf cfg.enable { wayland.windowManager.hyprland.settings = { diff --git a/modules/home/wm/hyprland/toothpick/startup.nix b/modules/home/programs/hyprland/toothpick/startup.nix similarity index 83% rename from modules/home/wm/hyprland/toothpick/startup.nix rename to modules/home/programs/hyprland/toothpick/startup.nix index 305f976a..75329ed4 100644 --- a/modules/home/wm/hyprland/toothpick/startup.nix +++ b/modules/home/programs/hyprland/toothpick/startup.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.home.wm.hyprland.toothpick.startup; + cfg = config.home.programs.hyprland.toothpick.startup; in { options = { - home.wm.hyprland.toothpick.startup.enable = mkEnableOption "Enables startup settings in Hyprland"; + home.programs.hyprland.toothpick.startup.enable = mkEnableOption "Enables startup settings in Hyprland"; }; config = mkIf cfg.enable { wayland.windowManager.hyprland.settings = { diff --git a/modules/home/wm/utils/hyprlock/default.nix b/modules/home/programs/hyprlock/default.nix similarity index 95% rename from modules/home/wm/utils/hyprlock/default.nix rename to modules/home/programs/hyprlock/default.nix index 4804344a..200c53e1 100644 --- a/modules/home/wm/utils/hyprlock/default.nix +++ b/modules/home/programs/hyprlock/default.nix @@ -6,13 +6,13 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.home.wm.utils.hyprlock; + cfg = config.home.programs.hyprlock; hyprlockFlake = inputs.hyprlock.packages.${pkgs.system}.hyprlock; # hyprlockPkg = pkgs.hyprlock; in { options = { - home.wm.utils.hyprlock.enable = mkEnableOption "Enables hyprlock"; + home.programs.hyprlock.enable = mkEnableOption "Enables hyprlock"; }; config = mkIf cfg.enable { programs.hyprlock = { diff --git a/modules/home/cli/jujutsu/default.nix b/modules/home/programs/jujutsu/default.nix similarity index 91% rename from modules/home/cli/jujutsu/default.nix rename to modules/home/programs/jujutsu/default.nix index 23245ca4..cdf6fb0d 100644 --- a/modules/home/cli/jujutsu/default.nix +++ b/modules/home/programs/jujutsu/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.home.cli.jujutsu; + cfg = config.home.programs.jujutsu; in { options = { - home.cli.jujutsu.enable = mkEnableOption "Enables jujutsu"; + home.programs.jujutsu.enable = mkEnableOption "Enables jujutsu"; }; config = mkIf cfg.enable { programs.jujutsu = { diff --git a/modules/home/cli/kitty/default.nix b/modules/home/programs/kitty/default.nix similarity index 91% rename from modules/home/cli/kitty/default.nix rename to modules/home/programs/kitty/default.nix index 99d7fc15..14d12bf4 100644 --- a/modules/home/cli/kitty/default.nix +++ b/modules/home/programs/kitty/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.home.cli.kitty; + cfg = config.home.programs.kitty; in { options = { - home.cli.kitty.enable = mkEnableOption "Enables kitty cli"; + home.programs.kitty.enable = mkEnableOption "Enables kitty programs"; }; config = mkIf cfg.enable { programs.kitty = { @@ -22,7 +22,7 @@ in { bold_italic_font = "auto"; font_size = "11.0"; cursor_blink_interval = 0; - copy_on_select = "clipboard"; + copy_on_select = "programspboard"; background_opacity = "0.95"; background_blur = "32"; window_padding_width = 3; @@ -47,8 +47,8 @@ in { extraConfig = '' kitty_mod shift+ctrl map kitty_mod+q close_tab - map ctrl+shift+c copy_to_clipboard - map ctrl+shift+v paste_from_clipboard + map ctrl+shift+c copy_to_programspboard + map ctrl+shift+v paste_from_programspboard tab_separator "" tab_title_template "{fmt.fg._504945}{fmt.bg.default}▓{fmt.fg._282828}{fmt.bg.default}{index}{fmt.fg._282828}{fmt.bg._504945} {title[:15] + (title[15:] and '…')} {fmt.fg._504945}{fmt.bg.default}▓ " active_tab_title_template "{fmt.fg._282828}{fmt.bg.default}▓{fmt.fg._A89984}{fmt.bg._282828}{fmt.fg._A89984}{fmt.bg._282828} {title[:40] + (title[40:] and '…')} {fmt.fg._282828}{fmt.bg.default}▓ " diff --git a/modules/home/gaming/lutris/default.nix b/modules/home/programs/lutris/default.nix similarity index 76% rename from modules/home/gaming/lutris/default.nix rename to modules/home/programs/lutris/default.nix index 8cb9cb34..ae936548 100644 --- a/modules/home/gaming/lutris/default.nix +++ b/modules/home/programs/lutris/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.home.gaming.lutris; + cfg = config.home.programs.lutris; in { options = { - home.gaming.lutris.enable = mkEnableOption "Enables lutris"; + home.programs.lutris.enable = mkEnableOption "Enables lutris"; }; config = mkIf cfg.enable { home.packages = [ diff --git a/modules/home/gaming/mangohud/default.nix b/modules/home/programs/mangohud/default.nix similarity index 67% rename from modules/home/gaming/mangohud/default.nix rename to modules/home/programs/mangohud/default.nix index 82e5558a..eed5fb0c 100644 --- a/modules/home/gaming/mangohud/default.nix +++ b/modules/home/programs/mangohud/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.home.gaming.mangohud; + cfg = config.home.programs.mangohud; in { options = { - home.gaming.mangohud.enable = mkEnableOption "Enables mangohud"; + home.programs.mangohud.enable = mkEnableOption "Enables mangohud"; }; config = mkIf cfg.enable { programs.mangohud = { diff --git a/modules/home/utils/misc/default.nix b/modules/home/programs/misc/default.nix similarity index 92% rename from modules/home/utils/misc/default.nix rename to modules/home/programs/misc/default.nix index aae3801b..809ed3d2 100644 --- a/modules/home/utils/misc/default.nix +++ b/modules/home/programs/misc/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.home.utils.misc; + cfg = config.home.programs.misc; in { options = { - home.utils.misc.enable = mkEnableOption "Enables miscellaneous utility apps"; + home.programs.misc.enable = mkEnableOption "Enables miscellaneous utility apps"; }; config = mkIf cfg.enable { programs = { diff --git a/modules/home/utils/mpv/default.nix b/modules/home/programs/mpv/default.nix similarity index 73% rename from modules/home/utils/mpv/default.nix rename to modules/home/programs/mpv/default.nix index dedc36c3..e5e39690 100644 --- a/modules/home/utils/mpv/default.nix +++ b/modules/home/programs/mpv/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.home.utils.mpv; + cfg = config.home.programs.mpv; in { options = { - home.utils.mpv.enable = mkEnableOption "Enables mpv"; + home.programs.mpv.enable = mkEnableOption "Enables mpv"; }; config = mkIf cfg.enable { programs.mpv = { diff --git a/modules/home/devtools/neovim/default.nix b/modules/home/programs/neovim/default.nix similarity index 97% rename from modules/home/devtools/neovim/default.nix rename to modules/home/programs/neovim/default.nix index 44fdf73b..88e79d4e 100644 --- a/modules/home/devtools/neovim/default.nix +++ b/modules/home/programs/neovim/default.nix @@ -5,7 +5,7 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.home.devtools.neovim; + cfg = config.home.programs.neovim; in { imports = [ ./plugins @@ -15,7 +15,7 @@ in { ]; options = { - home.devtools.neovim.enable = mkEnableOption "Enable neovim"; + home.programs.neovim.enable = mkEnableOption "Enable neovim"; }; config = mkIf cfg.enable { diff --git a/modules/home/devtools/neovim/keybindings.nix b/modules/home/programs/neovim/keybindings.nix similarity index 100% rename from modules/home/devtools/neovim/keybindings.nix rename to modules/home/programs/neovim/keybindings.nix diff --git a/modules/home/devtools/neovim/lsp.nix b/modules/home/programs/neovim/lsp.nix similarity index 100% rename from modules/home/devtools/neovim/lsp.nix rename to modules/home/programs/neovim/lsp.nix diff --git a/modules/home/devtools/neovim/plugins/alpha.nix b/modules/home/programs/neovim/plugins/alpha.nix similarity index 100% rename from modules/home/devtools/neovim/plugins/alpha.nix rename to modules/home/programs/neovim/plugins/alpha.nix diff --git a/modules/home/devtools/neovim/plugins/autopairs.nix b/modules/home/programs/neovim/plugins/autopairs.nix similarity index 100% rename from modules/home/devtools/neovim/plugins/autopairs.nix rename to modules/home/programs/neovim/plugins/autopairs.nix diff --git a/modules/home/devtools/neovim/plugins/bqf.nix b/modules/home/programs/neovim/plugins/bqf.nix similarity index 100% rename from modules/home/devtools/neovim/plugins/bqf.nix rename to modules/home/programs/neovim/plugins/bqf.nix diff --git a/modules/home/devtools/neovim/plugins/bufferline.nix b/modules/home/programs/neovim/plugins/bufferline.nix similarity index 100% rename from modules/home/devtools/neovim/plugins/bufferline.nix rename to modules/home/programs/neovim/plugins/bufferline.nix diff --git a/modules/home/devtools/neovim/plugins/colorizer.nix b/modules/home/programs/neovim/plugins/colorizer.nix similarity index 100% rename from modules/home/devtools/neovim/plugins/colorizer.nix rename to modules/home/programs/neovim/plugins/colorizer.nix diff --git a/modules/home/devtools/neovim/plugins/comment.nix b/modules/home/programs/neovim/plugins/comment.nix similarity index 100% rename from modules/home/devtools/neovim/plugins/comment.nix rename to modules/home/programs/neovim/plugins/comment.nix diff --git a/modules/home/devtools/neovim/plugins/conform.nix b/modules/home/programs/neovim/plugins/conform.nix similarity index 100% rename from modules/home/devtools/neovim/plugins/conform.nix rename to modules/home/programs/neovim/plugins/conform.nix diff --git a/modules/home/devtools/neovim/plugins/copilot.nix b/modules/home/programs/neovim/plugins/copilot.nix similarity index 100% rename from modules/home/devtools/neovim/plugins/copilot.nix rename to modules/home/programs/neovim/plugins/copilot.nix diff --git a/modules/home/devtools/neovim/plugins/default.nix b/modules/home/programs/neovim/plugins/default.nix similarity index 100% rename from modules/home/devtools/neovim/plugins/default.nix rename to modules/home/programs/neovim/plugins/default.nix diff --git a/modules/home/devtools/neovim/plugins/fidget.nix b/modules/home/programs/neovim/plugins/fidget.nix similarity index 100% rename from modules/home/devtools/neovim/plugins/fidget.nix rename to modules/home/programs/neovim/plugins/fidget.nix diff --git a/modules/home/devtools/neovim/plugins/fugitive.nix b/modules/home/programs/neovim/plugins/fugitive.nix similarity index 100% rename from modules/home/devtools/neovim/plugins/fugitive.nix rename to modules/home/programs/neovim/plugins/fugitive.nix diff --git a/modules/home/devtools/neovim/plugins/gitsigns.nix b/modules/home/programs/neovim/plugins/gitsigns.nix similarity index 100% rename from modules/home/devtools/neovim/plugins/gitsigns.nix rename to modules/home/programs/neovim/plugins/gitsigns.nix diff --git a/modules/home/devtools/neovim/plugins/gx.nix b/modules/home/programs/neovim/plugins/gx.nix similarity index 100% rename from modules/home/devtools/neovim/plugins/gx.nix rename to modules/home/programs/neovim/plugins/gx.nix diff --git a/modules/home/devtools/neovim/plugins/lualine.nix b/modules/home/programs/neovim/plugins/lualine.nix similarity index 100% rename from modules/home/devtools/neovim/plugins/lualine.nix rename to modules/home/programs/neovim/plugins/lualine.nix diff --git a/modules/home/devtools/neovim/plugins/none-ls.nix b/modules/home/programs/neovim/plugins/none-ls.nix similarity index 100% rename from modules/home/devtools/neovim/plugins/none-ls.nix rename to modules/home/programs/neovim/plugins/none-ls.nix diff --git a/modules/home/devtools/neovim/plugins/oil.nix b/modules/home/programs/neovim/plugins/oil.nix similarity index 100% rename from modules/home/devtools/neovim/plugins/oil.nix rename to modules/home/programs/neovim/plugins/oil.nix diff --git a/modules/home/devtools/neovim/plugins/plenary.nix b/modules/home/programs/neovim/plugins/plenary.nix similarity index 100% rename from modules/home/devtools/neovim/plugins/plenary.nix rename to modules/home/programs/neovim/plugins/plenary.nix diff --git a/modules/home/devtools/neovim/plugins/range-highlight.nix b/modules/home/programs/neovim/plugins/range-highlight.nix similarity index 100% rename from modules/home/devtools/neovim/plugins/range-highlight.nix rename to modules/home/programs/neovim/plugins/range-highlight.nix diff --git a/modules/home/devtools/neovim/plugins/treesitter.nix b/modules/home/programs/neovim/plugins/treesitter.nix similarity index 100% rename from modules/home/devtools/neovim/plugins/treesitter.nix rename to modules/home/programs/neovim/plugins/treesitter.nix diff --git a/modules/home/devtools/neovim/plugins/web-devicons.nix b/modules/home/programs/neovim/plugins/web-devicons.nix similarity index 100% rename from modules/home/devtools/neovim/plugins/web-devicons.nix rename to modules/home/programs/neovim/plugins/web-devicons.nix diff --git a/modules/home/devtools/neovim/plugins/which-key.nix b/modules/home/programs/neovim/plugins/which-key.nix similarity index 100% rename from modules/home/devtools/neovim/plugins/which-key.nix rename to modules/home/programs/neovim/plugins/which-key.nix diff --git a/modules/home/devtools/neovim/syntaxes.nix b/modules/home/programs/neovim/syntaxes.nix similarity index 100% rename from modules/home/devtools/neovim/syntaxes.nix rename to modules/home/programs/neovim/syntaxes.nix diff --git a/modules/home/devtools/nixvim/autocmd.nix b/modules/home/programs/nixvim/autocmd.nix similarity index 100% rename from modules/home/devtools/nixvim/autocmd.nix rename to modules/home/programs/nixvim/autocmd.nix diff --git a/modules/home/devtools/nixvim/completion.nix b/modules/home/programs/nixvim/completion.nix similarity index 100% rename from modules/home/devtools/nixvim/completion.nix rename to modules/home/programs/nixvim/completion.nix diff --git a/modules/home/devtools/nixvim/default.nix b/modules/home/programs/nixvim/default.nix similarity index 91% rename from modules/home/devtools/nixvim/default.nix rename to modules/home/programs/nixvim/default.nix index fb7e63d3..09415bd9 100644 --- a/modules/home/devtools/nixvim/default.nix +++ b/modules/home/programs/nixvim/default.nix @@ -6,7 +6,7 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.home.devtools.nixvim; + cfg = config.home.programs.nixvim; in { imports = [ inputs.nixvim.homeManagerModules.nixvim @@ -18,7 +18,7 @@ in { ]; options = { - home.devtools.nixvim.enable = mkEnableOption "Enable nixvim"; + home.programs.nixvim.enable = mkEnableOption "Enable nixvim"; }; config = mkIf cfg.enable { diff --git a/modules/home/devtools/nixvim/keymap.nix b/modules/home/programs/nixvim/keymap.nix similarity index 100% rename from modules/home/devtools/nixvim/keymap.nix rename to modules/home/programs/nixvim/keymap.nix diff --git a/modules/home/devtools/nixvim/options.nix b/modules/home/programs/nixvim/options.nix similarity index 100% rename from modules/home/devtools/nixvim/options.nix rename to modules/home/programs/nixvim/options.nix diff --git a/modules/home/devtools/nixvim/plugins/barbar.nix b/modules/home/programs/nixvim/plugins/barbar.nix similarity index 100% rename from modules/home/devtools/nixvim/plugins/barbar.nix rename to modules/home/programs/nixvim/plugins/barbar.nix diff --git a/modules/home/devtools/nixvim/plugins/cmp.nix b/modules/home/programs/nixvim/plugins/cmp.nix similarity index 100% rename from modules/home/devtools/nixvim/plugins/cmp.nix rename to modules/home/programs/nixvim/plugins/cmp.nix diff --git a/modules/home/devtools/nixvim/plugins/comment.nix b/modules/home/programs/nixvim/plugins/comment.nix similarity index 100% rename from modules/home/devtools/nixvim/plugins/comment.nix rename to modules/home/programs/nixvim/plugins/comment.nix diff --git a/modules/home/devtools/nixvim/plugins/conform.nix b/modules/home/programs/nixvim/plugins/conform.nix similarity index 100% rename from modules/home/devtools/nixvim/plugins/conform.nix rename to modules/home/programs/nixvim/plugins/conform.nix diff --git a/modules/home/devtools/nixvim/plugins/copilot.nix b/modules/home/programs/nixvim/plugins/copilot.nix similarity index 100% rename from modules/home/devtools/nixvim/plugins/copilot.nix rename to modules/home/programs/nixvim/plugins/copilot.nix diff --git a/modules/home/devtools/nixvim/plugins/default.nix b/modules/home/programs/nixvim/plugins/default.nix similarity index 100% rename from modules/home/devtools/nixvim/plugins/default.nix rename to modules/home/programs/nixvim/plugins/default.nix diff --git a/modules/home/devtools/nixvim/plugins/efm.nix b/modules/home/programs/nixvim/plugins/efm.nix similarity index 100% rename from modules/home/devtools/nixvim/plugins/efm.nix rename to modules/home/programs/nixvim/plugins/efm.nix diff --git a/modules/home/devtools/nixvim/plugins/floaterm.nix b/modules/home/programs/nixvim/plugins/floaterm.nix similarity index 100% rename from modules/home/devtools/nixvim/plugins/floaterm.nix rename to modules/home/programs/nixvim/plugins/floaterm.nix diff --git a/modules/home/devtools/nixvim/plugins/harpoon.nix b/modules/home/programs/nixvim/plugins/harpoon.nix similarity index 100% rename from modules/home/devtools/nixvim/plugins/harpoon.nix rename to modules/home/programs/nixvim/plugins/harpoon.nix diff --git a/modules/home/devtools/nixvim/plugins/lightline.nix b/modules/home/programs/nixvim/plugins/lightline.nix similarity index 100% rename from modules/home/devtools/nixvim/plugins/lightline.nix rename to modules/home/programs/nixvim/plugins/lightline.nix diff --git a/modules/home/devtools/nixvim/plugins/lsp-format.nix b/modules/home/programs/nixvim/plugins/lsp-format.nix similarity index 100% rename from modules/home/devtools/nixvim/plugins/lsp-format.nix rename to modules/home/programs/nixvim/plugins/lsp-format.nix diff --git a/modules/home/devtools/nixvim/plugins/lsp.nix b/modules/home/programs/nixvim/plugins/lsp.nix similarity index 100% rename from modules/home/devtools/nixvim/plugins/lsp.nix rename to modules/home/programs/nixvim/plugins/lsp.nix diff --git a/modules/home/devtools/nixvim/plugins/lualine.nix b/modules/home/programs/nixvim/plugins/lualine.nix similarity index 100% rename from modules/home/devtools/nixvim/plugins/lualine.nix rename to modules/home/programs/nixvim/plugins/lualine.nix diff --git a/modules/home/devtools/nixvim/plugins/markdown-preview.nix b/modules/home/programs/nixvim/plugins/markdown-preview.nix similarity index 100% rename from modules/home/devtools/nixvim/plugins/markdown-preview.nix rename to modules/home/programs/nixvim/plugins/markdown-preview.nix diff --git a/modules/home/devtools/nixvim/plugins/neo-tree.nix b/modules/home/programs/nixvim/plugins/neo-tree.nix similarity index 100% rename from modules/home/devtools/nixvim/plugins/neo-tree.nix rename to modules/home/programs/nixvim/plugins/neo-tree.nix diff --git a/modules/home/devtools/nixvim/plugins/nonels.nix b/modules/home/programs/nixvim/plugins/nonels.nix similarity index 100% rename from modules/home/devtools/nixvim/plugins/nonels.nix rename to modules/home/programs/nixvim/plugins/nonels.nix diff --git a/modules/home/devtools/nixvim/plugins/rustaceanvim.nix b/modules/home/programs/nixvim/plugins/rustaceanvim.nix similarity index 100% rename from modules/home/devtools/nixvim/plugins/rustaceanvim.nix rename to modules/home/programs/nixvim/plugins/rustaceanvim.nix diff --git a/modules/home/devtools/nixvim/plugins/startify.nix b/modules/home/programs/nixvim/plugins/startify.nix similarity index 100% rename from modules/home/devtools/nixvim/plugins/startify.nix rename to modules/home/programs/nixvim/plugins/startify.nix diff --git a/modules/home/devtools/nixvim/plugins/tagbar.nix b/modules/home/programs/nixvim/plugins/tagbar.nix similarity index 100% rename from modules/home/devtools/nixvim/plugins/tagbar.nix rename to modules/home/programs/nixvim/plugins/tagbar.nix diff --git a/modules/home/devtools/nixvim/plugins/telescope.nix b/modules/home/programs/nixvim/plugins/telescope.nix similarity index 100% rename from modules/home/devtools/nixvim/plugins/telescope.nix rename to modules/home/programs/nixvim/plugins/telescope.nix diff --git a/modules/home/devtools/nixvim/plugins/treesitter.nix b/modules/home/programs/nixvim/plugins/treesitter.nix similarity index 100% rename from modules/home/devtools/nixvim/plugins/treesitter.nix rename to modules/home/programs/nixvim/plugins/treesitter.nix diff --git a/modules/home/devtools/nixvim/plugins/vimtex.nix b/modules/home/programs/nixvim/plugins/vimtex.nix similarity index 100% rename from modules/home/devtools/nixvim/plugins/vimtex.nix rename to modules/home/programs/nixvim/plugins/vimtex.nix diff --git a/modules/home/devtools/nixvim/plugins/yanky.nix b/modules/home/programs/nixvim/plugins/yanky.nix similarity index 100% rename from modules/home/devtools/nixvim/plugins/yanky.nix rename to modules/home/programs/nixvim/plugins/yanky.nix diff --git a/modules/home/devtools/nixvim/todo.nix b/modules/home/programs/nixvim/todo.nix similarity index 100% rename from modules/home/devtools/nixvim/todo.nix rename to modules/home/programs/nixvim/todo.nix diff --git a/modules/home/utils/rofi/default.nix b/modules/home/programs/rofi/default.nix similarity index 76% rename from modules/home/utils/rofi/default.nix rename to modules/home/programs/rofi/default.nix index e4afb706..60124420 100644 --- a/modules/home/utils/rofi/default.nix +++ b/modules/home/programs/rofi/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.home.utils.rofi; + cfg = config.home.programs.rofi; in { options = { - home.utils.rofi.enable = mkEnableOption "Enables firefox"; + home.programs.rofi.enable = mkEnableOption "Enables firefox"; }; config = mkIf cfg.enable { programs.rofi = { diff --git a/modules/home/utils/ssh/default.nix b/modules/home/programs/ssh/default.nix similarity index 70% rename from modules/home/utils/ssh/default.nix rename to modules/home/programs/ssh/default.nix index 34a9ed13..91dcaecd 100644 --- a/modules/home/utils/ssh/default.nix +++ b/modules/home/programs/ssh/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.home.utils.ssh; + cfg = config.home.programs.ssh; in { options = { - home.utils.ssh.enable = mkEnableOption "Enables ssh"; + home.programs.ssh.enable = mkEnableOption "Enables ssh"; }; config = mkIf cfg.enable { programs.ssh = { diff --git a/modules/home/gaming/steam/default.nix b/modules/home/programs/steam/default.nix similarity index 93% rename from modules/home/gaming/steam/default.nix rename to modules/home/programs/steam/default.nix index f3f728b5..dc6a7d69 100644 --- a/modules/home/gaming/steam/default.nix +++ b/modules/home/programs/steam/default.nix @@ -6,7 +6,7 @@ ... }: let inherit (lib) mkIf mkEnableOption concatStringsSep head filter getExe; - cfg = config.home.gaming.steam; + cfg = config.home.programs.steam; steam-with-pkgs = pkgs.steam.override { extraPkgs = pkgs: with pkgs; [ @@ -52,7 +52,7 @@ ''; in { options = { - home.gaming.steam.enable = mkEnableOption "Enables steam"; + home.programs.steam.enable = mkEnableOption "Enables steam"; }; config = { home.packages = mkIf cfg.enable [ diff --git a/modules/home/utils/tuirun/default.nix b/modules/home/programs/tuirun/default.nix similarity index 86% rename from modules/home/utils/tuirun/default.nix rename to modules/home/programs/tuirun/default.nix index 90a8e394..e3d68bb8 100644 --- a/modules/home/utils/tuirun/default.nix +++ b/modules/home/programs/tuirun/default.nix @@ -6,13 +6,13 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.home.utils.tuirun; + cfg = config.home.programs.tuirun; in { imports = [ inputs.tuirun.homeManagerModules.default ]; options = { - home.utils.tuirun.enable = mkEnableOption "Enables tuirun"; + home.programs.tuirun.enable = mkEnableOption "Enables tuirun"; }; config = mkIf cfg.enable { programs.tuirun = { diff --git a/modules/home/devtools/vscode/default.nix b/modules/home/programs/vscode/default.nix similarity index 64% rename from modules/home/devtools/vscode/default.nix rename to modules/home/programs/vscode/default.nix index 25aefb45..321d56ec 100644 --- a/modules/home/devtools/vscode/default.nix +++ b/modules/home/programs/vscode/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.home.devtools.vscode; + cfg = config.home.programs.vscode; in { options = { - home.devtools.vscode.enable = mkEnableOption "Enables vscode"; + home.programs.vscode.enable = mkEnableOption "Enables vscode"; }; config = mkIf cfg.enable { programs.vscode = { diff --git a/modules/home/utils/waybar/default.nix b/modules/home/programs/waybar/default.nix similarity index 75% rename from modules/home/utils/waybar/default.nix rename to modules/home/programs/waybar/default.nix index 85f1869a..e55c12c9 100644 --- a/modules/home/utils/waybar/default.nix +++ b/modules/home/programs/waybar/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.home.utils.waybar; + cfg = config.home.programs.waybar; in { options = { - home.utils.waybar.enable = mkEnableOption "Enables waybar"; + home.programs.waybar.enable = mkEnableOption "Enables waybar"; }; config = mkIf cfg.enable { systemd.user.services.waybar = { diff --git a/modules/home/cli/wezterm/default.nix b/modules/home/programs/wezterm/default.nix similarity index 94% rename from modules/home/cli/wezterm/default.nix rename to modules/home/programs/wezterm/default.nix index 8d4b342c..81a5f630 100644 --- a/modules/home/cli/wezterm/default.nix +++ b/modules/home/programs/wezterm/default.nix @@ -9,10 +9,10 @@ weztermPkg = pkgs.wezterm; # weztermFlake = inputs.wezterm.packages.${pkgs.system}.default; inherit (lib) mkIf mkEnableOption; - cfg = config.home.cli.wezterm; + cfg = config.home.programs.wezterm; in { options = { - home.cli.wezterm.enable = mkEnableOption "Enables wezterm cli"; + home.programs.wezterm.enable = mkEnableOption "Enables wezterm programs"; }; config = mkIf cfg.enable { programs.wezterm = { diff --git a/modules/home/utils/yazi/default.nix b/modules/home/programs/yazi/default.nix similarity index 89% rename from modules/home/utils/yazi/default.nix rename to modules/home/programs/yazi/default.nix index 5f8a3579..4d21d708 100644 --- a/modules/home/utils/yazi/default.nix +++ b/modules/home/programs/yazi/default.nix @@ -5,14 +5,14 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.home.utils.yazi; + cfg = config.home.programs.yazi; in { imports = [ ./theme ]; options = { - home.utils.yazi.enable = mkEnableOption "Enables yazi"; + home.programs.yazi.enable = mkEnableOption "Enables yazi"; }; config = mkIf cfg.enable { programs.yazi = { diff --git a/modules/home/utils/yazi/theme/default.nix b/modules/home/programs/yazi/theme/default.nix similarity index 100% rename from modules/home/utils/yazi/theme/default.nix rename to modules/home/programs/yazi/theme/default.nix diff --git a/modules/home/utils/yazi/theme/filetype.nix b/modules/home/programs/yazi/theme/filetype.nix similarity index 100% rename from modules/home/utils/yazi/theme/filetype.nix rename to modules/home/programs/yazi/theme/filetype.nix diff --git a/modules/home/utils/yazi/theme/help.nix b/modules/home/programs/yazi/theme/help.nix similarity index 100% rename from modules/home/utils/yazi/theme/help.nix rename to modules/home/programs/yazi/theme/help.nix diff --git a/modules/home/utils/yazi/theme/icons.nix b/modules/home/programs/yazi/theme/icons.nix similarity index 100% rename from modules/home/utils/yazi/theme/icons.nix rename to modules/home/programs/yazi/theme/icons.nix diff --git a/modules/home/utils/yazi/theme/input.nix b/modules/home/programs/yazi/theme/input.nix similarity index 100% rename from modules/home/utils/yazi/theme/input.nix rename to modules/home/programs/yazi/theme/input.nix diff --git a/modules/home/utils/yazi/theme/manager.nix b/modules/home/programs/yazi/theme/manager.nix similarity index 100% rename from modules/home/utils/yazi/theme/manager.nix rename to modules/home/programs/yazi/theme/manager.nix diff --git a/modules/home/utils/yazi/theme/select.nix b/modules/home/programs/yazi/theme/select.nix similarity index 100% rename from modules/home/utils/yazi/theme/select.nix rename to modules/home/programs/yazi/theme/select.nix diff --git a/modules/home/utils/yazi/theme/status.nix b/modules/home/programs/yazi/theme/status.nix similarity index 100% rename from modules/home/utils/yazi/theme/status.nix rename to modules/home/programs/yazi/theme/status.nix diff --git a/modules/home/utils/yazi/theme/tasks.nix b/modules/home/programs/yazi/theme/tasks.nix similarity index 100% rename from modules/home/utils/yazi/theme/tasks.nix rename to modules/home/programs/yazi/theme/tasks.nix diff --git a/modules/home/utils/yazi/theme/which.nix b/modules/home/programs/yazi/theme/which.nix similarity index 100% rename from modules/home/utils/yazi/theme/which.nix rename to modules/home/programs/yazi/theme/which.nix diff --git a/modules/home/utils/zathura/default.nix b/modules/home/programs/zathura/default.nix similarity index 94% rename from modules/home/utils/zathura/default.nix rename to modules/home/programs/zathura/default.nix index d311c349..21946b3b 100644 --- a/modules/home/utils/zathura/default.nix +++ b/modules/home/programs/zathura/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.home.utils.zathura; + cfg = config.home.programs.zathura; in { options = { - home.utils.zathura.enable = mkEnableOption "Enables zathura"; + home.programs.zathura.enable = mkEnableOption "Enables zathura"; }; config = mkIf cfg.enable { programs.zathura = { diff --git a/modules/home/cli/zellij/default.nix b/modules/home/programs/zellij/default.nix similarity index 95% rename from modules/home/cli/zellij/default.nix rename to modules/home/programs/zellij/default.nix index 0ab7bb9e..cb9d5fae 100644 --- a/modules/home/cli/zellij/default.nix +++ b/modules/home/programs/zellij/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.home.cli.zellij; + cfg = config.home.programs.zellij; in { options = { - home.cli.zellij.enable = mkEnableOption "Enables zellij"; + home.programs.zellij.enable = mkEnableOption "Enables zellij"; }; config = mkIf cfg.enable { programs.zellij = { diff --git a/modules/home/browsers/zen/default.nix b/modules/home/programs/zen/default.nix similarity index 70% rename from modules/home/browsers/zen/default.nix rename to modules/home/programs/zen/default.nix index 197f462a..4bc35e3d 100644 --- a/modules/home/browsers/zen/default.nix +++ b/modules/home/programs/zen/default.nix @@ -6,10 +6,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.home.browsers.zen; + cfg = config.home.programs.zen; in { options = { - home.browsers.zen.enable = mkEnableOption "Enables zen browser"; + home.programs.zen.enable = mkEnableOption "Enables zen browser"; }; config = mkIf cfg.enable { home.packages = [ diff --git a/modules/home/cli/zsh/default.nix b/modules/home/programs/zsh/default.nix similarity index 96% rename from modules/home/cli/zsh/default.nix rename to modules/home/programs/zsh/default.nix index eb6acabf..f8ee8106 100644 --- a/modules/home/cli/zsh/default.nix +++ b/modules/home/programs/zsh/default.nix @@ -5,12 +5,12 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.home.cli.zsh; + cfg = config.home.programs.zsh; inherit (lib.meta) getExe; inherit (pkgs) eza bat; in { options = { - home.cli.zsh.enable = mkEnableOption "Enables zsh home configuration"; + home.programs.zsh.enable = mkEnableOption "Enables zsh home configuration"; }; config = mkIf cfg.enable { programs.zsh = { diff --git a/modules/home/userd/blueman-applet/default.nix b/modules/home/services/blueman-applet/default.nix similarity index 59% rename from modules/home/userd/blueman-applet/default.nix rename to modules/home/services/blueman-applet/default.nix index 9c27f606..0441350e 100644 --- a/modules/home/userd/blueman-applet/default.nix +++ b/modules/home/services/blueman-applet/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.home.userd.blueman-applet; + cfg = config.home.services.blueman-applet; in { options = { - home.userd.blueman-applet.enable = mkEnableOption "Enables blueman-applet"; + home.services.blueman-applet.enable = mkEnableOption "Enables blueman-applet"; }; config = mkIf cfg.enable { services.blueman-applet = { diff --git a/modules/home/userd/copyq/default.nix b/modules/home/services/copyq/default.nix similarity index 64% rename from modules/home/userd/copyq/default.nix rename to modules/home/services/copyq/default.nix index c866bc2f..71a1c152 100644 --- a/modules/home/userd/copyq/default.nix +++ b/modules/home/services/copyq/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.home.userd.copyq; + cfg = config.home.services.copyq; in { options = { - home.userd.copyq.enable = mkEnableOption "Enables copyq"; + home.services.copyq.enable = mkEnableOption "Enables copyq"; }; config = mkIf cfg.enable { services.copyq = { diff --git a/modules/home/userd/dconf/default.nix b/modules/home/services/dconf/default.nix similarity index 77% rename from modules/home/userd/dconf/default.nix rename to modules/home/services/dconf/default.nix index 648845f4..2cc076c1 100644 --- a/modules/home/userd/dconf/default.nix +++ b/modules/home/services/dconf/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) types mkOption; - cfg = config.home.userd.dconf; + cfg = config.home.services.dconf; in { options = { - home.userd.dconf.settings.color-scheme = mkOption { + home.services.dconf.settings.color-scheme = mkOption { type = types.str; default = "prefer-dark"; }; diff --git a/modules/home/userd/gpg/default.nix b/modules/home/services/gpg/default.nix similarity index 69% rename from modules/home/userd/gpg/default.nix rename to modules/home/services/gpg/default.nix index 003c09fa..ec829661 100644 --- a/modules/home/userd/gpg/default.nix +++ b/modules/home/services/gpg/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.home.userd.gpg; + cfg = config.home.services.gpg; in { options = { - home.userd.gpg.enable = mkEnableOption "Enables gpg"; + home.services.gpg.enable = mkEnableOption "Enables gpg"; }; config = mkIf cfg.enable { services.gpg-agent = { diff --git a/modules/home/userd/gtk/default.nix b/modules/home/services/gtk/default.nix similarity index 95% rename from modules/home/userd/gtk/default.nix rename to modules/home/services/gtk/default.nix index 010f37c5..d3ae1cfc 100644 --- a/modules/home/userd/gtk/default.nix +++ b/modules/home/services/gtk/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.home.userd.gtk; + cfg = config.home.services.gtk; in { options = { - home.userd.gtk.enable = mkEnableOption "Enables miscellaneous GTK elements"; + home.services.gtk.enable = mkEnableOption "Enables miscellaneous GTK elements"; }; config = mkIf cfg.enable { home = { diff --git a/modules/home/userd/gtk/wip.nix b/modules/home/services/gtk/wip.nix similarity index 100% rename from modules/home/userd/gtk/wip.nix rename to modules/home/services/gtk/wip.nix diff --git a/modules/home/wm/utils/hypridle/default.nix b/modules/home/services/hypridle/default.nix similarity index 88% rename from modules/home/wm/utils/hypridle/default.nix rename to modules/home/services/hypridle/default.nix index a7da742b..607e30b3 100644 --- a/modules/home/wm/utils/hypridle/default.nix +++ b/modules/home/services/hypridle/default.nix @@ -6,13 +6,13 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.home.wm.utils.hypridle; + cfg = config.home.services.hypridle; hypridleFlake = inputs.hypridle.packages.${pkgs.system}.hypridle; # hypridlePkg = pkgs.hypridle; in { options = { - home.wm.utils.hypridle.enable = mkEnableOption "Enables hypridle"; + home.services.hypridle.enable = mkEnableOption "Enables hypridle"; }; config = mkIf cfg.enable { services.hypridle = { diff --git a/modules/home/wm/utils/hyprpaper/default.nix b/modules/home/services/hyprpaper/default.nix similarity index 92% rename from modules/home/wm/utils/hyprpaper/default.nix rename to modules/home/services/hyprpaper/default.nix index d0b206f8..ea71abf3 100644 --- a/modules/home/wm/utils/hyprpaper/default.nix +++ b/modules/home/services/hyprpaper/default.nix @@ -6,13 +6,13 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.home.wm.utils.hyprpaper; + cfg = config.home.services.hyprpaper; hyprpaperFlake = inputs.hyprpaper.packages.${pkgs.system}.default; # hyprpaperPkg = pkgs.hyprpaper; in { options = { - home.wm.utils.hyprpaper.enable = mkEnableOption "Enables hyprpaper"; + home.services.hyprpaper.enable = mkEnableOption "Enables hyprpaper"; }; config = mkIf cfg.enable { services.hyprpaper = { diff --git a/modules/home/userd/mako/default.nix b/modules/home/services/mako/default.nix similarity index 88% rename from modules/home/userd/mako/default.nix rename to modules/home/services/mako/default.nix index 4894841f..b751fda0 100644 --- a/modules/home/userd/mako/default.nix +++ b/modules/home/services/mako/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.home.userd.mako; + cfg = config.home.services.mako; in { options = { - home.userd.mako.enable = mkEnableOption "Enables mako"; + home.services.mako.enable = mkEnableOption "Enables mako"; }; config = mkIf cfg.enable { services.mako = { diff --git a/modules/home/userd/polkit/default.nix b/modules/home/services/polkit/default.nix similarity index 86% rename from modules/home/userd/polkit/default.nix rename to modules/home/services/polkit/default.nix index 27471212..58b23b37 100644 --- a/modules/home/userd/polkit/default.nix +++ b/modules/home/services/polkit/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.home.userd.polkit; + cfg = config.home.services.polkit; in { options = { - home.userd.polkit.enable = mkEnableOption "Enables polkit"; + home.services.polkit.enable = mkEnableOption "Enables polkit"; }; config = mkIf cfg.enable { systemd.user.services.polkit-gnome-authentication-agent-1 = { diff --git a/modules/home/userd/syncthing/default.nix b/modules/home/services/syncthing/default.nix similarity index 65% rename from modules/home/userd/syncthing/default.nix rename to modules/home/services/syncthing/default.nix index d4f79735..df0a91fa 100644 --- a/modules/home/userd/syncthing/default.nix +++ b/modules/home/services/syncthing/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.home.userd.syncthing; + cfg = config.home.services.syncthing; in { options = { - home.userd.syncthing.enable = mkEnableOption "Enables syncthing"; + home.services.syncthing.enable = mkEnableOption "Enables syncthing"; }; config = mkIf cfg.enable { services.syncthing = { diff --git a/modules/home/userd/udiskie/default.nix b/modules/home/services/udiskie/default.nix similarity index 67% rename from modules/home/userd/udiskie/default.nix rename to modules/home/services/udiskie/default.nix index 39380232..62c43119 100644 --- a/modules/home/userd/udiskie/default.nix +++ b/modules/home/services/udiskie/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.home.userd.udiskie; + cfg = config.home.services.udiskie; in { options = { - home.userd.udiskie.enable = mkEnableOption "Enables udiskie"; + home.services.udiskie.enable = mkEnableOption "Enables udiskie"; }; config = mkIf cfg.enable { services.udiskie = { diff --git a/modules/home/userd/xdg/default.nix b/modules/home/services/xdg/default.nix similarity index 96% rename from modules/home/userd/xdg/default.nix rename to modules/home/services/xdg/default.nix index 14b7307e..e1ac350d 100644 --- a/modules/home/userd/xdg/default.nix +++ b/modules/home/services/xdg/default.nix @@ -9,10 +9,10 @@ if elem osConfig.networking.hostName ["cnix" "cnixpad"] then "zen.desktop" else "firefox.desktop"; - cfg = config.home.userd.xdg; + cfg = config.home.services.xdg; in { options = { - home.userd.xdg.enable = mkEnableOption "Enables XDG settings"; + home.services.xdg.enable = mkEnableOption "Enables XDG settings"; }; config = mkIf cfg.enable { xdg = { diff --git a/modules/home/wm/hyprland/default.nix b/modules/home/wm/hyprland/default.nix deleted file mode 100644 index a0ec09ac..00000000 --- a/modules/home/wm/hyprland/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{umodPath, ...}: { - imports = [ - "${umodPath}/wm/hyprland/cnst" - "${umodPath}/wm/hyprland/toothpick" - ]; -} diff --git a/modules/nixos/utils/android/default.nix b/modules/nixos/programs/android/default.nix similarity index 58% rename from modules/nixos/utils/android/default.nix rename to modules/nixos/programs/android/default.nix index 2098237d..97d089f0 100644 --- a/modules/nixos/utils/android/default.nix +++ b/modules/nixos/programs/android/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.nixos.utils.android; + cfg = config.nixos.programs.android; in { options = { - nixos.utils.android.enable = mkEnableOption "Enables android tools"; + nixos.programs.android.enable = mkEnableOption "Enables android tools"; }; config = mkIf cfg.enable { programs.adb.enable = true; diff --git a/modules/nixos/utils/anyrun/default.nix b/modules/nixos/programs/anyrun/default.nix similarity index 65% rename from modules/nixos/utils/anyrun/default.nix rename to modules/nixos/programs/anyrun/default.nix index 886b45b3..c4bbfe3a 100644 --- a/modules/nixos/utils/anyrun/default.nix +++ b/modules/nixos/programs/anyrun/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.nixos.utils.anyrun; + cfg = config.nixos.programs.anyrun; in { options = { - nixos.utils.anyrun.enable = mkEnableOption "Enables anyrun"; + nixos.programs.anyrun.enable = mkEnableOption "Enables anyrun"; }; config = mkIf cfg.enable { environment.systemPackages = [ diff --git a/modules/nixos/studio/beekeeper/default.nix b/modules/nixos/programs/beekeeper/default.nix similarity index 63% rename from modules/nixos/studio/beekeeper/default.nix rename to modules/nixos/programs/beekeeper/default.nix index 25bc0e8a..4e1e63f2 100644 --- a/modules/nixos/studio/beekeeper/default.nix +++ b/modules/nixos/programs/beekeeper/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.nixos.studio.beekeeper; + cfg = config.nixos.programs.beekeeper; in { options = { - nixos.studio.beekeeper.enable = mkEnableOption "Enables Beekeeper Studio"; + nixos.programs.beekeeper.enable = mkEnableOption "Enables Beekeeper Studio"; }; config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ diff --git a/modules/nixos/studio/blender/default.nix b/modules/nixos/programs/blender/default.nix similarity index 88% rename from modules/nixos/studio/blender/default.nix rename to modules/nixos/programs/blender/default.nix index b8b7ae36..63a0cdbc 100644 --- a/modules/nixos/studio/blender/default.nix +++ b/modules/nixos/programs/blender/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption mkOption; - cfg = config.nixos.studio.blender; + cfg = config.nixos.programs.blender; in { options = { - nixos.studio.blender = { + nixos.programs.blender = { enable = mkEnableOption "Enables Blender"; hip.enable = mkOption { type = lib.types.bool; diff --git a/modules/nixos/utils/brightnessctl/default.nix b/modules/nixos/programs/brightnessctl/default.nix similarity index 61% rename from modules/nixos/utils/brightnessctl/default.nix rename to modules/nixos/programs/brightnessctl/default.nix index 552eee65..dba7df1a 100644 --- a/modules/nixos/utils/brightnessctl/default.nix +++ b/modules/nixos/programs/brightnessctl/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.nixos.utils.brightnessctl; + cfg = config.nixos.programs.brightnessctl; in { options = { - nixos.utils.brightnessctl.enable = mkEnableOption "Enables brigthnessctl"; + nixos.programs.brightnessctl.enable = mkEnableOption "Enables brigthnessctl"; }; config = mkIf cfg.enable { environment.systemPackages = [ diff --git a/modules/nixos/utils/corectrl/default.nix b/modules/nixos/programs/corectrl/default.nix similarity index 71% rename from modules/nixos/utils/corectrl/default.nix rename to modules/nixos/programs/corectrl/default.nix index 8e645249..e8d91ece 100644 --- a/modules/nixos/utils/corectrl/default.nix +++ b/modules/nixos/programs/corectrl/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.nixos.utils.corectrl; + cfg = config.nixos.programs.corectrl; in { options = { - nixos.utils.corectrl.enable = mkEnableOption "Enables CoreCtrl"; + nixos.programs.corectrl.enable = mkEnableOption "Enables CoreCtrl"; }; config = mkIf cfg.enable { programs.corectrl = { diff --git a/modules/nixos/gaming/gamemode/default.nix b/modules/nixos/programs/gamemode/default.nix similarity index 94% rename from modules/nixos/gaming/gamemode/default.nix rename to modules/nixos/programs/gamemode/default.nix index 8ef19543..96b32c12 100644 --- a/modules/nixos/gaming/gamemode/default.nix +++ b/modules/nixos/programs/gamemode/default.nix @@ -6,14 +6,14 @@ ... }: let inherit (lib) mkIf mkEnableOption mkOption; - cfg = config.nixos.gaming.gamemode; + cfg = config.nixos.programs.gamemode; pipewireLowLatencyModule = inputs.nix-gaming.nixosModules.pipewireLowLatency; in { imports = [ pipewireLowLatencyModule ]; options = { - nixos.gaming.gamemode = { + nixos.programs.gamemode = { enable = mkEnableOption "Enables gamemode"; optimizeGpu.enable = mkOption { type = lib.types.bool; diff --git a/modules/nixos/gaming/gamescope/default.nix b/modules/nixos/programs/gamescope/default.nix similarity index 70% rename from modules/nixos/gaming/gamescope/default.nix rename to modules/nixos/programs/gamescope/default.nix index 877c2055..8e54566f 100644 --- a/modules/nixos/gaming/gamescope/default.nix +++ b/modules/nixos/programs/gamescope/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.nixos.gaming.gamescope; + cfg = config.nixos.programs.gamescope; in { options = { - nixos.gaming.gamescope.enable = mkEnableOption "Enables gamescope"; + nixos.programs.gamescope.enable = mkEnableOption "Enables gamescope"; }; config = mkIf cfg.enable { programs.gamescope = { diff --git a/modules/nixos/studio/gimp/default.nix b/modules/nixos/programs/gimp/default.nix similarity index 67% rename from modules/nixos/studio/gimp/default.nix rename to modules/nixos/programs/gimp/default.nix index 4fe9263a..6a27cd72 100644 --- a/modules/nixos/studio/gimp/default.nix +++ b/modules/nixos/programs/gimp/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.nixos.studio.gimp; + cfg = config.nixos.programs.gimp; in { options = { - nixos.studio.gimp.enable = mkEnableOption "Enables gimp"; + nixos.programs.gimp.enable = mkEnableOption "Enables gimp"; }; config = mkIf cfg.enable { environment.systemPackages = [ diff --git a/modules/nixos/gui/gnome/default.nix b/modules/nixos/programs/gnome/default.nix similarity index 73% rename from modules/nixos/gui/gnome/default.nix rename to modules/nixos/programs/gnome/default.nix index 492c05ed..8950ca4a 100644 --- a/modules/nixos/gui/gnome/default.nix +++ b/modules/nixos/programs/gnome/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.nixos.gui.gnome; + cfg = config.nixos.programs.gnome; in { options = { - nixos.gui.gnome.enable = mkEnableOption "Enables gnome"; + nixos.programs.gnome.enable = mkEnableOption "Enables gnome"; }; config = mkIf cfg.enable { services = { diff --git a/modules/nixos/gui/hyprland/default.nix b/modules/nixos/programs/hyprland/default.nix similarity index 56% rename from modules/nixos/gui/hyprland/default.nix rename to modules/nixos/programs/hyprland/default.nix index 40b869d7..1150405d 100644 --- a/modules/nixos/gui/hyprland/default.nix +++ b/modules/nixos/programs/hyprland/default.nix @@ -6,10 +6,11 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.nixos.gui.hyprland; + cfg = config.nixos.programs.hyprland; + hyprsysteminfoFlake = inputs.hyprsysteminfo.packages.${pkgs.system}.default; in { options = { - nixos.gui.hyprland.enable = mkEnableOption "Enables hyprland"; + nixos.programs.hyprland.enable = mkEnableOption "Enables hyprland"; }; config = mkIf cfg.enable { security.pam.services.hyprlock.text = "auth include login"; @@ -19,6 +20,12 @@ in { package = inputs.hyprland.packages.${pkgs.system}.default; portalPackage = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland; }; - environment.variables.NIXOS_OZONE_WL = "1"; + environment = { + variables.NIXOS_OZONE_WL = "1"; + systemPackages = [ + pkgs.hyprwayland-scanner + hyprsysteminfoFlake + ]; + }; }; } diff --git a/modules/nixos/studio/inkscape/default.nix b/modules/nixos/programs/inkscape/default.nix similarity index 66% rename from modules/nixos/studio/inkscape/default.nix rename to modules/nixos/programs/inkscape/default.nix index b926ae2a..9e6ec056 100644 --- a/modules/nixos/studio/inkscape/default.nix +++ b/modules/nixos/programs/inkscape/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.nixos.studio.inkscape; + cfg = config.nixos.programs.inkscape; in { options = { - nixos.studio.inkscape.enable = mkEnableOption "Enables inkscape"; + nixos.programs.inkscape.enable = mkEnableOption "Enables inkscape"; }; config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ diff --git a/modules/nixos/gaming/lutris/default.nix b/modules/nixos/programs/lutris/default.nix similarity index 72% rename from modules/nixos/gaming/lutris/default.nix rename to modules/nixos/programs/lutris/default.nix index f630ba7c..4040abdd 100644 --- a/modules/nixos/gaming/lutris/default.nix +++ b/modules/nixos/programs/lutris/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.nixos.gaming.lutris; + cfg = config.nixos.programs.lutris; in { options = { - nixos.gaming.lutris.enable = mkEnableOption "Enables lutris"; + nixos.programs.lutris.enable = mkEnableOption "Enables lutris"; }; config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ diff --git a/modules/nixos/utils/microfetch/default.nix b/modules/nixos/programs/microfetch/default.nix similarity index 65% rename from modules/nixos/utils/microfetch/default.nix rename to modules/nixos/programs/microfetch/default.nix index 00de022e..6070ba1a 100644 --- a/modules/nixos/utils/microfetch/default.nix +++ b/modules/nixos/programs/microfetch/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.nixos.utils.microfetch; + cfg = config.nixos.programs.microfetch; in { options = { - nixos.utils.microfetch.enable = mkEnableOption "Enables microfetch"; + nixos.programs.microfetch.enable = mkEnableOption "Enables microfetch"; }; config = mkIf cfg.enable { environment.systemPackages = [inputs.microfetch.packages.x86_64-linux.default]; diff --git a/modules/nixos/utils/misc/default.nix b/modules/nixos/programs/misc/default.nix similarity index 90% rename from modules/nixos/utils/misc/default.nix rename to modules/nixos/programs/misc/default.nix index 7249912b..e76f5384 100644 --- a/modules/nixos/utils/misc/default.nix +++ b/modules/nixos/programs/misc/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption mkOption mkMerge; - cfg = config.nixos.utils.misc; + cfg = config.nixos.programs.misc; in { options = { - nixos.utils.misc = { + nixos.programs.misc = { enable = mkEnableOption "Enables miscellaneous packages"; desktop.enable = mkOption { type = lib.types.bool; diff --git a/modules/nixos/studio/mysql-workbench/default.nix b/modules/nixos/programs/mysql-workbench/default.nix similarity index 61% rename from modules/nixos/studio/mysql-workbench/default.nix rename to modules/nixos/programs/mysql-workbench/default.nix index 64a0678a..50e6cdac 100644 --- a/modules/nixos/studio/mysql-workbench/default.nix +++ b/modules/nixos/programs/mysql-workbench/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.nixos.studio.mysql-workbench; + cfg = config.nixos.programs.mysql-workbench; in { options = { - nixos.studio.mysql-workbench.enable = mkEnableOption "Enables MySQL Workbench"; + nixos.programs.mysql-workbench.enable = mkEnableOption "Enables MySQL Workbench"; }; config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ diff --git a/modules/nixos/utils/nh/default.nix b/modules/nixos/programs/nh/default.nix similarity index 91% rename from modules/nixos/utils/nh/default.nix rename to modules/nixos/programs/nh/default.nix index b89b981f..cf1b937c 100644 --- a/modules/nixos/utils/nh/default.nix +++ b/modules/nixos/programs/nh/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption mkOption; - cfg = config.nixos.utils.nh; + cfg = config.nixos.programs.nh; in { options = { - nixos.utils.nh = { + nixos.programs.nh = { enable = mkEnableOption "Enables nix helper"; clean = { enable = mkEnableOption "Enables nix helper cleaning"; diff --git a/modules/nixos/utils/npm/default.nix b/modules/nixos/programs/npm/default.nix similarity index 64% rename from modules/nixos/utils/npm/default.nix rename to modules/nixos/programs/npm/default.nix index 59544dbc..edbf6731 100644 --- a/modules/nixos/utils/npm/default.nix +++ b/modules/nixos/programs/npm/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.nixos.utils.npm; + cfg = config.nixos.programs.npm; in { options = { - nixos.utils.npm.enable = mkEnableOption "Enables npm"; + nixos.programs.npm.enable = mkEnableOption "Enables npm"; }; config = mkIf cfg.enable { programs.npm = { diff --git a/modules/nixos/utils/obsidian/default.nix b/modules/nixos/programs/obsidian/default.nix similarity index 63% rename from modules/nixos/utils/obsidian/default.nix rename to modules/nixos/programs/obsidian/default.nix index 4c231cb1..2507b74f 100644 --- a/modules/nixos/utils/obsidian/default.nix +++ b/modules/nixos/programs/obsidian/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.nixos.utils.obsidian; + cfg = config.nixos.programs.obsidian; in { options = { - nixos.utils.obsidian.enable = mkEnableOption "Enables obsidian"; + nixos.programs.obsidian.enable = mkEnableOption "Enables obsidian"; }; config = mkIf cfg.enable { environment.systemPackages = [ diff --git a/modules/nixos/gaming/steam/default.nix b/modules/nixos/programs/steam/default.nix similarity index 70% rename from modules/nixos/gaming/steam/default.nix rename to modules/nixos/programs/steam/default.nix index 1fb49e45..e5d42d25 100644 --- a/modules/nixos/gaming/steam/default.nix +++ b/modules/nixos/programs/steam/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.nixos.gaming.steam; + cfg = config.nixos.programs.steam; in { options = { - nixos.gaming.steam.enable = mkEnableOption "Enables steam"; + nixos.programs.steam.enable = mkEnableOption "Enables steam"; }; config = mkIf cfg.enable { programs = { diff --git a/modules/nixos/utils/yubikey/default.nix b/modules/nixos/programs/yubikey/default.nix similarity index 73% rename from modules/nixos/utils/yubikey/default.nix rename to modules/nixos/programs/yubikey/default.nix index 5638c8c4..d2aa3cbc 100644 --- a/modules/nixos/utils/yubikey/default.nix +++ b/modules/nixos/programs/yubikey/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.nixos.utils.yubikey; + cfg = config.nixos.programs.yubikey; in { options = { - nixos.utils.yubikey.enable = mkEnableOption "Enables yubikey utilities"; + nixos.programs.yubikey.enable = mkEnableOption "Enables yubikey utilities"; }; config = mkIf cfg.enable { environment.systemPackages = [ diff --git a/modules/nixos/utils/zsh/default.nix b/modules/nixos/programs/zsh/default.nix similarity index 61% rename from modules/nixos/utils/zsh/default.nix rename to modules/nixos/programs/zsh/default.nix index fc0b0a8c..ef719e32 100644 --- a/modules/nixos/utils/zsh/default.nix +++ b/modules/nixos/programs/zsh/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.nixos.utils.zsh; + cfg = config.nixos.programs.zsh; in { options = { - nixos.utils.zsh.enable = mkEnableOption "Enables zsh shell"; + nixos.programs.zsh.enable = mkEnableOption "Enables zsh shell"; }; config = mkIf cfg.enable { programs.zsh.enable = cfg.enable; diff --git a/modules/nixos/services/security/agenix/default.nix b/modules/nixos/services/agenix/default.nix similarity index 84% rename from modules/nixos/services/security/agenix/default.nix rename to modules/nixos/services/agenix/default.nix index 35b52a37..4c97ea19 100644 --- a/modules/nixos/services/security/agenix/default.nix +++ b/modules/nixos/services/agenix/default.nix @@ -7,10 +7,10 @@ ... }: let inherit (lib) mkIf mkEnableOption mkOption mkMerge; - cfg = config.nixos.services.security.agenix; + cfg = config.nixos.services.agenix; in { options = { - nixos.services.security.agenix = { + nixos.services.agenix = { enable = mkEnableOption "Enables agenix system environment"; cnix.enable = mkOption { type = lib.types.bool; @@ -36,11 +36,6 @@ in { secrets = { cnstssh.file = "${self}/secrets/cnstssh.age"; cnixssh.file = "${self}/secrets/cnixssh.age"; - helix-gpt = { - file = "${self}/secrets/helix-gpt.age"; - owner = "cnst"; - group = "users"; - }; }; }) (mkIf cfg.toothpc.enable { diff --git a/modules/nixos/services/network/blueman/default.nix b/modules/nixos/services/blueman/default.nix similarity index 59% rename from modules/nixos/services/network/blueman/default.nix rename to modules/nixos/services/blueman/default.nix index 7d9f806b..65ed181d 100644 --- a/modules/nixos/services/network/blueman/default.nix +++ b/modules/nixos/services/blueman/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.nixos.services.network.blueman; + cfg = config.nixos.services.blueman; in { options = { - nixos.services.network.blueman.enable = mkEnableOption "Enables blueman"; + nixos.services.blueman.enable = mkEnableOption "Enables blueman"; }; config = mkIf cfg.enable { services = { diff --git a/modules/nixos/services/session/dbus/default.nix b/modules/nixos/services/dbus/default.nix similarity index 67% rename from modules/nixos/services/session/dbus/default.nix rename to modules/nixos/services/dbus/default.nix index f6bda7b4..2c722ff1 100644 --- a/modules/nixos/services/session/dbus/default.nix +++ b/modules/nixos/services/dbus/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.nixos.services.session.dbus; + cfg = config.nixos.services.dbus; in { options = { - nixos.services.session.dbus.enable = mkEnableOption "Enables dbus"; + nixos.services.dbus.enable = mkEnableOption "Enables dbus"; }; config = mkIf cfg.enable { services.dbus = { diff --git a/modules/nixos/services/session/dconf/default.nix b/modules/nixos/services/dconf/default.nix similarity index 57% rename from modules/nixos/services/session/dconf/default.nix rename to modules/nixos/services/dconf/default.nix index a18ef01d..bc03c386 100644 --- a/modules/nixos/services/session/dconf/default.nix +++ b/modules/nixos/services/dconf/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.nixos.services.session.dconf; + cfg = config.nixos.services.dconf; in { options = { - nixos.services.session.dconf.enable = mkEnableOption "Enables dconf"; + nixos.services.dconf.enable = mkEnableOption "Enables dconf"; }; config = mkIf cfg.enable { programs.dconf.enable = true; diff --git a/modules/nixos/services/system/fwupd/default.nix b/modules/nixos/services/fwupd/default.nix similarity index 58% rename from modules/nixos/services/system/fwupd/default.nix rename to modules/nixos/services/fwupd/default.nix index 8f94acff..4b406b15 100644 --- a/modules/nixos/services/system/fwupd/default.nix +++ b/modules/nixos/services/fwupd/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.nixos.services.system.fwupd; + cfg = config.nixos.services.fwupd; in { options = { - nixos.services.system.fwupd.enable = mkEnableOption "Enables fwupd"; + nixos.services.fwupd.enable = mkEnableOption "Enables fwupd"; }; config = mkIf cfg.enable { services.fwupd.enable = true; diff --git a/modules/nixos/services/security/gnome-keyring/default.nix b/modules/nixos/services/gnome-keyring/default.nix similarity index 54% rename from modules/nixos/services/security/gnome-keyring/default.nix rename to modules/nixos/services/gnome-keyring/default.nix index 52be524a..2faa7857 100644 --- a/modules/nixos/services/security/gnome-keyring/default.nix +++ b/modules/nixos/services/gnome-keyring/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.nixos.services.security.gnome-keyring; + cfg = config.nixos.services.gnome-keyring; in { options = { - nixos.services.security.gnome-keyring.enable = mkEnableOption "Enables gnome-keyring"; + nixos.services.gnome-keyring.enable = mkEnableOption "Enables gnome-keyring"; }; config = mkIf cfg.enable { services.gnome.gnome-keyring.enable = true; diff --git a/modules/nixos/services/system/greetd/default.nix b/modules/nixos/services/greetd/default.nix similarity index 94% rename from modules/nixos/services/system/greetd/default.nix rename to modules/nixos/services/greetd/default.nix index ca55441a..ad837be8 100644 --- a/modules/nixos/services/system/greetd/default.nix +++ b/modules/nixos/services/greetd/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption mkMerge mkOption types; - cfg = config.nixos.services.system.greetd; + cfg = config.nixos.services.greetd; in { options = { - nixos.services.system.greetd = { + nixos.services.greetd = { enable = mkEnableOption { type = types.bool; default = false; diff --git a/modules/nixos/services/system/gvfs/default.nix b/modules/nixos/services/gvfs/default.nix similarity index 58% rename from modules/nixos/services/system/gvfs/default.nix rename to modules/nixos/services/gvfs/default.nix index 32d36031..527ccebf 100644 --- a/modules/nixos/services/system/gvfs/default.nix +++ b/modules/nixos/services/gvfs/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.nixos.services.system.gvfs; + cfg = config.nixos.services.gvfs; in { options = { - nixos.services.system.gvfs.enable = mkEnableOption "Enables gvfs"; + nixos.services.gvfs.enable = mkEnableOption "Enables gvfs"; }; config = mkIf cfg.enable { services.gvfs.enable = true; diff --git a/modules/nixos/services/system/kanata/default.nix b/modules/nixos/services/kanata/default.nix similarity index 74% rename from modules/nixos/services/system/kanata/default.nix rename to modules/nixos/services/kanata/default.nix index 235c149f..da8e10e5 100644 --- a/modules/nixos/services/system/kanata/default.nix +++ b/modules/nixos/services/kanata/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.nixos.services.system.kanata; + cfg = config.nixos.services.kanata; in { options = { - nixos.services.system.kanata.enable = mkEnableOption "Enables kanata keyboard remapping"; + nixos.services.kanata.enable = mkEnableOption "Enables kanata keyboard remapping"; }; config = mkIf cfg.enable { services.kanata = { diff --git a/modules/nixos/services/system/kanata/hhkbse.kbd b/modules/nixos/services/kanata/hhkbse.kbd similarity index 100% rename from modules/nixos/services/system/kanata/hhkbse.kbd rename to modules/nixos/services/kanata/hhkbse.kbd diff --git a/modules/nixos/services/system/locate/default.nix b/modules/nixos/services/locate/default.nix similarity index 66% rename from modules/nixos/services/system/locate/default.nix rename to modules/nixos/services/locate/default.nix index f39dda30..f0e146e4 100644 --- a/modules/nixos/services/system/locate/default.nix +++ b/modules/nixos/services/locate/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.nixos.services.system.locate; + cfg = config.nixos.services.locate; in { options = { - nixos.services.system.locate.enable = mkEnableOption "Enables plocate"; + nixos.services.locate.enable = mkEnableOption "Enables plocate"; }; config = mkIf cfg.enable { services.locate = { diff --git a/modules/nixos/services/network/mullvad/default.nix b/modules/nixos/services/mullvad/default.nix similarity index 64% rename from modules/nixos/services/network/mullvad/default.nix rename to modules/nixos/services/mullvad/default.nix index 2745a06f..b6f5e1eb 100644 --- a/modules/nixos/services/network/mullvad/default.nix +++ b/modules/nixos/services/mullvad/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.nixos.services.network.mullvad; + cfg = config.nixos.services.mullvad; in { options = { - nixos.services.network.mullvad.enable = mkEnableOption "Enables mullvad"; + nixos.services.mullvad.enable = mkEnableOption "Enables mullvad"; }; config = mkIf cfg.enable { services.mullvad-vpn = { diff --git a/modules/nixos/services/system/nix-ld/default.nix b/modules/nixos/services/nix-ld/default.nix similarity index 93% rename from modules/nixos/services/system/nix-ld/default.nix rename to modules/nixos/services/nix-ld/default.nix index a20d1b34..2469b528 100644 --- a/modules/nixos/services/system/nix-ld/default.nix +++ b/modules/nixos/services/nix-ld/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.nixos.services.system.nix-ld; + cfg = config.nixos.services.nix-ld; in { options = { - nixos.services.system.nix-ld.enable = mkEnableOption "Enables nix-ld"; + nixos.services.nix-ld.enable = mkEnableOption "Enables nix-ld"; }; config = mkIf cfg.enable { programs.nix-ld = { diff --git a/modules/nixos/services/network/openssh/default.nix b/modules/nixos/services/openssh/default.nix similarity index 59% rename from modules/nixos/services/network/openssh/default.nix rename to modules/nixos/services/openssh/default.nix index 2b40478b..98e392b0 100644 --- a/modules/nixos/services/network/openssh/default.nix +++ b/modules/nixos/services/openssh/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.nixos.services.network.openssh; + cfg = config.nixos.services.openssh; in { options = { - nixos.services.network.openssh.enable = mkEnableOption "Enables openssh"; + nixos.services.openssh.enable = mkEnableOption "Enables openssh"; }; config = mkIf cfg.enable { services.openssh = { diff --git a/modules/nixos/services/system/pcscd/default.nix b/modules/nixos/services/pcscd/default.nix similarity index 58% rename from modules/nixos/services/system/pcscd/default.nix rename to modules/nixos/services/pcscd/default.nix index 52282d48..7acaec1e 100644 --- a/modules/nixos/services/system/pcscd/default.nix +++ b/modules/nixos/services/pcscd/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.nixos.services.system.pcscd; + cfg = config.nixos.services.pcscd; in { options = { - nixos.services.system.pcscd.enable = mkEnableOption "Enables pcscd"; + nixos.services.pcscd.enable = mkEnableOption "Enables pcscd"; }; config = mkIf cfg.enable { services.pcscd.enable = true; diff --git a/modules/nixos/services/system/pipewire/default.nix b/modules/nixos/services/pipewire/default.nix similarity index 75% rename from modules/nixos/services/system/pipewire/default.nix rename to modules/nixos/services/pipewire/default.nix index f0986c8b..a17cd794 100644 --- a/modules/nixos/services/system/pipewire/default.nix +++ b/modules/nixos/services/pipewire/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.nixos.services.system.pipewire; + cfg = config.nixos.services.pipewire; in { options = { - nixos.services.system.pipewire.enable = mkEnableOption "Enables pipewire"; + nixos.services.pipewire.enable = mkEnableOption "Enables pipewire"; }; config = mkIf cfg.enable { security.rtkit.enable = true; diff --git a/modules/nixos/services/system/powerd/default.nix b/modules/nixos/services/powerd/default.nix similarity index 62% rename from modules/nixos/services/system/powerd/default.nix rename to modules/nixos/services/powerd/default.nix index 3a99ae25..634b603a 100644 --- a/modules/nixos/services/system/powerd/default.nix +++ b/modules/nixos/services/powerd/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.nixos.services.system.powerd; + cfg = config.nixos.services.powerd; in { options = { - nixos.services.system.powerd.enable = mkEnableOption "Enables power-profiles-daemon"; + nixos.services.powerd.enable = mkEnableOption "Enables power-profiles-daemon"; }; config = mkIf cfg.enable { services = { diff --git a/modules/nixos/services/network/samba/default.nix b/modules/nixos/services/samba/default.nix similarity index 80% rename from modules/nixos/services/network/samba/default.nix rename to modules/nixos/services/samba/default.nix index e0b09d59..45c056c3 100644 --- a/modules/nixos/services/network/samba/default.nix +++ b/modules/nixos/services/samba/default.nix @@ -5,10 +5,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.nixos.services.network.samba; + cfg = config.nixos.services.samba; in { options = { - nixos.services.network.samba.enable = mkEnableOption "Enables samba"; + nixos.services.samba.enable = mkEnableOption "Enables samba"; }; config = mkIf cfg.enable { services = { diff --git a/modules/nixos/services/system/udisks/default.nix b/modules/nixos/services/udisks/default.nix similarity index 57% rename from modules/nixos/services/system/udisks/default.nix rename to modules/nixos/services/udisks/default.nix index 4ee71d95..566208a4 100644 --- a/modules/nixos/services/system/udisks/default.nix +++ b/modules/nixos/services/udisks/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.nixos.services.system.udisks; + cfg = config.nixos.services.udisks; in { options = { - nixos.services.system.udisks.enable = mkEnableOption "Enables udisks"; + nixos.services.udisks.enable = mkEnableOption "Enables udisks"; }; config = mkIf cfg.enable { services.udisks2.enable = true; diff --git a/modules/nixos/services/session/xserver/default.nix b/modules/nixos/services/xserver/default.nix similarity index 87% rename from modules/nixos/services/session/xserver/default.nix rename to modules/nixos/services/xserver/default.nix index 12c30c4f..f7bf6f46 100644 --- a/modules/nixos/services/session/xserver/default.nix +++ b/modules/nixos/services/xserver/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkOption types; - cfg = config.nixos.services.session.xserver; + cfg = config.nixos.services.xserver; in { options = { - nixos.services.session.xserver = { + nixos.services.xserver = { videoDrivers = mkOption { type = types.listOf (types.enum ["amdgpu" "nvidia"]); default = ["amdgpu"]; diff --git a/modules/nixos/services/system/zram/default.nix b/modules/nixos/services/zram/default.nix similarity index 57% rename from modules/nixos/services/system/zram/default.nix rename to modules/nixos/services/zram/default.nix index 6853b99b..fb93831f 100644 --- a/modules/nixos/services/system/zram/default.nix +++ b/modules/nixos/services/zram/default.nix @@ -4,10 +4,10 @@ ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.nixos.services.system.zram; + cfg = config.nixos.services.zram; in { options = { - nixos.services.system.zram.enable = mkEnableOption "Enables zram"; + nixos.services.zram.enable = mkEnableOption "Enables zram"; }; config = mkIf cfg.enable { zramSwap.enable = true; diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 21e8adcc..6df1c668 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -5,5 +5,4 @@ let in { "cnstssh.age".publicKeys = [cnst cnix]; "cnixssh.age".publicKeys = [cnst cnix]; - "helix-gpt.age".publicKeys = [cnst cnix]; } diff --git a/users/cnst/cpmodules.nix b/users/cnst/cpmodules.nix deleted file mode 100644 index eebae0a6..00000000 --- a/users/cnst/cpmodules.nix +++ /dev/null @@ -1,176 +0,0 @@ -{lib, ...}: let - inherit (lib) mkForce; -in { - # monitors = [ - # { - # name = "DP-3"; - # width = 2560; - # height = 1440; - # refreshRate = 240; - # bitDepth = 10; - # workspace = "1"; - # primary = true; - # } - # { - # name = "eDP-1"; - # width = 1920; - # height = 1200; - # refreshRate = 60; - # workspace = "1"; - # primary = false; - # } - # ]; - home = { - # browsers = { - # firefox = { - # enable = true; - # }; - # chromium = { - # enable = false; - # }; - # zen = { - # enable = true; - # }; - # }; - # comm = { - # discord = { - # enable = true; - # }; - # }; - # devtools = { - # neovim = { - # enable = true; - # }; - # vscode = { - # enable = false; - # }; - # helix = { - # enable = true; - # }; - # }; - # gaming = { - # steam = { - # enable = mkForce false; - # }; - # # mangohud = { - # # enable = true; - # # }; - # lutris = { - # enable = mkForce false; - # }; - # }; - # cli = { - # alacritty = { - # enable = true; - # }; - # bash = { - # enable = true; - # }; - # foot = { - # enable = true; - # }; - # jujutsu = { - # enable = false; - # }; - # kitty = { - # enable = true; - # }; - # wezterm = { - # enable = false; - # }; - # zellij = { - # enable = false; - # }; - # zsh = { - # enable = true; - # }; - # }; - # userd = { - # blueman-applet = { - # enable = true; - # }; - # copyq = { - # enable = true; - # }; - # dconf = { - # settings = { - # color-scheme = "prefer-dark"; - # }; - # }; - # gpg = { - # enable = false; - # }; - # gtk = { - # enable = true; - # }; - # mako = { - # enable = true; - # }; - # udiskie = { - # enable = true; - # }; - # polkit = { - # enable = true; - # }; - # syncthing = { - # enable = true; - # }; - # xdg = { - # enable = true; - # }; - # }; - # utils = { - # anyrun = { - # enable = false; - # }; - # rofi = { - # enable = false; - # }; - # waybar = { - # enable = true; - # }; - # yazi = { - # enable = true; - # }; - # zathura = { - # enable = true; - # }; - # tuirun = { - # enable = true; - # }; - # misc = { - # enable = true; - # }; - # mpv = { - # enable = true; - # }; - # eza = { - # enable = true; - # }; - # ssh = { - # enable = true; - # }; - # }; - # wm = { - # hyprland = { - # cnst = { - # enable = true; - # }; - # toothpick = { - # enable = false; - # }; - # }; - # utils = { - # hypridle = { - # enable = true; - # }; - # hyprlock = { - # enable = true; - # }; - # hyprpaper = { - # enable = true; - # }; - # }; - # }; - }; -} diff --git a/users/cnst/default.nix b/users/cnst/default.nix index b009cbfe..3f5d92b2 100644 --- a/users/cnst/default.nix +++ b/users/cnst/default.nix @@ -1,18 +1,19 @@ { pkgs, - lib, - osConfig, + # lib, + # osConfig, ... -}: let - isCnixpad = osConfig.networking.hostName == "cnixpad"; -in { - imports = - [ - ./modules.nix - ./git.nix - # ./shell.nix - ] - ++ lib.optionals isCnixpad [./cpmodules.nix]; +}: +# let +# isCnixpad = osConfig.networking.hostName == "cnixpad"; +# in +{ + imports = [ + ./modules.nix + ./git.nix + # ./shell.nix + ]; + # ++ lib.optionals isCnixpad [./cpmodules.nix]; home = { username = "cnst"; diff --git a/users/cnst/modules.nix b/users/cnst/modules.nix index f8487ccc..c83debaf 100644 --- a/users/cnst/modules.nix +++ b/users/cnst/modules.nix @@ -19,52 +19,43 @@ } ]; home = { - browsers = { - firefox = { + programs = { + alacritty = { + enable = true; + }; + anyrun = { + enable = false; + }; + bash = { enable = true; }; chromium = { enable = false; }; - zen = { - enable = true; - }; - }; - comm = { discord = { enable = true; }; - }; - devtools = { - neovim = { + eza = { enable = true; }; - vscode = { - enable = false; + firefox = { + enable = true; + }; + foot = { + enable = true; }; helix = { enable = true; }; - }; - # gaming = { - # steam = { - # enable = true; - # }; - # mangohud = { - # enable = true; - # }; - # lutris = { - # enable = true; - # }; - # }; - cli = { - alacritty = { - enable = true; + hyprland = { + cnst = { + enable = true; + }; + toothpick = { + enable = false; + }; }; - bash = { - enable = true; - }; - foot = { + hyprlock = { enable = true; }; jujutsu = { @@ -73,17 +64,50 @@ kitty = { enable = true; }; + misc = { + enable = true; + }; + mpv = { + enable = true; + }; + neovim = { + enable = true; + }; + rofi = { + enable = false; + }; + ssh = { + enable = true; + }; + tuirun = { + enable = true; + }; + vscode = { + enable = false; + }; + waybar = { + enable = true; + }; wezterm = { enable = false; }; + yazi = { + enable = true; + }; + zathura = { + enable = true; + }; zellij = { enable = false; }; + zen = { + enable = true; + }; zsh = { enable = true; }; }; - userd = { + services = { blueman-applet = { enable = true; }; @@ -101,10 +125,13 @@ gtk = { enable = true; }; - mako = { + hypridle = { enable = true; }; - udiskie = { + hyprpaper = { + enable = true; + }; + mako = { enable = true; }; polkit = { @@ -113,62 +140,12 @@ syncthing = { enable = true; }; + udiskie = { + enable = true; + }; xdg = { enable = true; }; }; - utils = { - anyrun = { - enable = false; - }; - rofi = { - enable = false; - }; - waybar = { - enable = true; - }; - yazi = { - enable = true; - }; - zathura = { - enable = true; - }; - tuirun = { - enable = true; - }; - misc = { - enable = true; - }; - mpv = { - enable = true; - }; - eza = { - enable = true; - }; - ssh = { - enable = true; - }; - }; - wm = { - hyprland = { - cnst = { - enable = true; - }; - toothpick = { - enable = false; - }; - }; - utils = { - hypridle = { - enable = true; - }; - hyprlock = { - enable = true; - }; - hyprpaper = { - enable = true; - }; - }; - }; }; } diff --git a/users/toothpick/modules.nix b/users/toothpick/modules.nix index 832e53f9..09b4a1af 100644 --- a/users/toothpick/modules.nix +++ b/users/toothpick/modules.nix @@ -10,62 +10,95 @@ } ]; home = { - browsers = { - firefox = { + programs = { + alacritty = { + enable = true; + }; + anyrun = { + enable = false; + }; + bash = { enable = true; }; chromium = { enable = true; }; - }; - comm = { discord = { enable = true; }; - }; - devtools = { - neovim = { + eza = { enable = true; }; - vscode = { - enable = true; - }; - helix = { - enable = true; - }; - }; - # gaming = { - # steam = { - # enable = true; - # }; - # mangohud = { - # enable = false; - # }; - # }; - cli = { - alacritty = { - enable = true; - }; - bash = { + firefox = { enable = true; }; foot = { enable = true; }; + helix = { + enable = true; + }; + hyprland = { + cnst = { + enable = false; + }; + toothpick = { + enable = true; + }; + }; + hyprlock = { + enable = true; + }; + jujutsu = { + enable = false; + }; kitty = { enable = true; }; + misc = { + enable = true; + }; + mpv = { + enable = true; + }; + neovim = { + enable = true; + }; + rofi = { + enable = false; + }; + ssh = { + enable = true; + }; + tuirun = { + enable = true; + }; + vscode = { + enable = true; + }; + waybar = { + enable = true; + }; wezterm = { enable = false; }; + yazi = { + enable = true; + }; + zathura = { + enable = true; + }; zellij = { enable = false; }; + zen = { + enable = false; + }; zsh = { enable = true; }; }; - userd = { + services = { blueman-applet = { enable = false; }; @@ -83,10 +116,13 @@ gtk = { enable = true; }; - mako = { + hypridle = { enable = true; }; - udiskie = { + hyprpaper = { + enable = true; + }; + mako = { enable = true; }; polkit = { @@ -95,62 +131,12 @@ syncthing = { enable = false; }; + udiskie = { + enable = true; + }; xdg = { enable = true; }; }; - utils = { - anyrun = { - enable = false; - }; - rofi = { - enable = false; - }; - waybar = { - enable = true; - }; - yazi = { - enable = true; - }; - zathura = { - enable = false; - }; - tuirun = { - enable = true; - }; - misc = { - enable = true; - }; - mpv = { - enable = true; - }; - eza = { - enable = true; - }; - ssh = { - enable = true; - }; - }; - wm = { - hyprland = { - cnst = { - enable = false; - }; - toothpick = { - enable = true; - }; - }; - utils = { - hypridle = { - enable = true; - }; - hyprlock = { - enable = true; - }; - hyprpaper = { - enable = true; - }; - }; - }; }; }