Compare commits

...

3 commits

Author SHA1 Message Date
Evie Litherland-Smith a3809f02f2 Switch back to using passSecretService 2024-09-12 09:17:57 +01:00
Evie Litherland-Smith 8044b416ee Ronin: update kanshi config
Disable laptop screen when docked

Set external screen scale in sway config as well as kanshi to remove
scale flickering
2024-09-12 09:09:13 +01:00
Evie Litherland-Smith d1b76f7f2f Auto upgrade operation from boot -> switch 2024-09-12 09:07:58 +01:00
6 changed files with 24 additions and 12 deletions

View file

@ -17,6 +17,5 @@
efi.canTouchEfiVariables = true; efi.canTouchEfiVariables = true;
}; };
users.mutableUsers = false; users.mutableUsers = false;
system.autoUpgrade.operation = "switch";
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
} }

View file

@ -4,7 +4,10 @@
home-manager.users.${username} = { home-manager.users.${username} = {
imports = [ ./home/work.nix ]; imports = [ ./home/work.nix ];
wayland.windowManager.sway.config = { wayland.windowManager.sway.config = {
output."eDP-1".scale = "1.25"; output = {
"eDP-1".scale = "1.25";
"Dell Inc. DELL P3223QE CCG8YN3".scale = "1.5";
};
workspaceOutputAssign = [ workspaceOutputAssign = [
{ {
output = "eDP-1"; output = "eDP-1";
@ -19,27 +22,39 @@
laptopScreen = { laptopScreen = {
criteria = "eDP-1"; criteria = "eDP-1";
scale = 1.25; scale = 1.25;
position = "2560,576"; # position = "2560,576";
}; };
monitor = { monitor = {
criteria = "Dell Inc. DELL P3223QE CCG8YN3"; criteria = "Dell Inc. DELL P3223QE CCG8YN3";
scale = 1.5; scale = 1.5;
position = "0,0";
}; };
in in
[ [
{ {
profile = { profile = {
name = "undocked"; name = "default";
outputs = [ laptopScreen ]; outputs = [
{
inherit (laptopScreen) criteria scale;
status = "enable";
position = "0,0";
}
];
}; };
} }
{ {
profile = { profile = {
name = "docked"; name = "docked";
outputs = [ outputs = [
laptopScreen {
monitor inherit (laptopScreen) criteria scale;
status = "disable";
}
{
inherit (monitor) criteria scale;
status = "enable";
position = "0,0";
}
]; ];
}; };
} }

View file

@ -197,6 +197,7 @@
}; };
}; };
services = { services = {
passSecretService.enable = true;
upower.enable = true; upower.enable = true;
power-profiles-daemon.enable = true; power-profiles-daemon.enable = true;
system76-scheduler = { system76-scheduler = {

View file

@ -2,7 +2,6 @@
{ {
home-manager.users.${username}.imports = [ ./home/desktop.nix ]; home-manager.users.${username}.imports = [ ./home/desktop.nix ];
nixpkgs.config.chromium.commandLineArgs = "--enable-features=UseOzonePlatform --ozone-platform=wayland"; nixpkgs.config.chromium.commandLineArgs = "--enable-features=UseOzonePlatform --ozone-platform=wayland";
system.autoUpgrade.operation = "boot";
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
environment = { environment = {
sessionVariables = { sessionVariables = {
@ -38,7 +37,6 @@
}; };
gtk.iconCache.enable = true; gtk.iconCache.enable = true;
services = { services = {
gnome.gnome-keyring.enable = true;
flatpak.enable = true; flatpak.enable = true;
printing.enable = true; printing.enable = true;
pipewire = { pipewire = {

View file

@ -25,7 +25,7 @@
hyprlinks = true; hyprlinks = true;
navigate = true; navigate = true;
side-by-side = true; side-by-side = true;
syntax-theme = with config.programs; lib.mkIf bat.enable bat.config.theme; syntax-theme = lib.mkIf config.programs.bat.enable config.programs.bat.config.theme;
}; };
}; };
attributes = [ attributes = [

View file

@ -22,7 +22,6 @@ in
../wlogout/default.nix ../wlogout/default.nix
]; ];
home.packages = with pkgs; [ home.packages = with pkgs; [
gnome.seahorse
ffmpeg ffmpeg
evince evince
grim grim