From ba955e5fc1e71e68012b0e6fecae4544875d623a Mon Sep 17 00:00:00 2001 From: Jaci Anderson Date: Thu, 15 Feb 2024 11:42:42 -0700 Subject: [PATCH] revert flake update, breaks on jacis device --- flake.lock | 24 ++++++++++++------------ jaci/dotfiles/labwc/autostart | 2 +- jaci/modules/home-manager/home.nix | 1 + jaci/modules/labwc/labwc_conf.nix | 11 +++++++++++ jaci/nixos/hardware-configuration.nix | 5 ++++- 5 files changed, 29 insertions(+), 14 deletions(-) diff --git a/flake.lock b/flake.lock index 61d8fd8..196e8a7 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1706435589, - "narHash": "sha256-yhEYJxMv5BkfmUuNe4QELKo+V5eq1pwhtVs6kEziHfE=", + "lastModified": 1705269478, + "narHash": "sha256-j7Rp8Y3ckBHOlIzqe0g2+/BVce9SU/dVtn4Eb0rMuY4=", "owner": "nix-community", "repo": "home-manager", - "rev": "4d54c29bce71f8c261513e0662cc573d30f3e33e", + "rev": "846200eb574faa2af808ed02e653c2b8ed51fd71", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1706371002, - "narHash": "sha256-dwuorKimqSYgyu8Cw6ncKhyQjUDOyuXoxDTVmAXq88s=", + "lastModified": 1705133751, + "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c002c6aa977ad22c60398daaa9be52f2203d0006", + "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", "type": "github" }, "original": { @@ -38,11 +38,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1706373441, - "narHash": "sha256-S1hbgNbVYhuY2L05OANWqmRzj4cElcbLuIkXTb69xkk=", + "lastModified": 1705183652, + "narHash": "sha256-rnfkyUH0x72oHfiSDhuCHDHg3gFgF+lF8zkkg5Zihsw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "56911ef3403a9318b7621ce745f5452fb9ef6867", + "rev": "428544ae95eec077c7f823b422afae5f174dee4b", "type": "github" }, "original": { @@ -54,11 +54,11 @@ }, "nur": { "locked": { - "lastModified": 1706559951, - "narHash": "sha256-yfez9ZnYWsm3m3K8HvN3bGEdWe8aO0ni9r82bAq+q9k=", + "lastModified": 1705283909, + "narHash": "sha256-7F2KyTB4cApsHg7oltJ1r0QFWMjWTOaS9m2IbKFhj6Y=", "owner": "nix-community", "repo": "NUR", - "rev": "24478b9e556e4366ef0a2ff58590d8cf24c77267", + "rev": "375b9a949232cd1e31bd89d197a5605a17d2aeb3", "type": "github" }, "original": { diff --git a/jaci/dotfiles/labwc/autostart b/jaci/dotfiles/labwc/autostart index 10a349b..5843909 100644 --- a/jaci/dotfiles/labwc/autostart +++ b/jaci/dotfiles/labwc/autostart @@ -11,7 +11,7 @@ swww img ~/.config/labwc/backgrounds/cat1.jpg >/dev/null 2>&1 & # output HDMI-A-1 position 1366,0 # output eDP-1 position 0,0 # } -kanshi >/dev/null 2>&1 & +#kanshi >/dev/null 2>&1 & # Launch a panel such as yambar or waybar. waybar >/dev/null 2>&1 & diff --git a/jaci/modules/home-manager/home.nix b/jaci/modules/home-manager/home.nix index f8e350a..609f918 100644 --- a/jaci/modules/home-manager/home.nix +++ b/jaci/modules/home-manager/home.nix @@ -74,6 +74,7 @@ ripgrep tre-command gtop + htop # # Photo / Video diff --git a/jaci/modules/labwc/labwc_conf.nix b/jaci/modules/labwc/labwc_conf.nix index 8f8b007..de4624c 100644 --- a/jaci/modules/labwc/labwc_conf.nix +++ b/jaci/modules/labwc/labwc_conf.nix @@ -80,6 +80,7 @@ wl-clipboard waybar wdisplays + wlr-randr xdg-utils zsh ] @@ -128,6 +129,16 @@ pulse.enable = true; }; + services.greetd = { + enable = true; + settings = rec { + initial_session = { + command = "${pkgs.labwc}/bin/labwc"; + user = "jaci"; + }; + default_session = initial_session; + }; + }; ### ## Misc ### diff --git a/jaci/nixos/hardware-configuration.nix b/jaci/nixos/hardware-configuration.nix index df133f1..b1db1b2 100644 --- a/jaci/nixos/hardware-configuration.nix +++ b/jaci/nixos/hardware-configuration.nix @@ -12,7 +12,10 @@ boot.initrd.kernelModules = [ "amdgpu" ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; - + boot.kernelParams = [ + # Fix for The Finals + "clearcpuid=304" + ]; fileSystems."/" = { device = "/dev/disk/by-label/NIXROOT"; fsType = "ext4";