From f1910ca9147b80b0b5d19ea8bbbb814dfe8cb80f Mon Sep 17 00:00:00 2001 From: joy Date: Tue, 23 Jul 2024 19:40:00 +0200 Subject: [PATCH] mhm --- flake.lock | 24 ++++++++++++------------ home/gtk/default.nix | 3 --- home/hyprland/default.nix | 2 +- home/misc/default.nix | 9 +++++---- home/zsh/default.nix | 3 +-- hosts/desktop/default.nix | 3 +-- modules/packages/default.nix | 3 ++- 7 files changed, 22 insertions(+), 25 deletions(-) diff --git a/flake.lock b/flake.lock index 70efb47..2a1e7b7 100644 --- a/flake.lock +++ b/flake.lock @@ -142,11 +142,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1721463311, - "narHash": "sha256-zmvqafJogm5DJ8+2v/kE9Oj8AGzK7IBOdMSIPZyKuNk=", + "lastModified": 1721707400, + "narHash": "sha256-09jb7g2M7wC7RyVih98lIer+wylgcWabCxCgILepGAw=", "owner": "rycee", "repo": "nur-expressions", - "rev": "863eb5594f8c375d1ddaa2cea84a819c5197dd76", + "rev": "67153a545bb69b86b8b4c80ac7fbf8eca644462e", "type": "gitlab" }, "original": { @@ -227,11 +227,11 @@ ] }, "locked": { - "lastModified": 1721135958, - "narHash": "sha256-H548rpPMsn25LDKn1PCFmPxmWlClJJGnvdzImHkqjuY=", + "lastModified": 1721714663, + "narHash": "sha256-ZDW5+rlROxaOuoEfIQM7Gqhoa+WALEYdYIiZhyJjAu0=", "owner": "nix-community", "repo": "home-manager", - "rev": "afd2021bedff2de92dfce0e257a3d03ae65c603d", + "rev": "7560dc942a6fbd37ebd1310b3dbda513de2d4b82", "type": "github" }, "original": { @@ -279,11 +279,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1721379653, - "narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=", + "lastModified": 1721562059, + "narHash": "sha256-Tybxt65eyOARf285hMHIJ2uul8SULjFZbT9ZaEeUnP8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1d9c2c9b3e71b9ee663d11c5d298727dace8d374", + "rev": "68c9ed8bbed9dfce253cc91560bf9043297ef2fe", "type": "github" }, "original": { @@ -333,11 +333,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1721478802, - "narHash": "sha256-+WMQs0fMAmpWPsKNgIFQoKLtvS4qtTj+mC++cD1May4=", + "lastModified": 1721573849, + "narHash": "sha256-pHfzFzjADtCqMswGwrfC5klBWJZ6h94bxVrVObJLrEM=", "owner": "danth", "repo": "stylix", - "rev": "6f36b27afd7b7ac8664bb62b7b27728540972c82", + "rev": "0ef70039a6435446472182c8f8106947abfc523d", "type": "github" }, "original": { diff --git a/home/gtk/default.nix b/home/gtk/default.nix index 7703a18..ef89184 100644 --- a/home/gtk/default.nix +++ b/home/gtk/default.nix @@ -8,9 +8,6 @@ in ".local/share/icons/GruvboxPlus".source = "${gruvboxPlus}"; }; -# qt.enable = true; -# qt.style.name = "adwaita-dark"; - gtk.enable = true; gtk.iconTheme.package = gruvboxPlus; gtk.iconTheme.name = "GruvboxPlus"; diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix index df77169..918375c 100644 --- a/home/hyprland/default.nix +++ b/home/hyprland/default.nix @@ -48,7 +48,7 @@ "$mod,TAB, exec, alacritty" "$mod, E, exec, nemo" "$mod, S, exec, firefox" - "$mod, X, exec, secrets" + "$mod, X, exec, keepassxc" "$mod, M, exec, mbsync -a && alacritty -e neomutt" "$mod, A, exec, rofi -show drun" "$mod, F, exec, freetube" diff --git a/home/misc/default.nix b/home/misc/default.nix index 9413ac9..216c71f 100644 --- a/home/misc/default.nix +++ b/home/misc/default.nix @@ -11,11 +11,12 @@ }; programs.home-manager.enable = true; - - qt.enable = true; - + + qt.enable = true; + qt.style.name = "adwaita-dark"; + xdg.mimeApps.defaultApplications = { - "text/plain" = ["neovide.desktop"]; + "text/plain" = ["helix.desktop"]; "image/*" = ["imv.desktop"]; "video/png" = ["mpv.desktop"]; "video/jpg" = ["mpv.desktop"]; diff --git a/home/zsh/default.nix b/home/zsh/default.nix index 920292b..d54a61d 100644 --- a/home/zsh/default.nix +++ b/home/zsh/default.nix @@ -11,7 +11,7 @@ initExtra = "PROMPT='%F{green}%~%f '"; shellAliases = { - v = "vim"; + v = "hx"; cat = "bat"; ls = "${pkgs.eza}/bin/eza --icons -a --group-directories-first"; pu = "bash ~/nix/home/zsh/push.sh"; @@ -40,7 +40,6 @@ enable = true; plugins = [ "history-substring-search" - "git" ]; }; diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix index a7e3ba2..25f3e2d 100644 --- a/hosts/desktop/default.nix +++ b/hosts/desktop/default.nix @@ -4,6 +4,7 @@ networking.networkmanager.enable = true; boot.loader = { + timeout = 0; efi = { canTouchEfiVariables = false; }; @@ -14,8 +15,6 @@ }; }; - boot.loader.timeout = 5; - imports = [ ../../modules ./hardware.nix diff --git a/modules/packages/default.nix b/modules/packages/default.nix index 6a108dc..06a3e92 100644 --- a/modules/packages/default.nix +++ b/modules/packages/default.nix @@ -35,6 +35,7 @@ cmus obs-studio #gui stuff + keepassxc vesktop signal-desktop upscayl @@ -60,7 +61,7 @@ appimage-run yt-dlp distrobox - vim + #vim font-awesome #laptop brightnessctl