fmt

diff --git a/audio.nix b/audio.nix
index 740e8a5882904e693a35459884e5af155fc89cac..15adf9c961c667c392201730480ac5d76538ef08 100644 (file)
--- a/audio.nix
+++ b/audio.nix
@@ -15,19 +15,18 @@
     };
   };
 
-#  services.mpd = {
-#    enable = true;
-#    musicDirectory = "${config.home.homeDirectory}/Music";
-#    playlistDirectory = "${config.home.homeDirectory}/.playlists";
-#    # mixer_type "none" # maybe mess around with this some time, it will turn off volume in rmpc, but apparently it will make the sound more quality for music
-#     extraConfig = ''
-#                            auto_update "yes"
-#                    audio_output {
-#                      type "pulse"
-#                      name "PipeWire Output"
-#                    }
-#                      '';
-#  };
-
+  #  services.mpd = {
+  #    enable = true;
+  #    musicDirectory = "${config.home.homeDirectory}/Music";
+  #    playlistDirectory = "${config.home.homeDirectory}/.playlists";
+  #    # mixer_type "none" # maybe mess around with this some time, it will turn off volume in rmpc, but apparently it will make the sound more quality for music
+  #     extraConfig = ''
+  #                          auto_update "yes"
+  #                  audio_output {
+  #                    type "pulse"
+  #                    name "PipeWire Output"
+  #                  }
+  #                    '';
+  #  };
 
 }

diff --git a/configuration.nix b/configuration.nix
index e2f7cc3c3020a1556d20d401412e172ec8840329..31ca9162a35fb3f90af6fc0f659b43d7b5e42cf4 100644 (file)
--- a/configuration.nix
+++ b/configuration.nix
@@ -2,10 +2,10 @@
 {
   imports = [
     ./hardware-configuration.nix
-       ./lockscreen.nix
-./x11.nix
-./hjem.nix
-./audio.nix
+    ./lockscreen.nix
+    ./x11.nix
+    ./hjem.nix
+    ./audio.nix
   ];
 
   # Bootloader.
@@ -37,14 +37,14 @@
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
-  (lib.lowPrio pkgs.vim) # Lower Vim's priority
-  (pkgs.writeShellApplication {
-    name = "vi";
-    runtimeInputs = [ pkgs.nvi ];
-    text = ''
-      exec ${pkgs.nvi}/bin/vi "$@"
-    '';
-  })
+    (lib.lowPrio pkgs.vim) # Lower Vim's priority
+    (pkgs.writeShellApplication {
+      name = "vi";
+      runtimeInputs = [ pkgs.nvi ];
+      text = ''
+        exec ${pkgs.nvi}/bin/vi "$@"
+      '';
+    })
     neovim
     wget
     git
@@ -62,8 +62,6 @@
     xdotool
   ];
 
-
-
   programs.git = {
     enable = true;
     config = {
@@ -79,7 +77,6 @@
     };
   };
 
-
   programs.steam = {
     enable = true;
     remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
@@ -93,7 +90,6 @@
     # programs here, NOT in environment.systemPackages
   ];
 
-
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
   # programs.mtr.enable = true;
@@ -105,7 +101,6 @@
   # Services
   services.openssh.enable = true;
 
-
   # Open ports in the firewall.
   # networking.firewall.allowedTCPPorts = [ ... ];
   # networking.firewall.allowedUDPPorts = [ ... ];

diff --git a/flake.nix b/flake.nix
index 7a7a576ef5c589b72dde2701ab0b2e091914e4c6..9663745f90450a0b3ca3959fa3a6dc9fe8330fef 100644 (file)
--- a/flake.nix
+++ b/flake.nix
@@ -17,11 +17,11 @@
     }@inputs:
     {
       nixosConfigurations.nepsis = nixpkgs.lib.nixosSystem {
-       specialArgs = {inherit inputs;};
+        specialArgs = { inherit inputs; };
         modules = [
           hjem.nixosModules.default
           ./configuration.nix
-       ./overlays.nix
+          ./overlays.nix
         ];
       };
     };

diff --git a/hjem.nix b/hjem.nix
index 5fa27baaf59d4558205f1c21770841d743917b76..13c118b568214f4170a4b25615d14e1647a9e387 100644 (file)
--- a/hjem.nix
+++ b/hjem.nix
@@ -18,20 +18,22 @@
     directory = "/home/andrew";
     files = {
 
-      ".config/sxhkd/sxhkdrc".text = builtins.readFile (pkgs.replaceVars ./dotfiles/sxhkdrc {
-               dmenu = pkgs.dmenu;
-       st = pkgs.st;
-      librewolf = pkgs.librewolf;
-      pamixer = pkgs.pamixer;
-      maim = pkgs.maim;
-      xdotool = pkgs.xdotool;
-      xclip = pkgs.xclip;
-      lockscreen = pkgs.lock-screen;
-});
+      ".config/sxhkd/sxhkdrc".text = builtins.readFile (
+        pkgs.replaceVars ./dotfiles/sxhkdrc {
+          dmenu = pkgs.dmenu;
+          st = pkgs.st;
+          librewolf = pkgs.librewolf;
+          pamixer = pkgs.pamixer;
+          maim = pkgs.maim;
+          xdotool = pkgs.xdotool;
+          xclip = pkgs.xclip;
+          lockscreen = pkgs.lock-screen;
+        }
+      );
     };
     packages = with pkgs; [
       discord
-lazygit
+      lazygit
     ];
   };
 

diff --git a/lock-screen.nix b/lock-screen.nix
index 294a99ea5236aa1d4c3e00a4698ad02febab2cba..ca4590342da3fc975f82ac25a2acb7d8ce060d98 100644 (file)
--- a/lock-screen.nix
+++ b/lock-screen.nix
@@ -1,12 +1,12 @@
-{ pkgs } :
+{ pkgs }:
 pkgs.writeShellApplication {
-       name = "lock-screen";
-       runtimeInputs = [ pkgs.betterlockscreen ];
-       text = ''
-               if [ ! -f "$HOME/.cache/betterlockscreen/current/lock_dimblur.png" ]; then
-                       betterlockscreen -u "$HOME/Wallpapers/Daniel_in_the_Lions_Den_by_Briton_Riviere.jpg" --fx dimblur
-               fi
+  name = "lock-screen";
+  runtimeInputs = [ pkgs.betterlockscreen ];
+  text = ''
+               if [ ! -f "$HOME/.cache/betterlockscreen/current/lock_dimblur.png" ]; then
+                       betterlockscreen -u "$HOME/Wallpapers/Daniel_in_the_Lions_Den_by_Briton_Riviere.jpg" --fx dimblur
+               fi
 
-               betterlockscreen -l dimblur
-       '';
+               betterlockscreen -l dimblur
+       '';
 }

diff --git a/lockscreen.nix b/lockscreen.nix
index 019ec8e95d8b4564e7a6d79aee8ef3af54bd515f..2ffb5918250d638b2f52de09665cc7c91c856f1f 100644 (file)
--- a/lockscreen.nix
+++ b/lockscreen.nix
@@ -5,7 +5,7 @@
   # $ nix search wget
   environment.systemPackages = with pkgs; [
     betterlockscreen
-       lock-screen
+    lock-screen
   ];
 
   programs.i3lock = {

diff --git a/overlays.nix b/overlays.nix
index 9b166008cfb7d235ec9940da80015e5c4494c991..bb80cf80ef1a81c5acd7774d41a69d70bbc4be05 100644 (file)
--- a/overlays.nix
+++ b/overlays.nix
@@ -1,7 +1,8 @@
-{pkgs, ...} : {
-nixpkgs.overlays = [
-(final: prev: {
-lock-screen = import ./lock-screen.nix {pkgs= prev;};
-})
-];
+{ pkgs, ... }:
+{
+  nixpkgs.overlays = [
+    (final: prev: {
+      lock-screen = import ./lock-screen.nix { pkgs = prev; };
+    })
+  ];
 }

diff --git a/x11.nix b/x11.nix
index dc9bf6299f9de956e191e6540edbc8719853ae39..7e18997b30f7ecf8a47e8cfe4c283f2c1bdeb960 100644 (file)
--- a/x11.nix
+++ b/x11.nix
@@ -25,7 +25,7 @@
     windowManager.dwm.enable = true;
     desktopManager.runXdgAutostartIfNone = false;
     displayManager = {
-      setupCommands = '''';
+      setupCommands = "";
       sessionCommands = ''
                        #!/bin/sh
                        ${pkgs.xrandr}/bin/xrandr --output DP-3 --primary --mode 2560x1440 --rate 180 --pos 0x0 --output DP-2 --mode 1920x1080 --rate 160 --pos 2560x360