22 files changed, 150 insertions, 232 deletions
diff --git a/home/configurations/boopy@alpha.nix b/home/alpha/boopy.nix
index 237eb11..237eb11 100644
--- a/home/configurations/boopy@alpha.nix
+++ b/home/alpha/boopy.nix
diff --git a/home/configurations/default.nix b/home/configurations/default.nix
deleted file mode 100644
index ac44363..0000000
--- a/home/configurations/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ self, ... } @ inputs:
-
-{
-  "boopy@alpha" = self.lib.mkHome "boopy" "alpha" "x86_64-linux" inputs.nixpkgs "22.05";
-}
diff --git a/home/default.nix b/home/default.nix
new file mode 100644
index 0000000..62e6aea
--- /dev/null
+++ b/home/default.nix
@@ -0,0 +1,22 @@
+{ self, nixpkgs, ... } @ inputs:
+
+{
+  "boopy@alpha" = self.lib.mkHome {
+    username = "boopy";
+    hostname = "alpha";
+    system = "x86_64-linux";
+    pkgs = import nixpkgs { system = "x86_64-linux"; overlays = [ inputs.rust-overlay.overlay ]; };
+
+    extraModules = [
+      ./profiles
+      ./profiles/base
+      ./profiles/browsing
+      ./profiles/development
+      ./profiles/messaging
+      ./profiles/multimedia
+      ./profiles/research
+    ];
+
+    version = "22.05";
+  };
+}
diff --git a/home/modules/default.nix b/home/modules/default.nix
deleted file mode 100644
index b096729..0000000
--- a/home/modules/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "profiles" = import ./profiles;
-  "profiles/base" = import ./profiles/base;
-  "profiles/browsing" = import ./profiles/browsing;
-  "profiles/development" = import ./profiles/development;
-  "profiles/messaging" = import ./profiles/messaging;
-  "profiles/multimedia" = import ./profiles/multimedia;
-  "profiles/research" = import ./profiles/research;
-
-  "programs/nixpkgs" = import ./programs/nixpkgs;
-  "programs/zshell" = import ./programs/zshell;
-  "programs/spotify-tui" = import ./programs/spotify-tui;
-
-  "misc/home" = import ./misc/home;
-  "misc/neotheme" = import ./misc/neotheme;
-}
diff --git a/home/modules/misc/home/default.nix b/home/modules/misc/home/default.nix
deleted file mode 100644
index 80232e7..0000000
--- a/home/modules/misc/home/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ config, pkgs, lib, nixpkgs, self, ... }:
-
-{
-  profiles.base.enable = true;
-  fonts.fontconfig.enable = true;
-
-
-  home = {
-    stateVersion = "22.05";
-  };
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/home/modules/profiles/base/config/waybar-settings-new.nix b/home/modules/profiles/base/config/waybar-settings-new.nix
deleted file mode 100644
index 4b55a05..0000000
--- a/home/modules/profiles/base/config/waybar-settings-new.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  # DISCLAIMER! On 22.05, do NOT use this until https://github.com/nix-community/home-manager/issues/2546 is solved.
-  layer = "bottom";
-  position = "top";
-  height = 17;
-  modules-left = [ "sway/workspaces" "sway/language" "cpu" "memory" ];
-  modules-center = [ "clock" ];
-  modules-right = [ "custom/weather" "pulseaudio" "network" ];
-
-  "sway/workspaces" = {
-    all-outputs = true;
-
-    persistent_workspaces = {
-      "α" = [ ];
-      "β" = [ ];
-      "γ" = [ ];
-      "δ" = [ ];
-      "ε" = [ ];
-      "ζ" = [ ];
-      "η" = [ ];
-      "θ" = [ ];
-      "ι" = [ ];
-      "κ" = [ ];
-    };
-  };
-
-  "sway/language" = {
-    format = " {long}";
-  };
-
-  "clock" = {
-    interval = 10;
-    format = "{:  %m/%d/%Y %I:%M %p}";
-  };
-
-  "cpu" = {
-    interval = 5;
-    format = "  {load}%   {usage}%";
-  };
-
-  "custom/weather" = {
-    format = "  {}";
-    exec = "curl 'wttr.in/?format='%t+-+%x+%C++%w'&M'";
-    interval = 3600;
-  };
-
-  "network" = {
-    interface = "enp4s0";
-    format = "  {ifname}";
-    format-wifi = "  {essid}";
-    format-ethernet = "  {ifname} {ipaddr}";
-    format-disconnected = "  Disconnected";
-    max-length = 50;
-  };
-
-  "pulseaudio" = {
-    format = "{icon} {volume}%";
-    format-muted = "婢  Muted";
-    format-source = "";
-    format-source-muted = "Muted";
-    format-icons.default = [ " " " " " " ];
-  };
-
-  "memory" = {
-    interval = 5;
-    format = " {used:0.1f}G / {total:0.1f}G ({percentage}%)";
-  };
-}
diff --git a/home/modules/profiles/base/config/waybar-settings.nix b/home/modules/profiles/base/config/waybar-settings.nix
deleted file mode 100644
index fb691c0..0000000
--- a/home/modules/profiles/base/config/waybar-settings.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{ neotheme }:
-
-with neotheme.colors;
-{
-  layer = "bottom";
-  position = "top";
-  height = 21;
-  modules-left = [ "pulseaudio" "custom/seperator" "cpu" "custom/seperator" "memory" ];
-  modules-center = [ "sway/workspaces" ];
-  modules-right = [ "clock" ];
-
-  modules = {
-    "sway/workspaces" = {
-      all-outputs = true;
-      persistent_workspaces = {
-        "α" = [ ];
-        "β" = [ ];
-        "γ" = [ ];
-        "δ" = [ ];
-        "ε" = [ ];
-        "ζ" = [ ];
-        "η" = [ ];
-        "θ" = [ ];
-        "ι" = [ ];
-        "κ" = [ ];
-      };
-    };
-
-    "clock" = {
-      interval = 10;
-      format = "<span foreground='#${color5}'></span> {:%A, %b %d %H:%M}";
-    };
-
-    "cpu" = {
-      interval = 5;
-      format = "<span foreground='#${color2}'></span> {usage:3}%";
-    };
-
-    "pulseaudio" = {
-      format = "<span foreground='#${color4}'>{icon}</span> {volume}%";
-      format-muted = "ﱝ  Muted";
-      format-icons.default = [ " " " " " " ];
-    };
-
-    "memory" = {
-      interval = 5;
-      format = "<span foreground='#${color3}'>﬙</span> {used:0.2f}GiB";
-    };
-
-    "custom/seperator" = {
-      format = "|";
-      interval = "once";
-      tooltip = false;
-    };
-  };
-}
diff --git a/home/modules/profiles/multimedia/default.nix b/home/modules/profiles/multimedia/default.nix
deleted file mode 100644
index 47cc1a9..0000000
--- a/home/modules/profiles/multimedia/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ config, lib, pkgs, ... }:
-let cfg = config.profiles.multimedia;
-in
-{
-  options.profiles.multimedia = {
-    enable = lib.mkEnableOption
-      "A profile that enables the system to be used for consuming multimedia contents.";
-  };
-
-  config = lib.mkIf cfg.enable {
-    home.packages = with pkgs; [ spotify playerctl ];
-
-    # services.spotifyd = {
-    #   enable = true;
-    #
-    #   package = (pkgs.spotifyd.override { withMpris = true; });
-    #
-    #   settings = {
-    #     global = {
-    #       username = "9nko3f7puya1e5bbo9c5ifddy";
-    #       password_cmd = "${pkgs.pass}/bin/pass www/spotify.com | head -n1";
-    #     };
-    #   };
-    # };
-    #
-    # programs.spotify-tui = {
-    #   enable = true;
-    #
-    #   settings = {
-    #     theme = {
-    #       active = "Cyan";
-    #       banner = "LightCyan";
-    #     };
-    #
-    #     behavior = {
-    #       seek_milliseconds = 5000;
-    #       volume_increment = 10;
-    #     };
-    #   };
-    # };
-
-    nixpkgs.allowedUnfree = [ "spotify" "spotify-unwrapped" ];
-  };
-}
diff --git a/home/modules/profiles/base/config/dunst.nix b/home/profiles/base/config/dunst.nix
index 60ed15f..60ed15f 100644
--- a/home/modules/profiles/base/config/dunst.nix
+++ b/home/profiles/base/config/dunst.nix
diff --git a/home/modules/profiles/base/config/foot.nix b/home/profiles/base/config/foot.nix
index 08a38e7..08a38e7 100644
--- a/home/modules/profiles/base/config/foot.nix
+++ b/home/profiles/base/config/foot.nix
diff --git a/home/modules/profiles/base/config/sway.nix b/home/profiles/base/config/sway.nix
index 00dae28..00dae28 100644
--- a/home/modules/profiles/base/config/sway.nix
+++ b/home/profiles/base/config/sway.nix
diff --git a/home/profiles/base/config/waybar-settings.nix b/home/profiles/base/config/waybar-settings.nix
new file mode 100644
index 0000000..089fefb
--- /dev/null
+++ b/home/profiles/base/config/waybar-settings.nix
@@ -0,0 +1,54 @@
+{ neotheme }:
+
+with neotheme.colors;
+{
+  layer = "bottom";
+  position = "top";
+  height = 21;
+  modules-left = [ "pulseaudio" "custom/seperator" "cpu" "custom/seperator" "memory" ];
+  modules-center = [ "sway/workspaces" ];
+  modules-right = [ "clock" ];
+
+  "sway/workspaces" = {
+    all-outputs = true;
+    persistent_workspaces = {
+      "α" = [ ];
+      "β" = [ ];
+      "γ" = [ ];
+      "δ" = [ ];
+      "ε" = [ ];
+      "ζ" = [ ];
+      "η" = [ ];
+      "θ" = [ ];
+      "ι" = [ ];
+      "κ" = [ ];
+    };
+  };
+
+  "clock" = {
+    interval = 10;
+    format = "<span foreground='#${color5}'></span> {:%A, %b %d %H:%M}";
+  };
+
+  "cpu" = {
+    interval = 5;
+    format = "<span foreground='#${color2}'></span> {usage:3}%";
+  };
+
+  "pulseaudio" = {
+    format = "<span foreground='#${color4}'>{icon}</span> {volume}%";
+    format-muted = "ﱝ  Muted";
+    format-icons.default = [ " " " " " " ];
+  };
+
+  "memory" = {
+    interval = 5;
+    format = "<span foreground='#${color3}'>﬙</span> {used:0.2f}GiB";
+  };
+
+  "custom/seperator" = {
+    format = "|";
+    interval = "once";
+    tooltip = false;
+  };
+}
diff --git a/home/modules/profiles/base/config/waybar-style.nix b/home/profiles/base/config/waybar-style.nix
index e3f30f6..0901a6a 100644
--- a/home/modules/profiles/base/config/waybar-style.nix
+++ b/home/profiles/base/config/waybar-style.nix
@@ -70,7 +70,7 @@ with neotheme.colors;
   }
 
   #custom-seperator {
-    color: #${bright0};
+    color: #${alt1};
     background-color: #${background};
     border-bottom: 1px solid #${bright0};
   }
diff --git a/home/modules/profiles/base/default.nix b/home/profiles/base/default.nix
index 3d75618..7b62442 100644
--- a/home/modules/profiles/base/default.nix
+++ b/home/profiles/base/default.nix
@@ -5,14 +5,19 @@ let
   neotheme = config.neotheme;
 
   inherit (self.packages.x86_64-linux) neovim iosevka-pure-bin phocus;
-
-  inherit (self.non-flake) wallpapers;
 in
 {
+  imports = [
+    ../../modules/programs/nixpkgs
+    ../../modules/programs/zshell
+    ../../modules/misc/neotheme
+  ];
+
   options.profiles.base.enable = lib.mkEnableOption
     "The base profile, should be always enabled";
 
   config = lib.mkIf cfg.enable {
+
     home.sessionVariables = rec {
       EDITOR = "nvim";
       VISUAL = "nvim";
@@ -54,12 +59,13 @@ in
         bright7 = "e4e4db";
       };
 
-      wallpaper = "${wallpapers}/nixos/nix-glow-fg-d4ae80.png";
+      wallpaper = "${self.inputs.wallpapers}/nixos/nix-glow-fg-d4ae80.png";
     };
 
     home.keyboard.layout = "us";
     home.packages = [
       pkgs.hydra-check
+      pkgs.sops
       neovim
 
       # Fonts
@@ -74,6 +80,8 @@ in
       (pkgs.nerdfonts.override { fonts = [ "Iosevka" "JetBrainsMono" ]; })
     ];
 
+    fonts.fontconfig.enable = true;
+
 
     wayland.windowManager.sway = {
       enable = true;
diff --git a/home/modules/profiles/base/p10k-config/p10k.zsh b/home/profiles/base/p10k-config/p10k.zsh
index aa6bc2c..aa6bc2c 100644
--- a/home/modules/profiles/base/p10k-config/p10k.zsh
+++ b/home/profiles/base/p10k-config/p10k.zsh
diff --git a/home/modules/profiles/browsing/default.nix b/home/profiles/browsing/default.nix
index 86f3cc1..86f3cc1 100644
--- a/home/modules/profiles/browsing/default.nix
+++ b/home/profiles/browsing/default.nix
diff --git a/home/modules/profiles/browsing/qutebrowser-settings.nix b/home/profiles/browsing/qutebrowser-settings.nix
index 0d7fa07..4486d0f 100644
--- a/home/modules/profiles/browsing/qutebrowser-settings.nix
+++ b/home/profiles/browsing/qutebrowser-settings.nix
@@ -8,7 +8,7 @@ let
   base04 = "#090a10";
   base05 = "#cbc0ab";
   base06 = "#e0d6bd";
-  base07 = "#27282e";
+  base07 = "#4f5058";
   base08 = "#b17f81";
   base09 = "#e9b189";
   base0A = "#d4ae80";
@@ -292,13 +292,13 @@ in
   colors.tabs.selected.odd.fg = base05;
 
   # Background color of selected odd tabs.
-  colors.tabs.selected.odd.bg = base02;
+  colors.tabs.selected.odd.bg = base07;
 
   # Foreground color of selected even tabs.
   colors.tabs.selected.even.fg = base05;
 
   # Background color of selected even tabs.
-  colors.tabs.selected.even.bg = base02;
+  colors.tabs.selected.even.bg = base07;
 
   # Background color for webpages if unset (or empty to use the theme's
   # color).
diff --git a/home/modules/profiles/default.nix b/home/profiles/default.nix
index af9d9a8..af9d9a8 100644
--- a/home/modules/profiles/default.nix
+++ b/home/profiles/default.nix
diff --git a/home/modules/profiles/development/default.nix b/home/profiles/development/default.nix
index 75f482f..b0b8309 100644
--- a/home/modules/profiles/development/default.nix
+++ b/home/profiles/development/default.nix
@@ -2,8 +2,6 @@
 
 let
   cfg = config.profiles.development;
-
-  inherit (self.packages.x86_64-linux) rust-nightly;
 in
 {
   options.profiles.development = {
@@ -68,14 +66,16 @@ in
 
     home.packages = [
       pkgs.bfg-repo-cleaner
+      pkgs.diffoscopeMinimal
       # Fix gpg not recognizing foot terminfo
       pkgs.foot.terminfo
+      pkgs.jq
+      pkgs.nixpkgs-fmt
+      pkgs.nixpkgs-review
       pkgs.ripgrep
       pkgs.rust-analyzer
-      rust-nightly
+      (pkgs.rust-bin.nightly.latest.default.override { extensions = [ "rust-src" ]; })
       pkgs.tig
-      pkgs.silver-searcher
-      pkgs.diffoscopeMinimal
     ];
 
     services.gpg-agent = {
diff --git a/home/modules/profiles/messaging/default.nix b/home/profiles/messaging/default.nix
index 76dc0fc..a25f4e1 100644
--- a/home/modules/profiles/messaging/default.nix
+++ b/home/profiles/messaging/default.nix
@@ -2,6 +2,8 @@
 let cfg = config.profiles.messaging;
 in
 {
+  imports = [ ../../modules/programs/nixpkgs ];
+  
   options.profiles.messaging = {
     enable = lib.mkEnableOption
       "A profile that enables the system to communicate via internet.";
@@ -9,6 +11,7 @@ in
 
   config = lib.mkIf cfg.enable {
     home.packages = with pkgs; [ discord-canary aerc weechat element slack ];
+    
     nixpkgs.allowedUnfree = [ "discord-canary" "slack" ];
   };
 }
diff --git a/home/profiles/multimedia/default.nix b/home/profiles/multimedia/default.nix
new file mode 100644
index 0000000..0554258
--- /dev/null
+++ b/home/profiles/multimedia/default.nix
@@ -0,0 +1,49 @@
+{ config, lib, pkgs, ... }:
+let cfg = config.profiles.multimedia;
+in
+{
+    imports = [
+      ../../modules/programs/nixpkgs
+      ../../modules/programs/spotify-tui
+    ];
+
+  options.profiles.multimedia = {
+    enable = lib.mkEnableOption
+      "A profile that enables the system to be used for consuming multimedia contents.";
+  };
+
+  config = lib.mkIf cfg.enable {
+    home.packages = with pkgs; [ playerctl ];
+
+    services.spotifyd = {
+      enable = true;
+
+      package = (pkgs.spotifyd.override { withMpris = true; });
+
+      settings = {
+        global = {
+          username = "9nko3f7puya1e5bbo9c5ifddy";
+          password_cmd = "cat /run/secrets/spotify-password"; # DISCLAIMER: this expects the `spotify` secret to be present (sops-nix)
+        };
+      };
+    };
+
+    programs.spotify-tui = {
+      enable = true;
+
+      settings = {
+        theme = {
+          active = "Cyan";
+          banner = "LightCyan";
+        };
+
+        behavior = {
+          seek_milliseconds = 5000;
+          volume_increment = 10;
+        };
+      };
+    };
+
+    nixpkgs.allowedUnfree = [ "spotify" "spotify-unwrapped" ];
+  };
+}
diff --git a/home/modules/profiles/research/default.nix b/home/profiles/research/default.nix
index 5741400..0c57f06 100644
--- a/home/modules/profiles/research/default.nix
+++ b/home/profiles/research/default.nix
@@ -2,6 +2,8 @@
 let cfg = config.profiles.research;
 in
 {
+  imports = [ ../../modules/programs/nixpkgs ];
+  
   options.profiles.research = {
     enable = lib.mkEnableOption
       "A profile that enables the system to be used for researching various topics.";