From 524f694ab0e849ed3b82834f7dd946bb2a8b65a4 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Mon, 26 Aug 2024 09:56:21 -0400 Subject: [PATCH] Upgraded Nixos --- flake.lock | 30 +++++++++++++++--------------- hosts/fwbook.nix | 2 ++ modules/nixos/desktop/hyprland.nix | 11 +++-------- 3 files changed, 20 insertions(+), 23 deletions(-) diff --git a/flake.lock b/flake.lock index ab7343d..1c648e0 100644 --- a/flake.lock +++ b/flake.lock @@ -65,11 +65,11 @@ ] }, "locked": { - "lastModified": 1722609272, - "narHash": "sha256-Kkb+ULEHVmk07AX+OhwyofFxBDpw+2WvsXguUS2m6e4=", + "lastModified": 1724561770, + "narHash": "sha256-zv8C9RNa86CIpyHwPIVO/k+5TfM8ZbjGwOOpTe1grls=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "f7142b8024d6b70c66fd646e1d099d3aa5bfec49", + "rev": "ac5694a0b855a981e81b4d9f14052e3ff46ca39e", "type": "github" }, "original": { @@ -80,11 +80,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1722332872, - "narHash": "sha256-2xLM4sc5QBfi0U/AANJAW21Bj4ZX479MHPMPkB+eKBU=", + "lastModified": 1724575805, + "narHash": "sha256-OB/kEL3GAhUZmUfkbPfsPhKs0pRqJKs0EEBiLfyKZw8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "14c333162ba53c02853add87a0000cbd7aa230c2", + "rev": "9fc19be21f0807d6be092d70bf0b1de0c00ac895", "type": "github" }, "original": { @@ -112,11 +112,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1722869614, - "narHash": "sha256-7ojM1KSk3mzutD7SkrdSflHXEujPvW1u7QuqWoTLXQU=", + "lastModified": 1724316499, + "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "883180e6550c1723395a3a342f830bfc5c371f6b", + "rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841", "type": "github" }, "original": { @@ -170,11 +170,11 @@ }, "unstable": { "locked": { - "lastModified": 1722630782, - "narHash": "sha256-hMyG9/WlUi0Ho9VkRrrez7SeNlDzLxalm9FwY7n/Noo=", + "lastModified": 1724678144, + "narHash": "sha256-DmNK+bnNtRNE8kGeTa/r6Bm1g7BKyDdHPTgkhKRteco=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d04953086551086b44b6f3c6b7eeb26294f207da", + "rev": "36dd860c7b3ce383388a4f8aba6c56e46f277969", "type": "github" }, "original": { @@ -191,11 +191,11 @@ ] }, "locked": { - "lastModified": 1722630065, - "narHash": "sha256-QfM/9BMRkCmgWzrPDK+KbgJOUlSJnfX4OvsUupEUZvA=", + "lastModified": 1724435763, + "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", "owner": "nix-community", "repo": "home-manager", - "rev": "afc892db74d65042031a093adb6010c4c3378422", + "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", "type": "github" }, "original": { diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index f40ebc1..5c8f778 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -14,6 +14,7 @@ in kde.enabled = true; hyprland.enabled = true; }; + services.displayManager.defaultSession = "hyprland"; skyg.nixos.common.hardware.sound.enable = true; # Firmware updater services.fwupd.enable = true; @@ -144,6 +145,7 @@ in lidSwitch = "suspend-then-hibernate"; powerKey = "lock"; extraConfig = '' + LidSwitchIgnoreInhibited=yes HandlePowerKey=suspend-then-hibernate IdleAction=suspend-then-hibernate IdleActionSec=2m diff --git a/modules/nixos/desktop/hyprland.nix b/modules/nixos/desktop/hyprland.nix index 6d6d4b4..f6e91b4 100644 --- a/modules/nixos/desktop/hyprland.nix +++ b/modules/nixos/desktop/hyprland.nix @@ -16,14 +16,10 @@ in # programs.hyprland.xwayland.enable = true; programs.hyprland.systemd.setPath.enable = true; services.hypridle.enable = true; - # services.xserver.windowManager.hypr.enable = true; programs.hyprlock.enable = true; programs.waybar.enable = true; environment.sessionVariables = { NIXOS_OZONE_WL = "1"; }; environment.systemPackages = with pkgs; [ - # common utilities - # mpv - # sound pavucontrol @@ -50,14 +46,13 @@ in nwg-bar # logout window hypridle # idle watch brightnessctl # brightness ctl - - # networking - networkmanagerapplet - + networkmanagerapplet # networking ]; + # system.userActivationScripts.hyprlandlocalConfig.text = '' if [[ ! -h "$HOME/.config/hypr" ]]; then ln -s "/home/${config.skyg.user.name}/nixos-setup/configs/hypr" "$HOME/.config/hypr"