tring to get laptop to work
This commit is contained in:
parent
e6d3e90d4d
commit
f323e3b909
3 changed files with 150 additions and 146 deletions
|
|
@ -19,6 +19,7 @@
|
||||||
../../modules/desktop/niri.nix
|
../../modules/desktop/niri.nix
|
||||||
../../modules/desktop/waybar.nix
|
../../modules/desktop/waybar.nix
|
||||||
../../modules/desktop/gnome.nix
|
../../modules/desktop/gnome.nix
|
||||||
|
../../modules/desktop/cosmic.nix
|
||||||
../../modules/desktop/fonts.nix
|
../../modules/desktop/fonts.nix
|
||||||
../../modules/desktop/input.nix
|
../../modules/desktop/input.nix
|
||||||
|
|
||||||
|
|
@ -47,7 +48,7 @@
|
||||||
../../modules/security/ssh-keys.nix
|
../../modules/security/ssh-keys.nix
|
||||||
|
|
||||||
# Services
|
# Services
|
||||||
../../modules/services/seatd.nix
|
#../../modules/services/seatd.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
|
|
@ -98,22 +99,23 @@
|
||||||
|
|
||||||
# Laptop-specific services
|
# Laptop-specific services
|
||||||
services = {
|
services = {
|
||||||
# Enable clean seatd/greetd login
|
xserver.displayManager.gdm.enable = true;
|
||||||
seatd-clean.enable = true;
|
xserver.displayManager.gdm.wayland = true; # Enable Wayland support
|
||||||
|
# Enable clean seatd/greetd login (seat management for Wayland compositors)
|
||||||
|
# seatd-clean.enable = true;
|
||||||
|
|
||||||
# Power management for laptop
|
# power-profiles-daemon.enable = true;
|
||||||
power-profiles-daemon.enable = true;
|
# upower.enable = true;
|
||||||
upower.enable = true;
|
|
||||||
|
|
||||||
# Essential services
|
|
||||||
tailscale.enable = true;
|
tailscale.enable = true;
|
||||||
blueman.enable = true;
|
# Bluetooth manager GUI
|
||||||
|
# blueman.enable = true;
|
||||||
|
|
||||||
# Firmware updates
|
# Firmware updates via fwupd
|
||||||
fwupd.enable = true;
|
fwupd.enable = true;
|
||||||
|
|
||||||
# Location services for time zone
|
# Location services (used for automatic time zone, etc.)
|
||||||
geoclue2.enable = true;
|
# geoclue2.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
# Localization
|
# Localization
|
||||||
|
|
|
||||||
|
|
@ -62,10 +62,10 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
# Bluetooth support for Intel AX200
|
# Bluetooth support for Intel AX200
|
||||||
bluetooth = {
|
# bluetooth = {
|
||||||
enable = true;
|
# enable = true;
|
||||||
powerOnBoot = true;
|
# powerOnBoot = true;
|
||||||
};
|
# };
|
||||||
};
|
};
|
||||||
|
|
||||||
# Power management for AMD Ryzen 7 4700U
|
# Power management for AMD Ryzen 7 4700U
|
||||||
|
|
|
||||||
|
|
@ -6,148 +6,150 @@
|
||||||
# Ensure waybar is installed
|
# Ensure waybar is installed
|
||||||
environment.systemPackages = with pkgs; [waybar];
|
environment.systemPackages = with pkgs; [waybar];
|
||||||
|
|
||||||
programs.waybar = {
|
# Configure Waybar
|
||||||
enable = true;
|
environment.etc."xdg/waybar/config".text = ''
|
||||||
settings = {
|
{
|
||||||
layer = "top";
|
"layer": "top",
|
||||||
position = "top";
|
"position": "top",
|
||||||
height = 30;
|
"height": 30,
|
||||||
spacing = 4;
|
"spacing": 4,
|
||||||
modules-left = ["sway/workspaces"];
|
"modules-left": ["sway/workspaces"],
|
||||||
modules-center = [];
|
"modules-center": [],
|
||||||
modules-right = ["network" "clock"];
|
"modules-right": ["network", "clock"],
|
||||||
"sway/workspaces" = {
|
"sway/workspaces": {
|
||||||
disable-scroll = false;
|
"disable-scroll": false,
|
||||||
all-outputs = true;
|
"all-outputs": true,
|
||||||
format = "{name}";
|
"format": "{name}",
|
||||||
format-icons = {
|
"format-icons": {
|
||||||
"1" = "1";
|
"1": "1",
|
||||||
"2" = "2";
|
"2": "2",
|
||||||
"3" = "3";
|
"3": "3",
|
||||||
"4" = "4";
|
"4": "4",
|
||||||
"5" = "5";
|
"5": "5",
|
||||||
urgent = "";
|
"urgent": "",
|
||||||
focused = "";
|
"focused": "",
|
||||||
default = "";
|
"default": ""
|
||||||
};
|
}
|
||||||
};
|
},
|
||||||
clock = {
|
"clock": {
|
||||||
timezone = "Europe/Oslo";
|
"timezone": "Europe/Oslo",
|
||||||
format = "{:%H:%M}";
|
"format": "{:%H:%M}",
|
||||||
format-alt = "{:%Y-%m-%d %H:%M:%S}";
|
"format-alt": "{:%Y-%m-%d %H:%M:%S}",
|
||||||
tooltip-format = "<tt><small>{calendar}</small></tt>";
|
"tooltip-format": "<tt><small>{calendar}</small></tt>",
|
||||||
calendar = {
|
"calendar": {
|
||||||
mode = "year";
|
"mode": "year",
|
||||||
mode-mon-col = 3;
|
"mode-mon-col": 3,
|
||||||
weeks-pos = "right";
|
"weeks-pos": "right",
|
||||||
on-scroll = 1;
|
"on-scroll": 1,
|
||||||
on-click-right = "mode";
|
"on-click-right": "mode",
|
||||||
format = {
|
"format": {
|
||||||
months = "<span color='#ffead3'><b>{}</b></span>";
|
"months": "<span color='#ffead3'><b>{}</b></span>",
|
||||||
days = "<span color='#ecc6d9'><b>{}</b></span>";
|
"days": "<span color='#ecc6d9'><b>{}</b></span>",
|
||||||
weeks = "<span color='#99ffdd'><b>W{}</b></span>";
|
"weeks": "<span color='#99ffdd'><b>W{}</b></span>",
|
||||||
weekdays = "<span color='#ffcc66'><b>{}</b></span>";
|
"weekdays": "<span color='#ffcc66'><b>{}</b></span>",
|
||||||
today = "<span color='#ff6699'><b><u>{}</u></b></span>";
|
"today": "<span color='#ff6699'><b><u>{}</u></b></span>"
|
||||||
};
|
}
|
||||||
};
|
},
|
||||||
actions = {
|
"actions": {
|
||||||
on-click-right = "mode";
|
"on-click-right": "mode",
|
||||||
on-click-forward = "tz_up";
|
"on-click-forward": "tz_up",
|
||||||
on-click-backward = "tz_down";
|
"on-click-backward": "tz_down",
|
||||||
on-scroll-up = "shift_up";
|
"on-scroll-up": "shift_up",
|
||||||
on-scroll-down = "shift_down";
|
"on-scroll-down": "shift_down"
|
||||||
};
|
}
|
||||||
};
|
},
|
||||||
network = {
|
"network": {
|
||||||
format-wifi = "{essid} ({signalStrength}%) ";
|
"format-wifi": "{essid} ({signalStrength}%) ",
|
||||||
format-ethernet = "{ipaddr}/{cidr} ";
|
"format-ethernet": "{ipaddr}/{cidr} ",
|
||||||
tooltip-format = "{ifname} via {gwaddr} ";
|
"tooltip-format": "{ifname} via {gwaddr} ",
|
||||||
format-linked = "{ifname} (No IP) ";
|
"format-linked": "{ifname} (No IP) ",
|
||||||
format-disconnected = "Disconnected ⚠";
|
"format-disconnected": "Disconnected ⚠",
|
||||||
format-alt = "{ifname}: {ipaddr}/{cidr}";
|
"format-alt": "{ifname}: {ipaddr}/{cidr}"
|
||||||
};
|
}
|
||||||
};
|
}
|
||||||
style = ''
|
'';
|
||||||
* {
|
|
||||||
border: none;
|
|
||||||
border-radius: 0;
|
|
||||||
font-family: 'Inter', 'Font Awesome 6 Free';
|
|
||||||
font-size: 13px;
|
|
||||||
min-height: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
window#waybar {
|
# Style for Waybar
|
||||||
background-color: rgba(43, 48, 59, 0.9);
|
environment.etc."xdg/waybar/style.css".text = ''
|
||||||
border-bottom: 3px solid rgba(100, 114, 125, 0.5);
|
* {
|
||||||
color: #ffffff;
|
border: none;
|
||||||
transition-property: background-color;
|
border-radius: 0;
|
||||||
transition-duration: 0.5s;
|
font-family: 'Inter', 'Font Awesome 6 Free';
|
||||||
}
|
font-size: 13px;
|
||||||
|
min-height: 0;
|
||||||
|
}
|
||||||
|
|
||||||
window#waybar.hidden {
|
window#waybar {
|
||||||
opacity: 0.2;
|
background-color: rgba(43, 48, 59, 0.9);
|
||||||
}
|
border-bottom: 3px solid rgba(100, 114, 125, 0.5);
|
||||||
|
color: #ffffff;
|
||||||
|
transition-property: background-color;
|
||||||
|
transition-duration: 0.5s;
|
||||||
|
}
|
||||||
|
|
||||||
#workspaces {
|
window#waybar.hidden {
|
||||||
margin: 0 4px;
|
opacity: 0.2;
|
||||||
}
|
}
|
||||||
|
|
||||||
#workspaces button {
|
#workspaces {
|
||||||
padding: 0 8px;
|
margin: 0 4px;
|
||||||
background-color: transparent;
|
}
|
||||||
color: #ffffff;
|
|
||||||
border-bottom: 3px solid transparent;
|
|
||||||
transition: all 0.3s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
#workspaces button:hover {
|
#workspaces button {
|
||||||
background: rgba(0, 0, 0, 0.2);
|
padding: 0 8px;
|
||||||
}
|
background-color: transparent;
|
||||||
|
color: #ffffff;
|
||||||
|
border-bottom: 3px solid transparent;
|
||||||
|
transition: all 0.3s ease;
|
||||||
|
}
|
||||||
|
|
||||||
#workspaces button.focused {
|
#workspaces button:hover {
|
||||||
background-color: #64727D;
|
background: rgba(0, 0, 0, 0.2);
|
||||||
border-bottom: 3px solid #ffffff;
|
}
|
||||||
}
|
|
||||||
|
|
||||||
#workspaces button.urgent {
|
#workspaces button.focused {
|
||||||
background-color: #eb4d4b;
|
background-color: #64727D;
|
||||||
color: #ffffff;
|
border-bottom: 3px solid #ffffff;
|
||||||
}
|
}
|
||||||
|
|
||||||
#clock,
|
#workspaces button.urgent {
|
||||||
#network {
|
background-color: #eb4d4b;
|
||||||
padding: 0 10px;
|
color: #ffffff;
|
||||||
color: #ffffff;
|
}
|
||||||
}
|
|
||||||
|
|
||||||
#clock {
|
#clock,
|
||||||
background-color: #64727D;
|
#network {
|
||||||
border-radius: 0 8px 8px 0;
|
padding: 0 10px;
|
||||||
}
|
color: #ffffff;
|
||||||
|
}
|
||||||
|
|
||||||
#network {
|
#clock {
|
||||||
background-color: #2980b9;
|
background-color: #64727D;
|
||||||
border-radius: 8px 0 0 8px;
|
border-radius: 0 8px 8px 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#network.disconnected {
|
#network {
|
||||||
background-color: #f53c3c;
|
background-color: #2980b9;
|
||||||
}
|
border-radius: 8px 0 0 8px;
|
||||||
|
}
|
||||||
|
|
||||||
@keyframes blink {
|
#network.disconnected {
|
||||||
to {
|
background-color: #f53c3c;
|
||||||
background-color: #ffffff;
|
}
|
||||||
color: #000000;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#network.disconnected {
|
@keyframes blink {
|
||||||
animation-name: blink;
|
to {
|
||||||
animation-duration: 0.5s;
|
background-color: #ffffff;
|
||||||
animation-timing-function: linear;
|
color: #000000;
|
||||||
animation-iteration-count: infinite;
|
}
|
||||||
animation-direction: alternate;
|
}
|
||||||
}
|
|
||||||
'';
|
#network.disconnected {
|
||||||
};
|
animation-name: blink;
|
||||||
|
animation-duration: 0.5s;
|
||||||
|
animation-timing-function: linear;
|
||||||
|
animation-iteration-count: infinite;
|
||||||
|
animation-direction: alternate;
|
||||||
|
}
|
||||||
|
'';
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue