From 7592ee3f2ff9e2aa2605f6d7565cb10e8c9d32f5 Mon Sep 17 00:00:00 2001 From: k Date: Sun, 22 Jun 2025 02:49:40 -0400 Subject: [PATCH 1/4] back to zsh --- hosts/home/home_common.nix | 48 +++++++++++++------------------------- 1 file changed, 16 insertions(+), 32 deletions(-) diff --git a/hosts/home/home_common.nix b/hosts/home/home_common.nix index 77f9f1e..e13b2e3 100644 --- a/hosts/home/home_common.nix +++ b/hosts/home/home_common.nix @@ -17,40 +17,24 @@ }; tmux.enable = true; starship.enable = true; - nushell = { + zsh = { enable = true; - shellAliases = { - cat = "bat"; - }; - extraConfig = '' - $env.config = { - show_banner: false, + autosuggestion.enable = true; + enableCompletion = true; + syntaxHighlighting.enable = true; + autocd = true; + plugins = [ + { + name = "zsh-nix-shell"; + file = "nix-shell.plugin.zsh"; + src = pkgs.fetchFromGitHub { + owner = "chisui"; + repo = "zsh-nix-shell"; + rev = "v0.8.0"; + sha256 = "1lzrn0n4fxfcgg65v0qhnj7wnybybqzs4adz7xsrkgmcsr0ii8b7"; + }; } - ''; + ]; }; - carapace = { - enable = true; - enableNushellIntegration = true; - }; - bat.enable = true; - # zsh = { - # enable = true; - # autosuggestion.enable = true; - # enableCompletion = true; - # syntaxHighlighting.enable = true; - # autocd = true; - # plugins = [ - # { - # name = "zsh-nix-shell"; - # file = "nix-shell.plugin.zsh"; - # src = pkgs.fetchFromGitHub { - # owner = "chisui"; - # repo = "zsh-nix-shell"; - # rev = "v0.8.0"; - # sha256 = "1lzrn0n4fxfcgg65v0qhnj7wnybybqzs4adz7xsrkgmcsr0ii8b7"; - # }; - # } - # ]; - # }; }; } From aa461a83448dc55f1d2b2fa63454c2663d39b0ae Mon Sep 17 00:00:00 2001 From: k Date: Sun, 22 Jun 2025 02:52:54 -0400 Subject: [PATCH 2/4] tile changes --- hosts/home/tile.nix | 2 +- hosts/home/waybar.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/home/tile.nix b/hosts/home/tile.nix index 6484488..e68e384 100644 --- a/hosts/home/tile.nix +++ b/hosts/home/tile.nix @@ -14,7 +14,7 @@ alacritty = {enable = true;}; wofi = {enable = true;}; zathura = {enable = true;}; - #mpv = {enable = true;}; + mpv = {enable = true;}; lf = {enable = true;}; }; home.packages = with pkgs; [ diff --git a/hosts/home/waybar.nix b/hosts/home/waybar.nix index 3a9daef..341d946 100644 --- a/hosts/home/waybar.nix +++ b/hosts/home/waybar.nix @@ -15,7 +15,7 @@ margin-right = 45; spacing = 15; - modules-left = ["sway/workspaces" "sway/mode"]; + modules-left = ["sway/workspaces" "sway/mode" "hyprland/window"]; modules-center = ["clock"]; modules-right = ["pulseaudio" "network" "battery"]; From a9beac4f611b786f907b4d0cad4efd4d848daccb Mon Sep 17 00:00:00 2001 From: k Date: Sun, 22 Jun 2025 02:57:43 -0400 Subject: [PATCH 3/4] switch to gnome --- hosts/laptop/configuration.nix | 28 ++++++++++++++++++++-------- hosts/laptop/home.nix | 2 +- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix index 89fa47c..0d67530 100644 --- a/hosts/laptop/configuration.nix +++ b/hosts/laptop/configuration.nix @@ -55,6 +55,10 @@ services = { hardware.bolt = {enable = false;}; + xserver = { + displayManager.gdm.enable = true; + desktopManager.gnome.enable = true; + }; pipewire = { enable = true; alsa.enable = true; @@ -165,20 +169,14 @@ programs = { zsh.enable = true; - regreet.enable = true; - hyprlock.enable = true; - hyprland = { - enable = true; - withUWSM = true; - }; }; users.users.k = { isNormalUser = true; description = "k"; extraGroups = ["networkmanager" "wheel" "cdrom" "libvirtd"]; - packages = with pkgs; [nushell]; - shell = pkgs.nushell; + packages = with pkgs; [zsh]; + shell = pkgs.zsh; }; home-manager = { @@ -190,6 +188,20 @@ sessionVariables = {MOZ_USE_XINPUT2 = "1";}; systemPackages = with pkgs; [ ]; + gnome.excludePackages = (with pkgs; [ + atomix # puzzle game + cheese # webcam tool + epiphany # web browser + geary # email reader + gedit # text editor + gnome-characters + gnome-music + gnome-photos + gnome-tour + hitori # sudoku game + iagno # go game + tali # poker game + ]); }; systemd.sleep.extraConfig = '' diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix index 2c946f3..9ae07d4 100644 --- a/hosts/laptop/home.nix +++ b/hosts/laptop/home.nix @@ -6,7 +6,7 @@ }: { imports = [ ../home/home_common.nix - ../home/hyprland.nix + ../home/gnome.nix ]; nixpkgs.config.allowUnfree = true; From fc3f54719229d4a1507748d55d0d87139e65b8b6 Mon Sep 17 00:00:00 2001 From: k Date: Sun, 22 Jun 2025 02:58:14 -0400 Subject: [PATCH 4/4] misc changes --- hosts/laptop/configuration.nix | 7 ++++--- hosts/laptop/home.nix | 9 ++++++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix index 0d67530..910ef78 100644 --- a/hosts/laptop/configuration.nix +++ b/hosts/laptop/configuration.nix @@ -27,8 +27,8 @@ gc.automatic = false; settings = { experimental-features = ["nix-command" "flakes"]; - #substituters = ["http://nix.dhilton.xyz/" "https://cache.nixos.org/"]; - #trusted-public-keys = ["nix.dhilton.xyz:MOW060dF1A0/UXmPZBue9KMxCO13PHYFwx1X9hcdYZ4="]; + substituters = ["http://nix.dhilton.xyz/" "https://cache.nixos.org/"]; + trusted-public-keys = ["nix.dhilton.xyz:MOW060dF1A0/UXmPZBue9KMxCO13PHYFwx1X9hcdYZ4="]; }; }; @@ -71,7 +71,7 @@ package = pkgs.ollama-intel; }; auto-cpufreq = { - enable = true; + enable = false; settings = { battery = { governor = "powersave"; @@ -187,6 +187,7 @@ environment = { sessionVariables = {MOZ_USE_XINPUT2 = "1";}; systemPackages = with pkgs; [ +config.boot.kernelPackages.perf ]; gnome.excludePackages = (with pkgs; [ atomix # puzzle game diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix index 9ae07d4..3c5a879 100644 --- a/hosts/laptop/home.nix +++ b/hosts/laptop/home.nix @@ -22,7 +22,6 @@ btop zip - emacs-gtk prismlauncher steam @@ -40,6 +39,14 @@ enableZshIntegration = true; nix-direnv.enable = true; }; + + emacs = { + enable = true; + package = pkgs.emacs-pgtk; + extraPackages = epkgs: [ + epkgs.vterm + ]; + }; }; services = {