diff --git a/dot_config/flake/flake.nix b/dot_config/flake/flake.nix index 56041d8..d39b8ff 100644 --- a/dot_config/flake/flake.nix +++ b/dot_config/flake/flake.nix @@ -98,7 +98,7 @@ home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; - # home-manager.backupFileExtension = "bak"; + home-manager.backupFileExtension = "bak"; home-manager.extraSpecialArgs = {inherit inputs outputs nixosModules homeModules darwinModules;}; home-manager.users.tyler = import ./machines/wash/home.nix; } diff --git a/dot_config/flake/home/common.nix b/dot_config/flake/home/common.nix index 5fdb701..2b3625f 100644 --- a/dot_config/flake/home/common.nix +++ b/dot_config/flake/home/common.nix @@ -13,7 +13,6 @@ # dotfiles age unstable.chezmoi - nh # backup restic @@ -40,6 +39,11 @@ yaml-language-server ]; + programs.nh = { + enable = true; + package = pkgs.unstable.nh; + }; + programs.bat = { enable = true; }; diff --git a/dot_config/flake/home/niri.nix b/dot_config/flake/home/niri.nix index ae0264b..2138ab7 100644 --- a/dot_config/flake/home/niri.nix +++ b/dot_config/flake/home/niri.nix @@ -19,6 +19,8 @@ in { xdg-desktop-portal-gtk gnome-keyring + upower + mods.xwayland-satellite wlsunset ]; @@ -373,8 +375,8 @@ in { # // block-out-from "screencast" # } - # // Example: enable rounded corners for all windows. - # // (This example rule is commented out with a "/-" in front.) + # Example: enable rounded corners for all windows. + # (This example rule is commented out with a "/-" in front.) # /-window-rule { # geometry-corner-radius 12 # clip-to-geometry true @@ -393,8 +395,8 @@ in { # Most actions that you can bind here can also be invoked programmatically with # `niri msg action do-something`. - # // Mod-Shift-/, which is usually the same as Mod-?, - # // shows a list of important hotkeys. + # Mod-Shift-/, which is usually the same as Mod-?, + # shows a list of important hotkeys. "Mod+Shift+Slash".action = show-hotkey-overlay; # Suggested binds for running programs: terminal, app launcher, screen locker. @@ -408,20 +410,20 @@ in { }; # Super+Alt+L hotkey-overlay-title="Lock the Screen: swaylock" { spawn "swaylock"; } - # // You can also use a shell. Do this if you need pipes, multiple commands, etc. - # // Note: the entire command goes as a single argument in the end. - # // Mod+T { spawn "bash" "-c" "notify-send hello && exec alacritty"; } + # You can also use a shell. Do this if you need pipes, multiple commands, etc. + # Note: the entire command goes as a single argument in the end. + # Mod+T { spawn "bash" "-c" "notify-send hello && exec alacritty"; } - # // Example volume keys mappings for PipeWire & WirePlumber. - # // The allow-when-locked=true property makes them work even when the session is locked. + # Example volume keys mappings for PipeWire & WirePlumber. + # The allow-when-locked=true property makes them work even when the session is locked. # XF86AudioRaiseVolume allow-when-locked=true { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1+"; } # XF86AudioLowerVolume allow-when-locked=true { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1-"; } # XF86AudioMute allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle"; } # XF86AudioMicMute allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle"; } - # // Open/close the Overview: a zoomed-out view of workspaces and windows. - # // You can also move the mouse into the top-left hot corner, - # // or do a four-finger swipe up on a touchpad. + # Open/close the Overview: a zoomed-out view of workspaces and windows. + # You can also move the mouse into the top-left hot corner, + # or do a four-finger swipe up on a touchpad. "Mod+O" = { repeat = false; action = toggle-overview; diff --git a/dot_config/flake/machines/wash/home.nix b/dot_config/flake/machines/wash/home.nix index 41c547f..21e263a 100644 --- a/dot_config/flake/machines/wash/home.nix +++ b/dot_config/flake/machines/wash/home.nix @@ -9,7 +9,7 @@ ../../home/home-backup.nix ../../home/gui.nix - ../../home/gnome.nix + # ../../home/gnome.nix ../../home/niri.nix ../../home/helide diff --git a/dot_config/flake/modules/home/ghostty.nix b/dot_config/flake/modules/home/ghostty.nix index 1588c95..70ef98b 100644 --- a/dot_config/flake/modules/home/ghostty.nix +++ b/dot_config/flake/modules/home/ghostty.nix @@ -3,9 +3,9 @@ enable = true; package = - if pkgs.stdenv.isDarwin - then pkgs.unstable.ghostty-bin - else pkgs.unstable.ghostty; + # if pkgs.stdenv.isDarwin + # then pkgs.unstable.ghostty-bin + pkgs.unstable.ghostty; settings = { theme = "light:Rose Pine Dawn,dark:Rose Pine"; diff --git a/dot_config/flake/modules/nixos/niri.nix b/dot_config/flake/modules/nixos/niri.nix index 1e3cf6a..6550ce0 100644 --- a/dot_config/flake/modules/nixos/niri.nix +++ b/dot_config/flake/modules/nixos/niri.nix @@ -10,6 +10,7 @@ services.xserver.displayManager.gdm.enable = true; niri-flake.cache.enable = true; programs.niri.enable = true; + services.upower.enable = true; environment.systemPackages = with pkgs; [ nautilus