119 current 2024-12-31 04:42:05 25.05.20241217.d3c42f1 6.6.66 *

configuration.nix

@@ -1,21 +1,20 @@
 # Edit this configuration file to define what should be installed on
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
-
+{
-{ config, pkgs, ... }:
+  config,
-
+  pkgs,
-let
+  ...
+}: let
   pkg_with_working_nitrogen = import (builtins.fetchTarball {
     url = "https://github.com/NixOS/nixpkgs/archive/c0c50dfcb70d48e5b79c4ae9f1aa9d339af860b4.tar.gz";
     sha256 = "17p3w4mgfr4yj2p0jz6kqgzhyr04h4fap5hnd837664xd1xhwdjb";
-    }) { inherit (pkgs) system; };
+  }) {inherit (pkgs) system;};
 
   old-nitrogen = pkg_with_working_nitrogen.nitrogen;
-in
+in {
-
+  imports = [
-{
+    # Include the results of the hardware scan.
-  imports =
-    [ # Include the results of the hardware scan.
     ./hardware-configuration.nix
     ./system/system.nix
     # inputs.home-manager.nixosModules.default
@@ -29,7 +28,7 @@ in
   networking.hostName = "thonkpad"; # Define your hostname.
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
 
-  nix.settings.experimental-features = [ "nix-command" "flakes" ]; 
+  nix.settings.experimental-features = ["nix-command" "flakes"];
 
   nix = {
     nixPath = [
@@ -89,10 +88,9 @@ in
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.synchronous = {
-
     isNormalUser = true;
     description = "jake";
-    extraGroups = [ "networkmanager" "wheel" ];
+    extraGroups = ["networkmanager" "wheel"];
     packages = with pkgs; [
       kdePackages.kate
       firefox
@@ -113,8 +111,10 @@ in
       librewolf
       eza
       flameshot
-      neofetch lolcat
+      neofetch
-      nnn xclip
+      lolcat
+      nnn
+      xclip
       brightnessctl
       xbindkeys
       pulseaudio
@@ -125,8 +125,6 @@ in
       # xorg.xrandr
       #  thunderbird
     ];
-
-
   };
 
   # Install firefox.
@@ -181,5 +179,4 @@ in
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
   system.stateVersion = "24.11"; # Did you read the comment?
-
 }

flake.nix

@@ -62,7 +62,7 @@
               # inputs.emacs-overlay.overlay -- breaks doom on 30.??
             ];
 
-            home.packages = with pkgs; [ xrandr procps bspwm sxhkd ];
+            home.packages = with pkgs; [xrandr procps bspwm sxhkd];
           };
           specialArgs = {inherit inputs;};
           # extraSpecialArgs = {inherit inputs;};

hardware-configuration.nix

@@ -1,24 +1,28 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
-
 {
-  imports =
+  config,
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [
+    (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
+  boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
-  boot.initrd.kernelModules = [ ];
+  boot.initrd.kernelModules = [];
-  boot.kernelModules = [ "kvm-intel" ];
+  boot.kernelModules = ["kvm-intel"];
-  boot.extraModulePackages = [ ];
+  boot.extraModulePackages = [];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/disk/by-uuid/05ca9d56-3506-43c5-b9ec-be928b782996";
+    device = "/dev/disk/by-uuid/05ca9d56-3506-43c5-b9ec-be928b782996";
     fsType = "ext4";
   };
 
-  swapDevices = [ ];
+  swapDevices = [];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's

home/programs/zsh/default.nix

@@ -1,6 +1,7 @@
 {
   pkgs,
   lib,
+  system,
   ...
 }: {
   home.packages = with pkgs; [zsh-powerlevel10k meslo-lgs-nf];

home/programs/zsh/zshrc

@@ -223,8 +223,9 @@ export LESS_TERMCAP_us=$'\e[1;4;31m'
 
 # ------ NNN (not no not november)
 export PATH=/home/synchronous/.scripts/nnn:$PATH
-export VISUAL=wrapper.sh
+# export VISUAL=wrapper.sh
-export EDITOR="$VISUAL"
+# export EDITOR="$VISUAL"
+export EDITOR="nvim"
 export NNN_PLUG='m:preview-tui;'
 export NNN_FIFO=/tmp/nnn.fifo
 export NNN_TERMINAL=alacritty

home/scripts/nixos-rebuild.sh

@@ -4,13 +4,13 @@
 set -e
 
 # Edit your config
-$EDITOR configuration.nix
+# $EDITOR configuration.nix
 
 # cd to your config dir
-pushd ~/dotfiles/nixos/
+pushd /home/synchronous/nix-cfg
 
 # Early return if no changes were detected (thanks @singiamtel!)
-if git diff --quiet '*.nix'; then
+if git --git-dir /home/synchronous/nix-cfg/.git diff --quiet '*.nix'; then
     echo "No changes detected, exiting."
     popd
     exit 0
@@ -21,18 +21,19 @@ alejandra . &>/dev/null \
   || ( alejandra . ; echo "formatting failed!" && exit 1)
 
 # Shows your changes
-git diff -U0 '*.nix'
+git --git-dir /home/synchronous/nix-cfg/.git diff 
+# -U0 '*.nix'
 
 echo "NixOS Rebuilding..."
 
 # Rebuild, output simplified errors, log trackebacks
-sudo nixos-rebuild switch &>nixos-switch.log || (cat nixos-switch.log | grep --color error && exit 1)
+sudo nixos-rebuild switch --flake /home/synchronous/nix-cfg/flake.nix &>nixos-switch.log || (cat nixos-switch.log | grep --color error && exit 1)
 
 # Get current generation metadata
 current=$(nixos-rebuild list-generations | grep current)
 
 # Commit all changes witih the generation metadata
-git commit -am "$current"
+git --git-dir /home/synchronous/nix-cfg/.git commit -am "$current"
 
 # Back to where you were
 popd

system/services/services.nix

@@ -1,6 +1,8 @@
-{ config, pkgs, ... }:
-
 {
+  config,
+  pkgs,
+  ...
+}: {
   imports = [
     ./synaptics/default.nix
   ];

system/services/synaptics/default.nix

@@ -1,4 +1,8 @@
-{ config, pkgs, ... }: {
+{
+  config,
+  pkgs,
+  ...
+}: {
   services.libinput = {
     enable = false;
     touchpad.naturalScrolling = true;
@@ -23,11 +27,11 @@
     maxSpeed = "1.0";
 
     additionalOptions = ''
-Option "VertScrollDelta" "-111"
+      Option "VertScrollDelta" "-111"
-Option "HorizScrollDelta" "-111"
+      Option "HorizScrollDelta" "-111"
-Option "FingerLow" "25"
+      Option "FingerLow" "25"
-Option "FingerHigh" "30"
+      Option "FingerHigh" "30"
-Option "MaxTapTime" "0"
+      Option "MaxTapTime" "0"
     '';
   };
 }

system/system.nix

@@ -1,6 +1,8 @@
-{ config, pkgs, ...}: 
-
 {
+  config,
+  pkgs,
+  ...
+}: {
   imports = [
     ./wm/bspwm.nix
     ./services/services.nix

system/wm/bspwm.nix

@@ -1,6 +1,8 @@
-{ config, pkgs, ... }:
-
 {
+  config,
+  pkgs,
+  ...
+}: {
   services.xserver = {
     enable = true;
     xkb.layout = "us";
@@ -27,7 +29,6 @@
         greeters.gtk.enable = true;
       };
     };
-   
   };
 
   # xsession.windowManager.bspwm = {