From 700906bb8f238a094b7897f71cbe0f12472eb3eb Mon Sep 17 00:00:00 2001 From: kiana-S Date: Sun, 12 May 2024 19:04:06 -0400 Subject: [PATCH] Update dependencies --- config/config.nix | 9 +-------- config/login.nix | 8 ++------ flake.lock | 18 +++++++++--------- home-manager/shell/default.nix | 7 ++----- home-manager/wayland/hyprland.nix | 4 +--- home-manager/wayland/wltools.nix | 1 - 6 files changed, 15 insertions(+), 32 deletions(-) diff --git a/config/config.nix b/config/config.nix index b2f0592..b38a28a 100644 --- a/config/config.nix +++ b/config/config.nix @@ -104,17 +104,10 @@ in services.openssh.enable = true; - programs.gnupg.package = pkgs.gnupg.overrideAttrs (orig: { - version = "2.4.0"; - src = pkgs.fetchurl { - url = "mirror://gnupg/gnupg/gnupg-2.4.0.tar.bz2"; - hash = "sha256-HXkVjdAdmSQx3S4/rLif2slxJ/iXhOosthDGAPsMFIM="; - }; - }); programs.gnupg.agent = { enable = true; enableSSHSupport = true; - pinentryFlavor = "gnome3"; + pinentryPackage = pkgs.pinentry-gnome3; }; # This value determines the NixOS release from which the default diff --git a/config/login.nix b/config/login.nix index 7be8421..940a59b 100644 --- a/config/login.nix +++ b/config/login.nix @@ -19,14 +19,10 @@ lib.mkIf (config.platform != "mobile") qtgraphicaleffects ]; - services.xserver = { - enable = true; - - displayManager.defaultSession = "hyprland"; - displayManager.sddm = { + services.displayManager.defaultSession = "hyprland"; + services.displayManager.sddm = { enable = true; wayland.enable = true; theme = "tokyo-night-sddm"; - }; }; }) diff --git a/flake.lock b/flake.lock index c784034..d78e9b3 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1705446327, - "narHash": "sha256-n7FCuAR2BI1SvLjF6eFc8VE6WLZCMlbToyfqU2ihbkU=", + "lastModified": 1715380449, + "narHash": "sha256-716+f9Rj3wjSyD1xitCv2FcYbgPz1WIVDj+ZBclH99Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "16cefa78cc801911ebd4ff1faddc6280ab3c9228", + "rev": "d7682620185f213df384c363288093b486b2883f", "type": "github" }, "original": { @@ -39,11 +39,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1705312285, - "narHash": "sha256-rd+dY+v61Y8w3u9bukO/hB55Xl4wXv4/yC8rCGVnK5U=", + "lastModified": 1715148395, + "narHash": "sha256-lRxjTxY3103LGMjWdVqntKZHhlmMX12QUjeFrQMmGaE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "bee2202bec57e521e3bd8acd526884b9767d7fa0", + "rev": "a4e2b7909fc1bdf30c30ef21d388fde0b5cdde4a", "type": "github" }, "original": { @@ -54,11 +54,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1705316053, - "narHash": "sha256-J2Ey5mPFT8gdfL2XC0JTZvKaBw/b2pnyudEXFvl+dQM=", + "lastModified": 1715266358, + "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c3e128f3c0ecc1fb04aef9f72b3dcc2f6cecf370", + "rev": "f1010e0469db743d14519a1efd37e23f8513d714", "type": "github" }, "original": { diff --git a/home-manager/shell/default.nix b/home-manager/shell/default.nix index 482d161..3bb6ea0 100644 --- a/home-manager/shell/default.nix +++ b/home-manager/shell/default.nix @@ -14,12 +14,9 @@ # Eza - ls replacement - programs.eza = { - enable = true; - enableAliases = true; - }; + programs.eza.enable = true; programs.fish.shellAliases = { - l = "ls -al"; + l = "ls -la"; }; # rlwrap config diff --git a/home-manager/wayland/hyprland.nix b/home-manager/wayland/hyprland.nix index 76433a8..5aaaaa5 100644 --- a/home-manager/wayland/hyprland.nix +++ b/home-manager/wayland/hyprland.nix @@ -1,6 +1,5 @@ { config, pkgs, lib, ... }: let - inherit (config) platform; scripts = ./scripts; modifier = "SUPER"; terminal = "alacritty"; @@ -12,7 +11,6 @@ in { wayland.windowManager.hyprland = { enable = true; - enableNvidiaPatches = platform == "desktop"; systemd.enable = true; xwayland.enable = true; @@ -24,7 +22,7 @@ in { "$menu" = "rofi -show drun"; exec-once = [ - "background=${../../assets/background.png} platform=${platform} ${scripts}/autostart" + "background=${../../assets/background.png} platform=${config.platform} ${scripts}/autostart" ]; general = { diff --git a/home-manager/wayland/wltools.nix b/home-manager/wayland/wltools.nix index 83dae62..eae3c08 100644 --- a/home-manager/wayland/wltools.nix +++ b/home-manager/wayland/wltools.nix @@ -60,7 +60,6 @@ # EWW programs.eww.enable = true; - programs.eww.package = pkgs.eww-wayland; programs.eww.configDir = ./eww; # Mako