adding tuigreet, lots of small changes all over

This commit is contained in:
Matt Nish-Lapidus 2025-02-21 16:46:10 -05:00
parent 01f0129c2f
commit d9be121700
6 changed files with 78 additions and 9 deletions

View file

@ -115,6 +115,11 @@
defaultBranch = "main"; defaultBranch = "main";
}; };
}; };
aliases = {
co = "checkout";
cm = "commit -m";
aa = "add .";
};
}; };
}; };

View file

@ -63,6 +63,30 @@
# Select internationalisation properties. # Select internationalisation properties.
i18n.defaultLocale = "en_CA.UTF-8"; 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; [ environment.systemPackages = with pkgs; [
wget wget
libGL libGL
@ -91,6 +115,7 @@
samba samba
ddcutil ddcutil
ddcui ddcui
greetd.tuigreet
]; ];
# Bootloader. # Bootloader.
@ -274,11 +299,20 @@
services.xserver.enable = true; 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. # 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.desktopManager.gnome.enable = true;
services.xserver.deviceSection = ''Option "TearFree" "true"''; # For amdgpu. services.xserver.deviceSection = ''Option "TearFree" "true"''; # For amdgpu.
# services.xserver.enableTearFree = true;
services.gnome.gnome-keyring.enable = true; services.gnome.gnome-keyring.enable = true;
services.gnome.gnome-settings-daemon.enable = true; services.gnome.gnome-settings-daemon.enable = true;
@ -300,7 +334,7 @@
clean = { clean = {
enable = true; enable = true;
dates = "daily"; dates = "daily";
extraArgs = "--keep-since 4d --keep 3"; extraArgs = "--keep 4";
}; };
flake = "/home/emenel/source/nixos-config"; flake = "/home/emenel/source/nixos-config";
package = pkgs.nh; package = pkgs.nh;
@ -431,6 +465,7 @@
libuv.out libuv.out
libressl.out libressl.out
libudev-zero.out libudev-zero.out
mesa.out
]; ];
fonts = { fonts = {

View file

@ -207,9 +207,13 @@
exec = "/home/emene/.local/bin/mirror-laptop"; exec = "/home/emene/.local/bin/mirror-laptop";
categories = [ "System" ]; categories = [ "System" ];
}; };
btop = {
name = "btop++";
exec = "/home/emenel/.local/bin/wezapp btop";
categories = [ "System" ];
};
}; };
xdg.configFile."halloy/config.toml".source = xdg.configFile."halloy/config.toml".source = ../../homes/emenel/dotfiles/dot_config/halloy/config.toml;
../../homes/emenel/dotfiles/dot_config/halloy/config.toml;
} }

View file

@ -14,7 +14,7 @@ in {
{ command = ["clipse" "-listen"]; } { command = ["clipse" "-listen"]; }
{ command = [ "${nix-config.packages.x86_64-linux.filen-desktop}/bin/filen-desktop" ]; } { command = [ "${nix-config.packages.x86_64-linux.filen-desktop}/bin/filen-desktop" ]; }
# { command = ["waybar"]; } # { command = ["waybar"]; }
{ command = [ "systemctl" "--user" "restart" "xwayland-satellite.service" "shikane.service" ]; } { command = [ "systemctl" "--user" "restart" "xwayland-satellite.service" ]; }
]; ];
workspaces = { workspaces = {

View file

@ -27,13 +27,12 @@
tldr tldr
glow glow
delta delta
btop-rocm (btop-rocm.override { cudaSupport = true; })
gnupg gnupg
imagemagick imagemagick
gnutls gnutls
gettext gettext
gnumake gnumake
nix-index
nix-du nix-du
usbutils usbutils
pciutils pciutils
@ -126,6 +125,10 @@
]; ];
programs = { programs = {
nix-index = {
enable = true;
enableFishIntegration = true;
};
direnv = { direnv = {
enable = true; enable = true;
nix-direnv.enable = true; nix-direnv.enable = true;
@ -153,15 +156,18 @@
]; ];
}; };
zoxide = { zoxide = {
enableFishIntegration = true;
enable = true; enable = true;
}; };
starship = { starship = {
enableFishIntegration = true;
enable = true; enable = true;
}; };
ripgrep = { ripgrep = {
enable = true; enable = true;
}; };
thefuck = { thefuck = {
enableFishIntegration = true;
enable = true; enable = true;
}; };
wezterm = { wezterm = {
@ -206,6 +212,7 @@
eza = { eza = {
enable = true; enable = true;
git = true; git = true;
enableFishIntegration = true;
}; };
fd = { fd = {
enable = true; enable = true;
@ -217,7 +224,6 @@
broot = { broot = {
enable = true; enable = true;
}; };
htop.enable = true;
lazygit.enable = true; lazygit.enable = true;
jq.enable = true; jq.enable = true;
rbw = { rbw = {

View file

@ -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;
};
});
}