diff --git a/flake.nix b/flake.nix index 27c2b76..c2755c3 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,13 @@ description = "A Special Snowflake :3"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; + + nixpkgs = { + url = "github:numtide/nixpkgs-unfree"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; + }; + nixos-hardware.url = "github:nixos/nixos-hardware"; home-manager = { diff --git a/home-modules/picom.nix b/home-modules/picom.nix index c5cf866..d3fedf4 100644 --- a/home-modules/picom.nix +++ b/home-modules/picom.nix @@ -2,7 +2,7 @@ services.picom = { enable = true; package = pkgs.picom-next; - backend = "xrender"; + backend = "glx"; vSync = true; fade = true; fadeDelta = 5; @@ -17,5 +17,8 @@ "window_type *= 'normal' && ! name ~= ''" "class_g = 'Peek'" ]; + fadeExclude = [ + "class_g = 'xsecurelock'" + ]; }; } diff --git a/hosts/x1/configuration.nix b/hosts/x1/configuration.nix index 9961f40..22cec67 100644 --- a/hosts/x1/configuration.nix +++ b/hosts/x1/configuration.nix @@ -59,7 +59,7 @@ in { tailscale.enable = true; # fingerprint scanner daemon - # to enrolla finger, use sudo fprintd-enroll $USER + # to enroll a finger, use sudo fprintd-enroll $USER fprintd.enable = true; }; diff --git a/modules/common.nix b/modules/common.nix index ff853a7..6d0ea03 100644 --- a/modules/common.nix +++ b/modules/common.nix @@ -26,9 +26,11 @@ settings = { substituters = [ "https://cache.vedenemo.dev" + "https://numtide.cachix.org" ]; trusted-public-keys = [ "cache.vedenemo.dev:8NhplARANhClUSWJyLVk4WMyy1Wb4rhmWW2u8AejH9E=" + "numtide.cachix.org-1:2ps1kLBUWjxIneOy1Ik6cQjb41X0iXVXeHigGmycPPE=" ]; trusted-users = [user]; experimental-features = ["nix-command" "flakes"]; diff --git a/modules/laptop.nix b/modules/laptop.nix index 9f09f3e..e37d2dc 100644 --- a/modules/laptop.nix +++ b/modules/laptop.nix @@ -49,7 +49,6 @@ Environment = [ "XSECURELOCK_COMPOSITE_OBSCURER=0" "XSECURELOCK_PASSWORD_PROMPT=asterisks" - "XSECURELOCK_SHOW_HOSTNAME=0" "XSECURELOCK_SHOW_KEYBOARD_LAYOUT=0" ]; ExecStart = "${pkgs.xss-lock}/bin/xss-lock --session \${XDG_SESSION_ID} -- ${pkgs.xsecurelock}/bin/xsecurelock"; diff --git a/overlays/dwm.nix b/overlays/dwm.nix index 6214aea..47097d3 100644 --- a/overlays/dwm.nix +++ b/overlays/dwm.nix @@ -3,8 +3,8 @@ src = pkgs.fetchFromGitHub { owner = "joinemm"; repo = "dwm"; - rev = "357fded817f8d734f4ddcc47463532c7256e5371"; - sha256 = "sha256-fHmp0YMA1SUqVlyajZKVFuz38Sz6iwsXp2oehnaGbBo="; + rev = "c0b431747eb4afa4f31b1dce79ff53253f2c4b63"; + sha256 = "sha256-YfMJVKMdNR9NiR3OK7CrHdrC3k9NLZ1UTI24KTa0Wt4="; }; nativeBuildInputs = with pkgs; [ xorg.libX11