From e68546568ca8e96cc8193d590af6644608214991 Mon Sep 17 00:00:00 2001 From: Nathan Braswell Date: Mon, 16 Jan 2023 12:36:01 -0500 Subject: [PATCH 1/2] Add computer specific packages, used it to add 'light' to 4800H --- flake.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index 64d7af3..7d5dc58 100644 --- a/flake.nix +++ b/flake.nix @@ -129,7 +129,7 @@ }; }; }; - commonConfigFunc = ({ config, lib, pkgs, modulesPath, ... }: { + commonConfigFunc = ({ config, lib, pkgs, modulesPath, ... }: (specificPkgs: { nixpkgs.config.allowUnfree = true; nix.settings.experimental-features = [ "nix-command" "flakes" ]; networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. @@ -222,7 +222,7 @@ gsettings set $gnome_schema gtk-theme 'Dracula' ''; }) - ]; + ] ++ specificPkgs; programs.waybar.enable = true; # kanshi systemd service @@ -242,7 +242,7 @@ services.openssh.enable = true; networking.firewall.enable = false; - }); + })); in { nixosConfigurations.nixos4800H = nixpkgs.lib.nixosSystem { inherit system; @@ -250,7 +250,7 @@ modules = [ home-manager.nixosModules.home-manager homeManagerSharedModule - ({ config, lib, pkgs, modulesPath, ... }@innerArgs: (lib.recursiveUpdate (commonConfigFunc innerArgs) { + ({ config, lib, pkgs, modulesPath, ... }@innerArgs: (lib.recursiveUpdate (commonConfigFunc innerArgs [ pkgs.light ]) { # HARDWARE imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; @@ -303,7 +303,7 @@ modules = [ home-manager.nixosModules.home-manager homeManagerSharedModule - ({ config, lib, pkgs, modulesPath, ... }@innerArgs: (lib.recursiveUpdate (commonConfigFunc innerArgs) { + ({ config, lib, pkgs, modulesPath, ... }@innerArgs: (lib.recursiveUpdate (commonConfigFunc innerArgs []) { # HARDWARE imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sr_mod" ]; From efebd05460adf92ef6fe0fde6afd8b34bff8e167 Mon Sep 17 00:00:00 2001 From: Nathan Braswell Date: Mon, 16 Jan 2023 17:35:15 -0500 Subject: [PATCH 2/2] Add Shift-H hide status bar to vimrc --- flake.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/flake.nix b/flake.nix index 7d5dc58..3beb0ae 100644 --- a/flake.nix +++ b/flake.nix @@ -84,6 +84,26 @@ nnoremap q :q inoremap jk inoremap kj + + " Thanks to https://unix.stackexchange.com/questions/140898/vim-hide-status-line-in-the-bottom + let s:hidden_all = 0 + function! ToggleHiddenAll() + if s:hidden_all == 0 + let s:hidden_all = 1 + set noshowmode + set noruler + set laststatus=0 + set noshowcmd + else + let s:hidden_all = 0 + set showmode + set ruler + set laststatus=2 + set showcmd + endif + endfunction + + nnoremap :call ToggleHiddenAll() ''; }; programs.tmux = {