format2

15 files changed, 8 insertions, 33 deletions

diff --git a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/workspaces.nix b/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/workspaces.nix
index 99599d3..06498a5 100644
--- a/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/workspaces.nix
+++ b/home/ebisu/fortune/desktop/wayland/hyprland/hyprland/workspaces.nix
@@ -5,17 +5,7 @@
       let
         generateWorkspaces =
           monitor: workspaces: offset:
-          builtins.genList (
-            x:
-            let
-              ws =
-                let
-                  c = (x + 1) / workspaces;
-                in
-                builtins.toString (x + 1 - (c * workspaces));
-            in
-            [ "${toString (x + offset + 1)}, monitor:${monitor}" ]
-          ) workspaces;
+          builtins.genList (x: [ "${toString (x + offset + 1)}, monitor:${monitor}" ]) workspaces;
         generateWorkspacesAll =
           monitors: tags:
           builtins.concatLists (
diff --git a/home/ebisu/fortune/desktop/wayland/hyprland/hyprlock.nix b/home/ebisu/fortune/desktop/wayland/hyprland/hyprlock.nix
index 51dddd9..de64f02 100644
--- a/home/ebisu/fortune/desktop/wayland/hyprland/hyprlock.nix
+++ b/home/ebisu/fortune/desktop/wayland/hyprland/hyprlock.nix
@@ -1,16 +1,10 @@
 { pkgs, config, ... }:
-let
-  colourScheme = builtins.fromJSON (
-    builtins.readFile "${config.home.homeDirectory}/.cache/wal/colors.json"
-  );
-  replaceHash = str: builtins.replaceStrings [ "#" ] [ "" ] str;
-in
 {
   programs.hyprlock = {
     enable = true;
 
     # https://github.com/hyprwm/hyprlock/issues/128#issuecomment-2063629880
-    package = pkgs.hyprlock.overrideAttrs (old: {
+    package = pkgs.hyprlock.overrideAttrs {
       version = "git";
       src = pkgs.fetchFromGitHub {
         owner = "hyprwm";
@@ -22,7 +16,7 @@ in
         substituteInPlace src/core/hyprlock.cpp \
         --replace "5000" "16"
       '';
-    });
+    };
 
     settings = {
       general = {
diff --git a/home/ebisu/fortune/desktop/wayland/mako.nix b/home/ebisu/fortune/desktop/wayland/mako.nix
index 4ec2a09..836541c 100644
--- a/home/ebisu/fortune/desktop/wayland/mako.nix
+++ b/home/ebisu/fortune/desktop/wayland/mako.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, ... }:
+{ config, ... }:
 let
   colourScheme = builtins.fromJSON (
     builtins.readFile "${config.home.homeDirectory}/.cache/wal/colors.json"
diff --git a/home/ebisu/fortune/editor/default.nix b/home/ebisu/fortune/editor/default.nix
index 974f849..fd98a64 100644
--- a/home/ebisu/fortune/editor/default.nix
+++ b/home/ebisu/fortune/editor/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, ... }:
+{ pkgs, ... }:
 {
   # imports = [ ./vscode-fhs.nix ];
 
diff --git a/home/ebisu/fortune/filesystem/core/bat/default.nix b/home/ebisu/fortune/filesystem/core/bat/default.nix
index f206c02..ea3f3a0 100644
--- a/home/ebisu/fortune/filesystem/core/bat/default.nix
+++ b/home/ebisu/fortune/filesystem/core/bat/default.nix
@@ -1,4 +1,3 @@
-{ pkgs, ... }:
 {
   programs.bat = {
     enable = true;
diff --git a/home/ebisu/fortune/multimedia/browser/default.nix b/home/ebisu/fortune/multimedia/browser/default.nix
index 6944e2a..a720f52 100644
--- a/home/ebisu/fortune/multimedia/browser/default.nix
+++ b/home/ebisu/fortune/multimedia/browser/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, inputs, ... }:
+{ pkgs, ... }:
 {
   imports = [ ./thorium.nix ];
 
diff --git a/home/ebisu/fortune/network/smolnet/bollux.nix b/home/ebisu/fortune/network/smolnet/bollux.nix
index 4e2b05d..b33575d 100644
--- a/home/ebisu/fortune/network/smolnet/bollux.nix
+++ b/home/ebisu/fortune/network/smolnet/bollux.nix
@@ -1,6 +1,5 @@
-{ pkgs, config, ... }:
+{ pkgs, ... }:
 {
   home.packages = with pkgs; [ (pkgs.callPackage ../../../../../pkgs/bollux { }) ];
-
   xdg.configFile."bollux/bollux.conf".text = '''';
 }
diff --git a/home/ebisu/fortune/network/smolnet/default.nix b/home/ebisu/fortune/network/smolnet/default.nix
index 7fee28f..fe69274 100644
--- a/home/ebisu/fortune/network/smolnet/default.nix
+++ b/home/ebisu/fortune/network/smolnet/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, ... }:
+{ pkgs, ... }:
 {
   imports = [ ./bollux.nix ];
 
diff --git a/home/ebisu/fortune/rice/bottom.nix b/home/ebisu/fortune/rice/bottom.nix
index b118920..8f3bc4b 100644
--- a/home/ebisu/fortune/rice/bottom.nix
+++ b/home/ebisu/fortune/rice/bottom.nix
@@ -1,4 +1,3 @@
-{ pkgs, ... }:
 {
   programs.bottom.enable = true;
 
diff --git a/home/ebisu/fortune/rice/fastfetch.nix b/home/ebisu/fortune/rice/fastfetch.nix
index 14980d9..2950c1d 100644
--- a/home/ebisu/fortune/rice/fastfetch.nix
+++ b/home/ebisu/fortune/rice/fastfetch.nix
@@ -1,4 +1,3 @@
-{ pkgs, ... }:
 {
   programs.fastfetch = {
     enable = true;
diff --git a/home/ebisu/fortune/system/fonts/meowsans/default.nix b/home/ebisu/fortune/system/fonts/meowsans/default.nix
index 9b5a4f1..bfef9a8 100644
--- a/home/ebisu/fortune/system/fonts/meowsans/default.nix
+++ b/home/ebisu/fortune/system/fonts/meowsans/default.nix
@@ -1,4 +1,3 @@
-{ pkgs, ... }:
 {
   home.file.".local/share/fonts/MeowSans_Font ".source = ./MeowSans_Font;
 }
diff --git a/home/ebisu/fortune/system/opengl.nix b/home/ebisu/fortune/system/opengl.nix
index b1efc8e..d44091b 100644
--- a/home/ebisu/fortune/system/opengl.nix
+++ b/home/ebisu/fortune/system/opengl.nix
@@ -1,6 +1,5 @@
 {
   pkgs,
-  config,
   inputs,
   ...
 }:
diff --git a/home/ebisu/fortune/system/terminal/foot.nix b/home/ebisu/fortune/system/terminal/foot.nix
index 28d1b11..7bf1063 100644
--- a/home/ebisu/fortune/system/terminal/foot.nix
+++ b/home/ebisu/fortune/system/terminal/foot.nix
@@ -1,4 +1,3 @@
-{ pkgs, ... }:
 {
   programs.foot = {
     enable = true;
diff --git a/home/ebisu/fortune/system/terminal/kitty.nix b/home/ebisu/fortune/system/terminal/kitty.nix
index 4346e8d..ef909fc 100644
--- a/home/ebisu/fortune/system/terminal/kitty.nix
+++ b/home/ebisu/fortune/system/terminal/kitty.nix
@@ -1,4 +1,3 @@
-{ pkgs, config, ... }:
 {
   programs.kitty = {
     enable = true;
diff --git a/home/ebisu/home.nix b/home/ebisu/home.nix
index 9c9c711..d39edf9 100644
--- a/home/ebisu/home.nix
+++ b/home/ebisu/home.nix
@@ -1,6 +1,5 @@
 {
   config,
-  pkgs,
   inputs,
   ...
 }: