From c560adf6945a056933d33c74aaa8aa267e7c7921 Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 23 May 2024 10:44:49 -0500 Subject: [PATCH] treewide: snowfall-lib v3 upgrade --- CHANGELOG.md | 2221 ----------------- README.md | 6 +- flake.lock | 14 +- flake.nix | 13 +- .../khaneliman@khanelimac/default.nix | 11 +- .../khaneliman@khanelinix/default.nix | 27 +- .../x86_64-linux/khaneliman@nixos/default.nix | 9 +- .../nixos@CORE-PW00LM92/default.nix | 11 +- lib/deploy/default.nix | 24 +- .../darwin/archetypes/personal/default.nix | 13 +- modules/darwin/archetypes/vm/default.nix | 13 +- .../darwin/archetypes/workstation/default.nix | 13 +- .../darwin/desktop/addons/barrier/default.nix | 13 +- .../desktop/addons/jankyborders/default.nix | 11 +- .../desktop/addons/sketchybar/default.nix | 11 +- .../darwin/desktop/addons/skhd/default.nix | 7 +- .../darwin/desktop/addons/yabai/default.nix | 29 +- modules/darwin/home/default.nix | 15 +- modules/darwin/nix/default.nix | 15 +- .../graphical/apps/_1password/default.nix | 17 +- modules/darwin/security/gpg/default.nix | 9 +- modules/darwin/security/sops/default.nix | 7 +- .../darwin/services/nix-daemon/default.nix | 13 +- modules/darwin/suites/art/default.nix | 9 +- modules/darwin/suites/business/default.nix | 15 +- modules/darwin/suites/common/default.nix | 11 +- modules/darwin/suites/desktop/default.nix | 17 +- modules/darwin/suites/development/default.nix | 9 +- modules/darwin/suites/games/default.nix | 13 +- modules/darwin/suites/music/default.nix | 9 +- modules/darwin/suites/networking/default.nix | 7 +- modules/darwin/suites/photo/default.nix | 15 +- modules/darwin/suites/social/default.nix | 13 +- modules/darwin/suites/video/default.nix | 9 +- modules/darwin/suites/vm/default.nix | 7 +- modules/darwin/system/fonts/default.nix | 5 +- modules/darwin/system/input/default.nix | 11 +- modules/darwin/system/interface/default.nix | 5 +- modules/darwin/system/networking/default.nix | 13 +- modules/darwin/tools/homebrew/default.nix | 13 +- modules/darwin/user/default.nix | 7 +- modules/home/host/default.nix | 5 +- .../addons/electron-support/default.nix | 13 +- .../graphical/addons/kanshi/default.nix | 9 +- .../graphical/addons/mako/default.nix | 7 +- .../graphical/addons/mangohud/default.nix | 7 +- .../graphical/addons/swappy/default.nix | 7 +- .../graphical/addons/swaync/default.nix | 7 +- .../graphical/addons/wlogout/default.nix | 7 +- .../graphical/apps/_1password/default.nix | 13 +- .../graphical/apps/armcord/default.nix | 11 +- .../graphical/apps/caprine/default.nix | 5 +- .../graphical/apps/discord/default.nix | 7 +- .../programs/graphical/apps/obs/default.nix | 7 +- .../apps/partitionmanager/default.nix | 7 +- .../graphical/apps/retroarch/default.nix | 7 +- .../graphical/apps/thunderbird/default.nix | 15 +- .../graphical/apps/zathura/default.nix | 11 +- .../graphical/bars/sketchybar/default.nix | 7 +- .../graphical/bars/waybar/default.nix | 11 +- .../graphical/browsers/chromium/default.nix | 13 +- .../graphical/browsers/firefox/default.nix | 15 +- .../graphical/editors/vscode/default.nix | 11 +- .../graphical/launchers/rofi/default.nix | 7 +- .../graphical/launchers/wofi/default.nix | 7 +- .../screenlockers/hyprlock/default.nix | 21 +- .../screenlockers/swaylock/default.nix | 9 +- .../programs/graphical/wms/hyprland/apps.nix | 3 +- .../programs/graphical/wms/hyprland/binds.nix | 3 +- .../graphical/wms/hyprland/default.nix | 11 +- .../graphical/wms/hyprland/variables.nix | 9 +- .../graphical/wms/hyprland/windowrules.nix | 9 +- .../graphical/wms/hyprland/workspacerules.nix | 9 +- .../terminal/editors/helix/default.nix | 5 +- .../terminal/editors/micro/default.nix | 13 +- .../terminal/editors/neovim/default.nix | 17 +- .../editors/neovim/plugins/default.nix | 6 - .../editors/neovim/plugins/wakatime.nix | 2 +- .../terminal/emulators/alacritty/default.nix | 7 +- .../terminal/emulators/foot/default.nix | 9 +- .../terminal/emulators/kitty/default.nix | 7 +- .../terminal/emulators/wezterm/default.nix | 9 +- .../terminal/media/ncmpcpp/default.nix | 9 +- .../terminal/media/ncspot/default.nix | 11 +- .../terminal/media/spicetify/default.nix | 7 +- .../programs/terminal/shells/bash/default.nix | 13 +- .../programs/terminal/shells/fish/default.nix | 7 +- .../programs/terminal/shells/zsh/default.nix | 5 +- .../terminal/social/slack-term/default.nix | 10 +- .../terminal/social/twitch-tui/default.nix | 10 +- .../programs/terminal/tools/azure/default.nix | 21 +- .../programs/terminal/tools/bat/default.nix | 7 +- .../terminal/tools/bottom/default.nix | 7 +- .../programs/terminal/tools/btop/default.nix | 7 +- .../programs/terminal/tools/cava/default.nix | 7 +- .../terminal/tools/colorls/default.nix | 7 +- .../programs/terminal/tools/comma/default.nix | 7 +- .../terminal/tools/direnv/default.nix | 13 +- .../programs/terminal/tools/eza/default.nix | 7 +- .../terminal/tools/fastfetch/default.nix | 7 +- .../terminal/tools/fup-repl/default.nix | 7 +- .../programs/terminal/tools/fzf/default.nix | 7 +- .../terminal/tools/git-crypt/default.nix | 7 +- .../programs/terminal/tools/git/default.nix | 13 +- .../terminal/tools/glxinfo/default.nix | 7 +- .../programs/terminal/tools/go/default.nix | 7 +- .../terminal/tools/home-manager/default.nix | 13 +- .../programs/terminal/tools/jq/default.nix | 7 +- .../programs/terminal/tools/k9s/default.nix | 7 +- .../terminal/tools/lazydocker/default.nix | 7 +- .../terminal/tools/lazygit/default.nix | 15 +- .../programs/terminal/tools/lsd/default.nix | 7 +- .../programs/terminal/tools/node/default.nix | 7 +- .../terminal/tools/oh-my-posh/default.nix | 7 +- .../terminal/tools/prisma/default.nix | 7 +- .../terminal/tools/python/default.nix | 7 +- .../terminal/tools/ripgrep/default.nix | 7 +- .../programs/terminal/tools/ssh/default.nix | 13 +- .../programs/terminal/tools/tmux/default.nix | 7 +- .../terminal/tools/topgrade/default.nix | 13 +- .../programs/terminal/tools/wine/default.nix | 7 +- .../tools/yazi/configs/plugins/glow.nix | 3 +- .../programs/terminal/tools/yazi/default.nix | 9 +- .../terminal/tools/yazi/keymap/manager.nix | 4 +- .../tools/yazi/keymap/manager/goto.nix | 4 +- .../terminal/tools/zellij/default.nix | 7 +- .../terminal/tools/zellij/layouts/system.kdl | 2 +- .../terminal/tools/zoxide/default.nix | 7 +- modules/home/services/barrier/default.nix | 13 +- modules/home/services/easyeffects/default.nix | 11 +- modules/home/services/hypridle/default.nix | 7 +- modules/home/services/hyprpaper/default.nix | 9 +- modules/home/services/keyring/default.nix | 13 +- modules/home/services/mpd/default.nix | 5 +- modules/home/services/noisetorch/default.nix | 7 +- modules/home/services/polkit/default.nix | 5 +- modules/home/services/sops/default.nix | 15 +- modules/home/services/swayidle/default.nix | 7 +- modules/home/services/tray/default.nix | 11 +- modules/home/services/udiskie/default.nix | 11 +- modules/home/suites/business/default.nix | 7 +- modules/home/suites/common/default.nix | 9 +- modules/home/suites/development/default.nix | 7 +- modules/home/suites/emulation/default.nix | 7 +- modules/home/suites/games/default.nix | 7 +- modules/home/suites/music/default.nix | 9 +- modules/home/suites/photo/default.nix | 7 +- modules/home/suites/social/default.nix | 13 +- modules/home/suites/video/default.nix | 7 +- modules/home/suites/wlroots/default.nix | 7 +- modules/home/system/xdg/default.nix | 11 +- modules/home/theme/catppuccin/default.nix | 15 +- .../home/theme/catppuccin/yazi/manager.nix | 10 +- modules/home/theme/gtk/default.nix | 11 +- modules/home/theme/qt/default.nix | 9 +- modules/home/user/default.nix | 11 +- modules/nixos/archetypes/gaming/default.nix | 15 +- modules/nixos/archetypes/personal/default.nix | 13 +- modules/nixos/archetypes/server/default.nix | 13 +- modules/nixos/archetypes/vm/default.nix | 13 +- .../nixos/archetypes/workstation/default.nix | 13 +- modules/nixos/archetypes/wsl/default.nix | 7 +- .../nixos/display-managers/gdm/default.nix | 19 +- .../display-managers/lightdm/default.nix | 21 +- .../display-managers/regreet/default.nix | 15 +- .../nixos/display-managers/sddm/default.nix | 11 +- .../display-managers/tuigreet/default.nix | 7 +- modules/nixos/hardware/audio/default.nix | 7 +- modules/nixos/hardware/bluetooth/default.nix | 7 +- modules/nixos/hardware/cpu/amd/default.nix | 7 +- modules/nixos/hardware/cpu/default.nix | 6 +- modules/nixos/hardware/cpu/intel/default.nix | 7 +- .../nixos/hardware/fingerprint/default.nix | 13 +- modules/nixos/hardware/gpu/amd/default.nix | 7 +- modules/nixos/hardware/gpu/default.nix | 6 +- modules/nixos/hardware/gpu/nvidia/default.nix | 9 +- modules/nixos/hardware/opengl/default.nix | 7 +- modules/nixos/hardware/power/default.nix | 13 +- .../nixos/hardware/rgb/ckb-next/default.nix | 15 +- .../nixos/hardware/rgb/openrgb/default.nix | 9 +- .../nixos/hardware/storage/btrfs/default.nix | 7 +- modules/nixos/hardware/storage/default.nix | 7 +- .../nixos/hardware/storage/zfs/default.nix | 13 +- modules/nixos/hardware/tpm/default.nix | 13 +- modules/nixos/hardware/yubikey/default.nix | 7 +- modules/nixos/home/default.nix | 13 +- modules/nixos/nix/default.nix | 11 +- .../graphical/addons/gamemode/default.nix | 7 +- .../graphical/addons/gamescope/default.nix | 7 +- .../graphical/addons/keyring/default.nix | 13 +- .../addons/looking-glass-client/default.nix | 9 +- .../graphical/addons/noisetorch/default.nix | 5 +- .../graphical/addons/xdg-portal/default.nix | 15 +- .../graphical/apps/_1password/default.nix | 9 +- .../graphical/apps/discord/default.nix | 11 +- .../programs/graphical/apps/steam/default.nix | 7 +- .../graphical/apps/virtualbox/default.nix | 15 +- .../desktop-environment/gnome/default.nix | 37 +- .../file-managers/dolphin/default.nix | 7 +- .../file-managers/nautilus/default.nix | 7 +- .../file-managers/thunar/default.nix | 13 +- .../graphical/wms/hyprland/default.nix | 7 +- .../programs/graphical/wms/sway/default.nix | 9 +- .../terminal/tools/bandwhich/default.nix | 13 +- .../terminal/tools/nix-ld/default.nix | 7 +- .../programs/terminal/tools/qmk/default.nix | 7 +- modules/nixos/security/acme/default.nix | 9 +- modules/nixos/security/auditd/default.nix | 11 +- modules/nixos/security/clamav/default.nix | 11 +- modules/nixos/security/doas/default.nix | 15 +- modules/nixos/security/gpg/default.nix | 7 +- modules/nixos/security/keyring/default.nix | 13 +- modules/nixos/security/polkit/default.nix | 7 +- .../nixos/security/pulse-secure/default.nix | 9 +- modules/nixos/security/sops/default.nix | 7 +- modules/nixos/security/sudo-rs/default.nix | 9 +- modules/nixos/security/usbguard/default.nix | 11 +- modules/nixos/services/avahi/default.nix | 11 +- modules/nixos/services/barrier/default.nix | 5 +- .../nixos/services/cloudflared/default.nix | 9 +- modules/nixos/services/ddc/default.nix | 7 +- modules/nixos/services/geoclue/default.nix | 13 +- modules/nixos/services/logrotate/default.nix | 7 +- modules/nixos/services/oomd/default.nix | 13 +- modules/nixos/services/openssh/default.nix | 13 +- modules/nixos/services/power/default.nix | 13 +- modules/nixos/services/printing/default.nix | 7 +- modules/nixos/services/samba/default.nix | 19 +- modules/nixos/services/snapper/default.nix | 11 +- .../nixos/services/spice-vdagentd/default.nix | 7 +- .../nixos/services/spice-webdav/default.nix | 7 +- modules/nixos/services/tailscale/default.nix | 9 +- modules/nixos/suites/art/default.nix | 7 +- modules/nixos/suites/common/default.nix | 11 +- modules/nixos/suites/desktop/default.nix | 9 +- modules/nixos/suites/development/default.nix | 13 +- modules/nixos/suites/games/default.nix | 13 +- modules/nixos/suites/social/default.nix | 7 +- modules/nixos/suites/video/default.nix | 13 +- modules/nixos/suites/vm/default.nix | 13 +- modules/nixos/suites/wlroots/default.nix | 7 +- modules/nixos/system/boot/default.nix | 9 +- modules/nixos/system/env/default.nix | 11 +- modules/nixos/system/fonts/default.nix | 3 +- modules/nixos/system/locale/default.nix | 13 +- modules/nixos/system/networking/default.nix | 9 +- modules/nixos/system/realtime/default.nix | 15 +- modules/nixos/system/time/default.nix | 7 +- modules/nixos/system/xkb/default.nix | 13 +- modules/nixos/theme/default.nix | 7 +- modules/nixos/theme/gtk/default.nix | 7 +- modules/nixos/theme/qt/default.nix | 9 +- modules/nixos/user/default.nix | 7 +- modules/nixos/virtualisation/kvm/default.nix | 9 +- .../nixos/virtualisation/podman/default.nix | 7 +- modules/shared/nix/default.nix | 9 +- modules/shared/suites/common/default.nix | 7 +- modules/shared/system/fonts/default.nix | 7 +- packages/pulse-cookie/default.nix | 1 + packages/trace-which/default.nix | 3 +- packages/wallpapers/default.nix | 9 +- packages/yabai-helper/default.nix | 7 +- shells/default/default.nix | 3 +- shells/dotnet/default.nix | 6 +- shells/nix/default.nix | 3 +- systems/aarch64-darwin/khanelimac/default.nix | 11 +- systems/aarch64-linux/nixos/default.nix | 4 +- .../x86_64-install-iso/graphical/default.nix | 9 +- .../x86_64-install-iso/minimal/default.nix | 9 +- systems/x86_64-iso/isolated/default.nix | 9 +- systems/x86_64-iso/rescue/default.nix | 9 +- .../x86_64-linux/CORE-PW00LM92/default.nix | 6 +- systems/x86_64-linux/khanelilab/default.nix | 11 +- systems/x86_64-linux/khanelinix/default.nix | 15 +- systems/x86_64-linux/nixos/default.nix | 6 +- 275 files changed, 1641 insertions(+), 3231 deletions(-) delete mode 100644 CHANGELOG.md delete mode 100644 modules/home/programs/terminal/editors/neovim/plugins/default.nix diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index b653ea386..000000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,2221 +0,0 @@ - # Changelog - - All notable changes to this project will be documented in this file. - - ## [Unreleased] -### Details -#### Changed -- CHANGELOG.md: update -- Packages/git-cliff: update changelog generation by @khaneliman - - -## [0.0.1] - 2024-05-08 -### Details -#### Changed -- Flake.lock: update by @khaneliman -- CHANGELOG.md: update by @khaneliman -- Packages/git-cliff: update changelog generation by @khaneliman -- Neovim/treesitter: associate avsc with json by @khaneliman -- Chore: changelog update by @khaneliman -- Zellij: update dev layout to open nvim dashboard by @khaneliman -- Flake.lock: update by @khaneliman -- Flake.lock: update by @khaneliman -- Hyprland: use sddm again by @khaneliman -- Flake.nix: unlock hyprland - -Accidentally left from troubleshooting by @khaneliman -- Flake.nix: hyprlock follows nixpkgs - -Fix red screen of death by @khaneliman -- Chore: changelog update by @khaneliman -- Flake.lock: update by @khaneliman -- Chore: changelog update by @khaneliman -- Flake.lock: update by @khaneliman -- Pre-commit-hook: git-cliff moved to pre-push by @khaneliman -- Hyprland: workspace rule opens zellij by @khaneliman -- Chore: deadnix by @khaneliman -- Pre-commit-hook: deadnix edit by @khaneliman -- Chore: nix fmt by @khaneliman -- Flake.nix: clean up formatter declaration by @khaneliman -- Dynamic-island-helper: formatting by @khaneliman -- Json: formatting by @khaneliman -- .github: formatting by @khaneliman -- Pre-commit-hook: swap beautysh for shfmt - -Matches the conform configuration by @khaneliman -- Set-gdm-wallpaper: formatting by @khaneliman -- Rofi: formatting by @khaneliman -- Dynamic-island-helper: formatting by @khaneliman -- Sketchyhelper: formatting by @khaneliman -- Packages/git-cliff: refactor config by @khaneliman -- Flake.nix: exclude flake.lock updates from changelog by @khaneliman -- .gitignore: ignore symlinked pre-commit config by @khaneliman -- Devshell/default: cleanup by @khaneliman -- Theme: change default package for system by @khaneliman -- Flake.lock: update - -Disable font-manager until fixed by @khaneliman -- Zellij: more detail to session resurrection by @khaneliman -- Hypridle: migrate to home-manager module by @khaneliman -- Hyprland: update terminal keybinds by @khaneliman -- Zellij: enable session serialization by @khaneliman -- Skhd: update terminal keybindings by @khaneliman -- Wezterm: change term variable by @khaneliman -- Flake.lock: update by @khaneliman -- Direnv: silence output by @khaneliman -- Nix/services: take ownership of logrotate and oomd by @khaneliman -- Fwupd: set esp location by @khaneliman -- Flake.lock: update by @khaneliman -- Theme: fromyaml distinct log message by @khaneliman -- CORE: resolve conflict by @khaneliman -- Cliphist: use home-manager module by @khaneliman -- Steam: compat tools fix by @khaneliman -- Gamescope: move to module by @khaneliman -- Gamemode: renice tweaks by @khaneliman -- Yubikey: move to hardware by @khaneliman -- Chore: lint fix by @khaneliman -- Flake.lock: update - -Resolved hyprland bug by @khaneliman -- Nix: more tweaks by @khaneliman -- Flake.nix: pin hyprland input to before breaking change - -https://github.com/hyprwm/Hyprland/issues/5849 by @khaneliman -- Flake.lock: update by @khaneliman -- Mpd: disable playerctld - -Crashing nonstop by @khaneliman -- Hyprland: reorg background apps by @khaneliman -- Nixos/rgb: split modules by @khaneliman -- Mpd: disable discord rpc by @khaneliman -- Hyprland: move variables to home by @khaneliman -- Hypridle: use flake pkg by @khaneliman -- Hyprlock: use flake pkg by @khaneliman -- Flake.lock: update by @khaneliman -- Nix: misc tweaks by @khaneliman -- Nix: documentation tweaks - -Might speed up rebuilds by @khaneliman -- Chore: lint cleanup by @khaneliman -- Khanelinix: test setting max-jobs by @khaneliman -- Hyprland: refactor by @khaneliman -- Flake.lock: more cleanup by @khaneliman -- Flake.lock: update by @khaneliman -- Sketchybar: set yabai external_bar on load - -Usually yabai loads before sketchybar, allow sketchybar to configure -yabai's external_bar height when it loads by @khaneliman -- Vscode: user settings - -Moving user settings from sync profile over. by @khaneliman -- Zathura: clean up by @khaneliman -- Ncmpcpp: qol improvements by @khaneliman -- Hyprland: adjust grimblast binds - -More logical mappings to remember -Also switch to hypr-contrib, fixes issues with nixpkg by @khaneliman -- Hyprland: adjust grimblast binds - -Can just notify from the script itself and can freeze for better -screenshots by @khaneliman -- Hyprland: use grimblast for all screenshots by @khaneliman -- Neovim: disable settings dotnet root global by @khaneliman -- Flake.lock: update by @khaneliman -- Easyeffects: disable for now - -Finding it kinda annoying by @khaneliman -- Yazi: highlight links and orphans by @khaneliman -- Yazi: break up theme config by @khaneliman -- Git: minor tweaks by @khaneliman -- Comma: replace with nix-index-database by @khaneliman -- Flake.lock: update by @khaneliman -- Hyprpaper: use flake pkg to fix hypr-socket-watch by @khaneliman -- Flake.lock: update by @khaneliman -- Waybar: reduce tray padding by @khaneliman -- Waybar: network format by @khaneliman -- Waybar: modules cleanup by @khaneliman -- Nixos/music: cleanup by @khaneliman -- Nixos/video: clean up FIX todos by @khaneliman -- Tray: move to separate module by @khaneliman -- Udiskie: reenable by @khaneliman -- Homes: consolidate nixcfg alias by @khaneliman -- Khanelinix: use noisetorch by @khaneliman -- Flake.lock: update by @khaneliman -- Mpd: refactor by @khaneliman -- Hyprland: cleanup package by @khaneliman -- Update README.md by @khaneliman -- Wlroots: use polkit service module by @khaneliman -- Wlroots: use clipboard service module by @khaneliman -- Gtk: refactoring by @khaneliman -- Hyprland: tweak launcher bindings by @khaneliman -- Qt: reorg and add some packages by @khaneliman -- Neovim: dont open minimap on load by @khaneliman -- Swaync: tweaking ui and features by @khaneliman -- Swaync: misc fixes by @khaneliman -- Wlroots: clean up systemPackages by @khaneliman -- Home-manager: backup existing files by @khaneliman -- Networking: more refactoring by @khaneliman -- DevShell/default: use nixpkgs nix-inspect by @khaneliman -- Swaync: migrate to home-manager module by @khaneliman -- Networking: refactor - -Trying NotAShelf config to see if it helps with my connectivity issues by @khaneliman -- Flake.lock: update by @khaneliman -- Chore: misc cleanup by @khaneliman -- Neovim: use spectre module by @khaneliman -- Khanelinix: use silentBoot by @khaneliman -- Plymouth: use theme config values by @khaneliman -- Nix: daemon priority adjustments by @khaneliman -- Nix: gc cleanup more frequently by @khaneliman -- Hardware: restructure gpu with nesting by @khaneliman -- Hardware: restructure cpu with nesting by @khaneliman -- Khanelilab: use intelcpu module by @khaneliman -- Khanelinix/specialization: migrate nixos-hardware nvidia removal to flake by @khaneliman -- Ssd: migrate nixos-hardware to flake by @khaneliman -- Bluetooth: tweaks by @khaneliman -- Pipewire: audio enable by @khaneliman -- Amdcpu: migrate nixos-hardware to flake - -Trying to reduce external input dependencies. by @khaneliman -- Amdgpu: migrate nixos-hardware to flake - -Trying to reduce external input dependencies. by @khaneliman -- Home/theme: refactor cursor and icon - -Moving ownership of generic theme elements to theme module by @khaneliman -- Wshowkeys: use module again by @khaneliman -- Flake.lock: update by @khaneliman -- Flake.lock: update by @khaneliman -- Flake.lock: update by @khaneliman -- Waybar: disable cava module - -audio glitches.... by @khaneliman -- Wlroots: nixpkgs-wayland wshowkeys by @khaneliman -- Flake.lock: update by @khaneliman -- Flake.lock: update by @khaneliman -- Flake.lock: update by @khaneliman -- Flake.lock: update - -Reduce amount of overlays by @khaneliman -- Darwin: missed nixpkgs-fmt -> nixfmt-rfc-style by @khaneliman -- Flake.lock: update by @khaneliman -- Wshowkeys: use module by @khaneliman -- Hyprland: disable scaling on xwayland by @khaneliman -- Flake.lock: update by @khaneliman -- Flake.lock: update by @khaneliman -- Hyprland: refactor keybinds by @khaneliman -- Khanelinix: boomer scaling by @khaneliman -- Hyprland: setup advantage keybinds by @khaneliman -- Zellij: disable for now - -Just got a new keyboard and trying to learn how to use existing bindings -before learning an entire new workflow. by @khaneliman -- Flake.lock: update by @khaneliman -- Qt: platformtheme deprecation fix by @khaneliman -- Flake.lock: update by @khaneliman -- Hyprland: setup advantage keybinds by @khaneliman -- Flake.lock: update by @khaneliman -- Flake.lock: update by @khaneliman -- Hyprland: explicit package reference from input by @khaneliman -- Hyprland: hyprlock recovery key update by @khaneliman -- Waybar: more firefox window-rewrites by @khaneliman -- Flake.lock: update by @khaneliman -- Neovim/tagbar: change toggle keymap by @khaneliman -- Neovim/aerial: change toggle keymap by @khaneliman -- Neovim: undotree init by @khaneliman -- Flake.lock: update by @khaneliman -- Flake.lock: update by @khaneliman -- Yazi/plugins: credits by @khaneliman -- Sketchybar/weather: change defaults by @khaneliman -- Yazi/plugins: ouch for archive previews by @khaneliman -- Sketchybar/weather: change defaults by @khaneliman -- Flake.lock: update by @khaneliman -- Yazi: openers with getExe by @khaneliman -- Yazi: preloaders and previewers update by @khaneliman -- Regreet: sway -> hyprland by @khaneliman -- Flake.lock: update by @khaneliman -- Yazi: keymap.toml -> nix by @khaneliman -- Hyprland: use wezterm by @khaneliman -- Flake.lock: update by @khaneliman -- Yazi: theme use catppuccin.nix by @khaneliman -- Yazi: theme.toml -> nix by @khaneliman -- Yazi: move settings to separate file by @khaneliman -- Yaba-helper: updates by @khaneliman -- Hyprpaper: always restart by @khaneliman -- Hyprland: gamemode script updates by @khaneliman -- Git: move ignoreRevsFile to local config - -Throws error if file is missing... too much hassle to have global in -current git state. by @khaneliman -- Flake.lock: update by @khaneliman -- Hyprland: misc cleanup by @khaneliman -- Wezterm: warn_about_missing_glyphs=false by @khaneliman -- Hyprland: disable kanshi by @khaneliman -- Nixos/commong: disable tailscale by @khaneliman -- Overlays/yabai: lint fix by @khaneliman -- Flake.nix: lint fix by @khaneliman -- .github/workflows: fmt match solution by @khaneliman -- Tmux: set-titles by @khaneliman -- Mini/starter: reorder recent files by @khaneliman -- Khanelinix: boot permissions by @khaneliman -- Zsh: tweak completions by @khaneliman -- Flake.lock: update by @khaneliman -- Yabai: 7.0.4 -> 7.1.0 by @khaneliman -- Mini: replace startify with mini.starter by @khaneliman -- Neorg: disable for now - -Errors and dont really use by @khaneliman -- .git-blame-ignore-revs: update by @khaneliman -- Chore: nixfmt solution by @khaneliman -- Treewide: nixpkgs-fmt -> nixfmt-rfc-style by @khaneliman -- Flake.lock: update by @khaneliman -- Flake.lock: update by @khaneliman -- Flake.lock: update by @khaneliman -- Flake.lock: update by @khaneliman -- Neotest: change mapping by @khaneliman -- Flake.lock: update by @khaneliman -- Hyprland: windowrules fix ryujinx by @khaneliman -- Sops: update github access-token by @khaneliman -- Flake.lock: update - -neotest error requiring nvim-nio by @khaneliman -- Flake.lock: update by @khaneliman -- Hyprland: systemd --all by @khaneliman -- Update README.md by @khaneliman -- Tmux: terminal change to fix color issue in k9s by @khaneliman -- .git-blame-ignore-revs: update by @khaneliman -- Chore: cleanup by @khaneliman -- Chore: cleanup by @khaneliman -- Firefox: move bypass-paywalls-clean to nur package by @khaneliman -- Flake.lock: update by @khaneliman -- Khanelinix: enable kubernetes tools by @khaneliman -- Devshells/dotnet: update to support more dotnet dev by @khaneliman -- Chore: lint cleanup by @khaneliman -- Flake.lock: update by @khaneliman -- Slack-term: create module by @khaneliman -- Twitch-tui: create module by @khaneliman -- Weather_config: move to waybar module by @khaneliman -- Wakatime: move secret to neovim and vscode modules by @khaneliman -- Fish: format functions by @khaneliman -- Flake.lock: update by @khaneliman -- Aliases: move gsed to shared - -linux is already using this package for gsed, doesnt need to be -conditional by @khaneliman -- User: nixre fix conflict by @khaneliman -- User: profile.png converted to actual png by @khaneliman -- Hyprland: hyprlock immediate on keybind by @khaneliman -- User: migrate settings to home-manager by @khaneliman -- Hyprlock: update theme by @khaneliman -- Flake.lock: update by @khaneliman -- Chore: lint cleanup by @khaneliman -- Keymappings: take ownership of generic buffer commands by @khaneliman -- Bufremove: handle remove all but current by @khaneliman -- Flake.lock: update by @khaneliman -- Neovim: /*lua*/ coverage by @khaneliman -- Yabai: 7.0.3 -> 7.0.4 by @khaneliman -- Cmp: refine completion selection and insertion by @khaneliman -- Nixvim: options => opts by @khaneliman -- Lualine: winbar ignore aerial by @khaneliman -- Flake.lock: update by @khaneliman -- Treesitter: move all grammarPackages to neovim by @khaneliman -- Chore: lint fix by @khaneliman -- Flake.lock: update by @khaneliman -- Hyprland: hyprlock unlock and relock keybind fix by @khaneliman -- Conform: disable codespell - -Dumb behavior of breaking my source code on save... by @khaneliman -- Sketchybar: format config by @khaneliman -- Hyprland: try adding hyprlock focus fix keybind by @khaneliman -- Neotest: safeguard adding rustaceanvim adapter by @khaneliman -- Flake.lock: update by @khaneliman -- Hyprland: allow session lock restore by @khaneliman -- Hyprlock: hide cursor and ignore empty by @khaneliman -- Rustaceanvim: tweaks by @khaneliman -- Chore: cleanup by @khaneliman -- Dap: try adding bashdb by @khaneliman -- Dap: refactor by @khaneliman -- Rustaceanvim: move to new module by @khaneliman -- Neovim: dap wip by @khaneliman -- Neovim: backspace works like expected by @khaneliman -- Neovim: insert navigation keymaps by @khaneliman -- Waybar: hyprland window-rewrite add minecraft by @khaneliman -- Nvtop: split into nvtopPackages. by @khaneliman -- Python: consolidate in home-manager by @khaneliman -- Node: consolidate in home-manager by @khaneliman -- Git: consolidate in home-manager by @khaneliman -- Comma: move to home-manager by @khaneliman -- Flake.nix: cleanup by @khaneliman -- Flake.lock: update by @khaneliman -- Flake.lock: update by @khaneliman -- Flake.lock: update by @khaneliman -- Chore: format fix by @khaneliman -- Flake.lock: update by @khaneliman -- Lualine: disable on certain buffers by @khaneliman -- Lualine: cleanup buffer tabline by @khaneliman -- Nixvim: use lualine for tabline by @khaneliman -- Nixvim: move nvim-web-devicons by @khaneliman -- Barbar: move keymappings to module by @khaneliman -- Darwin: dock layout by @khaneliman -- Flake.nix: disable neovim nightly, for now by @khaneliman -- Nixvim: buffer format toggle keymap by @khaneliman -- Chore: lint cleanup by @khaneliman -- Nixvim: move project-nvim to new module by @khaneliman -- Nixvim: move aerial telescope keymap to aerial module by @khaneliman -- Nixvim: move noice telescope keymap to noice module by @khaneliman -- Nixvim: refactoring add telescope integration by @khaneliman -- Nixvim: notify and wilder -> noice by @khaneliman -- Nixvim: use rustaceanvim instead of just rust-analyser lsp by @khaneliman -- Flake.lock: update by @khaneliman -- Flake.lock: update by @khaneliman -- Hypr-socket-watch: use home-manager module by @khaneliman -- Chore: lint by @khaneliman -- Flake.nix: restructure inputs and overlays by @khaneliman -- Darwin/home: v3 deprecation warning by @khaneliman -- Nixvim: telescope keymaps moved and disable frecency by @khaneliman -- Chore: deadnix cleanup by @khaneliman -- Snowfall-lib: v3 migration by @khaneliman -- Khanelinix: move kvm storage by @khaneliman -- Flake.lock: update by @khaneliman -- Hyprland: swap term bindings to match darwin by @khaneliman -- Jankyborders: use upstreamed pkg by @khaneliman -- Yabai: use upstreamed pkg by @khaneliman -- Hypr_socket_watch: disable temporarily by @khaneliman -- Nixvim: lsp-format conditional with conform by @khaneliman -- Flake.lock: follow nixpkgs again by @khaneliman -- Hypr_socket_watch: restructure dependencies calling by @khaneliman -- Flake.lock: update by @khaneliman -- Nixvim: treesitter add bicep grammar by @khaneliman -- Flake.lock: update by @khaneliman -- Skhd: cleanup executables by @khaneliman -- Jankyborders: bordersrc nix expression by @khaneliman -- Darwin: jankyborders brew -> nix by @khaneliman -- Flake.nix: configure nix fmt by @khaneliman -- Dependabot.yml: update by @khaneliman -- Build(deps): bump cachix/install-nix-action from 25 to 26 - -Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 25 to 26. -- [Release notes](https://github.com/cachix/install-nix-action/releases) -- [Commits](https://github.com/cachix/install-nix-action/compare/v25...v26) - ---- -updated-dependencies: -- dependency-name: cachix/install-nix-action - dependency-type: direct:production - update-type: version-update:semver-major -... - -Signed-off-by: dependabot[bot] by @dependabot[bot] in [#84](https://github.com/khaneliman/khanelinix/pull/84) -- Flake.lock: update by @khaneliman -- Sketchybar: cpu color fix by @khaneliman -- Sketchybar: wifi popup fix and add details by @khaneliman -- Sketchybar: network use mach helper by @khaneliman -- Sketchyhelper: felix implementation and cpu update by @khaneliman -- Flake.lock: update by @khaneliman -- Theme: use capitalize function - -Seems to be a catppuccin specific thing, though... need to break theme out into separate modules probably. by @khaneliman -- Sketchybar: 2.20.1-unstable -> 2.21.0 by @khaneliman -- Yabai: 6.0.15 -> 7.0.2 by @khaneliman -- Flake.lock: update by @khaneliman -- Hypridle: package set to flake output by @khaneliman -- Hyprlock: package set to flake output by @khaneliman -- Flake.lock: hyprland flakes dont follow nixpkgs by @khaneliman -- Chore: lint fix by @khaneliman -- Hyprpaper: use flake module by @khaneliman -- Nixvim: project-nvim telescope deprecation fix by @khaneliman -- Flake.lock: update by @khaneliman -- Ncspot: move to music suite by @khaneliman -- Mpd: hide behind linux check by @khaneliman -- Flake.lock: update by @khaneliman -- Update README.md by @khaneliman -- Khanelinix: use sudo-rs by @khaneliman -- Flake.lock: update by @khaneliman -- Nixvim: dap by @khaneliman -- Nixvim: telescope keybinding updates by @khaneliman -- Nixvim: try conform-nvim by @khaneliman -- Nixvim: neotree open on first buffer by @khaneliman -- Nixvim: show neo-tree on buffread by @khaneliman -- Nixvim: open minimap on buffread by @khaneliman -- Nixvim: cleanup keymapping conflicts by @khaneliman -- Nixvim: move keymappings closer to plugins by @khaneliman -- Nixvim: neo-tree visible hidden by @khaneliman -- Chore: consolidate nixvim plugins to plugins folder by @khaneliman -- Nixvim: nvim-colorizer keymapping and tweak by @khaneliman -- Nixvim: neo-tree tweaks by @khaneliman -- Nixvim: barbar tweak by @khaneliman -- Yazi: 0.2.3 -> 0.2.4 by @khaneliman -- Update README.md by @khaneliman -- Chore: cleanup by @khaneliman -- Yazi: border style by @khaneliman -- Yazi: tab keybinding updates by @khaneliman -- Ranger: commit bump by @khaneliman -- Yazi: move preset overrides to plugins folders by @khaneliman -- Yazi: keymap.toml taplo formatting by @khaneliman -- Nixvim: enable taplo lsp for toml by @khaneliman -- Yazi: plugins add smart-enter by @khaneliman -- Nixvim: project-nvim enable explicitly by @khaneliman -- Nixvim: startify tweaks by @khaneliman -- Nixvim: telescope project-nvim by @khaneliman -- Nixvim: telescope extensions added by @khaneliman -- Nixvim: lsp ccls update and disable clangd by @khaneliman -- Flake.lock: update by @khaneliman -- Nixvim: rust-analyzer updates by @khaneliman -- Flake.lock: update by @khaneliman -- Yabai: cleanup old border settings by @khaneliman -- Darwin: common suite tools by @khaneliman -- Fastfetch: clean up configs by @khaneliman -- Sketchybar: bump overlay commit by @khaneliman -- Flake.lock: update by @khaneliman -- Build(deps): bump DeterminateSystems/update-flake-lock from 20 to 21 - -Bumps [DeterminateSystems/update-flake-lock](https://github.com/determinatesystems/update-flake-lock) from 20 to 21. -- [Release notes](https://github.com/determinatesystems/update-flake-lock/releases) -- [Commits](https://github.com/determinatesystems/update-flake-lock/compare/v20...v21) - ---- -updated-dependencies: -- dependency-name: DeterminateSystems/update-flake-lock - dependency-type: direct:production - update-type: version-update:semver-major -... - -Signed-off-by: dependabot[bot] by @dependabot[bot] in [#82](https://github.com/khaneliman/khanelinix/pull/82) -- Chore: nixpkgs-wayland fix upstreamed, use it again by @khaneliman -- Chore: flake lock update by @khaneliman -- Chore: cleanup old sketchybar config by @khaneliman -- Sketchybar: network cleanup by @khaneliman -- Chore: flake lock update by @khaneliman -- Sketchybar: spaces module cleanup by @khaneliman -- Sketchybar: apple module cleanup by @khaneliman -- Sketchybar: today module cleanup by @khaneliman -- Sketchybar: stats animation by @khaneliman -- Sketchybar: commit bump by @khaneliman -- Sketchybar: bluetooth add system_woke subscription by @khaneliman -- Sketchybar: wifi module cleanup by @khaneliman -- Sketchybar: volume module cleanup by @khaneliman -- Chore: flake lock update by @khaneliman -- Sketchybar: github module cleanup by @khaneliman -- Sketchybar: bluetooth module cleanup by @khaneliman -- Sketchybar: battery module cleanup by @khaneliman -- Sketchybar: brew fixes by @khaneliman -- Chore: neovim-nightly follows nixpkgs by @khaneliman -- Chore: flake lock update by @khaneliman -- Chore: lint cleanup by @khaneliman -- Sketchybar: more cleanup by @khaneliman in [#81](https://github.com/khaneliman/khanelinix/pull/81) -- Sketchybar: cleanup by @khaneliman -- Sketchybar: more right click refreshes by @khaneliman -- Sketchybar: popup toggle util by @khaneliman -- Sketchybar: enable right click refreshes by @khaneliman -- Sketchybar: reenable hotload by @khaneliman -- Sketchybar: update_freq tweaks by @khaneliman -- Sketchybar: cpu mach_helper by @khaneliman -- Sketchybar: overlay commit bump by @khaneliman -- Sketchybar: sketchybar.so check instead of directory check by @khaneliman -- Sketchybar: disable volume osd by @khaneliman -- Sketchybar: disable hotload trial by @khaneliman -- Sketchybar: use sbar.exec callbacks by @khaneliman -- Sketchybar: use sbarlua by @khaneliman -- Sketchybar: 2.20.1 -> master by @khaneliman -- Neovim: todoTelescope keybind update by @khaneliman -- Chore: flake lock update by @khaneliman -- Sketchybar: helper compiles by @khaneliman -- Sketchybar: clean up source paths by @khaneliman -- Chore: flake lock update by @khaneliman -- Yabai: 6.0.12 -> 6.0.15 by @khaneliman -- Hyprlock: use screenshot with blur by @khaneliman -- Hyprlock: layout update by @khaneliman -- Hyprlock: tweak with new home-manager module updates by @khaneliman -- Chore: clean up flake input forks by @khaneliman -- Hyprland: swaylock -> hyprlock by @khaneliman -- Revert "waybar: go back to nixpkgs-wayland" - -This reverts commit 93e0343e744c8774b2b3ceed822d154321f1a84f. -Nixpkgs-wayland is currently not updating because of failing packages. Readd after its updated. by @khaneliman -- Waybar: go back to nixpkgs-wayland by @khaneliman -- Chore: flake lock update by @khaneliman -- Chore: flake lock update by @khaneliman -- Waybar: use new persistent workspace feature branch by @khaneliman -- Chore: lint fixes by @khaneliman -- Chore: flake lock update and workarounds for broken nixos-unstable and nixvim by @khaneliman -- Hypridle: use flake pkg by @khaneliman -- Hypridle: use hm-module from flake by @khaneliman -- Hyprland: use new hypridle instead of swayidle by @khaneliman -- Yabai: 6.0.11 -> 6.0.12 by @khaneliman -- Regreet: use nixpkgs-wayland sway by @khaneliman -- Wlroots: wl-screenrec and wlr-randr use nixpkgs-wayland by @khaneliman -- Swaylock-effects: use nixpkgs-wayland by @khaneliman -- Firefox: bpc latest instead of versioned by @khaneliman -- Chore: flake lock update by @khaneliman -- Chore: flake lock update by @khaneliman -- Nixvim: tagbar extraConfig -> settings by @khaneliman -- Chore: flake lock update by @khaneliman -- Nixvim: startify header update by @khaneliman -- Nixvim: manual todo matching -> todo-comments plugin by @khaneliman -- Dynamic-island-helper: create nix derivation by @khaneliman -- Sketchyhelper: create nix derivation by @khaneliman -- Chore: flake lock update by @khaneliman -- Yabai: 6.0.7 -> 6.0.11 by @khaneliman -- Yazi: keymap update by @khaneliman -- Chore: flake lock update by @khaneliman -- Chore: sketchybar bump by @khaneliman -- Chore: flake lock update by @khaneliman -- Chore: flake lock update by @khaneliman -- Lint: cleanup by @khaneliman -- Nixvim: update which-key sections by @khaneliman -- Nixvim: neo-tree bump width by @khaneliman -- Feat: nixvim add notify and toggle formatting keymap by @khaneliman -- Refactor: cleanup ripgrep dependency by @khaneliman -- Refactor: neo-tree tweaks by @khaneliman -- Chore: disable wezterm building on wsl home by @khaneliman -- Feat: nixvim completions added by @khaneliman -- Feat: nixvim add wilder by @khaneliman -- Refactor: nixvim remove tabnine by @khaneliman -- Feat: nixvim toggleterm lazygit by @khaneliman -- Refactor: nixvim keymappings support optional attributes by @khaneliman -- Refactor: nixvim floatterm -> toggleterm by @khaneliman -- Chore: nixvim keymappings by @khaneliman -- Refactor: manual imports -> import non default nix files by @khaneliman -- Refactor: nixvim move gitsigns into file by @khaneliman -- Chore: update telescope keymappings by @khaneliman -- Chore: cleanup old nvim config by @khaneliman -- Feat: lsp-format all and fix nix by @khaneliman -- Refactor: codeium-vim -> codeium.nvim by @khaneliman -- Feat: nixvim add codeium by @khaneliman -- Feat: nixvim add lsp servers by @khaneliman -- Feat: sketchybar 2.20.0 by @khaneliman -- Chore: deadnix cleanup by @khaneliman -- Feat: nixvim keymappings by @khaneliman in [#73](https://github.com/khaneliman/khanelinix/pull/73) -- Feat: nixvim add wakatime by @khaneliman -- Feat: nixvim general options by @khaneliman -- Feat: nixvim by @khaneliman -- Feat: yabai 6.0.7 by @khaneliman -- Chore: flake lock update by @khaneliman -- Feat: git rebase again by @khaneliman -- Chore: update k9s home-manager config by @khaneliman -- Feat: waybar add systemd-failed-units by @khaneliman -- Chore: bump dotnet sdk version neovim by @khaneliman -- Chore: flake lock update and workarounds by @khaneliman -- Chore: flake lock update by @khaneliman -- Chore: flake lock update - -Add overlays to compensate for broken packages. by @khaneliman -- Chore(deps): bump cachix/cachix-action from 13 to 14 - -Bumps [cachix/cachix-action](https://github.com/cachix/cachix-action) from 13 to 14. -- [Release notes](https://github.com/cachix/cachix-action/releases) -- [Commits](https://github.com/cachix/cachix-action/compare/v13...v14) - ---- -updated-dependencies: -- dependency-name: cachix/cachix-action - dependency-type: direct:production - update-type: version-update:semver-major -... - -Signed-off-by: dependabot[bot] by @dependabot[bot] in [#70](https://github.com/khaneliman/khanelinix/pull/70) -- Chore(deps): bump cachix/install-nix-action from 24 to 25 - -Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 24 to 25. -- [Release notes](https://github.com/cachix/install-nix-action/releases) -- [Commits](https://github.com/cachix/install-nix-action/compare/v24...v25) - ---- -updated-dependencies: -- dependency-name: cachix/install-nix-action - dependency-type: direct:production - update-type: version-update:semver-major -... - -Signed-off-by: dependabot[bot] by @dependabot[bot] in [#71](https://github.com/khaneliman/khanelinix/pull/71) -- Feat: yabai 6.0.4 -> 6.0.6 by @khaneliman -- Chore: flake lock update by @khaneliman -- Chore: waybar overlay changed to upstream by @khaneliman -- Feat: waybar overlay for unreleased fix by @khaneliman -- Chore: flake lock update by @khaneliman -- Chore: white space cleanup by @khaneliman -- Chore: flake lock update by @khaneliman -- Feat: yabai 6.0.4 by @khaneliman -- Chore: minor firefox userchrome styling setup by @khaneliman -- Refactor: darwin remove alacritty by @khaneliman -- Chore: flake lock update by @khaneliman -- Feat: firefox add browser toolbox by @khaneliman -- Refactor: clean up userchrome by @khaneliman -- Feat: sidebery instead of tabcenter by @khaneliman -- Feat: firefox gpu acceleration and hardware decoding options by @khaneliman -- Feat: khanelimac firefox battery tweaks by @khaneliman -- Chore: flake lock update by @khaneliman -- Chore: sketchybar.h update to latest by @khaneliman -- Chore: clean up overlays by @khaneliman -- Chore: flake lock update by @khaneliman -- Chore: wezterm update by @khaneliman -- Chore: sketchybar restart dynamic island on start by @khaneliman -- Chore: homebrew tap cleanup - api default support by @khaneliman -- Chore: flake lock update by @khaneliman -- Feat: dotnet devshell by @khaneliman -- Feat: angular devshell by @khaneliman -- Chore: flake lock update by @khaneliman -- Refactor: sway use package option by @khaneliman -- Refactor: wlogout nixos -> home-manager by @khaneliman -- Chore: flake lock update by @khaneliman -- Chore: deadnix by @khaneliman -- Chore: cava pkgs.emptyDirectory instead of null by @khaneliman -- Chore: flake lock update by @khaneliman -- Chore: clean up pinentry warnings by @khaneliman -- Chore: flake lock update by @khaneliman -- Feat: waybar libre office icons by @khaneliman -- Refactor: git workaround by @khaneliman -- Refactor: cdrom group using user config option by @khaneliman in [#66](https://github.com/khaneliman/khanelinix/pull/66) -- Refactor: use gerg spicetify by @khaneliman -- Refactor: use catppuccin pkg qt theme file by @khaneliman -- Refactor: git changes by @khaneliman -- Chore: flake lock update by @khaneliman -- Chore: comment out systems.modules.home by @khaneliman -- Chore: flake lock update by @khaneliman -- Chore: update sops.yaml by @khaneliman -- Wip by @khaneliman -- Chore(deps): bump cachix/install-nix-action from 23 to 24 (#60) - -Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 23 to 24. -- [Release notes](https://github.com/cachix/install-nix-action/releases) -- [Commits](https://github.com/cachix/install-nix-action/compare/v23...v24) - ---- -updated-dependencies: -- dependency-name: cachix/install-nix-action - dependency-type: direct:production - update-type: version-update:semver-major -... - -Signed-off-by: dependabot[bot] -Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> by @dependabot[bot] in [#60](https://github.com/khaneliman/khanelinix/pull/60) -- Chore(deps): bump cachix/cachix-action from 12 to 13 (#59) - -Bumps [cachix/cachix-action](https://github.com/cachix/cachix-action) from 12 to 13. -- [Release notes](https://github.com/cachix/cachix-action/releases) -- [Commits](https://github.com/cachix/cachix-action/compare/v12...v13) - ---- -updated-dependencies: -- dependency-name: cachix/cachix-action - dependency-type: direct:production - update-type: version-update:semver-major -... - -Signed-off-by: dependabot[bot] -Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> by @dependabot[bot] in [#59](https://github.com/khaneliman/khanelinix/pull/59) -- Chore(deps): bump actions/labeler from 4 to 5 (#58) - -Bumps [actions/labeler](https://github.com/actions/labeler) from 4 to 5. -- [Release notes](https://github.com/actions/labeler/releases) -- [Commits](https://github.com/actions/labeler/compare/v4...v5) - ---- -updated-dependencies: -- dependency-name: actions/labeler - dependency-type: direct:production - update-type: version-update:semver-major -... - -Signed-off-by: dependabot[bot] -Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> by @dependabot[bot] in [#58](https://github.com/khaneliman/khanelinix/pull/58) -- Chore: disable nix flake check for now by @khaneliman -- Chore: lint fix by @khaneliman -- Chore: flake lock update by @khaneliman -- Refactor: move betterdiscord theme to home-manager by @khaneliman -- Refactor: cleanup khanelinix services by @khaneliman -- Refactor: nix-ld -> nix-ld-rs by @khaneliman -- Chore: flake lock update and remove overlay by @khaneliman -- Chore: lint cleanup by @khaneliman -- Chore: flake lock update by @khaneliman -- Refactor: move cava to home-manager module by @khaneliman -- Chore: flake lock update by @khaneliman -- Refactor: go back to swaylock-effects (correct fork) by @khaneliman -- Chore: deadnix cleanup by @khaneliman -- Refactor: swayidle use nixpkgs-wayland by @khaneliman -- Refactor: wlroots suite use nixpkgs-wayland by @khaneliman -- Refactor: use nixpkgs-wayland wlogout by @khaneliman -- Refactor: nixify qt config by @khaneliman -- Refactor: move hyprland polish to appendConfig by @khaneliman -- Refactor: gtk reorganize by @khaneliman -- Chore: cleanup remaining sfmono by @khaneliman -- Refactor: move displays.conf to prependConfig hyprland by @khaneliman -- Feat: hyprland numlock by default by @khaneliman -- Chore: wezterm bump by @khaneliman -- Chore: cleanup gitignore result by @khaneliman -- Chore: cleanup overlay after nixpkgs update by @khaneliman -- Refactor: try upstream swaylock again by @khaneliman -- Refactor: try locking swaylock differently by @khaneliman -- Refactor: use new firefox policies option by @khaneliman -- Chore: flake lock update by @khaneliman -- Refactor: gnome firefox support by @khaneliman -- Refactor: move firefox config to home module by @khaneliman -- Chore: Remove dead code (#54) - -Co-authored-by: khaneliman by @github-actions[bot] in [#54](https://github.com/khaneliman/khanelinix/pull/54) -- Chore: flake lock update by @khaneliman -- Refactor: argon -> neon by @khaneliman -- Feat: monaspace nerd font by @khaneliman -- Chore: flake lock update by @khaneliman -- Chore: hyprland environment variable update by @khaneliman -- Chore: flake lock update by @khaneliman -- Feat: replace radeontop with amdgpu_top by @khaneliman -- Feat: file manager updates by @khaneliman -- Chore: flake lock update by @khaneliman -- Chore: misc mac cleanup by @khaneliman -- Chore: flake lock update by @khaneliman -- Chore: lsp language comments for nix expressions by @khaneliman -- Chore: networking tweaks by @khaneliman -- Chore: cleanup amdgpu by @khaneliman -- Chore: 1password-gui stable by @khaneliman -- Chore: flake lock update by @khaneliman -- Chore: manual dynamic island cleanup by @khaneliman -- Chore: lint fix by @khaneliman -- Chore: flake lock update by @khaneliman -- Refactor: sketchybar theme by @khaneliman -- Feat: yazi catppuccin theme by @khaneliman -- Feat: yazi layout customization by @khaneliman -- Chore: dynamic island sketchybar update by @khaneliman -- Chore: cleanup sketchybar colors.sh usage by @khaneliman -- Refactor: tweak caprine styling more by @khaneliman -- Feat: jankyborders homebrew by @khaneliman -- Chore: flake lock update and workarounds for broken packages by @khaneliman -- Feat: wezterm git package by @khaneliman -- Feat: multiple neovim configs by @khaneliman -- Chore: deadnix by @khaneliman -- Chore: flake lock update by @khaneliman -- Feat: macos overlays until nixpkgs updated by @khaneliman -- Feat: monaspace font by @khaneliman -- Feat: rofi enhancements by @khaneliman -- Chore: flake lock update by @khaneliman -- Chore: flake lock update and fastfetch workaround by @khaneliman -- Feat: nvidialess specialization by @khaneliman -- Chore: flake lock update by @khaneliman in [#45](https://github.com/khaneliman/khanelinix/pull/45) -- Feat: shell improvements by @khaneliman -- Feat: retroarch core updates and full option by @khaneliman -- Chore: flake lock update (breaking changes) by @khaneliman -- Feat: fzf module by @khaneliman -- Chore: key input timeout removal by @khaneliman -- Chore: sway lazy man timeouts by @khaneliman -- Feat: kitty add shell integration by @khaneliman -- Chore: flake lock update by @khaneliman -- Chore: cleanup unnecessary scratchpad exec-once by @khaneliman -- Feat: hyprland default app workspace rules by @khaneliman -- Feat: hyprland named specials by @khaneliman -- Chore: flake lock update by @khaneliman -- Feat: thunderbird reminders pinned upper right by @khaneliman -- Feat: hyprland new tmux terminal bind by @khaneliman -- Chore: flake.lock: Update (#40) - -Flake lock file updates: - -• Updated input 'home-manager': - 'github:nix-community/home-manager/c5c1ea85181d2bb44e46e8a944a8a3f56ad88f19' (2023-10-19) - → 'github:nix-community/home-manager/ae631b0b20f06f7d239d160723d228891ddb2fe0' (2023-10-20) -• Updated input 'hyprland': - 'github:hyprwm/Hyprland/bb9d0aed5bd11879f5a532e26fc0a91d1a8af714' (2023-10-20) - → 'github:hyprwm/Hyprland/4a79718fe8e4601983797d254cce39960827cb02' (2023-10-20) -• Updated input 'nixpkgs': - 'github:nixos/nixpkgs/ca012a02bf8327be9e488546faecae5e05d7d749' (2023-10-16) - → 'github:nixos/nixpkgs/7c9cc5a6e5d38010801741ac830a3f8fd667a7a0' (2023-10-19) -• Updated input 'nixpkgs-master': - 'github:nixos/nixpkgs/a0961ec2b7a4c7014a6233a290883e33ea0db04d' (2023-10-20) - → 'github:nixos/nixpkgs/28eb936285ed02bbd53e3771f1e0153ced640c44' (2023-10-20) -• Updated input 'nixpkgs-wayland': - 'github:nix-community/nixpkgs-wayland/fad6dabaa830ba040cdbebf685c1de476285f1f2' (2023-10-20) - → 'github:nix-community/nixpkgs-wayland/95eccd7ecead085fb419309dc9f351a3d252aaa7' (2023-10-20) -• Updated input 'nur': - 'github:nix-community/NUR/d531cd7ef0001eaba84743d6666726df3c3b5620' (2023-10-20) - → 'github:nix-community/NUR/5275d02ba283b544d714ede2d5c8b846854af3f3' (2023-10-20) - -Co-authored-by: github-actions[bot] by @github-actions[bot] in [#40](https://github.com/khaneliman/khanelinix/pull/40) -- Chore: Remove dead code (#42) - -Co-authored-by: khaneliman by @github-actions[bot] in [#42](https://github.com/khaneliman/khanelinix/pull/42) -- Refactor: modularize waybar css by @khaneliman -- Feat: waybar hyprland workspaces styling change by @khaneliman -- Chore: flake lock update by @khaneliman -- Refactor: waybar module refactor by @khaneliman -- Feat: waybar css updates by @khaneliman -- Feat: temporary waybar overlay with fixes by @khaneliman -- Chore: flake.lock: Update (#39) - -Flake lock file updates: - -• Updated input 'home-manager': - 'github:nix-community/home-manager/78125bc681d12364cb65524eaa887354134053d0' (2023-10-15) - → 'github:nix-community/home-manager/3433206e51766b4164dad368a81325efbf343fbe' (2023-10-18) -• Updated input 'hyprland': - 'github:hyprwm/Hyprland/54e1c2ccbdfa6dfade63221b5df02bf8578d96a6' (2023-10-16) - → 'github:hyprwm/Hyprland/d70cc88dab11bc6d1095523a0ce655dff40b27a2' (2023-10-18) -• Updated input 'nixpkgs': - 'github:nixos/nixpkgs/5e4c2ada4fcd54b99d56d7bd62f384511a7e2593' (2023-10-11) - → 'github:nixos/nixpkgs/ca012a02bf8327be9e488546faecae5e05d7d749' (2023-10-16) -• Updated input 'nixpkgs-wayland': - 'github:nix-community/nixpkgs-wayland/86615cbbddb6797ca143a24cfd36941cb9255f14' (2023-10-16) - → 'github:nix-community/nixpkgs-wayland/6fc186ae56a3debdd628c0e4df9e133e46299866' (2023-10-18) -• Updated input 'nur': - 'github:nix-community/NUR/998d09217e50c2c30ac41c4f3c8ddfc83427ffb2' (2023-10-16) - → 'github:nix-community/NUR/6b779ecc1afe9d3709d718c613136f56b3ac8b52' (2023-10-18) -• Updated input 'rustup-overlay': - 'github:oxalica/rust-overlay/056256f2fcf3c5a652dbc3edba9ec1a956d41f56' (2023-10-16) - → 'github:oxalica/rust-overlay/a2ccfb2134622b28668a274e403ba6f075ae1223' (2023-10-18) - -Co-authored-by: github-actions[bot] by @github-actions[bot] in [#39](https://github.com/khaneliman/khanelinix/pull/39) -- Feat: darwin tmux skhd update by @khaneliman -- Refactor: git pull ff again remove whitespace override by @khaneliman -- Refactor: hyprland persistent workspace instead of waybar by @khaneliman -- Refactor: move obs to home-manager by @khaneliman -- Chore: flake.lock: Update (#37) - -Flake lock file updates: - -• Updated input 'nur': - 'github:nix-community/NUR/cc83a858d3dbf50a934a4f74fe5508ac2fa72bc5' (2023-10-16) - → 'github:nix-community/NUR/998d09217e50c2c30ac41c4f3c8ddfc83427ffb2' (2023-10-16) - -Co-authored-by: github-actions[bot] by @github-actions[bot] in [#37](https://github.com/khaneliman/khanelinix/pull/37) -- Chore: sort waybar module definitions by @khaneliman -- Chore: flake.lock: Update (#36) - -* chore: flake.lock: Update - -Flake lock file updates: - -• Updated input 'home-manager': - 'github:nix-community/home-manager/d4a5076ea8c2c063c45e0165f9f75f69ef583e20' (2023-10-14) - → 'github:nix-community/home-manager/78125bc681d12364cb65524eaa887354134053d0' (2023-10-15) -• Updated input 'hyprland': - 'github:hyprwm/Hyprland/261c594458fec8bc64136eebf7c7e4e5ab421907' (2023-10-14) - → 'github:hyprwm/Hyprland/8af3e7beebb96eceb8a094a20286d57e3b135938' (2023-10-15) -• Updated input 'nixpkgs-wayland': - 'github:nix-community/nixpkgs-wayland/6b428305043afaf77119adb44dfea246c809e07f' (2023-10-14) - → 'github:nix-community/nixpkgs-wayland/0eaba2ea36991eeb0b6c7c5b97c6270c7aecfb9c' (2023-10-15) -• Updated input 'nixpkgs-wayland/lib-aggregate': - 'github:nix-community/lib-aggregate/9f495e4feea66426589cbb59ac8b972993b5d872' (2023-10-08) - → 'github:nix-community/lib-aggregate/af42578368ca0c97d5836ba55b146745911aaecc' (2023-10-15) -• Updated input 'nixpkgs-wayland/lib-aggregate/nixpkgs-lib': - 'github:nix-community/nixpkgs.lib/59da6ac0c02c48aa92dee37057f978412797db2a' (2023-10-08) - → 'github:nix-community/nixpkgs.lib/05c07c73de74725ec7efa6609011687035a92c0f' (2023-10-15) -• Updated input 'nur': - 'github:nix-community/NUR/a7f7dc7099baec26335cb9335e0adfc3d838e098' (2023-10-15) - → 'github:nix-community/NUR/366ab72bab2a056be9834de1270132072c83f574' (2023-10-15) -• Updated input 'yubikey-guide': - 'github:drduh/YubiKey-Guide/4a641dffd002e8132bcbbcd46089acfa2040c749' (2023-08-13) - → 'github:drduh/YubiKey-Guide/703c6aa37f45b68ec872de08d064a31aac8ffa93' (2023-10-15) - -* feat: waybar animation overhaul - -* refactor: waybar modules separated into nix expressions - ---------- - -Co-authored-by: github-actions[bot] -Co-authored-by: Austin Horstman by @github-actions[bot] in [#36](https://github.com/khaneliman/khanelinix/pull/36) -- Chore: copy pasta cleanup by @khaneliman -- Chore: flake.lock: Update (#35) - -chore: flake.lock: Update - -Flake lock file updates: - -• Updated input 'home-manager': - 'github:nix-community/home-manager/6bba64781e4b7c1f91a733583defbd3e46b49408' (2023-10-10) - → 'github:nix-community/home-manager/d4a5076ea8c2c063c45e0165f9f75f69ef583e20' (2023-10-14) -• Updated input 'hyprland': - 'github:hyprwm/Hyprland/424c9a7e704590db5c823557e5e388e366f7b1cd' (2023-10-13) - → 'github:hyprwm/Hyprland/261c594458fec8bc64136eebf7c7e4e5ab421907' (2023-10-14) -• Updated input 'nixpkgs-wayland': - 'github:nix-community/nixpkgs-wayland/7dcd2934b3cf761471d5e9bab8d8fb0d50ab2bca' (2023-10-13) - → 'github:nix-community/nixpkgs-wayland/6b428305043afaf77119adb44dfea246c809e07f' (2023-10-14) -• Updated input 'nur': - 'github:nix-community/NUR/25fedce20d4b0671adeefa9d52f6b69079af84c0' (2023-10-13) - → 'github:nix-community/NUR/00cf27339d55115a0f5311041dded91049e4426d' (2023-10-14) -• Updated input 'rustup-overlay': - 'github:oxalica/rust-overlay/b48a7e5dab1b472dd9c9ee9053401489dbb4d6fc' (2023-10-13) - → 'github:oxalica/rust-overlay/dce60ca7fca201014868c08a612edb73a998310f' (2023-10-14) -• Updated input 'sops-nix': - 'github:Mic92/sops-nix/f995ea159252a53b25fa99824f2891e3b479d511' (2023-10-11) - → 'github:Mic92/sops-nix/7711514b8543891eea6ae84392c74a379c5010de' (2023-10-14) - -Co-authored-by: github-actions[bot] by @github-actions[bot] in [#35](https://github.com/khaneliman/khanelinix/pull/35) -- Chore: cleanup code length theme module by @khaneliman -- Refactor: move bat and delta theme to theme module by @khaneliman -- Refactor: move tmux catppuccin to theme module by @khaneliman -- Chore: fromyaml runcommand naming by @khaneliman -- Chore: flake.lock: Update (#34) - -Flake lock file updates: - -• Updated input 'hyprland': - 'github:hyprwm/Hyprland/3a61350286de842c7f1566c38e2b42821080ddf4' (2023-10-12) - → 'github:hyprwm/Hyprland/424c9a7e704590db5c823557e5e388e366f7b1cd' (2023-10-13) -• Updated input 'nixpkgs-wayland': - 'github:nix-community/nixpkgs-wayland/b3a13eac46963b8f5343d481a282d92df0d39e06' (2023-10-13) - → 'github:nix-community/nixpkgs-wayland/7dcd2934b3cf761471d5e9bab8d8fb0d50ab2bca' (2023-10-13) -• Updated input 'nur': - 'github:nix-community/NUR/527c0fa45b385206d5c6e6bbed7e1a6ad096fda9' (2023-10-13) - → 'github:nix-community/NUR/25fedce20d4b0671adeefa9d52f6b69079af84c0' (2023-10-13) - -Co-authored-by: github-actions[bot] by @github-actions[bot] in [#34](https://github.com/khaneliman/khanelinix/pull/34) -- Chore: secret update by @khaneliman -- Feat: lsd custom aliases by @khaneliman -- Refactor: break git aliases out into separate module by @khaneliman -- Feat: try to arrange calendar reminder notifications by @khaneliman -- Refactor: development tui to home by @khaneliman -- Refactor: move social tui to home packages by @khaneliman -- Refactor: sops json -> yaml by @khaneliman -- Feat: twitch-tui by @khaneliman -- Feat: git diff-so-fancy -> delta by @khaneliman -- Refactor: bottom uses new theme package by @khaneliman -- Refactor: k9s use new theme package by @khaneliman -- Refactor: btop use new theme package by @khaneliman -- Refactor: lazygit use new theme package by @khaneliman -- Refactor: bat theme attribute set new package by @khaneliman -- Chore: flake.lock: Update (#33) - -chore: flake.lock: Update - -Flake lock file updates: - -• Updated input 'hyprland': - 'github:hyprwm/Hyprland/06cc42441cd5b24444f7c79495851dedde8bc732' (2023-10-11) - → 'github:hyprwm/Hyprland/3a61350286de842c7f1566c38e2b42821080ddf4' (2023-10-12) -• Updated input 'neovim-config': - 'github:khaneliman/khanelivim/e4f338261ee4c5086a577f3b57f3e66c42074def' (2023-10-09) - → 'github:khaneliman/khanelivim/76c4249afaada3a35c1c2eb84ffce0c25592c196' (2023-10-12) -• Updated input 'nixpkgs-wayland': - 'github:nix-community/nixpkgs-wayland/8ca67f97319a954d41e08e65bbbd9b4552f81e05' (2023-10-12) - → 'github:nix-community/nixpkgs-wayland/090c471a5bf3e137c106df899a5abdd9af6a586f' (2023-10-12) -• Updated input 'nur': - 'github:nix-community/NUR/c324f1bd5ad41d63a4721f08760480e346fbff0c' (2023-10-12) - → 'github:nix-community/NUR/9652d4b7c5c05d982e69d1c9df8d05010d431ba0' (2023-10-12) - -Co-authored-by: github-actions[bot] by @github-actions[bot] -- Feat: hyprland thunderbird reminder rules by @khaneliman -- Feat: lsof by @khaneliman -- Chore: Remove dead code (#30) by @github-actions[bot] in [#30](https://github.com/khaneliman/khanelinix/pull/30) -- Chore: flake.lock update - -Flake lock file updates: - -• Updated input 'hyprland': - 'github:hyprwm/Hyprland/d83357f4976a240a4418a1a0a16641518a47da25' (2023-10-10) - → 'github:hyprwm/Hyprland/06cc42441cd5b24444f7c79495851dedde8bc732' (2023-10-11) -• Updated input 'nixos-hardware': - 'github:nixos/nixos-hardware/c2bbfcfc3d12351919f8df7c7d6528f41751d0a3' (2023-10-10) - → 'github:nixos/nixos-hardware/d6b554a85caac840430a822aae963c811e9c7e26' (2023-10-11) -• Updated input 'nixpkgs-wayland': - 'github:nix-community/nixpkgs-wayland/a86a11dea571a2e757295aabd4e085d3aff7dd23' (2023-10-10) - → 'github:nix-community/nixpkgs-wayland/941e5c403f01de6161c7d233845d309c64d021a6' (2023-10-11) -• Updated input 'nur': - 'github:nix-community/NUR/6b1a5fb1a213d7daf13f3af6757321a288876d59' (2023-10-10) - → 'github:nix-community/NUR/9e3dfb3a12fc0be2722bb4a58c25656f5eae3915' (2023-10-11) -• Updated input 'rustup-overlay': - 'github:oxalica/rust-overlay/c0df7f2a856b5ff27a3ce314f6d7aacf5fda546f' (2023-10-09) - → 'github:oxalica/rust-overlay/c6d2f0bbd56fc833a7c1973f422ca92a507d0320' (2023-10-11) -• Updated input 'sops-nix': - 'github:Mic92/sops-nix/6b32358c22d2718a5407d39a8236c7bd9608f447' (2023-10-09) - → 'github:Mic92/sops-nix/f995ea159252a53b25fa99824f2891e3b479d511' (2023-10-11) by @github-actions[bot] in [#31](https://github.com/khaneliman/khanelinix/pull/31) -- Feat: 1password home config by @khaneliman -- Feat: darwin ssh setup by @khaneliman -- Refactor: nixos mdns by @khaneliman -- Feat: darwin networking disable stealth by @khaneliman -- Feat: khanelimac ssh config by @khaneliman -- Feat: hyprpaper service to handle crashes by @khaneliman -- Flake.lock: Update - -Flake lock file updates: - -• Updated input 'home-manager': - 'github:nix-community/home-manager/3c1d8758ac3f55ab96dcaf4d271c39da4b6e836d' (2023-10-08) - → 'github:nix-community/home-manager/6bba64781e4b7c1f91a733583defbd3e46b49408' (2023-10-10) -• Updated input 'hyprland': - 'github:hyprwm/Hyprland/499df49f7b28f9e3be9b1c53843fd5c465dec60b' (2023-10-08) - → 'github:hyprwm/Hyprland/d83357f4976a240a4418a1a0a16641518a47da25' (2023-10-10) -• Updated input 'neovim-config': - 'github:khaneliman/khanelivim/4ee64fd7b218c0fda4727f3b09a32617d0b22314' (2023-10-08) - → 'github:khaneliman/khanelivim/e4f338261ee4c5086a577f3b57f3e66c42074def' (2023-10-09) -• Updated input 'nixos-hardware': - 'github:nixos/nixos-hardware/bb2db418b616fea536b1be7f6ee72fb45c11afe0' (2023-10-06) - → 'github:nixos/nixos-hardware/c2bbfcfc3d12351919f8df7c7d6528f41751d0a3' (2023-10-10) -• Updated input 'nixos-wsl': - 'github:nix-community/nixos-wsl/337edef90c8abe35b42e95aecf510a063dad02dd' (2023-10-02) - → 'github:nix-community/nixos-wsl/5da7c4fd0ab9693d83cae50de7d9430696f92568' (2023-10-09) -• Updated input 'nixos-wsl/flake-compat': - 'github:edolstra/flake-compat/35bb57c0c8d8b62bbfd284272c928ceb64ddbde9' (2023-01-17) - → 'github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33' (2023-10-04) -• Updated input 'nixpkgs': - 'github:nixos/nixpkgs/87828a0e03d1418e848d3dd3f3014a632e4a4f64' (2023-10-06) - → 'github:nixos/nixpkgs/f99e5f03cc0aa231ab5950a15ed02afec45ed51a' (2023-10-09) -• Updated input 'nixpkgs-wayland': - 'github:nix-community/nixpkgs-wayland/6713cae5c550a7a68ac0bca534ec4e92585c9200' (2023-10-08) - → 'github:nix-community/nixpkgs-wayland/a86a11dea571a2e757295aabd4e085d3aff7dd23' (2023-10-10) -• Updated input 'nixpkgs-wayland/nix-eval-jobs': - 'github:nix-community/nix-eval-jobs/26af7cabdb7ee637dc9b63f1ce609a467534713c' (2023-10-07) - → 'github:nix-community/nix-eval-jobs/7cdbfd5ffe59fe54fd5c44be96f58c45e25d5b62' (2023-10-09) -• Updated input 'nixpkgs-wayland/nix-eval-jobs/nixpkgs': - 'github:NixOS/nixpkgs/c52af267ad0c11b55f89cf6c70adb10694ad938e' (2023-10-05) - → 'github:NixOS/nixpkgs/35c640b19a189ce3a86698ce2fdcd87d085a339b' (2023-10-09) -• Updated input 'nur': - 'github:nix-community/NUR/e59a27dcfd30d62a5927fe9f89c273cc15d09c47' (2023-10-08) - → 'github:nix-community/NUR/6b1a5fb1a213d7daf13f3af6757321a288876d59' (2023-10-10) -• Updated input 'rustup-overlay': - 'github:oxalica/rust-overlay/6528a18a62d817200099c520b6eea7833ade9a9a' (2023-10-08) - → 'github:oxalica/rust-overlay/c0df7f2a856b5ff27a3ce314f6d7aacf5fda546f' (2023-10-09) -• Updated input 'sops-nix': - 'github:Mic92/sops-nix/d7380c38d407eaf06d111832f4368ba3486b800e' (2023-10-08) - → 'github:Mic92/sops-nix/6b32358c22d2718a5407d39a8236c7bd9608f447' (2023-10-09) by @github-actions[bot] in [#28](https://github.com/khaneliman/khanelinix/pull/28) -- Update README.md by @khaneliman -- Flake.lock: Update - -Flake lock file updates: - -• Updated input 'home-manager': - 'github:nix-community/home-manager/b2a2133c9a0b0aa4d06d72b5891275f263ee08df' (2023-10-06) - → 'github:nix-community/home-manager/3c1d8758ac3f55ab96dcaf4d271c39da4b6e836d' (2023-10-08) -• Updated input 'hyprland': - 'github:hyprwm/Hyprland/728a8bb48e0f7de1cbe1ad13fb469754c3d0bc97' (2023-10-07) - → 'github:hyprwm/Hyprland/499df49f7b28f9e3be9b1c53843fd5c465dec60b' (2023-10-08) -• Updated input 'neovim-config': - 'github:khaneliman/khanelivim/a40cc29bb465bbcb84d1daa17afac055fb639687' (2023-10-06) - → 'github:khaneliman/khanelivim/4ee64fd7b218c0fda4727f3b09a32617d0b22314' (2023-10-08) -• Updated input 'nixpkgs-wayland': - 'github:nix-community/nixpkgs-wayland/ac7584ae702177c9f6f4a5e52550f7c2fcea29b9' (2023-10-07) - → 'github:nix-community/nixpkgs-wayland/6713cae5c550a7a68ac0bca534ec4e92585c9200' (2023-10-08) -• Updated input 'nixpkgs-wayland/lib-aggregate': - 'github:nix-community/lib-aggregate/273cc814826475216b2a8aa008697b939e784514' (2023-10-01) - → 'github:nix-community/lib-aggregate/9f495e4feea66426589cbb59ac8b972993b5d872' (2023-10-08) -• Updated input 'nixpkgs-wayland/lib-aggregate/nixpkgs-lib': - 'github:nix-community/nixpkgs.lib/56992d3dfd3b8cee5c5b5674c1a477446839b6ad' (2023-10-01) - → 'github:nix-community/nixpkgs.lib/59da6ac0c02c48aa92dee37057f978412797db2a' (2023-10-08) -• Updated input 'nur': - 'github:nix-community/NUR/975896ef9edb4539c040ea28ecebd7a2a12a5dd0' (2023-10-07) - → 'github:nix-community/NUR/e59a27dcfd30d62a5927fe9f89c273cc15d09c47' (2023-10-08) -• Updated input 'rustup-overlay': - 'github:oxalica/rust-overlay/126829788e99c188be4eeb805f144d73d8a00f2c' (2023-10-07) - → 'github:oxalica/rust-overlay/6528a18a62d817200099c520b6eea7833ade9a9a' (2023-10-08) -• Updated input 'sops-nix': - 'github:Mic92/sops-nix/746c7fa1a64c1671a4bf287737c27fdc7101c4c2' (2023-10-03) - → 'github:Mic92/sops-nix/d7380c38d407eaf06d111832f4368ba3486b800e' (2023-10-08) -• Updated input 'sops-nix/nixpkgs-stable': - 'github:NixOS/nixpkgs/dbe90e63a36762f1fbde546e26a84af774a32455' (2023-10-01) - → 'github:NixOS/nixpkgs/2f3b6b3fcd9fa0a4e6b544180c058a70890a7cc1' (2023-10-07) by @github-actions[bot] -- Refactor: rename neovim config again by @khaneliman -- Feat: lazygit catppuccin by @khaneliman -- Chore: lint fix by @khaneliman -- Flake.lock: Update - -Flake lock file updates: - -• Updated input 'hyprland': - 'github:hyprwm/Hyprland/61d3d4dee7a4f9f68b4e7dd1e77ccd9acbed9a7c' (2023-10-06) - → 'github:hyprwm/Hyprland/728a8bb48e0f7de1cbe1ad13fb469754c3d0bc97' (2023-10-07) -• Updated input 'nixpkgs': - 'github:nixos/nixpkgs/81e8f48ebdecf07aab321182011b067aafc78896' (2023-10-03) - → 'github:nixos/nixpkgs/87828a0e03d1418e848d3dd3f3014a632e4a4f64' (2023-10-06) -• Updated input 'nixpkgs-khanelinix': - 'github:khaneliman/nixpkgs/51d261b0aed53b56dd4a658a05c9ed6b937eb731' (2023-10-06) - → 'github:khaneliman/nixpkgs/d09cd1d7d177a30af5b2efbbc853842b6af9f546' (2023-10-07) -• Updated input 'nixpkgs-wayland': - 'github:nix-community/nixpkgs-wayland/53e525b2ee8d84bab4db3e90a7b94db51249d393' (2023-10-06) - → 'github:nix-community/nixpkgs-wayland/ac7584ae702177c9f6f4a5e52550f7c2fcea29b9' (2023-10-07) -• Updated input 'nixpkgs-wayland/nix-eval-jobs': - 'github:nix-community/nix-eval-jobs/6841d05ad796d57ecb34e8f5a3910f8fe5211b84' (2023-10-05) - → 'github:nix-community/nix-eval-jobs/26af7cabdb7ee637dc9b63f1ce609a467534713c' (2023-10-07) -• Updated input 'nur': - 'github:nix-community/NUR/b5bfec93605030aa492e339fd60ad00bdc9492ed' (2023-10-06) - → 'github:nix-community/NUR/975896ef9edb4539c040ea28ecebd7a2a12a5dd0' (2023-10-07) -• Updated input 'rustup-overlay': - 'github:oxalica/rust-overlay/fdb37574a04df04aaa8cf7708f94a9309caebe2b' (2023-10-06) - → 'github:oxalica/rust-overlay/126829788e99c188be4eeb805f144d73d8a00f2c' (2023-10-07) by @github-actions[bot] in [#26](https://github.com/khaneliman/khanelinix/pull/26) -- Refactor: hyprland home-manager module systemd handles environment variables now by @khaneliman -- Flake.lock: Update - -Flake lock file updates: - -• Updated input 'home-manager': - 'github:nix-community/home-manager/68f7d8c0fb0bfc67d1916dd7f06288424360d43a' (2023-10-04) - → 'github:nix-community/home-manager/b2a2133c9a0b0aa4d06d72b5891275f263ee08df' (2023-10-06) -• Updated input 'hyprland': - 'github:hyprwm/Hyprland/1afb00a01b7cab3e68f5af3ca6a7d7d86b8f913e' (2023-10-06) - → 'github:hyprwm/Hyprland/61d3d4dee7a4f9f68b4e7dd1e77ccd9acbed9a7c' (2023-10-06) -• Updated input 'nixos-hardware': - 'github:nixos/nixos-hardware/f4ef5df944429e2ce3308bdbe69da940fffc5942' (2023-10-06) - → 'github:nixos/nixos-hardware/bb2db418b616fea536b1be7f6ee72fb45c11afe0' (2023-10-06) -• Updated input 'nixpkgs': - 'github:nixos/nixpkgs/fdd898f8f79e8d2f99ed2ab6b3751811ef683242' (2023-10-01) - → 'github:nixos/nixpkgs/81e8f48ebdecf07aab321182011b067aafc78896' (2023-10-03) -• Updated input 'nixpkgs-wayland': - 'github:nix-community/nixpkgs-wayland/23e99072b523607ee4748a896b041e9a6f3ab1b6' (2023-10-06) - → 'github:nix-community/nixpkgs-wayland/53e525b2ee8d84bab4db3e90a7b94db51249d393' (2023-10-06) -• Updated input 'nur': - 'github:nix-community/NUR/e9db143072899753216cd84143489ed2a544e793' (2023-10-06) - → 'github:nix-community/NUR/b5bfec93605030aa492e339fd60ad00bdc9492ed' (2023-10-06) by @github-actions[bot] in [#25](https://github.com/khaneliman/khanelinix/pull/25) -- Chore: update renamed neovim repo by @khaneliman -- Chore: flake lock update by @khaneliman -- Remove dead code by @khaneliman in [#21](https://github.com/khaneliman/khanelinix/pull/21) -- Refactor: hide op-ssh-sign behind feature flag by @khaneliman -- Refactor: mkBoolOpt git by @khaneliman -- Refactor: dont use op-ssh-sign by @khaneliman -- Feat: 1password-gui-beta attempt workaround by @khaneliman -- Chore: sort hyprland variables by @khaneliman -- Feat: waybar window-rewrite setup by @khaneliman -- Chore: python3 instead of python311 explicitly by @khaneliman -- Flake.lock: Update - -Flake lock file updates: - -• Updated input 'darwin': - 'github:lnl7/nix-darwin/792c2e01347cb1b2e7ec84a1ef73453ca86537d8' (2023-09-30) - → 'github:lnl7/nix-darwin/8b6ea26d5d2e8359d06278364f41fbc4b903b28a' (2023-10-03) -• Updated input 'home-manager': - 'github:nix-community/home-manager/6f9b5b83ad1f470b3d11b8a9fe1d5ef68c7d0e30' (2023-10-01) - → 'github:nix-community/home-manager/68f7d8c0fb0bfc67d1916dd7f06288424360d43a' (2023-10-04) -• Updated input 'hyprland': - 'github:hyprwm/Hyprland/b784931e678f907b1f1e41d04485fefd8a1faaf8' (2023-10-02) - → 'github:hyprwm/Hyprland/1b99a69dc11c3c8266559c3c20b2f4dac6621dcc' (2023-10-04) -• Updated input 'hyprland/wlroots': - 'gitlab:wlroots/wlroots/5ef42e8e8adece098848fac53c721b6eb3818fc2' (2023-10-02) - → 'gitlab:wlroots/wlroots/3406c1b17a4a7e6d4e2a7d9c1176affa72bce1bc' (2023-10-04) -• Updated input 'hyprland-contrib': - 'github:hyprwm/contrib/33663f663e07b4ca52c9165f74e3d793f08b15e7' (2023-09-23) - → 'github:hyprwm/contrib/2e3f8ac2a3f1334fd2e211b07ed76b4215bb0542' (2023-10-03) -• Updated input 'neovim-config': - 'github:khaneliman/astronvim/ab840c25072ff5ef5bee6aee3565a59a4126607b' (2023-09-24) - → 'github:khaneliman/astronvim/37d69ee0e9cc4f82b2871ca30851e10709885f50' (2023-10-03) -• Updated input 'nixpkgs': - 'github:nixos/nixpkgs/f5892ddac112a1e9b3612c39af1b72987ee5783a' (2023-09-29) - → 'github:nixos/nixpkgs/fdd898f8f79e8d2f99ed2ab6b3751811ef683242' (2023-10-01) -• Updated input 'nixpkgs-wayland': - 'github:nix-community/nixpkgs-wayland/a734b5414e55cbe8a0ac1f4e79bb5c290d45f1d6' (2023-10-02) - → 'github:nix-community/nixpkgs-wayland/fe7ca23b2e28cda8eac1d0d4d7984acd99885c79' (2023-10-04) -• Updated input 'nur': - 'github:nix-community/NUR/e91591b0854baca7bc1a90c6d74181dba079b174' (2023-10-02) - → 'github:nix-community/NUR/330ca7d24da8e5e6af288b54fb1de105609ed14d' (2023-10-04) -• Updated input 'rustup-overlay': - 'github:oxalica/rust-overlay/1aaa2dc3e7367f2014f939c927e9e768a0cc2f08' (2023-10-02) - → 'github:oxalica/rust-overlay/f144d5022c94a893d14c2b0e632672935dc83662' (2023-10-04) -• Updated input 'snowfall-lib': - 'github:snowfallorg/lib/83e7839dd1aaa7694b88f50963716dc1bc5de371' (2023-09-16) - → 'github:snowfallorg/lib/92803a029b5314d4436a8d9311d8707b71d9f0b6' (2023-10-04) -• Updated input 'snowfall-lib/flake-utils-plus': - 'github:gytis-ivaskevicius/flake-utils-plus/2bf0f91643c2e5ae38c1b26893ac2927ac9bd82a' (2022-07-07) - → 'github:gytis-ivaskevicius/flake-utils-plus/bfc53579db89de750b25b0c5e7af299e0c06d7d3' (2023-10-03) -• Updated input 'snowfall-lib/flake-utils-plus/flake-utils': - 'github:numtide/flake-utils/3cecb5b042f7f209c56ffd8371b2711a290ec797' (2022-02-07) - → 'github:numtide/flake-utils/ff7b65b44d01cf9ba6a71320833626af21126384' (2023-09-12) -• Added input 'snowfall-lib/flake-utils-plus/flake-utils/systems': - 'github:nix-systems/default/da67096a3b9bf56a91d16901293e51ba5b49a27e' (2023-04-09) -• Updated input 'sops-nix': - 'github:Mic92/sops-nix/2f375ed8702b0d8ee2430885059d5e7975e38f78' (2023-09-21) - → 'github:Mic92/sops-nix/746c7fa1a64c1671a4bf287737c27fdc7101c4c2' (2023-10-03) -• Updated input 'sops-nix/nixpkgs-stable': - 'github:NixOS/nixpkgs/596611941a74be176b98aeba9328aa9d01b8b322' (2023-09-16) - → 'github:NixOS/nixpkgs/dbe90e63a36762f1fbde546e26a84af774a32455' (2023-10-01) by @github-actions[bot] -- Feat: xdg enable open use portal by @khaneliman -- Feat: disable hyprland background by @khaneliman -- Chore: reorg substituters by @khaneliman in [#19](https://github.com/khaneliman/khanelinix/pull/19) -- Flake.lock: Update - -Flake lock file updates: - -• Updated input 'hyprland': - 'github:hyprwm/Hyprland/9ec656a37df103edc111e8e48cdfe89528dfe92e' (2023-10-01) - → 'github:hyprwm/Hyprland/b784931e678f907b1f1e41d04485fefd8a1faaf8' (2023-10-02) -• Updated input 'hyprland/wlroots': - 'gitlab:wlroots/wlroots/c2aa7fd965cb7ee8bed24f4122b720aca8f0fc1e' (2023-09-28) - → 'gitlab:wlroots/wlroots/5ef42e8e8adece098848fac53c721b6eb3818fc2' (2023-10-02) -• Updated input 'nixos-wsl': - 'github:nix-community/nixos-wsl/cadde47d123d1a534c272b04a7582f1d11474c48' (2023-09-30) - → 'github:nix-community/nixos-wsl/337edef90c8abe35b42e95aecf510a063dad02dd' (2023-10-02) -• Updated input 'nixpkgs-wayland': - 'github:nix-community/nixpkgs-wayland/047ac635a222c9d6e38c61d10d3c5703954ad78c' (2023-10-01) - → 'github:nix-community/nixpkgs-wayland/a734b5414e55cbe8a0ac1f4e79bb5c290d45f1d6' (2023-10-02) -• Updated input 'nixpkgs-wayland/nix-eval-jobs': - 'github:nix-community/nix-eval-jobs/39657d146828157ef51c4f2d8bebb96a77075fc6' (2023-09-21) - → 'github:nix-community/nix-eval-jobs/82cede4edd01989095040b55d0212d61a65fc5fd' (2023-10-02) -• Updated input 'nixpkgs-wayland/nix-eval-jobs/flake-parts': - 'github:hercules-ci/flake-parts/7f53fdb7bdc5bb237da7fefef12d099e4fd611ca' (2023-09-01) - → 'github:hercules-ci/flake-parts/21928e6758af0a258002647d14363d5ffc85545b' (2023-10-01) -• Updated input 'nixpkgs-wayland/nix-eval-jobs/nixpkgs': - 'github:NixOS/nixpkgs/ff7daa56614b083d3a87e2872917b676e9ba62a6' (2023-09-21) - → 'github:NixOS/nixpkgs/fe0b3b663e98c85db7f08ab3a4ac318c523c0684' (2023-10-02) -• Updated input 'nixpkgs-wayland/nix-eval-jobs/treefmt-nix': - 'github:numtide/treefmt-nix/7a49c388d7a6b63bb551b1ddedfa4efab8f400d8' (2023-09-12) - → 'github:numtide/treefmt-nix/720bd006d855b08e60664e4683ccddb7a9ff614a' (2023-09-27) -• Updated input 'nur': - 'github:nix-community/NUR/72619f85c0eeec8864f0c365932e39e8935a5b93' (2023-10-01) - → 'github:nix-community/NUR/e91591b0854baca7bc1a90c6d74181dba079b174' (2023-10-02) -• Updated input 'rustup-overlay': - 'github:oxalica/rust-overlay/fc6fe50d9a4540a1111731baaa00f207301fdeb7' (2023-10-01) - → 'github:oxalica/rust-overlay/1aaa2dc3e7367f2014f939c927e9e768a0cc2f08' (2023-10-02) by @github-actions[bot] -- Feat: cachix the flake check by @khaneliman -- Chore(deps): bump actions/checkout from 3 to 4 - -Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. -- [Release notes](https://github.com/actions/checkout/releases) -- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) -- [Commits](https://github.com/actions/checkout/compare/v3...v4) - ---- -updated-dependencies: -- dependency-name: actions/checkout - dependency-type: direct:production - update-type: version-update:semver-major -... - -Signed-off-by: dependabot[bot] by @dependabot[bot] in [#18](https://github.com/khaneliman/khanelinix/pull/18) -- Chore(deps): bump cachix/install-nix-action from 20 to 23 - -Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 20 to 23. -- [Release notes](https://github.com/cachix/install-nix-action/releases) -- [Commits](https://github.com/cachix/install-nix-action/compare/v20...v23) - ---- -updated-dependencies: -- dependency-name: cachix/install-nix-action - dependency-type: direct:production - update-type: version-update:semver-major -... - -Signed-off-by: dependabot[bot] by @dependabot[bot] in [#17](https://github.com/khaneliman/khanelinix/pull/17) -- Remove dead code by @khaneliman in [#15](https://github.com/khaneliman/khanelinix/pull/15) -- Flake.lock: Update - -Flake lock file updates: - -• Updated input 'home-manager': - 'github:nix-community/home-manager/ae896c810f501bf0c3a2fd7fc2de094dd0addf01' (2023-09-30) - → 'github:nix-community/home-manager/6f9b5b83ad1f470b3d11b8a9fe1d5ef68c7d0e30' (2023-10-01) -• Updated input 'hyprland': - 'github:hyprwm/Hyprland/a2a29a60e5301df2cadf58c1bb18495d02710547' (2023-09-30) - → 'github:hyprwm/Hyprland/9ec656a37df103edc111e8e48cdfe89528dfe92e' (2023-10-01) -• Updated input 'nixos-hardware': - 'github:nixos/nixos-hardware/adcfd6aa860d1d129055039696bc457af7d50d0e' (2023-09-28) - → 'github:nixos/nixos-hardware/0ab3ee718e964fb42dc57ace6170f19cb0b66532' (2023-10-01) -• Updated input 'nixpkgs': - 'github:nixos/nixpkgs/8a86b98f0ba1c405358f1b71ff8b5e1d317f5db2' (2023-09-27) - → 'github:nixos/nixpkgs/f5892ddac112a1e9b3612c39af1b72987ee5783a' (2023-09-29) -• Updated input 'nixpkgs-wayland': - 'github:nix-community/nixpkgs-wayland/bedaae13271fd5cfd861698e591d6af7104174e4' (2023-09-30) - → 'github:nix-community/nixpkgs-wayland/047ac635a222c9d6e38c61d10d3c5703954ad78c' (2023-10-01) -• Updated input 'nixpkgs-wayland/lib-aggregate': - 'github:nix-community/lib-aggregate/cb8bfd550aaaf32a330c1c8870a3d9a5bfa00954' (2023-09-24) - → 'github:nix-community/lib-aggregate/273cc814826475216b2a8aa008697b939e784514' (2023-10-01) -• Updated input 'nixpkgs-wayland/lib-aggregate/nixpkgs-lib': - 'github:nix-community/nixpkgs.lib/01fc4cd75e577ac00e7c50b7e5f16cd9b6d633e8' (2023-09-24) - → 'github:nix-community/nixpkgs.lib/56992d3dfd3b8cee5c5b5674c1a477446839b6ad' (2023-10-01) -• Updated input 'nur': - 'github:nix-community/NUR/02ba0aeaddf56c02b8030f81d765e8de3d342f5b' (2023-09-30) - → 'github:nix-community/NUR/72619f85c0eeec8864f0c365932e39e8935a5b93' (2023-10-01) -• Updated input 'rustup-overlay': - 'github:oxalica/rust-overlay/a4c3c904ab29e04a20d3a6da6626d66030385773' (2023-09-30) - → 'github:oxalica/rust-overlay/fc6fe50d9a4540a1111731baaa00f207301fdeb7' (2023-10-01) by @github-actions[bot] -- Feat: darwin disable automatic space switching by @khaneliman -- Feat: yabai 5.0.9 overlay until merged by @khaneliman -- Remove dead code by @khaneliman in [#11](https://github.com/khaneliman/khanelinix/pull/11) -- Flake.lock: Update - -Flake lock file updates: - -• Updated input 'darwin': - 'github:lnl7/nix-darwin/e236a1e598a9a59265897948ac9874c364b9555f' (2023-09-26) - → 'github:lnl7/nix-darwin/792c2e01347cb1b2e7ec84a1ef73453ca86537d8' (2023-09-30) -• Updated input 'home-manager': - 'github:nix-community/home-manager/4f02e35f9d150573e1a710afa338846c2f6d850c' (2023-09-29) - → 'github:nix-community/home-manager/ae896c810f501bf0c3a2fd7fc2de094dd0addf01' (2023-09-30) -• Updated input 'hyprland': - 'github:hyprwm/Hyprland/86e8ed038f5b195cdf2548bc469f8f8bbc0caca8' (2023-09-30) - → 'github:hyprwm/Hyprland/a2a29a60e5301df2cadf58c1bb18495d02710547' (2023-09-30) -• Updated input 'nixos-generators': - 'github:nix-community/nixos-generators/8ee78470029e641cddbd8721496da1316b47d3b4' (2023-09-04) - → 'github:nix-community/nixos-generators/150f38bd1e09e20987feacb1b0d5991357532fb5' (2023-09-30) -• Updated input 'nixos-wsl': - 'github:nix-community/nixos-wsl/8735bdfa5fdfa6e90d944ff9f5f806668b53eacb' (2023-09-29) - → 'github:nix-community/nixos-wsl/cadde47d123d1a534c272b04a7582f1d11474c48' (2023-09-30) -• Updated input 'nixpkgs-wayland': - 'github:nix-community/nixpkgs-wayland/627951bf2a490f7b5f31e98e2180e4b715968895' (2023-09-29) - → 'github:nix-community/nixpkgs-wayland/bedaae13271fd5cfd861698e591d6af7104174e4' (2023-09-30) -• Updated input 'nur': - 'github:nix-community/NUR/b38a6a856e3c8258b6d776f63eb1041c314e96f6' (2023-09-30) - → 'github:nix-community/NUR/02ba0aeaddf56c02b8030f81d765e8de3d342f5b' (2023-09-30) by @github-actions[bot] -- Chore: use sri hash ranger overlay by @khaneliman -- Chore: update README by @khaneliman -- Create cachix.yml by @khaneliman -- Flake.lock: Update - -Flake lock file updates: - -• Updated input 'home-manager': - 'github:nix-community/home-manager/0f4e5b4999fd6a42ece5da8a3a2439a50e48e486' (2023-09-26) - → 'github:nix-community/home-manager/4f02e35f9d150573e1a710afa338846c2f6d850c' (2023-09-29) -• Updated input 'hyprland': - 'github:hyprwm/Hyprland/6d7dc70f663891ef39dcfb8ba8e5ff643b4d9ed8' (2023-09-27) - → 'github:hyprwm/Hyprland/86e8ed038f5b195cdf2548bc469f8f8bbc0caca8' (2023-09-30) -• Updated input 'hyprland/wlroots': - 'gitlab:wlroots/wlroots/98a745d926d8048bc30aef11b421df207a01c279' (2023-09-21) - → 'gitlab:wlroots/wlroots/c2aa7fd965cb7ee8bed24f4122b720aca8f0fc1e' (2023-09-28) -• Updated input 'nixos-wsl': - 'github:nix-community/nixos-wsl/e7d93d0f478b6fbb47c00d03449dc3d08b90abb7' (2023-09-12) - → 'github:nix-community/nixos-wsl/8735bdfa5fdfa6e90d944ff9f5f806668b53eacb' (2023-09-29) -• Updated input 'nixos-wsl/flake-utils': - 'github:numtide/flake-utils/f9e7cf818399d17d347f847525c5a5a8032e4e44' (2023-08-23) - → 'github:numtide/flake-utils/ff7b65b44d01cf9ba6a71320833626af21126384' (2023-09-12) -• Updated input 'nixpkgs': - 'github:nixos/nixpkgs/6500b4580c2a1f3d0f980d32d285739d8e156d92' (2023-09-25) - → 'github:nixos/nixpkgs/8a86b98f0ba1c405358f1b71ff8b5e1d317f5db2' (2023-09-27) -• Updated input 'nixpkgs-wayland': - 'github:nix-community/nixpkgs-wayland/ed461a19c9d8cb149f9348d57c3506f2c6bc9324' (2023-09-28) - → 'github:nix-community/nixpkgs-wayland/627951bf2a490f7b5f31e98e2180e4b715968895' (2023-09-29) -• Updated input 'nur': - 'github:nix-community/NUR/25f533015835c7d08883b7182fb20f60e717ad34' (2023-09-28) - → 'github:nix-community/NUR/b38a6a856e3c8258b6d776f63eb1041c314e96f6' (2023-09-30) -• Updated input 'rustup-overlay': - 'github:oxalica/rust-overlay/9d8f850c3de67597c65271f3088aced0a671677f' (2023-09-28) - → 'github:oxalica/rust-overlay/a4c3c904ab29e04a20d3a6da6626d66030385773' (2023-09-30) by @github-actions[bot] in [#6](https://github.com/khaneliman/khanelinix/pull/6) -- Chore(deps): bump cachix/install-nix-action from 18 to 23 - -Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 18 to 23. -- [Release notes](https://github.com/cachix/install-nix-action/releases) -- [Commits](https://github.com/cachix/install-nix-action/compare/v18...v23) - ---- -updated-dependencies: -- dependency-name: cachix/install-nix-action - dependency-type: direct:production - update-type: version-update:semver-major -... - -Signed-off-by: dependabot[bot] by @dependabot[bot] in [#8](https://github.com/khaneliman/khanelinix/pull/8) -- Chore(deps): bump actions/checkout from 2 to 4 - -Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 4. -- [Release notes](https://github.com/actions/checkout/releases) -- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) -- [Commits](https://github.com/actions/checkout/compare/v2...v4) - ---- -updated-dependencies: -- dependency-name: actions/checkout - dependency-type: direct:production - update-type: version-update:semver-major -... - -Signed-off-by: dependabot[bot] by @dependabot[bot] in [#7](https://github.com/khaneliman/khanelinix/pull/7) -- Create dependabot.yml by @khaneliman -- Create settings.yml by @khaneliman -- Update update-flakes.yml by @khaneliman -- Create update-flakes.yml by @khaneliman -- Chore: cleanup by @khaneliman -- Refactor: sort solution by @khaneliman -- Refactor: feature flags boot module by @khaneliman -- Refactor: break development into feature flags by @khaneliman -- Chore: cleanup by @khaneliman -- Chore: flake lock update by @khaneliman -- Refactor: clean up ssh config by @khaneliman -- Refactor: move where wakatime secret is enabled by @khaneliman -- Chore: lint fix by @khaneliman -- Chore: standardize python versions by @khaneliman -- Feat: sketchybar spaces activate animation by @khaneliman -- Refactor: clean up yabai config by @khaneliman -- Refactor: darwin development dependencies by @khaneliman -- Feat: readd astronvim v4 config by @khaneliman -- Chore: set recommended tmux escape-time by @khaneliman -- Feat: wsl smarter by @khaneliman -- Revert "feat: use astronvim v4 config" - -This reverts commit 746c3753d5f7080a03d9cbfad750c7a0994fa753. by @khaneliman -- Feat: use astronvim v4 config by @khaneliman -- Refactor: give bees less again by @khaneliman -- Feat: wsl add wsl-open by @khaneliman -- Feat: wsl add wslutilities and wslview override by @khaneliman -- Chore: lint fix by @khaneliman -- Update README.md by @khaneliman -- Feat: hardware add nvidia programs by @khaneliman -- Chore: bump dooit overlay until new nixos-unstable by @khaneliman -- Refactor: replace hyprland overlay with direct pkg references by @khaneliman -- Refactor: refine getExe and use getExe' by @khaneliman -- Chore: cleanup snowfall inputs by @khaneliman -- Chore: group attributes by @khaneliman -- Chore: linting cleanup by @khaneliman -- Wip home sops by @khaneliman -- Chore: cleanup overlays by @khaneliman -- Feat: dooit 2.0.0 overlay by @khaneliman -- Chore: cleanup with inputs; by @khaneliman -- Feat: hypr_socket_watch systemd service by @khaneliman -- Feat: hyprland socket watch wallpaper changer by @khaneliman -- Feat: hyprland reenable GDK_BACKEND=wayland by @khaneliman -- Refactor: move import_env to packages by @khaneliman -- Refactor: hyprpaper dynamic config by @khaneliman -- Refactor: move hyprpaper to separate module by @khaneliman -- Refactor: waybar persistent-workspaces rename by @khaneliman -- Refactor: waybar add idle_inhibitor to secondary monitor by @khaneliman -- Feat: more sops configuration by @khaneliman -- Refactor: move btrfs into new module by @khaneliman -- Chore: replace exa with eza by @khaneliman -- Refactor: tweak waybar format-icons by @khaneliman -- Refactor: hide vscode/argv.json behind keyring enable by @khaneliman -- Refactor: nixpkgs-wayland specific packages instead of overlay by @khaneliman -- Refactor: nixpkgs-wayland overlay replace manual waybar overlay by @khaneliman -- Refactor: waybar tweak urgent css by @khaneliman -- Refactor: convert hyprland workspaces to nix expression by @khaneliman -- Feat: readd scroll events waybar by @khaneliman -- Feat: waybar add empty and visible styling by @khaneliman -- Chore: update waybar overlay by @khaneliman -- Refactor: replace lib.getExe with inherit by @khaneliman -- Refactor: replace with lib with inherit by @khaneliman -- Chore: minor cleanup of boot by @khaneliman -- Chore: sketchybar version overlay until nixpkgs updated by @khaneliman -- Refactor: greetd -> regreet by @khaneliman -- Chore: waybar hyprland new config style by @khaneliman -- Feat: development add cpplint by @khaneliman -- Chore: cleanup flake.nix by @khaneliman -- Feat: nixos security add seahorse by @khaneliman -- Remove upstreamed overlay fix by @khaneliman -- Chore: update waybar overlay and flake lock by @khaneliman -- Darwin networking dns by @khaneliman -- Remove duplicate home-manager imports by @khaneliman -- Astronvim fix treesitter compile issue by @khaneliman -- Home folder cleanup by @khaneliman -- Swaylock debug level to troubleshoot by @khaneliman -- Swayidle debug level to troubleshoot by @khaneliman -- Flake darwin fix by @khaneliman -- Linting cleanup CORE by @khaneliman -- Xdg add associations too by @khaneliman -- Minor spicetify cleanup by @khaneliman -- Waybar fix xdg-open not found by @khaneliman -- Rename neovim to astronvim by @khaneliman -- Ranger overlay updated to latest commit by @khaneliman -- Remove unused sketchybar version overlay by @khaneliman -- Hyprland environment import safeguards by @khaneliman -- Add barrier kvm by @khaneliman -- Zen kernel for now since main is fubar by @khaneliman -- Hardware cleanup by @khaneliman -- Linting fixes by @khaneliman -- Waybar remove tooltip on wlogout by @khaneliman -- Revert nixpkgs update by @khaneliman -- Sketchybar overlay until nixpkgs update by @khaneliman -- Darwin zsh login shell by @khaneliman -- Git prune on fetch by @khaneliman -- Sketchybar config embedded manually for now by @khaneliman -- GetExe more configs by @khaneliman -- Darwin desktop configs use getexe by @khaneliman -- Kitty default again (wezterm crashes on display unplug) by @khaneliman -- Waybar overlay until new release by @khaneliman -- Ranger attempt jsonc preview support by @khaneliman -- Ranger edit jsonc support by @khaneliman -- Fastfetch jsonc config nix expression by @khaneliman -- Wezterm default hyprland by @khaneliman -- Add wezterm by @khaneliman -- Tmux colors fix by @khaneliman -- Waybar switch back to wlr/workspaces by @khaneliman -- Waybar overlay for hyprland urgent support until upstreamed by @khaneliman -- Waybar tweak urgent css by @khaneliman -- Create debug option for waybar by @khaneliman -- Btrfs-assistant add by @khaneliman -- Add protonup-qt by @khaneliman -- Waybar remove hyprland overlay and update config by @khaneliman -- Misc cleanup by @khaneliman -- Add yubikey to workstation by @khaneliman -- Darwin build fix by @khaneliman -- Sf-mono use source as input by @khaneliman -- Firefox embed config by @khaneliman -- Rofi embed config by @khaneliman -- Hyprland embed config by @khaneliman -- Embed ranger config by @khaneliman -- Embed qt theming by @khaneliman -- Alacritty home-manager config by @khaneliman -- Wlogout embed layout by @khaneliman -- Kitty home-manager config by @khaneliman -- Remove .functions by @khaneliman -- Zsh plugins by @khaneliman -- Bash home-manager config by @khaneliman -- Embed swaync dotfiles by @khaneliman -- Nixos remove neofetch by @khaneliman -- Helix cleanup by @khaneliman -- Minor fastfetch cleanup by @khaneliman -- Btop to home-manager config by @khaneliman -- Zsh to home-manager config by @khaneliman -- Fish to home-manager config by @khaneliman -- Fastfetch to home-manager config by @khaneliman -- Snowfall lib switch to dev by @khaneliman -- Ranger fork support tmux image preview by @khaneliman -- Cleanup neovim config by @khaneliman -- Khanelimac nixcfg alias by @khaneliman -- Micro home-manager consolidation by @khaneliman -- Topgrade home-manager consolidation by @khaneliman -- Tmux updates by @khaneliman -- Default editor options by @khaneliman -- Hyprland hyprpaper nix file by @khaneliman -- Darwin sketchybar aliases by @khaneliman -- Tmux home-manager consolidation by @khaneliman -- Lazygit home-manager consolidation by @khaneliman -- Nixos remove bundled op-ssh-sign by @khaneliman -- Git use home-manager options by @khaneliman -- Deadnix fixes by @khaneliman -- Direnv home-manager consolidation by @khaneliman -- Sort systems by @khaneliman -- Sort devshell.toml by @khaneliman -- Sort flake inputs by @khaneliman -- Nixos remove icehouse by @khaneliman -- Nixos cleanup discord config by @khaneliman -- Remove cowsay packages and overlays by @khaneliman -- Cleanup home-manager fish config by @khaneliman -- Remove .aliases file by @khaneliman -- Openssl alias specify bin by @khaneliman -- Nixos cava alias by @khaneliman -- Bat moved to home-manager by @khaneliman -- Lsd moved to home-manager by @khaneliman -- Refine aliases by @khaneliman -- Darwin shell fixes by @khaneliman -- Nixos add github desktop by @khaneliman -- Shell refactoring by @khaneliman -- Nixos networking nameservers by @khaneliman -- Remove lazygit overlay by @khaneliman -- Khanelinix disable common-gpu-nvidia-disable so gpu passthru works with nixos-hardware update by @khaneliman -- Flake lock update and disable broken packages by @khaneliman -- Nixos add snapper by @khaneliman -- Nixos add btrfs storage options by @khaneliman -- Consolidate git by @khaneliman -- Wip home-manager refactor by @khaneliman -- Home-manager git config support darwin and linux by @khaneliman -- Darwin conflict fix by @khaneliman -- Looking-glass update by @khaneliman -- Misc dev tweaks by @khaneliman -- Lazygit overlay until nixpkgs updated by @khaneliman -- Darwin add shell configs by @khaneliman -- Darwin use nix tmux config by @khaneliman -- Khanelimac archetypes by @khaneliman -- Darwin add tmux custom config by @khaneliman -- Darwin add archetypes and suite updates by @khaneliman -- Misc cleanup by @khaneliman -- Move agenix to shared module (still doesn't work with config) by @khaneliman -- Change nixos direnv to use nixos module by @khaneliman -- Consolidate common by @khaneliman -- Consolidate networking by @khaneliman -- Khanelimac specific tweaks by @khaneliman -- Darwin move homebrew to tools by @khaneliman -- Consolidate fonts by @khaneliman -- Darwin add sketchybar-app-font by @khaneliman -- Remove nur finally by @khaneliman -- More refactoring by @khaneliman -- Cleanup formatting by @khaneliman -- Nixos add to social suite by @khaneliman -- [wip] refactoring by @khaneliman -- Flake update and misc fixes/changes by @khaneliman -- Darwin hide mas apps behind flag by @khaneliman -- Darwin dev update (wip) by @khaneliman -- Cleanup by @khaneliman -- Darwin migrate sfmono to cask by @khaneliman -- Darwin consolidate homebrew config by @khaneliman -- Darwin homebrew tweaks by @khaneliman -- Migrate sddm-catppuccin to catppuccin-sddm-corners (will replace with nixpkgs) by @khaneliman -- Minor cleanup on display-managers sddm still not working for me by @khaneliman -- Nixos add element-desktop by @khaneliman -- Migrate wttrbar from custom package to nixpkg by @khaneliman -- Misc cleanup by @khaneliman -- Darwin yabai rule for element by @khaneliman -- Darwin disable home-manager until fixed and add element by @khaneliman -- Update workflows by @khaneliman -- Nixpkgs-lint solution by @khaneliman -- Nixpkgs-fmt solution by @khaneliman -- Switch to nixpkgs-fmt by @khaneliman -- Hyprland updates by @khaneliman -- Darwin system defaults added by @khaneliman -- Misc tweaks and fixes by @khaneliman -- Darwin add packages by @khaneliman -- Darwin migrate sketchybar to nix-darwin by @khaneliman -- Home-manager ncmpcpp use same directory as mpd explicitly by @khaneliman -- Hyprland use home-manager mpd-mpris by @khaneliman -- Hyprland use home-manager gnome-keyring daemon by @khaneliman -- Hyprland use blueman home-manager service by @khaneliman -- Nixpkgs development reqs by @khaneliman -- Hyprland tweaks by @khaneliman -- Nixos fix hyprland windowrule for spotify and add mpdevil by @khaneliman -- Nixos add mpris functionality waybar and mpd setup by @khaneliman -- Nixos migrate waybar to home-manager by @khaneliman -- Nixos fix hyprland rofi by @khaneliman -- Darwin migrate yabai to nix-darwin by @khaneliman -- Darwin migrate skhd to nix-darwin by @khaneliman -- Migrate swaylock to home-manager by @khaneliman -- Remove nixos swayidle just use home-manager by @khaneliman -- Nixos fix wallpaper change temporary hack by @khaneliman -- Nixos modularize hyprland config by @khaneliman -- Nixos convert hyprland to home-manager by @khaneliman -- Darwin remove brew suite by @khaneliman -- Darwin organize brews casks and taps by @khaneliman -- Darwin organize masApps by @khaneliman -- Minor cleanup by @khaneliman -- Nixos plymouth fix by @khaneliman -- Darwin organize better by @khaneliman -- Darwin migrate gui apps to homebrew module by @khaneliman -- Spotify cleanup by @khaneliman -- Minor hyprland and home-manager scaffold / test by @khaneliman -- Use mdns instead of ip by @khaneliman -- Update thunderbird a little and add vlc by @khaneliman -- Add darwin to check by @khaneliman -- Deadnix cleanup by @khaneliman -- Rename darwin hostname by @khaneliman -- Darwin add stuff from brewfile as a module for now by @khaneliman -- Enable colord for printing by @khaneliman -- Flake lock update by @khaneliman -- Hyprland remove unused script call by @khaneliman -- Bluetooth and power fix by @khaneliman -- Blacklist module throwing errors by @khaneliman -- Remove qmk from dev by @khaneliman -- Misc fixes by @khaneliman -- Waybar overlay for unreleased hyprland fix by @khaneliman -- Khanelinix enable sysrq by @khaneliman -- Darwin update common by @khaneliman -- Darwin add gimp by @khaneliman -- Nixos swaync icon update by @khaneliman -- Nixos waybar icon update by @khaneliman -- Shared blender config by @khaneliman -- Darwin fix username by @khaneliman -- Nixos enable blender again by @khaneliman -- Darwin remove iterm2 by @khaneliman -- Darwin 1password by @khaneliman -- Darwin home app linker by @khaneliman -- Add darwin firefox (wip) by @khaneliman -- Shared nix config module by @khaneliman -- Add zathura by @khaneliman -- Xdg mimeapps config by @khaneliman -- Helix initial config by @khaneliman -- Spicetify extensions and apps by @khaneliman -- Cleanup by @khaneliman -- Add spicetify by @khaneliman -- Darwin tweaks by @khaneliman -- Initial darwin setup by @khaneliman -- Initial snowfallorg home-manager setup by @khaneliman -- Move nixos into separate modules by @khaneliman -- Use breeze dark icons by @khaneliman -- Deadnix and statix fixes by @khaneliman -- Hyprland config tweak by @khaneliman -- Unpin linux kernel by @khaneliman -- Firefox updates by @khaneliman -- Try and fix printing by @khaneliman -- Screenlayout disable resetting secondary monitor by @khaneliman -- Cleanup gtk, qt, and hyprland configs a bit by @khaneliman -- Gdm instead of regreet again by @khaneliman -- Update hyprland polish file to use config values by @khaneliman -- Flake lock update - temp pin kernel crash on 6.4 by @khaneliman -- Hyprland add gsettings schemas to regular terminal by @khaneliman -- Update README.md by @khaneliman -- Some lint fixes by @khaneliman -- Gate flake check behind branch condition by @khaneliman -- Add lint workflow by @khaneliman -- Remove unused secrets file by @khaneliman -- Alejandra reformat by @khaneliman -- Deadnix fix by @khaneliman -- Alejandra format by @khaneliman -- Statix fix by @khaneliman -- Flake lock update by @khaneliman -- Add nixos packages to common by @khaneliman -- Refine xdg-desktop-portal implementation by @khaneliman -- Gamemode tweak by @khaneliman -- Flake lock update by @khaneliman -- Add gamemode by @khaneliman -- Add mangohud by @khaneliman -- Update firefox addon by @khaneliman -- Flake lock update and gtk breaking change fix by @khaneliman -- Flake lock update by @khaneliman -- Massive refactor by @khaneliman -- Flake lock update by @khaneliman -- Wlroots suite by @khaneliman -- Catppuccin regreet, modularize display-managers, some cleanup and reorg by @khaneliman -- Ranger plugins fix by @khaneliman -- Ranger dependencies by @khaneliman -- Flake lock update by @khaneliman -- Khanelinix remove nix controlled openrgb config by @khaneliman -- Samba update for khanelinix by @khaneliman -- Flake lock update by @khaneliman -- Add emulationstation by @khaneliman -- Thunderbird updates by @khaneliman -- Add emulators by @khaneliman -- Include discord in startup apps by @khaneliman -- Flake lock update by @khaneliman -- Remove waybar overlay with 0.9.18 in nixpkgs by @khaneliman -- Add glxinfo by @khaneliman -- Remove unused cava overlay by @khaneliman -- Attempt to fix peek.nvim (still errors but new errors) by @khaneliman -- Flake lock update by @khaneliman -- Add group notifications back to waybar 0.9.18 by @khaneliman -- Add hydra-check by @khaneliman -- Create README.md by @khaneliman -- Flake lock update by @khaneliman -- Add ssh public keys and aliases by @khaneliman -- Move sddm-catppuccin to its own nix flake by @khaneliman -- Change login shell to zsh by @khaneliman -- Use waybar again after new release with fixes by @khaneliman -- Flake lock update by @khaneliman -- Eww tweaks by @khaneliman -- Add betterdiscord theme by @khaneliman -- Hyprland add secondary monitor workaround by @khaneliman -- Add spotify by @khaneliman -- Initial eww bar config attempt by @khaneliman -- Environment variable updates by @khaneliman -- Flake lock update by @khaneliman -- Update khanelinix hardware by @khaneliman -- Update hyprland environment variables by @khaneliman -- Update firefox config by @khaneliman -- Tmux update by @khaneliman -- Flake update and remove things breaking build by @khaneliman -- Workflow add by @khaneliman -- Flake lock update by @khaneliman -- Initial commit by @khaneliman - -#### Fixes -- Sddm: fix config by @khaneliman -- Packages/git-cliff: fix syntax highlighting by @khaneliman -- Khanelilab: fix networking address by @khaneliman -- Shell/c: fix darwin by @khaneliman -- Shell/dotnet: fix darwin by @khaneliman -- Gamemode: fix hyprland commands - -For real this time.... by @khaneliman -- Gamemode: fix hyprland commands by @khaneliman -- Swaync: fixes by @khaneliman -- Hyprland: fix variable name by @khaneliman -- Swaync: fix by @khaneliman -- Swaync: fix screenshot utility by @khaneliman -- Hyprland: fix hl alias by @khaneliman -- Darwin: fixes by @khaneliman -- Hyprland: fix slurp shortcuts by @khaneliman -- Hyprland: fix yazi launch bind by @khaneliman -- Neovim/catppuccin: fix changed setting names by @khaneliman -- Nixvim: fix deprecations by @khaneliman -- Yazi: fix openers by @khaneliman -- Qt: fix style name by @khaneliman -- Telescope: fix conflicting key map by @khaneliman -- Hyprlock: fix images.shadow_passes by @khaneliman -- Dap: fix darwin build by @khaneliman -- Lualine: fix dap-ui by @khaneliman -- Git: fix darwin git credential helper by @khaneliman -- Conform: fix format toggle by @khaneliman -- Labeler.yml: fix by @khaneliman -- Deadnix: fix commit message by @khaneliman -- Skhd: fix yabai and skhd restart mappings by @khaneliman -- Hyprland: fix screen sharing by @khaneliman -- Firefox: fix intl.accept_languages by @khaneliman -- Yazi: fix conflicting keybinding by @khaneliman -- Flake.nix: fix rust-overlay name by @khaneliman -- Sketchybar: fix github by @khaneliman -- Khanelinix: fix swayoutput by @khaneliman -- Waybar: fix tray slider by @khaneliman -- Nixvim: fix todo and fix highlights by @khaneliman -- Nixvim: fix autoformat keymap by @khaneliman -- Nixvim: fix spellang by @khaneliman -- Fix: dib core remapping by @khaneliman -- Fix: wttrbar config location by @khaneliman -- Fix: non aarch-64 builds by @khaneliman -- Fix: sketchybar helper.sh make without cd by @khaneliman -- Fix: sketchybar remove compiled helpers by @khaneliman -- Fix: sketchybar island notification init by @khaneliman -- Fix: sketchybar toggle fixes by @khaneliman -- Fix: sketchybar bluetooth fix indexing by @khaneliman -- Fix: sketchybar weather gracefully handle failed api calls by @khaneliman -- Fix: deno darwin overlay fix by @khaneliman -- Fix: steam menu focus by @khaneliman -- Fix: qt theme fix by @khaneliman -- Fix: hacks and workarounds for k3b by @khaneliman -- Fix: cava for darwin by @khaneliman -- Fix: fix hyprland log aliases by @khaneliman -- Fix: sketchybar icons by @khaneliman -- Fix: record_screen by @khaneliman -- Fix: hyprland screenshot binds by @khaneliman -- Fix: firefox search force by @khaneliman -- Fix: firefox cfg.userchrome used appended after /chrome/userchrome.css by @khaneliman -- Fix: firefox needing to be beta for now for profile to work by @khaneliman -- Fix: proper darwin firefox config location by @khaneliman -- Fix: firefox not supported darwin by @khaneliman -- Fix: neovim onChange temporarily disabled by @khaneliman -- Fix: neovim onchange events by @khaneliman -- Fix: scream service property by @khaneliman -- Fix: hl commands breaking due to aliases by @khaneliman -- Fix: vulkan-utility-libraries revert by @khaneliman in [#53](https://github.com/khaneliman/khanelinix/pull/53) -- Fix: yabai bar height by @khaneliman -- Fix: zsh sketchybar aliases by @khaneliman -- Fix: music playing artwork sketchybar by @khaneliman -- Fix: caprine hide messenger ad by @khaneliman -- Fix: caprine macos config by @khaneliman -- Fix: caprine style fix by @khaneliman -- Fix: cleanup fonts by @khaneliman -- Fix: firefox theme by @khaneliman -- Fix: wlroots readd clipboard by @khaneliman -- Fix: hyprland pkg exe references by @khaneliman -- Fix: spicetify catppuccin theme by @khaneliman -- Feat: fix_git pkg (wip) by @khaneliman -- Fix: tmux ranger img previews by @khaneliman -- Fix: discord master overlay until released unstable by @khaneliman -- Fix: readd waybar persistent workspaces to config - -This reverts commit aa86bb51e6169da2f9b485aa8f72511fd08bdeab. by @khaneliman -- Fix: lint fixes by @khaneliman -- Fix: k9s theme path by @khaneliman -- Fix: hypraper restart always by @khaneliman -- Fix: kitty scratchpad launch by @khaneliman -- Fix: khanelinix static ip match router config by @khaneliman -- Fix: ssh port expression only nixos configurations by @khaneliman -- Fix: tmux truecolor by @khaneliman -- Fix: udiskie breaks darwin by @khaneliman -- Fix: nixos networking mdns by @khaneliman -- Fix: remove custom dib signing key by @khaneliman -- Fix: revert waybar workspaces setup for now by @khaneliman -- Fix: reenable wslagentbridge and remove ssh auth override by @khaneliman -- Fix: revert xdgOpenUsePortal until i can figure out portal application associations by @khaneliman -- Fix: sddm module fix by @khaneliman -- Fix: broken / disabled packages by @khaneliman -- Fix: trace-which encapsulate dependency properly by @khaneliman -- Fix: hyprland removed decoration setting by @khaneliman in [#12](https://github.com/khaneliman/khanelinix/pull/12) -- Fix: sops configuration by @khaneliman -- Fix: credentials usehttppath by @khaneliman -- Fix: lint fixes by @khaneliman -- Fix: sopsdiffer attribute by @khaneliman -- Fix: marksman dependencies by @khaneliman -- Fix: jdtls fix dependency by @khaneliman -- Fix: csharp-ls neovim by @khaneliman -- Fix: neovim lazy lock by @khaneliman -- Fix: remove conflicting dotnet-sdk version by @khaneliman -- Fix: wgetrc missing error by @khaneliman -- Fix: git includes option default by @khaneliman -- Fix: sops fixes by @khaneliman -- Fix: CORE nixcfg alias by @khaneliman -- Fix: git wsl not enabled by @khaneliman -- Fix: wsl git credentials by @khaneliman -- Fix: wsl git signing by @khaneliman -- Fix: remove doas from common to fix wsl by @khaneliman -- Fix: tune bees more by @khaneliman -- Fix: spice service wantedby by @khaneliman -- Fix: limit bees a different way by @khaneliman -- Refactor: fix lint warning waybar by @khaneliman -- Fix: stupid darwin sandbox workaround by @khaneliman -- Fix: hypr_socket_watch encapsulate dependency by @khaneliman -- Fix: remove broken darwin package by @khaneliman -- Fix: hyprland remove ws explicit bind conflicts by @khaneliman -- Fix: devshell by @khaneliman -- Fix: hyprland prevent stupid cursor relocation default change by @khaneliman -- Fix: limit beesd threads to prevent performance issues by @khaneliman -- Fix: replace types.string with types.str by @khaneliman -- Fix: btrfs dedupe by @khaneliman -- Fix: dumb waybar on-click workaround on hyprland by @khaneliman -- Fix: darwin missing inherits by @khaneliman -- Fix: disable mangohud for now (broke steam) by @khaneliman -- Fix: primary.sh xrandr command by @khaneliman -- Fix: regreet use sway and support monitor definitions by @khaneliman -- Fix: regreet work with vulkan by @khaneliman -- Fix: nixos-revision correct url and jq parameter by @khaneliman -- Fix: flake switch on darwin by @khaneliman -- Fix: astronvim gnumake dependency by @khaneliman -- Fix neovim plugins not being able to update by @khaneliman -- Record:screen: fix darwin build by @khaneliman -- Fix hyprland log aliases by @khaneliman -- Fix fastfetch config by @khaneliman -- Fix bat theme name by @khaneliman -- Fix home-manager config for khanelimac by @khaneliman -- Fixes and cleanup by @khaneliman -- Fix nixos config by @khaneliman -- Fix gdm user icon script by @khaneliman -- Fix mdns by @khaneliman -- Fix cursor-size gtk by @khaneliman -- Fix gtk theme name by @khaneliman -- Fix cachix by @khaneliman -- Fix check action by @khaneliman -- Fix waybar bug and use gdm for nixos since sddm is outdated by @khaneliman -- Fix discord theme error by @khaneliman - -#### New -- Zellij: add aliases for creating and attaching sessions by @khaneliman -- Zellij: add dev layout by @khaneliman -- Flake.nix: add misc hooks by @khaneliman -- Flake.nix: add prettier hook by @khaneliman -- CHANGELOG.md: init by @khaneliman -- Flake.nix: add git-cliff hook by @khaneliman -- Packages/git-cliff: add git-cliff package for hook by @khaneliman -- Flake.nix: add pre-commit-hooks by @khaneliman -- Zellij: add shell tab to layout - -mimic my normal tmux layout by @khaneliman -- Music: add musikube and pulsemixer by @khaneliman -- Zellij: add custom layout by @khaneliman -- Nix/system: add logrotate by @khaneliman -- Nix/system: add oomd by @khaneliman -- System/time: add ntp by @khaneliman -- Khanelinix: add realtime by @khaneliman -- Nixos/system: add realtime module by @khaneliman -- User.extraGroups: add extra groups by @khaneliman -- Khanelinix: add networking address - -Apparently configured in wrong system... by @khaneliman -- Hyprland: add resize binds by @khaneliman -- Khanelinix: add tpm by @khaneliman -- Nix/hardware: add tpm module by @khaneliman -- Fonts: add some more fonts by @khaneliman -- Obs: add extra plugins by @khaneliman -- Yazi: add unique type icons by @khaneliman -- Yazi: add icons by @khaneliman -- Neovim/treesitter: add kdl grammar by @khaneliman -- Waybar: additional modules by @khaneliman -- Services/easyeffects: init module by @khaneliman -- .gitignore: add flake by @khaneliman -- Home/services/noisetorch: init module by @khaneliman -- Nixos/noisetorch: init module by @khaneliman -- Nix: add channel links by @khaneliman -- Services/polkit: init new module by @khaneliman -- Services/cliboard: init new module by @khaneliman -- Lib: add booltToNum by @khaneliman -- Services/power: add power-profiles-daemon by @khaneliman -- Polkit: add logging by @khaneliman -- Boot: add silentBoot config by @khaneliman -- Nix: add extra substituters by @khaneliman -- Nvidia: add extra configuration by @khaneliman -- Hardware: init intelcpu by @khaneliman -- Nixos/theme: init theme module by @khaneliman -- Tmux: add fzf by @khaneliman -- Waybar: add cava module by @khaneliman -- Bluetooth: add experimental features by @khaneliman -- Zellij: init by @khaneliman -- Neovim: add quickfix navigation keybind by @khaneliman -- Shells/default: add nix-inspect by @khaneliman -- Yazi: add miller previewer by @khaneliman -- Yazi: add glow previewer by @khaneliman -- Yazi: add dmg opener by @khaneliman -- Neovim/neotest: add junit_jar by @khaneliman -- Neovim/conform: add sqlfluff by @khaneliman -- Neovim/conform: add shfmt by @khaneliman -- Neovim/conform: add xmlformat by @khaneliman -- Shells/java: init by @khaneliman -- Waybar: add wezterm window-rewrite by @khaneliman -- Yazi: add archive opener by @khaneliman -- Services/ddc: init by @khaneliman -- Codeium: add plugin settings by @khaneliman -- Treesitter: add vimdoc back by @khaneliman -- Darwin: add bashdb by @khaneliman -- Treesitter: add markdown_inline by @khaneliman -- Noice: add nvim-notify by @khaneliman -- Efm: add linters by @khaneliman -- Gitsigns: add git blame by @khaneliman -- Telescope: add git stash keymap by @khaneliman -- Development: add postman by @khaneliman -- .git-blame-ignore-revs: init by @khaneliman -- Git: add blame.ignoreRevsFile by @khaneliman -- Git: add GITHUB_TOKEN secret by @khaneliman -- Theme: add catppuccin.nix by @khaneliman -- Cmp: add priorities by @khaneliman -- Bufremove: init to handle removing single buffer by @khaneliman -- Rustaceanvim: add excludeDirs (doesnt seem to work) by @khaneliman -- .luarc.json: init by @khaneliman -- Conform: add codespell formatter by @khaneliman -- Neotest: add summary keymap by @khaneliman -- Conform: add formatter commands by @khaneliman -- Yabai: add teams work rule by @khaneliman -- Sketchybar: add window rewrite front app by @khaneliman -- Neotest: add adapters by @khaneliman -- Games: add minecraft and prismlauncher by @khaneliman -- Neotest: init by @khaneliman -- Gitsigns: add line blame by @khaneliman -- Lazygit: add overrideGpg by @khaneliman -- Conform: add async formatting by @khaneliman -- Telescope: add autocommands search by @khaneliman -- Lualine: add winbar by @khaneliman -- Lualine: add tabs to tabline by @khaneliman -- Lualine: add aerial by @khaneliman -- Nixvim: add refactoring-nvim by @khaneliman -- Nixvim: add webapi-vim for rustplay by @khaneliman -- Git: add core azure host credential provider by @khaneliman -- Git: add dib azure host credential provider by @khaneliman -- Hypr-socket-watch: add new rust flake by @khaneliman -- Devshell: add thaw - -This reverts commit 05a880d54c37997b325964d2a9b5e36d1f8668bd. by @khaneliman -- Flake.nix: add snowfallorg.thaw by @khaneliman -- Sway: add swaylock by @khaneliman -- Khanelinix: add dib signing by @khaneliman -- Sketchybar: add default space icon by @khaneliman -- Sketchybar: add copy labels wifi module by @khaneliman -- Jankyborders: add bordersrc for default behavior by @khaneliman -- Lib: add capitalize function by @khaneliman -- Khanelimac: add music suite by @khaneliman -- Git: add safe directories by @khaneliman -- Security: add sudo-rs by @khaneliman -- Nixvim: add aerial by @khaneliman -- Nixvim: add nix-develop by @khaneliman -- Yazi: add hostname to header by @khaneliman -- Yazi: add dragon keymap by @khaneliman -- Yazi: add extra status information by @khaneliman -- Yazi: add full border by @khaneliman -- Nixvim: add mini.map by @khaneliman -- Nixvim: add mini.basics and mini.bracketed by @khaneliman -- Nixvim: add mini.indentscope by @khaneliman -- Nixvim: add mini.surround by @khaneliman -- Firefox: add react dev tools by @khaneliman -- Sketchybar: add lua shebang on all by @khaneliman -- Sketchybar: add yabai item by @khaneliman -- Hyprland: add teams windowrule by @khaneliman -- Waybar: add teams window rewrite by @khaneliman -- Business: add teams by @khaneliman -- Sketchybar: add print_table by @khaneliman -- Sketchybar: add spaces with windowrules by @khaneliman -- Sketchybar: add skhd by @khaneliman -- Homebrew: add cask back by @khaneliman -- Hyprlock: add grace on lock by @khaneliman -- Firefox: add floorp package without customization, for now by @khaneliman -- Khanelinix: add hyprlandOutput by @khaneliman -- Khanelinix: add kernel specializations by @khaneliman -- Nixvim: add yanky by @khaneliman -- Sketchybar: add logFile output by @khaneliman -- Nixvim: add fix highlights by @khaneliman -- Nixvim: add toggle fold column by @khaneliman -- Nixvim: add toggle spell and wrap by @khaneliman -- Nixvim: add diffview by @khaneliman -- Nixvim: add indent-blankline by @khaneliman -- Feat: add ripgrep darwin by @khaneliman -- Feat: add floorp by @khaneliman -- Feat: add zoxide to yazi by @khaneliman -- Chore: add dynamic-island-sketchybar logging output by @khaneliman -- Feat: add neovim nightly overlay again by @khaneliman -- Chore: add spotify free rules and window rewrite by @khaneliman -- Feat: add git-credential-oauth by @khaneliman -- Feat: add video programs by @khaneliman -- Feat: add cloudflared by @khaneliman -- Feat: add khanelilab cloudflared secret by @khaneliman -- Chore: add supported secrets directories by @khaneliman -- Feat: add more to devshell by @khaneliman -- Chore: add meta.platforms to packages by @khaneliman -- Feat: add hyprland crash report aliases by @khaneliman -- Feat: add logging hyprland (breaking change randomly) by @khaneliman -- Feat: add firefox search defaults by @khaneliman -- Feat: add weather_config to secrets by @khaneliman -- Feat: add chromium while troubleshooting firefox crashes by @khaneliman -- Feat: add c devshell by @khaneliman -- Feat: add disko khanelinix by @khaneliman -- Feat: add hyprland catppuccin.conf by @khaneliman -- Feat: add nix-update by @khaneliman -- Feat: add theme module by @khaneliman -- Feat: add flake-checker to check.yml by @khaneliman -- Feat: add jqp dev packages by @khaneliman -- Feat: add yazi goto keymap by @khaneliman -- Feat: add gsed alias darwin by @khaneliman -- Feat: add yazi (wip config) by @khaneliman -- Feat: add tree-sitter to allow building from grammar by @khaneliman -- Feat: add k9s by @khaneliman -- Feat: add bottom by @khaneliman -- Feat: add prefetch-sri by @khaneliman -- Feat: add tearing to games by @khaneliman -- Feat: add hyprland tearing by @khaneliman -- Feat: add udiskie by @khaneliman -- Feat: add tree by @khaneliman -- Feat: add element windowrule by @khaneliman -- Feat: add khanelinix cachix by @khaneliman -- Feat: add git fix by @khaneliman -- Feat: add efi tools by @khaneliman -- Feat: add lanzaboote secure boot by @khaneliman -- Feat: add dib kubeconfig core laptop by @khaneliman -- Feat: add azure tools by @khaneliman -- Feat: add gtk and qt theme core laptop by @khaneliman -- Fix: add qt6 kvantum by @khaneliman -- Feat: add k9s to k8s by @khaneliman -- Feat: add nix secret by @khaneliman -- Feat: add wakatime secret for khanelimac khaneliman by @khaneliman -- Feat: add wakatime secret for core nixos by @khaneliman -- Feat: add wakatime secret and user ssh by @khaneliman -- Fix: add python3 pip dependency by @khaneliman -- Feat: add godot engine by @khaneliman -- Feat: add wakatime secret (wip implementation) by @khaneliman -- Feat: add snowfall-frost by @khaneliman -- Feat: add unityhub by @khaneliman -- Feat: initial wsl setup (#5) by @khaneliman -- Chore: add meta.mainProgram to local packages by @khaneliman -- Feat: add btrfs auto scrub by @khaneliman -- Feat: initial sops addition by @khaneliman -- Feat: add some disk space analysers by @khaneliman -- Feat: add tuigreet (unthemed) by @khaneliman -- Feat: add lightdm by @khaneliman -- Feat: add vscode/argv.json to fix keychain issue by @khaneliman -- Feat: add nix trace helper programs by @khaneliman -- Nixos-wsl: add CORE-PW00LM92 init by @khaneliman -- Testing kernel because of amdgpu issues in current by @khaneliman -- Test out armcord as a discord client by @khaneliman - -#### Removed -- Hyprland: remove WLR_RENDERER by @khaneliman -- Zellij: remove strider by @khaneliman -- Flake.nix: remove hypr-socket-watch overlay by @khaneliman -- Flake.nix: remove hypr*.inputs.nixpkgs.follows by @khaneliman -- Waybar: remove alt for clock by @khaneliman -- Flake.nix: remove unused inputs by @khaneliman -- Wallpapers: remove module used for creating symlink by @khaneliman -- Hyprland: remove redundant sessionVariables - -https://github.com/NixOS/nixpkgs/pull/307155 added these by default now by @khaneliman -- Eww: remove by @khaneliman -- Neovim: remove old config inputs by @khaneliman -- Flake.nix: remove nixos-hardware by @khaneliman -- Hardware: remove common-pc by @khaneliman -- Flake.nix: remove snowfall-frost and thaw by @khaneliman -- Khanelinix: remove ckb-next by @khaneliman -- Firefox: remove floorp and bypass-paywalls by @khaneliman -- Overlays/nix-update: remove by @khaneliman -- Git: remove git alias that blocks real command by @khaneliman -- Conform: remove codespell by @khaneliman -- Ranger: remove by @khaneliman -- Chore: remove unnecessary , options by @khaneliman -- Barbar: remove by @khaneliman -- Nixvim: remove auto center on insert by @khaneliman -- Hypr_socket_watch: remove local package by @khaneliman -- Flake.nix: remove unused insecure programs by @khaneliman -- Chore: remove dead code by @khaneliman in [#86](https://github.com/khaneliman/khanelinix/pull/86) -- Wlroots: remove swaylock by @khaneliman -- Hyprland: remove sway addons by @khaneliman -- Chore: remove sketchybar version overlay by @khaneliman -- Chore: remove dead code by @khaneliman in [#83](https://github.com/khaneliman/khanelinix/pull/83) -- Gtk: remove XCURSOR explicit sessionVariables - -Handled in the home.pointerCursor module by @khaneliman -- Nixvim: remove unused autocmds by @khaneliman -- Fastfetch: remove unused temp setting by @khaneliman -- Homebrew: remove cask tap again by @khaneliman -- Sketchybar: remove wifi and bluetooth aliases by @khaneliman -- Darwin: remove broken package reference by @khaneliman -- Wezterm: remove custom package by @khaneliman -- Nixvim: remove scrolloff locking by @khaneliman -- Chore: remove duplicate qt session variable by @khaneliman -- Chore: remove upstreamed swayidle systemdTarget by @khaneliman -- Chore: remove monaspace overlay by @khaneliman -- Chore: remove yabai overlay by @khaneliman -- Chore: remove unnecessary spicetify-cli module by @khaneliman -- Chore: remove dooit overlay and add to nixos by @khaneliman -- Chore: remove custom waybar overlay - -This reverts commit dfac919656d50196f4fa69f3d09eeacff5211537. by @khaneliman -- Chore: remove git safe directory by @khaneliman -- Refactor: remove tmux always on init, move to keybind by @khaneliman -- Chore: remove dead code (#38) - -Co-authored-by: khaneliman by @github-actions[bot] in [#38](https://github.com/khaneliman/khanelinix/pull/38) -- Chore: remove unused hyprland variable by @khaneliman -- Chore: remove nixpkgs-khanelinix again by @khaneliman -- Chore: remove nixpkgs fork again by @khaneliman -- Feat: remove armcord by @khaneliman -- Chore: remove custom xdg-open-with-portal by @khaneliman -- Chore: remove redundant shebangs by @khaneliman -- Refactor: remove simple package modules by @khaneliman -- Chore: remove global python by @khaneliman -- Chore: remove duplicate home-manager imports by @khaneliman -- Chore: remove unused bindings by @khaneliman -- Chore: remove unused types by @khaneliman -- Chore: remove unused attributes by @khaneliman -- Chore: remove unused agenix by @khaneliman -- Chore: remove unused packages by @khaneliman -- Chore: remove snowfallorg flake fork by @khaneliman -- Chore: remove unused inputs by @khaneliman -- Chore: remove unneeded sketchybar overlay by @khaneliman - -## New Contributors -* @dependabot[bot] made their first contribution in [#84](https://github.com/khaneliman/khanelinix/pull/84) -* @github-actions[bot] made their first contribution in [#54](https://github.com/khaneliman/khanelinix/pull/54) - -[unreleased]: https://github.com/khaneliman/khanelinix/compare/v0.0.1..HEAD - - - diff --git a/README.md b/README.md index e4ac4d463..e2e7dfab8 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,8 @@

- - + + Nix Flakes Ready @@ -16,7 +16,7 @@

-Welcome to KhaneliNix, a personal Nix configuration repository. This repository +Welcome to khanelinix, a personal Nix configuration repository. This repository contains my NixOS and Nixpkgs configurations, along with various tools and customizations to enhance the Nix experience. diff --git a/flake.lock b/flake.lock index 030bbe021..5fc097a22 100644 --- a/flake.lock +++ b/flake.lock @@ -1637,15 +1637,16 @@ ] }, "locked": { - "lastModified": 1694679207, - "narHash": "sha256-g6lYb6nXMpxYUVRZNRZPZI+L31xWlwF/r/oWZmiSYpo=", + "lastModified": 1716433572, + "narHash": "sha256-JzUSwdANQyTVZiKkTpGVB9rTCu2y8kn3vbrp8kUsozE=", "owner": "snowfallorg", "repo": "lib", - "rev": "8df9cb69f2ee4199c2879baaafce4e13864496a7", + "rev": "c58023878d6720c525446cb67d8fcbe7c3a5d84c", "type": "github" }, "original": { "owner": "snowfallorg", + "ref": "v3.0.0", "repo": "lib", "type": "github" } @@ -1659,16 +1660,15 @@ ] }, "locked": { - "lastModified": 1716186035, - "narHash": "sha256-iqtxSDYPgoS3ylNiTACYxqjdqrtV9OthXUHtmVQqY9g=", + "lastModified": 1716500926, + "narHash": "sha256-GBpnvjyw5Ox4xNB676sErwrT1GCK3ldWXuEw2oPk8Ao=", "owner": "snowfallorg", "repo": "lib", - "rev": "d6b766939af0350fcfad505cf3b693dbaf297c3b", + "rev": "9407d4127b89691ceafec0d3038dd4133ad7d0fb", "type": "github" }, "original": { "owner": "snowfallorg", - "ref": "dev", "repo": "lib", "type": "github" } diff --git a/flake.nix b/flake.nix index de378297e..d7dfca505 100644 --- a/flake.nix +++ b/flake.nix @@ -116,7 +116,7 @@ # Snowfall Lib snowfall-lib = { - url = "github:snowfallorg/lib/dev"; + url = "github:snowfallorg/lib"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -153,11 +153,18 @@ lib = snowfall-lib.mkLib { inherit inputs; src = ./.; + + snowfall = { + meta = { + name = "khanelinix"; + title = "KhaneliNix"; + }; + + namespace = "khanelinix"; + }; }; in lib.mkFlake { - package-namespace = "khanelinix"; - channels-config = { # allowBroken = true; allowUnfree = true; diff --git a/homes/aarch64-darwin/khaneliman@khanelimac/default.nix b/homes/aarch64-darwin/khaneliman@khanelimac/default.nix index 47c220b81..57560e291 100644 --- a/homes/aarch64-darwin/khaneliman@khanelimac/default.nix +++ b/homes/aarch64-darwin/khaneliman@khanelimac/default.nix @@ -1,7 +1,12 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkForce; - inherit (lib.internal) enabled disabled; + inherit (lib.${namespace}) enabled disabled; in { khanelinix = { @@ -57,7 +62,7 @@ in services = { sops = { enable = true; - defaultSopsFile = ../../../secrets/khanelimac/khaneliman/default.yaml; + defaultSopsFile = lib.snowfall.fs.get-file "secrets/khanelimac/khaneliman/default.yaml"; sshKeyPaths = [ "${config.home.homeDirectory}/.ssh/id_ed25519" ]; }; }; diff --git a/homes/x86_64-linux/khaneliman@khanelinix/default.nix b/homes/x86_64-linux/khaneliman@khanelinix/default.nix index 8bdbd99cc..cd21da98c 100644 --- a/homes/x86_64-linux/khaneliman@khanelinix/default.nix +++ b/homes/x86_64-linux/khaneliman@khanelinix/default.nix @@ -2,11 +2,12 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) getExe; - inherit (lib.internal) enabled; + inherit (lib.${namespace}) enabled; in { khanelinix = { @@ -44,7 +45,7 @@ in enable = true; appendConfig = # bash '' - exec-once = hyprctl setcursor ${config.khanelinix.theme.gtk.cursor.name} 32 + exec-once = hyprctl setcursor ${config.${namespace}.theme.gtk.cursor.name} 32 ''; prependConfig = # bash @@ -100,23 +101,23 @@ in monitors = [ { name = "DP-3"; - wallpaper = "${pkgs.khanelinix.wallpapers}/share/wallpapers/cat_pacman.png"; + wallpaper = "${pkgs.${namespace}.wallpapers}/share/wallpapers/cat_pacman.png"; } { name = "DP-1"; - wallpaper = "${pkgs.khanelinix.wallpapers}/share/wallpapers/cat-sound.png"; + wallpaper = "${pkgs.${namespace}.wallpapers}/share/wallpapers/cat-sound.png"; } ]; wallpapers = [ - "${pkgs.khanelinix.wallpapers}/share/wallpapers/buttons.png" - "${pkgs.khanelinix.wallpapers}/share/wallpapers/cat_pacman.png" - "${pkgs.khanelinix.wallpapers}/share/wallpapers/cat-sound.png" - "${pkgs.khanelinix.wallpapers}/share/wallpapers/flatppuccin_macchiato.png" - "${pkgs.khanelinix.wallpapers}/share/wallpapers/hashtags-black.png" - "${pkgs.khanelinix.wallpapers}/share/wallpapers/hashtags-new.png" - "${pkgs.khanelinix.wallpapers}/share/wallpapers/hearts.png" - "${pkgs.khanelinix.wallpapers}/share/wallpapers/tetris.png" + "${pkgs.${namespace}.wallpapers}/share/wallpapers/buttons.png" + "${pkgs.${namespace}.wallpapers}/share/wallpapers/cat_pacman.png" + "${pkgs.${namespace}.wallpapers}/share/wallpapers/cat-sound.png" + "${pkgs.${namespace}.wallpapers}/share/wallpapers/flatppuccin_macchiato.png" + "${pkgs.${namespace}.wallpapers}/share/wallpapers/hashtags-black.png" + "${pkgs.${namespace}.wallpapers}/share/wallpapers/hashtags-new.png" + "${pkgs.${namespace}.wallpapers}/share/wallpapers/hearts.png" + "${pkgs.${namespace}.wallpapers}/share/wallpapers/tetris.png" ]; }; @@ -128,7 +129,7 @@ in sops = { enable = true; - defaultSopsFile = ../../../secrets/khanelinix/khaneliman/default.yaml; + defaultSopsFile = lib.snowfall.fs.get-file "secrets/khanelinix/khaneliman/default.yaml"; sshKeyPaths = [ "${config.home.homeDirectory}/.ssh/id_ed25519" ]; }; }; diff --git a/homes/x86_64-linux/khaneliman@nixos/default.nix b/homes/x86_64-linux/khaneliman@nixos/default.nix index 0b97b59bf..04b86bfe5 100644 --- a/homes/x86_64-linux/khaneliman@nixos/default.nix +++ b/homes/x86_64-linux/khaneliman@nixos/default.nix @@ -1,6 +1,11 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let - inherit (lib.internal) enabled; + inherit (lib.${namespace}) enabled; in { khanelinix = { diff --git a/homes/x86_64-linux/nixos@CORE-PW00LM92/default.nix b/homes/x86_64-linux/nixos@CORE-PW00LM92/default.nix index c53c57485..0f5c18a90 100644 --- a/homes/x86_64-linux/nixos@CORE-PW00LM92/default.nix +++ b/homes/x86_64-linux/nixos@CORE-PW00LM92/default.nix @@ -1,7 +1,12 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkForce; - inherit (lib.internal) enabled disabled; + inherit (lib.${namespace}) enabled disabled; in { khanelinix = { @@ -48,7 +53,7 @@ in services = { sops = { enable = true; - defaultSopsFile = ../../../secrets/CORE/nixos/default.yaml; + defaultSopsFile = lib.snowfall.fs.get-file "secrets/CORE/nixos/default.yaml"; sshKeyPaths = [ "${config.home.homeDirectory}/.ssh/id_ed25519" ]; }; }; diff --git a/lib/deploy/default.nix b/lib/deploy/default.nix index ce9360b81..d921bd16d 100644 --- a/lib/deploy/default.nix +++ b/lib/deploy/default.nix @@ -1,8 +1,24 @@ -{ lib, inputs }: +{ + lib, + inputs, + namespace, +}: let inherit (inputs) deploy-rs; in rec { + ## Create deployment configuration for use with deploy-rs. + ## + ## ```nix + ## mkDeploy { + ## inherit self; + ## overrides = { + ## my-host.system.sudo = "doas -u"; + ## }; + ## } + ## ``` + ## + #@ { self: Flake, overrides: Attrs ? {} } -> Attrs mkDeploy = { self, @@ -15,7 +31,7 @@ rec { result: name: let host = hosts.${name}; - user = host.config.khanelinix.user.name or null; + user = host.config.${namespace}.user.name or null; inherit (host.pkgs) system; in result @@ -31,8 +47,8 @@ rec { // lib.optionalAttrs (user != null) { user = "root"; sshUser = user; - } - // lib.optionalAttrs (host.config.khanelinix.security.doas.enable or false) { sudo = "doas -u"; }; + }; + # // lib.optionalAttrs (host.config.${namespace}.security.doas.enable or false) { sudo = "doas -u"; }; }; }; } diff --git a/modules/darwin/archetypes/personal/default.nix b/modules/darwin/archetypes/personal/default.nix index 51c29abc9..a3695986f 100644 --- a/modules/darwin/archetypes/personal/default.nix +++ b/modules/darwin/archetypes/personal/default.nix @@ -1,12 +1,17 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt enabled; + inherit (lib.${namespace}) mkBoolOpt enabled; - cfg = config.khanelinix.archetypes.personal; + cfg = config.${namespace}.archetypes.personal; in { - options.khanelinix.archetypes.personal = { + options.${namespace}.archetypes.personal = { enable = mkBoolOpt false "Whether or not to enable the personal archetype."; }; diff --git a/modules/darwin/archetypes/vm/default.nix b/modules/darwin/archetypes/vm/default.nix index f38e9e094..ca3a016ef 100644 --- a/modules/darwin/archetypes/vm/default.nix +++ b/modules/darwin/archetypes/vm/default.nix @@ -1,12 +1,17 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt enabled; + inherit (lib.${namespace}) mkBoolOpt enabled; - cfg = config.khanelinix.archetypes.vm; + cfg = config.${namespace}.archetypes.vm; in { - options.khanelinix.archetypes.vm = { + options.${namespace}.archetypes.vm = { enable = mkBoolOpt false "Whether or not to enable the vm archetype."; }; diff --git a/modules/darwin/archetypes/workstation/default.nix b/modules/darwin/archetypes/workstation/default.nix index 2b5bf2098..4c116c5f5 100644 --- a/modules/darwin/archetypes/workstation/default.nix +++ b/modules/darwin/archetypes/workstation/default.nix @@ -1,12 +1,17 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt enabled; + inherit (lib.${namespace}) mkBoolOpt enabled; - cfg = config.khanelinix.archetypes.workstation; + cfg = config.${namespace}.archetypes.workstation; in { - options.khanelinix.archetypes.workstation = { + options.${namespace}.archetypes.workstation = { enable = mkBoolOpt false "Whether or not to enable the workstation archetype."; }; diff --git a/modules/darwin/desktop/addons/barrier/default.nix b/modules/darwin/desktop/addons/barrier/default.nix index 906bd2261..c6ee6bc49 100644 --- a/modules/darwin/desktop/addons/barrier/default.nix +++ b/modules/darwin/desktop/addons/barrier/default.nix @@ -1,12 +1,17 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.desktop.addons.barrier; + cfg = config.${namespace}.desktop.addons.barrier; in { - options.khanelinix.desktop.addons.barrier = { + options.${namespace}.desktop.addons.barrier = { enable = mkBoolOpt false "Whether or not to enable barrier."; }; diff --git a/modules/darwin/desktop/addons/jankyborders/default.nix b/modules/darwin/desktop/addons/jankyborders/default.nix index c6fe66968..c6c08e9d4 100644 --- a/modules/darwin/desktop/addons/jankyborders/default.nix +++ b/modules/darwin/desktop/addons/jankyborders/default.nix @@ -2,6 +2,7 @@ config, lib, pkgs, + namespace, ... }: let @@ -11,26 +12,26 @@ let mkOption literalExpression ; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.desktop.addons.jankyborders; + cfg = config.${namespace}.desktop.addons.jankyborders; in { - options.khanelinix.desktop.addons.jankyborders = { + options.${namespace}.desktop.addons.jankyborders = { enable = mkBoolOpt false "Whether to enable jankyborders in the desktop environment."; package = mkOption { type = lib.types.package; default = pkgs.jankyborders; defaultText = literalExpression "pkgs.jankyborders"; description = "The jankyborders package to use."; - example = literalExpression "pkgs.khanelinix.jankyborders"; + example = literalExpression "pkgs.${namespace}.jankyborders"; }; }; config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ jankyborders ]; - khanelinix.home.configFile = { + ${namespace}.home.configFile = { "borders/bordersrc".source = pkgs.writeShellScript "bordersrc" # bash '' diff --git a/modules/darwin/desktop/addons/sketchybar/default.nix b/modules/darwin/desktop/addons/sketchybar/default.nix index 4dd5dd555..7b2cec30e 100644 --- a/modules/darwin/desktop/addons/sketchybar/default.nix +++ b/modules/darwin/desktop/addons/sketchybar/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf types; - inherit (lib.internal) mkBoolOpt mkOpt; + inherit (lib.${namespace}) mkBoolOpt mkOpt; - cfg = config.khanelinix.desktop.addons.sketchybar; + cfg = config.${namespace}.desktop.addons.sketchybar; in { - options.khanelinix.desktop.addons.sketchybar = { + options.${namespace}.desktop.addons.sketchybar = { enable = mkBoolOpt false "Whether or not to enable sketchybar."; logFile = mkOpt types.str "/var/tmp/sketchybar.log" "Filepath of log output"; }; @@ -40,8 +41,8 @@ in jq lua5_4 wttrbar - pkgs.khanelinix.sketchyhelper - pkgs.khanelinix.dynamic-island-helper + pkgs.${namespace}.sketchyhelper + pkgs.${namespace}.dynamic-island-helper ]; # TODO: need to update nixpkg to support complex configurations diff --git a/modules/darwin/desktop/addons/skhd/default.nix b/modules/darwin/desktop/addons/skhd/default.nix index e7d12c399..24a6d4beb 100644 --- a/modules/darwin/desktop/addons/skhd/default.nix +++ b/modules/darwin/desktop/addons/skhd/default.nix @@ -2,19 +2,20 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf getExe; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; sketchybar = getExe config.services.sketchybar.package; yabai = getExe config.services.yabai.package; - cfg = config.khanelinix.desktop.addons.skhd; + cfg = config.${namespace}.desktop.addons.skhd; in { - options.khanelinix.desktop.addons.skhd = { + options.${namespace}.desktop.addons.skhd = { enable = mkBoolOpt false "Whether or not to enable skhd."; }; diff --git a/modules/darwin/desktop/addons/yabai/default.nix b/modules/darwin/desktop/addons/yabai/default.nix index 066d12ee5..6e6092249 100644 --- a/modules/darwin/desktop/addons/yabai/default.nix +++ b/modules/darwin/desktop/addons/yabai/default.nix @@ -2,22 +2,23 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf getExe; - inherit (lib.internal) mkBoolOpt enabled; + inherit (lib.${namespace}) mkBoolOpt enabled; - cfg = config.khanelinix.desktop.addons.yabai; + cfg = config.${namespace}.desktop.addons.yabai; in { - options.khanelinix.desktop.addons.yabai = { + options.${namespace}.desktop.addons.yabai = { enable = mkBoolOpt false "Whether or not to enable yabai."; debug = mkBoolOpt false "Whether to enable debug output."; }; config = mkIf cfg.enable { - khanelinix.desktop.addons.jankyborders = enabled; + ${namespace}.desktop.addons.jankyborders = enabled; services.yabai = { enable = true; @@ -64,7 +65,7 @@ in extraConfig = with pkgs; # bash '' - source ${getExe khanelinix.yabai-helper} + source ${getExe pkgs.${namespace}.yabai-helper} # Set external_bar here in case we launch after sketchybar BAR_HEIGHT=$(${getExe sketchybar} -m --query bar | jq -r '.height') @@ -75,16 +76,24 @@ in # Signal hooks ${getExe config.services.yabai.package} -m signal --add event=dock_did_restart action="sudo ${getExe config.services.yabai.package} --load-sa" ${getExe config.services.yabai.package} -m signal --add event=window_focused action="${getExe sketchybar} --trigger window_focus" - ${getExe config.services.yabai.package} -m signal --add event=display_added action="sleep 1 && source ${getExe khanelinix.yabai-helper} && create_spaces 7" - ${getExe config.services.yabai.package} -m signal --add event=display_removed action="sleep 1 && source ${getExe khanelinix.yabai-helper} && create_spaces 7" + ${getExe config.services.yabai.package} -m signal --add event=display_added action="sleep 1 && source ${ + getExe pkgs.${namespace}.yabai-helper + } && create_spaces 7" + ${getExe config.services.yabai.package} -m signal --add event=display_removed action="sleep 1 && source ${ + getExe pkgs.${namespace}.yabai-helper + } && create_spaces 7" ${getExe config.services.yabai.package} -m signal --add event=window_created action="${getExe sketchybar} --trigger windows_on_spaces" ${getExe config.services.yabai.package} -m signal --add event=window_destroyed action="${getExe sketchybar} --trigger windows_on_spaces" - ${getExe config.services.yabai.package} -m signal --add event=window_created app="Code" action="source ${getExe khanelinix.yabai-helper} && auto_stack Code" - # ${getExe config.services.yabai.package} -m signal --add event=window_created app="Firefox" title!="(— Private Browsing$|^Picture-in-Picture$)" action="source ${getExe khanelinix.yabai-helper} && auto_stack Firefox" + ${getExe config.services.yabai.package} -m signal --add event=window_created app="Code" action="source ${ + getExe pkgs.${namespace}.yabai-helper + } && auto_stack Code" + # ${getExe config.services.yabai.package} -m signal --add event=window_created app="Firefox" title!="(— Private Browsing$|^Picture-in-Picture$)" action="source ${ + getExe pkgs.${namespace}.yabai-helper + } && auto_stack Firefox" # ${getExe config.services.yabai.package} -m signal --add event=window_title_changed app="Firefox" title="- noVNC$" action="${getExe config.services.yabai.package} -m window $WINDOW_ID --toggle native-fullscreen" # jankyborders - ${getExe config.khanelinix.desktop.addons.jankyborders.package} 2>/dev/null 1>&2 & + ${getExe config.${namespace}.desktop.addons.jankyborders.package} 2>/dev/null 1>&2 & echo "yabai configuration loaded.." ''; diff --git a/modules/darwin/home/default.nix b/modules/darwin/home/default.nix index e7ef8dcc9..669c380bb 100644 --- a/modules/darwin/home/default.nix +++ b/modules/darwin/home/default.nix @@ -2,15 +2,16 @@ config, lib, options, + namespace, ... }: let inherit (lib) types mkAliasDefinitions; - inherit (lib.internal) mkOpt; + inherit (lib.${namespace}) mkOpt; in { - options.khanelinix.home = with types; { + options.${namespace}.home = with types; { file = mkOpt attrs { } "A set of files to be managed by home-manager's ."; configFile = mkOpt attrs { } @@ -20,13 +21,15 @@ in }; config = { - khanelinix.home.extraOptions = { - home.file = mkAliasDefinitions options.khanelinix.home.file; + ${namespace}.home.extraOptions = { + home.file = mkAliasDefinitions options.${namespace}.home.file; xdg.enable = true; - xdg.configFile = mkAliasDefinitions options.khanelinix.home.configFile; + xdg.configFile = mkAliasDefinitions options.${namespace}.home.configFile; }; - snowfallorg.users.${config.khanelinix.user.name}.home.config = mkAliasDefinitions options.khanelinix.home.extraOptions; + snowfallorg.users.${config.${namespace}.user.name}.home.config = + mkAliasDefinitions + options.${namespace}.home.extraOptions; home-manager = { # enables backing up existing files instead of erroring if conflicts exist diff --git a/modules/darwin/nix/default.nix b/modules/darwin/nix/default.nix index 3f77c1c65..4ad8161ca 100644 --- a/modules/darwin/nix/default.nix +++ b/modules/darwin/nix/default.nix @@ -1,11 +1,16 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf mkForce; - cfg = config.khanelinix.nix; + cfg = config.${namespace}.nix; in { - imports = [ ../../shared/nix/default.nix ]; + imports = [ (lib.snowfall.fs.get-file "modules/shared/nix/default.nix") ]; config = mkIf cfg.enable { nix = { @@ -22,7 +27,7 @@ in Hour = 3; }; - user = config.khanelinix.user.name; + user = config.${namespace}.user.name; }; optimise = { @@ -31,7 +36,7 @@ in Hour = 4; }; - user = config.khanelinix.user.name; + user = config.${namespace}.user.name; }; # NOTE: not sure if i saw any benefits changing this diff --git a/modules/darwin/programs/graphical/apps/_1password/default.nix b/modules/darwin/programs/graphical/apps/_1password/default.nix index d5e57cec2..6f302fbb2 100644 --- a/modules/darwin/programs/graphical/apps/_1password/default.nix +++ b/modules/darwin/programs/graphical/apps/_1password/default.nix @@ -1,12 +1,17 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.graphical.apps._1password; + cfg = config.${namespace}.programs.graphical.apps._1password; in { - options.khanelinix.programs.graphical.apps._1password = { + options.${namespace}.programs.graphical.apps._1password = { enable = mkBoolOpt false "Whether or not to enable 1password."; }; @@ -19,7 +24,9 @@ in "1password-cli" ]; - masApps = mkIf config.khanelinix.tools.homebrew.masEnable { "1Password for Safari" = 1569813296; }; + masApps = mkIf config.${namespace}.tools.homebrew.masEnable { + "1Password for Safari" = 1569813296; + }; }; }; } diff --git a/modules/darwin/security/gpg/default.nix b/modules/darwin/security/gpg/default.nix index 2fa4a4a0f..4cbac7f54 100644 --- a/modules/darwin/security/gpg/default.nix +++ b/modules/darwin/security/gpg/default.nix @@ -3,6 +3,7 @@ lib, pkgs, inputs, + namespace, ... }: let @@ -13,10 +14,10 @@ let getExe getExe' ; - inherit (lib.internal) mkOpt; + inherit (lib.${namespace}) mkOpt; inherit (inputs) gpg-base-conf yubikey-guide; - cfg = config.khanelinix.security.gpg; + cfg = config.${namespace}.security.gpg; gpgConf = "${gpg-base-conf}/gpg.conf"; @@ -52,7 +53,7 @@ let ''; in { - options.khanelinix.security.gpg = { + options.${namespace}.security.gpg = { enable = mkEnableOption "GPG"; agentTimeout = mkOpt types.int 5 "The amount of time to wait before continuing with shell init."; }; @@ -80,7 +81,7 @@ in enableSSHSupport = true; }; - khanelinix.home.file = { + ${namespace}.home.file = { ".gnupg/.keep".text = ""; ".gnupg/yubikey-guide.md".source = guide; diff --git a/modules/darwin/security/sops/default.nix b/modules/darwin/security/sops/default.nix index 538f83b13..995fb7a51 100644 --- a/modules/darwin/security/sops/default.nix +++ b/modules/darwin/security/sops/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.security.sops; + cfg = config.${namespace}.security.sops; in { - options.khanelinix.security.sops = { + options.${namespace}.security.sops = { enable = mkBoolOpt false "Whether to enable sops."; }; diff --git a/modules/darwin/services/nix-daemon/default.nix b/modules/darwin/services/nix-daemon/default.nix index b4005010b..487f9e64d 100644 --- a/modules/darwin/services/nix-daemon/default.nix +++ b/modules/darwin/services/nix-daemon/default.nix @@ -1,12 +1,17 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) types mkIf; - inherit (lib.internal) mkOpt enabled; + inherit (lib.${namespace}) mkOpt enabled; - cfg = config.khanelinix.services.nix-daemon; + cfg = config.${namespace}.services.nix-daemon; in { - options.khanelinix.services.nix-daemon = { + options.${namespace}.services.nix-daemon = { enable = mkOpt types.bool true "Whether to enable the Nix daemon."; }; diff --git a/modules/darwin/suites/art/default.nix b/modules/darwin/suites/art/default.nix index f7c52e1aa..eb34e4bf7 100644 --- a/modules/darwin/suites/art/default.nix +++ b/modules/darwin/suites/art/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.suites.art; + cfg = config.${namespace}.suites.art; in { - options.khanelinix.suites.art = { + options.${namespace}.suites.art = { enable = mkBoolOpt false "Whether or not to enable art configuration."; }; @@ -29,7 +30,7 @@ in "mediainfo" ]; - masApps = mkIf config.khanelinix.tools.homebrew.masEnable { "Pixelmator" = 407963104; }; + masApps = mkIf config.${namespace}.tools.homebrew.masEnable { "Pixelmator" = 407963104; }; }; }; } diff --git a/modules/darwin/suites/business/default.nix b/modules/darwin/suites/business/default.nix index 106743f20..96c5bd9d1 100644 --- a/modules/darwin/suites/business/default.nix +++ b/modules/darwin/suites/business/default.nix @@ -1,12 +1,17 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt enabled; + inherit (lib.${namespace}) mkBoolOpt enabled; - cfg = config.khanelinix.suites.business; + cfg = config.${namespace}.suites.business; in { - options.khanelinix.suites.business = { + options.${namespace}.suites.business = { enable = mkBoolOpt false "Whether or not to enable business configuration."; }; @@ -23,7 +28,7 @@ in "thunderbird" ]; - masApps = mkIf config.khanelinix.tools.homebrew.masEnable { + masApps = mkIf config.${namespace}.tools.homebrew.masEnable { "Brother iPrint&Scan" = 1193539993; "Keynote" = 409183694; "Microsoft OneNote" = 784801555; diff --git a/modules/darwin/suites/common/default.nix b/modules/darwin/suites/common/default.nix index 47adfedf0..ae3aaa0dc 100644 --- a/modules/darwin/suites/common/default.nix +++ b/modules/darwin/suites/common/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) enabled; + inherit (lib.${namespace}) enabled; - cfg = config.khanelinix.suites.common; + cfg = config.${namespace}.suites.common; in { - imports = [ ../../../shared/suites/common/default.nix ]; + imports = [ (lib.snowfall.fs.get-file "modules/shared/suites/common/default.nix") ]; config = mkIf cfg.enable { programs.zsh.enable = true; @@ -39,8 +40,8 @@ in haskellPackages.sfnt2woff intltool keychain - khanelinix.trace-symlink - khanelinix.trace-which + pkgs.${namespace}.trace-symlink + pkgs.${namespace}.trace-which mas moreutils ncdu diff --git a/modules/darwin/suites/desktop/default.nix b/modules/darwin/suites/desktop/default.nix index 7c03b4335..f8c1c1cad 100644 --- a/modules/darwin/suites/desktop/default.nix +++ b/modules/darwin/suites/desktop/default.nix @@ -1,17 +1,22 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt enabled; + inherit (lib.${namespace}) mkBoolOpt enabled; - cfg = config.khanelinix.suites.desktop; + cfg = config.${namespace}.suites.desktop; in { - options.khanelinix.suites.desktop = { + options.${namespace}.suites.desktop = { enable = mkBoolOpt false "Whether or not to enable common desktop configuration."; }; config = mkIf cfg.enable { - khanelinix.desktop.addons = { + ${namespace}.desktop.addons = { skhd = enabled; yabai = enabled; sketchybar = enabled; @@ -54,7 +59,7 @@ in "teamookla/speedtest" ]; - masApps = mkIf config.khanelinix.tools.homebrew.masEnable { + masApps = mkIf config.${namespace}.tools.homebrew.masEnable { "AdGuard for Safari" = 1440147259; "AmorphousMemoryMark" = 1495719766; "Amphetamine" = 937984704; diff --git a/modules/darwin/suites/development/default.nix b/modules/darwin/suites/development/default.nix index e04d21195..615f44a3c 100644 --- a/modules/darwin/suites/development/default.nix +++ b/modules/darwin/suites/development/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.suites.development; + cfg = config.${namespace}.suites.development; in { - options.khanelinix.suites.development = { + options.${namespace}.suites.development = { enable = mkBoolOpt false "Whether or not to enable common development configuration."; }; @@ -50,7 +51,7 @@ in "earthly/earthly" ]; - masApps = mkIf config.khanelinix.tools.homebrew.masEnable { + masApps = mkIf config.${namespace}.tools.homebrew.masEnable { "Patterns" = 429449079; "Xcode" = 497799835; }; diff --git a/modules/darwin/suites/games/default.nix b/modules/darwin/suites/games/default.nix index bfc097d20..0963fd540 100644 --- a/modules/darwin/suites/games/default.nix +++ b/modules/darwin/suites/games/default.nix @@ -1,12 +1,17 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.suites.games; + cfg = config.${namespace}.suites.games; in { - options.khanelinix.suites.games = { + options.${namespace}.suites.games = { enable = mkBoolOpt false "Whether or not to enable games configuration."; }; diff --git a/modules/darwin/suites/music/default.nix b/modules/darwin/suites/music/default.nix index 53b9dcad1..b11bfe0f4 100644 --- a/modules/darwin/suites/music/default.nix +++ b/modules/darwin/suites/music/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.suites.music; + cfg = config.${namespace}.suites.music; in { - options.khanelinix.suites.music = { + options.${namespace}.suites.music = { enable = mkBoolOpt false "Whether or not to enable music configuration."; }; @@ -24,7 +25,7 @@ in homebrew = { casks = [ "spotify" ]; - masApps = mkIf config.khanelinix.tools.homebrew.masEnable { "GarageBand" = 682658836; }; + masApps = mkIf config.${namespace}.tools.homebrew.masEnable { "GarageBand" = 682658836; }; }; }; } diff --git a/modules/darwin/suites/networking/default.nix b/modules/darwin/suites/networking/default.nix index e47f49991..bdfa82ea9 100644 --- a/modules/darwin/suites/networking/default.nix +++ b/modules/darwin/suites/networking/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt enabled; + inherit (lib.${namespace}) mkBoolOpt enabled; - cfg = config.khanelinix.suites.networking; + cfg = config.${namespace}.suites.networking; in { - options.khanelinix.suites.networking = { + options.${namespace}.suites.networking = { enable = mkBoolOpt false "Whether or not to enable networking configuration."; }; diff --git a/modules/darwin/suites/photo/default.nix b/modules/darwin/suites/photo/default.nix index e6ebf9c64..797f80298 100644 --- a/modules/darwin/suites/photo/default.nix +++ b/modules/darwin/suites/photo/default.nix @@ -1,12 +1,17 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.suites.photo; + cfg = config.${namespace}.suites.photo; in { - options.khanelinix.suites.photo = { + options.${namespace}.suites.photo = { enable = mkBoolOpt false "Whether or not to enable photo configuration."; }; @@ -14,7 +19,7 @@ in homebrew = { casks = [ "digikam" ]; - masApps = mkIf config.khanelinix.tools.homebrew.masEnable { }; + masApps = mkIf config.${namespace}.tools.homebrew.masEnable { }; }; }; } diff --git a/modules/darwin/suites/social/default.nix b/modules/darwin/suites/social/default.nix index 1d95fdb45..897eabf53 100644 --- a/modules/darwin/suites/social/default.nix +++ b/modules/darwin/suites/social/default.nix @@ -1,12 +1,17 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.suites.social; + cfg = config.${namespace}.suites.social; in { - options.khanelinix.suites.social = { + options.${namespace}.suites.social = { enable = mkBoolOpt false "Whether or not to enable social configuration."; }; diff --git a/modules/darwin/suites/video/default.nix b/modules/darwin/suites/video/default.nix index 72249f38a..0c01659b3 100644 --- a/modules/darwin/suites/video/default.nix +++ b/modules/darwin/suites/video/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.suites.video; + cfg = config.${namespace}.suites.video; in { - options.khanelinix.suites.video = { + options.${namespace}.suites.video = { enable = mkBoolOpt false "Whether or not to enable video configuration."; }; @@ -19,7 +20,7 @@ in environment.systemPackages = with pkgs; [ ffmpeg ]; homebrew = { - masApps = mkIf config.khanelinix.tools.homebrew.masEnable { + masApps = mkIf config.${namespace}.tools.homebrew.masEnable { "Infuse" = 1136220934; "iMovie" = 408981434; "Prime Video" = 545519333; diff --git a/modules/darwin/suites/vm/default.nix b/modules/darwin/suites/vm/default.nix index 5d31a4c39..ec9205da4 100644 --- a/modules/darwin/suites/vm/default.nix +++ b/modules/darwin/suites/vm/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.suites.vm; + cfg = config.${namespace}.suites.vm; in { - options.khanelinix.suites.vm = { + options.${namespace}.suites.vm = { enable = mkBoolOpt false "Whether or not to enable vm."; }; diff --git a/modules/darwin/system/fonts/default.nix b/modules/darwin/system/fonts/default.nix index 99b7f98b9..8f484d18f 100644 --- a/modules/darwin/system/fonts/default.nix +++ b/modules/darwin/system/fonts/default.nix @@ -2,15 +2,16 @@ config, pkgs, lib, + namespace, ... }: let inherit (lib) mkIf; - cfg = config.khanelinix.system.fonts; + cfg = config.${namespace}.system.fonts; in { - imports = [ ../../../shared/system/fonts/default.nix ]; + imports = [ (lib.snowfall.fs.get-file "modules/shared/system/fonts/default.nix") ]; config = mkIf cfg.enable { fonts = { diff --git a/modules/darwin/system/input/default.nix b/modules/darwin/system/input/default.nix index c1f60e6b8..9c33b3f8d 100644 --- a/modules/darwin/system/input/default.nix +++ b/modules/darwin/system/input/default.nix @@ -1,11 +1,16 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf mkMerge mkEnableOption; - cfg = config.khanelinix.system.input; + cfg = config.${namespace}.system.input; in { - options.khanelinix.system.input = { + options.${namespace}.system.input = { enable = mkEnableOption "macOS input"; }; diff --git a/modules/darwin/system/interface/default.nix b/modules/darwin/system/interface/default.nix index 473e91ea8..99df40b53 100644 --- a/modules/darwin/system/interface/default.nix +++ b/modules/darwin/system/interface/default.nix @@ -2,15 +2,16 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf mkEnableOption; - cfg = config.khanelinix.system.interface; + cfg = config.${namespace}.system.interface; in { - options.khanelinix.system.interface = { + options.${namespace}.system.interface = { enable = mkEnableOption "macOS interface"; }; diff --git a/modules/darwin/system/networking/default.nix b/modules/darwin/system/networking/default.nix index d92053d21..943f6afa3 100644 --- a/modules/darwin/system/networking/default.nix +++ b/modules/darwin/system/networking/default.nix @@ -1,12 +1,17 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.system.networking; + cfg = config.${namespace}.system.networking; in { - options.khanelinix.system.networking = { + options.${namespace}.system.networking = { enable = mkBoolOpt false "Whether or not to enable networking support"; }; diff --git a/modules/darwin/tools/homebrew/default.nix b/modules/darwin/tools/homebrew/default.nix index b454f4f5b..6e60aa4f6 100644 --- a/modules/darwin/tools/homebrew/default.nix +++ b/modules/darwin/tools/homebrew/default.nix @@ -1,12 +1,17 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.tools.homebrew; + cfg = config.${namespace}.tools.homebrew; in { - options.khanelinix.tools.homebrew = { + options.${namespace}.tools.homebrew = { enable = mkBoolOpt false "Whether or not to enable homebrew."; masEnable = mkBoolOpt false "Whether or not to enable Mac App Store downloads."; }; diff --git a/modules/darwin/user/default.nix b/modules/darwin/user/default.nix index 0d0430a17..1c645de01 100644 --- a/modules/darwin/user/default.nix +++ b/modules/darwin/user/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) types mkIf; - inherit (lib.internal) mkOpt; + inherit (lib.${namespace}) mkOpt; - cfg = config.khanelinix.user; + cfg = config.${namespace}.user; in { - options.khanelinix.user = { + options.${namespace}.user = { name = mkOpt types.str "khaneliman" "The user account."; email = mkOpt types.str "khaneliman12@gmail.com" "The email of the user."; fullName = mkOpt types.str "Austin Horstman" "The full name of the user."; diff --git a/modules/home/host/default.nix b/modules/home/host/default.nix index 7d7780851..b03383080 100644 --- a/modules/home/host/default.nix +++ b/modules/home/host/default.nix @@ -1,14 +1,15 @@ { lib, host ? null, + namespace, ... }: let inherit (lib) types; - inherit (lib.internal) mkOpt; + inherit (lib.${namespace}) mkOpt; in { - options.khanelinix.host = { + options.${namespace}.host = { name = mkOpt (types.nullOr types.str) host "The host name."; }; } diff --git a/modules/home/programs/graphical/addons/electron-support/default.nix b/modules/home/programs/graphical/addons/electron-support/default.nix index bdecf21a2..74138a8a3 100644 --- a/modules/home/programs/graphical/addons/electron-support/default.nix +++ b/modules/home/programs/graphical/addons/electron-support/default.nix @@ -1,12 +1,17 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.graphical.addons.electron-support; + cfg = config.${namespace}.programs.graphical.addons.electron-support; in { - options.khanelinix.programs.graphical.addons.electron-support = { + options.${namespace}.programs.graphical.addons.electron-support = { enable = mkBoolOpt false "Whether to enable wayland electron support in the desktop environment."; }; diff --git a/modules/home/programs/graphical/addons/kanshi/default.nix b/modules/home/programs/graphical/addons/kanshi/default.nix index a2cba9457..4fd34b4ad 100644 --- a/modules/home/programs/graphical/addons/kanshi/default.nix +++ b/modules/home/programs/graphical/addons/kanshi/default.nix @@ -2,18 +2,19 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf getExe; - inherit (lib.internal) mkBoolOpt; - inherit (config.khanelinix) user; + inherit (lib.${namespace}) mkBoolOpt; + inherit (config.${namespace}) user; inherit (config.users.users.${user.name}) home; - cfg = config.khanelinix.programs.graphical.addons.kanshi; + cfg = config.${namespace}.programs.graphical.addons.kanshi; in { - options.khanelinix.programs.graphical.addons.kanshi = { + options.${namespace}.programs.graphical.addons.kanshi = { enable = mkBoolOpt false "Whether to enable Kanshi in the desktop environment."; }; diff --git a/modules/home/programs/graphical/addons/mako/default.nix b/modules/home/programs/graphical/addons/mako/default.nix index d645b771a..8bc782a1b 100644 --- a/modules/home/programs/graphical/addons/mako/default.nix +++ b/modules/home/programs/graphical/addons/mako/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf getExe getExe'; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.graphical.addons.mako; + cfg = config.${namespace}.programs.graphical.addons.mako; in { - options.khanelinix.programs.graphical.addons.mako = { + options.${namespace}.programs.graphical.addons.mako = { enable = mkBoolOpt false "Whether to enable Mako in Sway."; }; diff --git a/modules/home/programs/graphical/addons/mangohud/default.nix b/modules/home/programs/graphical/addons/mangohud/default.nix index ef5c3777a..43b6266c1 100644 --- a/modules/home/programs/graphical/addons/mangohud/default.nix +++ b/modules/home/programs/graphical/addons/mangohud/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf literalExpression; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.graphical.mangohud; + cfg = config.${namespace}.programs.graphical.mangohud; in { - options.khanelinix.programs.graphical.mangohud = { + options.${namespace}.programs.graphical.mangohud = { enable = mkBoolOpt false "Whether or not to enable mangohud."; }; diff --git a/modules/home/programs/graphical/addons/swappy/default.nix b/modules/home/programs/graphical/addons/swappy/default.nix index c9faa6ab5..d25090f95 100644 --- a/modules/home/programs/graphical/addons/swappy/default.nix +++ b/modules/home/programs/graphical/addons/swappy/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.graphical.addons.swappy; + cfg = config.${namespace}.programs.graphical.addons.swappy; in { - options.khanelinix.programs.graphical.addons.swappy = { + options.${namespace}.programs.graphical.addons.swappy = { enable = mkBoolOpt false "Whether to enable Swappy in the desktop environment."; }; diff --git a/modules/home/programs/graphical/addons/swaync/default.nix b/modules/home/programs/graphical/addons/swaync/default.nix index b5006fb3f..72b96aa7c 100644 --- a/modules/home/programs/graphical/addons/swaync/default.nix +++ b/modules/home/programs/graphical/addons/swaync/default.nix @@ -5,14 +5,15 @@ osConfig, pkgs, system, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; inherit (inputs) hyprland-contrib; - cfg = config.khanelinix.programs.graphical.addons.swaync; + cfg = config.${namespace}.programs.graphical.addons.swaync; dependencies = with pkgs; [ bash @@ -31,7 +32,7 @@ let style = import ./style.nix; in { - options.khanelinix.programs.graphical.addons.swaync = { + options.${namespace}.programs.graphical.addons.swaync = { enable = mkBoolOpt false "Whether to enable swaync in the desktop environment."; }; diff --git a/modules/home/programs/graphical/addons/wlogout/default.nix b/modules/home/programs/graphical/addons/wlogout/default.nix index a499c9b72..6aafb1696 100644 --- a/modules/home/programs/graphical/addons/wlogout/default.nix +++ b/modules/home/programs/graphical/addons/wlogout/default.nix @@ -3,17 +3,18 @@ inputs, lib, system, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; inherit (inputs) nixpkgs-wayland; - cfg = config.khanelinix.programs.graphical.addons.wlogout; + cfg = config.${namespace}.programs.graphical.addons.wlogout; in { - options.khanelinix.programs.graphical.addons.wlogout = { + options.${namespace}.programs.graphical.addons.wlogout = { enable = mkBoolOpt false "Whether to enable wlogout in the desktop environment."; }; diff --git a/modules/home/programs/graphical/apps/_1password/default.nix b/modules/home/programs/graphical/apps/_1password/default.nix index 59035d7e2..d8ad2cb2a 100644 --- a/modules/home/programs/graphical/apps/_1password/default.nix +++ b/modules/home/programs/graphical/apps/_1password/default.nix @@ -1,12 +1,17 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.graphical.apps._1password; + cfg = config.${namespace}.programs.graphical.apps._1password; in { - options.khanelinix.programs.graphical.apps._1password = { + options.${namespace}.programs.graphical.apps._1password = { enable = mkBoolOpt false "Whether or not to enable 1password."; }; diff --git a/modules/home/programs/graphical/apps/armcord/default.nix b/modules/home/programs/graphical/apps/armcord/default.nix index 41e04f80a..6ae2a9cec 100644 --- a/modules/home/programs/graphical/apps/armcord/default.nix +++ b/modules/home/programs/graphical/apps/armcord/default.nix @@ -1,11 +1,16 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkEnableOption mkIf; - cfg = config.khanelinix.programs.graphical.apps.armcord; + cfg = config.${namespace}.programs.graphical.apps.armcord; in { - options.khanelinix.programs.graphical.apps.armcord = { + options.${namespace}.programs.graphical.apps.armcord = { enable = mkEnableOption "armcord"; }; diff --git a/modules/home/programs/graphical/apps/caprine/default.nix b/modules/home/programs/graphical/apps/caprine/default.nix index a2e72ec80..a80e7007a 100644 --- a/modules/home/programs/graphical/apps/caprine/default.nix +++ b/modules/home/programs/graphical/apps/caprine/default.nix @@ -2,15 +2,16 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkEnableOption mkIf; - cfg = config.khanelinix.programs.graphical.apps.caprine; + cfg = config.${namespace}.programs.graphical.apps.caprine; in { - options.khanelinix.programs.graphical.apps.caprine = { + options.${namespace}.programs.graphical.apps.caprine = { enable = mkEnableOption "caprine"; }; diff --git a/modules/home/programs/graphical/apps/discord/default.nix b/modules/home/programs/graphical/apps/discord/default.nix index 9567a1fbf..10966adda 100644 --- a/modules/home/programs/graphical/apps/discord/default.nix +++ b/modules/home/programs/graphical/apps/discord/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.graphical.apps.discord; + cfg = config.${namespace}.programs.graphical.apps.discord; in { - options.khanelinix.programs.graphical.apps.discord = { + options.${namespace}.programs.graphical.apps.discord = { enable = mkBoolOpt false "Whether or not to enable Discord."; }; diff --git a/modules/home/programs/graphical/apps/obs/default.nix b/modules/home/programs/graphical/apps/obs/default.nix index 25432121e..20532d5de 100644 --- a/modules/home/programs/graphical/apps/obs/default.nix +++ b/modules/home/programs/graphical/apps/obs/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.graphical.apps.obs; + cfg = config.${namespace}.programs.graphical.apps.obs; in { - options.khanelinix.programs.graphical.apps.obs = { + options.${namespace}.programs.graphical.apps.obs = { enable = mkBoolOpt false "Whether or not to enable support for OBS."; }; diff --git a/modules/home/programs/graphical/apps/partitionmanager/default.nix b/modules/home/programs/graphical/apps/partitionmanager/default.nix index 695d2ec90..497677991 100644 --- a/modules/home/programs/graphical/apps/partitionmanager/default.nix +++ b/modules/home/programs/graphical/apps/partitionmanager/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.graphical.apps.partitionmanager; + cfg = config.${namespace}.programs.graphical.apps.partitionmanager; in { - options.khanelinix.programs.graphical.apps.partitionmanager = { + options.${namespace}.programs.graphical.apps.partitionmanager = { enable = mkBoolOpt false "Whether or not to enable partitionmanager."; }; diff --git a/modules/home/programs/graphical/apps/retroarch/default.nix b/modules/home/programs/graphical/apps/retroarch/default.nix index 9e61b1cdb..d7a2b13f6 100644 --- a/modules/home/programs/graphical/apps/retroarch/default.nix +++ b/modules/home/programs/graphical/apps/retroarch/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.graphical.apps.retroarch; + cfg = config.${namespace}.programs.graphical.apps.retroarch; in { - options.khanelinix.programs.graphical.apps.retroarch = { + options.${namespace}.programs.graphical.apps.retroarch = { enable = mkBoolOpt false "Whether or not to enable retroarch."; }; diff --git a/modules/home/programs/graphical/apps/thunderbird/default.nix b/modules/home/programs/graphical/apps/thunderbird/default.nix index e4c247a7b..0b2deae17 100644 --- a/modules/home/programs/graphical/apps/thunderbird/default.nix +++ b/modules/home/programs/graphical/apps/thunderbird/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.graphical.apps.thunderbird; + cfg = config.${namespace}.programs.graphical.apps.thunderbird; in { - options.khanelinix.programs.graphical.apps.thunderbird = { + options.${namespace}.programs.graphical.apps.thunderbird = { enable = mkBoolOpt false "Whether or not to enable thunderbird."; }; @@ -24,9 +25,9 @@ in # TODO: set up accounts accounts.email.accounts = { - "${config.khanelinix.user.email}" = { - address = config.khanelinix.user.email; - realName = config.khanelinix.user.fullName; + "${config.${namespace}.user.email}" = { + address = config.${namespace}.user.email; + realName = config.${namespace}.user.fullName; flavor = "gmail.com"; primary = true; }; @@ -36,7 +37,7 @@ in enable = true; package = pkgs.thunderbird; - profiles.${config.khanelinix.user.name} = { + profiles.${config.${namespace}.user.name} = { isDefault = true; settings = { diff --git a/modules/home/programs/graphical/apps/zathura/default.nix b/modules/home/programs/graphical/apps/zathura/default.nix index 8bfc63b86..cea1d8b8e 100644 --- a/modules/home/programs/graphical/apps/zathura/default.nix +++ b/modules/home/programs/graphical/apps/zathura/default.nix @@ -1,11 +1,16 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkEnableOption mkIf; - cfg = config.khanelinix.programs.graphical.apps.zathura; + cfg = config.${namespace}.programs.graphical.apps.zathura; in { - options.khanelinix.programs.graphical.apps.zathura = { + options.${namespace}.programs.graphical.apps.zathura = { enable = mkEnableOption "zathura"; }; diff --git a/modules/home/programs/graphical/bars/sketchybar/default.nix b/modules/home/programs/graphical/bars/sketchybar/default.nix index ecd3e915f..b6925372e 100644 --- a/modules/home/programs/graphical/bars/sketchybar/default.nix +++ b/modules/home/programs/graphical/bars/sketchybar/default.nix @@ -2,13 +2,14 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf getExe; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.graphical.bars.sketchybar; + cfg = config.${namespace}.programs.graphical.bars.sketchybar; shellAliases = with pkgs; { push = # bash @@ -16,7 +17,7 @@ let }; in { - options.khanelinix.programs.graphical.bars.sketchybar = { + options.${namespace}.programs.graphical.bars.sketchybar = { enable = mkBoolOpt false "Whether to enable sketchybar in the desktop environment."; }; diff --git a/modules/home/programs/graphical/bars/waybar/default.nix b/modules/home/programs/graphical/bars/waybar/default.nix index 227bf257d..48fff3a13 100644 --- a/modules/home/programs/graphical/bars/waybar/default.nix +++ b/modules/home/programs/graphical/bars/waybar/default.nix @@ -4,6 +4,7 @@ lib, pkgs, system, + namespace, ... }: let @@ -13,10 +14,10 @@ let getExe mkMerge ; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; inherit (inputs) nixpkgs-wayland; - cfg = config.khanelinix.programs.graphical.bars.waybar; + cfg = config.${namespace}.programs.graphical.bars.waybar; style = builtins.readFile ./styles/style.css; controlCenterStyle = builtins.readFile ./styles/control-center.css; @@ -33,7 +34,7 @@ let custom-modules default-modules group-modules - (lib.mkIf config.khanelinix.programs.graphical.wms.hyprland.enable hyprland-modules) + (lib.mkIf config.${namespace}.programs.graphical.wms.hyprland.enable hyprland-modules) ]; bar = { @@ -82,7 +83,7 @@ let }; in { - options.khanelinix.programs.graphical.bars.waybar = { + options.${namespace}.programs.graphical.bars.waybar = { enable = mkBoolOpt false "Whether to enable waybar in the desktop environment."; debug = mkBoolOpt false "Whether to enable debug mode."; }; @@ -116,7 +117,7 @@ in sops.secrets = { weather_config = { - sopsFile = ../../../../../../secrets/khaneliman/default.yaml; + sopsFile = lib.snowfall.fs.get-file "secrets/khaneliman/default.yaml"; path = "${config.home.homeDirectory}/weather_config.json"; }; }; diff --git a/modules/home/programs/graphical/browsers/chromium/default.nix b/modules/home/programs/graphical/browsers/chromium/default.nix index 7991de73d..17ffeaf75 100644 --- a/modules/home/programs/graphical/browsers/chromium/default.nix +++ b/modules/home/programs/graphical/browsers/chromium/default.nix @@ -1,12 +1,17 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.graphical.browsers.chromium; + cfg = config.${namespace}.programs.graphical.browsers.chromium; in { - options.khanelinix.programs.graphical.browsers.chromium = { + options.${namespace}.programs.graphical.browsers.chromium = { enable = mkBoolOpt false "Whether or not to enable chromium."; }; diff --git a/modules/home/programs/graphical/browsers/firefox/default.nix b/modules/home/programs/graphical/browsers/firefox/default.nix index e5acfc470..a483c3be0 100644 --- a/modules/home/programs/graphical/browsers/firefox/default.nix +++ b/modules/home/programs/graphical/browsers/firefox/default.nix @@ -2,6 +2,7 @@ config, lib, pkgs, + namespace, ... }: let @@ -11,18 +12,18 @@ let mkMerge optionalAttrs ; - inherit (lib.internal) mkBoolOpt mkOpt; + inherit (lib.${namespace}) mkBoolOpt mkOpt; - cfg = config.khanelinix.programs.graphical.browsers.firefox; + cfg = config.${namespace}.programs.graphical.browsers.firefox; firefoxPath = if pkgs.stdenv.isLinux then - ".mozilla/firefox/${config.khanelinix.user.name}" + ".mozilla/firefox/${config.${namespace}.user.name}" else - "/Users/${config.khanelinix.user.name}/Library/Application Support/Firefox/Profiles/${config.khanelinix.user.name}"; + "/Users/${config.${namespace}.user.name}/Library/Application Support/Firefox/Profiles/${config.${namespace}.user.name}"; in { - options.khanelinix.programs.graphical.browsers.firefox = with types; { + options.${namespace}.programs.graphical.browsers.firefox = with types; { enable = mkBoolOpt false "Whether or not to enable Firefox."; hardwareDecoding = mkBoolOpt false "Enable hardware video decoding."; gpuAcceleration = mkBoolOpt false "Enable GPU acceleration."; @@ -82,9 +83,9 @@ in Preferences = { }; }; - profiles.${config.khanelinix.user.name} = { + profiles.${config.${namespace}.user.name} = { inherit (cfg) extraConfig; - inherit (config.khanelinix.user) name; + inherit (config.${namespace}.user) name; id = 0; diff --git a/modules/home/programs/graphical/editors/vscode/default.nix b/modules/home/programs/graphical/editors/vscode/default.nix index 590a6c8a2..c8c7c2946 100644 --- a/modules/home/programs/graphical/editors/vscode/default.nix +++ b/modules/home/programs/graphical/editors/vscode/default.nix @@ -2,22 +2,23 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.graphical.editors.vscode; + cfg = config.${namespace}.programs.graphical.editors.vscode; in { - options.khanelinix.programs.graphical.editors.vscode = { + options.${namespace}.programs.graphical.editors.vscode = { enable = mkBoolOpt false "Whether or not to enable vscode."; }; config = mkIf cfg.enable { home.file = { - ".vscode/argv.json" = mkIf config.khanelinix.services.keyring.enable { + ".vscode/argv.json" = mkIf config.${namespace}.services.keyring.enable { text = builtins.toJSON { "enable-crash-reporter" = true; "crash-reporter-id" = "53a6c113-87c4-4f20-9451-dd67057ddb95"; @@ -194,7 +195,7 @@ in sops.secrets = { wakatime = { - sopsFile = ../../../../../../secrets/khaneliman/default.yaml; + sopsFile = lib.snowfall.fs.get-file "secrets/khaneliman/default.yaml"; path = "${config.home.homeDirectory}/.wakatime.cfg"; }; }; diff --git a/modules/home/programs/graphical/launchers/rofi/default.nix b/modules/home/programs/graphical/launchers/rofi/default.nix index f7a49760e..472edf560 100644 --- a/modules/home/programs/graphical/launchers/rofi/default.nix +++ b/modules/home/programs/graphical/launchers/rofi/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.graphical.launchers.rofi; + cfg = config.${namespace}.programs.graphical.launchers.rofi; in { - options.khanelinix.programs.graphical.launchers.rofi = { + options.${namespace}.programs.graphical.launchers.rofi = { enable = mkBoolOpt false "Whether to enable Rofi in the desktop environment."; }; diff --git a/modules/home/programs/graphical/launchers/wofi/default.nix b/modules/home/programs/graphical/launchers/wofi/default.nix index b8cac13a7..5cf4bbb2e 100644 --- a/modules/home/programs/graphical/launchers/wofi/default.nix +++ b/modules/home/programs/graphical/launchers/wofi/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.graphical.addons.wofi; + cfg = config.${namespace}.programs.graphical.addons.wofi; in { - options.khanelinix.programs.graphical.addons.wofi = { + options.${namespace}.programs.graphical.addons.wofi = { enable = mkBoolOpt false "Whether to enable the Wofi in the desktop environment."; }; diff --git a/modules/home/programs/graphical/screenlockers/hyprlock/default.nix b/modules/home/programs/graphical/screenlockers/hyprlock/default.nix index fa69d4c33..6b0f0db53 100644 --- a/modules/home/programs/graphical/screenlockers/hyprlock/default.nix +++ b/modules/home/programs/graphical/screenlockers/hyprlock/default.nix @@ -4,19 +4,20 @@ lib, osConfig, system, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; inherit (inputs) hyprlock; - catppuccin = import ../../../../theme/catppuccin/colors.nix; + catppuccin = import (lib.snowfall.fs.get-file "modules/home/theme/catppuccin/colors.nix"); - cfg = config.khanelinix.programs.graphical.screenlockers.hyprlock; + cfg = config.${namespace}.programs.graphical.screenlockers.hyprlock; in { - options.khanelinix.programs.graphical.screenlockers.hyprlock = { + options.${namespace}.programs.graphical.screenlockers.hyprlock = { enable = mkBoolOpt false "Whether to enable hyprlock in the desktop environment."; }; @@ -109,7 +110,7 @@ in text = "$TIME"; color = catppuccin.colors.text.rgb; font_size = 100; - font_family = osConfig.khanelinix.system.fonts.default; + font_family = osConfig.${namespace}.system.fonts.default; valign = "center"; halign = "center"; position = "0, 330"; @@ -124,7 +125,7 @@ in text = " $USER"; color = catppuccin.colors.text.rgb; font_size = 25; - font_family = osConfig.khanelinix.system.fonts.default; + font_family = osConfig.${namespace}.system.fonts.default; valign = "top"; halign = "left"; position = "10, 0"; @@ -139,7 +140,7 @@ in text = "󰌾 "; color = catppuccin.colors.text.rgb; font_size = 50; - font_family = osConfig.khanelinix.system.fonts.default; + font_family = osConfig.${namespace}.system.fonts.default; valign = "center"; halign = "center"; positino = "15, -350"; @@ -154,7 +155,7 @@ in text = "Locked"; color = catppuccin.colors.text.rgb; font_size = 25; - font_family = osConfig.khanelinix.system.fonts.default; + font_family = osConfig.${namespace}.system.fonts.default; valign = "center"; halign = "center"; position = "0, -430"; @@ -169,7 +170,7 @@ in text = "cmd[update:120000] echo \"$(date +'%a %d %B')\""; color = catppuccin.colors.text.rgb; font_size = 30; - font_family = osConfig.khanelinix.system.fonts.default; + font_family = osConfig.${namespace}.system.fonts.default; valign = "center"; halign = "center"; position = "0, 210"; @@ -184,7 +185,7 @@ in text = " "; color = catppuccin.colors.text.rgb; font_size = 25; - font_family = osConfig.khanelinix.system.fonts.default; + font_family = osConfig.${namespace}.system.fonts.default; valign = "bottom"; halign = "right"; position = "5, 8"; diff --git a/modules/home/programs/graphical/screenlockers/swaylock/default.nix b/modules/home/programs/graphical/screenlockers/swaylock/default.nix index 802343f70..d940f31e7 100644 --- a/modules/home/programs/graphical/screenlockers/swaylock/default.nix +++ b/modules/home/programs/graphical/screenlockers/swaylock/default.nix @@ -4,17 +4,18 @@ lib, pkgs, system, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; inherit (inputs) nixpkgs-wayland; - cfg = config.khanelinix.programs.graphical.screenlockers.swaylock; + cfg = config.${namespace}.programs.graphical.screenlockers.swaylock; in { - options.khanelinix.programs.graphical.screenlockers.swaylock = { + options.${namespace}.programs.graphical.screenlockers.swaylock = { enable = mkBoolOpt false "Whether to enable swaylock in the desktop environment."; }; @@ -33,7 +34,7 @@ in timestr = "%R"; datestr = "%a, %e of %B"; - image = "${pkgs.khanelinix.wallpapers}/share/wallpapers/flatppuccin_macchiato.png"; + image = "${pkgs.${namespace}.wallpapers}/share/wallpapers/flatppuccin_macchiato.png"; fade-in = "0.2"; diff --git a/modules/home/programs/graphical/wms/hyprland/apps.nix b/modules/home/programs/graphical/wms/hyprland/apps.nix index 7fff508e5..27d9ab9db 100644 --- a/modules/home/programs/graphical/wms/hyprland/apps.nix +++ b/modules/home/programs/graphical/wms/hyprland/apps.nix @@ -2,12 +2,13 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf getExe; - cfg = config.khanelinix.programs.graphical.wms.hyprland; + cfg = config.${namespace}.programs.graphical.wms.hyprland; in { config = mkIf cfg.enable { diff --git a/modules/home/programs/graphical/wms/hyprland/binds.nix b/modules/home/programs/graphical/wms/hyprland/binds.nix index 2ecb450f5..12b53b688 100644 --- a/modules/home/programs/graphical/wms/hyprland/binds.nix +++ b/modules/home/programs/graphical/wms/hyprland/binds.nix @@ -2,12 +2,13 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf getExe; - cfg = config.khanelinix.programs.graphical.wms.hyprland; + cfg = config.${namespace}.programs.graphical.wms.hyprland; in { config = mkIf cfg.enable { diff --git a/modules/home/programs/graphical/wms/hyprland/default.nix b/modules/home/programs/graphical/wms/hyprland/default.nix index a8b20374c..f32b1227f 100644 --- a/modules/home/programs/graphical/wms/hyprland/default.nix +++ b/modules/home/programs/graphical/wms/hyprland/default.nix @@ -4,14 +4,15 @@ lib, pkgs, system, + namespace, ... }: let inherit (lib) mkIf mkEnableOption getExe; - inherit (lib.internal) enabled; + inherit (lib.${namespace}) enabled; inherit (inputs) hyprland; - cfg = config.khanelinix.programs.graphical.wms.hyprland; + cfg = config.${namespace}.programs.graphical.wms.hyprland; historicalLogAliases = builtins.listToAttrs ( builtins.genList (x: { @@ -23,12 +24,12 @@ let historicalCrashAliases = builtins.listToAttrs ( builtins.genList (x: { name = "hlc${toString (x + 1)}"; - value = "cat /home/${config.khanelinix.user.name}/.local/cache/hyprland/$(command ls -t /home/${config.khanelinix.user.name}/.local/cache/hyprland/ | grep 'hyprlandCrashReport' | head -n ${toString (x + 2)} | tail -n 1)"; + value = "cat /home/${config.${namespace}.user.name}/.local/cache/hyprland/$(command ls -t /home/${config.${namespace}.user.name}/.local/cache/hyprland/ | grep 'hyprlandCrashReport' | head -n ${toString (x + 2)} | tail -n 1)"; }) 4 ); in { - options.khanelinix.programs.graphical.wms.hyprland = { + options.${namespace}.programs.graphical.wms.hyprland = { enable = mkEnableOption "Hyprland."; appendConfig = lib.mkOption { type = lib.types.lines; @@ -70,7 +71,7 @@ in shellAliases = { hl = "cat $XDG_RUNTIME_DIR/hypr/$HYPRLAND_INSTANCE_SIGNATURE/hyprland.log"; - hlc = "cat /home/${config.khanelinix.user.name}/.local/cache/hyprland/$(command ls -t /home/${config.khanelinix.user.name}/.local/cache/hyprland/ | grep 'hyprlandCrashReport' | head -n 1)"; + hlc = "cat /home/${config.${namespace}.user.name}/.local/cache/hyprland/$(command ls -t /home/${config.${namespace}.user.name}/.local/cache/hyprland/ | grep 'hyprlandCrashReport' | head -n 1)"; } // historicalLogAliases // historicalCrashAliases; }; diff --git a/modules/home/programs/graphical/wms/hyprland/variables.nix b/modules/home/programs/graphical/wms/hyprland/variables.nix index 442af8b81..c65be30df 100644 --- a/modules/home/programs/graphical/wms/hyprland/variables.nix +++ b/modules/home/programs/graphical/wms/hyprland/variables.nix @@ -4,6 +4,7 @@ lib, pkgs, system, + namespace, ... }: let @@ -22,9 +23,9 @@ let '' ); - screenshot-path = "/home/${config.khanelinix.user.name}/Pictures/screenshots"; + screenshot-path = "/home/${config.${namespace}.user.name}/Pictures/screenshots"; - cfg = config.khanelinix.programs.graphical.wms.hyprland; + cfg = config.${namespace}.programs.graphical.wms.hyprland; in { config = mkIf cfg.enable { @@ -152,11 +153,11 @@ in "$looking-glass" = "${getExe pkgs.looking-glass-client}"; "$screen-locker" = "${getExe config.programs.hyprlock.package}"; "$window-inspector" = "${getExe hyprland-contrib.packages.${system}.hyprprop}"; - "$screen-recorder" = "${getExe pkgs.khanelinix.record_screen}"; + "$screen-recorder" = "${getExe pkgs.${namespace}.record_screen}"; # screenshot commands "$notify-screenshot" = ''${getExe pkgs.libnotify} --icon "$file" "Screenshot Saved"''; - "$screenshot-path" = "/home/${config.khanelinix.user.name}/Pictures/screenshots"; + "$screenshot-path" = "/home/${config.${namespace}.user.name}/Pictures/screenshots"; "$grimblast_area_file" = ''file="${screenshot-path}/$(${getDateTime}).png" && ${grimblast} --freeze --notify save area "$file"''; "$grimblast_active_file" = ''file="${screenshot-path}/$(${getDateTime}).png" && ${grimblast} --notify save active "$file"''; "$grimblast_screen_file" = ''file="${screenshot-path}/$(${getDateTime}).png" && ${grimblast} --notify save screen "$file"''; diff --git a/modules/home/programs/graphical/wms/hyprland/windowrules.nix b/modules/home/programs/graphical/wms/hyprland/windowrules.nix index e99466e93..5bff82f67 100644 --- a/modules/home/programs/graphical/wms/hyprland/windowrules.nix +++ b/modules/home/programs/graphical/wms/hyprland/windowrules.nix @@ -1,7 +1,12 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf; - cfg = config.khanelinix.programs.graphical.wms.hyprland; + cfg = config.${namespace}.programs.graphical.wms.hyprland; in { config = mkIf cfg.enable { diff --git a/modules/home/programs/graphical/wms/hyprland/workspacerules.nix b/modules/home/programs/graphical/wms/hyprland/workspacerules.nix index 4aab2445b..ec1a7e4da 100644 --- a/modules/home/programs/graphical/wms/hyprland/workspacerules.nix +++ b/modules/home/programs/graphical/wms/hyprland/workspacerules.nix @@ -1,7 +1,12 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf; - cfg = config.khanelinix.programs.graphical.wms.hyprland; + cfg = config.${namespace}.programs.graphical.wms.hyprland; in { config = mkIf cfg.enable { diff --git a/modules/home/programs/terminal/editors/helix/default.nix b/modules/home/programs/terminal/editors/helix/default.nix index 9b91e7bdc..81dc64539 100644 --- a/modules/home/programs/terminal/editors/helix/default.nix +++ b/modules/home/programs/terminal/editors/helix/default.nix @@ -2,17 +2,18 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkEnableOption mkIf; - cfg = config.khanelinix.programs.terminal.editors.helix; + cfg = config.${namespace}.programs.terminal.editors.helix; in { imports = lib.snowfall.fs.get-non-default-nix-files ./.; - options.khanelinix.programs.terminal.editors.helix = { + options.${namespace}.programs.terminal.editors.helix = { enable = mkEnableOption "Helix"; }; diff --git a/modules/home/programs/terminal/editors/micro/default.nix b/modules/home/programs/terminal/editors/micro/default.nix index 5fede1df9..63decc2d6 100644 --- a/modules/home/programs/terminal/editors/micro/default.nix +++ b/modules/home/programs/terminal/editors/micro/default.nix @@ -1,12 +1,17 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.terminal.editors.micro; + cfg = config.${namespace}.programs.terminal.editors.micro; in { - options.khanelinix.programs.terminal.editors.micro = { + options.${namespace}.programs.terminal.editors.micro = { enable = mkBoolOpt false "Whether or not to enable micro."; default = mkBoolOpt false "Whether to set micro as the session EDITOR"; }; diff --git a/modules/home/programs/terminal/editors/neovim/default.nix b/modules/home/programs/terminal/editors/neovim/default.nix index f6bd52893..b00e00556 100644 --- a/modules/home/programs/terminal/editors/neovim/default.nix +++ b/modules/home/programs/terminal/editors/neovim/default.nix @@ -1,14 +1,19 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkEnableOption mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.terminal.editors.neovim; + cfg = config.${namespace}.programs.terminal.editors.neovim; in { - imports = lib.snowfall.fs.get-non-default-nix-files ./.; + imports = lib.snowfall.fs.get-non-default-nix-files-recursive ./.; - options.khanelinix.programs.terminal.editors.neovim = { + options.${namespace}.programs.terminal.editors.neovim = { enable = mkEnableOption "neovim"; default = mkBoolOpt true "Whether to set Neovim as the session EDITOR"; }; @@ -39,7 +44,7 @@ in sops.secrets = { wakatime = { - sopsFile = ../../../../../../secrets/khaneliman/default.yaml; + sopsFile = lib.snowfall.fs.get-file "secrets/khaneliman/default.yaml"; path = "${config.home.homeDirectory}/.wakatime.cfg"; }; }; diff --git a/modules/home/programs/terminal/editors/neovim/plugins/default.nix b/modules/home/programs/terminal/editors/neovim/plugins/default.nix deleted file mode 100644 index 6d49e0664..000000000 --- a/modules/home/programs/terminal/editors/neovim/plugins/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ lib, ... }: -{ - imports = lib.snowfall.fs.get-non-default-nix-files ./.; - - programs.nixvim = { }; -} diff --git a/modules/home/programs/terminal/editors/neovim/plugins/wakatime.nix b/modules/home/programs/terminal/editors/neovim/plugins/wakatime.nix index c46d0a0fb..2ddf350a9 100644 --- a/modules/home/programs/terminal/editors/neovim/plugins/wakatime.nix +++ b/modules/home/programs/terminal/editors/neovim/plugins/wakatime.nix @@ -7,7 +7,7 @@ # TODO: figure out why i can't from within imports = # sops.secrets = { # wakatime = { - # sopsFile = ../../../../../../secrets/khaneliman/default.yaml; + # sopsFile = lib.snowfall.fs.get-file "secrets/khaneliman/default.yaml"; # path = "${config.home.homeDirectory}/.wakatime.cfg"; # }; # }; diff --git a/modules/home/programs/terminal/emulators/alacritty/default.nix b/modules/home/programs/terminal/emulators/alacritty/default.nix index b06c6683f..fbc453d74 100644 --- a/modules/home/programs/terminal/emulators/alacritty/default.nix +++ b/modules/home/programs/terminal/emulators/alacritty/default.nix @@ -2,13 +2,14 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) types mkIf; - inherit (lib.internal) mkBoolOpt mkOpt; + inherit (lib.${namespace}) mkBoolOpt mkOpt; - cfg = config.khanelinix.programs.terminal.emulators.alacritty; + cfg = config.${namespace}.programs.terminal.emulators.alacritty; macchiato = { primary = { @@ -118,7 +119,7 @@ let }; in { - options.khanelinix.programs.terminal.emulators.alacritty = with types; { + options.${namespace}.programs.terminal.emulators.alacritty = with types; { enable = mkBoolOpt false "Whether to enable alacritty."; # TODO: use theme module theme = mkOpt attr macchiato "Theme to use for alacritty."; diff --git a/modules/home/programs/terminal/emulators/foot/default.nix b/modules/home/programs/terminal/emulators/foot/default.nix index 3387ef528..30f7c16d5 100644 --- a/modules/home/programs/terminal/emulators/foot/default.nix +++ b/modules/home/programs/terminal/emulators/foot/default.nix @@ -2,17 +2,18 @@ config, pkgs, lib, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.terminal.emulators.foot; - colors = import ../../../../theme/catppuccin/colors.nix; + cfg = config.${namespace}.programs.terminal.emulators.foot; + colors = import (lib.snowfall.fs.get-file "modules/home/theme/catppuccin/colors.nix"); in { - options.khanelinix.programs.terminal.emulators.foot = { + options.${namespace}.programs.terminal.emulators.foot = { enable = mkBoolOpt false "Whether or not to enable foot."; }; diff --git a/modules/home/programs/terminal/emulators/kitty/default.nix b/modules/home/programs/terminal/emulators/kitty/default.nix index 35a6bd86e..0d623c090 100644 --- a/modules/home/programs/terminal/emulators/kitty/default.nix +++ b/modules/home/programs/terminal/emulators/kitty/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) types mkIf; - inherit (lib.internal) mkBoolOpt mkOpt; + inherit (lib.${namespace}) mkBoolOpt mkOpt; - cfg = config.khanelinix.programs.terminal.emulators.kitty; + cfg = config.${namespace}.programs.terminal.emulators.kitty; in { - options.khanelinix.programs.terminal.emulators.kitty = with types; { + options.${namespace}.programs.terminal.emulators.kitty = with types; { enable = mkBoolOpt false "Whether to enable kitty."; font = mkOpt str "MonaspiceKr Nerd Font" "Font to use for kitty."; # TODO: use theme module diff --git a/modules/home/programs/terminal/emulators/wezterm/default.nix b/modules/home/programs/terminal/emulators/wezterm/default.nix index 3b5ede0ed..8786d7433 100644 --- a/modules/home/programs/terminal/emulators/wezterm/default.nix +++ b/modules/home/programs/terminal/emulators/wezterm/default.nix @@ -2,17 +2,18 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.terminal.emulators.wezterm; - catppuccin = import ../../../../theme/catppuccin/colors.nix; + cfg = config.${namespace}.programs.terminal.emulators.wezterm; + catppuccin = import (lib.snowfall.fs.get-file "modules/home/theme/catppuccin/colors.nix"); in { - options.khanelinix.programs.terminal.emulators.wezterm = { + options.${namespace}.programs.terminal.emulators.wezterm = { enable = mkBoolOpt false "Whether or not to enable wezterm."; }; diff --git a/modules/home/programs/terminal/media/ncmpcpp/default.nix b/modules/home/programs/terminal/media/ncmpcpp/default.nix index 2a6e16b3e..2e14c40e2 100644 --- a/modules/home/programs/terminal/media/ncmpcpp/default.nix +++ b/modules/home/programs/terminal/media/ncmpcpp/default.nix @@ -2,15 +2,16 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkEnableOption mkIf; - cfg = config.khanelinix.programs.terminal.media.ncmpcpp; + cfg = config.${namespace}.programs.terminal.media.ncmpcpp; in { - options.khanelinix.programs.terminal.media.ncmpcpp = { + options.${namespace}.programs.terminal.media.ncmpcpp = { enable = mkEnableOption "ncmpcpp"; }; @@ -45,7 +46,9 @@ in } ]; - mpdMusicDir = mkIf config.khanelinix.services.mpd.enable config.khanelinix.services.mpd.musicDirectory; + mpdMusicDir = + mkIf config.${namespace}.services.mpd.enable + config.${namespace}.services.mpd.musicDirectory; settings = { # TODO: see how much UI customization can be done diff --git a/modules/home/programs/terminal/media/ncspot/default.nix b/modules/home/programs/terminal/media/ncspot/default.nix index 9dcc72de6..8cf2f8140 100644 --- a/modules/home/programs/terminal/media/ncspot/default.nix +++ b/modules/home/programs/terminal/media/ncspot/default.nix @@ -1,11 +1,16 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkEnableOption mkIf; - cfg = config.khanelinix.programs.terminal.media.ncspot; + cfg = config.${namespace}.programs.terminal.media.ncspot; in { - options.khanelinix.programs.terminal.media.ncspot = { + options.${namespace}.programs.terminal.media.ncspot = { enable = mkEnableOption "ncspot"; }; diff --git a/modules/home/programs/terminal/media/spicetify/default.nix b/modules/home/programs/terminal/media/spicetify/default.nix index 05868c40b..a90e28add 100644 --- a/modules/home/programs/terminal/media/spicetify/default.nix +++ b/modules/home/programs/terminal/media/spicetify/default.nix @@ -3,19 +3,20 @@ lib, pkgs, inputs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; inherit (inputs) spicetify-nix; - cfg = config.khanelinix.programs.terminal.media.spicetify; + cfg = config.${namespace}.programs.terminal.media.spicetify; spicePkgs = spicetify-nix.legacyPackages.${pkgs.system}; in { - options.khanelinix.programs.terminal.media.spicetify = { + options.${namespace}.programs.terminal.media.spicetify = { enable = mkBoolOpt false "Whether or not to enable support for spicetify."; }; diff --git a/modules/home/programs/terminal/shells/bash/default.nix b/modules/home/programs/terminal/shells/bash/default.nix index 587bf5b2f..449abadfb 100644 --- a/modules/home/programs/terminal/shells/bash/default.nix +++ b/modules/home/programs/terminal/shells/bash/default.nix @@ -1,12 +1,17 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.terminal.shell.bash; + cfg = config.${namespace}.programs.terminal.shell.bash; in { - options.khanelinix.programs.terminal.shell.bash = { + options.${namespace}.programs.terminal.shell.bash = { enable = mkBoolOpt false "Whether to enable bash."; }; diff --git a/modules/home/programs/terminal/shells/fish/default.nix b/modules/home/programs/terminal/shells/fish/default.nix index 00b2654d0..dbf9571b8 100644 --- a/modules/home/programs/terminal/shells/fish/default.nix +++ b/modules/home/programs/terminal/shells/fish/default.nix @@ -3,16 +3,17 @@ lib, pkgs, osConfig, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.terminal.shell.fish; + cfg = config.${namespace}.programs.terminal.shell.fish; in { - options.khanelinix.programs.terminal.shell.fish = { + options.${namespace}.programs.terminal.shell.fish = { enable = mkBoolOpt false "Whether to enable fish."; }; diff --git a/modules/home/programs/terminal/shells/zsh/default.nix b/modules/home/programs/terminal/shells/zsh/default.nix index ef3b26fb6..ab6b092aa 100644 --- a/modules/home/programs/terminal/shells/zsh/default.nix +++ b/modules/home/programs/terminal/shells/zsh/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkEnableOption mkIf; inherit (lib.strings) fileContents; - cfg = config.khanelinix.programs.terminal.shell.zsh; + cfg = config.${namespace}.programs.terminal.shell.zsh; in { - options.khanelinix.programs.terminal.shell.zsh = { + options.${namespace}.programs.terminal.shell.zsh = { enable = mkEnableOption "ZSH"; }; diff --git a/modules/home/programs/terminal/social/slack-term/default.nix b/modules/home/programs/terminal/social/slack-term/default.nix index 83c429615..f93bc6a5a 100644 --- a/modules/home/programs/terminal/social/slack-term/default.nix +++ b/modules/home/programs/terminal/social/slack-term/default.nix @@ -1,18 +1,18 @@ { config, lib, - pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.terminal.social.slack-term; + cfg = config.${namespace}.programs.terminal.social.slack-term; in { - options.khanelinix.programs.terminal.social.slack-term = { + options.${namespace}.programs.terminal.social.slack-term = { enable = mkBoolOpt false "Whether or not to enable slack-term."; }; @@ -21,7 +21,7 @@ in sops.secrets = { slack-term = { - sopsFile = ../../../../../../secrets/khaneliman/default.yaml; + sopsFile = lib.snowfall.fs.get-file "secrets/khaneliman/default.yaml"; path = "${config.home.homeDirectory}/.config/slack-term/config"; }; }; diff --git a/modules/home/programs/terminal/social/twitch-tui/default.nix b/modules/home/programs/terminal/social/twitch-tui/default.nix index 7ec2f612c..d21b3e1a7 100644 --- a/modules/home/programs/terminal/social/twitch-tui/default.nix +++ b/modules/home/programs/terminal/social/twitch-tui/default.nix @@ -1,18 +1,18 @@ { config, lib, - pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.terminal.social.twitch-tui; + cfg = config.${namespace}.programs.terminal.social.twitch-tui; in { - options.khanelinix.programs.terminal.social.twitch-tui = { + options.${namespace}.programs.terminal.social.twitch-tui = { enable = mkBoolOpt false "Whether or not to enable twitch-tui."; }; @@ -21,7 +21,7 @@ in sops.secrets = { twitch-tui = { - sopsFile = ../../../../../../secrets/khaneliman/default.yaml; + sopsFile = lib.snowfall.fs.get-file "secrets/khaneliman/default.yaml"; path = "${config.home.homeDirectory}/.config/twt/config.toml"; }; }; diff --git a/modules/home/programs/terminal/tools/azure/default.nix b/modules/home/programs/terminal/tools/azure/default.nix index dbc71f13e..3a169b329 100644 --- a/modules/home/programs/terminal/tools/azure/default.nix +++ b/modules/home/programs/terminal/tools/azure/default.nix @@ -2,25 +2,28 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.terminal.tools.azure; + cfg = config.${namespace}.programs.terminal.tools.azure; in { - options.khanelinix.programs.terminal.tools.azure = { + options.${namespace}.programs.terminal.tools.azure = { enable = mkBoolOpt false "Whether or not to enable common Azure utilities."; }; config = mkIf cfg.enable { - home.packages = with pkgs; [ - azure-cli - azure-functions-core-tools - azure-storage-azcopy - azuredatastudio - ]; + home.packages = + with pkgs; + [ + azure-functions-core-tools + azure-storage-azcopy + azuredatastudio + ] + ++ lib.optionals pkgs.stdenv.isLinux [ azure-cli ]; }; } diff --git a/modules/home/programs/terminal/tools/bat/default.nix b/modules/home/programs/terminal/tools/bat/default.nix index f2058e0ad..9441708c6 100644 --- a/modules/home/programs/terminal/tools/bat/default.nix +++ b/modules/home/programs/terminal/tools/bat/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) getExe mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.terminal.tools.bat; + cfg = config.${namespace}.programs.terminal.tools.bat; in { - options.khanelinix.programs.terminal.tools.bat = { + options.${namespace}.programs.terminal.tools.bat = { enable = mkBoolOpt false "Whether or not to enable bat."; }; diff --git a/modules/home/programs/terminal/tools/bottom/default.nix b/modules/home/programs/terminal/tools/bottom/default.nix index 716fc6c73..af3710171 100644 --- a/modules/home/programs/terminal/tools/bottom/default.nix +++ b/modules/home/programs/terminal/tools/bottom/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.terminal.tools.bottom; + cfg = config.${namespace}.programs.terminal.tools.bottom; in { - options.khanelinix.programs.terminal.tools.bottom = { + options.${namespace}.programs.terminal.tools.bottom = { enable = mkBoolOpt false "Whether or not to enable bottom."; }; diff --git a/modules/home/programs/terminal/tools/btop/default.nix b/modules/home/programs/terminal/tools/btop/default.nix index 8502b0ee6..a6b3bc0d4 100644 --- a/modules/home/programs/terminal/tools/btop/default.nix +++ b/modules/home/programs/terminal/tools/btop/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.terminal.tools.btop; + cfg = config.${namespace}.programs.terminal.tools.btop; in { - options.khanelinix.programs.terminal.tools.btop = { + options.${namespace}.programs.terminal.tools.btop = { enable = mkBoolOpt false "Whether or not to enable btop."; }; diff --git a/modules/home/programs/terminal/tools/cava/default.nix b/modules/home/programs/terminal/tools/cava/default.nix index 583eff498..7773e963a 100644 --- a/modules/home/programs/terminal/tools/cava/default.nix +++ b/modules/home/programs/terminal/tools/cava/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.terminal.tools.cava; + cfg = config.${namespace}.programs.terminal.tools.cava; in { - options.khanelinix.programs.terminal.tools.cava = { + options.${namespace}.programs.terminal.tools.cava = { enable = mkBoolOpt false "Whether or not to enable cava."; }; diff --git a/modules/home/programs/terminal/tools/colorls/default.nix b/modules/home/programs/terminal/tools/colorls/default.nix index b8d7579e3..27985aa97 100644 --- a/modules/home/programs/terminal/tools/colorls/default.nix +++ b/modules/home/programs/terminal/tools/colorls/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.terminal.tools.colorls; + cfg = config.${namespace}.programs.terminal.tools.colorls; in { - options.khanelinix.programs.terminal.tools.colorls = { + options.${namespace}.programs.terminal.tools.colorls = { enable = mkBoolOpt false "Whether or not to enable colorls."; }; diff --git a/modules/home/programs/terminal/tools/comma/default.nix b/modules/home/programs/terminal/tools/comma/default.nix index 75467e23c..1b8f9250b 100644 --- a/modules/home/programs/terminal/tools/comma/default.nix +++ b/modules/home/programs/terminal/tools/comma/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.terminal.tools.comma; + cfg = config.${namespace}.programs.terminal.tools.comma; in { - options.khanelinix.programs.terminal.tools.comma = { + options.${namespace}.programs.terminal.tools.comma = { enable = mkBoolOpt false "Whether or not to enable comma."; }; diff --git a/modules/home/programs/terminal/tools/direnv/default.nix b/modules/home/programs/terminal/tools/direnv/default.nix index 309981592..a9f4d468f 100644 --- a/modules/home/programs/terminal/tools/direnv/default.nix +++ b/modules/home/programs/terminal/tools/direnv/default.nix @@ -1,12 +1,17 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt enabled; + inherit (lib.${namespace}) mkBoolOpt enabled; - cfg = config.khanelinix.programs.terminal.tools.direnv; + cfg = config.${namespace}.programs.terminal.tools.direnv; in { - options.khanelinix.programs.terminal.tools.direnv = { + options.${namespace}.programs.terminal.tools.direnv = { enable = mkBoolOpt false "Whether or not to enable direnv."; }; diff --git a/modules/home/programs/terminal/tools/eza/default.nix b/modules/home/programs/terminal/tools/eza/default.nix index 06cb26dbd..8a4a99cdb 100644 --- a/modules/home/programs/terminal/tools/eza/default.nix +++ b/modules/home/programs/terminal/tools/eza/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) getExe mkForce mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.terminal.tools.eza; + cfg = config.${namespace}.programs.terminal.tools.eza; in { - options.khanelinix.programs.terminal.tools.eza = { + options.${namespace}.programs.terminal.tools.eza = { enable = mkBoolOpt false "Whether or not to enable eza."; }; diff --git a/modules/home/programs/terminal/tools/fastfetch/default.nix b/modules/home/programs/terminal/tools/fastfetch/default.nix index 723811fed..7a1c2a900 100644 --- a/modules/home/programs/terminal/tools/fastfetch/default.nix +++ b/modules/home/programs/terminal/tools/fastfetch/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.terminal.tools.fastfetch; + cfg = config.${namespace}.programs.terminal.tools.fastfetch; in { - options.khanelinix.programs.terminal.tools.fastfetch = { + options.${namespace}.programs.terminal.tools.fastfetch = { enable = mkBoolOpt false "Whether or not to enable fastfetch."; }; diff --git a/modules/home/programs/terminal/tools/fup-repl/default.nix b/modules/home/programs/terminal/tools/fup-repl/default.nix index a8d788bd8..506934b39 100644 --- a/modules/home/programs/terminal/tools/fup-repl/default.nix +++ b/modules/home/programs/terminal/tools/fup-repl/default.nix @@ -2,20 +2,21 @@ lib, pkgs, config, + namespace, ... }: let inherit (lib) mkIf getExe'; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.terminal.tools.fup-repl; + cfg = config.${namespace}.programs.terminal.tools.fup-repl; fup-repl = pkgs.writeShellScriptBin "fup-repl" '' ${getExe' pkgs.fup-repl "repl"} ''${@} ''; in { - options.khanelinix.programs.terminal.tools.fup-repl = { + options.${namespace}.programs.terminal.tools.fup-repl = { enable = mkBoolOpt false "Whether to enable fup-repl or not"; }; diff --git a/modules/home/programs/terminal/tools/fzf/default.nix b/modules/home/programs/terminal/tools/fzf/default.nix index e5de649d0..4400a178e 100644 --- a/modules/home/programs/terminal/tools/fzf/default.nix +++ b/modules/home/programs/terminal/tools/fzf/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.terminal.tools.fzf; + cfg = config.${namespace}.programs.terminal.tools.fzf; in { - options.khanelinix.programs.terminal.tools.fzf = { + options.${namespace}.programs.terminal.tools.fzf = { enable = mkBoolOpt false "Whether or not to enable fzf."; }; diff --git a/modules/home/programs/terminal/tools/git-crypt/default.nix b/modules/home/programs/terminal/tools/git-crypt/default.nix index 250c62098..fcb361e61 100644 --- a/modules/home/programs/terminal/tools/git-crypt/default.nix +++ b/modules/home/programs/terminal/tools/git-crypt/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.terminal.tools.git-crypt; + cfg = config.${namespace}.programs.terminal.tools.git-crypt; in { - options.khanelinix.programs.terminal.tools.git-crypt = { + options.${namespace}.programs.terminal.tools.git-crypt = { enable = mkBoolOpt false "Whether or not to enable git-crypt."; }; diff --git a/modules/home/programs/terminal/tools/git/default.nix b/modules/home/programs/terminal/tools/git/default.nix index 5c713d8b3..2d0ce8c8e 100644 --- a/modules/home/programs/terminal/tools/git/default.nix +++ b/modules/home/programs/terminal/tools/git/default.nix @@ -2,6 +2,7 @@ config, lib, pkgs, + namespace, ... }: let @@ -12,16 +13,16 @@ let mkForce getExe' ; - inherit (lib.internal) mkOpt mkBoolOpt enabled; - inherit (config.khanelinix) user; + inherit (lib.${namespace}) mkOpt mkBoolOpt enabled; + inherit (config.${namespace}) user; - cfg = config.khanelinix.programs.terminal.tools.git; + cfg = config.${namespace}.programs.terminal.tools.git; aliases = import ./aliases.nix; ignores = import ./ignores.nix; in { - options.khanelinix.programs.terminal.tools.git = { + options.${namespace}.programs.terminal.tools.git = { enable = mkEnableOption "Git"; includes = mkOpt (types.listOf types.attrs) [ ] "Git includeIf paths and conditions."; signByDefault = mkOpt types.bool true "Whether to sign commits by default."; @@ -113,7 +114,7 @@ in safe = { directory = [ - "~/khanelinix/" + "~/${namespace}/" "/etc/nixos" ]; }; @@ -170,7 +171,7 @@ in sops.secrets = { "github/access-token" = { - sopsFile = ../../../../../../secrets/khaneliman/default.yaml; + sopsFile = lib.snowfall.fs.get-file "secrets/khaneliman/default.yaml"; path = "${config.home.homeDirectory}/.config/gh/access-token"; }; }; diff --git a/modules/home/programs/terminal/tools/glxinfo/default.nix b/modules/home/programs/terminal/tools/glxinfo/default.nix index 880e195ef..277740645 100644 --- a/modules/home/programs/terminal/tools/glxinfo/default.nix +++ b/modules/home/programs/terminal/tools/glxinfo/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.terminal.tools.glxinfo; + cfg = config.${namespace}.programs.terminal.tools.glxinfo; in { - options.khanelinix.programs.terminal.tools.glxinfo = { + options.${namespace}.programs.terminal.tools.glxinfo = { enable = mkBoolOpt false "Whether or not to enable glxinfo."; }; diff --git a/modules/home/programs/terminal/tools/go/default.nix b/modules/home/programs/terminal/tools/go/default.nix index 5c823e27e..4b3db7b1b 100644 --- a/modules/home/programs/terminal/tools/go/default.nix +++ b/modules/home/programs/terminal/tools/go/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.terminal.tools.go; + cfg = config.${namespace}.programs.terminal.tools.go; in { - options.khanelinix.programs.terminal.tools.go = { + options.${namespace}.programs.terminal.tools.go = { enable = mkBoolOpt false "Whether or not to enable Go support."; }; diff --git a/modules/home/programs/terminal/tools/home-manager/default.nix b/modules/home/programs/terminal/tools/home-manager/default.nix index 365700576..201a79edb 100644 --- a/modules/home/programs/terminal/tools/home-manager/default.nix +++ b/modules/home/programs/terminal/tools/home-manager/default.nix @@ -1,12 +1,17 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkEnableOption mkIf; - inherit (lib.internal) enabled; + inherit (lib.${namespace}) enabled; - cfg = config.khanelinix.programs.terminal.tools.home-manager; + cfg = config.${namespace}.programs.terminal.tools.home-manager; in { - options.khanelinix.programs.terminal.tools.home-manager = { + options.${namespace}.programs.terminal.tools.home-manager = { enable = mkEnableOption "home-manager"; }; diff --git a/modules/home/programs/terminal/tools/jq/default.nix b/modules/home/programs/terminal/tools/jq/default.nix index 9f34a6e53..2362eef4d 100644 --- a/modules/home/programs/terminal/tools/jq/default.nix +++ b/modules/home/programs/terminal/tools/jq/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.terminal.tools.jq; + cfg = config.${namespace}.programs.terminal.tools.jq; in { - options.khanelinix.programs.terminal.tools.jq = { + options.${namespace}.programs.terminal.tools.jq = { enable = mkBoolOpt false "Whether or not to enable jq."; }; diff --git a/modules/home/programs/terminal/tools/k9s/default.nix b/modules/home/programs/terminal/tools/k9s/default.nix index 59893bd93..4458769ee 100644 --- a/modules/home/programs/terminal/tools/k9s/default.nix +++ b/modules/home/programs/terminal/tools/k9s/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.terminal.tools.k9s; + cfg = config.${namespace}.programs.terminal.tools.k9s; in { - options.khanelinix.programs.terminal.tools.k9s = { + options.${namespace}.programs.terminal.tools.k9s = { enable = mkBoolOpt false "Whether or not to enable k9s."; }; diff --git a/modules/home/programs/terminal/tools/lazydocker/default.nix b/modules/home/programs/terminal/tools/lazydocker/default.nix index c77b74721..2a39cbd85 100644 --- a/modules/home/programs/terminal/tools/lazydocker/default.nix +++ b/modules/home/programs/terminal/tools/lazydocker/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.terminal.tools.lazydocker; + cfg = config.${namespace}.programs.terminal.tools.lazydocker; in { - options.khanelinix.programs.terminal.tools.lazydocker = { + options.${namespace}.programs.terminal.tools.lazydocker = { enable = mkBoolOpt false "Whether or not to enable lazydocker."; }; diff --git a/modules/home/programs/terminal/tools/lazygit/default.nix b/modules/home/programs/terminal/tools/lazygit/default.nix index 803d27a97..d627bb001 100644 --- a/modules/home/programs/terminal/tools/lazygit/default.nix +++ b/modules/home/programs/terminal/tools/lazygit/default.nix @@ -1,12 +1,17 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.terminal.tools.lazygit; + cfg = config.${namespace}.programs.terminal.tools.lazygit; in { - options.khanelinix.programs.terminal.tools.lazygit = { + options.${namespace}.programs.terminal.tools.lazygit = { enable = mkBoolOpt false "Whether or not to enable lazygit."; }; @@ -17,7 +22,7 @@ in settings = { gui = { authorColors = { - "${config.khanelinix.user.fullName}" = "#c6a0f6"; + "${config.${namespace}.user.fullName}" = "#c6a0f6"; "dependabot[bot]" = "#eed49f"; }; branchColors = { diff --git a/modules/home/programs/terminal/tools/lsd/default.nix b/modules/home/programs/terminal/tools/lsd/default.nix index c41638914..4d84d67dc 100644 --- a/modules/home/programs/terminal/tools/lsd/default.nix +++ b/modules/home/programs/terminal/tools/lsd/default.nix @@ -2,13 +2,14 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.terminal.tools.lsd; + cfg = config.${namespace}.programs.terminal.tools.lsd; aliases = { @@ -18,7 +19,7 @@ let }; in { - options.khanelinix.programs.terminal.tools.lsd = { + options.${namespace}.programs.terminal.tools.lsd = { enable = mkBoolOpt false "Whether or not to enable lsd."; }; diff --git a/modules/home/programs/terminal/tools/node/default.nix b/modules/home/programs/terminal/tools/node/default.nix index a7842c995..b65a9d427 100644 --- a/modules/home/programs/terminal/tools/node/default.nix +++ b/modules/home/programs/terminal/tools/node/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) types mkIf; - inherit (lib.internal) mkBoolOpt mkOpt; + inherit (lib.${namespace}) mkBoolOpt mkOpt; - cfg = config.khanelinix.programs.terminal.tools.node; + cfg = config.${namespace}.programs.terminal.tools.node; in { - options.khanelinix.programs.terminal.tools.node = with types; { + options.${namespace}.programs.terminal.tools.node = with types; { enable = mkBoolOpt false "Whether or not to install and configure git"; flyctl = { enable = mkBoolOpt true "Whether or not to install flyctl"; diff --git a/modules/home/programs/terminal/tools/oh-my-posh/default.nix b/modules/home/programs/terminal/tools/oh-my-posh/default.nix index 59a113d05..1a61dccd8 100644 --- a/modules/home/programs/terminal/tools/oh-my-posh/default.nix +++ b/modules/home/programs/terminal/tools/oh-my-posh/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.terminal.tools.oh-my-posh; + cfg = config.${namespace}.programs.terminal.tools.oh-my-posh; in { - options.khanelinix.programs.terminal.tools.oh-my-posh = { + options.${namespace}.programs.terminal.tools.oh-my-posh = { enable = mkBoolOpt false "Whether or not to enable oh-my-posh."; }; diff --git a/modules/home/programs/terminal/tools/prisma/default.nix b/modules/home/programs/terminal/tools/prisma/default.nix index 420e62885..67d1f2a84 100644 --- a/modules/home/programs/terminal/tools/prisma/default.nix +++ b/modules/home/programs/terminal/tools/prisma/default.nix @@ -2,16 +2,17 @@ lib, pkgs, config, + namespace, ... }: let inherit (lib) types mkIf getExe'; - inherit (lib.internal) mkBoolOpt mkOpt; + inherit (lib.${namespace}) mkBoolOpt mkOpt; - cfg = config.khanelinix.programs.terminal.tools.prisma; + cfg = config.${namespace}.programs.terminal.tools.prisma; in { - options.khanelinix.programs.terminal.tools.prisma = with types; { + options.${namespace}.programs.terminal.tools.prisma = with types; { enable = mkBoolOpt false "Whether or not to install Prisma"; pkgs = { npm = mkOpt package pkgs.nodePackages.prisma "The NPM package to install"; diff --git a/modules/home/programs/terminal/tools/python/default.nix b/modules/home/programs/terminal/tools/python/default.nix index fcb5ee43c..3e8835110 100644 --- a/modules/home/programs/terminal/tools/python/default.nix +++ b/modules/home/programs/terminal/tools/python/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.terminal.tools.python; + cfg = config.${namespace}.programs.terminal.tools.python; in { - options.khanelinix.programs.terminal.tools.python = { + options.${namespace}.programs.terminal.tools.python = { enable = mkBoolOpt false "Whether or not to enable Python."; }; diff --git a/modules/home/programs/terminal/tools/ripgrep/default.nix b/modules/home/programs/terminal/tools/ripgrep/default.nix index cf881ae26..6a957a2ff 100644 --- a/modules/home/programs/terminal/tools/ripgrep/default.nix +++ b/modules/home/programs/terminal/tools/ripgrep/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) getExe mkForce mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.terminal.tools.ripgrep; + cfg = config.${namespace}.programs.terminal.tools.ripgrep; in { - options.khanelinix.programs.terminal.tools.ripgrep = { + options.${namespace}.programs.terminal.tools.ripgrep = { enable = mkBoolOpt false "Whether or not to enable ripgrep."; }; diff --git a/modules/home/programs/terminal/tools/ssh/default.nix b/modules/home/programs/terminal/tools/ssh/default.nix index a6207928f..1e599aa39 100644 --- a/modules/home/programs/terminal/tools/ssh/default.nix +++ b/modules/home/programs/terminal/tools/ssh/default.nix @@ -4,6 +4,7 @@ inputs, host, pkgs, + namespace, ... }: let @@ -13,28 +14,28 @@ let foldl optionalString ; - inherit (lib.internal) mkBoolOpt mkOpt; + inherit (lib.${namespace}) mkBoolOpt mkOpt; - cfg = config.khanelinix.programs.terminal.tools.ssh; + cfg = config.${namespace}.programs.terminal.tools.ssh; # @TODO(jakehamilton): This is a hold-over from an earlier Snowfall Lib version which used # the specialArg `name` to provide the host name. name = host; - user = config.users.users.${config.khanelinix.user.name}; + user = config.users.users.${config.${namespace}.user.name}; user-id = builtins.toString user.uid; default-key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJAZIwy7nkz8CZYR/ZTSNr+7lRBW2AYy1jw06b44zaID"; other-hosts = lib.filterAttrs ( - key: host: key != name && (host.config.khanelinix.user.name or null) != null + key: host: key != name && (host.config.${namespace}.user.name or null) != null ) ((inputs.self.nixosConfigurations or { }) // (inputs.self.darwinConfigurations or { })); other-hosts-config = lib.concatMapStringsSep "\n" ( name: let remote = other-hosts.${name}; - remote-user-name = remote.config.khanelinix.user.name; + remote-user-name = remote.config.${namespace}.user.name; remote-user-id = builtins.toString remote.config.users.users.${remote-user-name}.uid; forward-gpg = @@ -60,7 +61,7 @@ let ) (builtins.attrNames other-hosts); in { - options.khanelinix.programs.terminal.tools.ssh = with types; { + options.${namespace}.programs.terminal.tools.ssh = with types; { enable = mkBoolOpt false "Whether or not to configure ssh support."; authorizedKeys = mkOpt (listOf str) [ default-key ] "The public keys to apply."; extraConfig = mkOpt str "" "Extra configuration to apply."; diff --git a/modules/home/programs/terminal/tools/tmux/default.nix b/modules/home/programs/terminal/tools/tmux/default.nix index e81635587..01613cda1 100644 --- a/modules/home/programs/terminal/tools/tmux/default.nix +++ b/modules/home/programs/terminal/tools/tmux/default.nix @@ -2,13 +2,14 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.terminal.tools.tmux; + cfg = config.${namespace}.programs.terminal.tools.tmux; configFiles = lib.snowfall.fs.get-files ./config; plugins = with pkgs.tmuxPlugins; [ @@ -33,7 +34,7 @@ let ]; in { - options.khanelinix.programs.terminal.tools.tmux = { + options.${namespace}.programs.terminal.tools.tmux = { enable = mkBoolOpt false "Whether or not to enable tmux."; }; diff --git a/modules/home/programs/terminal/tools/topgrade/default.nix b/modules/home/programs/terminal/tools/topgrade/default.nix index 9b57deddd..869bf447f 100644 --- a/modules/home/programs/terminal/tools/topgrade/default.nix +++ b/modules/home/programs/terminal/tools/topgrade/default.nix @@ -1,12 +1,17 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.terminal.tools.topgrade; + cfg = config.${namespace}.programs.terminal.tools.topgrade; in { - options.khanelinix.programs.terminal.tools.topgrade = { + options.${namespace}.programs.terminal.tools.topgrade = { enable = mkBoolOpt false "Whether or not to enable topgrade."; }; diff --git a/modules/home/programs/terminal/tools/wine/default.nix b/modules/home/programs/terminal/tools/wine/default.nix index 4fde55e9f..50f42324c 100644 --- a/modules/home/programs/terminal/tools/wine/default.nix +++ b/modules/home/programs/terminal/tools/wine/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.terminal.tools.wine; + cfg = config.${namespace}.programs.terminal.tools.wine; in { - options.khanelinix.programs.terminal.tools.wine = { + options.${namespace}.programs.terminal.tools.wine = { enable = mkBoolOpt false "Whether or not to enable Wine."; }; diff --git a/modules/home/programs/terminal/tools/yazi/configs/plugins/glow.nix b/modules/home/programs/terminal/tools/yazi/configs/plugins/glow.nix index c7ff7501a..84573dea7 100644 --- a/modules/home/programs/terminal/tools/yazi/configs/plugins/glow.nix +++ b/modules/home/programs/terminal/tools/yazi/configs/plugins/glow.nix @@ -2,6 +2,7 @@ config, lib, pkgs, + namespace, ... }: let @@ -16,7 +17,7 @@ let # TODO: Use theme module style = "${stylePkg.outPath}/themes/catppuccin-macchiato.json"; - cfg = config.khanelinix.programs.terminal.tools.yazi; + cfg = config.${namespace}.programs.terminal.tools.yazi; in { config = mkIf cfg.enable { diff --git a/modules/home/programs/terminal/tools/yazi/default.nix b/modules/home/programs/terminal/tools/yazi/default.nix index a7ba3bc5f..dc749a734 100644 --- a/modules/home/programs/terminal/tools/yazi/default.nix +++ b/modules/home/programs/terminal/tools/yazi/default.nix @@ -2,25 +2,26 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; completion = import ./keymap/completion.nix { }; help = import ./keymap/help.nix { }; input = import ./keymap/input.nix { }; - manager = import ./keymap/manager.nix { inherit config; }; + manager = import ./keymap/manager.nix { inherit config namespace; }; select = import ./keymap/select.nix { }; tasks = import ./keymap/tasks.nix { }; - cfg = config.khanelinix.programs.terminal.tools.yazi; + cfg = config.${namespace}.programs.terminal.tools.yazi; in { imports = lib.snowfall.fs.get-non-default-nix-files ./configs/plugins; - options.khanelinix.programs.terminal.tools.yazi = { + options.${namespace}.programs.terminal.tools.yazi = { enable = mkBoolOpt false "Whether or not to enable yazi."; }; diff --git a/modules/home/programs/terminal/tools/yazi/keymap/manager.nix b/modules/home/programs/terminal/tools/yazi/keymap/manager.nix index ea54194e3..6661bb70f 100644 --- a/modules/home/programs/terminal/tools/yazi/keymap/manager.nix +++ b/modules/home/programs/terminal/tools/yazi/keymap/manager.nix @@ -1,8 +1,8 @@ -{ config, ... }: +{ config, namespace, ... }: let copy = import ./manager/copy.nix { }; find = import ./manager/find.nix { }; - goto = import ./manager/goto.nix { inherit config; }; + goto = import ./manager/goto.nix { inherit config namespace; }; navigation = import ./manager/navigation.nix { }; operation = import ./manager/operation.nix { }; selection = import ./manager/selection.nix { }; diff --git a/modules/home/programs/terminal/tools/yazi/keymap/manager/goto.nix b/modules/home/programs/terminal/tools/yazi/keymap/manager/goto.nix index bf65b9e92..d4ea5a106 100644 --- a/modules/home/programs/terminal/tools/yazi/keymap/manager/goto.nix +++ b/modules/home/programs/terminal/tools/yazi/keymap/manager/goto.nix @@ -1,4 +1,4 @@ -{ config, ... }: +{ config, namespace, ... }: { keymap = [ # Goto @@ -111,7 +111,7 @@ "g" "i" ]; - run = "cd /run/media/${config.khanelinix.user.name}"; + run = "cd /run/media/${config.${namespace}.user.name}"; desc = "Run command to change to media directory"; } { diff --git a/modules/home/programs/terminal/tools/zellij/default.nix b/modules/home/programs/terminal/tools/zellij/default.nix index 16aaeaf95..7600a43fe 100644 --- a/modules/home/programs/terminal/tools/zellij/default.nix +++ b/modules/home/programs/terminal/tools/zellij/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.terminal.tools.zellij; + cfg = config.${namespace}.programs.terminal.tools.zellij; in { - options.khanelinix.programs.terminal.tools.zellij = { + options.${namespace}.programs.terminal.tools.zellij = { enable = mkBoolOpt false "Whether or not to enable zellij."; }; diff --git a/modules/home/programs/terminal/tools/zellij/layouts/system.kdl b/modules/home/programs/terminal/tools/zellij/layouts/system.kdl index 2cb8f7492..4a4052944 100644 --- a/modules/home/programs/terminal/tools/zellij/layouts/system.kdl +++ b/modules/home/programs/terminal/tools/zellij/layouts/system.kdl @@ -40,7 +40,7 @@ layout { } } - dev_tab name="Khanelinix" cwd="~/khanelinix/" focus=true { + dev_tab name="khanelinix" cwd="~/khanelinix/" focus=true { term split_direction="vertical" { pane edit="./flake.nix" name="Flake" } diff --git a/modules/home/programs/terminal/tools/zoxide/default.nix b/modules/home/programs/terminal/tools/zoxide/default.nix index c0eb49b93..dded989b4 100644 --- a/modules/home/programs/terminal/tools/zoxide/default.nix +++ b/modules/home/programs/terminal/tools/zoxide/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.terminal.tools.zoxide; + cfg = config.${namespace}.programs.terminal.tools.zoxide; in { - options.khanelinix.programs.terminal.tools.zoxide = { + options.${namespace}.programs.terminal.tools.zoxide = { enable = mkBoolOpt false "Whether or not to enable zoxide."; }; diff --git a/modules/home/services/barrier/default.nix b/modules/home/services/barrier/default.nix index aae5598c3..bd3c8f498 100644 --- a/modules/home/services/barrier/default.nix +++ b/modules/home/services/barrier/default.nix @@ -1,12 +1,17 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkEnableOption mkIf types; - inherit (lib.internal) mkOpt; + inherit (lib.${namespace}) mkOpt; - cfg = config.khanelinix.services.barrier; + cfg = config.${namespace}.services.barrier; in { - options.khanelinix.services.barrier = { + options.${namespace}.services.barrier = { enable = mkEnableOption "barrier"; server = mkOpt types.str "192.168.1.3:24800" "Server address"; }; diff --git a/modules/home/services/easyeffects/default.nix b/modules/home/services/easyeffects/default.nix index fe11676f0..bff56801f 100644 --- a/modules/home/services/easyeffects/default.nix +++ b/modules/home/services/easyeffects/default.nix @@ -1,11 +1,16 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkEnableOption mkIf; - cfg = config.khanelinix.services.easyeffects; + cfg = config.${namespace}.services.easyeffects; in { - options.khanelinix.services.easyeffects = { + options.${namespace}.services.easyeffects = { enable = mkEnableOption "easyeffects"; }; diff --git a/modules/home/services/hypridle/default.nix b/modules/home/services/hypridle/default.nix index 6b6ef717d..e8ee710cc 100644 --- a/modules/home/services/hypridle/default.nix +++ b/modules/home/services/hypridle/default.nix @@ -3,17 +3,18 @@ inputs, lib, system, + namespace, ... }: let inherit (lib) mkIf getExe getExe'; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; inherit (inputs) hypridle; - cfg = config.khanelinix.services.hypridle; + cfg = config.${namespace}.services.hypridle; in { - options.khanelinix.services.hypridle = { + options.${namespace}.services.hypridle = { enable = mkBoolOpt false "Whether to enable hypridle service."; }; diff --git a/modules/home/services/hyprpaper/default.nix b/modules/home/services/hyprpaper/default.nix index 2b60cebf9..e9260936f 100644 --- a/modules/home/services/hyprpaper/default.nix +++ b/modules/home/services/hyprpaper/default.nix @@ -4,6 +4,7 @@ lib, pkgs, system, + namespace, ... }: let @@ -14,12 +15,12 @@ let mkOption ; inherit (inputs) hyprpaper hypr-socket-watch; - inherit (lib.internal) mkOpt; + inherit (lib.${namespace}) mkOpt; - cfg = config.khanelinix.services.hyprpaper; + cfg = config.${namespace}.services.hyprpaper; in { - options.khanelinix.services.hyprpaper = { + options.${namespace}.services.hyprpaper = { enable = mkEnableOption "Hyprpaper"; enableSocketWatch = mkEnableOption "hypr-socket-watch"; monitors = mkOption { @@ -53,7 +54,7 @@ in package = hypr-socket-watch.packages.${system}.hypr-socket-watch; monitor = "DP-1"; - wallpapers = "${pkgs.khanelinix.wallpapers}/share/wallpapers/"; + wallpapers = "${pkgs.${namespace}.wallpapers}/share/wallpapers/"; debug = false; }; }; diff --git a/modules/home/services/keyring/default.nix b/modules/home/services/keyring/default.nix index 0392b50c7..89e7db672 100644 --- a/modules/home/services/keyring/default.nix +++ b/modules/home/services/keyring/default.nix @@ -1,12 +1,17 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.services.keyring; + cfg = config.${namespace}.services.keyring; in { - options.khanelinix.services.keyring = { + options.${namespace}.services.keyring = { enable = mkBoolOpt false "Whether to enable gnome keyring."; }; diff --git a/modules/home/services/mpd/default.nix b/modules/home/services/mpd/default.nix index 73da14f42..5f4bf14b0 100644 --- a/modules/home/services/mpd/default.nix +++ b/modules/home/services/mpd/default.nix @@ -2,6 +2,7 @@ config, lib, pkgs, + namespace, ... }: let @@ -12,10 +13,10 @@ let types ; - cfg = config.khanelinix.services.mpd; + cfg = config.${namespace}.services.mpd; in { - options.khanelinix.services.mpd = { + options.${namespace}.services.mpd = { enable = mkEnableOption "mpd"; musicDirectory = mkOption { type = with types; either path str; diff --git a/modules/home/services/noisetorch/default.nix b/modules/home/services/noisetorch/default.nix index e7cf7d3fe..3360429e8 100644 --- a/modules/home/services/noisetorch/default.nix +++ b/modules/home/services/noisetorch/default.nix @@ -2,17 +2,18 @@ osConfig, config, lib, + namespace, ... }: let inherit (lib) getExe mkIf mkEnableOption; - cfg = config.khanelinix.services.noisetorch; - osCfg = osConfig.khanelinix.programs.graphical.addons.noisetorch; + cfg = config.${namespace}.services.noisetorch; + osCfg = osConfig.${namespace}.programs.graphical.addons.noisetorch; in { options = { - khanelinix.services.noisetorch = { + ${namespace}.services.noisetorch = { enable = mkEnableOption "noisetorch service"; }; }; diff --git a/modules/home/services/polkit/default.nix b/modules/home/services/polkit/default.nix index 765337651..b071af332 100644 --- a/modules/home/services/polkit/default.nix +++ b/modules/home/services/polkit/default.nix @@ -2,15 +2,16 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkEnableOption mkIf; - cfg = config.khanelinix.services.polkit; + cfg = config.${namespace}.services.polkit; in { - options.khanelinix.services.polkit = { + options.${namespace}.services.polkit = { enable = mkEnableOption "polkit"; }; diff --git a/modules/home/services/sops/default.nix b/modules/home/services/sops/default.nix index 4ef52fe94..dd3f8db39 100644 --- a/modules/home/services/sops/default.nix +++ b/modules/home/services/sops/default.nix @@ -1,12 +1,17 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf types; - inherit (lib.internal) mkBoolOpt mkOpt; + inherit (lib.${namespace}) mkBoolOpt mkOpt; - cfg = config.khanelinix.services.sops; + cfg = config.${namespace}.services.sops; in { - options.khanelinix.services.sops = with types; { + options.${namespace}.services.sops = with types; { enable = mkBoolOpt false "Whether to enable sops."; defaultSopsFile = mkOpt path null "Default sops file."; sshKeyPaths = mkOpt (listOf path) [ ] "SSH Key paths to use."; @@ -25,7 +30,7 @@ in secrets = { nix = { - sopsFile = ../../../../secrets/khaneliman/default.yaml; + sopsFile = lib.snowfall.fs.get-file "secrets/khaneliman/default.yaml"; path = "${config.home.homeDirectory}/.config/nix/nix.conf"; }; }; diff --git a/modules/home/services/swayidle/default.nix b/modules/home/services/swayidle/default.nix index aa5141f85..29908790c 100644 --- a/modules/home/services/swayidle/default.nix +++ b/modules/home/services/swayidle/default.nix @@ -3,17 +3,18 @@ inputs, lib, system, + namespace, ... }: let inherit (lib) mkIf getExe getExe'; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; inherit (inputs) nixpkgs-wayland; - cfg = config.khanelinix.services.swayidle; + cfg = config.${namespace}.services.swayidle; in { - options.khanelinix.services.swayidle = { + options.${namespace}.services.swayidle = { enable = mkBoolOpt false "Whether to enable swayidle service."; }; diff --git a/modules/home/services/tray/default.nix b/modules/home/services/tray/default.nix index 210c1e553..d155c5aba 100644 --- a/modules/home/services/tray/default.nix +++ b/modules/home/services/tray/default.nix @@ -1,11 +1,16 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkEnableOption mkIf; - cfg = config.khanelinix.services.tray; + cfg = config.${namespace}.services.tray; in { - options.khanelinix.services.tray = { + options.${namespace}.services.tray = { enable = mkEnableOption "tray"; }; diff --git a/modules/home/services/udiskie/default.nix b/modules/home/services/udiskie/default.nix index dac7c95f2..8b492b25f 100644 --- a/modules/home/services/udiskie/default.nix +++ b/modules/home/services/udiskie/default.nix @@ -1,11 +1,16 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkEnableOption mkIf; - cfg = config.khanelinix.services.udiskie; + cfg = config.${namespace}.services.udiskie; in { - options.khanelinix.services.udiskie = { + options.${namespace}.services.udiskie = { enable = mkEnableOption "udiskie"; }; diff --git a/modules/home/suites/business/default.nix b/modules/home/suites/business/default.nix index cc7951f0b..4f660b723 100644 --- a/modules/home/suites/business/default.nix +++ b/modules/home/suites/business/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt enabled; + inherit (lib.${namespace}) mkBoolOpt enabled; - cfg = config.khanelinix.suites.business; + cfg = config.${namespace}.suites.business; in { - options.khanelinix.suites.business = { + options.${namespace}.suites.business = { enable = mkBoolOpt false "Whether or not to enable business configuration."; }; diff --git a/modules/home/suites/common/default.nix b/modules/home/suites/common/default.nix index 0d319dc84..197711095 100644 --- a/modules/home/suites/common/default.nix +++ b/modules/home/suites/common/default.nix @@ -2,22 +2,23 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt enabled; + inherit (lib.${namespace}) mkBoolOpt enabled; - cfg = config.khanelinix.suites.common; + cfg = config.${namespace}.suites.common; in { - options.khanelinix.suites.common = { + options.${namespace}.suites.common = { enable = mkBoolOpt false "Whether or not to enable common configuration."; }; config = mkIf cfg.enable { home.shellAliases = { - nixcfg = "nvim ~/khanelinix/flake.nix"; + nixcfg = "nvim ~/${namespace}/flake.nix"; }; home.packages = diff --git a/modules/home/suites/development/default.nix b/modules/home/suites/development/default.nix index af054bc91..457c653de 100644 --- a/modules/home/suites/development/default.nix +++ b/modules/home/suites/development/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt enabled; + inherit (lib.${namespace}) mkBoolOpt enabled; - cfg = config.khanelinix.suites.development; + cfg = config.${namespace}.suites.development; in { - options.khanelinix.suites.development = { + options.${namespace}.suites.development = { enable = mkBoolOpt false "Whether or not to enable common development configuration."; azureEnable = mkBoolOpt false "Whether or not to enable azure development configuration."; dockerEnable = mkBoolOpt false "Whether or not to enable docker development configuration."; diff --git a/modules/home/suites/emulation/default.nix b/modules/home/suites/emulation/default.nix index e9bcbea08..6c70d85dd 100644 --- a/modules/home/suites/emulation/default.nix +++ b/modules/home/suites/emulation/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.suites.emulation; + cfg = config.${namespace}.suites.emulation; in { - options.khanelinix.suites.emulation = { + options.${namespace}.suites.emulation = { enable = mkBoolOpt false "Whether or not to enable emulation configuration."; retroarchFull = mkBoolOpt false "Whether or not to enable emulation configuration."; }; diff --git a/modules/home/suites/games/default.nix b/modules/home/suites/games/default.nix index 43de7b2ef..a6e6dbc5e 100644 --- a/modules/home/suites/games/default.nix +++ b/modules/home/suites/games/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt enabled; + inherit (lib.${namespace}) mkBoolOpt enabled; - cfg = config.khanelinix.suites.games; + cfg = config.${namespace}.suites.games; in { - options.khanelinix.suites.games = { + options.${namespace}.suites.games = { enable = mkBoolOpt false "Whether or not to enable common games configuration."; }; diff --git a/modules/home/suites/music/default.nix b/modules/home/suites/music/default.nix index 0772835ac..3ffa02088 100644 --- a/modules/home/suites/music/default.nix +++ b/modules/home/suites/music/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt enabled; + inherit (lib.${namespace}) mkBoolOpt enabled; - cfg = config.khanelinix.suites.music; + cfg = config.${namespace}.suites.music; in { - options.khanelinix.suites.music = { + options.${namespace}.suites.music = { enable = mkBoolOpt false "Whether or not to enable common music configuration."; }; @@ -36,7 +37,7 @@ in spicetify-cli tageditor youtube-music - pkgs.khanelinix.yt-music + pkgs.${namespace}.yt-music ]; khanelinix = { diff --git a/modules/home/suites/photo/default.nix b/modules/home/suites/photo/default.nix index 5525001ae..4b8bb01a8 100644 --- a/modules/home/suites/photo/default.nix +++ b/modules/home/suites/photo/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.suites.photo; + cfg = config.${namespace}.suites.photo; in { - options.khanelinix.suites.photo = { + options.${namespace}.suites.photo = { enable = mkBoolOpt false "Whether or not to enable photo configuration."; }; diff --git a/modules/home/suites/social/default.nix b/modules/home/suites/social/default.nix index fee3dce39..9658d05ae 100644 --- a/modules/home/suites/social/default.nix +++ b/modules/home/suites/social/default.nix @@ -1,12 +1,17 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt enabled; + inherit (lib.${namespace}) mkBoolOpt enabled; - cfg = config.khanelinix.suites.social; + cfg = config.${namespace}.suites.social; in { - options.khanelinix.suites.social = { + options.${namespace}.suites.social = { enable = mkBoolOpt false "Whether or not to enable social configuration."; }; diff --git a/modules/home/suites/video/default.nix b/modules/home/suites/video/default.nix index 7f22168a3..8d8795dea 100644 --- a/modules/home/suites/video/default.nix +++ b/modules/home/suites/video/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt enabled; + inherit (lib.${namespace}) mkBoolOpt enabled; - cfg = config.khanelinix.suites.video; + cfg = config.${namespace}.suites.video; in { - options.khanelinix.suites.video = { + options.${namespace}.suites.video = { enable = mkBoolOpt false "Whether or not to enable video configuration."; }; diff --git a/modules/home/suites/wlroots/default.nix b/modules/home/suites/wlroots/default.nix index 11141f516..54c71da9e 100644 --- a/modules/home/suites/wlroots/default.nix +++ b/modules/home/suites/wlroots/default.nix @@ -3,17 +3,18 @@ lib, inputs, system, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt enabled; + inherit (lib.${namespace}) mkBoolOpt enabled; inherit (inputs) nixpkgs-wayland; - cfg = config.khanelinix.suites.wlroots; + cfg = config.${namespace}.suites.wlroots; in { - options.khanelinix.suites.wlroots = { + options.${namespace}.suites.wlroots = { enable = mkBoolOpt false "Whether or not to enable common wlroots configuration."; }; diff --git a/modules/home/system/xdg/default.nix b/modules/home/system/xdg/default.nix index 714f65f2f..79915ecd0 100644 --- a/modules/home/system/xdg/default.nix +++ b/modules/home/system/xdg/default.nix @@ -1,8 +1,13 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkEnableOption mkIf; - cfg = config.khanelinix.system.xdg; + cfg = config.${namespace}.system.xdg; browser = [ "firefox.desktop" ]; editor = [ "nvim.desktop" ]; @@ -145,7 +150,7 @@ let }; in { - options.khanelinix.system.xdg = { + options.${namespace}.system.xdg = { enable = mkEnableOption "xdg"; }; diff --git a/modules/home/theme/catppuccin/default.nix b/modules/home/theme/catppuccin/default.nix index 4aa964d67..7de634b2d 100644 --- a/modules/home/theme/catppuccin/default.nix +++ b/modules/home/theme/catppuccin/default.nix @@ -2,6 +2,7 @@ config, lib, pkgs, + namespace, ... }: let @@ -11,9 +12,9 @@ let mkOption types ; - inherit (lib.internal) capitalize; + inherit (lib.${namespace}) capitalize; - cfg = config.khanelinix.theme.catppuccin; + cfg = config.${namespace}.theme.catppuccin; catppuccinAccents = [ "rosewater" @@ -40,7 +41,7 @@ let ]; in { - options.khanelinix.theme.catppuccin = { + options.${namespace}.theme.catppuccin = { enable = mkEnableOption "Enable catppuccin theme for applications."; accent = mkOption { @@ -123,12 +124,12 @@ in home = mkIf pkgs.stdenv.isLinux { pointerCursor = { - inherit (config.khanelinix.theme.gtk.cursor) name package size; + inherit (config.${namespace}.theme.gtk.cursor) name package size; x11.enable = true; }; sessionVariables = { - CURSOR_THEME = config.khanelinix.theme.gtk.cursor.name; + CURSOR_THEME = config.${namespace}.theme.gtk.cursor.name; }; }; @@ -158,7 +159,7 @@ in style = { name = "qt6ct-style"; - inherit (config.khanelinix.theme.qt.theme) package; + inherit (config.${namespace}.theme.qt.theme) package; }; }; @@ -259,7 +260,7 @@ in yazi.theme = lib.mkMerge [ (import ./yazi/filetype.nix { }) (import ./yazi/icons.nix { }) - (import ./yazi/manager.nix { inherit config lib; }) + (import ./yazi/manager.nix { inherit config lib namespace; }) (import ./yazi/status.nix { }) (import ./yazi/theme.nix { }) ]; diff --git a/modules/home/theme/catppuccin/yazi/manager.nix b/modules/home/theme/catppuccin/yazi/manager.nix index 0fd635fac..fb35338c3 100644 --- a/modules/home/theme/catppuccin/yazi/manager.nix +++ b/modules/home/theme/catppuccin/yazi/manager.nix @@ -1,4 +1,8 @@ -{ config, lib }: +{ + config, + lib, + namespace, +}: let catppuccin = import ../colors.nix; in @@ -62,8 +66,8 @@ in }; syntect_theme = let - cfg = config.khanelinix.theme.catppuccin; - inherit (lib.internal) capitalize; + cfg = config.${namespace}.theme.catppuccin; + inherit (lib.${namespace}) capitalize; in "/bat/Catppuccin ${capitalize cfg.flavor}.tmTheme"; }; diff --git a/modules/home/theme/gtk/default.nix b/modules/home/theme/gtk/default.nix index 1ddfd1164..c23e9e54b 100644 --- a/modules/home/theme/gtk/default.nix +++ b/modules/home/theme/gtk/default.nix @@ -3,21 +3,22 @@ lib, pkgs, osConfig, + namespace, ... }: let inherit (lib) mkIf mkDefault types; - inherit (lib.internal) + inherit (lib.${namespace}) boolToNum mkBoolOpt mkOpt nested-default-attrs ; - cfg = config.khanelinix.theme.gtk; + cfg = config.${namespace}.theme.gtk; in { - options.khanelinix.theme.gtk = { + options.${namespace}.theme.gtk = { enable = mkBoolOpt false "Whether to customize GTK and apply themes."; usePortal = mkBoolOpt false "Whether to use the GTK Portal."; @@ -77,7 +78,7 @@ in cursor-size = cfg.cursor.size; cursor-theme = cfg.cursor.name; enable-hot-corners = false; - font-name = osConfig.khanelinix.system.fonts.default; + font-name = osConfig.${namespace}.system.fonts.default; gtk-theme = cfg.theme.name; icon-theme = cfg.icon.name; }; @@ -88,7 +89,7 @@ in enable = true; font = { - name = osConfig.khanelinix.system.fonts.default; + name = osConfig.${namespace}.system.fonts.default; }; gtk2 = { diff --git a/modules/home/theme/qt/default.nix b/modules/home/theme/qt/default.nix index 779994faa..1009ca121 100644 --- a/modules/home/theme/qt/default.nix +++ b/modules/home/theme/qt/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) types mkDefault mkIf; - inherit (lib.internal) mkBoolOpt mkOpt; + inherit (lib.${namespace}) mkBoolOpt mkOpt; - cfg = config.khanelinix.theme.qt; + cfg = config.${namespace}.theme.qt; in { - options.khanelinix.theme.qt = with types; { + options.${namespace}.theme.qt = with types; { enable = mkBoolOpt false "Whether to customize qt and apply themes."; theme = { @@ -26,7 +27,7 @@ in Appearance = { color_scheme_path = mkOpt types.str "" "Color scheme path"; custom_palette = mkBoolOpt true "Whether to use custom palette"; - icon_theme = mkOpt types.str config.khanelinix.theme.gtk.icon.name "Icon theme"; + icon_theme = mkOpt types.str config.${namespace}.theme.gtk.icon.name "Icon theme"; standard_dialogs = mkOpt types.str "gtk3" "Dialog type"; style = mkOpt types.str "kvantum" "Style"; }; diff --git a/modules/home/user/default.nix b/modules/home/user/default.nix index 338372f14..630c289dd 100644 --- a/modules/home/user/default.nix +++ b/modules/home/user/default.nix @@ -4,6 +4,7 @@ lib, pkgs, system, + namespace, ... }: let @@ -15,10 +16,10 @@ let getExe getExe' ; - inherit (lib.internal) mkOpt; + inherit (lib.${namespace}) mkOpt; inherit (inputs) snowfall-flake; - cfg = config.khanelinix.user; + cfg = config.${namespace}.user; home-directory = if cfg.name == null then @@ -46,7 +47,7 @@ let defaultIconFileName = "profile.png"; in { - options.khanelinix.user = { + options.${namespace}.user = { enable = mkOpt types.bool false "Whether to configure the user account."; email = mkOpt types.str "khaneliman12@gmail.com" "The email of the user."; fullName = mkOpt types.str "Austin Horstman" "The full name of the user."; @@ -60,11 +61,11 @@ in assertions = [ { assertion = cfg.name != null; - message = "khanelinix.user.name must be set"; + message = "${namespace}.user.name must be set"; } { assertion = cfg.home != null; - message = "khanelinix.user.home must be set"; + message = "${namespace}.user.home must be set"; } ]; diff --git a/modules/nixos/archetypes/gaming/default.nix b/modules/nixos/archetypes/gaming/default.nix index aaac43141..e9502ef9c 100644 --- a/modules/nixos/archetypes/gaming/default.nix +++ b/modules/nixos/archetypes/gaming/default.nix @@ -1,17 +1,22 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt enabled; + inherit (lib.${namespace}) mkBoolOpt enabled; - cfg = config.khanelinix.archetypes.gaming; + cfg = config.${namespace}.archetypes.gaming; in { - options.khanelinix.archetypes.gaming = { + options.${namespace}.archetypes.gaming = { enable = mkBoolOpt false "Whether or not to enable the gaming archetype."; }; config = mkIf cfg.enable { - khanelinix.suites = { + ${namespace}.suites = { common = enabled; desktop = enabled; games = enabled; diff --git a/modules/nixos/archetypes/personal/default.nix b/modules/nixos/archetypes/personal/default.nix index 26176056f..3b84f5237 100644 --- a/modules/nixos/archetypes/personal/default.nix +++ b/modules/nixos/archetypes/personal/default.nix @@ -1,12 +1,17 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt enabled; + inherit (lib.${namespace}) mkBoolOpt enabled; - cfg = config.khanelinix.archetypes.personal; + cfg = config.${namespace}.archetypes.personal; in { - options.khanelinix.archetypes.personal = { + options.${namespace}.archetypes.personal = { enable = mkBoolOpt false "Whether or not to enable the personal archetype."; }; diff --git a/modules/nixos/archetypes/server/default.nix b/modules/nixos/archetypes/server/default.nix index a1401c54d..79fcdf3bb 100644 --- a/modules/nixos/archetypes/server/default.nix +++ b/modules/nixos/archetypes/server/default.nix @@ -1,12 +1,17 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt enabled; + inherit (lib.${namespace}) mkBoolOpt enabled; - cfg = config.khanelinix.archetypes.server; + cfg = config.${namespace}.archetypes.server; in { - options.khanelinix.archetypes.server = { + options.${namespace}.archetypes.server = { enable = mkBoolOpt false "Whether or not to enable the server archetype."; }; diff --git a/modules/nixos/archetypes/vm/default.nix b/modules/nixos/archetypes/vm/default.nix index f38e9e094..ca3a016ef 100644 --- a/modules/nixos/archetypes/vm/default.nix +++ b/modules/nixos/archetypes/vm/default.nix @@ -1,12 +1,17 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt enabled; + inherit (lib.${namespace}) mkBoolOpt enabled; - cfg = config.khanelinix.archetypes.vm; + cfg = config.${namespace}.archetypes.vm; in { - options.khanelinix.archetypes.vm = { + options.${namespace}.archetypes.vm = { enable = mkBoolOpt false "Whether or not to enable the vm archetype."; }; diff --git a/modules/nixos/archetypes/workstation/default.nix b/modules/nixos/archetypes/workstation/default.nix index bfe1d75ae..bacfd2318 100644 --- a/modules/nixos/archetypes/workstation/default.nix +++ b/modules/nixos/archetypes/workstation/default.nix @@ -1,12 +1,17 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt enabled; + inherit (lib.${namespace}) mkBoolOpt enabled; - cfg = config.khanelinix.archetypes.workstation; + cfg = config.${namespace}.archetypes.workstation; in { - options.khanelinix.archetypes.workstation = { + options.${namespace}.archetypes.workstation = { enable = mkBoolOpt false "Whether or not to enable the workstation archetype."; }; diff --git a/modules/nixos/archetypes/wsl/default.nix b/modules/nixos/archetypes/wsl/default.nix index c308c3b90..84b67418f 100644 --- a/modules/nixos/archetypes/wsl/default.nix +++ b/modules/nixos/archetypes/wsl/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf mkForce; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.archetypes.wsl; + cfg = config.${namespace}.archetypes.wsl; in { - options.khanelinix.archetypes.wsl = { + options.${namespace}.archetypes.wsl = { enable = mkBoolOpt false "Whether or not to enable the wsl archetype."; }; diff --git a/modules/nixos/display-managers/gdm/default.nix b/modules/nixos/display-managers/gdm/default.nix index c65af5513..ffb1a0230 100644 --- a/modules/nixos/display-managers/gdm/default.nix +++ b/modules/nixos/display-managers/gdm/default.nix @@ -2,17 +2,18 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) types mkIf getExe'; - inherit (lib.internal) mkBoolOpt mkOpt stringAfter; + inherit (lib.${namespace}) mkBoolOpt mkOpt stringAfter; - cfg = config.khanelinix.display-managers.gdm; + cfg = config.${namespace}.display-managers.gdm; gdmHome = config.users.users.gdm.home; in { - options.khanelinix.display-managers.gdm = with types; { + options.${namespace}.display-managers.gdm = with types; { enable = mkBoolOpt false "Whether or not to enable gdm."; autoSuspend = mkBoolOpt true "Whether or not to suspend the machine after inactivity."; defaultSession = mkOpt (nullOr str) null "The default session to use."; @@ -43,14 +44,16 @@ in libinput.enable = true; }; - systemd.services.khanelinix-user-icon = { + systemd.services."${namespace}-user-icon" = { before = [ "display-manager.service" ]; wantedBy = [ "display-manager.service" ]; script = # bash '' - config_file=/var/lib/AccountsService/users/${config.khanelinix.user.name} - icon_file=/run/current-system/sw/share/icons/user/${config.khanelinix.user.name}/${config.khanelinix.user.icon.fileName} + config_file=/var/lib/AccountsService/users/${config.${namespace}.user.name} + icon_file=/run/current-system/sw/share/icons/user/${config.${namespace}.user.name}/${ + config.${namespace}.user.icon.fileName + } if ! [ -d "$(dirname "$config_file")" ]; then mkdir -p "$(dirname "$config_file")" @@ -83,8 +86,8 @@ in stringAfter [ "users" ] # bash '' echo "Setting gdm permissions for user icon" - ${getExe' pkgs.acl "setfacl"} -m u:gdm:x /home/${config.khanelinix.user.name} - ${getExe' pkgs.acl "setfacl"} -m u:gdm:r /home/${config.khanelinix.user.name}/.face.icon || true + ${getExe' pkgs.acl "setfacl"} -m u:gdm:x /home/${config.${namespace}.user.name} + ${getExe' pkgs.acl "setfacl"} -m u:gdm:r /home/${config.${namespace}.user.name}/.face.icon || true ''; }; } diff --git a/modules/nixos/display-managers/lightdm/default.nix b/modules/nixos/display-managers/lightdm/default.nix index 215ea9d49..708dc8158 100644 --- a/modules/nixos/display-managers/lightdm/default.nix +++ b/modules/nixos/display-managers/lightdm/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.display-managers.lightdm; + cfg = config.${namespace}.display-managers.lightdm; in { - options.khanelinix.display-managers.lightdm = { + options.${namespace}.display-managers.lightdm = { enable = mkBoolOpt false "Whether or not to enable lightdm."; }; @@ -21,25 +22,25 @@ in displayManager.lightdm = { enable = true; - background = pkgs.khanelinix.wallpapers.flatppuccin_macchiato; + background = pkgs.${namespace}.wallpapers.flatppuccin_macchiato; greeters = { gtk = { enable = true; cursorTheme = { - inherit (config.khanelinix.desktop.addons.gtk.cursor) name; - package = config.khanelinix.desktop.addons.gtk.cursor.pkg; + inherit (config.${namespace}.desktop.addons.gtk.cursor) name; + package = config.${namespace}.desktop.addons.gtk.cursor.pkg; }; iconTheme = { - inherit (config.khanelinix.desktop.addons.gtk.icon) name; - package = config.khanelinix.desktop.addons.gtk.icon.pkg; + inherit (config.${namespace}.desktop.addons.gtk.icon) name; + package = config.${namespace}.desktop.addons.gtk.icon.pkg; }; theme = { - name = "${config.khanelinix.desktop.addons.gtk.theme.name}"; - package = config.khanelinix.desktop.addons.gtk.theme.pkg; + name = "${config.${namespace}.desktop.addons.gtk.theme.name}"; + package = config.${namespace}.desktop.addons.gtk.theme.pkg; }; }; }; diff --git a/modules/nixos/display-managers/regreet/default.nix b/modules/nixos/display-managers/regreet/default.nix index c3afb045d..bf86495a8 100644 --- a/modules/nixos/display-managers/regreet/default.nix +++ b/modules/nixos/display-managers/regreet/default.nix @@ -4,6 +4,7 @@ lib, pkgs, system, + namespace, ... }: let @@ -13,12 +14,12 @@ let getExe getExe' ; - inherit (lib.internal) mkBoolOpt mkOpt; + inherit (lib.${namespace}) mkBoolOpt mkOpt; inherit (inputs) hyprland; - cfg = config.khanelinix.display-managers.regreet; - themeCfg = config.khanelinix.theme; - gtkCfg = config.khanelinix.desktop.addons.gtk; + cfg = config.${namespace}.display-managers.regreet; + themeCfg = config.${namespace}.theme; + gtkCfg = config.${namespace}.desktop.addons.gtk; greetdHyprlandConfig = pkgs.writeText "greetd-hyprland-config" '' ${cfg.hyprlandOutput} @@ -40,7 +41,7 @@ let ''; in { - options.khanelinix.display-managers.regreet = with types; { + options.${namespace}.display-managers.regreet = with types; { enable = mkBoolOpt false "Whether or not to enable greetd."; hyprlandOutput = mkOpt lines "" "Hyprlands Outputs config."; }; @@ -57,14 +58,14 @@ in settings = { background = { - path = pkgs.khanelinix.wallpapers.flatppuccin_macchiato; + path = pkgs.${namespace}.wallpapers.flatppuccin_macchiato; fit = "Cover"; }; GTK = { application_prefer_dark_theme = true; cursor_theme_name = "${themeCfg.cursor.name}"; - font_name = "${config.khanelinix.system.fonts.default} * 12"; + font_name = "${config.${namespace}.system.fonts.default} * 12"; icon_theme_name = "${themeCfg.icon.name}"; theme_name = "${gtkCfg.theme.name}"; }; diff --git a/modules/nixos/display-managers/sddm/default.nix b/modules/nixos/display-managers/sddm/default.nix index 31f79db0f..462bfe2d2 100644 --- a/modules/nixos/display-managers/sddm/default.nix +++ b/modules/nixos/display-managers/sddm/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf getExe' stringAfter; - inherit (lib.internal) mkBoolOpt enabled; + inherit (lib.${namespace}) mkBoolOpt enabled; - cfg = config.khanelinix.display-managers.sddm; + cfg = config.${namespace}.display-managers.sddm; in { - options.khanelinix.display-managers.sddm = { + options.${namespace}.display-managers.sddm = { enable = mkBoolOpt false "Whether or not to enable sddm."; }; @@ -35,8 +36,8 @@ in stringAfter [ "users" ] # bash '' echo "Setting sddm permissions for user icon" - ${getExe' pkgs.acl "setfacl"} -m u:sddm:x /home/${config.khanelinix.user.name} - ${getExe' pkgs.acl "setfacl"} -m u:sddm:r /home/${config.khanelinix.user.name}/.face.icon || true + ${getExe' pkgs.acl "setfacl"} -m u:sddm:x /home/${config.${namespace}.user.name} + ${getExe' pkgs.acl "setfacl"} -m u:sddm:r /home/${config.${namespace}.user.name}/.face.icon || true ''; }; } diff --git a/modules/nixos/display-managers/tuigreet/default.nix b/modules/nixos/display-managers/tuigreet/default.nix index 17c3e3902..82238190d 100644 --- a/modules/nixos/display-managers/tuigreet/default.nix +++ b/modules/nixos/display-managers/tuigreet/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf getExe; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.display-managers.tuigreet; + cfg = config.${namespace}.display-managers.tuigreet; in { - options.khanelinix.display-managers.tuigreet = { + options.${namespace}.display-managers.tuigreet = { enable = mkBoolOpt false "Whether or not to enable tuigreet."; }; diff --git a/modules/nixos/hardware/audio/default.nix b/modules/nixos/hardware/audio/default.nix index 212281972..1bf849723 100644 --- a/modules/nixos/hardware/audio/default.nix +++ b/modules/nixos/hardware/audio/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) types mkIf mkForce; - inherit (lib.internal) mkBoolOpt mkOpt; + inherit (lib.${namespace}) mkBoolOpt mkOpt; - cfg = config.khanelinix.hardware.audio; + cfg = config.${namespace}.hardware.audio; in { - options.khanelinix.hardware.audio = with types; { + options.${namespace}.hardware.audio = with types; { enable = mkBoolOpt false "Whether or not to enable audio support."; alsa-monitor = mkOpt attrs { } "Alsa configuration."; extra-packages = mkOpt (listOf package) [ diff --git a/modules/nixos/hardware/bluetooth/default.nix b/modules/nixos/hardware/bluetooth/default.nix index 7770fc79b..a076d0a45 100644 --- a/modules/nixos/hardware/bluetooth/default.nix +++ b/modules/nixos/hardware/bluetooth/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.hardware.bluetooth; + cfg = config.${namespace}.hardware.bluetooth; in { - options.khanelinix.hardware.bluetooth = { + options.${namespace}.hardware.bluetooth = { enable = mkBoolOpt false "Whether or not to enable support for extra bluetooth devices."; }; diff --git a/modules/nixos/hardware/cpu/amd/default.nix b/modules/nixos/hardware/cpu/amd/default.nix index 76169e180..8ec324f6d 100644 --- a/modules/nixos/hardware/cpu/amd/default.nix +++ b/modules/nixos/hardware/cpu/amd/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.hardware.cpu.amd; + cfg = config.${namespace}.hardware.cpu.amd; in { - options.khanelinix.hardware.cpu.amd = { + options.${namespace}.hardware.cpu.amd = { enable = mkBoolOpt false "Whether or not to enable support for amd cpu."; }; diff --git a/modules/nixos/hardware/cpu/default.nix b/modules/nixos/hardware/cpu/default.nix index 6c723df86..1aeb1984d 100644 --- a/modules/nixos/hardware/cpu/default.nix +++ b/modules/nixos/hardware/cpu/default.nix @@ -1,9 +1,9 @@ -{ lib, ... }: +{ lib, namespace, ... }: let - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; in { - options.khanelinix.hardware.cpu = { + options.${namespace}.hardware.cpu = { enable = mkBoolOpt false "No-op used for setting up hierarchy."; }; } diff --git a/modules/nixos/hardware/cpu/intel/default.nix b/modules/nixos/hardware/cpu/intel/default.nix index 9436f9b88..0ea485a3b 100644 --- a/modules/nixos/hardware/cpu/intel/default.nix +++ b/modules/nixos/hardware/cpu/intel/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.hardware.cpu.intel; + cfg = config.${namespace}.hardware.cpu.intel; in { - options.khanelinix.hardware.cpu.intel = { + options.${namespace}.hardware.cpu.intel = { enable = mkBoolOpt false "Whether or not to enable support for intel cpu."; }; diff --git a/modules/nixos/hardware/fingerprint/default.nix b/modules/nixos/hardware/fingerprint/default.nix index da0aa1f3b..f61204dbb 100644 --- a/modules/nixos/hardware/fingerprint/default.nix +++ b/modules/nixos/hardware/fingerprint/default.nix @@ -1,12 +1,17 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.hardware.fingerprint; + cfg = config.${namespace}.hardware.fingerprint; in { - options.khanelinix.hardware.fingerprint = { + options.${namespace}.hardware.fingerprint = { enable = mkBoolOpt false "Whether or not to enable fingerprint support."; }; diff --git a/modules/nixos/hardware/gpu/amd/default.nix b/modules/nixos/hardware/gpu/amd/default.nix index b69e9004c..d3b774203 100644 --- a/modules/nixos/hardware/gpu/amd/default.nix +++ b/modules/nixos/hardware/gpu/amd/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.hardware.gpu.amd; + cfg = config.${namespace}.hardware.gpu.amd; in { - options.khanelinix.hardware.gpu.amd = { + options.${namespace}.hardware.gpu.amd = { enable = mkBoolOpt false "Whether or not to enable support for amdgpu."; }; diff --git a/modules/nixos/hardware/gpu/default.nix b/modules/nixos/hardware/gpu/default.nix index 014f986c4..85af8ba68 100644 --- a/modules/nixos/hardware/gpu/default.nix +++ b/modules/nixos/hardware/gpu/default.nix @@ -1,9 +1,9 @@ -{ lib, ... }: +{ lib, namespace, ... }: let - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; in { - options.khanelinix.hardware.gpu = { + options.${namespace}.hardware.gpu = { enable = mkBoolOpt false "No-op for setting up hierarchy."; }; } diff --git a/modules/nixos/hardware/gpu/nvidia/default.nix b/modules/nixos/hardware/gpu/nvidia/default.nix index a4c4823d4..9a09b996b 100644 --- a/modules/nixos/hardware/gpu/nvidia/default.nix +++ b/modules/nixos/hardware/gpu/nvidia/default.nix @@ -2,12 +2,13 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkDefault mkIf versionOlder; - inherit (lib.internal) mkBoolOpt; - cfg = config.khanelinix.hardware.gpu.nvidia; + inherit (lib.${namespace}) mkBoolOpt; + cfg = config.${namespace}.hardware.gpu.nvidia; # use the latest possible nvidia package nvStable = config.boot.kernelPackages.nvidiaPackages.stable.version; @@ -20,7 +21,7 @@ let config.boot.kernelPackages.nvidiaPackages.beta; in { - options.khanelinix.hardware.gpu.nvidia = { + options.${namespace}.hardware.gpu.nvidia = { enable = mkBoolOpt false "Whether or not to enable support for nvidia."; }; @@ -43,7 +44,7 @@ in ]; hardware = { - nvidia = mkIf (!config.khanelinix.hardware.gpu.amd.enable) { + nvidia = mkIf (!config.${namespace}.hardware.gpu.amd.enable) { package = mkDefault nvidiaPackage; modesetting.enable = mkDefault true; diff --git a/modules/nixos/hardware/opengl/default.nix b/modules/nixos/hardware/opengl/default.nix index f2e9b9c21..0fa5c0dba 100644 --- a/modules/nixos/hardware/opengl/default.nix +++ b/modules/nixos/hardware/opengl/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.hardware.opengl; + cfg = config.${namespace}.hardware.opengl; in { - options.khanelinix.hardware.opengl = { + options.${namespace}.hardware.opengl = { enable = mkBoolOpt false "Whether or not to enable support for opengl."; }; diff --git a/modules/nixos/hardware/power/default.nix b/modules/nixos/hardware/power/default.nix index 7dd3a3f70..a815f503c 100644 --- a/modules/nixos/hardware/power/default.nix +++ b/modules/nixos/hardware/power/default.nix @@ -1,12 +1,17 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.hardware.power; + cfg = config.${namespace}.hardware.power; in { - options.khanelinix.hardware.power = { + options.${namespace}.hardware.power = { enable = mkBoolOpt false "Whether or not to enable support for extra power devices."; }; diff --git a/modules/nixos/hardware/rgb/ckb-next/default.nix b/modules/nixos/hardware/rgb/ckb-next/default.nix index 91e9f435e..0b9c00e4b 100644 --- a/modules/nixos/hardware/rgb/ckb-next/default.nix +++ b/modules/nixos/hardware/rgb/ckb-next/default.nix @@ -1,12 +1,17 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) types mkIf; - inherit (lib.internal) mkBoolOpt mkOpt; + inherit (lib.${namespace}) mkBoolOpt mkOpt; - cfg = config.khanelinix.hardware.rgb.ckb-next; + cfg = config.${namespace}.hardware.rgb.ckb-next; in { - options.khanelinix.hardware.rgb.ckb-next = with types; { + options.${namespace}.hardware.rgb.ckb-next = with types; { enable = mkBoolOpt false "Whether or not to enable support for rgb controls."; ckbNextConfig = mkOpt (nullOr path) null "The ckb-next.conf file to create."; }; @@ -14,7 +19,7 @@ in config = mkIf cfg.enable { hardware.ckb-next.enable = true; - khanelinix.home.configFile = + ${namespace}.home.configFile = { } // lib.optionalAttrs (cfg.ckbNextConfig != null) { "ckb-next/ckb-next.cfg".source = cfg.ckbNextConfig; diff --git a/modules/nixos/hardware/rgb/openrgb/default.nix b/modules/nixos/hardware/rgb/openrgb/default.nix index cc6747e73..78d37c5b3 100644 --- a/modules/nixos/hardware/rgb/openrgb/default.nix +++ b/modules/nixos/hardware/rgb/openrgb/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) types mkIf mkOption; - inherit (lib.internal) mkBoolOpt mkOpt; + inherit (lib.${namespace}) mkBoolOpt mkOpt; - cfg = config.khanelinix.hardware.rgb.openrgb; + cfg = config.${namespace}.hardware.rgb.openrgb; in { - options.khanelinix.hardware.rgb.openrgb = with types; { + options.${namespace}.hardware.rgb.openrgb = with types; { enable = mkBoolOpt false "Whether or not to enable support for rgb controls."; motherboard = mkOption { type = types.nullOr ( @@ -32,7 +33,7 @@ in openrgb-with-all-plugins ]; - khanelinix.home.configFile = + ${namespace}.home.configFile = { } // lib.optionalAttrs (cfg.openRGBConfig != null) { "OpenRGB/sizes.ors".source = cfg.openRGBConfig + "/sizes.ors"; diff --git a/modules/nixos/hardware/storage/btrfs/default.nix b/modules/nixos/hardware/storage/btrfs/default.nix index 657737e3f..bc8b8155b 100644 --- a/modules/nixos/hardware/storage/btrfs/default.nix +++ b/modules/nixos/hardware/storage/btrfs/default.nix @@ -2,6 +2,7 @@ config, lib, pkgs, + namespace, ... }: let @@ -11,10 +12,10 @@ let genAttrs getExe ; - inherit (lib.internal) mkBoolOpt mkOpt; + inherit (lib.${namespace}) mkBoolOpt mkOpt; inherit (cfg) dedupeFilesystems; - cfg = config.khanelinix.hardware.storage.btrfs; + cfg = config.${namespace}.hardware.storage.btrfs; dedupeFilesystemsAttrSets = genAttrs dedupeFilesystems (name: { spec = "LABEL=${name}"; @@ -30,7 +31,7 @@ let }); in { - options.khanelinix.hardware.storage.btrfs = with types; { + options.${namespace}.hardware.storage.btrfs = with types; { enable = mkBoolOpt false "Whether or not to enable support for btrfs devices."; autoScrub = mkBoolOpt false "Whether to enable btrfs autoScrub;"; dedupe = mkBoolOpt false "Whether to enable btrfs deduplication;"; diff --git a/modules/nixos/hardware/storage/default.nix b/modules/nixos/hardware/storage/default.nix index e100cd159..ae3ab204f 100644 --- a/modules/nixos/hardware/storage/default.nix +++ b/modules/nixos/hardware/storage/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.hardware.storage; + cfg = config.${namespace}.hardware.storage; in { - options.khanelinix.hardware.storage = { + options.${namespace}.hardware.storage = { enable = mkBoolOpt false "Whether or not to enable support for extra storage devices."; ssdEnable = mkBoolOpt true "Whether or not to enable support for SSD storage devices."; }; diff --git a/modules/nixos/hardware/storage/zfs/default.nix b/modules/nixos/hardware/storage/zfs/default.nix index b4f2d83d6..2bad14933 100644 --- a/modules/nixos/hardware/storage/zfs/default.nix +++ b/modules/nixos/hardware/storage/zfs/default.nix @@ -1,13 +1,18 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkEnableOption mkIf mkDefault; - inherit (lib.internal) mkOpt; + inherit (lib.${namespace}) mkOpt; inherit (lib.types) listOf str; - cfg = config.khanelinix.hardware.storage.zfs; + cfg = config.${namespace}.hardware.storage.zfs; in { - options.khanelinix.hardware.storage.zfs = { + options.${namespace}.hardware.storage.zfs = { enable = mkEnableOption "ZFS support"; auto-snapshot = { enable = mkEnableOption "ZFS auto snapshotting"; diff --git a/modules/nixos/hardware/tpm/default.nix b/modules/nixos/hardware/tpm/default.nix index 088dab7a1..5dc8231e8 100644 --- a/modules/nixos/hardware/tpm/default.nix +++ b/modules/nixos/hardware/tpm/default.nix @@ -1,12 +1,17 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkDefault mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.hardware.tpm; + cfg = config.${namespace}.hardware.tpm; in { - options.khanelinix.hardware.tpm = { + options.${namespace}.hardware.tpm = { enable = mkBoolOpt false "Whether or not to enable Trusted Platform Module 2 (TPM2)."; }; diff --git a/modules/nixos/hardware/yubikey/default.nix b/modules/nixos/hardware/yubikey/default.nix index c623c6ef2..5956b6349 100644 --- a/modules/nixos/hardware/yubikey/default.nix +++ b/modules/nixos/hardware/yubikey/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.hardware.yubikey; + cfg = config.${namespace}.hardware.yubikey; in { - options.khanelinix.hardware.yubikey = { + options.${namespace}.hardware.yubikey = { enable = mkBoolOpt false "Whether or not to enable Yubikey."; }; diff --git a/modules/nixos/home/default.nix b/modules/nixos/home/default.nix index 690557177..ff43af66c 100644 --- a/modules/nixos/home/default.nix +++ b/modules/nixos/home/default.nix @@ -3,15 +3,16 @@ lib, options, pkgs, + namespace, ... }: let inherit (lib) types mkAliasDefinitions; - inherit (lib.internal) mkOpt; + inherit (lib.${namespace}) mkOpt; in { - options.khanelinix.home = with types; { + options.${namespace}.home = with types; { configFile = mkOpt attrs { } "A set of files to be managed by home-manager's ."; @@ -22,10 +23,10 @@ in config = { environment.systemPackages = [ pkgs.home-manager ]; - khanelinix.home.extraOptions = { - home.file = mkAliasDefinitions options.khanelinix.home.file; + ${namespace}.home.extraOptions = { + home.file = mkAliasDefinitions options.${namespace}.home.file; home.stateVersion = config.system.stateVersion; - xdg.configFile = mkAliasDefinitions options.khanelinix.home.configFile; + xdg.configFile = mkAliasDefinitions options.${namespace}.home.configFile; xdg.enable = true; }; @@ -36,7 +37,7 @@ in useGlobalPkgs = true; useUserPackages = true; - users.${config.khanelinix.user.name} = mkAliasDefinitions options.khanelinix.home.extraOptions; + users.${config.${namespace}.user.name} = mkAliasDefinitions options.${namespace}.home.extraOptions; verbose = true; }; diff --git a/modules/nixos/nix/default.nix b/modules/nixos/nix/default.nix index 3d0535f40..b7710c768 100644 --- a/modules/nixos/nix/default.nix +++ b/modules/nixos/nix/default.nix @@ -1,11 +1,16 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkDefault mkIf mkForce; - cfg = config.khanelinix.nix; + cfg = config.${namespace}.nix; in { - imports = [ ../../shared/nix/default.nix ]; + imports = [ (lib.snowfall.fs.get-file "modules/shared/nix/default.nix") ]; config = mkIf cfg.enable { documentation.man.generateCaches = mkDefault true; diff --git a/modules/nixos/programs/graphical/addons/gamemode/default.nix b/modules/nixos/programs/graphical/addons/gamemode/default.nix index b3c1fd7ca..3be5ff1ff 100644 --- a/modules/nixos/programs/graphical/addons/gamemode/default.nix +++ b/modules/nixos/programs/graphical/addons/gamemode/default.nix @@ -2,13 +2,14 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) types mkIf getExe'; - inherit (lib.internal) mkBoolOpt mkOpt; + inherit (lib.${namespace}) mkBoolOpt mkOpt; - cfg = config.khanelinix.programs.graphical.addons.gamemode; + cfg = config.${namespace}.programs.graphical.addons.gamemode; defaultStartScript = '' ${getExe' pkgs.libnotify "notify-send"} 'GameMode started' @@ -19,7 +20,7 @@ let ''; in { - options.khanelinix.programs.graphical.addons.gamemode = with types; { + options.${namespace}.programs.graphical.addons.gamemode = with types; { enable = mkBoolOpt false "Whether or not to enable gamemode."; endscript = mkOpt (nullOr str) null "The script to run when disabling gamemode."; startscript = mkOpt (nullOr str) null "The script to run when enabling gamemode."; diff --git a/modules/nixos/programs/graphical/addons/gamescope/default.nix b/modules/nixos/programs/graphical/addons/gamescope/default.nix index de88fb1da..ecf9db6d2 100644 --- a/modules/nixos/programs/graphical/addons/gamescope/default.nix +++ b/modules/nixos/programs/graphical/addons/gamescope/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) getExe mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.graphical.addons.gamescope; + cfg = config.${namespace}.programs.graphical.addons.gamescope; in { - options.khanelinix.programs.graphical.addons.gamescope = { + options.${namespace}.programs.graphical.addons.gamescope = { enable = mkBoolOpt false "Whether or not to enable gamescope."; }; diff --git a/modules/nixos/programs/graphical/addons/keyring/default.nix b/modules/nixos/programs/graphical/addons/keyring/default.nix index a3ac09124..48d08491f 100644 --- a/modules/nixos/programs/graphical/addons/keyring/default.nix +++ b/modules/nixos/programs/graphical/addons/keyring/default.nix @@ -1,12 +1,17 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.graphical.addons.keyring; + cfg = config.${namespace}.programs.graphical.addons.keyring; in { - options.khanelinix.programs.graphical.addons.keyring = { + options.${namespace}.programs.graphical.addons.keyring = { enable = mkBoolOpt false "Whether to enable the passwords application."; }; diff --git a/modules/nixos/programs/graphical/addons/looking-glass-client/default.nix b/modules/nixos/programs/graphical/addons/looking-glass-client/default.nix index 37ba9ea3e..1ab01002b 100644 --- a/modules/nixos/programs/graphical/addons/looking-glass-client/default.nix +++ b/modules/nixos/programs/graphical/addons/looking-glass-client/default.nix @@ -2,17 +2,18 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; - inherit (config.khanelinix) user; + inherit (lib.${namespace}) mkBoolOpt; + inherit (config.${namespace}) user; - cfg = config.khanelinix.programs.graphical.addons.looking-glass-client; + cfg = config.${namespace}.programs.graphical.addons.looking-glass-client; in { - options.khanelinix.programs.graphical.addons.looking-glass-client = { + options.${namespace}.programs.graphical.addons.looking-glass-client = { enable = mkBoolOpt false "Whether or not to enable the Looking Glass client."; }; diff --git a/modules/nixos/programs/graphical/addons/noisetorch/default.nix b/modules/nixos/programs/graphical/addons/noisetorch/default.nix index f3e69086b..98e73fa7a 100644 --- a/modules/nixos/programs/graphical/addons/noisetorch/default.nix +++ b/modules/nixos/programs/graphical/addons/noisetorch/default.nix @@ -2,6 +2,7 @@ config, lib, pkgs, + namespace, ... }: let @@ -13,10 +14,10 @@ let types ; - cfg = config.khanelinix.programs.graphical.addons.noisetorch; + cfg = config.${namespace}.programs.graphical.addons.noisetorch; in { - options.khanelinix.programs.graphical.addons.noisetorch = { + options.${namespace}.programs.graphical.addons.noisetorch = { enable = mkEnableOption "noisetorch service"; package = mkOption { type = types.package; diff --git a/modules/nixos/programs/graphical/addons/xdg-portal/default.nix b/modules/nixos/programs/graphical/addons/xdg-portal/default.nix index 1798f83e2..109c5f657 100644 --- a/modules/nixos/programs/graphical/addons/xdg-portal/default.nix +++ b/modules/nixos/programs/graphical/addons/xdg-portal/default.nix @@ -4,17 +4,18 @@ lib, pkgs, system, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; inherit (inputs) hyprland; - cfg = config.khanelinix.programs.graphical.addons.xdg-portal; + cfg = config.${namespace}.programs.graphical.addons.xdg-portal; in { - options.khanelinix.programs.graphical.addons.xdg-portal = { + options.${namespace}.programs.graphical.addons.xdg-portal = { enable = mkBoolOpt false "Whether or not to add support for xdg portal."; }; @@ -26,9 +27,9 @@ in common = let portal = - if config.khanelinix.programs.graphical.wms.hyprland.enable == "Hyprland" then + if config.${namespace}.programs.graphical.wms.hyprland.enable == "Hyprland" then "hyprland" - else if config.khanelinix.programs.graphical.wms.sway.enable == "sway" then + else if config.${namespace}.programs.graphical.wms.sway.enable == "sway" then "wlr" else "gtk"; @@ -48,8 +49,8 @@ in extraPortals = with pkgs; [ xdg-desktop-portal-gtk ] - ++ (lib.optional config.khanelinix.programs.graphical.wms.sway.enable xdg-desktop-portal-wlr) - ++ (lib.optional config.khanelinix.programs.graphical.wms.hyprland.enable + ++ (lib.optional config.${namespace}.programs.graphical.wms.sway.enable xdg-desktop-portal-wlr) + ++ (lib.optional config.${namespace}.programs.graphical.wms.hyprland.enable hyprland.packages.${system}.xdg-desktop-portal-hyprland ); # xdgOpenUsePortal = true; diff --git a/modules/nixos/programs/graphical/apps/_1password/default.nix b/modules/nixos/programs/graphical/apps/_1password/default.nix index fc857f0d3..f0f376687 100644 --- a/modules/nixos/programs/graphical/apps/_1password/default.nix +++ b/modules/nixos/programs/graphical/apps/_1password/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt enabled; + inherit (lib.${namespace}) mkBoolOpt enabled; - cfg = config.khanelinix.programs.graphical.apps._1password; + cfg = config.${namespace}.programs.graphical.apps._1password; in { - options.khanelinix.programs.graphical.apps._1password = { + options.${namespace}.programs.graphical.apps._1password = { enable = mkBoolOpt false "Whether or not to enable 1password."; }; @@ -22,7 +23,7 @@ in enable = true; package = pkgs._1password-gui; - polkitPolicyOwners = [ config.khanelinix.user.name ]; + polkitPolicyOwners = [ config.${namespace}.user.name ]; }; ssh.extraConfig = '' diff --git a/modules/nixos/programs/graphical/apps/discord/default.nix b/modules/nixos/programs/graphical/apps/discord/default.nix index a96e5536a..16620d6ee 100644 --- a/modules/nixos/programs/graphical/apps/discord/default.nix +++ b/modules/nixos/programs/graphical/apps/discord/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf getExe; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.graphical.apps.discord; + cfg = config.${namespace}.programs.graphical.apps.discord; in { - options.khanelinix.programs.graphical.apps.discord = { + options.${namespace}.programs.graphical.apps.discord = { enable = mkBoolOpt false "Whether or not to enable Discord."; canary.enable = mkBoolOpt false "Whether or not to enable Discord Canary."; firefox.enable = mkBoolOpt false "Whether or not to enable the Firefox version of Discord."; @@ -20,8 +21,8 @@ in config = mkIf cfg.enable { environment.systemPackages = lib.optional cfg.enable pkgs.discord - ++ lib.optional cfg.canary.enable pkgs.khanelinix.discord - ++ lib.optional cfg.firefox.enable pkgs.khanelinix.discord-firefox; + ++ lib.optional cfg.canary.enable pkgs.${namespace}.discord + ++ lib.optional cfg.firefox.enable pkgs.${namespace}.discord-firefox; system.userActivationScripts = { postInstall = # bash diff --git a/modules/nixos/programs/graphical/apps/steam/default.nix b/modules/nixos/programs/graphical/apps/steam/default.nix index 35362c2a8..a1e087d6c 100644 --- a/modules/nixos/programs/graphical/apps/steam/default.nix +++ b/modules/nixos/programs/graphical/apps/steam/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.graphical.apps.steam; + cfg = config.${namespace}.programs.graphical.apps.steam; in { - options.khanelinix.programs.graphical.apps.steam = { + options.${namespace}.programs.graphical.apps.steam = { enable = mkBoolOpt false "Whether or not to enable support for Steam."; }; diff --git a/modules/nixos/programs/graphical/apps/virtualbox/default.nix b/modules/nixos/programs/graphical/apps/virtualbox/default.nix index 62982f3fd..393d89528 100644 --- a/modules/nixos/programs/graphical/apps/virtualbox/default.nix +++ b/modules/nixos/programs/graphical/apps/virtualbox/default.nix @@ -1,17 +1,22 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.graphical.apps.virtualbox; + cfg = config.${namespace}.programs.graphical.apps.virtualbox; in { - options.khanelinix.programs.graphical.apps.virtualbox = { + options.${namespace}.programs.graphical.apps.virtualbox = { enable = mkBoolOpt false "Whether or not to enable Virtualbox."; }; config = mkIf cfg.enable { - khanelinix.user.extraGroups = [ "vboxusers" ]; + ${namespace}.user.extraGroups = [ "vboxusers" ]; virtualisation.virtualbox.host = { enable = true; diff --git a/modules/nixos/programs/graphical/desktop-environment/gnome/default.nix b/modules/nixos/programs/graphical/desktop-environment/gnome/default.nix index 2fae9cc64..04f79d417 100644 --- a/modules/nixos/programs/graphical/desktop-environment/gnome/default.nix +++ b/modules/nixos/programs/graphical/desktop-environment/gnome/default.nix @@ -2,6 +2,7 @@ config, lib, pkgs, + namespace, ... }: let @@ -12,14 +13,14 @@ let optional getExe ; - inherit (lib.internal) + inherit (lib.${namespace}) enabled mkBoolOpt mkOpt mkDefault ; - cfg = config.khanelinix.programs.graphical.desktop-environment.gnome; + cfg = config.${namespace}.programs.graphical.desktop-environment.gnome; gdmHome = config.users.users.gdm.home; defaultExtensions = with pkgs.gnomeExtensions; [ @@ -42,7 +43,7 @@ let nested-default-attrs = mapAttrs (_key: default-attrs); in { - options.khanelinix.programs.graphical.desktop-environment.gnome = with types; { + options.${namespace}.programs.graphical.desktop-environment.gnome = with types; { enable = mkBoolOpt false "Whether or not to use Gnome as the desktop environment."; color-scheme = mkOpt (enum [ "light" @@ -55,11 +56,11 @@ in light = mkOpt (oneOf [ str package - ]) pkgs.khanelinix.wallpapers.flatppuccin_macchiato "The light wallpaper to use."; + ]) pkgs.${namespace}.wallpapers.flatppuccin_macchiato "The light wallpaper to use."; dark = mkOpt (oneOf [ str package - ]) pkgs.khanelinix.wallpapers.cat-sound "The dark wallpaper to use."; + ]) pkgs.${namespace}.wallpapers.cat-sound "The dark wallpaper to use."; }; wayland = mkBoolOpt true "Whether or not to use Wayland."; }; @@ -112,15 +113,15 @@ in favorite-apps = [ "org.gnome.Nautilus.desktop" ] # FIX: references - # ++ optional config.khanelinix.programs.graphical.firefox.enable "firefox.desktop" - # ++ optional config.khanelinix.programs.graphical.vscode.enable "code.desktop" - ++ optional config.khanelinix.programs.terminal.emulators.foot.enable "foot.desktop" - ++ optional config.khanelinix.programs.terminal.emulators.kitty.enable "kitty.desktop" + # ++ optional config.${namespace}.programs.graphical.firefox.enable "firefox.desktop" + # ++ optional config.${namespace}.programs.graphical.vscode.enable "code.desktop" + ++ optional config.${namespace}.programs.terminal.emulators.foot.enable "foot.desktop" + ++ optional config.${namespace}.programs.terminal.emulators.kitty.enable "kitty.desktop" ++ [ "org.gnome.Console.desktop" ] # FIX: references - # ++ optional config.khanelinix.programs.graphical.logseq.enable "logseq.desktop" - ++ optional config.khanelinix.programs.graphical.apps.discord.enable "discord.desktop" - ++ optional config.khanelinix.programs.graphical.apps.steam.enable "steam.desktop"; + # ++ optional config.${namespace}.programs.graphical.logseq.enable "logseq.desktop" + ++ optional config.${namespace}.programs.graphical.apps.discord.enable "discord.desktop" + ++ optional config.${namespace}.programs.graphical.apps.steam.enable "steam.desktop"; }; "org/gnome/desktop/background" = { @@ -207,8 +208,8 @@ in menu-button-icon-image = 23; menu-button-terminal = - if config.khanelinix.desktop.addons.term.enable then - getExe config.khanelinix.desktop.addons.term.pkg + if config.${namespace}.desktop.addons.term.enable then + getExe config.${namespace}.desktop.addons.term.pkg else getExe pkgs.gnome.gnome-terminal; }; @@ -316,7 +317,7 @@ in lib.optional (cfg.monitors != null) "L+ ${gdmHome}/.config/monitors.xml - - - - ${cfg.monitors}" ); - services.khanelinix-user-icon = { + services."${namespace}-user-icon" = { before = [ "display-manager.service" ]; wantedBy = [ "display-manager.service" ]; @@ -328,8 +329,10 @@ in script = # bash '' - config_file=/var/lib/AccountsService/users/${config.khanelinix.user.name} - icon_file=/run/current-system/sw/share/khanelinix.icons/user/${config.khanelinix.user.name}/${config.khanelinix.user.icon.fileName} + config_file=/var/lib/AccountsService/users/${config.${namespace}.user.name} + icon_file=/run/current-system/sw/share/${namespace}.icons/user/${config.${namespace}.user.name}/${ + config.${namespace}.user.icon.fileName + } if ! [ -d "$(dirname "$config_file")"]; then mkdir -p "$(dirname "$config_file")" diff --git a/modules/nixos/programs/graphical/file-managers/dolphin/default.nix b/modules/nixos/programs/graphical/file-managers/dolphin/default.nix index 030f10ef6..19a3c2fed 100644 --- a/modules/nixos/programs/graphical/file-managers/dolphin/default.nix +++ b/modules/nixos/programs/graphical/file-managers/dolphin/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.graphical.file-managers.dolphin; + cfg = config.${namespace}.programs.graphical.file-managers.dolphin; in { - options.khanelinix.programs.graphical.file-managers.dolphin = { + options.${namespace}.programs.graphical.file-managers.dolphin = { enable = mkBoolOpt false "Whether or not to enable Dolphin."; }; diff --git a/modules/nixos/programs/graphical/file-managers/nautilus/default.nix b/modules/nixos/programs/graphical/file-managers/nautilus/default.nix index 8107613e5..8d2ecab1e 100644 --- a/modules/nixos/programs/graphical/file-managers/nautilus/default.nix +++ b/modules/nixos/programs/graphical/file-managers/nautilus/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.graphical.file-managers.nautilus; + cfg = config.${namespace}.programs.graphical.file-managers.nautilus; in { - options.khanelinix.programs.graphical.file-managers.nautilus = { + options.${namespace}.programs.graphical.file-managers.nautilus = { enable = mkBoolOpt false "Whether to enable the gnome file manager."; }; diff --git a/modules/nixos/programs/graphical/file-managers/thunar/default.nix b/modules/nixos/programs/graphical/file-managers/thunar/default.nix index 6fe02ec14..f574c82b4 100644 --- a/modules/nixos/programs/graphical/file-managers/thunar/default.nix +++ b/modules/nixos/programs/graphical/file-managers/thunar/default.nix @@ -1,12 +1,17 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.graphical.file-managers.thunar; + cfg = config.${namespace}.programs.graphical.file-managers.thunar; in { - options.khanelinix.programs.graphical.file-managers.thunar = { + options.${namespace}.programs.graphical.file-managers.thunar = { enable = mkBoolOpt false "Whether to enable the xfce file manager."; }; diff --git a/modules/nixos/programs/graphical/wms/hyprland/default.nix b/modules/nixos/programs/graphical/wms/hyprland/default.nix index 0a492b288..429b87e4f 100644 --- a/modules/nixos/programs/graphical/wms/hyprland/default.nix +++ b/modules/nixos/programs/graphical/wms/hyprland/default.nix @@ -4,6 +4,7 @@ lib, pkgs, system, + namespace, ... }: let @@ -13,10 +14,10 @@ let mkIf types ; - inherit (lib.internal) mkBoolOpt mkOpt enabled; + inherit (lib.${namespace}) mkBoolOpt mkOpt enabled; inherit (inputs) hyprland; - cfg = config.khanelinix.programs.graphical.wms.hyprland; + cfg = config.${namespace}.programs.graphical.wms.hyprland; programs = makeBinPath ( with pkgs; @@ -30,7 +31,7 @@ let ); in { - options.khanelinix.programs.graphical.wms.hyprland = with types; { + options.${namespace}.programs.graphical.wms.hyprland = with types; { enable = mkBoolOpt false "Whether or not to enable Hyprland."; customConfigFiles = mkOpt attrs { } diff --git a/modules/nixos/programs/graphical/wms/sway/default.nix b/modules/nixos/programs/graphical/wms/sway/default.nix index 6aa892255..ccfcfd399 100644 --- a/modules/nixos/programs/graphical/wms/sway/default.nix +++ b/modules/nixos/programs/graphical/wms/sway/default.nix @@ -3,6 +3,7 @@ inputs, lib, pkgs, + namespace, ... }: let @@ -12,24 +13,24 @@ let getExe getExe' ; - inherit (lib.internal) + inherit (lib.${namespace}) mkBoolOpt mkOpt enabled fileWithText optionalString ; - inherit (config.khanelinix.desktop.addons) term; + inherit (config.${namespace}.desktop.addons) term; inherit (inputs) nixpkgs-wayland; - cfg = config.khanelinix.programs.graphical.wms.sway; + cfg = config.${namespace}.programs.graphical.wms.sway; substitutedConfig = pkgs.substituteAll { src = ./config; term = term.pkg.pname or term.pkg.name; }; in { - options.khanelinix.programs.graphical.wms.sway = with types; { + options.${namespace}.programs.graphical.wms.sway = with types; { enable = mkBoolOpt false "Whether or not to enable Sway."; extraConfig = mkOpt str "" "Additional configuration for the Sway config file."; wallpaper = mkOpt (nullOr package) null "The wallpaper to display."; diff --git a/modules/nixos/programs/terminal/tools/bandwhich/default.nix b/modules/nixos/programs/terminal/tools/bandwhich/default.nix index daccba115..fc47ef8e4 100644 --- a/modules/nixos/programs/terminal/tools/bandwhich/default.nix +++ b/modules/nixos/programs/terminal/tools/bandwhich/default.nix @@ -1,12 +1,17 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.terminal.tools.bandwhich; + cfg = config.${namespace}.programs.terminal.tools.bandwhich; in { - options.khanelinix.programs.terminal.tools.bandwhich = { + options.${namespace}.programs.terminal.tools.bandwhich = { enable = mkBoolOpt false "Whether or not to enable bandwhich."; }; diff --git a/modules/nixos/programs/terminal/tools/nix-ld/default.nix b/modules/nixos/programs/terminal/tools/nix-ld/default.nix index c78beb2ab..4374c4d39 100644 --- a/modules/nixos/programs/terminal/tools/nix-ld/default.nix +++ b/modules/nixos/programs/terminal/tools/nix-ld/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.programs.terminal.tools.nix-ld; + cfg = config.${namespace}.programs.terminal.tools.nix-ld; in { - options.khanelinix.programs.terminal.tools.nix-ld = { + options.${namespace}.programs.terminal.tools.nix-ld = { enable = mkBoolOpt false "Whether or not to enable nix-ld."; }; diff --git a/modules/nixos/programs/terminal/tools/qmk/default.nix b/modules/nixos/programs/terminal/tools/qmk/default.nix index 023f1b711..10a8cba1e 100644 --- a/modules/nixos/programs/terminal/tools/qmk/default.nix +++ b/modules/nixos/programs/terminal/tools/qmk/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.tools.qmk; + cfg = config.${namespace}.tools.qmk; in { - options.khanelinix.tools.qmk = { + options.${namespace}.tools.qmk = { enable = mkBoolOpt false "Whether or not to enable QMK"; }; diff --git a/modules/nixos/security/acme/default.nix b/modules/nixos/security/acme/default.nix index c122b9a71..e8fbe9761 100644 --- a/modules/nixos/security/acme/default.nix +++ b/modules/nixos/security/acme/default.nix @@ -2,18 +2,19 @@ config, lib, virtual, + namespace, ... }: let inherit (lib) mkIf mkEnableOption optional; - inherit (lib.internal) mkOpt; + inherit (lib.${namespace}) mkOpt; - cfg = config.khanelinix.security.acme; + cfg = config.${namespace}.security.acme; in { - options.khanelinix.security.acme = with lib.types; { + options.${namespace}.security.acme = with lib.types; { enable = mkEnableOption "default ACME configuration"; - email = mkOpt str config.khanelinix.user.email "The email to use."; + email = mkOpt str config.${namespace}.user.email "The email to use."; staging = mkOpt bool virtual "Whether to use the staging server or not."; }; diff --git a/modules/nixos/security/auditd/default.nix b/modules/nixos/security/auditd/default.nix index 94f6e2ae3..1465fcd5f 100644 --- a/modules/nixos/security/auditd/default.nix +++ b/modules/nixos/security/auditd/default.nix @@ -1,11 +1,16 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf mkEnableOption; - cfg = config.khanelinix.security.auditd; + cfg = config.${namespace}.security.auditd; in { - options.khanelinix.security.auditd = { + options.${namespace}.security.auditd = { enable = mkEnableOption "default auditd configuration"; }; diff --git a/modules/nixos/security/clamav/default.nix b/modules/nixos/security/clamav/default.nix index e7752fa0b..f6dc77911 100644 --- a/modules/nixos/security/clamav/default.nix +++ b/modules/nixos/security/clamav/default.nix @@ -1,11 +1,16 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf mkEnableOption; - cfg = config.khanelinix.security.clamav; + cfg = config.${namespace}.security.clamav; in { - options.khanelinix.security.clamav = { + options.${namespace}.security.clamav = { enable = mkEnableOption "default clamav configuration"; }; diff --git a/modules/nixos/security/doas/default.nix b/modules/nixos/security/doas/default.nix index 9a7c7adb9..a23e424f7 100644 --- a/modules/nixos/security/doas/default.nix +++ b/modules/nixos/security/doas/default.nix @@ -1,12 +1,17 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.security.doas; + cfg = config.${namespace}.security.doas; in { - options.khanelinix.security.doas = { + options.${namespace}.security.doas = { enable = mkBoolOpt false "Whether or not to replace sudo with doas."; }; @@ -27,7 +32,7 @@ in { keepEnv = true; noPass = true; - users = [ config.khanelinix.user.name ]; + users = [ config.${namespace}.user.name ]; } ]; }; diff --git a/modules/nixos/security/gpg/default.nix b/modules/nixos/security/gpg/default.nix index a7e6846c4..82e9cfbbe 100644 --- a/modules/nixos/security/gpg/default.nix +++ b/modules/nixos/security/gpg/default.nix @@ -3,6 +3,7 @@ lib, pkgs, inputs, + namespace, ... }: let @@ -12,10 +13,10 @@ let getExe getExe' ; - inherit (lib.internal) mkBoolOpt mkOpt; + inherit (lib.${namespace}) mkBoolOpt mkOpt; inherit (inputs) gpg-base-conf yubikey-guide; - cfg = config.khanelinix.security.gpg; + cfg = config.${namespace}.security.gpg; gpgConf = "${gpg-base-conf}/gpg.conf"; @@ -67,7 +68,7 @@ let ''; in { - options.khanelinix.security.gpg = with types; { + options.${namespace}.security.gpg = with types; { enable = mkBoolOpt false "Whether or not to enable GPG."; agentTimeout = mkOpt int 5 "The amount of time to wait before continuing with shell init."; }; diff --git a/modules/nixos/security/keyring/default.nix b/modules/nixos/security/keyring/default.nix index 619996c59..43a8e3588 100644 --- a/modules/nixos/security/keyring/default.nix +++ b/modules/nixos/security/keyring/default.nix @@ -1,12 +1,17 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.security.keyring; + cfg = config.${namespace}.security.keyring; in { - options.khanelinix.security.keyring = { + options.${namespace}.security.keyring = { enable = mkBoolOpt false "Whether to enable gnome keyring."; }; diff --git a/modules/nixos/security/polkit/default.nix b/modules/nixos/security/polkit/default.nix index cc40b2729..98489942d 100644 --- a/modules/nixos/security/polkit/default.nix +++ b/modules/nixos/security/polkit/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.security.polkit; + cfg = config.${namespace}.security.polkit; in { - options.khanelinix.security.polkit = { + options.${namespace}.security.polkit = { enable = mkBoolOpt false "Whether or not to enable polkit."; }; diff --git a/modules/nixos/security/pulse-secure/default.nix b/modules/nixos/security/pulse-secure/default.nix index f82b3bf0d..0aea0bde1 100644 --- a/modules/nixos/security/pulse-secure/default.nix +++ b/modules/nixos/security/pulse-secure/default.nix @@ -2,26 +2,27 @@ config, pkgs, lib, + namespace, ... }: let inherit (lib) getExe mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.security.pulse-secure; + cfg = config.${namespace}.security.pulse-secure; start-pulse-vpn = pkgs.writeShellScriptBin "start-pulse-vpn" # bash '' # Grab hostname from cli argument HOST="$1" - DSID=$(${getExe pkgs.khanelinix.pulse-cookie} -n DSID $HOST) + DSID=$(${getExe pkgs.${namespace}.pulse-cookie} -n DSID $HOST) # NOTE: can be pulse or nc sudo ${getExe pkgs.openconnect} --protocol pulse -C DSID=$DSID $HOST ''; in { - options.khanelinix.security.pulse-secure = { + options.${namespace}.security.pulse-secure = { enable = mkBoolOpt false "Whether to enable pulse-secure."; }; diff --git a/modules/nixos/security/sops/default.nix b/modules/nixos/security/sops/default.nix index 032d8de81..25eaea336 100644 --- a/modules/nixos/security/sops/default.nix +++ b/modules/nixos/security/sops/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf types; - inherit (lib.internal) mkBoolOpt mkOpt; + inherit (lib.${namespace}) mkBoolOpt mkOpt; - cfg = config.khanelinix.security.sops; + cfg = config.${namespace}.security.sops; in { - options.khanelinix.security.sops = with types; { + options.${namespace}.security.sops = with types; { enable = mkBoolOpt false "Whether to enable sops."; defaultSopsFile = mkOpt path null "Default sops file."; sshKeyPaths = mkOpt (listOf path) [ "/etc/ssh/ssh_host_ed25519_key" ] "SSH Key paths to use."; diff --git a/modules/nixos/security/sudo-rs/default.nix b/modules/nixos/security/sudo-rs/default.nix index f9791f7fb..38d143dcd 100644 --- a/modules/nixos/security/sudo-rs/default.nix +++ b/modules/nixos/security/sudo-rs/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.security.sudo-rs; + cfg = config.${namespace}.security.sudo-rs; in { - options.khanelinix.security.sudo-rs = { + options.${namespace}.security.sudo-rs = { enable = mkBoolOpt false "Whether or not to replace sudo with sudo-rs."; }; @@ -25,7 +26,7 @@ in # extraRules = [ # { # noPass = true; - # users = [ config.khanelinix.user.name ]; + # users = [ config.${namespace}.user.name ]; # } # ]; }; diff --git a/modules/nixos/security/usbguard/default.nix b/modules/nixos/security/usbguard/default.nix index 3bc529f75..e1a647f74 100644 --- a/modules/nixos/security/usbguard/default.nix +++ b/modules/nixos/security/usbguard/default.nix @@ -1,11 +1,16 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf mkEnableOption; - cfg = config.khanelinix.security.usbguard; + cfg = config.${namespace}.security.usbguard; in { - options.khanelinix.security.usbguard = { + options.${namespace}.security.usbguard = { enable = mkEnableOption "default usbguard configuration"; }; diff --git a/modules/nixos/services/avahi/default.nix b/modules/nixos/services/avahi/default.nix index 044334b6f..241939813 100644 --- a/modules/nixos/services/avahi/default.nix +++ b/modules/nixos/services/avahi/default.nix @@ -1,11 +1,16 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let - cfg = config.khanelinix.services.avahi; + cfg = config.${namespace}.services.avahi; inherit (lib) mkEnableOption mkIf; in { - options.khanelinix.services.avahi = { + options.${namespace}.services.avahi = { enable = mkEnableOption "Avahi"; }; diff --git a/modules/nixos/services/barrier/default.nix b/modules/nixos/services/barrier/default.nix index a83eb03fa..97b9b3c94 100644 --- a/modules/nixos/services/barrier/default.nix +++ b/modules/nixos/services/barrier/default.nix @@ -2,15 +2,16 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkEnableOption mkIf; - cfg = config.khanelinix.services.barrier; + cfg = config.${namespace}.services.barrier; in { - options.khanelinix.services.barrier = { + options.${namespace}.services.barrier = { enable = mkEnableOption "barrier"; }; diff --git a/modules/nixos/services/cloudflared/default.nix b/modules/nixos/services/cloudflared/default.nix index 91560105b..74d1e053b 100644 --- a/modules/nixos/services/cloudflared/default.nix +++ b/modules/nixos/services/cloudflared/default.nix @@ -2,16 +2,17 @@ lib, pkgs, config, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.services.cloudflared; + cfg = config.${namespace}.services.cloudflared; in { - options.khanelinix.services.cloudflared = { + options.${namespace}.services.cloudflared = { enable = mkBoolOpt false "Whether or not to configure cloudflared"; }; @@ -20,7 +21,7 @@ in # assertions = [ # { # assertion = cfg.autoconnect.enable -> cfg.autoconnect.key != ""; - # message = "khanelinix.services.cloudflared.autoconnect.key must be set"; + # message = "${namespace}.services.cloudflared.autoconnect.key must be set"; # } # ]; diff --git a/modules/nixos/services/ddc/default.nix b/modules/nixos/services/ddc/default.nix index e8ddaaf3c..4627c0d0c 100644 --- a/modules/nixos/services/ddc/default.nix +++ b/modules/nixos/services/ddc/default.nix @@ -2,16 +2,17 @@ lib, pkgs, config, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.services.ddccontrol; + cfg = config.${namespace}.services.ddccontrol; in { - options.khanelinix.services.ddccontrol = { + options.${namespace}.services.ddccontrol = { enable = mkBoolOpt false "Whether or not to configure ddccontrol"; }; diff --git a/modules/nixos/services/geoclue/default.nix b/modules/nixos/services/geoclue/default.nix index 32ff4243b..39af888bb 100644 --- a/modules/nixos/services/geoclue/default.nix +++ b/modules/nixos/services/geoclue/default.nix @@ -1,12 +1,17 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.services.geoclue; + cfg = config.${namespace}.services.geoclue; in { - options.khanelinix.services.geoclue = { + options.${namespace}.services.geoclue = { enable = mkBoolOpt false "Whether or not to configure geoclue support."; }; diff --git a/modules/nixos/services/logrotate/default.nix b/modules/nixos/services/logrotate/default.nix index 554ced9ac..3497ea0da 100644 --- a/modules/nixos/services/logrotate/default.nix +++ b/modules/nixos/services/logrotate/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.services.logrotate; + cfg = config.${namespace}.services.logrotate; in { - options.khanelinix.services.logrotate = { + options.${namespace}.services.logrotate = { enable = mkBoolOpt false "Whether or not to configure logrotate."; }; diff --git a/modules/nixos/services/oomd/default.nix b/modules/nixos/services/oomd/default.nix index 008dc4ba3..023dbd8f2 100644 --- a/modules/nixos/services/oomd/default.nix +++ b/modules/nixos/services/oomd/default.nix @@ -1,12 +1,17 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.services.oomd; + cfg = config.${namespace}.services.oomd; in { - options.khanelinix.services.oomd = { + options.${namespace}.services.oomd = { enable = mkBoolOpt false "Whether or not to configure oomd."; }; diff --git a/modules/nixos/services/openssh/default.nix b/modules/nixos/services/openssh/default.nix index d3a7c72b8..331ee53b5 100644 --- a/modules/nixos/services/openssh/default.nix +++ b/modules/nixos/services/openssh/default.nix @@ -4,6 +4,7 @@ host, inputs, lib, + namespace, ... }: let @@ -13,28 +14,28 @@ let foldl optionalString ; - inherit (lib.internal) mkBoolOpt mkOpt; + inherit (lib.${namespace}) mkBoolOpt mkOpt; - cfg = config.khanelinix.services.openssh; + cfg = config.${namespace}.services.openssh; # @TODO(jakehamilton): This is a hold-over from an earlier Snowfall Lib version which used # the specialArg `name` to provide the host name. name = host; - user = config.users.users.${config.khanelinix.user.name}; + user = config.users.users.${config.${namespace}.user.name}; user-id = builtins.toString user.uid; default-key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJAZIwy7nkz8CZYR/ZTSNr+7lRBW2AYy1jw06b44zaID"; other-hosts = lib.filterAttrs ( - key: host: key != name && (host.config.khanelinix.user.name or null) != null + key: host: key != name && (host.config.${namespace}.user.name or null) != null ) ((inputs.self.nixosConfigurations or { }) // (inputs.self.darwinConfigurations or { })); other-hosts-config = lib.concatMapStringsSep "\n" ( name: let remote = other-hosts.${name}; - remote-user-name = remote.config.khanelinix.user.name; + remote-user-name = remote.config.${namespace}.user.name; remote-user-id = builtins.toString remote.config.users.users.${remote-user-name}.uid; forward-gpg = @@ -60,7 +61,7 @@ let ) (builtins.attrNames other-hosts); in { - options.khanelinix.services.openssh = with types; { + options.${namespace}.services.openssh = with types; { enable = mkBoolOpt false "Whether or not to configure OpenSSH support."; authorizedKeys = mkOpt (listOf str) [ default-key ] "The public keys to apply."; extraConfig = mkOpt str "" "Extra configuration to apply."; diff --git a/modules/nixos/services/power/default.nix b/modules/nixos/services/power/default.nix index b05beeb4f..b8efe81bb 100644 --- a/modules/nixos/services/power/default.nix +++ b/modules/nixos/services/power/default.nix @@ -1,12 +1,17 @@ -{ lib, config, ... }: +{ + lib, + config, + namespace, + ... +}: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.services.power; + cfg = config.${namespace}.services.power; in { - options.khanelinix.services.power = { + options.${namespace}.services.power = { enable = mkBoolOpt false "Whether or not to configure power profiles"; }; diff --git a/modules/nixos/services/printing/default.nix b/modules/nixos/services/printing/default.nix index 36b009f99..526ca2dfd 100644 --- a/modules/nixos/services/printing/default.nix +++ b/modules/nixos/services/printing/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.services.printing; + cfg = config.${namespace}.services.printing; in { - options.khanelinix.services.printing = { + options.${namespace}.services.printing = { enable = mkBoolOpt false "Whether or not to configure printing support."; }; diff --git a/modules/nixos/services/samba/default.nix b/modules/nixos/services/samba/default.nix index c444370ca..d80eb42b3 100644 --- a/modules/nixos/services/samba/default.nix +++ b/modules/nixos/services/samba/default.nix @@ -1,4 +1,9 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mapAttrs @@ -7,9 +12,9 @@ let optionalAttrs types ; - inherit (lib.internal) mkBoolOpt mkOpt; + inherit (lib.${namespace}) mkBoolOpt mkOpt; - cfg = config.khanelinix.services.samba; + cfg = config.${namespace}.services.samba; bool-to-yes-no = value: if value then "yes" else "no"; @@ -24,7 +29,7 @@ let browseable = mkBoolOpt true "Whether the share is browseable."; comment = mkOpt str name "An optional comment."; read-only = mkBoolOpt false "Whether the share should be read only."; - only-owner-editable = mkBoolOpt false "Whether the share is only writable by the system owner (khanelinix.user.name)."; + only-owner-editable = mkBoolOpt false "Whether the share is only writable by the system owner (${namespace}.user.name)."; extra-config = mkOpt attrs { } "Extra configuration options for the share."; }; @@ -32,7 +37,7 @@ let ); in { - options.khanelinix.services.samba = with types; { + options.${namespace}.services.samba = with types; { enable = mkEnableOption "Samba"; browseable = mkBoolOpt true "Whether the shares are browseable."; workgroup = mkOpt str "WORKGROUP" "The workgroup to use."; @@ -69,7 +74,7 @@ in "read only" = bool-to-yes-no value.read-only; } // (optionalAttrs value.only-owner-editable { - "write list" = config.khanelinix.user.name; + "write list" = config.${namespace}.user.name; "read list" = "guest, nobody"; "create mask" = "0755"; "directory mask" = "0755"; @@ -83,7 +88,7 @@ in # sambaUserSetup = { # text = '' # PATH=$PATH:${lib.makeBinPath [ pkgs.samba ]} - # pdbedit -i smbpasswd:/home/${config.khanelinix.user.name}/smbpasswd -e tdbsam:/var/lib/samba/private/passdb.tdb + # pdbedit -i smbpasswd:/home/${config.${namespace}.user.name}/smbpasswd -e tdbsam:/var/lib/samba/private/passdb.tdb # ''; # deps = [ ]; # }; diff --git a/modules/nixos/services/snapper/default.nix b/modules/nixos/services/snapper/default.nix index 15f9515e7..f02aca6c6 100644 --- a/modules/nixos/services/snapper/default.nix +++ b/modules/nixos/services/snapper/default.nix @@ -1,6 +1,11 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let - cfg = config.khanelinix.services.snapper; + cfg = config.${namespace}.services.snapper; safeStr = types.strMatching "[^\n\"]*" // { description = "string without line breaks or quotes"; @@ -10,7 +15,7 @@ let inherit (lib) types mkEnableOption mkIf; in { - options.khanelinix.services.snapper = { + options.${namespace}.services.snapper = { enable = mkEnableOption "snapper"; configs = lib.mkOption { diff --git a/modules/nixos/services/spice-vdagentd/default.nix b/modules/nixos/services/spice-vdagentd/default.nix index 94fef577a..7574cf262 100644 --- a/modules/nixos/services/spice-vdagentd/default.nix +++ b/modules/nixos/services/spice-vdagentd/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf getExe'; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.services.spice-vdagentd; + cfg = config.${namespace}.services.spice-vdagentd; in { - options.khanelinix.services.spice-vdagentd = { + options.${namespace}.services.spice-vdagentd = { enable = mkBoolOpt false "Whether or not to configure spice-vdagent support."; }; diff --git a/modules/nixos/services/spice-webdav/default.nix b/modules/nixos/services/spice-webdav/default.nix index bda027c11..92a994bc2 100644 --- a/modules/nixos/services/spice-webdav/default.nix +++ b/modules/nixos/services/spice-webdav/default.nix @@ -2,6 +2,7 @@ config, pkgs, lib, + namespace, ... }: let @@ -11,12 +12,12 @@ let mkOption getExe' ; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.services.spice-webdav; + cfg = config.${namespace}.services.spice-webdav; in { - options.khanelinix.services.spice-webdav = with types; { + options.${namespace}.services.spice-webdav = with types; { enable = mkBoolOpt false "Whether or not to configure spice-webdav proxy support."; package = mkOption { default = pkgs.phodav; diff --git a/modules/nixos/services/tailscale/default.nix b/modules/nixos/services/tailscale/default.nix index 3cbb6e865..06ec5e96b 100644 --- a/modules/nixos/services/tailscale/default.nix +++ b/modules/nixos/services/tailscale/default.nix @@ -2,17 +2,18 @@ lib, pkgs, config, + namespace, ... }: let inherit (lib) types mkIf; inherit (lib.modules) mkBefore; - inherit (lib.internal) mkBoolOpt mkOpt; + inherit (lib.${namespace}) mkBoolOpt mkOpt; - cfg = config.khanelinix.services.tailscale; + cfg = config.${namespace}.services.tailscale; in { - options.khanelinix.services.tailscale = with types; { + options.${namespace}.services.tailscale = with types; { enable = mkBoolOpt false "Whether or not to configure Tailscale"; autoconnect = { enable = mkBoolOpt false "Whether or not to enable automatic connection to Tailscale"; @@ -24,7 +25,7 @@ in assertions = [ { assertion = cfg.autoconnect.enable -> cfg.autoconnect.key != ""; - message = "khanelinix.services.tailscale.autoconnect.key must be set"; + message = "${namespace}.services.tailscale.autoconnect.key must be set"; } ]; diff --git a/modules/nixos/suites/art/default.nix b/modules/nixos/suites/art/default.nix index 175eac97e..4e18b45fb 100644 --- a/modules/nixos/suites/art/default.nix +++ b/modules/nixos/suites/art/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.suites.art; + cfg = config.${namespace}.suites.art; in { - options.khanelinix.suites.art = { + options.${namespace}.suites.art = { enable = mkBoolOpt false "Whether or not to enable art configuration."; }; diff --git a/modules/nixos/suites/common/default.nix b/modules/nixos/suites/common/default.nix index 67c355317..fa99888b0 100644 --- a/modules/nixos/suites/common/default.nix +++ b/modules/nixos/suites/common/default.nix @@ -2,24 +2,25 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) enabled; + inherit (lib.${namespace}) enabled; - cfg = config.khanelinix.suites.common; + cfg = config.${namespace}.suites.common; in { - imports = [ ../../../shared/suites/common/default.nix ]; + imports = [ (lib.snowfall.fs.get-file "modules/shared/suites/common/default.nix") ]; config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ appimage-run clac feh - khanelinix.trace-symlink - khanelinix.trace-which + pkgs.${namespace}.trace-symlink + pkgs.${namespace}.trace-which ncdu toilet tree diff --git a/modules/nixos/suites/desktop/default.nix b/modules/nixos/suites/desktop/default.nix index a2d37cbb9..eaa417108 100644 --- a/modules/nixos/suites/desktop/default.nix +++ b/modules/nixos/suites/desktop/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt enabled; + inherit (lib.${namespace}) mkBoolOpt enabled; - cfg = config.khanelinix.suites.desktop; + cfg = config.${namespace}.suites.desktop; in { - options.khanelinix.suites.desktop = { + options.${namespace}.suites.desktop = { enable = mkBoolOpt false "Whether or not to enable common desktop configuration."; }; @@ -25,7 +26,7 @@ in fontpreview gparted keepass - pkgs.khanelinix.pocketcasts + pkgs.${namespace}.pocketcasts ]; # TODO: what does this set that makes it default diff --git a/modules/nixos/suites/development/default.nix b/modules/nixos/suites/development/default.nix index 84b516356..64757e356 100644 --- a/modules/nixos/suites/development/default.nix +++ b/modules/nixos/suites/development/default.nix @@ -1,12 +1,17 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.suites.development; + cfg = config.${namespace}.suites.development; in { - options.khanelinix.suites.development = { + options.${namespace}.suites.development = { enable = mkBoolOpt false "Whether or not to enable common development configuration."; azureEnable = mkBoolOpt false "Whether or not to enable azure development configuration."; dockerEnable = mkBoolOpt false "Whether or not to enable docker development configuration."; diff --git a/modules/nixos/suites/games/default.nix b/modules/nixos/suites/games/default.nix index 7d73b7124..8fc835a71 100644 --- a/modules/nixos/suites/games/default.nix +++ b/modules/nixos/suites/games/default.nix @@ -1,12 +1,17 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt enabled; + inherit (lib.${namespace}) mkBoolOpt enabled; - cfg = config.khanelinix.suites.games; + cfg = config.${namespace}.suites.games; in { - options.khanelinix.suites.games = { + options.${namespace}.suites.games = { enable = mkBoolOpt false "Whether or not to enable common games configuration."; }; diff --git a/modules/nixos/suites/social/default.nix b/modules/nixos/suites/social/default.nix index 1d4302f61..82378f216 100644 --- a/modules/nixos/suites/social/default.nix +++ b/modules/nixos/suites/social/default.nix @@ -2,15 +2,16 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt enabled; - cfg = config.khanelinix.suites.social; + inherit (lib.${namespace}) mkBoolOpt enabled; + cfg = config.${namespace}.suites.social; in { - options.khanelinix.suites.social = { + options.${namespace}.suites.social = { enable = mkBoolOpt false "Whether or not to enable social configuration."; }; diff --git a/modules/nixos/suites/video/default.nix b/modules/nixos/suites/video/default.nix index ad581ff70..8942e041e 100644 --- a/modules/nixos/suites/video/default.nix +++ b/modules/nixos/suites/video/default.nix @@ -1,12 +1,17 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.suites.video; + cfg = config.${namespace}.suites.video; in { - options.khanelinix.suites.video = { + options.${namespace}.suites.video = { enable = mkBoolOpt false "Whether or not to enable video configuration."; }; diff --git a/modules/nixos/suites/vm/default.nix b/modules/nixos/suites/vm/default.nix index f66799ffe..319733708 100644 --- a/modules/nixos/suites/vm/default.nix +++ b/modules/nixos/suites/vm/default.nix @@ -1,12 +1,17 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt enabled; + inherit (lib.${namespace}) mkBoolOpt enabled; - cfg = config.khanelinix.suites.vm; + cfg = config.${namespace}.suites.vm; in { - options.khanelinix.suites.vm = { + options.${namespace}.suites.vm = { enable = mkBoolOpt false "Whether or not to enable common vm configuration."; }; diff --git a/modules/nixos/suites/wlroots/default.nix b/modules/nixos/suites/wlroots/default.nix index afe5ade7f..d0802aee4 100644 --- a/modules/nixos/suites/wlroots/default.nix +++ b/modules/nixos/suites/wlroots/default.nix @@ -3,17 +3,18 @@ inputs, system, lib, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; inherit (inputs) nixpkgs-wayland; - cfg = config.khanelinix.suites.wlroots; + cfg = config.${namespace}.suites.wlroots; in { - options.khanelinix.suites.wlroots = { + options.${namespace}.suites.wlroots = { enable = mkBoolOpt false "Whether or not to enable common wlroots configuration."; }; diff --git a/modules/nixos/system/boot/default.nix b/modules/nixos/system/boot/default.nix index 939dd9640..022900dd6 100644 --- a/modules/nixos/system/boot/default.nix +++ b/modules/nixos/system/boot/default.nix @@ -2,17 +2,18 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.system.boot; - themeCfg = config.khanelinix.theme; + cfg = config.${namespace}.system.boot; + themeCfg = config.${namespace}.theme; in { - options.khanelinix.system.boot = { + options.${namespace}.system.boot = { enable = mkBoolOpt false "Whether or not to enable booting."; plymouth = mkBoolOpt false "Whether or not to enable plymouth boot splash."; secureBoot = mkBoolOpt false "Whether or not to enable secure boot."; diff --git a/modules/nixos/system/env/default.nix b/modules/nixos/system/env/default.nix index 64333fdf3..a126f2cb2 100644 --- a/modules/nixos/system/env/default.nix +++ b/modules/nixos/system/env/default.nix @@ -1,4 +1,9 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) types @@ -8,10 +13,10 @@ let mapAttrs ; - cfg = config.khanelinix.system.env; + cfg = config.${namespace}.system.env; in { - options.khanelinix.system.env = + options.${namespace}.system.env = with types; mkOption { apply = mapAttrs (_n: v: if isList v then concatMapStringsSep ":" toString v else (toString v)); diff --git a/modules/nixos/system/fonts/default.nix b/modules/nixos/system/fonts/default.nix index 8e413185a..a27597e28 100644 --- a/modules/nixos/system/fonts/default.nix +++ b/modules/nixos/system/fonts/default.nix @@ -2,12 +2,13 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf mapAttrs; - cfg = config.khanelinix.system.fonts; + cfg = config.${namespace}.system.fonts; in { imports = [ ../../../shared/system/fonts/default.nix ]; diff --git a/modules/nixos/system/locale/default.nix b/modules/nixos/system/locale/default.nix index 79be2e7d8..779638609 100644 --- a/modules/nixos/system/locale/default.nix +++ b/modules/nixos/system/locale/default.nix @@ -1,12 +1,17 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf mkForce; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.system.locale; + cfg = config.${namespace}.system.locale; in { - options.khanelinix.system.locale = { + options.${namespace}.system.locale = { enable = mkBoolOpt false "Whether or not to manage locale settings."; }; diff --git a/modules/nixos/system/networking/default.nix b/modules/nixos/system/networking/default.nix index 43cbd0333..ebf251721 100644 --- a/modules/nixos/system/networking/default.nix +++ b/modules/nixos/system/networking/default.nix @@ -2,6 +2,7 @@ config, lib, pkgs, + namespace, ... }: let @@ -11,12 +12,12 @@ let mkDefault mkForce ; - inherit (lib.internal) mkBoolOpt mkOpt; + inherit (lib.${namespace}) mkBoolOpt mkOpt; - cfg = config.khanelinix.system.networking; + cfg = config.${namespace}.system.networking; in { - options.khanelinix.system.networking = with types; { + options.${namespace}.system.networking = with types; { enable = mkBoolOpt false "Whether or not to enable networking support"; hosts = mkOpt attrs { } "An attribute set to merge with "; optimizeTcp = mkBoolOpt false "Optimize TCP connections"; @@ -214,7 +215,7 @@ in }; # let me configure tailscale manually - "20-tailscale-ignore" = mkIf config.khanelinix.services.tailscale.enable { + "20-tailscale-ignore" = mkIf config.${namespace}.services.tailscale.enable { matchConfig.Name = "tailscale*"; linkConfig = { Unmanaged = "yes"; diff --git a/modules/nixos/system/realtime/default.nix b/modules/nixos/system/realtime/default.nix index 83a2781b5..b8e604691 100644 --- a/modules/nixos/system/realtime/default.nix +++ b/modules/nixos/system/realtime/default.nix @@ -1,12 +1,17 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.system.realtime; + cfg = config.${namespace}.system.realtime; in { - options.khanelinix.system.realtime = { + options.${namespace}.system.realtime = { enable = mkBoolOpt false "Whether or not to configure xkb."; }; @@ -16,7 +21,7 @@ in # tldr: realtime processes have higher priority than normal processes # and that's a good thing users = { - users."${config.khanelinix.user.name}".extraGroups = [ "realtime" ]; + users."${config.${namespace}.user.name}".extraGroups = [ "realtime" ]; groups.realtime = { }; }; diff --git a/modules/nixos/system/time/default.nix b/modules/nixos/system/time/default.nix index 8cde4b3e8..983053672 100644 --- a/modules/nixos/system/time/default.nix +++ b/modules/nixos/system/time/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.system.time; + cfg = config.${namespace}.system.time; in { - options.khanelinix.system.time = { + options.${namespace}.system.time = { enable = mkBoolOpt false "Whether or not to configure time related settings."; }; diff --git a/modules/nixos/system/xkb/default.nix b/modules/nixos/system/xkb/default.nix index 16c2595e5..e30adcb7a 100644 --- a/modules/nixos/system/xkb/default.nix +++ b/modules/nixos/system/xkb/default.nix @@ -1,12 +1,17 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.system.xkb; + cfg = config.${namespace}.system.xkb; in { - options.khanelinix.system.xkb = { + options.${namespace}.system.xkb = { enable = mkBoolOpt false "Whether or not to configure xkb."; }; diff --git a/modules/nixos/theme/default.nix b/modules/nixos/theme/default.nix index a7c656d53..a2396e47e 100644 --- a/modules/nixos/theme/default.nix +++ b/modules/nixos/theme/default.nix @@ -2,6 +2,7 @@ config, lib, pkgs, + namespace, ... }: let @@ -11,9 +12,9 @@ let mkOption types ; - inherit (lib.internal) mkOpt; + inherit (lib.${namespace}) mkOpt; - cfg = config.khanelinix.theme; + cfg = config.${namespace}.theme; catppuccinAccents = [ "rosewater" @@ -40,7 +41,7 @@ let in { # TODO: consolidate home-manager and nixos module - options.khanelinix.theme = { + options.${namespace}.theme = { enable = mkEnableOption "Enable custom theme use for applications."; cursor = { diff --git a/modules/nixos/theme/gtk/default.nix b/modules/nixos/theme/gtk/default.nix index 20fb4061a..2d5296e26 100644 --- a/modules/nixos/theme/gtk/default.nix +++ b/modules/nixos/theme/gtk/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) types mkIf; - inherit (lib.internal) mkBoolOpt mkOpt; + inherit (lib.${namespace}) mkBoolOpt mkOpt; - cfg = config.khanelinix.theme.gtk; + cfg = config.${namespace}.theme.gtk; in { - options.khanelinix.theme.gtk = with types; { + options.${namespace}.theme.gtk = with types; { enable = mkBoolOpt false "Whether to customize GTK and apply themes."; theme = { diff --git a/modules/nixos/theme/qt/default.nix b/modules/nixos/theme/qt/default.nix index de4c7d0f2..a9349192d 100644 --- a/modules/nixos/theme/qt/default.nix +++ b/modules/nixos/theme/qt/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) types mkIf; - inherit (lib.internal) mkBoolOpt mkOpt; + inherit (lib.${namespace}) mkBoolOpt mkOpt; - cfg = config.khanelinix.theme.qt; + cfg = config.${namespace}.theme.qt; in { - options.khanelinix.theme.qt = with types; { + options.${namespace}.theme.qt = with types; { enable = mkBoolOpt false "Whether to customize qt and apply themes."; theme = { @@ -28,7 +29,7 @@ in systemPackages = with pkgs; [ cfg.theme.package ] - ++ lib.optional config.khanelinix.suites.wlroots.enable libsForQt5.qt5.qtwayland; + ++ lib.optional config.${namespace}.suites.wlroots.enable libsForQt5.qt5.qtwayland; }; qt = { diff --git a/modules/nixos/user/default.nix b/modules/nixos/user/default.nix index f2adc61e2..6b1361f83 100644 --- a/modules/nixos/user/default.nix +++ b/modules/nixos/user/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) types; - inherit (lib.internal) mkOpt; + inherit (lib.${namespace}) mkOpt; - cfg = config.khanelinix.user; + cfg = config.${namespace}.user; in { - options.khanelinix.user = with types; { + options.${namespace}.user = with types; { email = mkOpt str "khaneliman12@gmail.com" "The email of the user."; extraGroups = mkOpt (listOf str) [ ] "Groups for the user to be assigned."; extraOptions = mkOpt attrs { } "Extra options passed to ."; diff --git a/modules/nixos/virtualisation/kvm/default.nix b/modules/nixos/virtualisation/kvm/default.nix index 48223cdd6..176fcddb6 100644 --- a/modules/nixos/virtualisation/kvm/default.nix +++ b/modules/nixos/virtualisation/kvm/default.nix @@ -2,6 +2,7 @@ config, lib, pkgs, + namespace, ... }: let @@ -13,13 +14,13 @@ let concatStringsSep getExe ; - inherit (lib.internal) mkBoolOpt mkOpt enabled; - inherit (config.khanelinix) user; + inherit (lib.${namespace}) mkBoolOpt mkOpt enabled; + inherit (config.${namespace}) user; - cfg = config.khanelinix.virtualisation.kvm; + cfg = config.${namespace}.virtualisation.kvm; in { - options.khanelinix.virtualisation.kvm = with types; { + options.${namespace}.virtualisation.kvm = with types; { enable = mkBoolOpt false "Whether or not to enable KVM virtualisation."; # Use `machinectl` and then `machinectl status ` to # get the unit "*.scope" of the virtual machine. diff --git a/modules/nixos/virtualisation/podman/default.nix b/modules/nixos/virtualisation/podman/default.nix index 7c03d1a52..b8369c3f3 100644 --- a/modules/nixos/virtualisation/podman/default.nix +++ b/modules/nixos/virtualisation/podman/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.virtualisation.podman; + cfg = config.${namespace}.virtualisation.podman; in { - options.khanelinix.virtualisation.podman = { + options.${namespace}.virtualisation.podman = { enable = mkBoolOpt false "Whether or not to enable Podman."; }; diff --git a/modules/shared/nix/default.nix b/modules/shared/nix/default.nix index c7bc1f80c..313a30191 100644 --- a/modules/shared/nix/default.nix +++ b/modules/shared/nix/default.nix @@ -3,6 +3,7 @@ inputs, lib, pkgs, + namespace, ... }: let @@ -16,12 +17,12 @@ let pipe types ; - inherit (lib.internal) mkBoolOpt mkOpt; + inherit (lib.${namespace}) mkBoolOpt mkOpt; - cfg = config.khanelinix.nix; + cfg = config.${namespace}.nix; in { - options.khanelinix.nix = with types; { + options.${namespace}.nix = with types; { enable = mkBoolOpt true "Whether or not to manage nix configuration."; package = mkOpt package pkgs.nixVersions.latest "Which nix package to use."; }; @@ -65,7 +66,7 @@ in "root" "@wheel" "nix-builder" - config.khanelinix.user.name + config.${namespace}.user.name ]; in { diff --git a/modules/shared/suites/common/default.nix b/modules/shared/suites/common/default.nix index 5e4888cbf..b4efb796e 100644 --- a/modules/shared/suites/common/default.nix +++ b/modules/shared/suites/common/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) mkIf; - inherit (lib.internal) mkBoolOpt; + inherit (lib.${namespace}) mkBoolOpt; - cfg = config.khanelinix.suites.common; + cfg = config.${namespace}.suites.common; in { - options.khanelinix.suites.common = { + options.${namespace}.suites.common = { enable = mkBoolOpt false "Whether or not to enable common configuration."; }; diff --git a/modules/shared/system/fonts/default.nix b/modules/shared/system/fonts/default.nix index 699271ff8..6b2e7cfba 100644 --- a/modules/shared/system/fonts/default.nix +++ b/modules/shared/system/fonts/default.nix @@ -2,16 +2,17 @@ config, lib, pkgs, + namespace, ... }: let inherit (lib) types mkIf; - inherit (lib.internal) mkBoolOpt mkOpt enabled; + inherit (lib.${namespace}) mkBoolOpt mkOpt enabled; - cfg = config.khanelinix.system.fonts; + cfg = config.${namespace}.system.fonts; in { - options.khanelinix.system.fonts = with types; { + options.${namespace}.system.fonts = with types; { enable = mkBoolOpt false "Whether or not to manage fonts."; fonts = with pkgs; diff --git a/packages/pulse-cookie/default.nix b/packages/pulse-cookie/default.nix index 41547f887..4817c2ddd 100644 --- a/packages/pulse-cookie/default.nix +++ b/packages/pulse-cookie/default.nix @@ -51,5 +51,6 @@ python3.pkgs.buildPythonApplication rec { description = "wrapper around openconnect allowing user to log in through a webkit window for mfa"; mainProgram = "get-pulse-cookie"; license = licenses.gpl3; + platforms = platforms.linux; }; } diff --git a/packages/trace-which/default.nix b/packages/trace-which/default.nix index ba03930a0..ce61b9b09 100644 --- a/packages/trace-which/default.nix +++ b/packages/trace-which/default.nix @@ -2,6 +2,7 @@ writeShellApplication, pkgs, lib, + namespace, ... }: writeShellApplication { @@ -15,6 +16,6 @@ writeShellApplication { text = # bash '' - a=$(which "$1") && exec ${lib.getExe pkgs.khanelinix.trace-symlink} "$a" + a=$(which "$1") && exec ${lib.getExe pkgs.${namespace}.trace-symlink} "$a" ''; } diff --git a/packages/wallpapers/default.nix b/packages/wallpapers/default.nix index 1444b6025..1a7ab1e85 100644 --- a/packages/wallpapers/default.nix +++ b/packages/wallpapers/default.nix @@ -1,4 +1,9 @@ -{ pkgs, lib, ... }: +{ + pkgs, + lib, + namespace, + ... +}: let images = builtins.attrNames (builtins.readDir ./wallpapers); mkWallpaper = @@ -36,7 +41,7 @@ let installTarget = "$out/share/wallpapers"; in pkgs.stdenvNoCC.mkDerivation { - name = "khanelinix.wallpapers"; + name = "${namespace}.wallpapers"; src = ./wallpapers; installPhase = # bash diff --git a/packages/yabai-helper/default.nix b/packages/yabai-helper/default.nix index 59c98a141..404ec93f8 100644 --- a/packages/yabai-helper/default.nix +++ b/packages/yabai-helper/default.nix @@ -2,6 +2,7 @@ writeShellApplication, pkgs, lib, + namespace, ... }: let @@ -219,7 +220,7 @@ writeShellApplication { yabai -m window "$YABAI_WINDOW_ID" --space "$2" fi yabai -m space --focus "$2" - set_wallpaper ${pkgs.khanelinix.wallpapers}/share/wallpapers/$(ls ${pkgs.khanelinix.wallpapers}/share/wallpapers/ | shuf -n 1) + set_wallpaper ${pkgs.${namespace}.wallpapers}/share/wallpapers/$(ls ${pkgs.${namespace}.wallpapers}/share/wallpapers/ | shuf -n 1) return 0 fi @@ -232,7 +233,7 @@ writeShellApplication { echo "$i" yabai -m space --create yabai -m space --focus "$i" - set_wallpaper ${pkgs.khanelinix.wallpapers}/share/wallpapers/$(ls ${pkgs.khanelinix.wallpapers}/share/wallpapers/ | shuf -n 1) + set_wallpaper ${pkgs.${namespace}.wallpapers}/share/wallpapers/$(ls ${pkgs.${namespace}.wallpapers}/share/wallpapers/ | shuf -n 1) done yabai -m space "$CURRENT_SPACE" --focus @@ -244,7 +245,7 @@ writeShellApplication { set_wallpapers() { if [[ $(command -v yabai) ]]; then - LOCAL_WALLPAPERS="$(realpath ${pkgs.khanelinix.wallpapers}/share/wallpapers/)" + LOCAL_WALLPAPERS="$(realpath ${pkgs.${namespace}.wallpapers}/share/wallpapers/)" yabai -m space --focus 1 diff --git a/shells/default/default.nix b/shells/default/default.nix index f5cfa568d..6b3fbc91e 100644 --- a/shells/default/default.nix +++ b/shells/default/default.nix @@ -3,6 +3,7 @@ mkShell, pkgs, system, + namespace, ... }: let @@ -30,7 +31,7 @@ mkShell { shellHook = '' ${inputs.self.checks.${system}.pre-commit-check.shellHook} - echo 🔨 Welcome to khanelinix + echo 🔨 Welcome to ${namespace} ''; diff --git a/shells/dotnet/default.nix b/shells/dotnet/default.nix index b83cfb1b6..6b00d64f3 100644 --- a/shells/dotnet/default.nix +++ b/shells/dotnet/default.nix @@ -34,7 +34,6 @@ mkShell { dotnet_8.sdk ] ) - azure-cli dotnetbuildhelpers netcoredbg powershell @@ -47,7 +46,10 @@ mkShell { mono msbuild ] - ++ lib.optionals pkgs.stdenv.isLinux [ bicep ]; + ++ lib.optionals pkgs.stdenv.isLinux [ + azure-cli + bicep + ]; shellHook = '' diff --git a/shells/nix/default.nix b/shells/nix/default.nix index 18e6eec4b..018954319 100644 --- a/shells/nix/default.nix +++ b/shells/nix/default.nix @@ -3,6 +3,7 @@ mkShell, pkgs, system, + namespace, ... }: let @@ -30,7 +31,7 @@ mkShell { ]; shellHook = '' - echo 🔨 Welcome to khanelinix + echo 🔨 Welcome to ${namespace} ''; diff --git a/systems/aarch64-darwin/khanelimac/default.nix b/systems/aarch64-darwin/khanelimac/default.nix index 93f1c482d..a3170929b 100644 --- a/systems/aarch64-darwin/khanelimac/default.nix +++ b/systems/aarch64-darwin/khanelimac/default.nix @@ -1,8 +1,13 @@ -{ lib, config, ... }: +{ + lib, + config, + namespace, + ... +}: let - inherit (lib.internal) enabled; + inherit (lib.${namespace}) enabled; - cfg = config.khanelinix.user; + cfg = config.${namespace}.user; in { khanelinix = { diff --git a/systems/aarch64-linux/nixos/default.nix b/systems/aarch64-linux/nixos/default.nix index 3c30c6bce..83f388924 100644 --- a/systems/aarch64-linux/nixos/default.nix +++ b/systems/aarch64-linux/nixos/default.nix @@ -1,6 +1,6 @@ -{ lib, ... }: +{ lib, namespace, ... }: let - inherit (lib.internal) enabled; + inherit (lib.${namespace}) enabled; in { imports = [ ./hardware.nix ]; diff --git a/systems/x86_64-install-iso/graphical/default.nix b/systems/x86_64-install-iso/graphical/default.nix index cef9a64a0..92388e586 100644 --- a/systems/x86_64-install-iso/graphical/default.nix +++ b/systems/x86_64-install-iso/graphical/default.nix @@ -1,7 +1,12 @@ -{ pkgs, lib, ... }: +{ + pkgs, + lib, + namespace, + ... +}: let inherit (lib) mkForce; - inherit (lib.internal) enabled; + inherit (lib.${namespace}) enabled; in { # `install-iso` adds wireless support that diff --git a/systems/x86_64-install-iso/minimal/default.nix b/systems/x86_64-install-iso/minimal/default.nix index 6ce67c5f7..0851d4e6d 100644 --- a/systems/x86_64-install-iso/minimal/default.nix +++ b/systems/x86_64-install-iso/minimal/default.nix @@ -1,7 +1,12 @@ -{ pkgs, lib, ... }: +{ + pkgs, + lib, + namespace, + ... +}: let inherit (lib) mkForce; - inherit (lib.internal) enabled; + inherit (lib.${namespace}) enabled; in { # `install-iso` adds wireless support that diff --git a/systems/x86_64-iso/isolated/default.nix b/systems/x86_64-iso/isolated/default.nix index cb8008480..15ec50810 100644 --- a/systems/x86_64-iso/isolated/default.nix +++ b/systems/x86_64-iso/isolated/default.nix @@ -1,7 +1,12 @@ -{ lib, pkgs, ... }: +{ + lib, + pkgs, + namespace, + ... +}: let inherit (lib) mkForce getExe getExe'; - inherit (lib.internal) enabled; + inherit (lib.${namespace}) enabled; gpgConf = pkgs.fetchurl { url = "https://raw.githubusercontent.com/drduh/config/master/gpg.conf"; diff --git a/systems/x86_64-iso/rescue/default.nix b/systems/x86_64-iso/rescue/default.nix index 27b890e41..76277890c 100644 --- a/systems/x86_64-iso/rescue/default.nix +++ b/systems/x86_64-iso/rescue/default.nix @@ -1,6 +1,11 @@ -{ pkgs, lib, ... }: +{ + pkgs, + lib, + namespace, + ... +}: let - inherit (lib.internal) enabled; + inherit (lib.${namespace}) enabled; in { environment.systemPackages = with pkgs; [ diff --git a/systems/x86_64-linux/CORE-PW00LM92/default.nix b/systems/x86_64-linux/CORE-PW00LM92/default.nix index fcddc520a..cd82e8b3b 100644 --- a/systems/x86_64-linux/CORE-PW00LM92/default.nix +++ b/systems/x86_64-linux/CORE-PW00LM92/default.nix @@ -1,7 +1,7 @@ -{ lib, ... }: +{ lib, namespace, ... }: let inherit (lib) mkForce; - inherit (lib.internal) enabled disabled; + inherit (lib.${namespace}) enabled disabled; in { imports = [ ./hardware.nix ]; @@ -25,7 +25,7 @@ in sops = { enable = true; sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; - defaultSopsFile = ../../../secrets/CORE/default.yaml; + defaultSopsFile = lib.snowfall.fs.get-file "secrets/CORE/default.yaml"; }; }; diff --git a/systems/x86_64-linux/khanelilab/default.nix b/systems/x86_64-linux/khanelilab/default.nix index c917b4dbc..070ba1cc4 100644 --- a/systems/x86_64-linux/khanelilab/default.nix +++ b/systems/x86_64-linux/khanelilab/default.nix @@ -1,6 +1,11 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let - inherit (lib.internal) enabled; + inherit (lib.${namespace}) enabled; in { imports = [ ./hardware.nix ]; @@ -110,7 +115,7 @@ in sops = { enable = true; sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; - defaultSopsFile = ../../../secrets/khanelilab/default.yaml; + defaultSopsFile = lib.snowfall.fs.get-file secrets/khanelilab/default.yaml; }; }; diff --git a/systems/x86_64-linux/khanelinix/default.nix b/systems/x86_64-linux/khanelinix/default.nix index 7c76fb7f6..d70b41cc1 100644 --- a/systems/x86_64-linux/khanelinix/default.nix +++ b/systems/x86_64-linux/khanelinix/default.nix @@ -1,6 +1,11 @@ -{ config, lib, ... }: +{ + config, + lib, + namespace, + ... +}: let - inherit (lib.internal) enabled; + inherit (lib.${namespace}) enabled; in { imports = [ @@ -119,7 +124,7 @@ in # TODO: make part of ssh config proper extraConfig = '' Host server - User ${config.khanelinix.user.name} + User ${config.${namespace}.user.name} Hostname austinserver.local ''; }; @@ -132,7 +137,7 @@ in browseable = true; comment = "Home Public folder"; only-owner-editable = false; - path = "/home/${config.khanelinix.user.name}/Public/"; + path = "/home/${config.${namespace}.user.name}/Public/"; public = true; read-only = false; }; @@ -156,7 +161,7 @@ in sops = { enable = true; sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; - defaultSopsFile = ../../../secrets/khanelinix/default.yaml; + defaultSopsFile = lib.snowfall.fs.get-file "secrets/khanelinix/default.yaml"; }; sudo-rs = enabled; }; diff --git a/systems/x86_64-linux/nixos/default.nix b/systems/x86_64-linux/nixos/default.nix index be809a113..d5ca09a51 100644 --- a/systems/x86_64-linux/nixos/default.nix +++ b/systems/x86_64-linux/nixos/default.nix @@ -1,6 +1,6 @@ -{ lib, ... }: +{ lib, namespace, ... }: let - inherit (lib.internal) enabled; + inherit (lib.${namespace}) enabled; in { imports = [ ./hardware.nix ]; @@ -41,7 +41,7 @@ in sops = { enable = true; sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; - defaultSopsFile = ../../../secrets/nixos/default.yaml; + defaultSopsFile = lib.snowfall.fs.get-file "secrets/nixos/default.yaml"; }; };