From 42d91889d17323776be84f5b3eea4220ede9297c Mon Sep 17 00:00:00 2001 From: Anthony Rodriguez Date: Sun, 13 Oct 2024 14:54:12 +0200 Subject: [PATCH] repo: update flake dependencies, disable epson, use tuigreet --- flake.lock | 66 ++++++++++++++++++------------------ home/programs/ags/types | 1 - hosts/default.nix | 4 +-- system/core/users.nix | 1 + system/hardware/printing.nix | 1 - system/services/greetd.nix | 21 ++++++++++++ system/services/regreet.nix | 50 --------------------------- 7 files changed, 57 insertions(+), 87 deletions(-) delete mode 120000 home/programs/ags/types create mode 100644 system/services/greetd.nix delete mode 100644 system/services/regreet.nix diff --git a/flake.lock b/flake.lock index 67c3f59..eff0f38 100644 --- a/flake.lock +++ b/flake.lock @@ -6,11 +6,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1727303518, - "narHash": "sha256-lO5JMynTxNZxg/+E4/Y9reeLGIz/M8cEue+Re4cP6qo=", + "lastModified": 1728326430, + "narHash": "sha256-tV1ABHuA1HItMdCTuNdA8fMB+qw7LpjvI945VwMSABI=", "owner": "Aylur", "repo": "ags", - "rev": "cd543afec4d9ed708990e5ba52184716809bf248", + "rev": "60180a184cfb32b61a1d871c058b31a3b9b0743d", "type": "github" }, "original": { @@ -226,11 +226,11 @@ ] }, "locked": { - "lastModified": 1728306985, - "narHash": "sha256-l/KpcWTv2SjxCnqFs5GYhvjeVYd40WQV4/F2+w9btd4=", + "lastModified": 1728791962, + "narHash": "sha256-nr5QiXwQcZmf6/auC1UpX8iAtINMtdi2mH+OkqJQVmU=", "owner": "nix-community", "repo": "home-manager", - "rev": "3ac39b2a8b7cbfc0f96628d8a84867c885bc988b", + "rev": "64c6325b28ebd708653dd41d88f306023f296184", "type": "github" }, "original": { @@ -330,11 +330,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1728280052, - "narHash": "sha256-8gy3keN+6vKnn5nFDXib00bXFBUW+Xf+x6TKbTDl/x0=", + "lastModified": 1728804056, + "narHash": "sha256-56PIycP8j95LmZzcOKgcoNm4e7yvnjFz7+b4dxIDGKE=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "037bd7f67212127eaa52fee8199f951d19b7954a", + "rev": "1a782646d0ae5563d333095dfa3eadd756331e32", "type": "github" }, "original": { @@ -363,11 +363,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1728277759, - "narHash": "sha256-pMUMUo4vMcdjU4d8wuEHI5i8fW8SzYptR3GZPeDru1c=", + "lastModified": 1728716283, + "narHash": "sha256-v6hhDJNLhdCiuFn6ic7D3lk/lk27+6OOzG213ikRu4w=", "owner": "YaLTeR", "repo": "niri", - "rev": "03c603918d817762ee95d21ea15a854adf47886e", + "rev": "33b39913c7121a6c7b112beb0e329c3e64e4f57a", "type": "github" }, "original": { @@ -378,11 +378,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1728269138, - "narHash": "sha256-oKxDImsOvgUZMY4NwXVyUc/c1HiU2qInX+b5BU0yXls=", + "lastModified": 1728729581, + "narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "ecfcd787f373f43307d764762e139a7cdeb9c22b", + "rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806", "type": "github" }, "original": { @@ -445,11 +445,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1728193676, - "narHash": "sha256-PbDWAIjKJdlVg+qQRhzdSor04bAPApDqIv2DofTyynk=", + "lastModified": 1728740863, + "narHash": "sha256-u+rxA79a0lyhG+u+oPBRtTDtzz8kvkc9a6SWSt9ekVc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ecbc1ca8ffd6aea8372ad16be9ebbb39889e55b6", + "rev": "a3f9ad65a0bf298ed5847629a57808b97e6e8077", "type": "github" }, "original": { @@ -477,11 +477,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1728018373, - "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", + "lastModified": 1728492678, + "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", + "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "type": "github" }, "original": { @@ -493,11 +493,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1728018373, - "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", + "lastModified": 1728492678, + "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", + "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "type": "github" }, "original": { @@ -684,11 +684,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1728256779, - "narHash": "sha256-XH+3ks0nLZgYA3TZW5ovItvtCe3z6mchGwEz9qt8zWY=", + "lastModified": 1728378979, + "narHash": "sha256-CW/5Cs9m8HupL+6iRMpdHE88OmK9MXH2h3BcXCQw440=", "owner": "notashelf", "repo": "nvf", - "rev": "e77632e4eb2044acc58398eb7f6a14b1b8a4b184", + "rev": "0947ab38c0bc79780eec599161306157b8de74a3", "type": "github" }, "original": { @@ -707,11 +707,11 @@ ] }, "locked": { - "lastModified": 1727917089, - "narHash": "sha256-XWNBGf8Z03sqA5/m99X6XTFbHGNuVx1gMaMQJbdDIrY=", + "lastModified": 1728750492, + "narHash": "sha256-9IHlIsH4gLqQjS2lFbEnsl/ItdqzBBLWLsyXS0k0jf8=", "owner": "nix-community", "repo": "plasma-manager", - "rev": "bc14b17bff1557de8f103172508f896a87bb9cdb", + "rev": "c6d4b6f3e0138c08f37d66fcfbcbe37dab08f108", "type": "github" }, "original": { @@ -2544,11 +2544,11 @@ }, "locked": { "dir": "nix", - "lastModified": 1727585736, - "narHash": "sha256-vEkcyKdFpfWbrtZlB5DCjNCmI2GudIJuHstWo3F9gL8=", + "lastModified": 1728322634, + "narHash": "sha256-cUnwLCSc59Sx3E+meVlVUMfyROr0aToWPID7UA6PZvg=", "owner": "wez", "repo": "wezterm", - "rev": "a2f2c07a29f5c98f6736cde0c86b24887f9fd48a", + "rev": "ed430415ee69279ea692358525196ad7d4c965b8", "type": "github" }, "original": { diff --git a/home/programs/ags/types b/home/programs/ags/types deleted file mode 120000 index bef2e43..0000000 --- a/home/programs/ags/types +++ /dev/null @@ -1 +0,0 @@ -/home/nezia/.local/share/com.github.Aylur.ags/types \ No newline at end of file diff --git a/hosts/default.nix b/hosts/default.nix index 2c49150..b5c4aed 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -19,7 +19,7 @@ ++ [ ./vamos - "${mod}/services/regreet.nix" + "${mod}/services/greetd.nix" "${mod}/programs/niri" "${mod}/services/gnome.nix" @@ -54,7 +54,7 @@ ++ [ ./solaire - "${mod}/services/regreet.nix" + "${mod}/services/greetd.nix" "${mod}/programs/niri" "${mod}/services/gnome.nix" diff --git a/system/core/users.nix b/system/core/users.nix index 7da1ca7..815b366 100644 --- a/system/core/users.nix +++ b/system/core/users.nix @@ -4,6 +4,7 @@ description = "Anthony Rodriguez"; extraGroups = [ "networkmanager" + "audio" "video" "wheel" ]; diff --git a/system/hardware/printing.nix b/system/hardware/printing.nix index 3fd0010..09c1f43 100644 --- a/system/hardware/printing.nix +++ b/system/hardware/printing.nix @@ -23,7 +23,6 @@ hardware.sane.extraBackends = [ pkgs.sane-airscan # generic pkgs.hplip # HP - pkgs.epkowa # Epson pkgs.utsushi # other printers ]; } diff --git a/system/services/greetd.nix b/system/services/greetd.nix new file mode 100644 index 0000000..9268650 --- /dev/null +++ b/system/services/greetd.nix @@ -0,0 +1,21 @@ +{ + lib, + pkgs, + config, + ... +}: { + services.greetd = { + enable = true; + settings = rec { + initial_session = { + command = "${lib.getExe pkgs.greetd.tuigreet} \ + --time \ + --asterisks \ + --user-menu \ + --cmd ${lib.getExe config.programs.niri.package} --session"; + user = "greeter"; + }; + default_session = initial_session; + }; + }; +} diff --git a/system/services/regreet.nix b/system/services/regreet.nix deleted file mode 100644 index fb310e4..0000000 --- a/system/services/regreet.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ - inputs, - lib, - pkgs, - config, - ... -}: let - inherit (lib) mkDefault mkForce; -in { - environment.systemPackages = [ - config.style.gtk.theme.package - config.style.gtk.iconTheme.package - config.style.cursorTheme.package - ]; - - programs.regreet = { - enable = true; - package = pkgs.greetd.regreet; - settings = { - background = { - path = mkDefault config.style.wallpaper; - fit = "Cover"; - }; - GTK = let - isDark = inputs.basix.schemeData.base16.${config.style.scheme}.variant == "dark"; - in { - application_prefer_dark_theme = isDark; - cursor_theme_name = mkForce config.style.cursorTheme.name; - icon_theme_name = mkForce config.style.gtk.iconTheme.name; - theme_name = mkForce config.style.gtk.theme.name; - font_name = mkForce "Inter 18"; - }; - }; - }; - - services.greetd = { - enable = true; - settings = rec { - default_session = { - command = "${lib.getExe pkgs.cage} -s -d -m last -- ${lib.getExe config.programs.regreet.package}"; - user = "greeter"; - }; - initial_session = default_session; - }; - }; - security.pam.services.greetd = { - enableGnomeKeyring = true; - fprintAuth = false; - }; -}