diff --git a/flake.lock.up.bk b/flake.lock.up.bk new file mode 100644 index 0000000..fe7d582 --- /dev/null +++ b/flake.lock.up.bk @@ -0,0 +1,82 @@ +{ + "nodes": { + "dotfiles": { + "flake": false, + "locked": { + "lastModified": 1728755658, + "narHash": "sha256-wBITZXL6P5tAbz2jsUzEDxPUaMLIx2I/NT0WXAiQJg8=", + "ref": "refs/heads/main", + "rev": "f2f874c82656d8588c8a611b007f2e35d8eb72f3", + "revCount": 29, + "type": "git", + "url": "https://github.com/nomadics9/dotfiles.git" + }, + "original": { + "type": "git", + "url": "https://github.com/nomadics9/dotfiles.git" + } + }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1727817100, + "narHash": "sha256-dlyV9/eiWkm/Y/t2+k4CFZ29tBvCANmJogEYaHeAOTw=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "437ec62009fa8ceb684eb447d455ffba25911cf9", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1727802920, + "narHash": "sha256-HP89HZOT0ReIbI7IJZJQoJgxvB2Tn28V6XS3MNKnfLs=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "27e30d177e57d912d614c88c622dcfdb2e6e6515", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1720535198, + "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "dotfiles": "dotfiles", + "home-manager": "home-manager", + "nixpkgs": "nixpkgs", + "nixpkgs-stable": "nixpkgs-stable" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/home/features/desktop/wayland.nix b/home/features/desktop/wayland.nix index 6eb4fff..908f53b 100644 --- a/home/features/desktop/wayland.nix +++ b/home/features/desktop/wayland.nix @@ -19,7 +19,7 @@ in layer = "top"; modules-left = [ "custom/launcher" "cpu" "memory" "custom/weather" "hyprland/workspaces" ]; modules-center = [ "mpris" ]; - modules-right = [ "network" "pulseaudio" "backlight" "battery" "clock" "tray" "hyprland/language" "custom/wallpaper" "custom/refresh-rate" ]; + modules-right = [ "network" "pulseaudio" "backlight" "battery" "clock" "tray" "hyprland/language" "custom/wallpaper" "idle_inhibitor" "custom/refresh-rate" ]; "hyprland/workspaces" = { format = "{name}"; @@ -173,13 +173,21 @@ in tooltip = false; }; + "idle_inhibitor" = { + format = "{icon}"; + format-icons = { + activated = " "; + deactivated = " "; + }; + }; + "custom/launcher" = { format = "󱄅"; on-click = "wofi --show drun --allow-images"; }; "custom/wallpaper" = { - format = "󰸉"; + format = "󰸉 "; on-click = "bash ~/.config/hypr/scripts/changewallpaper.sh"; }; }; @@ -219,7 +227,6 @@ in #mode, #custom-lock, #workspaces, - #idle_inhibitor, #custom-launcher, #custom-spotify, #custom-weather, @@ -431,46 +438,47 @@ in margin-top: 7px; margin-bottom: 7px; } - #language { - color: #8a909e; - font-family: Iosevka Nerd Font; - font-weight: bold; - border-radius : 8px 0 0 8px; - margin-top: 7px; - margin-bottom: 7px; - } - - #custom-refresh-rate { - color: #8a909e; - margin-right: 12px; - border-radius: 8px; - padding: 0 6px 0 6.8px; - border-radius: 0 8px 8px 0; - margin-top: 7px; - margin-bottom: 7px; - } - #custom-wallpaper { - color: #8a909e; - padding-right: 7; - padding-left: 7; - } - #custom-wallpaper, + #language, - #custom-refresh-rate { + #custom-refresh-rate, + #custom-wallpaper, + #idle_inhibitor { background-color: #252733; - padding: 0em 2em; + color: #8a909e; + font-family: JetBrains Mono Nerd Font; + font-weight: bold; + font-size: 17px; + padding: 0 7px; /* Adjust padding here */ + margin-top: 7px; + margin-bottom: 7px; + padding-top: 3px; + padding-bottom: 3px; +} - font-size: 17px; +#language { + border-radius: 8px 0 0 8px; /* Rounded on the left */ +} - padding-left: 7.5px; - padding-right: 7.5px; +#custom-refresh-rate { + border-radius: 0 8px 8px 0; /* Rounded on the right */ + margin-right: 12px; +} - padding-top: 3px; - padding-bottom: 3px; +#custom-wallpaper, +#idle_inhibitor { + /* No border-radius here to avoid separation */ + padding-left: 7px; + padding-right: 7px; +} - margin-top: 7px; - margin-bottom: 7px; - } +/* Remove additional borders/margins that might cause separation */ +#idle_inhibitor, +#custom-wallpaper { + margin-left: 0; /* Reset margin */ + margin-right: 0; /* Reset margin */ + margin-top: 7px; /* Reset margin */ + margin-bottom: 7px; /* Reset margin */ +} tooltip { font-family: Iosevka Nerd Font; @@ -505,13 +513,10 @@ in background-color: #eb4d4b; } - #idle_inhibitor { - background-color: #242933; - } - #idle_inhibitor.activated { background-color: #ecf0f1; color: #2d3436; + border-radius: 8px } #mpris, #custom-spotify { diff --git a/home/nomad/unkown.nix b/home/nomad/unkown.nix index f828a61..64a7958 100644 --- a/home/nomad/unkown.nix +++ b/home/nomad/unkown.nix @@ -41,7 +41,7 @@ } ]; monitor = [ - "eDP-1,1920x1080@60,0x0,1" + "eDP-1,2560x1600@60,0x0,1.25" "DP-2,1920x1080@60,auto,1" ];