Fixed bug in Updates script

Added xorgScale.nix file that will set scaling in xorg if the xrandrScale option is set in a options.nix file gnome-keyring should work properly now when we login (from sddm)
jwyuen · May 27, 2024 · f2c8653 · f2c8653
1 parent 51492b7
commit f2c8653
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 12 deletions.
diff --git a/dots/.config/bspwm/scripts/Updates b/dots/.config/bspwm/scripts/Updates
@@ -3,7 +3,7 @@
 # Script to check for new updates in NixOS 
 
 HOST=$(hostname -s)
-PROJECT_DIR=~/jwy-gh0stzk-dots
+PROJECT_DIR=~/jwy-gh0stzk-dotfiles
 
 get_total_updates() {
     #nhstring="Closure size: 2048 -> 2048 (0 paths added, 0 paths removed, delta +0, disk usage +0B)."

diff --git a/nix-config/hosts/nix-lappy/options.nix b/nix-config/hosts/nix-lappy/options.nix
@@ -76,4 +76,7 @@ in {
   # Enable SyncThing
   syncthing = true;
 
+  # Xorg scaling
+  xrandrScale = "0.8x0.8";
+
 }
diff --git a/nix-config/system/default.nix b/nix-config/system/default.nix
@@ -23,5 +23,6 @@
     ./services.nix
     ./syncthing.nix
     ./vm.nix
+    ./xorgScale.nix
   ];
 }
diff --git a/nix-config/system/displaymanager.nix b/nix-config/system/displaymanager.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, host, ... }:
+{ lib, pkgs, config, host, ... }:
 
 let inherit (import ../hosts/${host}/options.nix) theKBDVariant
 theKBDLayout theSecondKBDLayout; in
@@ -25,12 +25,12 @@ theKBDLayout theSecondKBDLayout; in
  #   _JAVA_OPTIONS = "-Dsun.java2d.uiScale=1.2";
  # };
   environment.systemPackages =
-let
-    sugar = pkgs.callPackage ../pkgs/sddm-sugar-dark.nix {};
-    tokyo-night = pkgs.libsForQt5.callPackage ../pkgs/sddm-tokyo-night.nix {};
-in [ 
-    sugar.sddm-sugar-dark # Name: sugar-dark
-    tokyo-night # Name: tokyo-night-sddm
-    pkgs.libsForQt5.qt5.qtgraphicaleffects
-  ];
+    let
+      sugar = pkgs.callPackage ../pkgs/sddm-sugar-dark.nix {};
+      tokyo-night = pkgs.libsForQt5.callPackage ../pkgs/sddm-tokyo-night.nix {};
+    in [ 
+      sugar.sddm-sugar-dark # Name: sugar-dark
+      tokyo-night # Name: tokyo-night-sddm
+      pkgs.libsForQt5.qt5.qtgraphicaleffects
+    ];
 }
diff --git a/nix-config/system/services.nix b/nix-config/system/services.nix
@@ -27,11 +27,13 @@
   programs.thunar.enable = true;
   services.gvfs.enable = true;
   services.tumbler.enable = true;
-  services.gnome.gnome-keyring.enable=true;
   hardware.bluetooth.enable = true; # enables support for Bluetooth
   hardware.bluetooth.powerOnBoot = false; # powers up the default Bluetooth controller on boot
   services.blueman.enable = true;
-  #security.pam.services.swaylock = {
+
+  services.gnome.gnome-keyring.enable=true;
+  security.pam.services.sddm.enableGnomeKeyring = true;
+  #security.pam.services.login.enableGnomeKeyring = true;
   security.pam.services.betterlockscreen = {
 
     text = ''

diff --git a/nix-config/system/xorgScale.nix b/nix-config/system/xorgScale.nix
@@ -0,0 +1,8 @@
+{ config, lib, host, ... }:
+
+let inherit (import ../hosts/${host}/options.nix) xrandrScale; in
+lib.mkIf ("${xrandrScale}" != null && "${host}" == "nix-lappy") {
+  services.xserver.displayManager.sessionCommands = ''
+    xrandr --output eDP-1 --scale ${xrandrScale} --mode 2880x1800
+  '';
+}