From d9be12170018db9cdf6263314c518ef6604a5f71 Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Fri, 21 Feb 2025 16:46:10 -0500 Subject: [PATCH] adding tuigreet, lots of small changes all over --- homes/emenel/default.nix | 5 +++++ hosts/eddie/configuration.nix | 41 +++++++++++++++++++++++++++++++--- modules/home/desktop.nix | 8 +++++-- modules/home/niri.nix | 2 +- modules/home/shell-conf.nix | 12 +++++++--- overlays-disabled/tuigreet.nix | 19 ++++++++++++++++ 6 files changed, 78 insertions(+), 9 deletions(-) create mode 100644 overlays-disabled/tuigreet.nix diff --git a/homes/emenel/default.nix b/homes/emenel/default.nix index 7b78e4c..160bbfe 100644 --- a/homes/emenel/default.nix +++ b/homes/emenel/default.nix @@ -115,6 +115,11 @@ defaultBranch = "main"; }; }; + aliases = { + co = "checkout"; + cm = "commit -m"; + aa = "add ."; + }; }; }; diff --git a/hosts/eddie/configuration.nix b/hosts/eddie/configuration.nix index e9dcaf7..109f099 100644 --- a/hosts/eddie/configuration.nix +++ b/hosts/eddie/configuration.nix @@ -63,6 +63,30 @@ # Select internationalisation properties. i18n.defaultLocale = "en_CA.UTF-8"; + console = { + colors = with pkgs.lib.nix-rice; + let theme = palette.toRgbShortHex pkgs.rice.colorPalette; + in + with theme; [ + normal.black + normal.red + normal.green + normal.yellow + normal.blue + normal.magenta + normal.cyan + normal.white + bright.black + bright.red + bright.green + bright.yellow + bright.blue + bright.magenta + bright.cyan + bright.white + ]; + }; + environment.systemPackages = with pkgs; [ wget libGL @@ -91,6 +115,7 @@ samba ddcutil ddcui + greetd.tuigreet ]; # Bootloader. @@ -274,11 +299,20 @@ services.xserver.enable = true; + services.greetd = { + enable = true; + settings = { + default_session = { + command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --sessions ${config.services.displayManager.sessionData.desktops}/share/xsessions:${config.services.displayManager.sessionData.desktops}/share/wayland-sessions --remember --remember-user-session --user-menu --window-padding 5 --asterisks --asterisks-char ^ --theme 'border=magenta;text=cyan;prompt=green;time=red;action=blue;button=yellow;container=silver;input=red'"; + user = "greeter"; + }; + }; + }; + # Enable the GNOME Desktop Environment. - services.xserver.displayManager.gdm.enable = true; + # services.xserver.displayManager.gdm.enable = true; services.xserver.desktopManager.gnome.enable = true; services.xserver.deviceSection = ''Option "TearFree" "true"''; # For amdgpu. - # services.xserver.enableTearFree = true; services.gnome.gnome-keyring.enable = true; services.gnome.gnome-settings-daemon.enable = true; @@ -300,7 +334,7 @@ clean = { enable = true; dates = "daily"; - extraArgs = "--keep-since 4d --keep 3"; + extraArgs = "--keep 4"; }; flake = "/home/emenel/source/nixos-config"; package = pkgs.nh; @@ -431,6 +465,7 @@ libuv.out libressl.out libudev-zero.out + mesa.out ]; fonts = { diff --git a/modules/home/desktop.nix b/modules/home/desktop.nix index f82b0fc..bd6479d 100644 --- a/modules/home/desktop.nix +++ b/modules/home/desktop.nix @@ -207,9 +207,13 @@ exec = "/home/emene/.local/bin/mirror-laptop"; categories = [ "System" ]; }; + btop = { + name = "btop++"; + exec = "/home/emenel/.local/bin/wezapp btop"; + categories = [ "System" ]; + }; }; - xdg.configFile."halloy/config.toml".source = - ../../homes/emenel/dotfiles/dot_config/halloy/config.toml; + xdg.configFile."halloy/config.toml".source = ../../homes/emenel/dotfiles/dot_config/halloy/config.toml; } diff --git a/modules/home/niri.nix b/modules/home/niri.nix index 37b7a19..f21e5df 100644 --- a/modules/home/niri.nix +++ b/modules/home/niri.nix @@ -14,7 +14,7 @@ in { { command = ["clipse" "-listen"]; } { command = [ "${nix-config.packages.x86_64-linux.filen-desktop}/bin/filen-desktop" ]; } # { command = ["waybar"]; } - { command = [ "systemctl" "--user" "restart" "xwayland-satellite.service" "shikane.service" ]; } + { command = [ "systemctl" "--user" "restart" "xwayland-satellite.service" ]; } ]; workspaces = { diff --git a/modules/home/shell-conf.nix b/modules/home/shell-conf.nix index b33fee7..5868d3a 100644 --- a/modules/home/shell-conf.nix +++ b/modules/home/shell-conf.nix @@ -27,13 +27,12 @@ tldr glow delta - btop-rocm + (btop-rocm.override { cudaSupport = true; }) gnupg imagemagick gnutls gettext gnumake - nix-index nix-du usbutils pciutils @@ -126,6 +125,10 @@ ]; programs = { + nix-index = { + enable = true; + enableFishIntegration = true; + }; direnv = { enable = true; nix-direnv.enable = true; @@ -153,15 +156,18 @@ ]; }; zoxide = { + enableFishIntegration = true; enable = true; }; starship = { + enableFishIntegration = true; enable = true; }; ripgrep = { enable = true; }; thefuck = { + enableFishIntegration = true; enable = true; }; wezterm = { @@ -206,6 +212,7 @@ eza = { enable = true; git = true; + enableFishIntegration = true; }; fd = { enable = true; @@ -217,7 +224,6 @@ broot = { enable = true; }; - htop.enable = true; lazygit.enable = true; jq.enable = true; rbw = { diff --git a/overlays-disabled/tuigreet.nix b/overlays-disabled/tuigreet.nix new file mode 100644 index 0000000..811b452 --- /dev/null +++ b/overlays-disabled/tuigreet.nix @@ -0,0 +1,19 @@ +self: super: { + tuigreet = super.greetd.tuigreet.overrideAttrs (final: old: { + version = "master"; + + src = self.fetchFromGitHub { + owner = "apognu"; + repo = "tuigreet"; + rev = "master"; + hash = "sha256-6hVTU575tP+bPAUZlGhDwvBTVISyORC0wqljC7guZdA="; + }; + + cargoHash = "sha256-FrWDRsYhfq46wBm7F0Tifiw5oGXzSgwZC05ndNXcg8k="; + + cargoDeps = super.pkgs.rustPlatform.fetchCargoVendor { + inherit (final) pname src version; + hash = final.cargoHash; + }; + }); +}