diff --git a/hardwares/doloro-laptop/hardware-configuration.nix b/hardwares/doloro-laptop/hardware-configuration.nix index c389ce6..6c0be97 100644 --- a/hardwares/doloro-laptop/hardware-configuration.nix +++ b/hardwares/doloro-laptop/hardware-configuration.nix @@ -1,14 +1,25 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: +{ + config, + lib, + pkgs, + modulesPath, + ... +}: { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "vmd" "nvme" ]; + boot.initrd.availableKernelModules = [ + "xhci_pci" + "thunderbolt" + "vmd" + "nvme" + ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; diff --git a/hosts/doloro-laptop/home.nix b/hosts/doloro-laptop/home.nix index f9b636c..0cbdd35 100644 --- a/hosts/doloro-laptop/home.nix +++ b/hosts/doloro-laptop/home.nix @@ -47,9 +47,13 @@ xdg.mimeApps.enable = true; wayland.windowManager.hyprland.settings = { monitor = [ - "HDMI-A-1, 1920x1080@60, 0x0, 1" - "DP-3, 1920x1080@144, 1920x0, 1" + "eDP-1, 2880x1800@120, 0x0, 2" ]; + input = { + kb_layout = "gb"; + follow_mouse = 2; + sensitivity = 0; + }; }; # This value determines the Home Manager release that your configuration is diff --git a/hosts/doloro-laptop/nixos.nix b/hosts/doloro-laptop/nixos.nix index 69f3c6e..c6105ce 100644 --- a/hosts/doloro-laptop/nixos.nix +++ b/hosts/doloro-laptop/nixos.nix @@ -30,7 +30,7 @@ in # Use the systemd-boot EFI boot loader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - boot.kernelPackages = pkgs.linuxPackages_latest; + boot.kernelPackages = pkgs.linuxPackages_6_12; # Hibernate works on 6.12 but not on latest networking.hostName = "doloro-nixos-laptop"; # Define your hostname. security.rtkit.enable = true; @@ -64,7 +64,7 @@ in enable = true; extraPackages = with pkgs; [ intel-media-driver # VA-API (iHD) userspace - vpl-gpu-rt # oneVPL (QSV) runtime + # vpl-gpu-rt # oneVPL (QSV) runtime intel-compute-runtime # OpenCL (NEO) + Level Zero for Arc/Xe ]; }; @@ -78,9 +78,6 @@ in users.users.root.openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBaa6Z5qtBSLEz+A4fQGYPfkOISsRQlmKkVbcx2zxML7" ]; - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; # Select internationalisation properties. # i18n.defaultLocale = "en_US.UTF-8"; @@ -93,17 +90,6 @@ in # Enable the X11 windowing system. services.xserver.enable = true; - # Configure keymap in X11 - # services.xserver.xkb.layout = "us"; - # services.xserver.xkb.options = "eurosign:e,caps:escape"; - - # Enable CUPS to print documents. - # services.printing.enable = true; - - # Enable sound. - # services.pulseaudio.enable = true; - # OR - sops = { defaultSopsFile = builtins.toPath "${nix-meow.flakeRoot}/secrets/users.yaml"; secrets = { @@ -132,6 +118,9 @@ in tree ]; hashedPasswordFile = config.sops.secrets."doloro-hashed_password".path; + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBaa6Z5qtBSLEz+A4fQGYPfkOISsRQlmKkVbcx2zxML7" # pc public key + ]; # initialPassword = "sex"; }; users.mutableUsers = false; diff --git a/hosts/doloro/home.nix b/hosts/doloro/home.nix index 87fea83..12fd241 100644 --- a/hosts/doloro/home.nix +++ b/hosts/doloro/home.nix @@ -59,10 +59,15 @@ exec-once = [ "hyprctl dispatch workspace 2" # shit solution to get quickshell on the right monitor ]; + workspace = [ + "name:2, monitor:DP-3" + ]; + input = { + kb_layout = "gb"; + follow_mouse = 2; + sensitivity = -0.5; + }; }; - workspace = [ - "name:2, monitor:DP-3" - ]; services = { gpg-agent = { diff --git a/modules/hyprland/runner.nix b/modules/hyprland/runner.nix index 6950d98..4a859a2 100644 --- a/modules/hyprland/runner.nix +++ b/modules/hyprland/runner.nix @@ -1,15 +1,20 @@ { inputs, pkgs, ... }: { home.packages = [ - pkgs.walker + pkgs.hyprlauncher ]; - systemd.user.services.walker-deamon = { + wayland.windowManager.hyprland.settings = { + bind = [ + "$mainMod, R, exec, hyprlauncher" + ]; + }; + systemd.user.services.hyprlauncher-deamon = { Install = { WantedBy = [ "hyprland-session.target" ]; }; Service = { ExecStart = "${pkgs.writeShellScript "watch-store" '' - walker --gapplication-service + hyprlauncher -d ''}"; }; }; diff --git a/modules/hyprland/settings.nix b/modules/hyprland/settings.nix index cc1db70..b46d0cd 100644 --- a/modules/hyprland/settings.nix +++ b/modules/hyprland/settings.nix @@ -85,11 +85,6 @@ enable_anr_dialog = false; vfr = true; }; - input = { - kb_layout = "gb"; - follow_mouse = 2; - sensitivity = -0.5; - }; "$mainMod" = "SUPER"; bind = [ "$mainMod, Q, exec, foot" @@ -97,7 +92,6 @@ "$mainMod, M, exit" "$mainMod, E, exec, $fileManager" "$mainMod, V, togglefloating," - "$mainMod, R, exec, walker" "$mainMod, P, pseudo, # dwindle" "$mainMod, J, togglesplit, # dwindle" "$mainMod, left, movefocus, l"