From e50310eb80f94329b55a627aba803e51ffd27e09 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Fri, 8 Sep 2023 21:59:56 -0400 Subject: [PATCH] flake: migrate users/profiles -> users/modules --- flake.nix | 18 +++------- modules/global/home-manager.nix | 30 +++------------- users/infinidoge/default.nix | 6 ---- .../{ => functionality}/bindmounts.nix | 0 users/{profiles => modules/global}/direnv.nix | 0 users/{profiles => modules/global}/emacs.nix | 0 .../global}/flameshot.nix | 2 +- users/{profiles => modules/global}/git.nix | 0 users/{profiles => modules/global}/gpg.nix | 0 users/{profiles => modules/global}/htop.nix | 0 .../{profiles => modules/global}/keychain.nix | 0 users/{profiles => modules/global}/kitty.nix | 0 users/{profiles => modules/global}/mpd.nix | 0 .../global}/programming/haskell.nix | 0 .../global}/programming/java.nix | 0 .../global}/programming/kotlin.nix | 0 .../global}/programming/lua.nix | 0 .../global}/programming/nim.nix | 0 .../global}/programming/python.nix | 0 .../global}/programming/racket.nix | 0 .../global}/programming/rust.nix | 0 .../global}/programming/zig.nix | 0 users/{profiles => modules/global}/rofi.nix | 4 +-- .../global}/shells/all.nix | 0 .../global}/shells/bash.nix | 0 .../global}/shells/common.nix | 0 .../global}/shells/fish.nix | 0 .../global}/shells/ion.nix | 0 .../global}/shells/nushell.nix | 0 .../global}/shells/zsh.nix | 0 users/{profiles => modules/global}/ssh.nix | 0 .../{profiles => modules/global}/starship.nix | 0 users/modules/global/themeing.nix | 34 +++++++++++++++++++ users/{profiles => modules/global}/tmux.nix | 0 users/{profiles => modules/global}/vim.nix | 0 users/profiles/themeing.nix | 31 ----------------- 36 files changed, 46 insertions(+), 79 deletions(-) rename users/modules/{ => functionality}/bindmounts.nix (100%) rename users/{profiles => modules/global}/direnv.nix (100%) rename users/{profiles => modules/global}/emacs.nix (100%) rename users/{profiles => modules/global}/flameshot.nix (96%) rename users/{profiles => modules/global}/git.nix (100%) rename users/{profiles => modules/global}/gpg.nix (100%) rename users/{profiles => modules/global}/htop.nix (100%) rename users/{profiles => modules/global}/keychain.nix (100%) rename users/{profiles => modules/global}/kitty.nix (100%) rename users/{profiles => modules/global}/mpd.nix (100%) rename users/{profiles => modules/global}/programming/haskell.nix (100%) rename users/{profiles => modules/global}/programming/java.nix (100%) rename users/{profiles => modules/global}/programming/kotlin.nix (100%) rename users/{profiles => modules/global}/programming/lua.nix (100%) rename users/{profiles => modules/global}/programming/nim.nix (100%) rename users/{profiles => modules/global}/programming/python.nix (100%) rename users/{profiles => modules/global}/programming/racket.nix (100%) rename users/{profiles => modules/global}/programming/rust.nix (100%) rename users/{profiles => modules/global}/programming/zig.nix (100%) rename users/{profiles => modules/global}/rofi.nix (84%) rename users/{profiles => modules/global}/shells/all.nix (100%) rename users/{profiles => modules/global}/shells/bash.nix (100%) rename users/{profiles => modules/global}/shells/common.nix (100%) rename users/{profiles => modules/global}/shells/fish.nix (100%) rename users/{profiles => modules/global}/shells/ion.nix (100%) rename users/{profiles => modules/global}/shells/nushell.nix (100%) rename users/{profiles => modules/global}/shells/zsh.nix (100%) rename users/{profiles => modules/global}/ssh.nix (100%) rename users/{profiles => modules/global}/starship.nix (100%) create mode 100644 users/modules/global/themeing.nix rename users/{profiles => modules/global}/tmux.nix (100%) rename users/{profiles => modules/global}/vim.nix (100%) delete mode 100644 users/profiles/themeing.nix diff --git a/flake.nix b/flake.nix index 7362366..529b779 100644 --- a/flake.nix +++ b/flake.nix @@ -107,19 +107,11 @@ inputs.rust-overlay.overlays.default inputs.universe-cli.overlays.default ]; - home-manager = - let - profiles = self.lib.rakeLeaves ./users/profiles; - in - { - sharedModules = [ - inputs.impermanence.nixosModules.home-manager.impermanence - ] ++ (self.lib.leaves ./users/modules); - - extraSpecialArgs = { - inherit profiles; - }; - }; + home-manager = { + sharedModules = [ + inputs.impermanence.nixosModules.home-manager.impermanence + ] ++ (self.lib.leaves ./users/modules); + }; } # --- Universe Modules --- diff --git a/modules/global/home-manager.nix b/modules/global/home-manager.nix index 59c7de2..e82f120 100644 --- a/modules/global/home-manager.nix +++ b/modules/global/home-manager.nix @@ -8,25 +8,7 @@ }; sharedModules = [ - ({ profiles, ... }: { - imports = with profiles; [ - # Programs - direnv - emacs - git - gpg - htop - keychain - mpd - ssh - vim - - # Terminal - shells.all - starship - tmux - ] ++ builtins.attrValues profiles.programming; - + { home = { stateVersion = config.system.stateVersion; sessionVariables = { @@ -46,20 +28,16 @@ createDirectories = true; }; }; - }) (lib.mkIf config.services.xserver.enable { xsession.enable = true; }) - (lib.mkIf config.info.graphical ({ profiles, ... }: { - imports = with profiles; [ - kitty - ]; - + } + (lib.mkIf config.info.graphical { xdg.systemDirs.data = [ "${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}" "${pkgs.gtk3}/share/gsettings-schemas/${pkgs.gtk3.name}" ]; - })) + }) ]; }; } diff --git a/users/infinidoge/default.nix b/users/infinidoge/default.nix index 44a5839..4179637 100644 --- a/users/infinidoge/default.nix +++ b/users/infinidoge/default.nix @@ -10,12 +10,6 @@ in home = { config, main, profiles, ... }: { imports = flatten [ - (ifGraphical' (with profiles; [ - rofi - themeing - flameshot - ])) - ./config ]; diff --git a/users/modules/bindmounts.nix b/users/modules/functionality/bindmounts.nix similarity index 100% rename from users/modules/bindmounts.nix rename to users/modules/functionality/bindmounts.nix diff --git a/users/profiles/direnv.nix b/users/modules/global/direnv.nix similarity index 100% rename from users/profiles/direnv.nix rename to users/modules/global/direnv.nix diff --git a/users/profiles/emacs.nix b/users/modules/global/emacs.nix similarity index 100% rename from users/profiles/emacs.nix rename to users/modules/global/emacs.nix diff --git a/users/profiles/flameshot.nix b/users/modules/global/flameshot.nix similarity index 96% rename from users/profiles/flameshot.nix rename to users/modules/global/flameshot.nix index 89b4912..3ae853e 100644 --- a/users/profiles/flameshot.nix +++ b/users/modules/global/flameshot.nix @@ -1,7 +1,7 @@ { config, main, pkgs, lib, ... }: { services.flameshot = { - enable = true; + enable = main.info.graphical; settings = { General = { buttons = "@Variant(\\0\\0\\0\\x7f\\0\\0\\0\\vQList\\0\\0\\0\\0\\x18\\0\\0\\0\\0\\0\\0\\0\\x1\\0\\0\\0\\x2\\0\\0\\0\\x3\\0\\0\\0\\x4\\0\\0\\0\\x5\\0\\0\\0\\x6\\0\\0\\0\\x12\\0\\0\\0\\x13\\0\\0\\0\\xf\\0\\0\\0\\x16\\0\\0\\0\\a\\0\\0\\0\\b\\0\\0\\0\\t\\0\\0\\0\\x10\\0\\0\\0\\n\\0\\0\\0\\v\\0\\0\\0\\f\\0\\0\\0\\r\\0\\0\\0\\xe\\0\\0\\0\\x11\\0\\0\\0\\x14\\0\\0\\0\\x15\\0\\0\\0\\x17)"; diff --git a/users/profiles/git.nix b/users/modules/global/git.nix similarity index 100% rename from users/profiles/git.nix rename to users/modules/global/git.nix diff --git a/users/profiles/gpg.nix b/users/modules/global/gpg.nix similarity index 100% rename from users/profiles/gpg.nix rename to users/modules/global/gpg.nix diff --git a/users/profiles/htop.nix b/users/modules/global/htop.nix similarity index 100% rename from users/profiles/htop.nix rename to users/modules/global/htop.nix diff --git a/users/profiles/keychain.nix b/users/modules/global/keychain.nix similarity index 100% rename from users/profiles/keychain.nix rename to users/modules/global/keychain.nix diff --git a/users/profiles/kitty.nix b/users/modules/global/kitty.nix similarity index 100% rename from users/profiles/kitty.nix rename to users/modules/global/kitty.nix diff --git a/users/profiles/mpd.nix b/users/modules/global/mpd.nix similarity index 100% rename from users/profiles/mpd.nix rename to users/modules/global/mpd.nix diff --git a/users/profiles/programming/haskell.nix b/users/modules/global/programming/haskell.nix similarity index 100% rename from users/profiles/programming/haskell.nix rename to users/modules/global/programming/haskell.nix diff --git a/users/profiles/programming/java.nix b/users/modules/global/programming/java.nix similarity index 100% rename from users/profiles/programming/java.nix rename to users/modules/global/programming/java.nix diff --git a/users/profiles/programming/kotlin.nix b/users/modules/global/programming/kotlin.nix similarity index 100% rename from users/profiles/programming/kotlin.nix rename to users/modules/global/programming/kotlin.nix diff --git a/users/profiles/programming/lua.nix b/users/modules/global/programming/lua.nix similarity index 100% rename from users/profiles/programming/lua.nix rename to users/modules/global/programming/lua.nix diff --git a/users/profiles/programming/nim.nix b/users/modules/global/programming/nim.nix similarity index 100% rename from users/profiles/programming/nim.nix rename to users/modules/global/programming/nim.nix diff --git a/users/profiles/programming/python.nix b/users/modules/global/programming/python.nix similarity index 100% rename from users/profiles/programming/python.nix rename to users/modules/global/programming/python.nix diff --git a/users/profiles/programming/racket.nix b/users/modules/global/programming/racket.nix similarity index 100% rename from users/profiles/programming/racket.nix rename to users/modules/global/programming/racket.nix diff --git a/users/profiles/programming/rust.nix b/users/modules/global/programming/rust.nix similarity index 100% rename from users/profiles/programming/rust.nix rename to users/modules/global/programming/rust.nix diff --git a/users/profiles/programming/zig.nix b/users/modules/global/programming/zig.nix similarity index 100% rename from users/profiles/programming/zig.nix rename to users/modules/global/programming/zig.nix diff --git a/users/profiles/rofi.nix b/users/modules/global/rofi.nix similarity index 84% rename from users/profiles/rofi.nix rename to users/modules/global/rofi.nix index 775d793..f86690b 100644 --- a/users/profiles/rofi.nix +++ b/users/modules/global/rofi.nix @@ -1,6 +1,6 @@ -{ pkgs, ... }: { +{ main, pkgs, ... }: { programs.rofi = { - enable = true; + enable = main.info.graphical; extraConfig = { modi = builtins.concatStringsSep "," [ "window" diff --git a/users/profiles/shells/all.nix b/users/modules/global/shells/all.nix similarity index 100% rename from users/profiles/shells/all.nix rename to users/modules/global/shells/all.nix diff --git a/users/profiles/shells/bash.nix b/users/modules/global/shells/bash.nix similarity index 100% rename from users/profiles/shells/bash.nix rename to users/modules/global/shells/bash.nix diff --git a/users/profiles/shells/common.nix b/users/modules/global/shells/common.nix similarity index 100% rename from users/profiles/shells/common.nix rename to users/modules/global/shells/common.nix diff --git a/users/profiles/shells/fish.nix b/users/modules/global/shells/fish.nix similarity index 100% rename from users/profiles/shells/fish.nix rename to users/modules/global/shells/fish.nix diff --git a/users/profiles/shells/ion.nix b/users/modules/global/shells/ion.nix similarity index 100% rename from users/profiles/shells/ion.nix rename to users/modules/global/shells/ion.nix diff --git a/users/profiles/shells/nushell.nix b/users/modules/global/shells/nushell.nix similarity index 100% rename from users/profiles/shells/nushell.nix rename to users/modules/global/shells/nushell.nix diff --git a/users/profiles/shells/zsh.nix b/users/modules/global/shells/zsh.nix similarity index 100% rename from users/profiles/shells/zsh.nix rename to users/modules/global/shells/zsh.nix diff --git a/users/profiles/ssh.nix b/users/modules/global/ssh.nix similarity index 100% rename from users/profiles/ssh.nix rename to users/modules/global/ssh.nix diff --git a/users/profiles/starship.nix b/users/modules/global/starship.nix similarity index 100% rename from users/profiles/starship.nix rename to users/modules/global/starship.nix diff --git a/users/modules/global/themeing.nix b/users/modules/global/themeing.nix new file mode 100644 index 0000000..271c910 --- /dev/null +++ b/users/modules/global/themeing.nix @@ -0,0 +1,34 @@ +{ lib, main, config, pkgs, ... }: +{ + config = lib.mkIf main.info.graphical { + gtk = { + enable = true; + gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc"; + + font = { + package = pkgs.dejavu_fonts; + name = "DejaVu Sans"; + size = 10; + }; + + iconTheme = { + package = pkgs.gnome.adwaita-icon-theme; + name = "Adwaita-dark"; + }; + + theme = { + package = pkgs.gnome.gnome-themes-extra; + name = "Adwaita-dark"; + }; + }; + + qt = { + enable = true; + style = { + package = pkgs.adwaita-qt; + name = "adwaita-dark"; + }; + platformTheme = "gnome"; + }; + }; +} diff --git a/users/profiles/tmux.nix b/users/modules/global/tmux.nix similarity index 100% rename from users/profiles/tmux.nix rename to users/modules/global/tmux.nix diff --git a/users/profiles/vim.nix b/users/modules/global/vim.nix similarity index 100% rename from users/profiles/vim.nix rename to users/modules/global/vim.nix diff --git a/users/profiles/themeing.nix b/users/profiles/themeing.nix deleted file mode 100644 index 07f9a76..0000000 --- a/users/profiles/themeing.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ config, pkgs, ... }: { - gtk = { - enable = true; - gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc"; - - font = { - package = pkgs.dejavu_fonts; - name = "DejaVu Sans"; - size = 10; - }; - - iconTheme = { - package = pkgs.gnome.adwaita-icon-theme; - name = "Adwaita-dark"; - }; - - theme = { - package = pkgs.gnome.gnome-themes-extra; - name = "Adwaita-dark"; - }; - }; - - qt = { - enable = true; - style = { - package = pkgs.adwaita-qt; - name = "adwaita-dark"; - }; - platformTheme = "gnome"; - }; -}