From 0e4c4464389c9b4b90aa1f090497035cfab8f431 Mon Sep 17 00:00:00 2001 From: matt1432 Date: Sat, 28 Oct 2023 18:20:09 -0400 Subject: [PATCH] refactor: change hosts to devices and separate hm modules from nix modules --- common/default.nix | 19 +++++++++-------- common/{hostvars.nix => device-vars.nix} | 4 ++-- common/{modules => home}/bash/config/bashrc | 0 .../bash/config/colorgrid.sh | 0 .../bash/config/dracula/fzf.sh | 0 .../bash/config/dracula/less.sh | 0 common/{modules => home}/bash/default.nix | 2 -- common/{modules => home}/bash/programs.nix | 2 -- common/{modules => home}/git.nix | 2 -- common/{modules => home}/neovim/base.vim | 0 common/{modules => home}/neovim/default.nix | 4 +--- .../neovim/plugins/autopairs.lua | 0 .../neovim/plugins/dracula.vim | 0 .../neovim/plugins/indent.lua | 0 .../neovim/plugins/lualine.lua | 0 .../{modules => home}/neovim/plugins/mini.lua | 0 .../neovim/plugins/neotree.lua | 0 .../neovim/plugins/neotree.vim | 0 .../neovim/plugins/snippets.vim | 0 .../neovim/plugins/treesitter.vim | 0 common/{modules => home}/tmux.nix | 2 -- {hosts => devices}/binto/default.nix | 8 +++---- .../binto/hardware-configuration.nix | 0 {hosts => devices}/binto/modules/desktop.nix | 0 .../binto/modules/nix-gaming.nix | 0 {hosts => devices}/binto/modules/nvidia.nix | 0 .../wim/config/ags/.eslintrc.yml | 0 .../wim/config/ags/.stylelintrc.yml | 0 .../wim/config/ags/bin/heart.sh | 0 .../wim/config/ags/bin/launch-app.sh | 0 .../wim/config/ags/bin/osk-toggle.sh | 0 .../wim/config/ags/bin/qs-toggles.sh | 0 .../wim/config/ags/bin/startup.sh | 0 .../wim/config/ags/bin/tablet-toggle.sh | 0 {hosts => devices}/wim/config/ags/config.js | 0 {hosts => devices}/wim/config/ags/imports.js | 0 .../wim/config/ags/js/applauncher/main.js | 0 .../wim/config/ags/js/bar/audio.js | 0 .../wim/config/ags/js/bar/battery.js | 0 .../wim/config/ags/js/bar/brightness.js | 0 .../wim/config/ags/js/bar/clock.js | 0 .../wim/config/ags/js/bar/current-window.js | 0 .../wim/config/ags/js/bar/fullscreen.js | 0 .../wim/config/ags/js/bar/gesture.js | 0 .../wim/config/ags/js/bar/heart.js | 0 .../wim/config/ags/js/bar/keyboard-layout.js | 0 .../wim/config/ags/js/bar/main.js | 0 .../wim/config/ags/js/bar/notif-button.js | 0 .../wim/config/ags/js/bar/osk-toggle.js | 0 .../wim/config/ags/js/bar/quick-settings.js | 0 .../wim/config/ags/js/bar/systray.js | 0 .../wim/config/ags/js/bar/tablet-toggle.js | 0 .../wim/config/ags/js/bar/workspaces.js | 0 {hosts => devices}/wim/config/ags/js/date.js | 0 .../wim/config/ags/js/media-player/gesture.js | 0 .../wim/config/ags/js/media-player/mpris.js | 0 .../wim/config/ags/js/media-player/player.js | 0 .../wim/config/ags/js/misc/closer.js | 0 .../wim/config/ags/js/misc/cursorbox.js | 0 .../wim/config/ags/js/misc/popup.js | 0 .../wim/config/ags/js/misc/separator.js | 0 .../wim/config/ags/js/notifications/base.js | 0 .../wim/config/ags/js/notifications/center.js | 0 .../config/ags/js/notifications/gesture.js | 4 ++-- .../wim/config/ags/js/notifications/popup.js | 0 .../wim/config/ags/js/overview/clients.js | 0 .../wim/config/ags/js/overview/dragndrop.js | 0 .../wim/config/ags/js/overview/main.js | 0 .../wim/config/ags/js/overview/variables.js | 0 .../wim/config/ags/js/overview/workspaces.js | 0 .../wim/config/ags/js/powermenu.js | 0 .../ags/js/quick-settings/button-grid.js | 0 .../wim/config/ags/js/quick-settings/main.js | 0 .../ags/js/quick-settings/slider-box.js | 0 .../ags/js/quick-settings/toggle-button.js | 0 .../wim/config/ags/js/screen-corners.js | 0 .../wim/config/ags/package.json | 0 .../wim/config/ags/scss/common.scss | 0 .../wim/config/ags/scss/main.scss | 0 .../config/ags/scss/widgets/applauncher.scss | 0 .../wim/config/ags/scss/widgets/corners.scss | 0 .../wim/config/ags/scss/widgets/date.scss | 0 .../ags/scss/widgets/notification-center.scss | 0 .../config/ags/scss/widgets/notification.scss | 0 .../wim/config/ags/scss/widgets/overview.scss | 0 .../wim/config/ags/scss/widgets/player.scss | 0 .../config/ags/scss/widgets/powermenu.scss | 0 .../ags/scss/widgets/quick-settings.scss | 0 .../wim/config/ags/scss/widgets/systray.scss | 0 .../config/ags/scss/widgets/traybuttons.scss | 0 .../config/ags/scss/widgets/workspaces.scss | 0 .../wim/config/ags/services/pointers.js | 0 {hosts => devices}/wim/config/dolphinrc | 0 .../wim/config/gtklock/scripts/blur.sh | 0 .../wim/config/gtklock/scripts/lock.sh | 0 .../wim/config/gtklock/style.css | 0 {hosts => devices}/wim/config/hypr/main.conf | 0 .../wim/config/hypr/scripts/autorotate.sh | 0 .../wim/config/hypr/scripts/lisgd.sh | 0 {hosts => devices}/wim/config/kdeglobals | 0 {hosts => devices}/wim/config/kiorc | 0 {hosts => devices}/wim/config/mimeapps.list | 0 .../wim/config/neofetch/config.conf | 0 {hosts => devices}/wim/config/swappy/config | 0 .../wim/config/swayosd/style.css | 0 {hosts => devices}/wim/default.nix | 21 +++++++++---------- .../wim/hardware-configuration.nix | 0 .../modules => devices/wim/home}/dotfiles.nix | 2 +- {hosts => devices}/wim/home/hyprland.nix | 2 +- {hosts => devices}/wim/home/packages.nix | 0 {hosts => devices}/wim/modules/desktop.nix | 0 {hosts => devices}/wim/modules/security.nix | 0 flake.nix | 5 +++-- {modules => home}/alacritty.nix | 4 +--- {modules => home}/dconf.nix | 2 -- {modules => home}/firefox/addons/addons.json | 0 {modules => home}/firefox/addons/default.nix | 0 .../addons/generated-firefox-addons.nix | 0 .../firefox/addons/seventv_settings.json | 0 {modules => home}/firefox/custom.css | 0 {modules => home}/firefox/default.nix | 0 .../firefox/firefox-gx/default.nix | 0 .../firefox/firefox-gx/ogx_left-sidebar.css | 0 .../firefox/firefox-gx/ogx_menu.css | 0 {modules => home}/theme.nix | 2 +- {modules => home}/wofi/default.nix | 2 -- {modules => home}/wofi/style.css | 0 127 files changed, 36 insertions(+), 51 deletions(-) rename common/{hostvars.nix => device-vars.nix} (74%) rename common/{modules => home}/bash/config/bashrc (100%) rename common/{modules => home}/bash/config/colorgrid.sh (100%) rename common/{modules => home}/bash/config/dracula/fzf.sh (100%) rename common/{modules => home}/bash/config/dracula/less.sh (100%) rename common/{modules => home}/bash/default.nix (99%) rename common/{modules => home}/bash/programs.nix (97%) rename common/{modules => home}/git.nix (96%) rename common/{modules => home}/neovim/base.vim (100%) rename common/{modules => home}/neovim/default.nix (98%) rename common/{modules => home}/neovim/plugins/autopairs.lua (100%) rename common/{modules => home}/neovim/plugins/dracula.vim (100%) rename common/{modules => home}/neovim/plugins/indent.lua (100%) rename common/{modules => home}/neovim/plugins/lualine.lua (100%) rename common/{modules => home}/neovim/plugins/mini.lua (100%) rename common/{modules => home}/neovim/plugins/neotree.lua (100%) rename common/{modules => home}/neovim/plugins/neotree.vim (100%) rename common/{modules => home}/neovim/plugins/snippets.vim (100%) rename common/{modules => home}/neovim/plugins/treesitter.vim (100%) rename common/{modules => home}/tmux.nix (97%) rename {hosts => devices}/binto/default.nix (89%) rename {hosts => devices}/binto/hardware-configuration.nix (100%) rename {hosts => devices}/binto/modules/desktop.nix (100%) rename {hosts => devices}/binto/modules/nix-gaming.nix (100%) rename {hosts => devices}/binto/modules/nvidia.nix (100%) rename {hosts => devices}/wim/config/ags/.eslintrc.yml (100%) rename {hosts => devices}/wim/config/ags/.stylelintrc.yml (100%) rename {hosts => devices}/wim/config/ags/bin/heart.sh (100%) rename {hosts => devices}/wim/config/ags/bin/launch-app.sh (100%) rename {hosts => devices}/wim/config/ags/bin/osk-toggle.sh (100%) rename {hosts => devices}/wim/config/ags/bin/qs-toggles.sh (100%) rename {hosts => devices}/wim/config/ags/bin/startup.sh (100%) rename {hosts => devices}/wim/config/ags/bin/tablet-toggle.sh (100%) rename {hosts => devices}/wim/config/ags/config.js (100%) rename {hosts => devices}/wim/config/ags/imports.js (100%) rename {hosts => devices}/wim/config/ags/js/applauncher/main.js (100%) rename {hosts => devices}/wim/config/ags/js/bar/audio.js (100%) rename {hosts => devices}/wim/config/ags/js/bar/battery.js (100%) rename {hosts => devices}/wim/config/ags/js/bar/brightness.js (100%) rename {hosts => devices}/wim/config/ags/js/bar/clock.js (100%) rename {hosts => devices}/wim/config/ags/js/bar/current-window.js (100%) rename {hosts => devices}/wim/config/ags/js/bar/fullscreen.js (100%) rename {hosts => devices}/wim/config/ags/js/bar/gesture.js (100%) rename {hosts => devices}/wim/config/ags/js/bar/heart.js (100%) rename {hosts => devices}/wim/config/ags/js/bar/keyboard-layout.js (100%) rename {hosts => devices}/wim/config/ags/js/bar/main.js (100%) rename {hosts => devices}/wim/config/ags/js/bar/notif-button.js (100%) rename {hosts => devices}/wim/config/ags/js/bar/osk-toggle.js (100%) rename {hosts => devices}/wim/config/ags/js/bar/quick-settings.js (100%) rename {hosts => devices}/wim/config/ags/js/bar/systray.js (100%) rename {hosts => devices}/wim/config/ags/js/bar/tablet-toggle.js (100%) rename {hosts => devices}/wim/config/ags/js/bar/workspaces.js (100%) rename {hosts => devices}/wim/config/ags/js/date.js (100%) rename {hosts => devices}/wim/config/ags/js/media-player/gesture.js (100%) rename {hosts => devices}/wim/config/ags/js/media-player/mpris.js (100%) rename {hosts => devices}/wim/config/ags/js/media-player/player.js (100%) rename {hosts => devices}/wim/config/ags/js/misc/closer.js (100%) rename {hosts => devices}/wim/config/ags/js/misc/cursorbox.js (100%) rename {hosts => devices}/wim/config/ags/js/misc/popup.js (100%) rename {hosts => devices}/wim/config/ags/js/misc/separator.js (100%) rename {hosts => devices}/wim/config/ags/js/notifications/base.js (100%) rename {hosts => devices}/wim/config/ags/js/notifications/center.js (100%) rename {hosts => devices}/wim/config/ags/js/notifications/gesture.js (97%) rename {hosts => devices}/wim/config/ags/js/notifications/popup.js (100%) rename {hosts => devices}/wim/config/ags/js/overview/clients.js (100%) rename {hosts => devices}/wim/config/ags/js/overview/dragndrop.js (100%) rename {hosts => devices}/wim/config/ags/js/overview/main.js (100%) rename {hosts => devices}/wim/config/ags/js/overview/variables.js (100%) rename {hosts => devices}/wim/config/ags/js/overview/workspaces.js (100%) rename {hosts => devices}/wim/config/ags/js/powermenu.js (100%) rename {hosts => devices}/wim/config/ags/js/quick-settings/button-grid.js (100%) rename {hosts => devices}/wim/config/ags/js/quick-settings/main.js (100%) rename {hosts => devices}/wim/config/ags/js/quick-settings/slider-box.js (100%) rename {hosts => devices}/wim/config/ags/js/quick-settings/toggle-button.js (100%) rename {hosts => devices}/wim/config/ags/js/screen-corners.js (100%) rename {hosts => devices}/wim/config/ags/package.json (100%) rename {hosts => devices}/wim/config/ags/scss/common.scss (100%) rename {hosts => devices}/wim/config/ags/scss/main.scss (100%) rename {hosts => devices}/wim/config/ags/scss/widgets/applauncher.scss (100%) rename {hosts => devices}/wim/config/ags/scss/widgets/corners.scss (100%) rename {hosts => devices}/wim/config/ags/scss/widgets/date.scss (100%) rename {hosts => devices}/wim/config/ags/scss/widgets/notification-center.scss (100%) rename {hosts => devices}/wim/config/ags/scss/widgets/notification.scss (100%) rename {hosts => devices}/wim/config/ags/scss/widgets/overview.scss (100%) rename {hosts => devices}/wim/config/ags/scss/widgets/player.scss (100%) rename {hosts => devices}/wim/config/ags/scss/widgets/powermenu.scss (100%) rename {hosts => devices}/wim/config/ags/scss/widgets/quick-settings.scss (100%) rename {hosts => devices}/wim/config/ags/scss/widgets/systray.scss (100%) rename {hosts => devices}/wim/config/ags/scss/widgets/traybuttons.scss (100%) rename {hosts => devices}/wim/config/ags/scss/widgets/workspaces.scss (100%) rename {hosts => devices}/wim/config/ags/services/pointers.js (100%) rename {hosts => devices}/wim/config/dolphinrc (100%) rename {hosts => devices}/wim/config/gtklock/scripts/blur.sh (100%) rename {hosts => devices}/wim/config/gtklock/scripts/lock.sh (100%) rename {hosts => devices}/wim/config/gtklock/style.css (100%) rename {hosts => devices}/wim/config/hypr/main.conf (100%) rename {hosts => devices}/wim/config/hypr/scripts/autorotate.sh (100%) rename {hosts => devices}/wim/config/hypr/scripts/lisgd.sh (100%) rename {hosts => devices}/wim/config/kdeglobals (100%) rename {hosts => devices}/wim/config/kiorc (100%) rename {hosts => devices}/wim/config/mimeapps.list (100%) rename {hosts => devices}/wim/config/neofetch/config.conf (100%) rename {hosts => devices}/wim/config/swappy/config (100%) rename {hosts => devices}/wim/config/swayosd/style.css (100%) rename {hosts => devices}/wim/default.nix (79%) rename {hosts => devices}/wim/hardware-configuration.nix (100%) rename {hosts/wim/modules => devices/wim/home}/dotfiles.nix (95%) rename {hosts => devices}/wim/home/hyprland.nix (97%) rename {hosts => devices}/wim/home/packages.nix (100%) rename {hosts => devices}/wim/modules/desktop.nix (100%) rename {hosts => devices}/wim/modules/security.nix (100%) rename {modules => home}/alacritty.nix (96%) rename {modules => home}/dconf.nix (94%) rename {modules => home}/firefox/addons/addons.json (100%) rename {modules => home}/firefox/addons/default.nix (100%) rename {modules => home}/firefox/addons/generated-firefox-addons.nix (100%) rename {modules => home}/firefox/addons/seventv_settings.json (100%) rename {modules => home}/firefox/custom.css (100%) rename {modules => home}/firefox/default.nix (100%) rename {modules => home}/firefox/firefox-gx/default.nix (100%) rename {modules => home}/firefox/firefox-gx/ogx_left-sidebar.css (100%) rename {modules => home}/firefox/firefox-gx/ogx_menu.css (100%) rename {modules => home}/theme.nix (97%) rename {modules => home}/wofi/default.nix (93%) rename {modules => home}/wofi/style.css (100%) diff --git a/common/default.nix b/common/default.nix index 49948e1..141d702 100644 --- a/common/default.nix +++ b/common/default.nix @@ -13,13 +13,14 @@ }: { imports = [ ./cachix.nix + ./overlays + ./device-vars.nix + home-manager.nixosModules.default nh.nixosModules.default + ./modules/programs.nix ./modules/locale.nix - ./overlays - - ./hostvars.nix ]; nixpkgs.config.allowUnfree = true; @@ -64,14 +65,14 @@ default = { imports = [ nur.hmModules.nur - ./modules/bash - ./modules/git.nix - ./modules/neovim - ./modules/tmux.nix + ./home/bash + ./home/git.nix + ./home/neovim + ./home/tmux.nix - ./hostvars.nix + ./device-vars.nix ({ osConfig, ... }: { - services.hostvars = osConfig.services.hostvars; + services.device-vars = osConfig.services.device-vars; }) ]; diff --git a/common/hostvars.nix b/common/device-vars.nix similarity index 74% rename from common/hostvars.nix rename to common/device-vars.nix index 6eaa1c1..ef89ae4 100644 --- a/common/hostvars.nix +++ b/common/device-vars.nix @@ -1,5 +1,5 @@ { lib, ... }: { - options.services.hostvars = with lib; { + options.services.device-vars = with lib; { username = mkOption { description = '' Username that was defined at the initial setup process @@ -9,7 +9,7 @@ configDir = mkOption { description = '' - The path to where most of the hosts' configs are in the .nix folder + The path to where most of the devices' configs are in the .nix folder ''; type = types.nullOr types.str; }; diff --git a/common/modules/bash/config/bashrc b/common/home/bash/config/bashrc similarity index 100% rename from common/modules/bash/config/bashrc rename to common/home/bash/config/bashrc diff --git a/common/modules/bash/config/colorgrid.sh b/common/home/bash/config/colorgrid.sh similarity index 100% rename from common/modules/bash/config/colorgrid.sh rename to common/home/bash/config/colorgrid.sh diff --git a/common/modules/bash/config/dracula/fzf.sh b/common/home/bash/config/dracula/fzf.sh similarity index 100% rename from common/modules/bash/config/dracula/fzf.sh rename to common/home/bash/config/dracula/fzf.sh diff --git a/common/modules/bash/config/dracula/less.sh b/common/home/bash/config/dracula/less.sh similarity index 100% rename from common/modules/bash/config/dracula/less.sh rename to common/home/bash/config/dracula/less.sh diff --git a/common/modules/bash/default.nix b/common/home/bash/default.nix similarity index 99% rename from common/modules/bash/default.nix rename to common/home/bash/default.nix index 5c3d56b..2bd780b 100644 --- a/common/modules/bash/default.nix +++ b/common/home/bash/default.nix @@ -1,5 +1,3 @@ -# Home-manager module - { config, lib, ... }: { imports = [ ./programs.nix diff --git a/common/modules/bash/programs.nix b/common/home/bash/programs.nix similarity index 97% rename from common/modules/bash/programs.nix rename to common/home/bash/programs.nix index 1007f49..e5143c2 100644 --- a/common/modules/bash/programs.nix +++ b/common/home/bash/programs.nix @@ -1,5 +1,3 @@ -# Home-manager module - { pkgs, ... }: { programs = { fzf = { diff --git a/common/modules/git.nix b/common/home/git.nix similarity index 96% rename from common/modules/git.nix rename to common/home/git.nix index 7cbff66..842f699 100644 --- a/common/modules/git.nix +++ b/common/home/git.nix @@ -1,5 +1,3 @@ -# Home-manager module - { pkgs, ... }: { programs = { diff --git a/common/modules/neovim/base.vim b/common/home/neovim/base.vim similarity index 100% rename from common/modules/neovim/base.vim rename to common/home/neovim/base.vim diff --git a/common/modules/neovim/default.nix b/common/home/neovim/default.nix similarity index 98% rename from common/modules/neovim/default.nix rename to common/home/neovim/default.nix index e48cd16..b6069ba 100644 --- a/common/modules/neovim/default.nix +++ b/common/home/neovim/default.nix @@ -1,5 +1,3 @@ -# Home-manager module - { pkgs, lib, ... }: let # installs a vim plugin from git with a given tag / branch plugin = owner: repo: rev: hash: pkgs.vimUtils.buildVimPlugin { @@ -11,7 +9,7 @@ }; fileContents = lib.strings.fileContents; in { - # TODO: make a gradle module and have java in hostvars.nix + # TODO: make a gradle module and have java in device-vars.nix xdg.dataFile = { ".gradle/gradle.properties".source = pkgs.writeText "gradle.properties" '' diff --git a/common/modules/neovim/plugins/autopairs.lua b/common/home/neovim/plugins/autopairs.lua similarity index 100% rename from common/modules/neovim/plugins/autopairs.lua rename to common/home/neovim/plugins/autopairs.lua diff --git a/common/modules/neovim/plugins/dracula.vim b/common/home/neovim/plugins/dracula.vim similarity index 100% rename from common/modules/neovim/plugins/dracula.vim rename to common/home/neovim/plugins/dracula.vim diff --git a/common/modules/neovim/plugins/indent.lua b/common/home/neovim/plugins/indent.lua similarity index 100% rename from common/modules/neovim/plugins/indent.lua rename to common/home/neovim/plugins/indent.lua diff --git a/common/modules/neovim/plugins/lualine.lua b/common/home/neovim/plugins/lualine.lua similarity index 100% rename from common/modules/neovim/plugins/lualine.lua rename to common/home/neovim/plugins/lualine.lua diff --git a/common/modules/neovim/plugins/mini.lua b/common/home/neovim/plugins/mini.lua similarity index 100% rename from common/modules/neovim/plugins/mini.lua rename to common/home/neovim/plugins/mini.lua diff --git a/common/modules/neovim/plugins/neotree.lua b/common/home/neovim/plugins/neotree.lua similarity index 100% rename from common/modules/neovim/plugins/neotree.lua rename to common/home/neovim/plugins/neotree.lua diff --git a/common/modules/neovim/plugins/neotree.vim b/common/home/neovim/plugins/neotree.vim similarity index 100% rename from common/modules/neovim/plugins/neotree.vim rename to common/home/neovim/plugins/neotree.vim diff --git a/common/modules/neovim/plugins/snippets.vim b/common/home/neovim/plugins/snippets.vim similarity index 100% rename from common/modules/neovim/plugins/snippets.vim rename to common/home/neovim/plugins/snippets.vim diff --git a/common/modules/neovim/plugins/treesitter.vim b/common/home/neovim/plugins/treesitter.vim similarity index 100% rename from common/modules/neovim/plugins/treesitter.vim rename to common/home/neovim/plugins/treesitter.vim diff --git a/common/modules/tmux.nix b/common/home/tmux.nix similarity index 97% rename from common/modules/tmux.nix rename to common/home/tmux.nix index 569c152..9a35844 100644 --- a/common/modules/tmux.nix +++ b/common/home/tmux.nix @@ -1,5 +1,3 @@ -# Home-manager module - { pkgs, ... }: { programs = { tmux = { diff --git a/hosts/binto/default.nix b/devices/binto/default.nix similarity index 89% rename from hosts/binto/default.nix rename to devices/binto/default.nix index db08264..39d30aa 100644 --- a/hosts/binto/default.nix +++ b/devices/binto/default.nix @@ -12,7 +12,7 @@ ./modules/nvidia.nix ]; - services.hostvars = { + services.device-vars = { username = "matt"; fontSize = 10.0; }; @@ -33,9 +33,9 @@ matt = { imports = [ - ../../modules/alacritty.nix - ../../modules/dconf.nix - ../../modules/firefox + ../../home/alacritty.nix + ../../home/dconf.nix + ../../home/firefox ]; # No touchy diff --git a/hosts/binto/hardware-configuration.nix b/devices/binto/hardware-configuration.nix similarity index 100% rename from hosts/binto/hardware-configuration.nix rename to devices/binto/hardware-configuration.nix diff --git a/hosts/binto/modules/desktop.nix b/devices/binto/modules/desktop.nix similarity index 100% rename from hosts/binto/modules/desktop.nix rename to devices/binto/modules/desktop.nix diff --git a/hosts/binto/modules/nix-gaming.nix b/devices/binto/modules/nix-gaming.nix similarity index 100% rename from hosts/binto/modules/nix-gaming.nix rename to devices/binto/modules/nix-gaming.nix diff --git a/hosts/binto/modules/nvidia.nix b/devices/binto/modules/nvidia.nix similarity index 100% rename from hosts/binto/modules/nvidia.nix rename to devices/binto/modules/nvidia.nix diff --git a/hosts/wim/config/ags/.eslintrc.yml b/devices/wim/config/ags/.eslintrc.yml similarity index 100% rename from hosts/wim/config/ags/.eslintrc.yml rename to devices/wim/config/ags/.eslintrc.yml diff --git a/hosts/wim/config/ags/.stylelintrc.yml b/devices/wim/config/ags/.stylelintrc.yml similarity index 100% rename from hosts/wim/config/ags/.stylelintrc.yml rename to devices/wim/config/ags/.stylelintrc.yml diff --git a/hosts/wim/config/ags/bin/heart.sh b/devices/wim/config/ags/bin/heart.sh similarity index 100% rename from hosts/wim/config/ags/bin/heart.sh rename to devices/wim/config/ags/bin/heart.sh diff --git a/hosts/wim/config/ags/bin/launch-app.sh b/devices/wim/config/ags/bin/launch-app.sh similarity index 100% rename from hosts/wim/config/ags/bin/launch-app.sh rename to devices/wim/config/ags/bin/launch-app.sh diff --git a/hosts/wim/config/ags/bin/osk-toggle.sh b/devices/wim/config/ags/bin/osk-toggle.sh similarity index 100% rename from hosts/wim/config/ags/bin/osk-toggle.sh rename to devices/wim/config/ags/bin/osk-toggle.sh diff --git a/hosts/wim/config/ags/bin/qs-toggles.sh b/devices/wim/config/ags/bin/qs-toggles.sh similarity index 100% rename from hosts/wim/config/ags/bin/qs-toggles.sh rename to devices/wim/config/ags/bin/qs-toggles.sh diff --git a/hosts/wim/config/ags/bin/startup.sh b/devices/wim/config/ags/bin/startup.sh similarity index 100% rename from hosts/wim/config/ags/bin/startup.sh rename to devices/wim/config/ags/bin/startup.sh diff --git a/hosts/wim/config/ags/bin/tablet-toggle.sh b/devices/wim/config/ags/bin/tablet-toggle.sh similarity index 100% rename from hosts/wim/config/ags/bin/tablet-toggle.sh rename to devices/wim/config/ags/bin/tablet-toggle.sh diff --git a/hosts/wim/config/ags/config.js b/devices/wim/config/ags/config.js similarity index 100% rename from hosts/wim/config/ags/config.js rename to devices/wim/config/ags/config.js diff --git a/hosts/wim/config/ags/imports.js b/devices/wim/config/ags/imports.js similarity index 100% rename from hosts/wim/config/ags/imports.js rename to devices/wim/config/ags/imports.js diff --git a/hosts/wim/config/ags/js/applauncher/main.js b/devices/wim/config/ags/js/applauncher/main.js similarity index 100% rename from hosts/wim/config/ags/js/applauncher/main.js rename to devices/wim/config/ags/js/applauncher/main.js diff --git a/hosts/wim/config/ags/js/bar/audio.js b/devices/wim/config/ags/js/bar/audio.js similarity index 100% rename from hosts/wim/config/ags/js/bar/audio.js rename to devices/wim/config/ags/js/bar/audio.js diff --git a/hosts/wim/config/ags/js/bar/battery.js b/devices/wim/config/ags/js/bar/battery.js similarity index 100% rename from hosts/wim/config/ags/js/bar/battery.js rename to devices/wim/config/ags/js/bar/battery.js diff --git a/hosts/wim/config/ags/js/bar/brightness.js b/devices/wim/config/ags/js/bar/brightness.js similarity index 100% rename from hosts/wim/config/ags/js/bar/brightness.js rename to devices/wim/config/ags/js/bar/brightness.js diff --git a/hosts/wim/config/ags/js/bar/clock.js b/devices/wim/config/ags/js/bar/clock.js similarity index 100% rename from hosts/wim/config/ags/js/bar/clock.js rename to devices/wim/config/ags/js/bar/clock.js diff --git a/hosts/wim/config/ags/js/bar/current-window.js b/devices/wim/config/ags/js/bar/current-window.js similarity index 100% rename from hosts/wim/config/ags/js/bar/current-window.js rename to devices/wim/config/ags/js/bar/current-window.js diff --git a/hosts/wim/config/ags/js/bar/fullscreen.js b/devices/wim/config/ags/js/bar/fullscreen.js similarity index 100% rename from hosts/wim/config/ags/js/bar/fullscreen.js rename to devices/wim/config/ags/js/bar/fullscreen.js diff --git a/hosts/wim/config/ags/js/bar/gesture.js b/devices/wim/config/ags/js/bar/gesture.js similarity index 100% rename from hosts/wim/config/ags/js/bar/gesture.js rename to devices/wim/config/ags/js/bar/gesture.js diff --git a/hosts/wim/config/ags/js/bar/heart.js b/devices/wim/config/ags/js/bar/heart.js similarity index 100% rename from hosts/wim/config/ags/js/bar/heart.js rename to devices/wim/config/ags/js/bar/heart.js diff --git a/hosts/wim/config/ags/js/bar/keyboard-layout.js b/devices/wim/config/ags/js/bar/keyboard-layout.js similarity index 100% rename from hosts/wim/config/ags/js/bar/keyboard-layout.js rename to devices/wim/config/ags/js/bar/keyboard-layout.js diff --git a/hosts/wim/config/ags/js/bar/main.js b/devices/wim/config/ags/js/bar/main.js similarity index 100% rename from hosts/wim/config/ags/js/bar/main.js rename to devices/wim/config/ags/js/bar/main.js diff --git a/hosts/wim/config/ags/js/bar/notif-button.js b/devices/wim/config/ags/js/bar/notif-button.js similarity index 100% rename from hosts/wim/config/ags/js/bar/notif-button.js rename to devices/wim/config/ags/js/bar/notif-button.js diff --git a/hosts/wim/config/ags/js/bar/osk-toggle.js b/devices/wim/config/ags/js/bar/osk-toggle.js similarity index 100% rename from hosts/wim/config/ags/js/bar/osk-toggle.js rename to devices/wim/config/ags/js/bar/osk-toggle.js diff --git a/hosts/wim/config/ags/js/bar/quick-settings.js b/devices/wim/config/ags/js/bar/quick-settings.js similarity index 100% rename from hosts/wim/config/ags/js/bar/quick-settings.js rename to devices/wim/config/ags/js/bar/quick-settings.js diff --git a/hosts/wim/config/ags/js/bar/systray.js b/devices/wim/config/ags/js/bar/systray.js similarity index 100% rename from hosts/wim/config/ags/js/bar/systray.js rename to devices/wim/config/ags/js/bar/systray.js diff --git a/hosts/wim/config/ags/js/bar/tablet-toggle.js b/devices/wim/config/ags/js/bar/tablet-toggle.js similarity index 100% rename from hosts/wim/config/ags/js/bar/tablet-toggle.js rename to devices/wim/config/ags/js/bar/tablet-toggle.js diff --git a/hosts/wim/config/ags/js/bar/workspaces.js b/devices/wim/config/ags/js/bar/workspaces.js similarity index 100% rename from hosts/wim/config/ags/js/bar/workspaces.js rename to devices/wim/config/ags/js/bar/workspaces.js diff --git a/hosts/wim/config/ags/js/date.js b/devices/wim/config/ags/js/date.js similarity index 100% rename from hosts/wim/config/ags/js/date.js rename to devices/wim/config/ags/js/date.js diff --git a/hosts/wim/config/ags/js/media-player/gesture.js b/devices/wim/config/ags/js/media-player/gesture.js similarity index 100% rename from hosts/wim/config/ags/js/media-player/gesture.js rename to devices/wim/config/ags/js/media-player/gesture.js diff --git a/hosts/wim/config/ags/js/media-player/mpris.js b/devices/wim/config/ags/js/media-player/mpris.js similarity index 100% rename from hosts/wim/config/ags/js/media-player/mpris.js rename to devices/wim/config/ags/js/media-player/mpris.js diff --git a/hosts/wim/config/ags/js/media-player/player.js b/devices/wim/config/ags/js/media-player/player.js similarity index 100% rename from hosts/wim/config/ags/js/media-player/player.js rename to devices/wim/config/ags/js/media-player/player.js diff --git a/hosts/wim/config/ags/js/misc/closer.js b/devices/wim/config/ags/js/misc/closer.js similarity index 100% rename from hosts/wim/config/ags/js/misc/closer.js rename to devices/wim/config/ags/js/misc/closer.js diff --git a/hosts/wim/config/ags/js/misc/cursorbox.js b/devices/wim/config/ags/js/misc/cursorbox.js similarity index 100% rename from hosts/wim/config/ags/js/misc/cursorbox.js rename to devices/wim/config/ags/js/misc/cursorbox.js diff --git a/hosts/wim/config/ags/js/misc/popup.js b/devices/wim/config/ags/js/misc/popup.js similarity index 100% rename from hosts/wim/config/ags/js/misc/popup.js rename to devices/wim/config/ags/js/misc/popup.js diff --git a/hosts/wim/config/ags/js/misc/separator.js b/devices/wim/config/ags/js/misc/separator.js similarity index 100% rename from hosts/wim/config/ags/js/misc/separator.js rename to devices/wim/config/ags/js/misc/separator.js diff --git a/hosts/wim/config/ags/js/notifications/base.js b/devices/wim/config/ags/js/notifications/base.js similarity index 100% rename from hosts/wim/config/ags/js/notifications/base.js rename to devices/wim/config/ags/js/notifications/base.js diff --git a/hosts/wim/config/ags/js/notifications/center.js b/devices/wim/config/ags/js/notifications/center.js similarity index 100% rename from hosts/wim/config/ags/js/notifications/center.js rename to devices/wim/config/ags/js/notifications/center.js diff --git a/hosts/wim/config/ags/js/notifications/gesture.js b/devices/wim/config/ags/js/notifications/gesture.js similarity index 97% rename from hosts/wim/config/ags/js/notifications/gesture.js rename to devices/wim/config/ags/js/notifications/gesture.js index 87f727b..dbba73d 100644 --- a/hosts/wim/config/ags/js/notifications/gesture.js +++ b/devices/wim/config/ags/js/notifications/gesture.js @@ -47,12 +47,12 @@ export default ({ margin-bottom: -70px; margin-top: -70px; opacity: 0;`; const rightAnim1 = `transition: margin 0.5s ease, opacity 0.5s ease; - margin-left: ${Number(maxOffset + endMargin)}px; + margin-left: ${Number(maxOffset + endMargin)}px; margin-right: -${Number(maxOffset + endMargin)}px; opacity: 0;`; const rightAnim2 = `transition: margin 0.5s ease, opacity 0.5s ease; - margin-left: ${Number(maxOffset + endMargin)}px; + margin-left: ${Number(maxOffset + endMargin)}px; margin-right: -${Number(maxOffset + endMargin)}px; margin-bottom: -70px; margin-top: -70px; opacity: 0;`; diff --git a/hosts/wim/config/ags/js/notifications/popup.js b/devices/wim/config/ags/js/notifications/popup.js similarity index 100% rename from hosts/wim/config/ags/js/notifications/popup.js rename to devices/wim/config/ags/js/notifications/popup.js diff --git a/hosts/wim/config/ags/js/overview/clients.js b/devices/wim/config/ags/js/overview/clients.js similarity index 100% rename from hosts/wim/config/ags/js/overview/clients.js rename to devices/wim/config/ags/js/overview/clients.js diff --git a/hosts/wim/config/ags/js/overview/dragndrop.js b/devices/wim/config/ags/js/overview/dragndrop.js similarity index 100% rename from hosts/wim/config/ags/js/overview/dragndrop.js rename to devices/wim/config/ags/js/overview/dragndrop.js diff --git a/hosts/wim/config/ags/js/overview/main.js b/devices/wim/config/ags/js/overview/main.js similarity index 100% rename from hosts/wim/config/ags/js/overview/main.js rename to devices/wim/config/ags/js/overview/main.js diff --git a/hosts/wim/config/ags/js/overview/variables.js b/devices/wim/config/ags/js/overview/variables.js similarity index 100% rename from hosts/wim/config/ags/js/overview/variables.js rename to devices/wim/config/ags/js/overview/variables.js diff --git a/hosts/wim/config/ags/js/overview/workspaces.js b/devices/wim/config/ags/js/overview/workspaces.js similarity index 100% rename from hosts/wim/config/ags/js/overview/workspaces.js rename to devices/wim/config/ags/js/overview/workspaces.js diff --git a/hosts/wim/config/ags/js/powermenu.js b/devices/wim/config/ags/js/powermenu.js similarity index 100% rename from hosts/wim/config/ags/js/powermenu.js rename to devices/wim/config/ags/js/powermenu.js diff --git a/hosts/wim/config/ags/js/quick-settings/button-grid.js b/devices/wim/config/ags/js/quick-settings/button-grid.js similarity index 100% rename from hosts/wim/config/ags/js/quick-settings/button-grid.js rename to devices/wim/config/ags/js/quick-settings/button-grid.js diff --git a/hosts/wim/config/ags/js/quick-settings/main.js b/devices/wim/config/ags/js/quick-settings/main.js similarity index 100% rename from hosts/wim/config/ags/js/quick-settings/main.js rename to devices/wim/config/ags/js/quick-settings/main.js diff --git a/hosts/wim/config/ags/js/quick-settings/slider-box.js b/devices/wim/config/ags/js/quick-settings/slider-box.js similarity index 100% rename from hosts/wim/config/ags/js/quick-settings/slider-box.js rename to devices/wim/config/ags/js/quick-settings/slider-box.js diff --git a/hosts/wim/config/ags/js/quick-settings/toggle-button.js b/devices/wim/config/ags/js/quick-settings/toggle-button.js similarity index 100% rename from hosts/wim/config/ags/js/quick-settings/toggle-button.js rename to devices/wim/config/ags/js/quick-settings/toggle-button.js diff --git a/hosts/wim/config/ags/js/screen-corners.js b/devices/wim/config/ags/js/screen-corners.js similarity index 100% rename from hosts/wim/config/ags/js/screen-corners.js rename to devices/wim/config/ags/js/screen-corners.js diff --git a/hosts/wim/config/ags/package.json b/devices/wim/config/ags/package.json similarity index 100% rename from hosts/wim/config/ags/package.json rename to devices/wim/config/ags/package.json diff --git a/hosts/wim/config/ags/scss/common.scss b/devices/wim/config/ags/scss/common.scss similarity index 100% rename from hosts/wim/config/ags/scss/common.scss rename to devices/wim/config/ags/scss/common.scss diff --git a/hosts/wim/config/ags/scss/main.scss b/devices/wim/config/ags/scss/main.scss similarity index 100% rename from hosts/wim/config/ags/scss/main.scss rename to devices/wim/config/ags/scss/main.scss diff --git a/hosts/wim/config/ags/scss/widgets/applauncher.scss b/devices/wim/config/ags/scss/widgets/applauncher.scss similarity index 100% rename from hosts/wim/config/ags/scss/widgets/applauncher.scss rename to devices/wim/config/ags/scss/widgets/applauncher.scss diff --git a/hosts/wim/config/ags/scss/widgets/corners.scss b/devices/wim/config/ags/scss/widgets/corners.scss similarity index 100% rename from hosts/wim/config/ags/scss/widgets/corners.scss rename to devices/wim/config/ags/scss/widgets/corners.scss diff --git a/hosts/wim/config/ags/scss/widgets/date.scss b/devices/wim/config/ags/scss/widgets/date.scss similarity index 100% rename from hosts/wim/config/ags/scss/widgets/date.scss rename to devices/wim/config/ags/scss/widgets/date.scss diff --git a/hosts/wim/config/ags/scss/widgets/notification-center.scss b/devices/wim/config/ags/scss/widgets/notification-center.scss similarity index 100% rename from hosts/wim/config/ags/scss/widgets/notification-center.scss rename to devices/wim/config/ags/scss/widgets/notification-center.scss diff --git a/hosts/wim/config/ags/scss/widgets/notification.scss b/devices/wim/config/ags/scss/widgets/notification.scss similarity index 100% rename from hosts/wim/config/ags/scss/widgets/notification.scss rename to devices/wim/config/ags/scss/widgets/notification.scss diff --git a/hosts/wim/config/ags/scss/widgets/overview.scss b/devices/wim/config/ags/scss/widgets/overview.scss similarity index 100% rename from hosts/wim/config/ags/scss/widgets/overview.scss rename to devices/wim/config/ags/scss/widgets/overview.scss diff --git a/hosts/wim/config/ags/scss/widgets/player.scss b/devices/wim/config/ags/scss/widgets/player.scss similarity index 100% rename from hosts/wim/config/ags/scss/widgets/player.scss rename to devices/wim/config/ags/scss/widgets/player.scss diff --git a/hosts/wim/config/ags/scss/widgets/powermenu.scss b/devices/wim/config/ags/scss/widgets/powermenu.scss similarity index 100% rename from hosts/wim/config/ags/scss/widgets/powermenu.scss rename to devices/wim/config/ags/scss/widgets/powermenu.scss diff --git a/hosts/wim/config/ags/scss/widgets/quick-settings.scss b/devices/wim/config/ags/scss/widgets/quick-settings.scss similarity index 100% rename from hosts/wim/config/ags/scss/widgets/quick-settings.scss rename to devices/wim/config/ags/scss/widgets/quick-settings.scss diff --git a/hosts/wim/config/ags/scss/widgets/systray.scss b/devices/wim/config/ags/scss/widgets/systray.scss similarity index 100% rename from hosts/wim/config/ags/scss/widgets/systray.scss rename to devices/wim/config/ags/scss/widgets/systray.scss diff --git a/hosts/wim/config/ags/scss/widgets/traybuttons.scss b/devices/wim/config/ags/scss/widgets/traybuttons.scss similarity index 100% rename from hosts/wim/config/ags/scss/widgets/traybuttons.scss rename to devices/wim/config/ags/scss/widgets/traybuttons.scss diff --git a/hosts/wim/config/ags/scss/widgets/workspaces.scss b/devices/wim/config/ags/scss/widgets/workspaces.scss similarity index 100% rename from hosts/wim/config/ags/scss/widgets/workspaces.scss rename to devices/wim/config/ags/scss/widgets/workspaces.scss diff --git a/hosts/wim/config/ags/services/pointers.js b/devices/wim/config/ags/services/pointers.js similarity index 100% rename from hosts/wim/config/ags/services/pointers.js rename to devices/wim/config/ags/services/pointers.js diff --git a/hosts/wim/config/dolphinrc b/devices/wim/config/dolphinrc similarity index 100% rename from hosts/wim/config/dolphinrc rename to devices/wim/config/dolphinrc diff --git a/hosts/wim/config/gtklock/scripts/blur.sh b/devices/wim/config/gtklock/scripts/blur.sh similarity index 100% rename from hosts/wim/config/gtklock/scripts/blur.sh rename to devices/wim/config/gtklock/scripts/blur.sh diff --git a/hosts/wim/config/gtklock/scripts/lock.sh b/devices/wim/config/gtklock/scripts/lock.sh similarity index 100% rename from hosts/wim/config/gtklock/scripts/lock.sh rename to devices/wim/config/gtklock/scripts/lock.sh diff --git a/hosts/wim/config/gtklock/style.css b/devices/wim/config/gtklock/style.css similarity index 100% rename from hosts/wim/config/gtklock/style.css rename to devices/wim/config/gtklock/style.css diff --git a/hosts/wim/config/hypr/main.conf b/devices/wim/config/hypr/main.conf similarity index 100% rename from hosts/wim/config/hypr/main.conf rename to devices/wim/config/hypr/main.conf diff --git a/hosts/wim/config/hypr/scripts/autorotate.sh b/devices/wim/config/hypr/scripts/autorotate.sh similarity index 100% rename from hosts/wim/config/hypr/scripts/autorotate.sh rename to devices/wim/config/hypr/scripts/autorotate.sh diff --git a/hosts/wim/config/hypr/scripts/lisgd.sh b/devices/wim/config/hypr/scripts/lisgd.sh similarity index 100% rename from hosts/wim/config/hypr/scripts/lisgd.sh rename to devices/wim/config/hypr/scripts/lisgd.sh diff --git a/hosts/wim/config/kdeglobals b/devices/wim/config/kdeglobals similarity index 100% rename from hosts/wim/config/kdeglobals rename to devices/wim/config/kdeglobals diff --git a/hosts/wim/config/kiorc b/devices/wim/config/kiorc similarity index 100% rename from hosts/wim/config/kiorc rename to devices/wim/config/kiorc diff --git a/hosts/wim/config/mimeapps.list b/devices/wim/config/mimeapps.list similarity index 100% rename from hosts/wim/config/mimeapps.list rename to devices/wim/config/mimeapps.list diff --git a/hosts/wim/config/neofetch/config.conf b/devices/wim/config/neofetch/config.conf similarity index 100% rename from hosts/wim/config/neofetch/config.conf rename to devices/wim/config/neofetch/config.conf diff --git a/hosts/wim/config/swappy/config b/devices/wim/config/swappy/config similarity index 100% rename from hosts/wim/config/swappy/config rename to devices/wim/config/swappy/config diff --git a/hosts/wim/config/swayosd/style.css b/devices/wim/config/swayosd/style.css similarity index 100% rename from hosts/wim/config/swayosd/style.css rename to devices/wim/config/swayosd/style.css diff --git a/hosts/wim/default.nix b/devices/wim/default.nix similarity index 79% rename from hosts/wim/default.nix rename to devices/wim/default.nix index 7a77e12..7617578 100644 --- a/hosts/wim/default.nix +++ b/devices/wim/default.nix @@ -14,9 +14,9 @@ ./modules/security.nix ]; - services.hostvars = { + services.device-vars = { username = "matt"; - configDir = "/home/matt/.nix/hosts/wim/config"; + configDir = "/home/matt/.nix/devices/wim/config"; fontSize = 12.5; }; @@ -35,16 +35,15 @@ home-manager.users = { matt = { imports = [ - ./home/hyprland.nix + ../../home/alacritty.nix + ../../home/dconf.nix + ../../home/firefox + ../../home/theme.nix + ../../home/wofi + + ./home/dotfiles.nix ./home/packages.nix - - ../../modules/alacritty.nix - ../../modules/dconf.nix - ../../modules/firefox - ../../modules/theme.nix - ../../modules/wofi - - ./modules/dotfiles.nix + ./home/hyprland.nix ]; # No touchy diff --git a/hosts/wim/hardware-configuration.nix b/devices/wim/hardware-configuration.nix similarity index 100% rename from hosts/wim/hardware-configuration.nix rename to devices/wim/hardware-configuration.nix diff --git a/hosts/wim/modules/dotfiles.nix b/devices/wim/home/dotfiles.nix similarity index 95% rename from hosts/wim/modules/dotfiles.nix rename to devices/wim/home/dotfiles.nix index d4722d8..52682f9 100644 --- a/hosts/wim/modules/dotfiles.nix +++ b/devices/wim/home/dotfiles.nix @@ -1,5 +1,5 @@ { config, pkgs, ... }: let - configDir = config.services.hostvars.configDir; + configDir = config.services.device-vars.configDir; symlink = config.lib.file.mkOutOfStoreSymlink; in { diff --git a/hosts/wim/home/hyprland.nix b/devices/wim/home/hyprland.nix similarity index 97% rename from hosts/wim/home/hyprland.nix rename to devices/wim/home/hyprland.nix index 849e9af..2e19513 100644 --- a/hosts/wim/home/hyprland.nix +++ b/devices/wim/home/hyprland.nix @@ -1,5 +1,5 @@ { pkgs, config, hyprland, hyprgrass, ags, osConfig, ... }: let - configDir = config.services.hostvars.configDir; + configDir = config.services.device-vars.configDir; symlink = config.lib.file.mkOutOfStoreSymlink; gset = pkgs.gsettings-desktop-schemas; diff --git a/hosts/wim/home/packages.nix b/devices/wim/home/packages.nix similarity index 100% rename from hosts/wim/home/packages.nix rename to devices/wim/home/packages.nix diff --git a/hosts/wim/modules/desktop.nix b/devices/wim/modules/desktop.nix similarity index 100% rename from hosts/wim/modules/desktop.nix rename to devices/wim/modules/desktop.nix diff --git a/hosts/wim/modules/security.nix b/devices/wim/modules/security.nix similarity index 100% rename from hosts/wim/modules/security.nix rename to devices/wim/modules/security.nix diff --git a/flake.nix b/flake.nix index e5db041..35f9853 100644 --- a/flake.nix +++ b/flake.nix @@ -42,6 +42,7 @@ url = "github:nix-community/nurl"; inputs.nixpkgs.follows = "nixpkgs"; }; + coc-stylelintplus = { url = "github:matt1432/coc-stylelintplus"; inputs.nixpkgs.follows = "nixpkgs"; @@ -66,7 +67,7 @@ system = "x86_64-linux"; specialArgs = attrs; modules = defaultModules ++ [ - ./hosts/wim + ./devices/wim ]; }; @@ -74,7 +75,7 @@ system = "x86_64-linux"; specialArgs = attrs; modules = defaultModules ++ [ - ./hosts/binto + ./devices/binto ]; }; }; diff --git a/modules/alacritty.nix b/home/alacritty.nix similarity index 96% rename from modules/alacritty.nix rename to home/alacritty.nix index fb763c6..768193f 100644 --- a/modules/alacritty.nix +++ b/home/alacritty.nix @@ -1,5 +1,3 @@ -# Home-manager module - { config, ... }: { programs.alacritty = { enable = true; @@ -41,7 +39,7 @@ family = "JetBrainsMono Nerd Font"; style = "Italic"; }; - size = config.services.hostvars.fontSize; + size = config.services.device-vars.fontSize; }; # https://github.com/dracula/alacritty/blob/05faff15c0158712be87d200081633d9f4850a7d/dracula.yml diff --git a/modules/dconf.nix b/home/dconf.nix similarity index 94% rename from modules/dconf.nix rename to home/dconf.nix index 446a85d..15ffc81 100644 --- a/modules/dconf.nix +++ b/home/dconf.nix @@ -1,5 +1,3 @@ -# Home-manager module - { ... }: { dconf.settings = { "org/virt-manager/virt-manager/connections" = { diff --git a/modules/firefox/addons/addons.json b/home/firefox/addons/addons.json similarity index 100% rename from modules/firefox/addons/addons.json rename to home/firefox/addons/addons.json diff --git a/modules/firefox/addons/default.nix b/home/firefox/addons/default.nix similarity index 100% rename from modules/firefox/addons/default.nix rename to home/firefox/addons/default.nix diff --git a/modules/firefox/addons/generated-firefox-addons.nix b/home/firefox/addons/generated-firefox-addons.nix similarity index 100% rename from modules/firefox/addons/generated-firefox-addons.nix rename to home/firefox/addons/generated-firefox-addons.nix diff --git a/modules/firefox/addons/seventv_settings.json b/home/firefox/addons/seventv_settings.json similarity index 100% rename from modules/firefox/addons/seventv_settings.json rename to home/firefox/addons/seventv_settings.json diff --git a/modules/firefox/custom.css b/home/firefox/custom.css similarity index 100% rename from modules/firefox/custom.css rename to home/firefox/custom.css diff --git a/modules/firefox/default.nix b/home/firefox/default.nix similarity index 100% rename from modules/firefox/default.nix rename to home/firefox/default.nix diff --git a/modules/firefox/firefox-gx/default.nix b/home/firefox/firefox-gx/default.nix similarity index 100% rename from modules/firefox/firefox-gx/default.nix rename to home/firefox/firefox-gx/default.nix diff --git a/modules/firefox/firefox-gx/ogx_left-sidebar.css b/home/firefox/firefox-gx/ogx_left-sidebar.css similarity index 100% rename from modules/firefox/firefox-gx/ogx_left-sidebar.css rename to home/firefox/firefox-gx/ogx_left-sidebar.css diff --git a/modules/firefox/firefox-gx/ogx_menu.css b/home/firefox/firefox-gx/ogx_menu.css similarity index 100% rename from modules/firefox/firefox-gx/ogx_menu.css rename to home/firefox/firefox-gx/ogx_menu.css diff --git a/modules/theme.nix b/home/theme.nix similarity index 97% rename from modules/theme.nix rename to home/theme.nix index 2db2cd7..07d87f3 100644 --- a/modules/theme.nix +++ b/home/theme.nix @@ -1,5 +1,5 @@ { pkgs, lib, config, ... }: let - fontSize = config.services.hostvars.fontSize; + fontSize = config.services.device-vars.fontSize; dracula-xresources = pkgs.fetchFromGitHub { owner = "dracula"; repo = "xresources"; diff --git a/modules/wofi/default.nix b/home/wofi/default.nix similarity index 93% rename from modules/wofi/default.nix rename to home/wofi/default.nix index 4ecdc6c..a243fdc 100644 --- a/modules/wofi/default.nix +++ b/home/wofi/default.nix @@ -1,5 +1,3 @@ -# Home-manager module - { ... }: { programs = { wofi = { diff --git a/modules/wofi/style.css b/home/wofi/style.css similarity index 100% rename from modules/wofi/style.css rename to home/wofi/style.css