From 48179c02213ff8e11f9b004df153b2c4bd48ddbd Mon Sep 17 00:00:00 2001 From: ISnortPennies Date: Wed, 25 Jan 2023 21:32:29 -0500 Subject: [PATCH] made system boot faster, changed shxkd config changed starship config --- flake.nix | 2 +- home-manager/dwm/autostart.sh | 4 ---- home-manager/home.nix | 4 ---- modules/xserver.nix | 5 +++++ modules/zsh.nix | 6 +++++- repl.nix | 8 ++++++++ systems/desktop.nix | 9 ++++++--- 7 files changed, 25 insertions(+), 13 deletions(-) delete mode 100755 home-manager/dwm/autostart.sh create mode 100644 repl.nix diff --git a/flake.nix b/flake.nix index d4f1966..b252350 100644 --- a/flake.nix +++ b/flake.nix @@ -88,7 +88,7 @@ inputs ); settings = { - experimental-features = ["nix-command" "flakes"]; + experimental-features = ["nix-command" "flakes" "repl-flake"]; auto-optimise-store = true; warn-dirty = false; }; diff --git a/home-manager/dwm/autostart.sh b/home-manager/dwm/autostart.sh deleted file mode 100755 index 3e542ad..0000000 --- a/home-manager/dwm/autostart.sh +++ /dev/null @@ -1,4 +0,0 @@ -if ! pidof sxhkd > /dev/null;then - sxhkd & -fi - diff --git a/home-manager/home.nix b/home-manager/home.nix index 1628595..2f28c3c 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -30,10 +30,6 @@ source = ./config; recursive = true; }; - ".dwm" = { - source = ./dwm; - recursive = true; - }; }; }; } diff --git a/modules/xserver.nix b/modules/xserver.nix index 89fb60f..e4971d4 100644 --- a/modules/xserver.nix +++ b/modules/xserver.nix @@ -14,6 +14,11 @@ windowManager.dwm.enable = true; displayManager = { defaultSession = "none+dwm"; + sessionCommands = '' + if ! pidof sxhkd > /dev/null;then + sxhkd & + fi + ''; lightdm = { enable = true; greeters.mini = { diff --git a/modules/zsh.nix b/modules/zsh.nix index bc1fb68..8118ee2 100644 --- a/modules/zsh.nix +++ b/modules/zsh.nix @@ -17,7 +17,7 @@ enable = true; settings = { add_newline = false; - format = "$sudo \n $directory$git_branch$character"; + format = "$sudo$cmd_duration \n $directory$git_branch$character"; character = { success_symbol = "[ ](#9ece6a bold)"; error_symbol = "[ ](#db4b4b bold)"; @@ -32,6 +32,10 @@ format = "[ ](#7aa2f7)"; disabled = false; }; + cmd_duration = { + min_time = 5000; + style = "bold #9ece6a"; + }; }; }; }; diff --git a/repl.nix b/repl.nix new file mode 100644 index 0000000..ef4e772 --- /dev/null +++ b/repl.nix @@ -0,0 +1,8 @@ +let + flake = builtins.getFlake (toString ./.); + nixpkgs = import {}; +in { + inherit flake; + inherit nixpkgs; + nixos = flake.nixosConfigurations; +} diff --git a/systems/desktop.nix b/systems/desktop.nix index 7ba0e28..dcc63f1 100644 --- a/systems/desktop.nix +++ b/systems/desktop.nix @@ -41,18 +41,21 @@ boot = { initrd = { kernelModules = ["amdgpu"]; - availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "uas" "sd_mod"]; + availableKernelModules = ["nvme" "ext4" "vfat" "xhci_pci" "ahci" "usbhid" "sd_mod"]; + includeDefaultModules = false; }; }; fileSystems = { "/" = { - device = "/dev/disk/by-uuid/e5c9634f-0273-4fd3-b35f-49899984340f"; + device = "/dev/disk/by-id/nvme-Samsung_SSD_980_500GB_S64ENJ0R607785J-part2"; fsType = "ext4"; + label = "nixos"; }; "/boot" = { - device = "/dev/disk/by-uuid/D3B9-197E"; + device = "/dev/disk/by-id/nvme-Samsung_SSD_980_500GB_S64ENJ0R607785J-part1"; fsType = "vfat"; + label = "BOOT"; }; }; }