From 837445c7cc9d29cb00efe9120855c0f10c7d02b2 Mon Sep 17 00:00:00 2001 From: Ranomier <> Date: Tue, 10 Dec 2024 23:33:17 +0100 Subject: [PATCH] 278 current 2024-12-10 23:33:12 24.11.20241205.4dc2fc4 6.12.1 * --- flake.lock | 24 ++++++++++++------------ modules/networking.nix | 5 +---- modules/sec_auth/login-manager.nix | 14 ++++++++------ modules/software/android.nix | 2 +- modules/software/virt.nix | 5 +---- modules/wm_and_de/components/rofi.nix | 5 ++--- modules/wm_and_de/hyprland.nix | 6 +++--- 7 files changed, 28 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index cd0aea8..a95c495 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1733050161, - "narHash": "sha256-lYnT+EYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20=", + "lastModified": 1733572789, + "narHash": "sha256-zjO6m5BqxXIyjrnUziAzk4+T4VleqjstNudSqWcpsHI=", "owner": "nix-community", "repo": "home-manager", - "rev": "62d536255879be574ebfe9b87c4ac194febf47c5", + "rev": "c7ffc9727d115e433fd884a62dc164b587ff651d", "type": "github" }, "original": { @@ -38,11 +38,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1733217105, - "narHash": "sha256-fc6jTzIwCIVWTX50FtW6AZpuukuQWSEbPiyg6ZRGWFY=", + "lastModified": 1733481457, + "narHash": "sha256-IS3bxa4N1VMSh3/P6vhEAHQZecQ3oAlKCDvzCQSO5Is=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "cceee0a31d2f01bcc98b2fbd591327c06a4ea4f9", + "rev": "e563803af3526852b6b1d77107a81908c66a9fcf", "type": "github" }, "original": { @@ -54,11 +54,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1733261153, - "narHash": "sha256-eq51hyiaIwtWo19fPEeE0Zr2s83DYMKJoukNLgGGpek=", + "lastModified": 1733412085, + "narHash": "sha256-FillH0qdWDt/nlO6ED7h4cmN+G9uXwGjwmCnHs0QVYM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b681065d0919f7eb5309a93cea2cfa84dec9aa88", + "rev": "4dc2fc4e62dbf62b84132fe526356fbac7b03541", "type": "github" }, "original": { @@ -70,11 +70,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1733212471, - "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", + "lastModified": 1733581040, + "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", + "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01", "type": "github" }, "original": { diff --git a/modules/networking.nix b/modules/networking.nix index e503ffe..30e1846 100644 --- a/modules/networking.nix +++ b/modules/networking.nix @@ -1,7 +1,4 @@ -{ - pkgs, - ... -}: { +{pkgs, ...}: { # Configure network proxy if necessary # networking.proxy.default = "http://user:password@proxy:port/"; # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; diff --git a/modules/sec_auth/login-manager.nix b/modules/sec_auth/login-manager.nix index 7c6801a..73c7dcf 100644 --- a/modules/sec_auth/login-manager.nix +++ b/modules/sec_auth/login-manager.nix @@ -7,12 +7,14 @@ settings = { default_session = { command = '' ${pkgs.greetd.tuigreet}/bin/tuigreet \ - --time \ - --time-format '%Y-%m-%dT%H:%M:%S %A' \ - --remember \ - --user-menu \ - --theme 'border=lightgreen;text=lightgreen;prompt=lightgreen;time=lightgreen;action=lightgreen;button=lightgreen;input=lightgreen' \ - --cmd Hyprland''; + --time \ + --time-format '%Y-%m-%dT%H:%M:%S %A' \ + --remember \ + --user-menu \ + --user-menu-min-uid 1000 \ + --user-menu-max-uid 2000 \ + --theme 'border=lightgreen;text=lightgreen;prompt=lightgreen;time=lightgreen;action=lightgreen;button=lightgreen;input=lightgreen' \ + --cmd Hyprland''; # removed elements from theme: container user = "greeter"; }; diff --git a/modules/software/android.nix b/modules/software/android.nix index b69455e..766f4f4 100644 --- a/modules/software/android.nix +++ b/modules/software/android.nix @@ -1,4 +1,4 @@ -{ ... }: { +{...}: { # for running android apps # also starts the systemd service waydroid-container virtualisation.waydroid.enable = true; diff --git a/modules/software/virt.nix b/modules/software/virt.nix index 945cb6f..29a6c8e 100644 --- a/modules/software/virt.nix +++ b/modules/software/virt.nix @@ -1,7 +1,4 @@ -{ - pkgs, - ... -}: { +{pkgs, ...}: { # for running android apps virtualisation.waydroid.enable = true; # also starts the systemd service waydroid-container diff --git a/modules/wm_and_de/components/rofi.nix b/modules/wm_and_de/components/rofi.nix index 74c398f..f7843aa 100644 --- a/modules/wm_and_de/components/rofi.nix +++ b/modules/wm_and_de/components/rofi.nix @@ -1,5 +1,4 @@ -{ pkgs, ... }: -{ +{pkgs, ...}: { environment.systemPackages = with pkgs; [ rofi-wayland ]; @@ -120,7 +119,7 @@ padding: 10px; background-color: @bg-col-light; text-color: @grey; - vertical-align: 0.5; + vertical-align: 0.5; horizontal-align: 0.5; } diff --git a/modules/wm_and_de/hyprland.nix b/modules/wm_and_de/hyprland.nix index 3bbaac6..9eb04e7 100644 --- a/modules/wm_and_de/hyprland.nix +++ b/modules/wm_and_de/hyprland.nix @@ -1,7 +1,7 @@ {pkgs, ...}: { - import = [ - ./components/rofi.nix - ]; + #imports = [ + # ./components/rofi.nix + #]; # Enable the X11 windowing system. # You can disable this if you're only using the Wayland session. services.xserver.enable = false;