From 62207c05fa47c5fa984db9ff6e91e614925d24b2 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Mon, 26 Jun 2023 18:35:00 -0400 Subject: [PATCH] chore: Formatting Also removes redundant comments. --- home/htop.nix | 1 + home/neovim.nix | 2 ++ home/swaylock.nix | 1 + modules/gamemode.nix | 1 + modules/gnome.nix | 1 - modules/greetd.nix | 2 ++ modules/logind.nix | 3 --- modules/resolved.nix | 1 - modules/systemd.nix | 3 --- modules/zram.nix | 3 +-- overlays/joshuto.nix | 1 + overlays/waybar.nix | 1 - 12 files changed, 9 insertions(+), 11 deletions(-) diff --git a/home/htop.nix b/home/htop.nix index a4180359..4aa5eb32 100644 --- a/home/htop.nix +++ b/home/htop.nix @@ -4,6 +4,7 @@ programs.htop = { enable = true; package = pkgs."htop-vim"; + settings = { tree_view = 1; hide_userland_threads = 1; diff --git a/home/neovim.nix b/home/neovim.nix index e7154e9f..b16fe6f3 100644 --- a/home/neovim.nix +++ b/home/neovim.nix @@ -3,6 +3,7 @@ let vim-nix-rummik = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "vim-nix"; version = "0def8020f152a51c011a707680780dac61a8989a"; + src = pkgs.fetchFromGitHub { owner = "rummik"; repo = "vim-nix"; @@ -152,6 +153,7 @@ in tnoremap ''; + plugins = with pkgs.vimPlugins; [ { plugin = nvim-tree-lua; diff --git a/home/swaylock.nix b/home/swaylock.nix index 1c0784f2..d0cfe009 100644 --- a/home/swaylock.nix +++ b/home/swaylock.nix @@ -3,6 +3,7 @@ { programs.swaylock = { package = pkgs."swaylock-effects"; + settings = { show-keyboard-layout = true; daemonize = true; diff --git a/modules/gamemode.nix b/modules/gamemode.nix index cc625b97..336f7b8c 100644 --- a/modules/gamemode.nix +++ b/modules/gamemode.nix @@ -3,6 +3,7 @@ { programs.gamemode = { enable = true; + settings = { general = { renice = 10; diff --git a/modules/gnome.nix b/modules/gnome.nix index ee318cdf..ad11ec5d 100644 --- a/modules/gnome.nix +++ b/modules/gnome.nix @@ -20,7 +20,6 @@ ibus.engines = with pkgs.ibus-engines; [ mozc ]; }; - # services.gnome.core-utilities.enable = false; environment.gnome.excludePackages = [ pkgs.gnome-tour ]; hardware.pulseaudio.enable = false; diff --git a/modules/greetd.nix b/modules/greetd.nix index 2b40679f..1c1063d6 100644 --- a/modules/greetd.nix +++ b/modules/greetd.nix @@ -4,11 +4,13 @@ services.greetd = { enable = true; restart = false; + settings = { default_session = { command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd Hyprland"; user = "greeter"; }; + initial_session = { command = "${pkgs.hyprland}/bin/Hyprland"; user = "user"; diff --git a/modules/logind.nix b/modules/logind.nix index 8b32ecb2..7b718792 100644 --- a/modules/logind.nix +++ b/modules/logind.nix @@ -1,9 +1,6 @@ { services.logind = { - # Don't suspend on lid close lidSwitch = "ignore"; - - # Don't shutdown when power button is short-pressed extraConfig = "HandlePowerKey=ignore"; }; } diff --git a/modules/resolved.nix b/modules/resolved.nix index 3d53bbcb..9cd0547e 100644 --- a/modules/resolved.nix +++ b/modules/resolved.nix @@ -1,4 +1,3 @@ { - # Don't use link-local multicast name resolution services.resolved.llmnr = "false"; } diff --git a/modules/systemd.nix b/modules/systemd.nix index 3898bb62..0bc00eed 100644 --- a/modules/systemd.nix +++ b/modules/systemd.nix @@ -1,9 +1,6 @@ { systemd = { - # Limit shutdown wait time to 10 seconds extraConfig = "DefaultTimeoutStopSec=10s"; - - # Don't wait for an internet connection before obtaining a graphical interface services.NetworkManager-wait-online.enable = false; }; } diff --git a/modules/zram.nix b/modules/zram.nix index 68d3151d..f8ddd9ce 100644 --- a/modules/zram.nix +++ b/modules/zram.nix @@ -1,4 +1,3 @@ { - # Use zram for swap - zramSwap.enable = true; # Swap + zramSwap.enable = true; } diff --git a/overlays/joshuto.nix b/overlays/joshuto.nix index 535ccd7f..440bb16d 100644 --- a/overlays/joshuto.nix +++ b/overlays/joshuto.nix @@ -5,6 +5,7 @@ (final: prev: { joshuto = prev.joshuto.overrideAttrs (oldAttrs: rec { version = "1d7f9067189fbf730605f373d591654651e01689"; + src = final.fetchFromGitHub { owner = "kamiyaa"; repo = "joshuto"; diff --git a/overlays/waybar.nix b/overlays/waybar.nix index a036fc39..e324512d 100644 --- a/overlays/waybar.nix +++ b/overlays/waybar.nix @@ -12,7 +12,6 @@ }; postPatch = /* bash */ '' - # use hyprctl to switch workspaces sed -i 's/zext_workspace_handle_v1_activate(workspace_handle_);/const std::string command = "hyprctl dispatch workspace " + name_;\n\tsystem(command.c_str());/g' src/modules/wlr/workspace_manager.cpp '';