From ff6e01975f7409b6309241fa4b33cee85aec1a12 Mon Sep 17 00:00:00 2001 From: Dmitry Voronin Date: Wed, 18 Dec 2024 12:08:17 +0300 Subject: [PATCH] wip --- .treefmt.toml | 1 + home/file/sway/default.nix | 49 ++++++++++--------- .../sway/module/{Display.nix => Display.conf} | 0 home/file/sway/module/{Font.nix => Font.conf} | 0 .../sway/module/{Input.nix => Input.conf} | 0 home/file/sway/module/{Keyd.nix => Keyd.conf} | 0 .../module/{Launcher.nix => Launcher.conf} | 0 home/file/sway/module/{Mod.nix => Mod.conf} | 0 .../sway/module/{Mouse.nix => Mouse.conf} | 0 .../{Navigation.nix => Navigation.conf} | 0 .../{Notification.nix => Notification.conf} | 0 .../sway/module/{Resize.nix => Resize.conf} | 0 .../{ScratchPad.nix => ScratchPad.conf} | 0 .../{Screenshot.nix => Screenshot.conf} | 0 .../sway/module/{Session.nix => Session.conf} | 0 .../sway/module/{Sound.nix => Sound.conf} | 0 .../sway/module/{Style.nix => Style.conf} | 0 .../sway/module/{System.nix => System.conf} | 0 .../module/{Terminal.nix => Terminal.conf} | 0 .../sway/module/{Tiling.nix => Tiling.conf} | 0 .../module/{TitleBar.nix => TitleBar.conf} | 0 .../sway/module/{Waybar.nix => Waybar.conf} | 0 .../module/{Workspace.nix => Workspace.conf} | 0 23 files changed, 26 insertions(+), 24 deletions(-) rename home/file/sway/module/{Display.nix => Display.conf} (100%) rename home/file/sway/module/{Font.nix => Font.conf} (100%) rename home/file/sway/module/{Input.nix => Input.conf} (100%) rename home/file/sway/module/{Keyd.nix => Keyd.conf} (100%) rename home/file/sway/module/{Launcher.nix => Launcher.conf} (100%) rename home/file/sway/module/{Mod.nix => Mod.conf} (100%) rename home/file/sway/module/{Mouse.nix => Mouse.conf} (100%) rename home/file/sway/module/{Navigation.nix => Navigation.conf} (100%) rename home/file/sway/module/{Notification.nix => Notification.conf} (100%) rename home/file/sway/module/{Resize.nix => Resize.conf} (100%) rename home/file/sway/module/{ScratchPad.nix => ScratchPad.conf} (100%) rename home/file/sway/module/{Screenshot.nix => Screenshot.conf} (100%) rename home/file/sway/module/{Session.nix => Session.conf} (100%) rename home/file/sway/module/{Sound.nix => Sound.conf} (100%) rename home/file/sway/module/{Style.nix => Style.conf} (100%) rename home/file/sway/module/{System.nix => System.conf} (100%) rename home/file/sway/module/{Terminal.nix => Terminal.conf} (100%) rename home/file/sway/module/{Tiling.nix => Tiling.conf} (100%) rename home/file/sway/module/{TitleBar.nix => TitleBar.conf} (100%) rename home/file/sway/module/{Waybar.nix => Waybar.conf} (100%) rename home/file/sway/module/{Workspace.nix => Workspace.conf} (100%) diff --git a/.treefmt.toml b/.treefmt.toml index 6aceea5e..13f06f83 100644 --- a/.treefmt.toml +++ b/.treefmt.toml @@ -7,6 +7,7 @@ excludes = [ "*.patch", "*.ogg", "*.lock", + "*.conf", "License" ] diff --git a/home/file/sway/default.nix b/home/file/sway/default.nix index 00753cf4..d5bac6f2 100644 --- a/home/file/sway/default.nix +++ b/home/file/sway/default.nix @@ -1,33 +1,34 @@ { config, lib, + pkgs, util, ... -}@args: +}: let - swayRc = util.catText [ - ./module/Mod.nix - ./module/Style.nix - ./module/Display.nix - ./module/Input.nix - ./module/Font.nix - ./module/Launcher.nix - ./module/Terminal.nix - ./module/TitleBar.nix - ./module/Navigation.nix - ./module/Notification.nix - ./module/Resize.nix - ./module/ScratchPad.nix - ./module/Screenshot.nix - ./module/Sound.nix - ./module/Tiling.nix - ./module/Workspace.nix - ./module/Session.nix - ./module/Keyd.nix - ./module/Waybar.nix - ./module/System.nix - ./module/Mouse.nix - ] args; + swayRcRaw = pkgs.writeText "sway-rc-raw" (util.readFiles [ + ./module/Mod.conf + ./module/Style.conf + ./module/Display.conf + ./module/Input.conf + ./module/Font.conf + ./module/Launcher.conf + ./module/Terminal.conf + ./module/TitleBar.conf + ./module/Navigation.conf + ./module/Notification.conf + ./module/Resize.conf + ./module/ScratchPad.conf + ./module/Screenshot.conf + ./module/Sound.conf + ./module/Tiling.conf + ./module/Workspace.conf + ./module/Session.conf + ./module/Keyd.conf + ./module/Waybar.conf + ./module/System.conf + ./module/Mouse.conf + ]); in { text = diff --git a/home/file/sway/module/Display.nix b/home/file/sway/module/Display.conf similarity index 100% rename from home/file/sway/module/Display.nix rename to home/file/sway/module/Display.conf diff --git a/home/file/sway/module/Font.nix b/home/file/sway/module/Font.conf similarity index 100% rename from home/file/sway/module/Font.nix rename to home/file/sway/module/Font.conf diff --git a/home/file/sway/module/Input.nix b/home/file/sway/module/Input.conf similarity index 100% rename from home/file/sway/module/Input.nix rename to home/file/sway/module/Input.conf diff --git a/home/file/sway/module/Keyd.nix b/home/file/sway/module/Keyd.conf similarity index 100% rename from home/file/sway/module/Keyd.nix rename to home/file/sway/module/Keyd.conf diff --git a/home/file/sway/module/Launcher.nix b/home/file/sway/module/Launcher.conf similarity index 100% rename from home/file/sway/module/Launcher.nix rename to home/file/sway/module/Launcher.conf diff --git a/home/file/sway/module/Mod.nix b/home/file/sway/module/Mod.conf similarity index 100% rename from home/file/sway/module/Mod.nix rename to home/file/sway/module/Mod.conf diff --git a/home/file/sway/module/Mouse.nix b/home/file/sway/module/Mouse.conf similarity index 100% rename from home/file/sway/module/Mouse.nix rename to home/file/sway/module/Mouse.conf diff --git a/home/file/sway/module/Navigation.nix b/home/file/sway/module/Navigation.conf similarity index 100% rename from home/file/sway/module/Navigation.nix rename to home/file/sway/module/Navigation.conf diff --git a/home/file/sway/module/Notification.nix b/home/file/sway/module/Notification.conf similarity index 100% rename from home/file/sway/module/Notification.nix rename to home/file/sway/module/Notification.conf diff --git a/home/file/sway/module/Resize.nix b/home/file/sway/module/Resize.conf similarity index 100% rename from home/file/sway/module/Resize.nix rename to home/file/sway/module/Resize.conf diff --git a/home/file/sway/module/ScratchPad.nix b/home/file/sway/module/ScratchPad.conf similarity index 100% rename from home/file/sway/module/ScratchPad.nix rename to home/file/sway/module/ScratchPad.conf diff --git a/home/file/sway/module/Screenshot.nix b/home/file/sway/module/Screenshot.conf similarity index 100% rename from home/file/sway/module/Screenshot.nix rename to home/file/sway/module/Screenshot.conf diff --git a/home/file/sway/module/Session.nix b/home/file/sway/module/Session.conf similarity index 100% rename from home/file/sway/module/Session.nix rename to home/file/sway/module/Session.conf diff --git a/home/file/sway/module/Sound.nix b/home/file/sway/module/Sound.conf similarity index 100% rename from home/file/sway/module/Sound.nix rename to home/file/sway/module/Sound.conf diff --git a/home/file/sway/module/Style.nix b/home/file/sway/module/Style.conf similarity index 100% rename from home/file/sway/module/Style.nix rename to home/file/sway/module/Style.conf diff --git a/home/file/sway/module/System.nix b/home/file/sway/module/System.conf similarity index 100% rename from home/file/sway/module/System.nix rename to home/file/sway/module/System.conf diff --git a/home/file/sway/module/Terminal.nix b/home/file/sway/module/Terminal.conf similarity index 100% rename from home/file/sway/module/Terminal.nix rename to home/file/sway/module/Terminal.conf diff --git a/home/file/sway/module/Tiling.nix b/home/file/sway/module/Tiling.conf similarity index 100% rename from home/file/sway/module/Tiling.nix rename to home/file/sway/module/Tiling.conf diff --git a/home/file/sway/module/TitleBar.nix b/home/file/sway/module/TitleBar.conf similarity index 100% rename from home/file/sway/module/TitleBar.nix rename to home/file/sway/module/TitleBar.conf diff --git a/home/file/sway/module/Waybar.nix b/home/file/sway/module/Waybar.conf similarity index 100% rename from home/file/sway/module/Waybar.nix rename to home/file/sway/module/Waybar.conf diff --git a/home/file/sway/module/Workspace.nix b/home/file/sway/module/Workspace.conf similarity index 100% rename from home/file/sway/module/Workspace.nix rename to home/file/sway/module/Workspace.conf