Merge remote-tracking branch 'origin/main' into thinkpad

common.nix

@@ -13,7 +13,7 @@ rec {
     pictures = "${dir.home}/Pictures";
   };
 
-  hostname = "nixos";
+  hostname = "thinkpad";
 
   keymaps = {
     layout = "gb,no";
@@ -21,8 +21,7 @@ rec {
   };
 
   # Empty matches all
-  monitor1 = "DP-1";
+  monitor1 = "";
-  monitor2 = "DP-3";
 
   username = "martin";
 

configuration.nix

@@ -39,6 +39,7 @@ in
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
+    brightnessctl
     wget
     xdg-utils
     xdg-desktop-portal

flake.nix

@@ -42,7 +42,7 @@
       common = import ./common.nix;
     in
     {
-      defaultPackage.${system} = home-manager.defaultPackage.${system};
+      defaultPackages.${system} = home-manager.defaultPackage.${system};
 
       # The minimum amount of dependencies in order to run 'just switch-now'
       devShells.${system}.default = pkgs.mkShell {

home-manager/development/git.nix

@@ -12,7 +12,7 @@
 
     signing = {
       signByDefault = true;
-      key = "706F53DD087A91DE";
+      key = "848D71DE0590C199";
     };
 
     extraConfig = {

home-manager/hyprland/hyprpanel/default.nix

@@ -39,6 +39,7 @@ in
             "network"
             "systray"
             "clock"
+            "battery"
             "notifications"
           ];
         };

home-manager/hyprland/hyprpaper.nix

@@ -1,5 +1,6 @@
 # Wallpapers
 { pkgs, ... }:
+
 let
   common = import ../../common.nix;
 in
@@ -14,7 +15,6 @@ in
       let
         wallpaperDir = ../../wallpapers;
         monitor1 = "${wallpaperDir}/nixos_waves.png";
-        monitor2 = "${wallpaperDir}/ekg_v2.png";
       in
       {
         ipc = "on";
@@ -23,12 +23,10 @@ in
 
         preload = [
           monitor1
-          monitor2
         ];
 
         wallpaper = [
           "${common.monitor1},${monitor1}"
-          "${common.monitor2},${monitor2}"
         ];
       };
   };

home-manager/hyprland/settings.nix

@@ -7,8 +7,7 @@ in
 {
   wayland.windowManager.hyprland.settings = {
     monitor = [
-      "${common.monitor1}, 3440x1440@175, 0x0, 1"
+      "${common.monitor1}, 1920x1080@60.05, 0x0, 1"
-      "${common.monitor2}, 3840x2160@60, 3440x0, 1.5, transform, 1"
     ];
 
     # Autostart
@@ -16,6 +15,7 @@ in
       app.browser
       app.terminal
       "systemctl --user start hyprpolkitagent"
+      "hyprsunset -t 5000" # Set blue light filter
     ];
 
     env = [
@@ -105,11 +105,16 @@ in
       kb_layout = common.keymaps.layout;
       kb_options = common.keymaps.options;
       follow_mouse = 1;
-      sensitivity = 0; # -1.0 - 1.0, 0 means no modification.
+      sensitivity = 0.4; # -1.0 - 1.0, 0 means no modification.
-      touchpad.natural_scroll = false;
+      touchpad.natural_scroll = true;
     };
 
-    gestures.workspace_swipe = false;
+    gestures = {
+      workspace_swipe = true;
+      workspace_swipe_distance = 150;
+      workspace_swipe_min_speed_to_force = 0;
+      workspace_swipe_cancel_ratio = 0.5;
+    };
 
     device = {
       name = "logitech-g502-hero-gaming-mouse";

home-manager/hyprland/waybar/config/config.jsonc

@@ -15,19 +15,19 @@
     "custom/notification",
     "tray",
     "custom/lock",
-    "custom/power"
+    "custom/power",
   ],
   "hyprland/workspaces": {
     "disable-scroll": false,
     "sort-by-name": true,
-    "format": " {id} "
+    "format": " {id} ",
   },
   "hyprland/window": {
-    "format": "{initialTitle}"
+    "format": "{initialTitle}",
   },
   "tray": {
     "icon-size": 21,
-    "spacing": 10
+    "spacing": 10,
   },
   // TODO better music module
   "custom/music": {
@@ -37,7 +37,7 @@
     "tooltip": false,
     "exec": "playerctl metadata --format='{{ title }}'",
     "on-click": "playerctl play-pause",
-    "max-length": 50
+    "max-length": 50,
   },
   "clock": {
     "timezone": "Europe/Oslo",
@@ -51,39 +51,39 @@
         "days": "<span color='#ecc6d9'><b>{}</b></span>",
         "weeks": "<span color='#99ffdd'><b>W{}</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>",
-      }
+      },
-    }
+    },
   },
   "backlight": {
     "device": "intel_backlight",
     "format": "{icon}",
-    "format-icons": ["", "", "", "", "", "", "", "", ""]
+    "format-icons": ["", "", "", "", "", "", "", "", ""],
   },
   "wireplumber": {
     // "scroll-step": 1, // %, can be a float
     "format": "{icon} {volume}%",
     "format-muted": " ",
     "format-icons": {
-      "default": ["", " ", " "]
+      "default": ["", " ", " "],
     },
-    "on-click": "pavucontrol"
+    "on-click": "pavucontrol",
   },
   "hyprland/language": {
     "format-en": "EN",
     "format-no": "NO",
     "keyboard-name": "logitech-logitech-g710-keyboard",
-    "on-click": "hyprctl switchxkblayout logitech-logitech-g710-keyboard next"
+    "on-click": "hyprctl switchxkblayout logitech-logitech-g710-keyboard next",
   },
   "custom/lock": {
     "tooltip": false,
     "on-click": "sh -c '(sleep 0.5s; hyprlock)'",
-    "format": ""
+    "format": "",
   },
   "custom/power": {
     "tooltip": false,
     "on-click": "wlogout &",
-    "format": " "
+    "format": " ",
   },
   "custom/notification": {
     "tooltip": false,
@@ -96,13 +96,13 @@
       "inhibited-notification": "<span foreground='#f38ba8'><sup></sup></span>",
       "inhibited-none": "",
       "dnd-inhibited-notification": "<span foreground='#f38ba8'><sup></sup></span>",
-      "dnd-inhibited-none": ""
+      "dnd-inhibited-none": "",
     },
     "return-type": "json",
     "exec-if": "which swaync-client",
     "exec": "swaync-client -swb",
     "on-click": "swaync-client -t -sw",
     "on-click-right": "swaync-client -d -sw",
-    "escape": true
+    "escape": true,
-  }
+  },
 }

modules/battery.nix

@@ -0,0 +1,6 @@
+{
+  services = {
+    upower.enable = true;
+    power-profiles-daemon.enable = true;
+  };
+}

modules/default.nix

@@ -1,5 +1,6 @@
 {
   imports = [
+    ./battery.nix
     ./development.nix
     ./fonts.nix
     ./gnome

modules/development.nix

@@ -37,6 +37,5 @@
 
   services.ollama = {
     enable = true;
-    acceleration = "cuda";
   };
 }

modules/hardware/graphics/default.nix

@@ -1,7 +1,5 @@
 {
-  imports = [
+  imports = [ ];
-    ./nvidia.nix
-  ];
 
   # Enable OpenGL
   hardware.graphics.enable = true;

modules/hardware/graphics/nvidia.nix

@@ -1,28 +0,0 @@
-{ pkgs, ... }:
-
-{
-  boot.kernelParams = [ "nvidia.NVreg_PreserveVideoMemoryAllocations=1" ];
-
-  # For hardware acceleration
-  environment.sessionVariables.LIBVA_DRIVER_NAME = "nvidia";
-
-  hardware = {
-    graphics.extraPackages = with pkgs; [
-      # Used for hardware-acceleration
-      nvidia-vaapi-driver
-    ];
-    nvidia = {
-      # Required
-      modesetting.enable = true;
-      # Use closed-source drivers
-      open = false;
-      # Enable the Nvidia settings menu
-      nvidiaSettings = true;
-      # Enable nvidia-suspend.service, nvidia-hibernate.service and nvidia-resume.service
-      powerManagement.enable = true;
-    };
-  };
-
-  # Load Nvidia driver for Xorg and Wayland
-  services.xserver.videoDrivers = [ "nvidia" ];
-}

modules/hardware/hardware-configuration.nix

@@ -15,26 +15,26 @@
   ];
 
   boot.initrd.availableKernelModules = [
-    "xhci_pci"
-    "ahci"
     "nvme"
+    "xhci_pci"
     "usb_storage"
-    "usbhid"
     "sd_mod"
-    "sr_mod"
+    "sdhci_pci"
   ];
   boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
+  boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" = {
-    device = "/dev/disk/by-uuid/5e3f0f97-4bb4-4a53-ace2-9ed19ff9e8ea";
+    device = "/dev/disk/by-uuid/5ac9c425-35ae-47d5-a683-68ee0dbfc2bc";
-    fsType = "btrfs";
+    fsType = "ext4";
-    options = [ "subvol=@" ];
   };
 
+  boot.initrd.luks.devices."luks-99b73f22-3fa1-42b5-ad48-54b0ccff72cc".device =
+    "/dev/disk/by-uuid/99b73f22-3fa1-42b5-ad48-54b0ccff72cc";
+
   fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/D188-48A9";
+    device = "/dev/disk/by-uuid/3CFB-D12A";
     fsType = "vfat";
     options = [
       "fmask=0077"
@@ -49,10 +49,9 @@
   # still possible to use this option, but it's recommended to use it in conjunction
   # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.eno1.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp2s0f0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp0s20f0u8.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlp6s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

modules/hyprland/default.nix

@@ -6,6 +6,7 @@
     xdg-desktop-portal-hyprland
     hyprpolkitagent # Auth deamon providing modals for password auth
     hyprshot # Screenshots
+    hyprsunset # Blue light filter
     unstable.hyprsysteminfo
     unstable.hyprland-qtutils
     unstable.hyprland-qt-support

modules/security.nix

@@ -11,7 +11,27 @@
   security = {
     pam = {
       services = {
-        login.u2fAuth = false; # U2F and password
+        gdm-fingerprint.text = ''
+          auth       required                    pam_shells.so
+          auth       requisite                   pam_nologin.so
+          auth       requisite                   pam_faillock.so      preauth
+          auth       required                    ${pkgs.fprintd}/lib/security/pam_fprintd.so
+          auth       optional                    pam_permit.so
+          auth       required                    pam_env.so
+          auth       [success=ok default=1]      ${pkgs.gdm}/lib/security/pam_gdm.so
+          auth       optional                    ${pkgs.gnome-keyring}/lib/security/pam_gnome_keyring.so
+
+          account    include                     login
+
+          password   required                    pam_deny.so
+
+          session    include                     login
+          session    optional                    ${pkgs.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start
+        '';
+        login = {
+          fprintAuth = false;
+          u2fAuth = false; # U2F and password
+        };
         sudo.u2fAuth = true; # U2F or password
       };
       u2f = {
@@ -24,6 +44,23 @@
     };
   };
 
+  # Start the driver at boot
+  systemd.services.fprintd = {
+    wantedBy = [ "multi-user.target" ];
+    serviceConfig.Type = "simple";
+  };
+
+  # Install the driver
+  services.fprintd = {
+    enable = true;
+    tod.driver = pkgs.libfprint-2-tod1-goodix-550a; # Goodix 550a driver (from Lenovo)
+  };
+
+  # however for focaltech 2808:a658, use fprintd with overidden package (without tod)
+  # services.fprintd.package = pkgs.fprintd.override {
+  #   libfprint = pkgs.libfprint-focaltech-2808-a658;
+  # };
+
   services = {
     pcscd.enable = true; # Required for Yubikey
     udev.packages = with pkgs; [ yubikey-personalization ];