diff --git a/flake.nix b/flake.nix
index 201893f..2401156 100644
--- a/flake.nix
+++ b/flake.nix
@@ -94,6 +94,7 @@
{
home-manager.backupFileExtension = "backup";
home-manager.useGlobalPkgs = true;
+ home-manager.useUserPackages = true;
home-manager.sharedModules = [
plasma-manager.homeManagerModules.plasma-manager
sops-nix.homeManagerModules.sops
diff --git a/home/hypr.nix b/home/hypr.nix
index b053b61..c6c1226 100644
--- a/home/hypr.nix
+++ b/home/hypr.nix
@@ -4,11 +4,232 @@
...
}: {
programs.waybar = {
- enable = false;
+ enable = true;
systemd = {
enable = true;
target = "hyprland-session.target";
};
+ style = ''
+ * {
+ font-family: "JetBrainsMono Nerd Font";
+ font-size: 12pt;
+ font-weight: bold;
+ border-radius: 8px;
+ transition-property: background-color;
+ transition-duration: 0.5s;
+ }
+ @keyframes blink_red {
+ to {
+ background-color: rgb(242, 143, 173);
+ color: rgb(26, 24, 38);
+ }
+ }
+ .warning, .critical, .urgent {
+ animation-name: blink_red;
+ animation-duration: 1s;
+ animation-timing-function: linear;
+ animation-iteration-count: infinite;
+ animation-direction: alternate;
+ }
+ window#waybar {
+ background-color: transparent;
+ }
+ window > box {
+ margin-left: 5px;
+ margin-right: 5px;
+ margin-top: 5px;
+ background-color: #1e1e2a;
+ padding: 3px;
+ padding-left:8px;
+ border: 2px none #33ccff;
+ }
+ #workspaces {
+ padding-left: 0px;
+ padding-right: 4px;
+ }
+ #workspaces button {
+ padding-top: 5px;
+ padding-bottom: 5px;
+ padding-left: 6px;
+ padding-right: 6px;
+ }
+ #workspaces button.active {
+ background-color: rgb(181, 232, 224);
+ color: rgb(26, 24, 38);
+ }
+ #workspaces button.urgent {
+ color: rgb(26, 24, 38);
+ }
+ #workspaces button:hover {
+ background-color: rgb(248, 189, 150);
+ color: rgb(26, 24, 38);
+ }
+ tooltip {
+ background: rgb(48, 45, 65);
+ }
+ tooltip label {
+ color: rgb(217, 224, 238);
+ }
+ #custom-launcher {
+ font-size: 20px;
+ padding-left: 8px;
+ padding-right: 6px;
+ color: #7ebae4;
+ }
+ #mode, #clock, #memory, #temperature,#cpu,#mpd, #custom-wall, #temperature, #backlight, #pulseaudio, #network, #battery, #custom-powermenu, #custom-cava-internal {
+ padding-left: 10px;
+ padding-right: 10px;
+ }
+ /* #mode { */
+ /* margin-left: 10px; */
+ /* background-color: rgb(248, 189, 150); */
+ /* color: rgb(26, 24, 38); */
+ /* } */
+ #memory {
+ color: rgb(181, 232, 224);
+ }
+ #cpu {
+ color: rgb(245, 194, 231);
+ }
+ #clock {
+ color: rgb(217, 224, 238);
+ }
+ /* #idle_inhibitor {
+ color: rgb(221, 182, 242);
+ }*/
+ #custom-wall {
+ color: #33ccff;
+ }
+ #temperature {
+ color: rgb(150, 205, 251);
+ }
+ #backlight {
+ color: rgb(248, 189, 150);
+ }
+ #pulseaudio {
+ color: rgb(245, 224, 220);
+ }
+ #network {
+ color: #ABE9B3;
+ }
+ #network.disconnected {
+ color: rgb(255, 255, 255);
+ }
+ #custom-powermenu {
+ color: rgb(242, 143, 173);
+ padding-right: 8px;
+ }
+ #tray {
+ padding-right: 8px;
+ padding-left: 10px;
+ }
+ #mpd.paused {
+ color: #414868;
+ font-style: italic;
+ }
+ #mpd.stopped {
+ background: transparent;
+ }
+ #mpd {
+ color: #c0caf5;
+ }
+ #custom-cava-internal{
+ font-family: "Hack Nerd Font" ;
+ color: #33ccff;
+ }
+ '';
+ settings = [{
+ "layer" = "top";
+ "position" = "top";
+ modules-left = [
+ "custom/launcher"
+ "temperature"
+ "mpd"
+ "custom/cava-internal"
+ ];
+ modules-center = [
+ "clock"
+ ];
+ modules-right = [
+ "pulseaudio"
+ "backlight"
+ "memory"
+ "cpu"
+ "network"
+ "custom/powermenu"
+ "tray"
+ ];
+ "custom/launcher" = {
+ "format" = " ";
+ "on-click" = "pkill rofi || rofi2";
+ "on-click-middle" = "exec default_wall";
+ "on-click-right" = "exec wallpaper_random";
+ "tooltip" = false;
+ };
+ "custom/cava-internal" = {
+ "exec" = "sleep 1s && cava-internal";
+ "tooltip" = false;
+ };
+ "pulseaudio" = {
+ "scroll-step" = 1;
+ "format" = "{icon} {volume}%";
+ "format-muted" = " Muted";
+ "format-icons" = {
+ "default" = [ "" "" "" ];
+ };
+ "on-click" = "pamixer -t";
+ "tooltip" = false;
+ };
+ "clock" = {
+ "interval" = 1;
+ "format" = "{:%I:%M %p %A %b %d}";
+ "tooltip" = true;
+ "tooltip-format"= "{=%A; %d %B %Y}\n{calendar}";
+ };
+ "memory" = {
+ "interval" = 1;
+ "format" = " {percentage}%";
+ "states" = {
+ "warning" = 85;
+ };
+ };
+ "cpu" = {
+ "interval" = 1;
+ "format" = " {usage}%";
+ };
+ "mpd" = {
+ "max-length" = 25;
+ "format" = " {title}";
+ "format-paused" = " {title}";
+ "format-stopped" = "";
+ "format-disconnected" = "";
+ "on-click" = "mpc --quiet toggle";
+ "on-click-right" = "mpc update; mpc ls | mpc add";
+ "on-click-middle" = "kitty --class='ncmpcpp' ncmpcpp ";
+ "on-scroll-up" = "mpc --quiet prev";
+ "on-scroll-down" = "mpc --quiet next";
+ "smooth-scrolling-threshold" = 5;
+ "tooltip-format" = "{title} - {artist} ({elapsedTime:%M:%S}/{totalTime:%H:%M:%S})";
+ };
+ "network" = {
+ "format-disconnected" = " Disconnected";
+ "format-ethernet" = " Connected!";
+ "format-linked" = " {essid} (No IP)";
+ "format-wifi" = " {essid}";
+ "interval" = 1;
+ "tooltip" = false;
+ };
+ "custom/powermenu" = {
+ "format" = "";
+ "on-click" = "pkill rofi || ~/.config/rofi/powermenu/type-3/powermenu.sh";
+ "tooltip" = false;
+ };
+ "tray" = {
+ "icon-size" = 15;
+ "spacing" = 5;
+ };
+ }];
+
};
programs.hyprlock = {
diff --git a/hosts/ichigo/configuration.nix b/hosts/ichigo/configuration.nix
index bce55da..f4dee03 100644
--- a/hosts/ichigo/configuration.nix
+++ b/hosts/ichigo/configuration.nix
@@ -6,7 +6,8 @@
imports = [
./hardware-configuration.nix
../../nixos/desktop.nix
- #../../nixos/hypr.nix
+ # ../../nixos/plasma.nix
+ ../../nixos/hypr.nix
];
hardware.graphics = {
@@ -26,7 +27,6 @@
automount_opts = "x-systemd.automount,noauto,x-systemd.idle-timeout=60,x-systemd.device-timeout=5s,x-systemd.mount-timeout=5s,user,users";
credentials = "${config.sops.templates."smb-credentials".path}";
in ["${automount_opts},credentials=${credentials},uid=1000,gid=100"];
- #in ["${automount_opts},credentials=/etc/nixos/smb-secrets,uid=1000,gid=100"];
};
system.stateVersion = "24.11";
diff --git a/hosts/ichigo/home.nix b/hosts/ichigo/home.nix
index 8518606..ed5cd68 100644
--- a/hosts/ichigo/home.nix
+++ b/hosts/ichigo/home.nix
@@ -5,8 +5,8 @@
}: {
imports = [
../../home/desktop.nix
- #../../home/hypr.nix
- ../../home/plasma.nix
+ ../../home/hypr.nix
+ # ../../home/plasma.nix
];
home.stateVersion = "24.11";
diff --git a/nixos/desktop.nix b/nixos/desktop.nix
index 345f8a2..b658ef9 100644
--- a/nixos/desktop.nix
+++ b/nixos/desktop.nix
@@ -13,7 +13,7 @@
# Enable Bluetooth
hardware.bluetooth.enable = true;
- # Enable the KDE Plasma Desktop Environment.
+ # Enable SDDM
services.xserver.enable = true;
services.displayManager.sddm = {
enable = true;
@@ -22,12 +22,6 @@
enableHidpi = true;
};
- services.desktopManager.plasma6.enable = true;
- environment.plasma6.excludePackages = with pkgs.kdePackages; [
- elisa
- kate
- ];
-
# Catppuccin
catppuccin = {
sddm = {
@@ -62,6 +56,7 @@
ibm-plex
liberation_ttf
nerd-fonts.blex-mono
+ nerd-fonts.jetbrains-mono
noto-fonts
noto-fonts-cjk-sans
noto-fonts-emoji
@@ -108,16 +103,6 @@
# List packages installed in system profile.
environment.systemPackages = with pkgs; [
bitwarden-desktop
- (catppuccin-kde.override {
- flavour = ["mocha"];
- accents = [
- "blue"
- "lavender"
- "pink"
- "sapphire"
- ];
- winDecStyles = ["classic"];
- })
firefoxpwa
qpwgraph
yubioath-flutter
diff --git a/nixos/plasma.nix b/nixos/plasma.nix
new file mode 100644
index 0000000..3cac3d5
--- /dev/null
+++ b/nixos/plasma.nix
@@ -0,0 +1,24 @@
+{
+ pkgs,
+ ...
+}: {
+ services.desktopManager.plasma6.enable = true;
+ environment.plasma6.excludePackages = with pkgs.kdePackages; [
+ elisa
+ kate
+ ];
+
+ # List packages installed in system profile.
+ environment.systemPackages = with pkgs; [
+ (catppuccin-kde.override {
+ flavour = ["mocha"];
+ accents = [
+ "blue"
+ "lavender"
+ "pink"
+ "sapphire"
+ ];
+ winDecStyles = ["classic"];
+ })
+ ];
+}