Changed: Stuff
This commit is contained in:
parent
521120022a
commit
bb19cc1377
@ -93,14 +93,24 @@ in
|
||||
allow_tearing = false;
|
||||
};
|
||||
|
||||
/*decoration = {
|
||||
decoration = {
|
||||
rounding = 12;
|
||||
drop_shadow = "yes";
|
||||
shadow_range = 16;
|
||||
shadow_render_power = 4;
|
||||
shadow_ignore_window = 1;
|
||||
"col.shadow" = "0xFFF887FF";
|
||||
"col.shadow_inactive" = "0xFFDE004E";
|
||||
|
||||
shadow = {
|
||||
enabled = true;
|
||||
range = 16;
|
||||
render_power = 4;
|
||||
ignore_window = true;
|
||||
color = "0xFFF887FF";
|
||||
color_inactive = "0xFFDE004E";
|
||||
#drop_shadow = "yes";
|
||||
#shadow_range = 16;
|
||||
#shadow_render_power = 4;
|
||||
#shadow_ignore_window = 1;
|
||||
#"col.shadow" = "0xFFF887FF";
|
||||
#"col.shadow_inactive" = "0xFFDE004E";
|
||||
};
|
||||
|
||||
blur = {
|
||||
enabled = true;
|
||||
size = 1;
|
||||
@ -108,7 +118,7 @@ in
|
||||
new_optimizations = 1;
|
||||
noise = 0.04;
|
||||
};
|
||||
};*/
|
||||
};
|
||||
|
||||
animations = {
|
||||
enabled = "yes";
|
||||
@ -175,6 +185,7 @@ in
|
||||
"${super}, S, exec, ${power}"
|
||||
"${super}, P, pseudo, " # dwindle
|
||||
"${super}, J, togglesplit, "# dwindle
|
||||
"${super}, O, exec, obsidian"
|
||||
|
||||
# Move focus with mainMod + arrow keys
|
||||
"${super}, left, movefocus, l"
|
||||
|
||||
@ -15,8 +15,8 @@
|
||||
# Hyprpaper configuration
|
||||
services.hyprpaper.enable = true;
|
||||
services.hyprpaper.settings = {
|
||||
preload = "Pictures/Wallpapers/space_station.png";
|
||||
wallpaper = ", Pictures/Wallpapers/space_station.png";
|
||||
preload = "Pictures/Wallpapers/tokio.png";
|
||||
wallpaper = ", Pictures/Wallpapers/tokio.png";
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -2,40 +2,167 @@
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
} : {
|
||||
programs.waybar = {
|
||||
enable = true;
|
||||
package = pkgs.waybar;
|
||||
/*settings = {
|
||||
settings = {
|
||||
mainBar = {
|
||||
layer = "top";
|
||||
position = "top";
|
||||
height = 30;
|
||||
output = [
|
||||
"eDP-1"
|
||||
"DP-1"
|
||||
"HDMI-A-1"
|
||||
"Virtual-1"
|
||||
output = [ "DP-1" ];
|
||||
|
||||
modules-left = [
|
||||
"hyprland/workspaces"
|
||||
"mpris"
|
||||
];
|
||||
|
||||
modules-left = [ "sway/workspaces" "sway/mode" "wlr/taskbar" ];
|
||||
modules-center = [ "sway/window" "custom/hello-from-waybar" ];
|
||||
modules-right = [ "mpd" "custom/mymodule#with-css-id" "temperature" ];
|
||||
modules-center = [];
|
||||
|
||||
modules-right = [
|
||||
"network"
|
||||
"memory"
|
||||
"cpu"
|
||||
"clock"
|
||||
];
|
||||
|
||||
# Widgets
|
||||
"sway/workspaces" = {
|
||||
disable-scroll = true;
|
||||
all-outputs = true;
|
||||
};
|
||||
"custom/hello-from-waybar" = {
|
||||
format = "hello {}";
|
||||
max-length = 40;
|
||||
interval = "once";
|
||||
exec = pkgs.writeShellScript "hello-from-waybar" ''
|
||||
echo "from within waybar $USER"
|
||||
'';
|
||||
|
||||
mpris = {
|
||||
format = "{player_icon} {dynamic}";
|
||||
format-paused = "<span color='grey'>{status_icon} {dynamic}</span>";
|
||||
max-length = 100;
|
||||
|
||||
player-icons = {
|
||||
default = "⏸";
|
||||
mpv = "🎵";
|
||||
};
|
||||
|
||||
status-icons = {
|
||||
paused = "▶";
|
||||
};
|
||||
};
|
||||
|
||||
"hyprland/workspaces" = {
|
||||
format = "{icon}";
|
||||
format-icons = {
|
||||
default = "";
|
||||
active = "";
|
||||
};
|
||||
};
|
||||
|
||||
network = {
|
||||
tooltip = true;
|
||||
format-wifi = "{icon} ";
|
||||
format-icons = ["" "" ""];
|
||||
rotate = 0;
|
||||
format-ethernet = " ";
|
||||
tooltip-format = "Network: <big><b>{essid}</b></big>\nSignal strength: <b>{signaldBm}dBm ({signalStrength}%)</b>\nFrequency: <b>{frequency}MHz</b>\nInterface: <b>{ifname}</b>\nIP: <b>{ipaddr}/{cidr}</b>\nGateway: <b>{gwaddr}</b>\nNetmask: <b>{netmask}</b>";
|
||||
format-linked = " {ifname} (No IP)";
|
||||
format-disconnected = " ";
|
||||
tooltip-format-disconnected = "Disconnected";
|
||||
on-click = "/usr/local/bin/ags -t ControlPanel";
|
||||
interval = 2;
|
||||
};
|
||||
|
||||
memory = {
|
||||
interval = 1;
|
||||
rotate = 270;
|
||||
format = "{icon}";
|
||||
format-icons = ["" "" "" "" "" "" "" "" ""];
|
||||
max-length = 10;
|
||||
};
|
||||
|
||||
cpu = {
|
||||
interval = 1;
|
||||
format = "{icon}";
|
||||
rotate = 270;
|
||||
format-icons = ["" "" "" "" "" "" "" "" ""];
|
||||
};
|
||||
|
||||
clock = {
|
||||
format = "{:%I:%M %p}";
|
||||
rotate = 0;
|
||||
on-click = "/usr/local/bin/ags -t ActivityCenter";
|
||||
tooltip-format = "<tt>{calendar}</tt>";
|
||||
|
||||
calendar = {
|
||||
mode = "month";
|
||||
mode-mon-col = 3;
|
||||
on-scroll = 1;
|
||||
on-click-right = "mode";
|
||||
format = {
|
||||
months = "<span color='#ffead3'><b>{}</b></span>";
|
||||
weekdays = "<span color='#ffcc66'><b>{}</b></span>";
|
||||
today = "<span color='#ff6699'><b>{}</b></span>";
|
||||
};
|
||||
};
|
||||
|
||||
actions = {
|
||||
on-click-right = "mode";
|
||||
on-click-forward = "tz_up";
|
||||
on-click-backward = "tz_down";
|
||||
on-scroll-up = "shift_up";
|
||||
on-scroll-down = "shift_down";
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
};*/
|
||||
|
||||
secondBar = {
|
||||
layer = "top";
|
||||
position = "top";
|
||||
height = 30;
|
||||
output = [
|
||||
"HDMI-A-2"
|
||||
];
|
||||
|
||||
modules-left = [
|
||||
"hyprland/workspaces"
|
||||
];
|
||||
|
||||
modules-center = [
|
||||
"custom/weather"
|
||||
];
|
||||
|
||||
modules-right = [
|
||||
"network"
|
||||
];
|
||||
|
||||
"hyprland/workspaces" = {
|
||||
format = "{icon}";
|
||||
format-icons = {
|
||||
default = "";
|
||||
active = "";
|
||||
};
|
||||
};
|
||||
|
||||
"custom/weather" = {
|
||||
exec = "python3 ~/.config/waybar/weather.py waybar";
|
||||
restart-interval = 900;
|
||||
return-type = "json";
|
||||
};
|
||||
|
||||
network = {
|
||||
tooltip = true;
|
||||
format-wifi = "{icon} ";
|
||||
format-icons = ["" "" ""];
|
||||
rotate = 0;
|
||||
format-ethernet = "{bandwidthTotalBits} {bandwidthUpBits} {bandwidthDownBits} ";
|
||||
tooltip-format = "Network: <big><b>{essid}</b></big>\nSignal strength: <b>{signaldBm}dBm ({signalStrength}%)</b>\nFrequency: <b>{frequency}MHz</b>\nInterface: <b>{ifname}</b>\nIP: <b>{ipaddr}/{cidr}</b>\nGateway: <b>{gwaddr}</b>\nNetmask: <b>{netmask}</b>";
|
||||
format-linked = " {ifname} (No IP)";
|
||||
format-disconnected = " ";
|
||||
tooltip-format-disconnected = "Disconnected";
|
||||
on-click = "/usr/local/bin/ags -t ControlPanel";
|
||||
interval = 2;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
home.file.".config/waybar" = {
|
||||
|
||||
7
home/programs/misc/appimage.nix
Normal file
7
home/programs/misc/appimage.nix
Normal file
@ -0,0 +1,7 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
home.programs.appimage = {
|
||||
enable = true;
|
||||
binfmt = true;
|
||||
};
|
||||
}
|
||||
15
home/xdg.nix
15
home/xdg.nix
@ -1,4 +1,4 @@
|
||||
{config, ...}: let
|
||||
{pkgs, config, ...}: let
|
||||
browser = ["firefox.desktop"];
|
||||
|
||||
# XDG MIME types
|
||||
@ -43,5 +43,18 @@ in {
|
||||
XDG_SCREENSHOTS_DIR = "${config.xdg.userDirs.pictures}/Screenshots";
|
||||
};
|
||||
};
|
||||
|
||||
portal = {
|
||||
enable = true;
|
||||
xdgOpenUsePortal = true;
|
||||
config = {
|
||||
common.default = [ "gtk" ];
|
||||
hyprland.default = [ "gtk" "hyprland" ];
|
||||
};
|
||||
extraPortals = [
|
||||
pkgs.xdg-desktop-portal-gtk
|
||||
pkgs.xdg-desktop-portal-hyprland
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
../../modules/regreet/regreet.nix
|
||||
../../modules/plymouth.nix
|
||||
../../modules/file_managers/spacefm.nix
|
||||
|
||||
../../modules/python.nix
|
||||
# Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
];
|
||||
@ -55,7 +55,7 @@
|
||||
|
||||
# for Nvidia GPU
|
||||
#services.xserver.videoDrivers = ["nvidia"];
|
||||
hardware.opengl.enable = true;
|
||||
hardware.graphics.enable = true;
|
||||
#hardware.nvidia = {
|
||||
# package = config.boot.kernelPackages.nvidiaPackages.stable;
|
||||
# modesetting.enable = true;
|
||||
|
||||
@ -76,5 +76,5 @@
|
||||
];
|
||||
|
||||
security.polkit.enable = true;
|
||||
|
||||
security.rtkit.enable = true;
|
||||
}
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
../../home/hyprland # Window Manager
|
||||
../../home/themes/dark
|
||||
../../home/hyprland/waybar/single-monitor.nix
|
||||
../../home/hyprland/waybar/double-monitor.nix
|
||||
|
||||
../../home/programs/dev # Dev Tools
|
||||
|
||||
@ -23,13 +23,13 @@
|
||||
../../home/programs/productivity/blender.nix
|
||||
../../home/programs/productivity/slicer.nix
|
||||
../../home/programs/productivity/okular.nix
|
||||
#../../home/programs/productivity/geary.nix
|
||||
../../home/programs/productivity/obsidian.nix
|
||||
|
||||
../../home/programs/social/element.nix
|
||||
../../home/programs/social/webcord.nix
|
||||
|
||||
../../home/programs/web/firefox.nix
|
||||
|
||||
../../home/programs/misc/appimage.nix
|
||||
# Games
|
||||
# ../../home/programs/games/itch.nix
|
||||
# ../../home/programs/games/steam.nix
|
||||
|
||||
Loading…
Reference in New Issue
Block a user