diff --git a/flake.lock b/flake.lock index eb56fae..5834274 100644 --- a/flake.lock +++ b/flake.lock @@ -186,11 +186,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1763759067, - "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", + "lastModified": 1762810396, + "narHash": "sha256-dxFVgQPG+R72dkhXTtqUm7KpxElw3u6E+YlQ2WaDgt8=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", + "rev": "0bdadb1b265fb4143a75bd1ec7d8c915898a9923", "type": "github" }, "original": { @@ -282,11 +282,11 @@ ] }, "locked": { - "lastModified": 1763992789, - "narHash": "sha256-WHkdBlw6oyxXIra/vQPYLtqY+3G8dUVZM8bEXk0t8x4=", + "lastModified": 1758463745, + "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", "owner": "nix-community", "repo": "home-manager", - "rev": "44831a7eaba4360fb81f2acc5ea6de5fde90aaa3", + "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", "type": "github" }, "original": { @@ -330,11 +330,11 @@ ] }, "locked": { - "lastModified": 1763384566, - "narHash": "sha256-r+wgI+WvNaSdxQmqaM58lVNvJYJ16zoq+tKN20cLst4=", + "lastModified": 1752689277, + "narHash": "sha256-uldUBFkZe/E7qbvxa3mH1ItrWZyT6w1dBKJQF/3ZSsc=", "owner": "nix-community", "repo": "naersk", - "rev": "d4155d6ebb70fbe2314959842f744aa7cabbbf6a", + "rev": "0e72363d0938b0208d6c646d10649164c43f4d64", "type": "github" }, "original": { @@ -357,11 +357,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1764405884, - "narHash": "sha256-TnvBRPmcpcyinvLgsitHS7w5soSa6yNBfRYEI2TK1Ts=", + "lastModified": 1762857797, + "narHash": "sha256-puoFJGlbL6khrQKozCO6Wgpq/IhA2Sfnz+ui/87lbQQ=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "10aae4855ee275f7d80d85f4328c24265fb20f1f", + "rev": "2ff3443b4226f6721a43b75e76b6ca59caa34fec", "type": "github" }, "original": { @@ -390,11 +390,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1764399944, - "narHash": "sha256-FC9eYtSmplgxllCX4/3hJq5J3sXWKLSc7at8ZUxycVw=", + "lastModified": 1762854265, + "narHash": "sha256-iykTzCzU8hI7b8LvAquYY4Asl2xj3AcLzWZv6rm8MGY=", "owner": "YaLTeR", "repo": "niri", - "rev": "b35bcae35b3f9665043c335e55ed5828af77db85", + "rev": "fb2f67c8a036f674e9101e15a7bb1cf61524ebde", "type": "github" }, "original": { @@ -425,11 +425,11 @@ ] }, "locked": { - "lastModified": 1764381338, - "narHash": "sha256-EBguntbfHsbikHdk9v/2lAyrLzjaZf6tEZeRymXAfJA=", + "lastModified": 1762826252, + "narHash": "sha256-7VqX6Z8Pq5DzVV5YM7o92vC6goNGtucCv71dXwpy01Q=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "600e16b6baf213d9192a0035ff15618305fcea60", + "rev": "f10a42469c4db9b4ae7b3cd3a5c0d8bffb4a8b98", "type": "github" }, "original": { @@ -440,11 +440,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1764316264, - "narHash": "sha256-82L+EJU+40+FIdeG4gmUlOF1jeSwlf2AwMarrpdHF6o=", + "lastModified": 1762756533, + "narHash": "sha256-HiRDeUOD1VLklHeOmaKDzf+8Hb7vSWPVFcWwaTrpm+U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9a7b80b6f82a71ea04270d7ba11b48855681c4b0", + "rev": "c2448301fb856e351aab33e64c33a3fc8bcf637d", "type": "github" }, "original": { @@ -471,11 +471,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1764352606, - "narHash": "sha256-ZwPqcETKhoQ+TS40+hFr5CY4wzcNGKhi6l8w2HmmxKc=", + "lastModified": 1762482733, + "narHash": "sha256-g/da4FzvckvbiZT075Sb1/YDNDr+tGQgh4N8i5ceYMg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "24e915b36ca87d32777d766da3a3f4e3ce22cc98", + "rev": "e1ebeec86b771e9d387dd02d82ffdc77ac753abc", "type": "github" }, "original": { @@ -495,11 +495,11 @@ ] }, "locked": { - "lastModified": 1764404323, - "narHash": "sha256-lyAJQNdm/ZRfH6mDXLIA8/g2tCuHlHEfthC0UA+BLFs=", + "lastModified": 1762858278, + "narHash": "sha256-BYeYJFonJRt9xg6UYXpvVGK5j4NEOXHETRffPQT7drM=", "owner": "nix-community", "repo": "NUR", - "rev": "5a7ff5a222e1422c4f129f64e10ebecf78ace9f8", + "rev": "a053db755b35970d6a0ebd97aaceb8f629faa8e7", "type": "github" }, "original": { @@ -691,11 +691,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1763845106, - "narHash": "sha256-S3HH655nydKoLTuqX8qcJidZH0PiWGB/YcoPomH1DaQ=", + "lastModified": 1762295027, + "narHash": "sha256-5z5cGrp9F8g8iyQrM8WkB6pAwP4AaicljKZ15gx+X9Y=", "owner": "nix-community", "repo": "stylix", - "rev": "b9b8173a6e31c6d06f328307ddbdf7d6af82b7ad", + "rev": "91b9a270523361268ba6a8772152fde31103869f", "type": "github" }, "original": { @@ -808,11 +808,11 @@ ] }, "locked": { - "lastModified": 1762938485, - "narHash": "sha256-AlEObg0syDl+Spi4LsZIBrjw+snSVU4T8MOeuZJUJjM=", + "lastModified": 1762410071, + "narHash": "sha256-aF5fvoZeoXNPxT0bejFUBXeUjXfHLSL7g+mjR/p5TEg=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4", + "rev": "97a30861b13c3731a84e09405414398fbf3e109f", "type": "github" }, "original": { @@ -841,11 +841,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1764366786, - "narHash": "sha256-yVCJ4Qe/JkdKDu0DddFdAQgDQVeF12nxH7zv3jtooV4=", + "lastModified": 1762747449, + "narHash": "sha256-Z1TKiux8K09a93w4PFDFsj8HFugXNy3iCC3Z8MpR5Rk=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "b362a3873710a42f7ac2d8ba03772d8290733934", + "rev": "6338574bc5c036487486acde264f38f39ea15fad", "type": "github" }, "original": { diff --git a/homeConfigurations/vinzenz/default.nix b/homeConfigurations/vinzenz/default.nix index a8a0d28..785afe7 100644 --- a/homeConfigurations/vinzenz/default.nix +++ b/homeConfigurations/vinzenz/default.nix @@ -3,7 +3,6 @@ imports = [ # keep-sorted start ./editorconfig.nix - ./element.nix ./fonts.nix ./fuzzel.nix ./git.nix @@ -55,7 +54,9 @@ nextcloud-client thunderbird fractal + telegram-desktop + element-desktop wireguard-tools wirelesstools @@ -79,8 +80,6 @@ foliate dconf2nix - - gnome-terminal ]; home.file = { @@ -91,9 +90,6 @@ "idea.properties".text = "idea.filewatcher.executable.path = ${pkgs.fsnotifier}/bin/fsnotifier"; }; - services = { - trayscale.enable = true; - poweralertd.enable = true; - }; + services.trayscale.enable = true; }; } diff --git a/homeConfigurations/vinzenz/element.nix b/homeConfigurations/vinzenz/element.nix deleted file mode 100644 index e2a7474..0000000 --- a/homeConfigurations/vinzenz/element.nix +++ /dev/null @@ -1,187 +0,0 @@ -{ - programs.element-desktop = { - enable = true; - settings = { - # https://github.com/element-hq/element-web/blob/develop/docs/config.md - # https://github.com/catppuccin/element - "show_labs_settings" = true; - "setting_defaults" = { - default_theme = "custom-Catppuccin Latte (Mauve)"; - "custom_themes" = [ - { - "name" = "Catppuccin Latte (Mauve)"; - "is_dark" = false; - "colors" = { - "accent-color" = "#8839ef"; - "primary-color" = "#8839ef"; - "warning-color" = "#d20f39"; - "alert" = "#df8e1d"; - "sidebar-color" = "#dce0e8"; - "roomlist-background-color" = "#e6e9ef"; - "roomlist-text-color" = "#4c4f69"; - "roomlist-text-secondary-color" = "#7c7f93"; - "roomlist-highlights-color" = "#bcc0cc"; - "roomlist-separator-color" = "#8c8fa1"; - "timeline-background-color" = "#eff1f5"; - "timeline-text-color" = "#4c4f69"; - "secondary-content" = "#4c4f69"; - "tertiary-content" = "#4c4f69"; - "timeline-text-secondary-color" = "#6c6f85"; - "timeline-highlights-color" = "#e6e9ef"; - "reaction-row-button-selected-bg-color" = "#bcc0cc"; - "menu-selected-color" = "#bcc0cc"; - "focus-bg-color" = "#acb0be"; - "room-highlight-color" = "#04a5e5"; - "togglesw-off-color" = "#7c7f93"; - "other-user-pill-bg-color" = "#04a5e5"; - "username-colors" = [ - "#8839ef" - "#e64553" - "#fe640b" - "#40a02b" - "#179299" - "#04a5e5" - "#209fb5" - "#7287fd" - ]; - "avatar-background-colors" = [ - "#1e66f5" - "#8839ef" - "#40a02b" - ]; - }; - } - { - "name" = "Catppuccin Frappé (Mauve)"; - "is_dark" = true; - "colors" = { - "accent-color" = "#ca9ee6"; - "primary-color" = "#ca9ee6"; - "warning-color" = "#e78284"; - "alert" = "#e5c890"; - "sidebar-color" = "#232634"; - "roomlist-background-color" = "#292c3c"; - "roomlist-text-color" = "#c6d0f5"; - "roomlist-text-secondary-color" = "#949cbb"; - "roomlist-highlights-color" = "#51576d"; - "roomlist-separator-color" = "#838ba7"; - "timeline-background-color" = "#303446"; - "timeline-text-color" = "#c6d0f5"; - "secondary-content" = "#c6d0f5"; - "tertiary-content" = "#c6d0f5"; - "timeline-text-secondary-color" = "#a5adce"; - "timeline-highlights-color" = "#292c3c"; - "reaction-row-button-selected-bg-color" = "#51576d"; - "menu-selected-color" = "#51576d"; - "focus-bg-color" = "#626880"; - "room-highlight-color" = "#99d1db"; - "togglesw-off-color" = "#949cbb"; - "other-user-pill-bg-color" = "#99d1db"; - "username-colors" = [ - "#ca9ee6" - "#ea999c" - "#ef9f76" - "#a6d189" - "#81c8be" - "#99d1db" - "#85c1dc" - "#babbf1" - ]; - "avatar-background-colors" = [ - "#8caaee" - "#ca9ee6" - "#a6d189" - ]; - }; - } - { - "name" = "Catppuccin Macchiato (Mauve)"; - "is_dark" = true; - "colors" = { - "accent-color" = "#c6a0f6"; - "primary-color" = "#c6a0f6"; - "warning-color" = "#ed8796"; - "alert" = "#eed49f"; - "sidebar-color" = "#181926"; - "roomlist-background-color" = "#1e2030"; - "roomlist-text-color" = "#cad3f5"; - "roomlist-text-secondary-color" = "#939ab7"; - "roomlist-highlights-color" = "#494d64"; - "roomlist-separator-color" = "#8087a2"; - "timeline-background-color" = "#24273a"; - "timeline-text-color" = "#cad3f5"; - "secondary-content" = "#cad3f5"; - "tertiary-content" = "#cad3f5"; - "timeline-text-secondary-color" = "#a5adcb"; - "timeline-highlights-color" = "#1e2030"; - "reaction-row-button-selected-bg-color" = "#494d64"; - "menu-selected-color" = "#494d64"; - "focus-bg-color" = "#5b6078"; - "room-highlight-color" = "#91d7e3"; - "togglesw-off-color" = "#939ab7"; - "other-user-pill-bg-color" = "#91d7e3"; - "username-colors" = [ - "#c6a0f6" - "#ee99a0" - "#f5a97f" - "#a6da95" - "#8bd5ca" - "#91d7e3" - "#7dc4e4" - "#b7bdf8" - ]; - "avatar-background-colors" = [ - "#8aadf4" - "#c6a0f6" - "#a6da95" - ]; - }; - } - { - "name" = "Catppuccin Mocha (Mauve)"; - "is_dark" = true; - "colors" = { - "accent-color" = "#cba6f7"; - "primary-color" = "#cba6f7"; - "warning-color" = "#f38ba8"; - "alert" = "#f9e2af"; - "sidebar-color" = "#11111b"; - "roomlist-background-color" = "#181825"; - "roomlist-text-color" = "#cdd6f4"; - "roomlist-text-secondary-color" = "#9399b2"; - "roomlist-highlights-color" = "#45475a"; - "roomlist-separator-color" = "#7f849c"; - "timeline-background-color" = "#1e1e2e"; - "timeline-text-color" = "#cdd6f4"; - "secondary-content" = "#cdd6f4"; - "tertiary-content" = "#cdd6f4"; - "timeline-text-secondary-color" = "#a6adc8"; - "timeline-highlights-color" = "#181825"; - "reaction-row-button-selected-bg-color" = "#45475a"; - "menu-selected-color" = "#45475a"; - "focus-bg-color" = "#585b70"; - "room-highlight-color" = "#89dceb"; - "togglesw-off-color" = "#9399b2"; - "other-user-pill-bg-color" = "#89dceb"; - "username-colors" = [ - "#cba6f7" - "#eba0ac" - "#fab387" - "#a6e3a1" - "#94e2d5" - "#89dceb" - "#74c7ec" - "#b4befe" - ]; - "avatar-background-colors" = [ - "#89b4fa" - "#cba6f7" - "#a6e3a1" - ]; - }; - } - ]; - }; - }; - }; -} diff --git a/homeConfigurations/vinzenz/swaync.nix b/homeConfigurations/vinzenz/swaync.nix index 113aac0..93be775 100644 --- a/homeConfigurations/vinzenz/swaync.nix +++ b/homeConfigurations/vinzenz/swaync.nix @@ -19,10 +19,6 @@ "inhibitors" "notifications" ]; - - widget-config = { - mpris.autohide = true; - }; }; }; } diff --git a/homeConfigurations/vinzenz/waybar.nix b/homeConfigurations/vinzenz/waybar.nix index b04fd5b..73c0ef8 100644 --- a/homeConfigurations/vinzenz/waybar.nix +++ b/homeConfigurations/vinzenz/waybar.nix @@ -11,10 +11,8 @@ programs.waybar = { enable = true; - systemd = { - enable = true; - target = "graphical-session.target"; - }; + systemd.enable = true; + systemd.target = "graphical-session.target"; style = lib.mkAfter (builtins.readFile ./waybar.css); settings = { mainBar = { @@ -37,9 +35,9 @@ "custom/swaync" ]; modules-right = [ - "group/system-tray" #"image" "group/status-infos" + "group/system-tray" "custom/wlogout" ]; @@ -58,13 +56,12 @@ "group/status-infos" = { orientation = "inherit"; modules = [ + "battery" "custom/weather" "temperature" "cpu" "memory" "disk" - # "battery" - "upower" ]; }; @@ -113,9 +110,6 @@ on-scroll-down = "shift_up"; }; }; - upower = { - icon-size = 14; - }; battery = { format = "{capacity}% {icon}"; format-icons = [