diff --git a/flake.lock b/flake.lock index 37585c5..a8aa53d 100644 --- a/flake.lock +++ b/flake.lock @@ -84,7 +84,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1731533236, @@ -128,16 +128,15 @@ ] }, "locked": { - "lastModified": 1742655702, - "narHash": "sha256-jbqlw4sPArFtNtA1s3kLg7/A4fzP4GLk9bGbtUJg0JQ=", + "lastModified": 1743360001, + "narHash": "sha256-HtpS/ZdgWXw0y+aFdORcX5RuBGTyz3WskThspNR70SM=", "owner": "nix-community", "repo": "home-manager", - "rev": "0948aeedc296f964140d9429223c7e4a0702a1ff", + "rev": "b6fd653ef8fbeccfd4958650757e91767a65506d", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -170,29 +169,10 @@ "type": "github" } }, - "kwin-effects-forceblur": { - "inputs": { - "nixpkgs": "nixpkgs_2", - "utils": "utils" - }, - "locked": { - "lastModified": 1740651704, - "narHash": "sha256-s6pe3osipbo+GZVAB6LycyOsYcdvC12OJzuQRVptVZE=", - "owner": "taj-ny", - "repo": "kwin-effects-forceblur", - "rev": "1c8dcf1a471b13ada1e37f468de71e115148353f", - "type": "github" - }, - "original": { - "owner": "taj-ny", - "repo": "kwin-effects-forceblur", - "type": "github" - } - }, "nix-gaming": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1743299372, @@ -256,22 +236,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1730200266, - "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1743076231, "narHash": "sha256-yQugdVfi316qUfqzN8JMaA2vixl+45GxNm4oUfXlbgw=", @@ -287,23 +251,7 @@ "type": "github" } }, - "nixpkgs_4": { - "locked": { - "lastModified": 1743231893, - "narHash": "sha256-tpJsHMUPEhEnzySoQxx7+kA+KUtgWqvlcUBqROYNNt0=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "c570c1f5304493cafe133b8d843c7c1c4a10d3a6", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { + "nixpkgs_3": { "locked": { "lastModified": 1743095683, "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", @@ -319,6 +267,22 @@ "type": "github" } }, + "nixpkgs_4": { + "locked": { + "lastModified": 1742288794, + "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "flake-parts": "flake-parts_2", @@ -328,11 +292,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1743288994, - "narHash": "sha256-hUlfAcIUnS8/eSFq+uzOHPZO1p8QgBTAoqhDWzEkUto=", + "lastModified": 1743362786, + "narHash": "sha256-XbXIRDbb8/vLBX1M096l7lM5wfzBTp1ZXfUl9bUhVGU=", "owner": "nix-community", "repo": "nixvim", - "rev": "81fdde9fc529e0a5f9ff0d570f31acfe85fd20ac", + "rev": "d81f37256d0a8691b837b74979d27bf89be8ecdd", "type": "github" }, "original": { @@ -368,9 +332,8 @@ "inputs": { "agenix": "agenix", "home-manager": "home-manager_2", - "kwin-effects-forceblur": "kwin-effects-forceblur", "nix-gaming": "nix-gaming", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", "zen-browser": "zen-browser" @@ -406,42 +369,9 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "utils": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "zen-browser": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1743216975, diff --git a/flake.nix b/flake.nix index ef851be..1d651bb 100644 --- a/flake.nix +++ b/flake.nix @@ -3,14 +3,14 @@ inputs = { # Nixpkgs - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; # You can access packages and modules from different nixpkgs revs # at the same time. Here's an working example: nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; # Also see the 'unstable-packages' overlay at 'overlays/default.nix'. # Home manager home-manager.inputs.nixpkgs.follows = "nixpkgs"; - home-manager.url = "github:nix-community/home-manager/release-24.11"; + home-manager.url = "github:nix-community/home-manager"; agenix.url = "github:ryantm/agenix"; nixvim.url = "github:nix-community/nixvim"; nixvim.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home-manager/modules/hyprland/default.nix b/home-manager/modules/hyprland/default.nix index 2854dcd..ee97670 100644 --- a/home-manager/modules/hyprland/default.nix +++ b/home-manager/modules/hyprland/default.nix @@ -30,7 +30,7 @@ in { xray = true; }; }; - blurls = "waybar"; + # blurls = "waybar"; dwindle = { pseudotile = true; # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below preserve_split = true; # You probably want this @@ -40,8 +40,8 @@ in { extend_border_grab_area = 15; # Extends the clickable area around the border for resizing hover_icon_on_border = true; # Shows a cursor icon when layout = "dwindle"; - "col.active_border" = "rgba(C55900ee) rgba(FFAA63ee) 45deg"; - "col.inactive_border" = "rgba(595959aa)"; + "col.active_border" = "rgba(3A2BABFF) rgba(1A0B8AFF) 45deg"; + "col.inactive_border" = "rgba(110E29aa)"; border_size = 2; gaps_out = 10; }; @@ -49,6 +49,7 @@ in { "${pkgs.kdePackages.kwallet-pam}/libexec/pam_kwallet_init" "${pkgs.networkmanagerapplet}/bin/nm-applet" "${pkgs.blueman}/bin/blueman-applet" + "${pkgs.waybar}/bin/waybar" ]; "$super" = "SUPER"; "$alt_super" = "CTRL"; @@ -59,8 +60,8 @@ in { # Screenshot region "$super SHIFT,S, exec, GRIM_DEFAULT_DIR=${config.home.homeDirectory}/Pictures/Screenshots/ ${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp)\" - | wl-copy " "$super,T, exec, kitty" - "$super, L,exec, hyprlock --immediate" - "$super, B,exec, chromium" + "$alt_super $super, L,exec, hyprlock --immediate" + "$super, B,exec, zen" "$super,F,fullscreen" "$super SHIFT,F,togglefloating" "$super,E,exec,kate" @@ -93,10 +94,10 @@ in { "$super, J, togglesplit" - "$super, left, movefocus, l" - "$super, right, movefocus, r" - "$super, up, movefocus, u" - "$super, down, movefocus, d" + "$super, h, movefocus, l" + "$super, l, movefocus, r" + "$super, k, movefocus, u" + "$super, j, movefocus, d" ]; bindm = [ "$super, mouse:272, movewindow" diff --git a/home-manager/modules/kitty/default.nix b/home-manager/modules/kitty/default.nix index cf0b4c3..041a9f8 100644 --- a/home-manager/modules/kitty/default.nix +++ b/home-manager/modules/kitty/default.nix @@ -16,6 +16,9 @@ in { settings = { confirm_os_window_close = 0; window_padding_width = 5; + background_opacity = "0.45"; + background_blur = 1; + dynamic_background_opacity = "yes"; }; }; }; diff --git a/home-manager/modules/neovim/default.nix b/home-manager/modules/neovim/default.nix index 0876035..df21584 100644 --- a/home-manager/modules/neovim/default.nix +++ b/home-manager/modules/neovim/default.nix @@ -8,7 +8,7 @@ cfg = config.lily.neovim; in { imports = [ - # ./colorscheme.nix + ./colorscheme.nix ./plugins ./keybinds.nix ]; diff --git a/home-manager/modules/waybar/default.nix b/home-manager/modules/waybar/default.nix index c94d579..effe73c 100644 --- a/home-manager/modules/waybar/default.nix +++ b/home-manager/modules/waybar/default.nix @@ -1,18 +1,161 @@ -{ - config, - lib, - ... -}: let +{ pkgs, config, lib, ... }: +let cfg = config.lily.waybar; -in { - options.lily.waybar = { - enable = lib.mkEnableOption "activate waybar"; - }; - +in +{ + options.lily.waybar.enable = lib.mkEnableOption "activate waybar"; config = lib.mkIf cfg.enable { + home.packages = with pkgs; [ + pavucontrol + networkmanagerapplet + blueman + ]; programs.waybar = { enable = true; - systemd.enable = true; + style = ./style.css; + + settings = { + mainBar = { + layer = "top"; + position = "top"; + height = 40; + # tray.icon-size = 15; + + modules-left = [ + "custom/icon" + "custom/separator" + "battery" + "custom/separator" + "custom/screenshot" + "tray" + "hyprland/workspaces" + ]; + + modules-center = [ "hyprland/window" ]; + modules-right = [ + "mpris" + "pulseaudio" + "network" + "clock" + ]; + + mpris = { + format = "{player_icon}{status_icon} [{position}/{length}] {title} - {artist}"; + tooltip-format = "{player_icon}{status_icon} [{position}/{length}] {title} - {artist}"; + title-len = 20; + artist-len = 10; + interval = 1; + player-icons = { + default = ""; + mpv = "🎵 "; + spotify = " "; + }; + status-icons = { + playing = "▶"; + stopped = "󰓛"; + paused = "󰏤"; + }; + on-click-middle = "playerctld shift"; + }; + + battery = { + interval = 30; + states = { + warning = 30; + critical = 15; + }; + format = "{icon} {capacity}%"; + format-charging = " {icon} {capacity}%"; + format-icons = [ " " " " " " " " ]; + max-length = 25; + }; + + pulseaudio = { + format = "{icon} {volume}"; + format-bluetooth = " "; + format-bluetooth-muted = " "; + format-muted = ""; + format-icons = { + default = [ "" "󰕾" "" ]; + }; + on-click = "${pkgs.pavucontrol}/bin/pavucontrol"; + }; + + network = { + format-wifi = "󰖩 {essid}"; + on-click = "${pkgs.networkmanagerapplet}/bin/nm-connection-editor"; + format-ethernet = "󰈀 wired"; + format-disconnected = ""; + tooltip-format = "{ifname} via {gwaddr} "; + tooltip-format-wifi = "{essid} ({signalStrength}%) "; + tooltip-format-ethernet = "{ifname} "; + tooltip-format-disconnected = "Disconnected"; + }; + + clock = { + format = "󰃰 {:%d.%m.%y 󰇙 %H:%M}"; + }; + + "custom/icon" = { + format = " "; + # on-click = "${config.lily.wlogout.logoutlaunch}/bin/logoutlaunch"; + }; + + "custom/screenshot" = { + format = " "; + on-click = "GRIM_DEFAULT_DIR=${config.xdg.configHome}/../Pictures/Screenshots ${pkgs.grim}/bin/grim"; + }; + + "custom/separator" = { + format = " "; + }; + + "hyprland/workspaces" = { + format = "{icon}"; # lavender + tooltip = false; + all-outputs = false; + current-only = true; + sort-by-number = true; + persistent-workspaces = { + "1" = ""; + "2" = ""; + "3" = ""; + "4" = ""; + "5" = ""; + "6" = ""; + "7" = ""; + "8" = ""; + "9" = ""; + "10" = ""; + }; + format-icons = { + "1" = ""; + "2" = ""; + "3" = ""; + "4" = ""; + "5" = ""; + "6" = ""; + "7" = ""; + "8" = ""; + "9" = ""; + "10" = "󰊠"; # sapphire + urgent = ""; # sapphire + active = "󰮯"; # blue + default = ""; + }; + }; + + "hyprland/window" = { + format = "{}"; + rewrite = { + "" = "There is no place like ~"; + }; + max-length = 200; + seperate-outputs = true; + }; + }; + }; }; + # home.file.".config/waybar/themes/theme.css" = { source = ./themes/Catppuccin-Mocha.css; }; }; } diff --git a/home-manager/modules/waybar/default.nix.old b/home-manager/modules/waybar/default.nix.old new file mode 100644 index 0000000..e4bc891 --- /dev/null +++ b/home-manager/modules/waybar/default.nix.old @@ -0,0 +1,203 @@ +{ pkgs, config, lib, ... }: +let + cfg = config.lily.waybar; +in +{ + options.lily.waybar.enable = lib.mkEnableOption "activate waybar"; + config = lib.mkIf cfg.enable { + home.packages = with pkgs; [ + pavucontrol + networkmanagerapplet + blueman + ]; + programs.waybar = { + enable = true; + style = ./style.css; + + settings = { + mainBar = { + layer = "top"; + position = "top"; + mode = "dock"; + height = 40; + tray.icon-size = 15; + + modules-left = [ + "custom/icon" + "custom/separator" + "cpu" + "memory" + "temperature" + "battery" + "custom/separator" + "custom/separator" + "custom/screenshot" + "tray" + "hyprland/workspaces" + ]; + + modules-center = [ "hyprland/window" ]; + modules-right = [ + "mpris" + "pulseaudio" + "network" + "bluetooth" + "custom/wallchange" + "custom/themechange" + "clock" + ]; + + mpris = { + format = "{player_icon}{status_icon} [{position}/{length}] {title} - {artist}"; + tooltip-format = "{player_icon}{status_icon} [{position}/{length}] {title} - {artist}"; + title-len = 20; + artist-len = 10; + interval = 1; + player-icons = { + default = ""; + mpv = "🎵 "; + spotify = " "; + }; + status-icons = { + playing = "▶"; + stopped = "󰓛"; + paused = "󰏤"; + }; + on-click-middle = "playerctld shift"; + }; + + cpu = { + interval = 10; + format = " {usage}"; + max-length = 10; + }; + + memory = { + interval = 30; + format = " {used:0.1f}G"; + max-length = 10; + }; + + temperatures = { + thermal-zone = 0; + critical-threshold = 90; + format-critical = " {temperatureC}°C"; + format = " {temperatureC}°C"; + }; + + battery = { + interval = 30; + states = { + warning = 30; + critical = 15; + }; + format = "{icon} {capacity}%"; + format-charging = " {icon} {capacity}%"; + format-icons = [ " " " " " " " " ]; + max-length = 25; + }; + + pulseaudio = { + format = "{icon} {volume}"; + format-bluetooth = " "; + format-bluetooth-muted = " "; + format-muted = ""; + format-icons = { + default = [ "" "󰕾" "" ]; + }; + on-click = "${pkgs.pavucontrol}/bin/pavucontrol"; + }; + + network = { + format-wifi = "󰖩 {essid}"; + on-click = "${pkgs.networkmanagerapplet}/bin/nm-connection-editor"; + format-ethernet = "󰈀 wired"; + format-disconnected = ""; + tooltip-format = "{ifname} via {gwaddr} "; + tooltip-format-wifi = "{essid} ({signalStrength}%) "; + tooltip-format-ethernet = "{ifname} "; + tooltip-format-disconnected = "Disconnected"; + }; + + bluetooth = { + tooltip = true; + on-click = "${pkgs.blueman}/bin/blueman-manager"; + }; + + clock = { + format = "󰃰 {:%d.%m.%y 󰇙 %H:%M}"; + }; + + "custom/icon" = { + format = " "; + # on-click = "${config.lily.wlogout.logoutlaunch}/bin/logoutlaunch"; + }; + + "custom/screenshot" = { + format = " "; + on-click = "GRIM_DEFAULT_DIR=${config.xdg.configHome}/../Pictures/Screenshots ${pkgs.grim}/bin/grim"; + }; + + "custom/separator" = { + format = " "; + }; + + # "custom/wallchange" = { + # format = "󰉼 {}"; + # tooltip = true; + # exec = "echo ; echo 󰆊 switch wallpaper"; + # on-click = "${inputs.wall-utils.packages.${pkgs.system}.wall-utils}/bin/wall-utils next"; + # on-click-right = "${inputs.wall-utils.packages.${pkgs.system}.wall-utils}/bin/wall-utils previous"; + # on-click-middle = "${inputs.wall-utils.packages.${pkgs.system}.wall-utils}/bin/wall-utils select"; + # # interval = 3600; # once every day + # }; + + "hyprland/workspaces" = { + format = "{icon}"; # lavender + tooltip = false; + all-outputs = false; + current-only = true; + sort-by-number = true; + persistent-workspaces = { + "1" = ""; + "2" = ""; + "3" = ""; + "4" = ""; + "5" = ""; + "6" = ""; + "7" = ""; + "8" = ""; + "9" = ""; + "10" = ""; + }; + format-icons = { + "1" = ""; + "2" = ""; + "3" = ""; + "4" = ""; + "5" = ""; + "6" = ""; + "7" = ""; + "8" = ""; + "9" = ""; + "10" = "󰊠"; # sapphire + urgent = ""; # sapphire + active = "󰮯"; # blue + default = ""; + }; + }; + + "hyprland/window" = { + format = "{}"; + rewrite = { + "" = "There is no place like ~"; + }; + max-length = 200; + seperate-outputs = true; + }; + }; + }; + }; + home.file.".config/waybar/themes/theme.css" = { source = ./themes/Catppuccin-Mocha.css; }; + }; +} diff --git a/home-manager/modules/waybar/style.css b/home-manager/modules/waybar/style.css new file mode 100644 index 0000000..8e34242 --- /dev/null +++ b/home-manager/modules/waybar/style.css @@ -0,0 +1,108 @@ +* { + /* `otf-font-awesome` and SpaceMono Nerd Font are required to be installed for icons */ + font-family: "Fira Sans Semibold", FontAwesome, Roboto, Helvetica, Arial, sans-serif; + font-size: 15px; + transition: background-color .3s ease-out; +} + +window#waybar { + background: rgba(26, 27, 38, 0); + border: none; + color: #c0caf5; + font-family: + SpaceMono Nerd Font, + feather; + transition: background-color .5s; +} + +.modules-left, +.modules-center, +.modules-right +{ + background: rgba(0, 0, 8, 1); + margin: 5px 10px; + padding: 0 5px; + border-radius: 15px; +} +.modules-left { + padding: 0; +} +.modules-center { + padding: 0 10px; +} + +#clock, +#battery, +#cpu, +#memory, +#disk, +#temperature, +#backlight, +#network, +#pulseaudio, +#wireplumber, +#custom-media, +#tray, +#mode, +#idle_inhibitor, +#scratchpad, +#power-profiles-daemon, +#language, +#mpd { + padding: 0 10px; + border-radius: 15px; +} + +#clock:hover, +#battery:hover, +#cpu:hover, +#memory:hover, +#disk:hover, +#temperature:hover, +#backlight:hover, +#network:hover, +#pulseaudio:hover, +#wireplumber:hover, +#custom-media:hover, +#tray:hover, +#mode:hover, +#idle_inhibitor:hover, +#scratchpad:hover, +#power-profiles-daemon:hover, +#language:hover, +#mpd:hover { + background: rgba(26, 27, 38, 0.9); +} + + +#workspaces button { + background: transparent; + font-family: + SpaceMono Nerd Font, + feather; + font-weight: 900; + font-size: 13pt; + color: #c0caf5; + border:none; + border-radius: 15px; +} + +#workspaces button.active { + background: #13131d; +} + +#workspaces button:hover { + background: #11111b; + color: #cdd6f4; + box-shadow: none; +} + +#custom-arch { + margin-left: 5px; + padding: 0 10px; + font-size: 25px; + transition: color .5s; +} +#custom-arch:hover { + color: #1793d1; +} diff --git a/home-manager/modules/waybar/style.css.old b/home-manager/modules/waybar/style.css.old new file mode 100644 index 0000000..3df4eeb --- /dev/null +++ b/home-manager/modules/waybar/style.css.old @@ -0,0 +1,153 @@ +* { + border: none; + border-radius: 0px; + font-family: "Iosevka Nerd Font"; + font-weight: bold; + font-size: 13px; + min-height: 10px; +} + +@import "themes/theme.css"; + +window#waybar { + border-bottom: 1px solid rgba(255,255, 255, 0.2); + border-left: 1px solid rgba(255, 255, 255, 0.2); + border-right: 1px solid rgba(255, 255, 255, 0.2); + border-bottom-right-radius: 10px; + border-bottom-left-radius: 10px; + background: @bar-bg; +} + +tooltip { + background: @main-bg; + color: @main-fg; + border-radius: 7px; + border-width: 0px; +} + +#cpu, +#battery, +#memory, +#temperature { + padding-left: 10px; + padding-right: 10px; + background-color: @wb-act-fg; + margin: 1px 0px 1px 0px; +} + +#cpu { + border-radius: 10px 0px 0px 10px; + color: @maroon; +} + +#memory { + color: @peach; +} + +#temperature { + color: @yellow; +} + +#memory, +#temperature { + border-radius: 0px; +} + +#battery { + border-radius: 0px 10px 10px 0px; + color: @green; +} + +#tray { + color: @sky; +} + +#pulseaudio { + color: @rosewater; +} + +#mpris { + color: @rosewater; +} + +#network { + color: @flamingo; +} + +#bluetooth { + color: @pink; +} + +#custom-wallchange, +#custom-themechange { + color: @mauve; +} + +#clock { + color: @mauve; +} + +#bluetooth, +#clock, +#idle_inhibitor, +#language, +#mpris, +#network, +#pulseaudio, +#taskbar, +#tray, +#window, +#custom-icon, +#workspaces { + opacity: 1; + padding-left: 10px; + padding-right: 10px; + border-radius: 10px; +} + +.modules-left, +.modules-right, +.modules-center { + color: @main-fg; + background: @main-bg; + border-radius: 10px; + margin-left: 2px; + margin-right: 2px; + margin-top: 2px; + margin-bottom: 2px; +} + +#custom-icon { + color: @red; + font-weight: bold; +} + +#custom-apt-update-icon, +#custom-screenshot +{ + color: @teal; +} + +#workspaces { + color: @main-fg; + background: @main-bg; +} + +#workspaces button { + padding-left: 3px; + padding-right: 3px; + border-radius: 10px; + color: @main-fg; + transition: all 0.5s cubic-bezier(0.55, -0.68, 0.48, 1.682); +} + +#workspaces button.active { + background: @wb-act-fg; + color: @lavender; + margin-left: 3px; + padding-left: 12px; + margin-top: 2px; + margin-bottom: 2px; + padding-right: 12px; + margin-right: 3px; +} diff --git a/home-manager/modules/waybar/themes/Catppuccin-Latte.css b/home-manager/modules/waybar/themes/Catppuccin-Latte.css new file mode 100644 index 0000000..6e146db --- /dev/null +++ b/home-manager/modules/waybar/themes/Catppuccin-Latte.css @@ -0,0 +1,26 @@ +@define-color bar-bg rgba(0, 0, 0, 0); + + +@define-color main-bg #dce0e8; +@define-color main-fg #4c4f69; + +@define-color wb-act-bg #ccd0da; +@define-color wb-act-fg #bcc0cc; + +@define-color wb-hvr-bg #acb0be; +@define-color wb-hvr-fg #6cd0da; + +@define-color rosewater #dc8a78; +@define-color flamingo #dd7878; +@define-color pink #ea76cb; +@define-color mauve #8839ef; +@define-color red #d20f39; +@define-color maroon #e64553; +@define-color peach #fe640b; +@define-color yellow #df8e1d; +@define-color green #40a02b; +@define-color teal #179299; +@define-color sky #04a5e5; +@define-color sapphire #209fb5; +@define-color blue #1e66f5; +@define-color lavender #7287fd; diff --git a/home-manager/modules/waybar/themes/Catppuccin-Mocha.css b/home-manager/modules/waybar/themes/Catppuccin-Mocha.css new file mode 100644 index 0000000..078d8af --- /dev/null +++ b/home-manager/modules/waybar/themes/Catppuccin-Mocha.css @@ -0,0 +1,25 @@ +@define-color bar-bg rgba(0, 0, 0, 0); + +@define-color main-bg #11111b; +@define-color main-fg #cdd6f4; + +@define-color wb-act-bg #a6adc8; +@define-color wb-act-fg #313244; + +@define-color wb-hvr-bg #f5c2e7; +@define-color wb-hvr-fg #313244; + +@define-color rosewater #f5e0dc; +@define-color flamingo #f2cdcd; +@define-color pink #f5c2e7; +@define-color mauve #cba6f7; +@define-color red #f38ba8; +@define-color maroon #eba0ac; +@define-color peach #fab387; +@define-color yellow #f9e2af; +@define-color green #a6e3a1; +@define-color teal #94e2d5; +@define-color sky #89dceb; +@define-color sapphire #74c7ec; +@define-color blue #89b4fa; +@define-color lavender #b4befe; diff --git a/home-manager/modules/waybar/themes/theme.css b/home-manager/modules/waybar/themes/theme.css new file mode 100644 index 0000000..56f46af --- /dev/null +++ b/home-manager/modules/waybar/themes/theme.css @@ -0,0 +1,26 @@ +@define-color bar-bg rgba(0, 0, 0, 0); + + +@define-color main-bg #11111b; +@define-color main-fg #cdd6f4; + +@define-color wb-act-bg #a6adc8; +@define-color wb-act-fg #313244; + +@define-color wb-hvr-bg #f5c2e7; +@define-color wb-hvr-fg #313244; + +@define-color rosewater #f5e0dc; +@define-color flamingo #f2cdcd; +@define-color pink #f5c2e7; +@define-color mauve #cba6f7; +@define-color red #f38ba8; +@define-color maroon #eba0ac; +@define-color peach #fab387; +@define-color yellow #f9e2af; +@define-color green #a6e3a1; +@define-color teal #94e2d5; +@define-color sky #89dceb; +@define-color sapphire #74c7ec; +@define-color blue #89b4fa; +@define-color lavender #b4befe; diff --git a/home-manager/profiles/desktop.nix b/home-manager/profiles/desktop.nix index 3755a57..fb7aaaa 100644 --- a/home-manager/profiles/desktop.nix +++ b/home-manager/profiles/desktop.nix @@ -17,5 +17,11 @@ vesktop inputs.zen-browser.packages."${system}".default hyfetch + + nerd-fonts.iosevka + nerd-fonts.space-mono + fira-sans + + prismlauncher ]; } diff --git a/modules/common/desktop.nix b/modules/common/desktop.nix index 8d83f6d..bc5adc4 100644 --- a/modules/common/desktop.nix +++ b/modules/common/desktop.nix @@ -2,6 +2,7 @@ pkgs, lib, config, + inputs, flake-self, ... }: let @@ -29,6 +30,7 @@ in { envsubst glib headsetcontrol + flatpak ]; networking = { networkmanager.enable = true; @@ -68,7 +70,7 @@ in { }; # services.printing.enable = true; - # services.flatpak.enable = true; + services.flatpak.enable = true; services.avahi = { enable = true; nssmdns4 = true; @@ -78,5 +80,11 @@ in { # environment.sessionVariables = { # MOZ_DISABLE_RDD_SANDBOX = "1"; # }; + + programs.nix-ld.enable = true; + programs.nix-ld.libraries = with pkgs; [ + # Add any missing dynamic libraries for unpackaged programs + # here, NOT in environment.systemPackages + ]; }; } diff --git a/modules/wayland/default.nix b/modules/wayland/default.nix index c896cc9..68ed01a 100644 --- a/modules/wayland/default.nix +++ b/modules/wayland/default.nix @@ -13,7 +13,7 @@ in { [ wl-clipboard xwayland - xwaylandvideobridge + kdePackages.xwaylandvideobridge wayland-utils wev ]