Aloria update

This commit is contained in:
Thomas Avé 2024-06-10 16:01:29 +02:00
parent f1a77181e7
commit 85791beff8
5 changed files with 33 additions and 63 deletions

View File

@ -12,7 +12,7 @@
./ssh ./ssh
./mpv ./mpv
]; ];
home.packages = with pkgs; [ telegram-desktop webcord devenv iwgtk ]; home.packages = with pkgs; [ telegram-desktop webcord devenv iwgtk element-desktop ];
programs.ssh.matchBlocks."*".identityFile = "/home/user/.secrets/SSH/Aloria/id_ed25519"; programs.ssh.matchBlocks."*".identityFile = "/home/user/.secrets/SSH/Aloria/id_ed25519";
services.hyprpaper = { services.hyprpaper = {
@ -26,11 +26,6 @@
}; };
}; };
gtk.iconTheme = {
name = "Papirus";
gtk.iconTheme.package = pkgs.papirus-icon-theme;
};
# wayland.windowManager.hyprland.settings.env = ["WLR_DRM_DEVICES,/dev/dri/by-path/pci-0000:01:00.0-card"]; # Nvidia # wayland.windowManager.hyprland.settings.env = ["WLR_DRM_DEVICES,/dev/dri/by-path/pci-0000:01:00.0-card"]; # Nvidia
# wayland.windowManager.hyprland.settings.env = ["WLR_DRM_DEVICES,/dev/dri/by-path/pci-0000:00:02.0-card"]; # Intel # wayland.windowManager.hyprland.settings.env = ["WLR_DRM_DEVICES,/dev/dri/by-path/pci-0000:00:02.0-card"]; # Intel
wayland.windowManager.hyprland.settings = { wayland.windowManager.hyprland.settings = {

View File

@ -24,18 +24,6 @@
]; ];
}; };
}; };
gtk = {
enable = true;
theme = {
package = pkgs.gnome.gnome-themes-extra;
name = "Adwaita-dark";
};
iconTheme = {
name = "Papirus";
package = pkgs.papirus-icon-theme;
};
};
programs.waybar.settings.mainBar = { programs.waybar.settings.mainBar = {
output = "DP-2"; output = "DP-2";
"custom/temperature".exec = "${pkgs.lm_sensors}/bin/sensors | ${pkgs.gnugrep}/bin/grep Tctl | cut -c16-22"; "custom/temperature".exec = "${pkgs.lm_sensors}/bin/sensors | ${pkgs.gnugrep}/bin/grep Tctl | cut -c16-22";

View File

@ -67,6 +67,25 @@ in {
pkgs.jq pkgs.jq
]; ];
gtk = {
enable = true;
theme = {
package = pkgs.gnome.gnome-themes-extra;
name = "Adwaita-dark";
};
iconTheme = {
name = "Papirus";
package = pkgs.papirus-icon-theme;
};
};
home.pointerCursor = {
gtk.enable = true;
name = "Adwaita";
size = 28;
package = pkgs.gnome.adwaita-icon-theme;
};
services.cliphist = { enable = true; }; services.cliphist = { enable = true; };
services.hyprpaper = { services.hyprpaper = {

View File

@ -1,38 +1,4 @@
{ pkgs, inputs, config, ... }: { pkgs, inputs, config, ... }:
let
mkConnection = name: cfg: {
connection = {
id = name;
type = "wifi";
};
ipv4 = {
method = "auto";
};
ipv6 = {
method = "auto";
};
wifi = {
ssid = name;
mode = "infrastructure";
};
wifi-security = {
auth-alg = "open";
key-mgmt = "wpa-psk";
psk = cfg.id;
};
};
connections = {
"The Buttshark" = {
id = "$THE_BUTTSHARK";
};
"5G Research Tower (5000 Watt)" = {
id = "$RESEARCH_TOWER";
};
"5G Research Tower (2400 Watt)" = {
id = "$RESEARCH_TOWER";
};
};
in
{ {
imports = [ imports = [
(import ../Common { inherit inputs pkgs; }) (import ../Common { inherit inputs pkgs; })
@ -105,17 +71,18 @@ in
}]; }];
}; };
}; };
networking.networkmanager = { # networking.networkmanager = {
enable = true; # enable = true;
ensureProfiles = { # ensureProfiles = {
environmentFiles = [ # environmentFiles = [
"/home/user/.secrets/Wireless/Aloria.env" # "/home/user/.secrets/Wireless/Aloria.env"
]; # ];
profiles = pkgs.lib.mapAttrs mkConnection connections; # profiles = pkgs.lib.mapAttrs mkConnection connections;
}; # };
dns = "systemd-resolved"; # dns = "systemd-resolved";
}; # };
networking.networkmanager.wifi.backend = "iwd"; # networking.networkmanager.wifi.backend = "iwd";
networking.wireless.iwd.enable = true; networking.wireless.iwd.enable = true;
networking.wireless.iwd.settings = { networking.wireless.iwd.settings = {
IPv6 = { IPv6 = {

View File

@ -10,6 +10,7 @@
services.thermald.enable = true; services.thermald.enable = true;
services.pcscd.enable = true; services.pcscd.enable = true;
services.fwupd.enable = true; services.fwupd.enable = true;
services.gvfs.enable = true;
services.fstrim.enable = true; services.fstrim.enable = true;
hardware.opengl = { hardware.opengl = {
enable = true; enable = true;