diff --git a/home-manager/default.nix b/home-manager/default.nix index 6666b37..d6be617 100644 --- a/home-manager/default.nix +++ b/home-manager/default.nix @@ -2,8 +2,8 @@ let home-manager = (import ../nix/sources.nix).home-manager; - unstable = import {}; - fontSize = hiDPI : if hiDPI then "FiraCode:size=14" else "FiraCode:size=8"; + unstable = import { }; + fontSize = hiDPI: if hiDPI then "FiraCode:size=14" else "FiraCode:size=8"; in { imports = [ @@ -107,8 +107,7 @@ in ncmpcpp acpi - #unstable.prusa-slicer - prusa-slicer + unstable.prusa-slicer htop xdg-utils moreutils @@ -167,109 +166,109 @@ in }; programs.waybar = { - enable = true; - settings = [ { - layer = "top"; - position = "bottom"; - height = 28; - modules-left = [ - "sway/workspaces" - "sway/window" - ]; - modules-center = [ - ]; - modules-right = [ - "sway/mode" - "disk" - "pulseaudio" - "network" - "memory" - "cpu" - "temperature" - "battery" - "tray" - "clock" - ]; - modules = { - "battery" = { - states = { - warning = 20; - critical = 10; + enable = true; + settings = [{ + layer = "top"; + position = "bottom"; + height = 28; + modules-left = [ + "sway/workspaces" + "sway/window" + ]; + modules-center = [ + ]; + modules-right = [ + "sway/mode" + "disk" + "pulseaudio" + "network" + "memory" + "cpu" + "temperature" + "battery" + "tray" + "clock" + ]; + modules = { + "battery" = { + states = { + warning = 20; + critical = 10; + }; + format = " {capacity}%"; + format-discharging = "{icon} {capacity}%"; + format-icons = [ + "" + "" + "" + "" + "" + "" + "" + "" + "" + "" + ]; }; - format = " {capacity}%"; - format-discharging = "{icon} {capacity}%"; - format-icons = [ - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - ]; - }; - "cpu" = { - format = " {}"; - }; - "clock" = { - format = "{:%H:%M}"; - tooltip = false; - }; - "memory" = { - interval = 5; - format = " {}%"; - tooltip-format = "{used:0.1f}/{total:0.1f} GB"; - states = { - warning = 80; - critical = 90; - }; - }; - "network" = { - interface = "wl*"; - format-wifi = " {essid}"; - format-icons = [ - "" - ]; - tooltip-format-wifi = "{frequency} MHz, {signaldBm} dBm"; - }; - "pulseaudio" = { - scroll-step = 1; - format = "{icon} {volume}%"; - format-bluetooth = "{icon} {volume}% "; - format-muted = ""; - format-icons = { - headphones = ""; - handsfree = ""; - headset = ""; - phone = ""; - portable = ""; - car = ""; - default = ["" ""]; + "cpu" = { + format = " {}"; + }; + "clock" = { + format = "{:%H:%M}"; + tooltip = false; + }; + "memory" = { + interval = 5; + format = " {}%"; + tooltip-format = "{used:0.1f}/{total:0.1f} GB"; + states = { + warning = 80; + critical = 90; + }; + }; + "network" = { + interface = "wl*"; + format-wifi = " {essid}"; + format-icons = [ + "" + ]; + tooltip-format-wifi = "{frequency} MHz, {signaldBm} dBm"; + }; + "pulseaudio" = { + scroll-step = 1; + format = "{icon} {volume}%"; + format-bluetooth = "{icon} {volume}% "; + format-muted = ""; + format-icons = { + headphones = ""; + handsfree = ""; + headset = ""; + phone = ""; + portable = ""; + car = ""; + default = [ "" "" ]; + }; + on-click = "pavucontrol"; + }; + "sway/workspaces" = { + all-outputs = false; + disable-scroll = false; + format = "{name}"; + }; + "temperature" = { + format = " {temperatureC}°C"; + hwmon-path = "/sys/class/hwmon/hwmon3/temp1_input"; + critical-threshold = 75; + }; + "disk" = { + interval = 30; + format = "{free} free"; + path = "/"; }; - on-click ="pavucontrol"; }; - "sway/workspaces" = { - all-outputs = false; - disable-scroll = false; - format = "{name}"; - }; - "temperature" = { - format = " {temperatureC}°C"; - hwmon-path = "/sys/class/hwmon/hwmon3/temp1_input"; - critical-threshold = 75; - }; - "disk" = { - interval= 30; - format= "{free} free"; - path= "/"; - }; - }; - } ]; - style = builtins.readFile ./waybar.css; - }; + }]; + style = builtins.readFile ./waybar.css; + }; programs.mako = { diff --git a/home-manager/modules/vscode.nix b/home-manager/modules/vscode.nix index 753a7c8..18a7b6e 100644 --- a/home-manager/modules/vscode.nix +++ b/home-manager/modules/vscode.nix @@ -1,7 +1,12 @@ -{ pkgs, ... }: { +{ pkgs, ... }: +let + unstable = import { }; +in +{ programs.vscode = { enable = true; + package = unstable.vscodium; extensions = with pkgs.vscode-extensions; [ # Dark Theme dracula-theme.theme-dracula