From: Andrew Date: Sat, 23 Aug 2025 03:48:33 +0000 (-0400) Subject: unfixed and fixed ghostty. + reformat files X-Git-Url: http://git.skullheadx.com/nixos/projects.html?a=commitdiff_plain;h=61fd81562a9a2d7744e05b939948898e25dfb6fc;p=nixos.git unfixed and fixed ghostty. + reformat files --- diff --git a/configuration.nix b/configuration.nix index 13d3a6b..bb6bfe2 100644 --- a/configuration.nix +++ b/configuration.nix @@ -2,7 +2,12 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, ... }: +{ + config, + pkgs, + inputs, + ... +}: { imports = [ @@ -59,9 +64,9 @@ nixpkgs.config.allowUnfree = true; programs.hyprland = { - enable = true; + enable = true; withUWSM = true; - }; + }; # List packages installed in system profile. To search, run: # $ nix search wget @@ -72,7 +77,7 @@ hyprland kitty libnotify - bibata-cursors + bibata-cursors ]; programs.steam = { enable = true; @@ -103,22 +108,22 @@ nerd-fonts.jetbrains-mono nerd-fonts.fira-code nerd-fonts.droid-sans-mono - noto-fonts-color-emoji + noto-fonts-color-emoji ]; - - security.rtkit.enable = true; - services.pipewire = { - enable = true; - audio.enable = true; - pulse.enable = true; - alsa.enable = true; - }; - services.pipewire.wireplumber.enable = true; - - hardware = { - opengl.enable = true; - }; + security.rtkit.enable = true; + services.pipewire = { + enable = true; + audio.enable = true; + pulse.enable = true; + alsa.enable = true; + }; + services.pipewire.wireplumber.enable = true; + hardware = { + opengl = { + enable = true; + }; + }; # Some programs need SUID wrappers, can be configured further or are # started in user sessions. diff --git a/flake.lock b/flake.lock index e2aaa78..cc6afcd 100644 --- a/flake.lock +++ b/flake.lock @@ -83,6 +83,22 @@ "type": "github" } }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -104,6 +120,24 @@ "type": "github" } }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "fromYaml": { "flake": false, "locked": { @@ -120,6 +154,28 @@ "type": "github" } }, + "ghostty": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs", + "zig": "zig", + "zon2nix": "zon2nix" + }, + "locked": { + "lastModified": 1755899651, + "narHash": "sha256-TRD1b1R8uCwyzritcrI4F+7Gd+aU8uQEJXO+1ImZL2Q=", + "owner": "ghostty-org", + "repo": "ghostty", + "rev": "c014dd79f6f4526c1883f7bdbffda124ecf70f77", + "type": "github" + }, + "original": { + "owner": "ghostty-org", + "repo": "ghostty", + "type": "github" + } + }, "gnome-shell": { "flake": false, "locked": { @@ -158,6 +214,19 @@ } }, "nixpkgs": { + "locked": { + "lastModified": 1755770914, + "narHash": "sha256-CPJ7DELncy3IRAs0XDbGuHVyjPjPNDbIu/XASVjIupA=", + "rev": "9cb344e96d5b6918e94e1bca2d9f3ea1e9615545", + "type": "tarball", + "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.808519.9cb344e96d5b/nixexprs.tar.xz" + }, + "original": { + "type": "tarball", + "url": "https://channels.nixos.org/nixos-25.05/nixexprs.tar.xz" + } + }, + "nixpkgs_2": { "locked": { "lastModified": 1755186698, "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", @@ -200,8 +269,9 @@ }, "root": { "inputs": { + "ghostty": "ghostty", "home-manager": "home-manager", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "stylix": "stylix" } }, @@ -218,7 +288,7 @@ "nixpkgs" ], "nur": "nur", - "systems": "systems", + "systems": "systems_2", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -254,6 +324,21 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tinted-foot": { "flake": false, "locked": { @@ -334,6 +419,61 @@ "repo": "base16-zed", "type": "github" } + }, + "zig": { + "inputs": { + "flake-compat": [ + "ghostty", + "flake-compat" + ], + "flake-utils": [ + "ghostty", + "flake-utils" + ], + "nixpkgs": [ + "ghostty", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1748261582, + "narHash": "sha256-3i0IL3s18hdDlbsf0/E+5kyPRkZwGPbSFngq5eToiAA=", + "owner": "mitchellh", + "repo": "zig-overlay", + "rev": "aafb1b093fb838f7a02613b719e85ec912914221", + "type": "github" + }, + "original": { + "owner": "mitchellh", + "repo": "zig-overlay", + "type": "github" + } + }, + "zon2nix": { + "inputs": { + "flake-utils": [ + "ghostty", + "flake-utils" + ], + "nixpkgs": [ + "ghostty", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1742104771, + "narHash": "sha256-LhidlyEA9MP8jGe1rEnyjGFCzLLgCdDpYeWggibayr0=", + "owner": "jcollie", + "repo": "zon2nix", + "rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613", + "type": "github" + }, + "original": { + "owner": "jcollie", + "repo": "zon2nix", + "rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index c7ccd06..5d97a42 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,5 @@ { - description = "Skullhead's Flake"; + description = "Skullheadx's Flake"; inputs = { nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; @@ -34,6 +34,9 @@ home = lib.nixosSystem { inherit system; modules = [ ./configuration.nix ]; + specialArgs = { + inherit inputs; + }; }; }; homeConfigurations = { diff --git a/freetube.nix b/freetube.nix index 96f9a4a..d3ef894 100644 --- a/freetube.nix +++ b/freetube.nix @@ -2,31 +2,31 @@ { programs.freetube = { - enable = true; - settings = { - checkForUpdates = false; - defaultQuality = "1440"; - baseTheme = "catppuccinMocha"; - quickBookmarkTargetPlaylistId = "favorites"; - checkForBlogPosts = false; - generalAutoLoadMorePaginatedItemsEnabled = true; - openDeepLinksInNewWindow = true; - barColor = false; - hideLabelsSideBar = true; - hideHeaderLogo = false; - expandSideBar = true; - enableSubtitlesByDefaultvalue = true; - displayVideoPlayButton=true; - defaultViewingMode = "theatre"; - defaultPlayback = 2; - enableScreenshot = true; - screenshotAskPath = false; - hideTrendingVideos = true; - hideSubscriptionsShorts = true; - hideChannelShorts=true; - downloadBehavior = "download"; - useSponsorBlock = true; - }; + enable = true; + settings = { + checkForUpdates = false; + defaultQuality = "1440"; + baseTheme = "catppuccinMocha"; + quickBookmarkTargetPlaylistId = "favorites"; + checkForBlogPosts = false; + generalAutoLoadMorePaginatedItemsEnabled = true; + openDeepLinksInNewWindow = true; + barColor = false; + hideLabelsSideBar = true; + hideHeaderLogo = false; + expandSideBar = true; + enableSubtitlesByDefaultvalue = true; + displayVideoPlayButton = true; + defaultViewingMode = "theatre"; + defaultPlayback = 2; + enableScreenshot = true; + screenshotAskPath = false; + hideTrendingVideos = true; + hideSubscriptionsShorts = true; + hideChannelShorts = true; + downloadBehavior = "download"; + useSponsorBlock = true; + }; }; } diff --git a/ghostty.nix b/ghostty.nix index fb5287f..3fda034 100644 --- a/ghostty.nix +++ b/ghostty.nix @@ -1,5 +1,9 @@ -{ config, pkgs, ... }: - +{ + config, + pkgs, + inputs, + ... +}: { programs.ghostty = { enable = true; @@ -7,6 +11,7 @@ link-url = true; background-opacity = 0.8; background-blur = true; + }; }; } diff --git a/home.nix b/home.nix index 602a2de..c18531f 100644 --- a/home.nix +++ b/home.nix @@ -2,19 +2,19 @@ config, lib, pkgs, + inputs, ... }: - { imports = [ ./sh.nix + ./ghostty.nix ./hyprland/hyprland.nix ./hyprpaper.nix ./hypridle.nix ./hyprlock.nix ./hyprsunset.nix - ./ghostty.nix ./obsidian.nix ./fastfetch.nix ./udiskie.nix @@ -47,6 +47,7 @@ home.packages = with pkgs; [ # # Adds the 'hello':wq command to your environment. It prints a friendly # # "Hello, world!" when run. + discord neovim catppuccin-gtk @@ -60,19 +61,17 @@ wev obs-studio # hyprsysteminfo # application to display info about hyprland - hyprland-qt-support - hyprutils - hyprgraphics - hyprland-qtutils - - helvum - pavucontrol - - grim - slurp - swappy + hyprland-qt-support + hyprutils + hyprgraphics + hyprland-qtutils + helvum + pavucontrol + grim + slurp + swappy # # It is sometimes useful to fine-tune packages, for example, by applying # # overrides. You can do that directly here, just don't forget the @@ -101,21 +100,21 @@ # org.gradle.daemon.idletimeout=3600000 # ''; home.file = { - ".config/swappy/config".text = '' - [Default] - save_dir=$HOME/Screenshots - save_filename_format=Screenshot-%Y%m%d-%H%M%S.png - show_panel=true - line_size=5 - text_size=20 - text_font=monospace - paint_mode=brush - early_exit=true - fill_shape=false - auto_save=true - transparent=true - transparency=50 - ''; + ".config/swappy/config".text = '' + [Default] + save_dir=$HOME/Screenshots + save_filename_format=Screenshot-%Y%m%d-%H%M%S.png + show_panel=true + line_size=5 + text_size=20 + text_font=monospace + paint_mode=brush + early_exit=true + fill_shape=false + auto_save=true + transparent=true + transparency=50 + ''; }; @@ -177,18 +176,18 @@ enable = true; extraPortals = [ pkgs.xdg-desktop-portal-hyprland ]; }; - - services.gnome-keyring = { - enable = true; - }; - -services.hyprpolkitagent.enable = true; - home.pointerCursor = { - hyprcursor.enable = true; - name = "Bibata-Original-Classic"; - size = 25; - package = pkgs.bibata-cursors; - }; + + services.gnome-keyring = { + enable = true; + }; + + services.hyprpolkitagent.enable = true; + home.pointerCursor = { + hyprcursor.enable = true; + name = "Bibata-Original-Classic"; + size = 25; + package = pkgs.bibata-cursors; + }; # Let Home Manager install and manage itself. programs.home-manager.enable = true; } diff --git a/hypridle.nix b/hypridle.nix index 4747411..79ccb07 100644 --- a/hypridle.nix +++ b/hypridle.nix @@ -1,43 +1,43 @@ { config, pkgs, ... }: { - services.hypridle = { - enable = true; - settings = { - general = { - lock_cmd = "pidof hyprlock || hyprlock"; # avoid starting multiple hyprlock instances. - before_sleep_cmd = "loginctl lock-session"; # lock before suspend. - after_sleep_cmd = "hyprctl dispatch dpms on"; # to avoid having to press a key twice to turn on the display. - }; + services.hypridle = { + enable = true; + settings = { + general = { + lock_cmd = "pidof hyprlock || hyprlock"; # avoid starting multiple hyprlock instances. + before_sleep_cmd = "loginctl lock-session"; # lock before suspend. + after_sleep_cmd = "hyprctl dispatch dpms on"; # to avoid having to press a key twice to turn on the display. + }; - listener = [ - { - timeout = 150; # 2.5min. - on-timeout = "brightnessctl -s set 10"; # set monitor backlight to minimum, avoid 0 on OLED monitor. - on-resume = "brightnessctl -r"; # monitor backlight restore. - } - { - # turn off keyboard backlight, comment out this section if you dont have a keyboard backlight. - timeout = 150; # 2.5min. - on-timeout = "brightnessctl -sd rgb:kbd_backlight set 0"; # turn off keyboard backlight. - on-resume = "brightnessctl -rd rgb:kbd_backlight"; # turn on keyboard backlight. - } - { - timeout = 300; # 5min - on-timeout = "loginctl lock-session"; # lock screen when timeout has passed - } + listener = [ + { + timeout = 150; # 2.5min. + on-timeout = "brightnessctl -s set 10"; # set monitor backlight to minimum, avoid 0 on OLED monitor. + on-resume = "brightnessctl -r"; # monitor backlight restore. + } + { + # turn off keyboard backlight, comment out this section if you dont have a keyboard backlight. + timeout = 150; # 2.5min. + on-timeout = "brightnessctl -sd rgb:kbd_backlight set 0"; # turn off keyboard backlight. + on-resume = "brightnessctl -rd rgb:kbd_backlight"; # turn on keyboard backlight. + } + { + timeout = 300; # 5min + on-timeout = "loginctl lock-session"; # lock screen when timeout has passed + } - { - timeout = 330; # 5.5min - on-timeout = "hyprctl dispatch dpms off"; # screen off when timeout has passed - on-resume = "hyprctl dispatch dpms on && brightnessctl -r"; # screen on when activity is detected after timeout has fired. - } + { + timeout = 330; # 5.5min + on-timeout = "hyprctl dispatch dpms off"; # screen off when timeout has passed + on-resume = "hyprctl dispatch dpms on && brightnessctl -r"; # screen on when activity is detected after timeout has fired. + } - { - timeout = 1800; # 30min - on-timeout = "systemctl suspend"; # suspend pc - } - ]; - }; -}; + { + timeout = 1800; # 30min + on-timeout = "systemctl suspend"; # suspend pc + } + ]; + }; + }; } diff --git a/hyprland/binds.nix b/hyprland/binds.nix index d89f155..5f02ffd 100644 --- a/hyprland/binds.nix +++ b/hyprland/binds.nix @@ -57,7 +57,7 @@ in - "$mod, d, exec, ghostty" + "$mod, D, exec, uwsm app -- ghostty" "$mod, b, exec, brave" "$mod, space, exec, pkill rofi || rofi -show drun" "$mod, p, exec, pkill hyprpicker || hyprpicker -ar" diff --git a/hyprlock.nix b/hyprlock.nix index f78131b..6321a60 100644 --- a/hyprlock.nix +++ b/hyprlock.nix @@ -1,109 +1,115 @@ -{ config, pkgs, lib, ... }: +{ + config, + pkgs, + lib, + ... +}: let - font = "Monospace"; + font = "Monospace"; in { - programs.hyprlock = { - enable = true; - settings = { - # sample hyprlock.conf - # for more configuration options, refer https://wiki.hyprland.org/Hypr-Ecosystem/hyprlock - # - # rendered text in all widgets supports pango markup (e.g. or tags) - # ref. https://wiki.hyprland.org/Hypr-Ecosystem/hyprlock/#general-remarks - # - # shortcuts to clear password buffer: ESC, Ctrl+U, Ctrl+Backspace - # - # you can get started by copying this config to ~/.config/hypr/hyprlock.conf - # - general = { - hide_cursor = false; - }; + programs.hyprlock = { + enable = true; + settings = { + # sample hyprlock.conf + # for more configuration options, refer https://wiki.hyprland.org/Hypr-Ecosystem/hyprlock + # + # rendered text in all widgets supports pango markup (e.g. or tags) + # ref. https://wiki.hyprland.org/Hypr-Ecosystem/hyprlock/#general-remarks + # + # shortcuts to clear password buffer: ESC, Ctrl+U, Ctrl+Backspace + # + # you can get started by copying this config to ~/.config/hypr/hyprlock.conf + # + general = { + hide_cursor = false; + }; - # uncomment to enable fingerprint authentication - # auth { - # fingerprint { - # enabled = true - # ready_message = Scan fingerprint to unlock - # present_message = Scanning... - # retry_delay = 250 # in milliseconds - # } - # } + # uncomment to enable fingerprint authentication + # auth { + # fingerprint { + # enabled = true + # ready_message = Scan fingerprint to unlock + # present_message = Scanning... + # retry_delay = 250 # in milliseconds + # } + # } - animations = { - enabled = true; - bezier = "linear, 1, 1, 0, 0"; - animation = ["fadeIn, 1, 5, linear" - "fadeOut, 1, 5, linear" - "inputFieldDots, 1, 2, linear" - ]; - }; + animations = { + enabled = true; + bezier = "linear, 1, 1, 0, 0"; + animation = [ + "fadeIn, 1, 5, linear" + "fadeOut, 1, 5, linear" + "inputFieldDots, 1, 2, linear" + ]; + }; - background = { - monitor = ""; - path = "screenshot"; - blur_passes = 3; - blur_size = 8; - }; + background = { + monitor = ""; + path = "screenshot"; + blur_passes = 3; + blur_size = 8; + }; - input-field = lib.mkForce [ - { - monitor = ""; - size = "20, 5"; - outline_thickness = 3; - inner_color = "rgba(0, 0, 0, 0.0)"; # no fill + input-field = lib.mkForce [ + { + monitor = ""; + size = "20, 5"; + outline_thickness = 3; + inner_color = "rgba(0, 0, 0, 0.0)"; # no fill - outer_color = "rgba(33ccffee) rgba(00ff99ee) 45deg"; - check_color = "rgba(00ff99ee) rgba(ff6633ee) 120deg"; - fail_color = "rgba(ff6633ee) rgba(ff0066ee) 40deg"; + outer_color = "rgba(33ccffee) rgba(00ff99ee) 45deg"; + check_color = "rgba(00ff99ee) rgba(ff6633ee) 120deg"; + fail_color = "rgba(ff6633ee) rgba(ff0066ee) 40deg"; - font_color = "rgb(143, 143, 143)"; - fade_on_empty = false; - rounding = 15; + font_color = "rgb(143, 143, 143)"; + fade_on_empty = false; + rounding = 15; - font_family = "${font}"; - placeholder_text = "Input password..."; - fail_text = "$PAMFAIL"; + font_family = "${font}"; + placeholder_text = "Input password..."; + fail_text = "$PAMFAIL"; - # uncomment to use a letter instead of a dot to indicate the typed password - # dots_text_format = * - # dots_size = 0.4 - dots_spacing = 0.3; + # uncomment to use a letter instead of a dot to indicate the typed password + # dots_text_format = * + # dots_size = 0.4 + dots_spacing = 0.3; - # uncomment to use an input indicator that does not show the password length (similar to swaylock's input indicator) - # hide_input = true + # uncomment to use an input indicator that does not show the password length (similar to swaylock's input indicator) + # hide_input = true - position = "0, -20"; - halign = "center"; - valign = "center"; - } - ]; + position = "0, -20"; + halign = "center"; + valign = "center"; + } + ]; - # TIME - label = [ - { - monitor = ""; - text = "$TIME"; # ref. https://wiki.hyprland.org/Hypr-Ecosystem/hyprlock/#variable-substitution - font_size = 90; - font_family = "${font}"; + # TIME + label = [ + { + monitor = ""; + text = "$TIME"; # ref. https://wiki.hyprland.org/Hypr-Ecosystem/hyprlock/#variable-substitution + font_size = 90; + font_family = "${font}"; - position = "-30, 0"; - halign = "right"; - valign = "top"; - } + position = "-30, 0"; + halign = "right"; + valign = "top"; + } - # DATE - { - monitor = ""; - text = "cmd[update:60000] date +'%A, %d %B %Y'"; # update every 60 seconds - font_size = 25; - font_family = "${font}"; + # DATE + { + monitor = ""; + text = "cmd[update:60000] date +'%A, %d %B %Y'"; # update every 60 seconds + font_size = 25; + font_family = "${font}"; - position = "-30, -150"; - halign = "right"; - valign = "top"; - } - ]; - }; -}; + position = "-30, -150"; + halign = "right"; + valign = "top"; + } + ]; + }; + }; } diff --git a/hyprpaper.nix b/hyprpaper.nix index 013eae9..58c97f2 100644 --- a/hyprpaper.nix +++ b/hyprpaper.nix @@ -1,33 +1,34 @@ { config, pkgs, ... }: -let - hk_1440 = pkgs.fetchurl { - url = "https://raw.githubusercontent.com/Skullheadx/dotfiles/16c0b7ce0cf0a6286554a3bbe60c636871fb75c9/backgrounds/hollowknightbackground_2560x1440.png"; - hash = "sha256-NyfvBFeEkXe3Z6ZpciJlOEBOMvKQjZKoH9ji2jiqmj8="; - }; - hk_1080 = pkgs.fetchurl { - url = "https://raw.githubusercontent.com/Skullheadx/dotfiles/16c0b7ce0cf0a6286554a3bbe60c636871fb75c9/backgrounds/hollowknightbackground_1920x1080.png"; - hash = "sha256-mCqYc4w+S8aVALo6wMyXrWtCmfw78kIEcFAhxlFNbHQ="; - }; - testImage = pkgs.fetchurl { - url = "https://i.redd.it/mvev8aelh7zc1.png"; - hash = "sha256-lJjIq+3140a5OkNy/FAEOCoCcvQqOi73GWJGwR2zT9w"; - }; +let + hk_1440 = pkgs.fetchurl { + url = "https://raw.githubusercontent.com/Skullheadx/dotfiles/16c0b7ce0cf0a6286554a3bbe60c636871fb75c9/backgrounds/hollowknightbackground_2560x1440.png"; + hash = "sha256-NyfvBFeEkXe3Z6ZpciJlOEBOMvKQjZKoH9ji2jiqmj8="; + }; + hk_1080 = pkgs.fetchurl { + url = "https://raw.githubusercontent.com/Skullheadx/dotfiles/16c0b7ce0cf0a6286554a3bbe60c636871fb75c9/backgrounds/hollowknightbackground_1920x1080.png"; + hash = "sha256-mCqYc4w+S8aVALo6wMyXrWtCmfw78kIEcFAhxlFNbHQ="; + }; + testImage = pkgs.fetchurl { + url = "https://i.redd.it/mvev8aelh7zc1.png"; + hash = "sha256-lJjIq+3140a5OkNy/FAEOCoCcvQqOi73GWJGwR2zT9w"; + }; in { services.hyprpaper = { - enable = true; - settings = { - ipc = "on"; - splash = false; - preload = [ - (builtins.toString hk_1440) - (builtins.toString hk_1080) - ]; + enable = true; + settings = { + ipc = "on"; + splash = false; + preload = [ + (builtins.toString hk_1440) + (builtins.toString hk_1080) + ]; - wallpaper = [ - "DP-3,${builtins.toString hk_1440}" - "DP-2,${builtins.toString hk_1080}" - ]; - }; -};} + wallpaper = [ + "DP-3,${builtins.toString hk_1440}" + "DP-2,${builtins.toString hk_1080}" + ]; + }; + }; +} diff --git a/waybar.nix b/waybar.nix index cdc18b1..07d42fd 100644 --- a/waybar.nix +++ b/waybar.nix @@ -5,10 +5,10 @@ settings = [ { - output = [ "DP-3"]; - #height = 24; # Waybar height + output = [ "DP-3" ]; + #height = 24; # Waybar height spacing = 4; # Gaps between modules - fixed-center = true; + fixed-center = true; modules-left = [ "hyprland/workspaces" @@ -36,12 +36,12 @@ "2" = ""; "3" = ""; "4" = ""; - "5" = "󰡈"; - "6" = ""; - "7" = "7"; - "8" = ""; + "5" = "󰊴"; + "6" = ""; + "7" = "7"; + "8" = ""; "9" = "󰠮"; - "10" = "10"; + "10" = "10"; }; }; @@ -144,12 +144,12 @@ "2" = ""; "3" = ""; "4" = ""; - "5" = "󰡈"; - "6" = ""; - "7" = "7"; - "8" = ""; + "5" = "󰊴"; + "6" = ""; + "7" = "7"; + "8" = ""; "9" = "󰠮"; - "10" = "10"; + "10" = "10"; }; }; @@ -166,181 +166,181 @@ } ]; style = '' -* { - font-size: 14px; - border-radius: 5px; -} + * { + font-size: 14px; + border-radius: 5px; + } -window#waybar { - /* `otf-font-awesome` is required to be installed for icons */ - font-family: jetbrains-mono, monospace; - background-color: transparent; - border-bottom: 0px; - color: #ebdbb2; - transition-property: background-color; - transition-duration: .5s; -} + window#waybar { + /* `otf-font-awesome` is required to be installed for icons */ + font-family: jetbrains-mono, monospace; + background-color: transparent; + border-bottom: 0px; + color: #ebdbb2; + transition-property: background-color; + transition-duration: .5s; + } -window#waybar.hidden { - opacity: 0.2; -} + window#waybar.hidden { + opacity: 0.2; + } -window#waybar.empty #window { - background-color: transparent; -} + window#waybar.empty #window { + background-color: transparent; + } -/* -window#waybar.empty { - background-color: transparent; -} -window#waybar.solo { - background-color: #FFFFFF; -} -*/ + /* + window#waybar.empty { + background-color: transparent; + } + window#waybar.solo { + background-color: #FFFFFF; + } + */ -.modules-right { - margin: 10px 10px 0 0; -} -.modules-center { - margin: 10px 0 0 0; -} -.modules-left { - margin: 10px 0 0 10px; -} + .modules-right { + margin: 10px 10px 0 0; + } + .modules-center { + margin: 10px 0 0 0; + } + .modules-left { + margin: 10px 0 0 10px; + } -button { - /* Use box-shadow instead of border so the text isn't offset */ - /* box-shadow: inset 0 -3px transparent; */ - border: none; -} + button { + /* Use box-shadow instead of border so the text isn't offset */ + /* box-shadow: inset 0 -3px transparent; */ + border: none; + } -/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */ -/* -button:hover { - background: inherit; - box-shadow: inset 0 -3px #ebdbb2; -} */ + /* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */ + /* + button:hover { + background: inherit; + box-shadow: inset 0 -3px #ebdbb2; + } */ -#workspaces { - background-color: #282828; -} + #workspaces { + background-color: #282828; + } -#workspaces button { - padding: 0 5px; - background-color: transparent; - color: #ebdbb2; - border-radius: 0; -} + #workspaces button { + padding: 0 5px; + background-color: transparent; + color: #ebdbb2; + border-radius: 0; + } -#workspaces button:first-child { - border-radius: 5px 0 0 5px; -} + #workspaces button:first-child { + border-radius: 5px 0 0 5px; + } -#workspaces button:last-child { - border-radius: 0 5px 5px 0; -} + #workspaces button:last-child { + border-radius: 0 5px 5px 0; + } -#workspaces button:hover { - color: #d79921; -} + #workspaces button:hover { + color: #d79921; + } -#workspaces button.focused { - background-color: #665c54; - /* box-shadow: inset 0 -3px #ffffff; */ -} + #workspaces button.focused { + background-color: #665c54; + /* box-shadow: inset 0 -3px #ffffff; */ + } -#workspaces button.urgent { - background-color: #b16286; -} + #workspaces button.urgent { + background-color: #b16286; + } -#idle_inhibitor, -#cava, -#scratchpad, -#mode, -#window, -#clock, -#battery, -#backlight, -#wireplumber, -#tray, -#mpris, -#load { - padding: 0 10px; - background-color: #282828; - color: #ebdbb2; -} + #idle_inhibitor, + #cava, + #scratchpad, + #mode, + #window, + #clock, + #battery, + #backlight, + #wireplumber, + #tray, + #mpris, + #load { + padding: 0 10px; + background-color: #282828; + color: #ebdbb2; + } -#mode { - background-color: #689d6a; - color: #282828; - /* box-shadow: inset 0 -3px #ffffff; */ -} + #mode { + background-color: #689d6a; + color: #282828; + /* box-shadow: inset 0 -3px #ffffff; */ + } -/* If workspaces is the leftmost module, omit left margin */ -.modules-left > widget:first-child > #workspaces { - margin-left: 0; -} + /* If workspaces is the leftmost module, omit left margin */ + .modules-left > widget:first-child > #workspaces { + margin-left: 0; + } -/* If workspaces is the rightmost module, omit right margin */ -.modules-right > widget:last-child > #workspaces { - margin-right: 0; -} + /* If workspaces is the rightmost module, omit right margin */ + .modules-right > widget:last-child > #workspaces { + margin-right: 0; + } -#cava { - padding: 0 5px; -} + #cava { + padding: 0 5px; + } -#battery.charging, #battery.plugged { - background-color: #98971a; - color: #282828; -} + #battery.charging, #battery.plugged { + background-color: #98971a; + color: #282828; + } -@keyframes blink { - to { - background-color: #282828; - color: #ebdbb2; - } -} + @keyframes blink { + to { + background-color: #282828; + color: #ebdbb2; + } + } -/* Using steps() instead of linear as a timing function to limit cpu usage */ -#battery.critical:not(.charging) { - background-color: #cc241d; - color: #ebdbb2; - animation-name: blink; - animation-duration: 0.5s; - animation-timing-function: steps(12); - animation-iteration-count: infinite; - animation-direction: alternate; -} + /* Using steps() instead of linear as a timing function to limit cpu usage */ + #battery.critical:not(.charging) { + background-color: #cc241d; + color: #ebdbb2; + animation-name: blink; + animation-duration: 0.5s; + animation-timing-function: steps(12); + animation-iteration-count: infinite; + animation-direction: alternate; + } -label:focus { - background-color: #000000; -} + label:focus { + background-color: #000000; + } -#wireplumber.muted { - background-color: #458588; -} + #wireplumber.muted { + background-color: #458588; + } -#tray > .passive { - -gtk-icon-effect: dim; -} + #tray > .passive { + -gtk-icon-effect: dim; + } -#tray > .needs-attention { - -gtk-icon-effect: highlight; -} + #tray > .needs-attention { + -gtk-icon-effect: highlight; + } -#mpris.playing { - background-color: #d79921; - color: #282828; -} + #mpris.playing { + background-color: #d79921; + color: #282828; + } -#tray menu { - font-family: sans-serif; -} + #tray menu { + font-family: sans-serif; + } -#scratchpad.empty { - background: transparent; -} + #scratchpad.empty { + background: transparent; + } ''; };